xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复头像没有默认值的bug

Browse Source
This commit is contained in:
Xwen
2023-12-14 23:47:39 +08:00
parent 212606f638
commit 7d9e6f3a23
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Yi.Bbs.Vue3/src/assets/logo.ico → Yi.Bbs.Vue3/src/assets/common/icons/logo.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

8
Yi.Bbs.Vue3/src/components/AvatarInfo.vue
View File

@@ -50,14 +50,14 @@ const userInfo = reactive({
role: [], role: [],
id: "", id: "",
}); });
const iconUrl = ref("/src/assets/logo.ico"); const iconUrl = ref("../../src/assets/common/icons/logo.ico");
const iconUrlHandler = () => { const iconUrlHandler = () => {
if ( if (
userInfo.icon == null || userInfo.icon == null ||
userInfo.icon == undefined || userInfo.icon == undefined ||
userInfo.icon == "" userInfo.icon == ""
) { ) {
return "/src/assets/logo.ico"; return "../../src/assets/common/icons/logo.ico";
} }
return `${import.meta.env.VITE_APP_BASEAPI}/file/${userInfo.icon}`; return `${import.meta.env.VITE_APP_BASEAPI}/file/${userInfo.icon}`;
}; };
@@ -88,7 +88,6 @@ const Init = () => {
userInfo.role = props.userInfo.role; userInfo.role = props.userInfo.role;
userInfo.id = props.userInfo.id; userInfo.id = props.userInfo.id;
iconUrl.value = iconUrlHandler(userInfo.icon); iconUrl.value = iconUrlHandler(userInfo.icon);
console.log("使用传入值:", iconUrl.value);
} }
//使用当前登录用户 //使用当前登录用户
@@ -97,8 +96,7 @@ const Init = () => {
userInfo.nick = userStore.name; userInfo.nick = userStore.name;
userInfo.role = userStore.role; userInfo.role = userStore.role;
userInfo.id = userStore.id; userInfo.id = userStore.id;
iconUrl.value = userInfo.icon; iconUrl.value = iconUrlHandler(userInfo.icon);
console.log("当前登陆:", iconUrl.value);
} }
}; };
</script> </script>

3
Yi.Bbs.Vue3/src/stores/user.js
View File

@@ -45,9 +45,8 @@ const useUserStore = defineStore("user", {
const user = res.user; const user = res.user;
const avatar = const avatar =
user.icon == "" || user.icon == null user.icon == "" || user.icon == null
? "/src/assets/logo.ico" ? "../../src/assets/common/icons/logo.ico"
: import.meta.env.VITE_APP_BASEAPI + "/file/" + user.icon; : import.meta.env.VITE_APP_BASEAPI + "/file/" + user.icon;
console.log(avatar, "store的avatar");
if (res.roleCodes && res.roleCodes.length > 0) { if (res.roleCodes && res.roleCodes.length > 0) {
// 验证返回的roles是否是一个非空数组 // 验证返回的roles是否是一个非空数组
this.roles = res.roleCodes; this.roles = res.roleCodes;