evoxwht 2 лет назад
Родитель
Сommit
a2745353d3

+ 1 - 0
crmeb/app/services/system/attachment/SystemAttachmentServices.php

@@ -68,6 +68,7 @@ class SystemAttachmentServices extends BaseServices
             if ($site_url) {
                 $item['satt_dir'] = (strpos($item['satt_dir'], $site_url) !== false || strstr($item['satt_dir'], 'http') !== false) ? $item['satt_dir'] : $site_url . $item['satt_dir'];
                 $item['att_dir'] = (strpos($item['att_dir'], $site_url) !== false || strstr($item['att_dir'], 'http') !== false) ? $item['satt_dir'] : $site_url . $item['att_dir'];
+                $item['time'] = date('Y-m-d H:i:s', $item['time']);
             }
         }
         $where['module_type'] = 1;

+ 2 - 2
crmeb/crmeb/services/AccessTokenServeService.php

@@ -49,7 +49,7 @@ class AccessTokenServeService extends HttpService
     /**
      * @var string
      */
-    protected $apiHost = 'http://sms.crmeb.net/api/';
+    protected $apiHost = 'https://sms.crmeb.net/api/';
 
     /**
      * 沙盒地址
@@ -61,7 +61,7 @@ class AccessTokenServeService extends HttpService
      * 沙盒模式
      * @var bool
      */
-    protected $sandBox = true;
+    protected $sandBox = false;
 
     /**
      * 登录接口

+ 1 - 1
template/admin/src/pages/notify/smsConfig/index.vue

@@ -81,7 +81,7 @@
     <!--      </div>-->
     <Card :bordered="false" dis-hover class="ivu-mt" style="height: 800px">
       <iframe
-        src="https://api_v2.crmeb.net?token=AF37D4579721672220B08CA872586943"
+        src="https://sms.crmeb.net?token=AF37D4579721672220B08CA872586943"
         style="width: 100%; height: 800px"
         frameborder="0"
       ></iframe>

+ 4 - 4
template/uni-app/manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "CRMEB标准版",
+    "name" : "CRMEB标准版-发行",
     "appid" : "__UNI__A3F1ED4",
     "description" : "CRMEB标准版",
-    "versionName" : "4.7.0",
-    "versionCode" : 470,
+    "versionName" : "5.1.0",
+    "versionCode" : 510,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -181,7 +181,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx1234567890",
+        "appid" : "wx3b82801238ca1b57",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

+ 2 - 2
template/uni-app/pages/goods/order_details/index.vue

@@ -185,7 +185,7 @@
 					<view>{{$t(`用户备注`)}}:</view>
 					<view class='conter'>{{orderInfo.refund_explain}}</view>
 				</view>
-				<view class='item acea-row row-between'>
+				<view class='item acea-row row-between' v-if="orderInfo.refund_img.length">
 					<view>{{$t(`申请图片`)}}:</view>
 					<view class='upload acea-row row-middle'>
 						<view class='conter'>
@@ -222,7 +222,7 @@
 					<view>{{$t(`支付方式`)}}:</view>
 					<view class='conter'>{{$t(orderInfo._status._payType)}}</view>
 				</view>
-				<view class='item acea-row row-between' v-if="orderInfo.mark">
+				<view class='item acea-row row-between' v-if="orderInfo.mark && isReturen != 1">
 					<view v-if="orderInfo.pid">{{$t(`买家备注`)}}:</view>
 					<view v-else>{{$t(`买家留言`)}}:</view>
 					<view class='conter'>{{orderInfo.mark}}</view>