From 9481d004b0b0da980df41efae98cb83d0c12c510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sat, 19 Oct 2024 16:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E6=88=B7Id=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=E5=8F=8A=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/header-tools.vue | 14 ++++++++------
 src/views/user/profile/index.vue       |  5 ++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/layout/components/header-tools.vue b/src/layout/components/header-tools.vue
index 51af8e2..b3f0913 100644
--- a/src/layout/components/header-tools.vue
+++ b/src/layout/components/header-tools.vue
@@ -68,11 +68,8 @@
               <div class="user-profile">
                 <div class="user-info">
                   <div class="nickname">
-                    <span class="ele-text-heading">
-                      {{ loginUser.realName || loginUser.nickname }}
-                    </span>
                     <div class="ele-text-placeholder">
-                      用户ID：<span class="ele-text-secondary">{{
+                      UID：<span class="ele-text-secondary">{{
                         loginUser.userId
                       }}</span>
                       <copy-outlined
@@ -80,6 +77,12 @@
                         @click="copyText(loginUser.userId)"
                       />
                     </div>
+                    <span class="ele-text-placeholder">
+                      昵称：
+                      <span class="ele-text-secondary">{{
+                        loginUser.nickname
+                      }}</span>
+                    </span>
                     <div class="role" style="margin-top: 10px">
                       <template
                         v-for="(item, index) in loginUser.roles"
@@ -166,7 +169,7 @@
     SearchOutlined
   } from '@ant-design/icons-vue';
   import { storeToRefs } from 'pinia';
-  import { copyText, getMerchantId, openNew, openUrl } from "@/utils/common";
+  import { copyText, getMerchantId, openNew, openUrl } from '@/utils/common';
   import { useThemeStore } from '@/store/modules/theme';
   import HeaderNotice from './header-notice.vue';
   import PasswordModal from './password-modal.vue';
@@ -333,7 +336,6 @@
     // 更新商户ID和名称
     if (!getMerchantId() && loginUser.value.merchantId == null) {
       listMerchantAccount({ phone: loginUser.value.phone }).then((res) => {
-        console.log(res);
         if (res.length > 0) {
           const item = res[0];
           authUser({
diff --git a/src/views/user/profile/index.vue b/src/views/user/profile/index.vue
index 4df02aa..73e2314 100644
--- a/src/views/user/profile/index.vue
+++ b/src/views/user/profile/index.vue
@@ -110,7 +110,10 @@
                 "
                 style="max-width: 580px; margin-top: 20px"
               >
-                <a-form-item label="登录账号" v-bind="validateInfos.username">
+                <a-form-item label="用户ID" v-bind="validateInfos.userId">
+                  <a-input disabled v-model:value="form.userId" allow-clear />
+                </a-form-item>
+                <a-form-item label="用户名" v-bind="validateInfos.username">
                   <a-input
                     disabled
                     v-model:value="form.username"