From d738784730aad8567f435e52cca4a4fd19fa59d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 9 Feb 2026 21:47:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=9B=B4=E6=96=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加昵称和兼容name字段到用户模型
- 实现用户头像、昵称、手机号等完整信息展示
- 将原name列改为userInfo列并优化布局
- 移除独立的phone列以整合用户信息显示
- 添加用户ID显示和点击搜索功能
- 优化用户信息区域样式和交互体验
---
 src/api/shop/shopOrder/model/index.ts |  4 +++
 src/views/shop/shopOrder/index.vue    | 43 ++++++++++++++++++++-------
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/api/shop/shopOrder/model/index.ts b/src/api/shop/shopOrder/model/index.ts
index 3c5da42..a24e73d 100644
--- a/src/api/shop/shopOrder/model/index.ts
+++ b/src/api/shop/shopOrder/model/index.ts
@@ -37,6 +37,10 @@ export interface ShopOrder {
   icCard?: string;
   // 头像
   avatar?: string;
+  // 昵称(部分接口会返回)
+  nickname?: string;
+  // 兼容字段：部分接口可能返回 name
+  name?: string;
   // 真实姓名
   realName?: string;
   // 手机号码
diff --git a/src/views/shop/shopOrder/index.vue b/src/views/shop/shopOrder/index.vue
index 825ec21..478afa2 100644
--- a/src/views/shop/shopOrder/index.vue
+++ b/src/views/shop/shopOrder/index.vue
@@ -31,10 +31,33 @@
       >
         <template #toolbar> </template>
         <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'name'">
-            <div @click="onSearch(record)" class="cursor-pointer">{{
-              record.name || '匿名'
-            }}</div>
+          <template v-if="column.key === 'userInfo'">
+            <a-space :size="8">
+              <a-avatar
+                v-if="record.avatar"
+                :src="record.avatar"
+                shape="square"
+              />
+              <div class="leading-tight">
+                <div class="cursor-pointer" @click.stop="onSearch(record)">
+                  {{
+                    record.nickname ||
+                    record.realName ||
+                    record.name ||
+                    '匿名'
+                  }}
+                  <span v-if="record.userId" class="text-gray-400">
+                    (ID:{{ record.userId }})
+                  </span>
+                </div>
+                <div
+                  v-if="record.mobile || record.phone"
+                  class="text-gray-500 text-xs"
+                >
+                  {{ record.mobile || record.phone }}
+                </div>
+              </div>
+            </a-space>
           </template>
           <template v-if="column.key === 'orderGoods'">
             <template v-for="(item, index) in record.orderGoods" :key="index">
@@ -46,12 +69,6 @@
               </div>
             </template>
           </template>
-          <template v-if="column.key === 'phone'">
-            <div v-if="record.mobile" class="text-gray-400">{{
-              record.mobile
-            }}</div>
-            <div v-else class="text-gray-600">{{ record.phone }}</div>
-          </template>
           <template v-if="column.key === 'payType'">
             <template v-for="item in getPayType()">
               <template v-if="record.payStatus == 1">
@@ -326,6 +343,12 @@
       key: 'orderNo',
       align: 'center'
     },
+    {
+      title: '用户信息',
+      dataIndex: 'userId',
+      key: 'userInfo',
+      width: 220
+    },
     {
       title: '商品信息',
       dataIndex: 'orderGoods',