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

crmeb/app/services/order/StoreOrderServices.php

@@ -101,10 +101,13 @@ class StoreOrderServices extends BaseServices
         foreach ($data as &$item) {
             $refund_num = array_sum(array_column($item['refund'], 'refund_num'));
             $cart_num = 0;
+            $vipTruePrice = 0;
             foreach ($item['_info'] as $items) {
                 $cart_num += $items['cart_info']['cart_num'];
+                $vipTruePrice = bcadd((string)$vipTruePrice, (string)$items['cart_info']['vip_truePrice'], 2);
             }
-            $item['is_all_refund'] = $refund_num == $cart_num ? true : false;
+            $item['total_price'] = bcadd($item['total_price'], $vipTruePrice, 2);
+            $item['is_all_refund'] = $refund_num == $cart_num;
         }
         return compact('data', 'count');
     }

crmeb/crmeb/services/serve/storage/Crmeb.php

@@ -52,98 +52,6 @@ class Crmeb extends BaseStorage
         return $this->accessToken->httpRequest('v2/user/info');
     }
 
-    /**
-     * 用户登录
-     * @param string $account
-     * @param string $secret
-     * @return array|mixed
-     */
-    public function login(string $account, string $secret)
-    {
-        return $this->accessToken->httpRequest('user/login', ['account' => $account, 'secret' => $secret], 'POST', false);
-    }
-
-    /**
-     * 注册平台
-     * @param array $data
-     * @return array|mixed
-     */
-    public function register(array $data)
-    {
-        return $this->accessToken->httpRequest('user/register', $data, 'POST', false);
-    }
-
-    /**
-     * 平台用户消息记录
-     * @param int $page
-     * @param int $limit
-     * @return array|mixed
-     */
-    public function userBill(int $page, int $limit)
-    {
-        return $this->accessToken->httpRequest('user/bill', ['page' => $page, 'limit' => $limit]);
-    }
-
-    /**
-     * 找回账号
-     * @param array $data
-     * @return array|mixed
-     */
-    public function forget(array $data)
-    {
-        return $this->accessToken->httpRequest('user/forget', $data, 'POST', false);
-    }
-
-    /**
-     * 修改密码
-     * @param array $data
-     * @return array|mixed
-     */
-    public function modify(array $data)
-    {
-        return $this->accessToken->httpRequest('user/modify', $data, 'POST', false);
-    }
-
-    /**
-     * 获取验证码
-     * @param string $phone
-     * @return array|mixed
-     */
-    public function code(string $phone, $type = 0)
-    {
-        return $this->accessToken->httpRequest('user/code', ['phone' => $phone, 'types' => $type], 'POST', false);
-    }
-
-    /**
-     * 验证验证码
-     * @param string $phone
-     * @return array|mixed
-     */
-    public function checkCode(string $phone, string $verify_code)
-    {
-        return $this->accessToken->httpRequest('user/code/verify', ['phone' => $phone, 'verify_code' => $verify_code], 'POST', false);
-    }
-
-    /**
-     * 套餐列表
-     * @param string $type 套餐类型：sms,短信；query,物流查询；dump,电子面单；copy,产品复制
-     * @return array|mixed
-     */
-    public function mealList(string $type)
-    {
-        return $this->accessToken->httpRequest('meal/list', ['type' => $type]);
-    }
-
-    /**
-     * 套餐支付
-     * @param array $data
-     * @return array|mixed
-     */
-    public function payMeal(array $data)
-    {
-        return $this->accessToken->httpRequest('meal/code', $data);
-    }
-
     /**
      * 用量记录
      * @param int $page
@@ -163,14 +71,4 @@ class Crmeb extends BaseStorage
         }
         return $this->accessToken->httpRequest('user/record', $data);
     }
-
-    /**
-     * 修改手机号
-     * @param array $data
-     * @return array|mixed
-     */
-    public function modifyPhone(array $data)
-    {
-        return $this->accessToken->httpRequest('user/modify/phone', $data);
-    }
 }

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

@@ -7,7 +7,7 @@
           >如何配置密钥</a
         >
         <span v-else
-          >您当前剩余{{ copyConfig.copy_num }}条采集次数，<span class="add" @click="mealPay('copy')"
+          >您当前剩余{{ copyConfig.copy_num }}条采集次数，<span class="add" @click="mealPay()"
             >增加采集次数</span
           ></span
         >
@@ -73,8 +73,8 @@ export default {
     this.getCopyConfig();
   },
   methods: {
-    mealPay(val) {
-      this.$router.push({ path: this.$routeProStr + '/setting/sms/sms_pay/index', query: { type: val } });
+    mealPay() {
+      this.$router.push({ path: this.$routeProStr + '/setting/sms/sms_config/index'});
     },
     getCopyConfig() {
       copyConfigApi().then((res) => {