From ca0c92a05c8be10ada67ed30aa71e9a3037b3db1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 21 十一月 2024 21:52:49 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/project_management-vue
---
src/store/modules/user.js | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 63e6ba2..cdbab1e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,5 @@
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 user = {
state: {
@@ -57,10 +55,7 @@
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.user
- let avatar = user.avatar || ""
- if (!isHttp(avatar)) {
- avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar
- }
+ const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
--
Gitblit v1.8.0