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

crmeb/crmeb/services/HttpService.php

@@ -88,8 +88,13 @@ class HttpService
         $method = strtoupper($method);
         //请求方式
         curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
-        //post请求
-        if ($method == 'POST') curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+        //携带参数
+        if ($method == 'POST') {
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+        } elseif ($method == 'GET' && count($data)) {
+            $url .= '?' . http_build_query($data);
+            curl_setopt($curl, CURLOPT_URL, $url);
+        }
         //超时时间
         curl_setopt($curl, CURLOPT_TIMEOUT, $timeout);
         //设置header头

crmeb/crmeb/services/express/storage/Express.php

@@ -30,7 +30,7 @@ class Express extends BaseExpress
     /**
      * 电子面单模版
      */
-    const EXPRESS_TEMP = 'v2/expr/temp';
+    const EXPRESS_TEMP = 'v2/expr_dump/temp';
 
     /**
      * 快递公司

template/admin/src/pages/marketing/point_statistic/index.vue

@@ -158,7 +158,7 @@ export default {
           align: 'center',
         },
         {
-          title: '金额',
+          title: '积分',
           width: 180,
           key: 'value',
           align: 'center',

template/admin/src/pages/marketing/storeIntegralOrder/components/tableExpand.vue

@@ -1,10 +1,6 @@
 <template>
   <div>
     <Row class="expand-row">
-      <Col span="8">
-        <span class="expand-key">下单时间：</span>
-        <span class="expand-value" v-text="row.add_time"></span>
-      </Col>
       <Col span="8">
         <span class="expand-key">用户备注：</span>
         <span class="expand-value" v-text="row.mark ? row.mark : '无'"></span>