From b1884a6f3b12e0f51e3fbe0f993ff9a3cddc93a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 29 Sep 2026 10:45:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=BB=84=E4=BB=B6=E4=BB=A5=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0=E5=92=8C=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D=EF=BC=8C=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/order/OrderCenterServices.php    | 16 +++++++++
 .../components/DetailOrderInfo.vue            |  6 ++--
 .../src/pages/order/orderCenter/detail.vue    | 18 ++++++++--
 .../src/pages/order/orderCenter/index.vue     | 34 +++++++++----------
 .../src/pages/plugin/normal/order/Detail.vue  |  6 ++--
 .../src/pages/plugin/normal/order/List.vue    |  2 +-
 .../normal/order/components/OrderTable.vue    |  4 +--
 .../src/pages/plugin/virtual/order/Detail.vue |  4 +--
 8 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/backend/app/services/order/OrderCenterServices.php b/backend/app/services/order/OrderCenterServices.php
index 9a9481628..252e47367 100644
--- a/backend/app/services/order/OrderCenterServices.php
+++ b/backend/app/services/order/OrderCenterServices.php
@@ -423,6 +423,10 @@ class OrderCenterServices extends BaseService implements OrderCenterSyncInterfac
         }
         $detail = $detail->toArray();
         $detail['extra_info'] = $this->parseExtraInfo($detail['extra_info']);
+        // 下单用户昵称/绑定电话（eb_user），供详情"用户信息"区展示
+        $detailUser = User::where('uid', (int)$detail['uid'])->field('nickname,phone')->find();
+        $detail['nickname'] = $detailUser['nickname'] ?? '';
+        $detail['user_phone'] = $detailUser['phone'] ?? '';
         // 解析 JSON 字段
         if (!empty($detail['custom_form'])) {
             $detail['custom_form'] = $this->parseExtraInfo($detail['custom_form']);
@@ -2410,6 +2414,18 @@ class OrderCenterServices extends BaseService implements OrderCenterSyncInterfac
             unset($item['extra_info']['business_status']);
         }
 
+        // 批量注入下单用户昵称/电话，供列表页"用户信息"列展示
+        $uids = array_values(array_unique(array_filter(array_column($list, 'uid'))));
+        if (!empty($uids)) {
+            $userMap = User::where('uid', 'in', $uids)->column('nickname,phone', 'uid');
+            foreach ($list as &$item) {
+                $user = $userMap[$item['uid']] ?? [];
+                $item['nickname'] = $user['nickname'] ?? '';
+                $item['user_phone'] = $user['phone'] ?? '';
+            }
+            unset($item);
+        }
+
         // 批量查询并合并售后状态到列表
         $orderNos = array_column($list, 'order_no');
         $afterSaleSummary = $this->getAfterSaleSummary($orderNos);
diff --git a/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue b/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue
index a2bbe4572..ecd82c4db 100644
--- a/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue
+++ b/frontend/admin/src/pages/order/orderCenter/components/DetailOrderInfo.vue
@@ -28,11 +28,11 @@
       <ul class="list">
         <li class="item">
           <div>用户名称：</div>
-          <div class="value">{{ data.real_name || data.contact?.name || '--' }}</div>
+          <div class="value">{{ data.nickname || '--' }}</div>
         </li>
         <li class="item">
           <div>绑定电话：</div>
-          <div class="value">{{ data.user_phone || data.contact?.phone || '--' }}</div>
+          <div class="value">{{ data.user_phone || '--' }}</div>
         </li>
       </ul>
     </div>
@@ -60,7 +60,7 @@
         </li>
         <li class="item">
           <div>收货电话：</div>
-          <div class="value">{{ data.contact?.phone || data.user_phone || '--' }}</div>
+          <div class="value">{{ data.contact?.phone || '--' }}</div>
         </li>
         <li class="item">
           <div>收货地址：</div>
diff --git a/frontend/admin/src/pages/order/orderCenter/detail.vue b/frontend/admin/src/pages/order/orderCenter/detail.vue
index 23b9a7a09..90a0f2a33 100644
--- a/frontend/admin/src/pages/order/orderCenter/detail.vue
+++ b/frontend/admin/src/pages/order/orderCenter/detail.vue
@@ -56,7 +56,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { ElMessage } from 'element-plus';
 import __asset_order_icon_0 from '@/assets/images/order_icon.png';
@@ -69,6 +69,9 @@ import DetailLogistics from './components/DetailLogistics';
 
 defineOptions({ name: 'orderCenterDetail' });
 
+// 传入 id 时作为抽屉内嵌组件使用；不传时为路由整页（取 route.params.id）
+const props = defineProps({ id: { type: [String, Number], default: '' } });
+
 const route = useRoute();
 
 const detailData = ref(null);
@@ -79,7 +82,7 @@ const logisticsVisible = ref(false);
 const logisticsData = ref([]);
 
 function loadDetail() {
-  const id = route.params.id;
+  const id = props.id || route.params.id;
   if (!id) return;
   detailLoading.value = true;
   orderCenterDetail(id)
@@ -135,6 +138,15 @@ function formatDate(date) {
 onMounted(() => {
   loadDetail();
 });
+
+watch(
+  () => props.id,
+  (val) => {
+    if (val) loadDetail();
+  }
+);
+
+defineExpose({ loadDetail });
 </script>
 
 <style lang="scss" scoped>
@@ -179,6 +191,8 @@ onMounted(() => {
 
   .list {
     display: flex;
+    flex-wrap: wrap;
+    row-gap: 12px;
     margin-top: 20px;
     overflow: hidden;
     list-style: none;
diff --git a/frontend/admin/src/pages/order/orderCenter/index.vue b/frontend/admin/src/pages/order/orderCenter/index.vue
index f5af0a870..f56831349 100644
--- a/frontend/admin/src/pages/order/orderCenter/index.vue
+++ b/frontend/admin/src/pages/order/orderCenter/index.vue
@@ -198,8 +198,8 @@
         </el-table-column>
         <el-table-column label="用户信息" min-width="150">
           <template #default="scope">
-            <div>{{ scope.row.contact_name || '--' }}</div>
-            <div>{{ scope.row.contact_phone || '--' }}</div>
+            <div>{{ scope.row.nickname || '--' }}</div>
+            <div>{{ scope.row.user_phone || '--' }}</div>
           </template>
         </el-table-column>
         <el-table-column label="订单金额" min-width="120">
@@ -267,12 +267,14 @@
         </div></template
       >
     </el-dialog>
+    <el-drawer v-model="detailDrawerVisible" title="订单详情" size="720px" @opened="onDetailDrawerOpened">
+      <OrderCenterDetail :id="detailOrderId" ref="orderDetailRef" />
+    </el-drawer>
   </div>
 </template>
 
 <script setup>
 import { onMounted, ref } from 'vue';
-import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import {
   orderCenterList,
@@ -282,13 +284,10 @@ import {
   orderCenterCategories,
   orderCenterFilterOptions,
 } from '@/api/orderCenter';
-import setting from '@/setting';
+import OrderCenterDetail from './detail.vue';
 
 defineOptions({ name: 'orderCenter' });
 
-const router = useRouter();
-const routePre = setting.routePre;
-
 const searchForm = ref({
   order_category: '',
   product_type: '',
@@ -308,6 +307,9 @@ const loading = ref(false);
 const statData = ref({});
 const remarkModal = ref(false);
 const remarkForm = ref({ id: 0, remark: '' });
+const detailDrawerVisible = ref(false);
+const detailOrderId = ref(0);
+const orderDetailRef = ref(null);
 const statusTab = ref('');
 const categoryOptions = ref([]);
 const productTypeOptions = ref([]);
@@ -408,16 +410,14 @@ function handleReset() {
 }
 
 function viewDetail(row) {
-  const routeMap = {
-    normal: routePre + '/product/normal/order/detail/',
-    virtual: routePre + '/product/virtual/order/detail/',
-    cardkey: routePre + '/product/cardkey/order/detail/',
-  };
-  const path = routeMap[row.product_type];
-  if (path) {
-    router.push({ path: path + row.order_no });
-  } else {
-    router.push({ path: routePre + '/order/center/detail/' + row.id });
+  detailOrderId.value = row.id;
+  detailDrawerVisible.value = true;
+}
+
+function onDetailDrawerOpened() {
+  // 抽屉打开后触发详情组件重新加载，保证同一订单重复打开时数据最新
+  if (orderDetailRef.value) {
+    orderDetailRef.value.loadDetail();
   }
 }
 
diff --git a/frontend/admin/src/pages/plugin/normal/order/Detail.vue b/frontend/admin/src/pages/plugin/normal/order/Detail.vue
index be6d3be8f..5301a320d 100644
--- a/frontend/admin/src/pages/plugin/normal/order/Detail.vue
+++ b/frontend/admin/src/pages/plugin/normal/order/Detail.vue
@@ -74,13 +74,13 @@
                 <el-col :span="8"
                   ><div class="detail-item">
                     <span class="label">用户名称：</span
-                    ><span class="value">{{ detailData.real_name || detailData.contact?.name || '--' }}</span>
+                    ><span class="value">{{ detailData.nickname || '--' }}</span>
                   </div></el-col
                 >
                 <el-col :span="8"
                   ><div class="detail-item">
                     <span class="label">联系电话：</span
-                    ><span class="value">{{ detailData.user_phone || detailData.contact?.phone || '--' }}</span>
+                    ><span class="value">{{ detailData.user_phone || '--' }}</span>
                   </div></el-col
                 >
               </el-row>
@@ -180,7 +180,7 @@
                 <el-col :span="8"
                   ><div class="detail-item">
                     <span class="label">收货电话：</span
-                    ><span class="value">{{ detailData.contact?.phone || detailData.user_phone || '--' }}</span>
+                    ><span class="value">{{ detailData.contact?.phone || '--' }}</span>
                   </div></el-col
                 >
                 <el-col :span="8"
diff --git a/frontend/admin/src/pages/plugin/normal/order/List.vue b/frontend/admin/src/pages/plugin/normal/order/List.vue
index 45f0a9c67..da09ebf5a 100644
--- a/frontend/admin/src/pages/plugin/normal/order/List.vue
+++ b/frontend/admin/src/pages/plugin/normal/order/List.vue
@@ -448,7 +448,7 @@ function onRemarkSuccess() {
 function openEditAddress(row) {
   addressOrderNo.value = row.order_no;
   addressName.value = row.contact_name || row.real_name || '';
-  addressPhone.value = row.contact_phone || row.user_phone || '';
+  addressPhone.value = row.contact_phone || '';
   addressDetail.value = row.user_address || '';
   addressVisible.value = true;
 }
diff --git a/frontend/admin/src/pages/plugin/normal/order/components/OrderTable.vue b/frontend/admin/src/pages/plugin/normal/order/components/OrderTable.vue
index 300b835f2..b6b1c7315 100644
--- a/frontend/admin/src/pages/plugin/normal/order/components/OrderTable.vue
+++ b/frontend/admin/src/pages/plugin/normal/order/components/OrderTable.vue
@@ -73,8 +73,8 @@
       </el-table-column>
       <el-table-column label="用户信息" min-width="150">
         <template #default="scope">
-          <div>{{ scope.row.contact_name || scope.row.real_name || '--' }}</div>
-          <div>{{ scope.row.contact_phone || scope.row.user_phone || '--' }}</div>
+          <div>{{ scope.row.nickname || '--' }}</div>
+          <div>{{ scope.row.user_phone || '--' }}</div>
         </template>
       </el-table-column>
       <el-table-column label="订单金额" min-width="130">
diff --git a/frontend/admin/src/pages/plugin/virtual/order/Detail.vue b/frontend/admin/src/pages/plugin/virtual/order/Detail.vue
index 9fa2c0a3a..c5d1d6a49 100644
--- a/frontend/admin/src/pages/plugin/virtual/order/Detail.vue
+++ b/frontend/admin/src/pages/plugin/virtual/order/Detail.vue
@@ -96,13 +96,13 @@
                 <el-col :span="8"
                   ><div class="detail-item">
                     <span class="label">用户名称：</span
-                    ><span class="value">{{ orderInfo.real_name || orderInfo.contact?.name || '--' }}</span>
+                    ><span class="value">{{ orderInfo.nickname || '--' }}</span>
                   </div></el-col
                 >
                 <el-col :span="8"
                   ><div class="detail-item">
                     <span class="label">联系电话：</span
-                    ><span class="value">{{ orderInfo.user_phone || orderInfo.contact?.phone || '--' }}</span>
+                    ><span class="value">{{ orderInfo.user_phone || '--' }}</span>
                   </div></el-col
                 >
               </el-row>