From 79521c4807f42fe58b76359e818652d86b00d21d Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 7 Aug 2025 12:26:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=A4=B4=E5=83=8F=E5=90=8E=E6=B2=A1=E6=9C=89=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9C=80=E6=96=B0=E7=9A=84=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除在 permission.ts 中的冗余用户信息检查

- 刷新页面确保获取最新的用户信息

- 更新 profile 页面中用户头像的显示逻辑

- 在头像上传成功后同步更新用户信息

#ICRONO
---
 src/plugins/permission.ts   | 8 +++-----
 src/views/profile/index.vue | 9 ++++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 2890b6df..0493511a 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -35,13 +35,11 @@ export function setupPermission() {
       const permissionStore = usePermissionStore();
       const userStore = useUserStore();
 
-      // 确保用户信息已加载
-      if (!userStore.userInfo.username) {
-        await userStore.getUserInfo();
-      }
-
       // 确保动态路由已生成
       if (!permissionStore.isDynamicRoutesGenerated) {
+        /** 先获取最新的用户信息 */
+        await userStore.getUserInfo();
+
         const dynamicRoutes = await permissionStore.generateRoutes();
         dynamicRoutes.forEach((route: RouteRecordRaw) => {
           router.addRoute(route);
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index 947bb2fe..835db2f8 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -6,7 +6,7 @@
         <el-card class="user-card">
           <div class="user-info">
             <div class="avatar-wrapper">
-              <el-avatar :src="userProfile.avatar" :size="100" />
+              <el-avatar :src="userStore.userInfo.avatar" :size="100" />
               <el-button
                 type="info"
                 class="avatar-edit-btn"
@@ -227,9 +227,12 @@ import UserAPI, {
 } from "@/api/system/user.api";
 
 import FileAPI from "@/api/file.api";
+import { useUserStoreHook } from "@/store";
 
 import { Camera } from "@element-plus/icons-vue";
 
+const userStore = useUserStoreHook();
+
 const userProfile = ref<UserProfileVO>({});
 
 const enum DialogType {
@@ -443,12 +446,12 @@ const handleFileChange = async (event: Event) => {
     // 调用文件上传API
     try {
       const data = await FileAPI.uploadFile(file);
-      // 更新用户头像
-      userProfile.value.avatar = data.url;
       // 更新用户信息
       await UserAPI.updateProfile({
         avatar: data.url,
       });
+      // 更新用户头像
+      userStore.userInfo.avatar = data.url;
     } catch (error) {
       console.error("头像上传失败：" + error);
       ElMessage.error("头像上传失败");