Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

crmeb/app/services/order/StoreOrderServices.php

@@ -171,6 +171,7 @@ class StoreOrderServices extends BaseServices
         $data['refunded_count'] = (string)$storeOrderRefundServices->count($refund_where + ['refund_type' => 6]);
         $data['refund_count'] = bcadd(bcadd($data['refunding_count'], $data['refunded_count'], 0), $data['no_refund_count'], 0);
         $data['yue_pay_status'] = (int)sys_config('balance_func_status') && (int)sys_config('yue_pay_status') == 1 ? (int)1 : (int)2;//余额支付 1 开启 2 关闭
+        $data['pc_order_count'] = $data['order_count'] + $data['refunding_count'] + $data['refunded_count'];
         $data['pay_weixin_open'] = is_wecaht_pay();//微信支付 1 开启 0 关闭
         $data['ali_pay_status'] = is_ali_pay();//支付包支付 1 开启 0 关闭
         $data['friend_pay_status'] = (int)sys_config('friend_pay_status') ?? 0;//好友代付 1 开启 0 关闭

crmeb/app/services/system/config/SystemConfigServices.php

@@ -124,14 +124,6 @@ class SystemConfigServices extends BaseServices
             ],
             'show_value' => 1
         ],
-        'allin_pay_status' => [
-            'son_type' => [
-                'allin_appid' => '',
-                'allin_cusid' => '',
-                'allin_private_key' => '',
-            ],
-            'show_value' => 1
-        ],
         'pay_wechat_type' => [
             'son_type' => [
                 'pay_weixin_key' => '',
@@ -410,7 +402,7 @@ class SystemConfigServices extends BaseServices
             foreach ($parameter as $v) {
                 if (strstr($v, $this->cuttingStr) !== false) {
                     $pdata = explode($this->cuttingStr, $v);
-                    $options[] = ['label' => $pdata[1], 'value' => (int)$pdata[0]];
+                    $options[] = ['label' => $pdata[1], 'value' => $pdata[0]];
                 }
             }
             $formbuider[] = $radio = $this->builder->radio($data['menu_name'], $data['info'], (int)$data['value'])->options($options)->appendRule('suffix', [

crmeb/crmeb/services/app/WechatService.php

@@ -60,7 +60,13 @@ class WechatService
             $appId = isset($wechat['wechat_app_appid']) ? trim($wechat['wechat_app_appid']) : '';
             $appsecret = isset($wechat['wechat_app_appsecret']) ? trim($wechat['wechat_app_appsecret']) : '';
         } else {
-            $appId = isset($wechat['wechat_appid']) ? trim($wechat['wechat_appid']) : '';
+            $appId = null;
+            if (request()->isPc()) {
+                $appId = sys_config('wechat_open_app_id');
+            }
+            if (!$appId) {
+                $appId = isset($wechat['wechat_appid']) ? trim($wechat['wechat_appid']) : '';
+            }
             $appsecret = isset($wechat['wechat_appsecret']) ? trim($wechat['wechat_appsecret']) : '';
         }
         $config = [

template/admin/src/pages/product/productAdd/index.vue

@@ -660,7 +660,7 @@
         <!-- 营销设置-->
         <Row :gutter="24" type="flex" v-show="headTab.length === 6 ? currentTab === '5' : currentTab === '4'">
           <Col span="24">
-            <FormItem label="虚拟销量：">
+            <FormItem label="已售数量：">
               <InputNumber :min="0" :max="999999" v-model="formValidate.ficti" placeholder="请输入虚拟销量" />
             </FormItem>
           </Col>

template/admin/src/pages/product/productReply/index.vue

@@ -70,7 +70,7 @@
       <Row type="flex">
         <Col v-bind="grid">
           <Button v-auth="['product-reply-save_fictitious_reply']" type="primary" icon="md-add" @click="add"
-            >添加虚拟评论</Button
+            >添加自评</Button
           >
         </Col>
       </Row>