From d10c74c4064c534015978f77be7b14daf2dea08c Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 16 Jun 2023 17:17:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=B7=B2=E4=B8=8B=E6=9E=B6=E5=95=86=E5=93=81=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/users/user_goods_collection/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/uni-app/pages/users/user_goods_collection/index.vue b/template/uni-app/pages/users/user_goods_collection/index.vue index bd7fab4ac..4e392b3b4 100644 --- a/template/uni-app/pages/users/user_goods_collection/index.vue +++ b/template/uni-app/pages/users/user_goods_collection/index.vue @@ -197,7 +197,7 @@ }) } else { this.$util.Tips({ - title: that.$t(`该商品已下架`) + title: this.$t(`该商品已下架`) }) } From e462132501d2c1ee98bbba16a871c659322d8182 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 16 Jun 2023 17:18:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=8D=95=E6=98=BE=E7=A4=BA=E9=80=80=E6=AC=BE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/goods/order_details/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue index 09625e51b..d9a6542fb 100644 --- a/template/uni-app/pages/goods/order_details/index.vue +++ b/template/uni-app/pages/goods/order_details/index.vue @@ -176,10 +176,10 @@ - + {{$t(`申请理由`)}}： - {{(orderInfo.add_time_y || '') +' '+(orderInfo.add_time_h || 0)}} + {{orderInfo.refund_explain}} {{$t(`申请图片`)}}： From b99f4ae2a4f9961d8dd4ee3e3ac9fe02e33076a6 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 16 Jun 2023 17:19:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/users/user_spread_money/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/uni-app/pages/users/user_spread_money/index.vue b/template/uni-app/pages/users/user_spread_money/index.vue index 5f153af2e..e8dc8fa1c 100644 --- a/template/uni-app/pages/users/user_spread_money/index.vue +++ b/template/uni-app/pages/users/user_spread_money/index.vue @@ -25,7 +25,7 @@ {{$t(`原因`)}}：{{child.fail_msg}} - + {{$t(`提现方式`)}}：{{child.extract_type}} From 2839c115f929723f133e78682422680397b30332 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Fri, 16 Jun 2023 17:26:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/v1/order/StoreOrder.php | 8 ++++++++ crmeb/crmeb/services/express/storage/Express.php | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php index da3b13f54..3e253858c 100644 --- a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php +++ b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php @@ -293,6 +293,7 @@ class StoreOrder extends AuthController ['day_type', 0], //顺丰传 0今天，1明天，2后台 ['pickup_time', []],//开始时间 9:00，结束时间 10:00 开始时间和结束时间之间不能小于一个小时 + ['service_type', ''],//快递业务类型 ]); if (!$id) { return app('json')->fail(100100); @@ -325,8 +326,15 @@ class StoreOrder extends AuthController ['address', ''], ['weight', ''], ['service_type', ''], + ['cart_ids', []], ]); + foreach ($data['cart_ids'] as $cart) { + if (!isset($cart['cart_id']) || !$cart['cart_id'] || !isset($cart['cart_num']) || !$cart['cart_num']) { + return app('json')->fail(400159); + } + } + return app('json')->success($services->express()->getPrice($data)); } diff --git a/crmeb/crmeb/services/express/storage/Express.php b/crmeb/crmeb/services/express/storage/Express.php index bb8a86bb3..9421f4a22 100644 --- a/crmeb/crmeb/services/express/storage/Express.php +++ b/crmeb/crmeb/services/express/storage/Express.php @@ -170,13 +170,13 @@ class Express extends BaseExpress */ public function getPrice(array $data) { - if (!empty($data['kuaidicom'])) { + if (empty($data['kuaidicom'])) { throw new ApiException('快递编码必须填写'); } - if (!empty($data['send_address'])) { + if (empty($data['send_address'])) { throw new ApiException('寄件地址必须填写'); } - if (!empty($data['address'])) { + if (empty($data['address'])) { throw new ApiException('收件地址必须填写'); } $param = [