diff --git a/backend/modules/product/normal/controller/admin/OrderController.php b/backend/modules/product/normal/controller/admin/OrderController.php index 391f41646..b83364154 100644 --- a/backend/modules/product/normal/controller/admin/OrderController.php +++ b/backend/modules/product/normal/controller/admin/OrderController.php @@ -363,7 +363,7 @@ class OrderController extends AuthController return app('json')->fail('参数错误'); } $order = $centerServices->getOne(['order_no' => $orderNo], - 'order_no, total_price, pay_price, pay_postage, coupon_price, deduction_price, use_integral_num, extra_info'); + 'order_no, status_code, delivery_time, is_del, total_price, pay_price, pay_postage, coupon_price, deduction_price, use_integral_num, extra_info'); if (!$order) { return app('json')->fail('订单不存在'); } @@ -376,7 +376,8 @@ class OrderController extends AuthController $data['give_integral'] = $extraInfo['give_integral'] ?? 0; $data['use_integral'] = $data['use_integral_num'] ?? $extraInfo['use_integral_num'] ?? 0; $data['backed_integral'] = $extraInfo['backed_integral'] ?? 0; - unset($data['extra_info']); + // 仅保留配送方式,供前端与列表同口径计算业务状态(待发货/待收货/待到店) + $data['extra_info'] = ['delivery_type' => (string)($extraInfo['delivery_type'] ?? '')]; return app('json')->success($data); } diff --git a/frontend/admin/src/pages/plugin/normal/order/Edit.vue b/frontend/admin/src/pages/plugin/normal/order/Edit.vue index 96aa89674..df484ad16 100644 --- a/frontend/admin/src/pages/plugin/normal/order/Edit.vue +++ b/frontend/admin/src/pages/plugin/normal/order/Edit.vue @@ -10,7 +10,7 @@ 订单状态: - {{ getStatusLabel(orderInfo.status_code) }} + {{ businessStatus.text }} @@ -104,9 +104,9 @@