From fbec0a50ff9a4e4afb5ac7cbb965020acb9db2c7 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期五, 10 五月 2024 15:35:10 +0800
Subject: [PATCH] 备忘录添加了fid
---
ruoyi-ui/src/store/modules/user.js | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index ab0a6fe..f6bd9ab 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -31,16 +31,23 @@
actions: {
// 鐧诲綍
Login({ commit }, userInfo) {
+
const username = userInfo.username.trim()
const password = userInfo.password
const code = userInfo.code
+
+
const uuid = userInfo.uuid
+
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
- setToken(res.token)
- commit('SET_TOKEN', res.token)
+
+ setToken(res.data.token)
+
+ commit('SET_TOKEN', res.data.token)
resolve()
}).catch(error => {
+ alert(error)
reject(error)
})
})
@@ -51,7 +58,8 @@
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.user
- const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+ // (user.avatar == "" || user.avatar == null) ?: process.env.VUE_APP_BASE_API + user.avatar
+ const avatar =require("@/assets/images/zhang.png") ;
if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
--
Gitblit v1.9.1