From 50478b84da86ef020c2fcb6de2855644a95fee10 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 五月 2025 14:34:29 +0800
Subject: [PATCH] 1.首页开发联调
---
src/store/modules/user.js | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 20350e4..24e6871 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,6 @@
import { login, logout, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
+import { isHttp, isEmpty } from "@/utils/validate"
import defAva from '@/assets/images/profile.jpg'
const useUserStore = defineStore(
@@ -7,6 +8,7 @@
{
state: () => ({
token: getToken(),
+ id: '',
name: '',
avatar: '',
roles: [],
@@ -34,16 +36,19 @@
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.user
- const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
-
+ let avatar = user.avatar || ""
+ if (!isHttp(avatar)) {
+ avatar = (isEmpty(avatar)) ? defAva : import.meta.env.VITE_APP_BASE_API + avatar
+ }
if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
this.roles = res.roles
this.permissions = res.permissions
} else {
- this.setRoutes = ['ROLE_DEFAULT']
+ this.roles = ['ROLE_DEFAULT']
}
+ this.id = user.userId
this.name = user.userName
- this.avatar = avatar;
+ this.avatar = avatar
resolve(res)
}).catch(error => {
reject(error)
--
Gitblit v1.9.3