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 = [ 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(`申请图片`)}}: 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(`该商品已下架`) }) } 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}}