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);
-    }
 }

crmeb/public/admin/system_static/css/chunk-906b1e4a.1858985a.css

@@ -0,0 +1 @@
+.expand[data-v-7eab2fa5]{padding-left:50px}.expand-row[data-v-7eab2fa5]{margin-bottom:16px}.express_temp_id[data-v-9647bf98]{position:relative}.express_temp_id button[data-v-9647bf98]{position:absolute;top:50%;right:110px;padding:0;border:none;background:none;-webkit-transform:translateY(-50%);transform:translateY(-50%);color:#57a3f3}.ivu-btn-text[data-v-9647bf98]:focus{-webkit-box-shadow:none;box-shadow:none}.trips[data-v-9647bf98]{color:#ccc}.product-data[data-v-9647bf98]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.product-data .image[data-v-9647bf98]{width:50px!important;height:50px!important}.line2[data-v-9647bf98]{display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden}

crmeb/public/admin/system_static/css/chunk-fb10e656.dbbbf26c.css

@@ -0,0 +1 @@
+.upload-btn[data-v-c7198f0a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.img-list[data-v-c7198f0a]{padding:10px;overflow:scroll;height:calc(100vh - 50px)}[data-v-c7198f0a] .el-upload--picture-card,[data-v-c7198f0a] .el-upload-list--picture-card .el-upload-list__item{width:113px;height:113px;line-height:113px;overflow:inherit}[data-v-c7198f0a] .el-upload-list--picture-card .el-upload-list__item img{width:111px;height:111px;border-radius:6px;-o-object-fit:cover;object-fit:cover}.btndel[data-v-c7198f0a]{position:absolute;z-index:1;font-size:18px;right:0;top:0;color:#282828;opacity:.5}.el-upload[data-v-c7198f0a]:focus,[data-v-c7198f0a] .el-upload--picture-card:hover{border-color:#c0ccda}.img-box[data-v-c7198f0a]{display:-webkit-box;display:-ms-flexbox;display:flex;padding-left:100px;-ms-flex-wrap:wrap;flex-wrap:wrap}.footer[data-v-c7198f0a]{padding:0 10px 0 15px;position:fixed;bottom:0;width:100%;-webkit-box-sizing:border-box;box-sizing:border-box;background-color:hsla(0,0%,100%,.85);-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px);z-index:277;border-top:1px solid #f0f0f0;height:50px;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.footer .btn[data-v-c7198f0a],.footer[data-v-c7198f0a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.footer .btn[data-v-c7198f0a]{border:1px solid #ccc;width:88px;height:30px;border-radius:15px;color:#000;font-size:14px;font-family:PingFang SC-Regular,PingFang SC;font-weight:400;color:#666;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.footer .upload[data-v-c7198f0a]{background-color:#e93323;color:#fff;margin-left:10px}.upload-success[data-v-c7198f0a]{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;height:80vh}.upload-success .success[data-v-c7198f0a],.upload-success[data-v-c7198f0a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.upload-success .success[data-v-c7198f0a]{width:50px;height:50px;background:#4bbc12;border-radius:50%;margin-bottom:20px}.upload-success .success .image[data-v-c7198f0a]{width:60%}.upload-success .text[data-v-c7198f0a]{font-size:16px;font-family:PingFang SC-Medium,PingFang SC;font-weight:500;color:#282828;margin-bottom:40px}.upload-success .again[data-v-c7198f0a]{width:150px;height:43px;border-radius:21px;text-align:center;line-height:41px;font-size:15px;font-weight:400;color:#333;border:1px solid #ccc}

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) => {