From 7d9e6f3a23bfcd23866e66f99db06c85c5d2de15 Mon Sep 17 00:00:00 2001
From: Xwen <929716663@qq.com>
Date: Thu, 14 Dec 2023 23:47:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4=E5=80=BC=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Bbs.Vue3/src/assets/{ => common/icons}/logo.ico | Bin
 Yi.Bbs.Vue3/src/components/AvatarInfo.vue          |   8 +++-----
 Yi.Bbs.Vue3/src/stores/user.js                     |   3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename Yi.Bbs.Vue3/src/assets/{ => common/icons}/logo.ico (100%)

diff --git a/Yi.Bbs.Vue3/src/assets/logo.ico b/Yi.Bbs.Vue3/src/assets/common/icons/logo.ico
similarity index 100%
rename from Yi.Bbs.Vue3/src/assets/logo.ico
rename to Yi.Bbs.Vue3/src/assets/common/icons/logo.ico
diff --git a/Yi.Bbs.Vue3/src/components/AvatarInfo.vue b/Yi.Bbs.Vue3/src/components/AvatarInfo.vue
index f340a801..9306df7e 100644
--- a/Yi.Bbs.Vue3/src/components/AvatarInfo.vue
+++ b/Yi.Bbs.Vue3/src/components/AvatarInfo.vue
@@ -50,14 +50,14 @@ const userInfo = reactive({
   role: [],
   id: "",
 });
-const iconUrl = ref("/src/assets/logo.ico");
+const iconUrl = ref("../../src/assets/common/icons/logo.ico");
 const iconUrlHandler = () => {
   if (
     userInfo.icon == null ||
     userInfo.icon == undefined ||
     userInfo.icon == ""
   ) {
-    return "/src/assets/logo.ico";
+    return "../../src/assets/common/icons/logo.ico";
   }
   return `${import.meta.env.VITE_APP_BASEAPI}/file/${userInfo.icon}`;
 };
@@ -88,7 +88,6 @@ const Init = () => {
     userInfo.role = props.userInfo.role;
     userInfo.id = props.userInfo.id;
     iconUrl.value = iconUrlHandler(userInfo.icon);
-    console.log("使用传入值:", iconUrl.value);
   }
 
   //使用当前登录用户
@@ -97,8 +96,7 @@ const Init = () => {
     userInfo.nick = userStore.name;
     userInfo.role = userStore.role;
     userInfo.id = userStore.id;
-    iconUrl.value = userInfo.icon;
-    console.log("当前登陆:", iconUrl.value);
+    iconUrl.value = iconUrlHandler(userInfo.icon);
   }
 };
 </script>
diff --git a/Yi.Bbs.Vue3/src/stores/user.js b/Yi.Bbs.Vue3/src/stores/user.js
index d23a5929..1a8ff224 100644
--- a/Yi.Bbs.Vue3/src/stores/user.js
+++ b/Yi.Bbs.Vue3/src/stores/user.js
@@ -45,9 +45,8 @@ const useUserStore = defineStore("user", {
             const user = res.user;
             const avatar =
               user.icon == "" || user.icon == null
-                ? "/src/assets/logo.ico"
+                ? "../../src/assets/common/icons/logo.ico"
                 : import.meta.env.VITE_APP_BASEAPI + "/file/" + user.icon;
-            console.log(avatar, "store的avatar");
             if (res.roleCodes && res.roleCodes.length > 0) {
               // 验证返回的roles是否是一个非空数组
               this.roles = res.roleCodes;