From 2f5c57b05e564cdd1492b867602df0a54e39b7f6 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 19 Jun 2023 17:56:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?style:=20=E5=B1=95=E7=A4=BA=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/marketing/point_statistic/index.vue  | 2 +-
 .../marketing/storeIntegralOrder/components/tableExpand.vue   | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/template/admin/src/pages/marketing/point_statistic/index.vue b/template/admin/src/pages/marketing/point_statistic/index.vue
index 416f25116..a3256e7ee 100644
--- a/template/admin/src/pages/marketing/point_statistic/index.vue
+++ b/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',
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableExpand.vue b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableExpand.vue
index 75e888852..022b31fa6 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableExpand.vue
+++ b/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>

From bb69a26eff63e1baa8767155a27f008c4d104a06 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 19 Jun 2023 18:15:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E8=8E=B7=E5=8F=96=E7=94=B5=E5=AD=90=E9=9D=A2?=
 =?UTF-8?q?=E5=8D=95=E6=A8=A1=E7=89=88=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/HttpService.php             | 9 +++++++--
 crmeb/crmeb/services/express/storage/Express.php | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crmeb/crmeb/services/HttpService.php b/crmeb/crmeb/services/HttpService.php
index e9f09ed4d..53688523b 100644
--- a/crmeb/crmeb/services/HttpService.php
+++ b/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头
diff --git a/crmeb/crmeb/services/express/storage/Express.php b/crmeb/crmeb/services/express/storage/Express.php
index 1705ac371..eff8a5254 100644
--- a/crmeb/crmeb/services/express/storage/Express.php
+++ b/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';
 
     /**
      * 快递公司