From a7b8f2ee901edd65382f1ca7daa9528d5eeef398 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sat, 24 Jun 2023 10:13:44 +0800
Subject: [PATCH] !722 update ruoyi-admin/src/main/resources/banner.txt. Merge pull request !722 from 万河/N/A
---
ruoyi-ui/src/store/modules/user.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 91f8253..75c0c57 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -49,9 +49,9 @@
// 获取用户信息
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
- getInfo(state.token).then(res => {
+ getInfo().then(res => {
const user = res.user
- const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.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) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
@@ -66,7 +66,7 @@
})
})
},
-
+
// 退出系统
LogOut({ commit, state }) {
return new Promise((resolve, reject) => {
--
Gitblit v1.9.2