Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

crmeb/app/adminapi/controller/v1/product/StoreProductReply.php

@@ -100,7 +100,8 @@ class StoreProductReply extends AuthController
             ['product_score', 0],
             ['service_score', 0],
             ['product_id', 0],
-            ['add_time', 0]
+            ['add_time', 0],
+            ['suk', ''],
         ]);
         if (!$data['product_id']) {
             $data['product_id'] = $data['image']['product_id'] ?? '';

crmeb/app/services/product/product/StoreProductReplyServices.php

@@ -131,10 +131,12 @@ class StoreProductReplyServices extends BaseServices
     public function getRecProductReply(int $productId)
     {
         $res = $this->dao->getProductReply($productId);
+
         if ($res) {
             $res = $res->toArray();
-//            $res['cart_info'] = isset($res['cart_info']) ? json_decode($res['cart_info'], true) : [];
-            $res['suk'] = isset($res['cart_info']['productInfo']['attrInfo']) ? $res['cart_info']['productInfo']['attrInfo']['suk'] : '';
+            if ($res['suk'] == '') {
+                $res['suk'] = isset($res['cart_info']['productInfo']['attrInfo']) ? $res['cart_info']['productInfo']['attrInfo']['suk'] : '';
+            }
             $res['nickname'] = anonymity($res['nickname']);
             $res['merchant_reply_time'] = date('Y-m-d H:i', $res['merchant_reply_time']);
             $res['add_time'] = time_tran($res['add_time']);

crmeb/app/services/product/product/StoreProductServices.php

@@ -865,6 +865,15 @@ class StoreProductServices extends BaseServices
             $item['cost'] = floatval($item['cost']);
             $item['is_product_type'] = 1;
             $item['logistics'] = explode(',', $item['logistics']);
+            $attrs = $this->getProductRules($item['id'], 0)['attrs'];
+            foreach ($attrs as $items) {
+                $item['attrs'][] = [
+                    'image' => $items['pic'],
+                    'price' => $items['price'],
+                    'ot_price' => $items['ot_price'],
+                    'suk' => implode(',', $items['detail'])
+                ];
+            }
         }
         return $data;
     }

crmeb/app/services/shipping/ExpressServices.php

@@ -260,7 +260,7 @@ class ExpressServices extends BaseServices
                 $data['partner_name'] = $express['partner_name'] ?? '';
                 $data['is_code'] = $express['is_code'] ?? '';
                 $data['net'] = $express['net'] ?? '';
-                $data['is_show'] = 1;
+                $data['is_show'] = 0;
                 $data['status'] = 0;
                 if ($express['partner_id'] == 0 && $express['partner_key'] == 0 && $express['net'] == 0 && $express['check_man'] == 0 && $express['partner_name'] == 0 && $express['is_code'] == 0) {
                     $data['status'] = 1;

crmeb/app/services/user/UserBrokerageServices.php

@@ -396,7 +396,7 @@ class UserBrokerageServices extends BaseServices
         }
         /** @var UserExtractServices $userExtractService */
         $userExtractService = app()->make(UserExtractServices::class);
-        $userExtract = $userExtractService->getColumn(['uid' => $uid], 'fail_msg', 'id');
+        $userExtract = $userExtractService->getColumn(['uid' => $uid], 'fail_msg,extract_type', 'id');
         $list = $this->dao->getList($where, '*', $page, $limit);
         $count = $this->dao->count($where);
         $times = [];
@@ -404,7 +404,15 @@ class UserBrokerageServices extends BaseServices
             foreach ($list as &$item) {
                 $item['time'] = $item['time_key'] = $item['add_time'] ? date('Y-m', (int)$item['add_time']) : '';
                 $item['add_time'] = $item['add_time'] ? date('Y-m-d H:i', (int)$item['add_time']) : '';
-                $item['fail_msg'] = $item['type'] == 'extract_fail' ? $userExtract[$item['link_id']] : '';
+                $item['fail_msg'] = $item['type'] == 'extract_fail' ? $userExtract[$item['link_id']]['fail_msg'] : '';
+                $extract_type = $userExtract[$item['link_id']]['extract_type'];
+                if ($extract_type == 'alipay') {
+                    $item['extract_type'] = '支付宝';
+                } elseif ($extract_type == 'weixin') {
+                    $item['extract_type'] = '微信';
+                } else {
+                    $item['extract_type'] = '银行卡';
+                }
             }
             $times = array_merge(array_unique(array_column($list, 'time_key')));
         }

crmeb/crmeb/services/AccessTokenServeService.php

@@ -93,8 +93,8 @@ class AccessTokenServeService extends HttpService
     public function getConfig()
     {
         return [
-            'account' => $this->account,
-            'secret' => $this->secret
+            'access_key' => $this->account,
+            'secret_key' => $this->secret
         ];
     }
 

crmeb/crmeb/services/copyproduct/storage/Copy.php

@@ -24,11 +24,11 @@ class Copy extends BaseCopyProduct
     /**
      * 是否开通
      */
-    const PRODUCT_OPEN = 'copy/open';
+    const PRODUCT_OPEN = 'v2/copy/open';
     /**
      * 获取详情
      */
-    const PRODUCT_GOODS = 'copy/goods';
+    const PRODUCT_GOODS = 'v2/copy/goods';
 
     /** 初始化
      * @param array $config

crmeb/crmeb/services/sms/storage/Chuanglan.php

@@ -26,47 +26,47 @@ class Chuanglan extends BaseSms
     /**
      * 开通
      */
-    const SMS_OPEN = 'sms_v2/open';
+    const SMS_OPEN = 'v2/sms_v2/open';
 
     /**
      * 修改签名
      */
-    const SMS_MODIFY = 'sms_v2/modify';
+    const SMS_MODIFY = 'v2/sms_v2/modify';
 
     /**
      * 用户信息
      */
-    const SMS_INFO = 'sms_v2/info';
+    const SMS_INFO = 'v2/sms_v2/info';
 
     /**
      * 发送短信
      */
-    const SMS_SEND = 'sms_v2/send';
+    const SMS_SEND = 'v2/sms_v2/send';
 
     /**
      * 短信模板
      */
-    const SMS_TEMPS = 'sms_v2/temps';
+    const SMS_TEMPS = 'v2/sms_v2/temps';
 
     /**
      * 申请模板
      */
-    const SMS_APPLY = 'sms_v2/apply';
+    const SMS_APPLY = 'v2/sms_v2/apply';
 
     /**
      * 模板记录
      */
-    const SMS_APPLYS = 'sms_v2/applys';
+    const SMS_APPLYS = 'v2/sms_v2/applys';
 
     /**
      * 发送记录
      */
-    const SMS_RECORD = 'sms_v2/record';
+    const SMS_RECORD = 'v2/sms_v2/record';
 
     /**
      * 获取短信发送状态
      */
-    const SMS_STSTUS = 'sms/status';
+    const SMS_STSTUS = 'v2/sms/status';
 
     /**
      * 短信签名

template/uni-app/pages/users/user_spread_money/index.vue

@@ -25,6 +25,9 @@
 											<view class="fail-msg" v-if="child.fail_msg">
 												{{$t(`原因`)}}：{{child.fail_msg}}
 											</view>
+											<view class="fail-msg" v-else>
+												{{$t(`提现方式`)}}：{{child.extract_type}}
+											</view>
 										</view>
 										<view class='num font-color' v-if="child.pm == 1">+{{child.number}}</view>
 										<view class='num' v-else>-{{child.number}}</view>