diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php index fd8d14cac..f5b8ff0ca 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php @@ -258,7 +258,7 @@ class StoreOrderController CacheService::set('PAY_LOCK_' . $uni, 'PAY_LOCK', 2); if (!$uni) return app('json')->fail(100100); $orderInfo = $this->services->get(['order_id' => $uni]); - if ($orderInfo->is_del == 1 || $orderInfo->is_system_del == 1) return app('json')->fail('订单已经超过系统支付时间,无法支付,请重新下单'); + if ($orderInfo->is_cancel == 1 || $orderInfo->is_del == 1 || $orderInfo->is_system_del == 1) return app('json')->fail('订单已经超过系统支付时间,无法支付,请重新下单'); $uid = $type == 1 ? (int)$request->uid() : $orderInfo->uid; $orderInfo->is_channel = $this->getChennel[$request->getFromType()] ?? ($request->isApp() ? 0 : 1); $orderInfo->order_id = $uid != $orderInfo->pay_uid ? app()->make(StoreOrderCreateServices::class)->getNewOrderId('cp') : $uni; diff --git a/crmeb/app/services/message/notice/RoutineTemplateListService.php b/crmeb/app/services/message/notice/RoutineTemplateListService.php index 6958e6925..11bf52e86 100644 --- a/crmeb/app/services/message/notice/RoutineTemplateListService.php +++ b/crmeb/app/services/message/notice/RoutineTemplateListService.php @@ -138,7 +138,7 @@ class RoutineTemplateListService extends NoticeService 'thing2' => $storeTitle, 'amount3' => $order['pay_price'], 'character_string6' => $data['order_id'] - ], '/pages/goods/order_details/index?order_id=' . $data['order_id'] . '&isReturen=1'); + ], '/pages/goods/order_details/index?order_id=' . $data['order_id'] . '&isReturn=1'); } /** @@ -155,7 +155,7 @@ class RoutineTemplateListService extends NoticeService 'thing2' => $storeTitle, 'amount3' => $order['pay_price'], 'character_string6' => $order['order_id'] - ], '/pages/goods/order_details/index?order_id=' . $order['order_id'] . '&isReturen=1'); + ], '/pages/goods/order_details/index?order_id=' . $order['order_id'] . '&isReturn=1'); } /** diff --git a/crmeb/app/services/message/notice/WechatTemplateListService.php b/crmeb/app/services/message/notice/WechatTemplateListService.php index 3021f0682..30bfdf47e 100644 --- a/crmeb/app/services/message/notice/WechatTemplateListService.php +++ b/crmeb/app/services/message/notice/WechatTemplateListService.php @@ -151,7 +151,7 @@ class WechatTemplateListService extends NoticeService 'time5' => date('Y-m-d H:i:s', time()), 'thing2' => $title, 'amount3' => $order['refund_price'], - ], '/pages/goods/order_details/index?order_id=' . $order['refund_no'] . '&isReturen=1'); + ], '/pages/goods/order_details/index?order_id=' . $order['refund_no'] . '&isReturn=1'); } /** @@ -168,7 +168,7 @@ class WechatTemplateListService extends NoticeService 'thing2' => $title, 'amount3' => $order['refund_price'], 'thing4' => $order['refuse_reason'], - ], '/pages/goods/order_details/index?order_id=' . $order['refund_no'] . '&isReturen=1'); + ], '/pages/goods/order_details/index?order_id=' . $order['refund_no'] . '&isReturn=1'); } /** diff --git a/crmeb/app/services/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php index bd7cb0ee0..1b6cd8e1c 100644 --- a/crmeb/app/services/product/product/StoreProductServices.php +++ b/crmeb/app/services/product/product/StoreProductServices.php @@ -954,7 +954,7 @@ class StoreProductServices extends BaseServices $res = $this->dao->update($id, $data); $storeProductCateServices->update(['product_id' => $id], ['status' => 0]); if (!$res) throw new AdminException(100008); - return 100002; + return '移动回收站成功'; } } @@ -994,6 +994,7 @@ class StoreProductServices extends BaseServices foreach ($attrs as $items) { $item['attrs'][$key] = $items; $item['attrs'][$key]['suk'] = implode(',', $items['detail']); + $item['attrs'][$key]['product_price'] = $items['price']; $key += 1; } } diff --git a/template/admin/src/libs/request.js b/template/admin/src/libs/request.js index 8fad286ce..ec8f5ec7b 100644 --- a/template/admin/src/libs/request.js +++ b/template/admin/src/libs/request.js @@ -15,7 +15,7 @@ import Setting from '@/setting'; import router from '@/router'; const service = axios.create({ baseURL: Setting.apiBaseURL, - timeout: 10000, // 请求超时时间 + timeout: 100000, // 请求超时时间 }); axios.defaults.withCredentials = true; // 携带cookie diff --git a/template/admin/src/pages/marketing/lottery/create.vue b/template/admin/src/pages/marketing/lottery/create.vue index ec2c0e70b..d29067823 100644 --- a/template/admin/src/pages/marketing/lottery/create.vue +++ b/template/admin/src/pages/marketing/lottery/create.vue @@ -629,7 +629,7 @@ export default { attends_user: 1, //参与用户1:所有 2:部分 user_level: [], //参与用户等级 user_label: [], //参与用户标签 - is_svip: '-1', //参与用户是否付费会员 + is_svip: '', //参与用户是否付费会员 prize_num: 0, //奖品数量 period: [], //活动时间 prize: [], //奖品数组 diff --git a/template/admin/src/pages/marketing/storeSeckill/createMore.vue b/template/admin/src/pages/marketing/storeSeckill/createMore.vue index 99aaadea3..ff2fb90d0 100644 --- a/template/admin/src/pages/marketing/storeSeckill/createMore.vue +++ b/template/admin/src/pages/marketing/storeSeckill/createMore.vue @@ -659,7 +659,6 @@ export default { item.attrs.forEach((value) => { value.cate_name = item.cate_name; value.store_label = item.store_label; - value.product_price = item.price; value.status = 1; }); });