From 09b8f674033cdc82350b53438b9ba4903febe19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Fri, 17 Feb 2023 10:36:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/order/StoreOrderRefundServices.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php index ef8d2144c..4290ee77b 100644 --- a/crmeb/app/services/order/StoreOrderRefundServices.php +++ b/crmeb/app/services/order/StoreOrderRefundServices.php @@ -1104,7 +1104,13 @@ class StoreOrderRefundServices extends BaseServices /** * 退款订单详情 * @param $uni - * @return mixed + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 吴汐 + * @email 442384644@qq.com + * @date 2023/02/17 */ public function refundDetail($uni) { @@ -1129,6 +1135,12 @@ class StoreOrderRefundServices extends BaseServices $orderData['store_order_sn'] = $orderInfo['order_id']; $orderData['cartInfo'] = $orderData['cart_info']; $orderData['_pay_time'] = date('Y-m-d H:i:s', $orderInfo['pay_time']); + $orderData['type'] = 0; + if ($orderInfo['seckill_id'] || $orderInfo['bargain_id'] || $orderInfo['combination_id']) { + if ($orderInfo['seckill_id']) $orderData['type'] = 1; + if ($orderInfo['bargain_id']) $orderData['type'] = 2; + if ($orderInfo['combination_id']) $orderData['type'] = 3; + } //核算优惠金额 $vipTruePrice = 0; $total_price = 0; From ac85b538493c3a32924c5343d857ac4f972651c3 Mon Sep 17 00:00:00 2001 From: From-wh Date: Fri, 17 Feb 2023 11:31:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?improve:=20=E5=90=8E=E5=8F=B0=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/vendor/Export2Excel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/admin/src/vendor/Export2Excel.js b/template/admin/src/vendor/Export2Excel.js index bc76b4231..15b326016 100644 --- a/template/admin/src/vendor/Export2Excel.js +++ b/template/admin/src/vendor/Export2Excel.js @@ -9,7 +9,7 @@ // +---------------------------------------------------------------------- /* eslint-disable */ require('script-loader!file-saver'); -require('script-loader!@/vendor/Blob'); +require('./Blob'); require('script-loader!xlsx/dist/xlsx.core.min'); function generateArray(table) { var out = []; From b1f1b8c110e8d39b6bc785386a00dcc3f0f993fa Mon Sep 17 00:00:00 2001 From: From-wh Date: Fri, 17 Feb 2023 11:31:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?improve:=20=E5=9B=9E=E8=B7=B3=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/admin/orderList/index.vue | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/template/uni-app/pages/admin/orderList/index.vue b/template/uni-app/pages/admin/orderList/index.vue index ade84c5a8..8f8ec9e5c 100644 --- a/template/uni-app/pages/admin/orderList/index.vue +++ b/template/uni-app/pages/admin/orderList/index.vue @@ -161,6 +161,8 @@ onLoad(option) { let type = option.types; this.where.status = type; + }, + onShow() { this.init(); }, methods: { @@ -369,16 +371,18 @@