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'; /** * 快递公司 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 @@