From c7f312ba12ab35c1d1daef89df033d39af8e1c8d Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Mon, 20 Jan 2025 22:48:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20username=20=E4=B8=BA=20nic?=
 =?UTF-8?q?kname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/BasicLayout.vue |  2 +-
 src/views/merchant/List.vue | 10 +++++-----
 src/views/user/UserList.vue |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue
index acbd42b..699190a 100644
--- a/src/layouts/BasicLayout.vue
+++ b/src/layouts/BasicLayout.vue
@@ -75,7 +75,7 @@
         <div class="header-right">
           <a-dropdown>
             <a class="ant-dropdown-link" @click.prevent>
-              {{ userInfo.username }}
+              {{ userInfo.nickname }}
               <down-outlined />
             </a>
             <template #overlay>
diff --git a/src/views/merchant/List.vue b/src/views/merchant/List.vue
index 2a919b8..adb9daf 100644
--- a/src/views/merchant/List.vue
+++ b/src/views/merchant/List.vue
@@ -79,7 +79,7 @@
                 :key="user.userid" 
                 :value="user.userid"
               >
-                {{ user.phone }} ({{ user.username || '未设置昵称' }})
+                {{ user.phone }} ({{ user.nickname || '未设置昵称' }})
               </a-select-option>
             </a-select>
           </a-form-item>
@@ -228,7 +228,7 @@
                 :key="user.userid" 
                 :value="user.userid"
               >
-                {{ user.phone }} ({{ user.username || '未设置昵称' }})
+                {{ user.phone }} ({{ user.nickname || '未设置昵称' }})
               </a-select-option>
             </a-select>
           </a-form-item>
@@ -349,8 +349,8 @@ export default defineComponent({
         key: 'user_info',
         width: 200,
         customRender: ({ record }) => {
-          if (!record.user_username && !record.user_phone) return '-'
-          return `${record.user_username || '未设置昵称'} (${record.user_phone})`
+          if (!record.user_nickname && !record.user_phone) return '-'
+          return `${record.user_nickname || '未设置昵称'} (${record.user_phone})`
         }
       },
       {
@@ -863,7 +863,7 @@ export default defineComponent({
         userOptions.value = [{
           userid: record.user_id,
           phone: record.user_phone,
-          username: record.user_username
+          nickname: record.user_nickname
         }]
       }
       
diff --git a/src/views/user/UserList.vue b/src/views/user/UserList.vue
index 80b7430..9084c03 100644
--- a/src/views/user/UserList.vue
+++ b/src/views/user/UserList.vue
@@ -205,8 +205,8 @@ export default defineComponent({
       },
       {
         title: '用户名',
-        dataIndex: 'username',
-        key: 'username',
+        dataIndex: 'nickname',
+        key: 'nickname',
         width: 120,
       },
       {
@@ -437,7 +437,7 @@ export default defineComponent({
     const handleResetPassword = (record) => {
       Modal.confirm({
         title: '重置密码',
-        content: `确定要重置用户 ${record.username || record.phone} 的密码吗？`,
+        content: `确定要重置用户 ${record.nickname || record.phone} 的密码吗？`,
         async onOk() {
           try {
             const password = generatePassword()