From 7446bf25a4b57845ee74fbcc292e7a70fa7605be Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 22 Oct 2026 10:31:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=AE=9E=E7=89=A9=E5=95=86=E5=93=81):=20?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BC=96=E8=BE=91=E5=BC=B9=E7=AA=97=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA=E6=94=B9=E4=B8=BA=E4=B8=8E=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=90=8C=E5=8F=A3=E5=BE=84=E8=AE=A1=E7=AE=97=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/OrderController.php      |  5 +++--
 .../src/pages/plugin/normal/order/Edit.vue    | 21 ++++++-------------
 2 files changed, 9 insertions(+), 17 deletions(-)

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 @@
           </el-col>
           <el-col :span="12">
             <span class="label">订单状态：</span>
-            <span class="value">{{ getStatusLabel(orderInfo.status_code) }}</span>
+            <span class="value">{{ businessStatus.text }}</span>
           </el-col>
         </el-row>
         <el-row :gutter="24" style="margin-top: 8px">
@@ -104,9 +104,9 @@
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, reactive, computed } from 'vue';
 import { ElMessage } from 'element-plus';
-import { saveEditOrder, getEditOrderForm, saveOrderIntegral } from '../normalOrder';
+import { saveEditOrder, getEditOrderForm, saveOrderIntegral, getOrderBusinessStatus } from '../normalOrder';
 
 defineOptions({ name: 'orderEdit' });
 
@@ -133,6 +133,9 @@ const integralData = reactive({
   back_integral: 0,
 });
 
+/** 订单状态与列表/详情同口径（待支付/待发货/待收货/待到店/待评价等） */
+const businessStatus = computed(() => getOrderBusinessStatus(orderInfo.value || {}));
+
 /** 打开弹窗 */
 function open(no) {
   orderNo.value = no || '';
@@ -220,18 +223,6 @@ function handleClose() {
   visible.value = false;
 }
 
-function getStatusLabel(code) {
-  const map = {
-    pending_payment: '待支付',
-    processing: '进行中',
-    completed: '已完成',
-    canceled: '已取消',
-    refunding: '退款中',
-    refunded: '已退款',
-  };
-  return map[code] || code || '--';
-}
-
 defineExpose({ open });
 </script>