From 952a20f1c005d80e9bf881287c40e6f4e4266a0b Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:34:52 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/store/modules/user.js | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 8626ba0..8c7bda4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -11,6 +11,8 @@
name: "",
avatar: "",
nickName: "",
+ companyName: "",
+ loginUserInfo: {},
roles: [],
permissions: [],
},
@@ -30,6 +32,12 @@
},
SET_NICKNAME: (state, nickName) => {
state.nickName = nickName;
+ },
+ SET_COMPANYNAME: (state, companyName) => {
+ state.companyName = companyName;
+ },
+ SET_LOGINUSERINFO: (state, loginUserInfo) => {
+ state.loginUserInfo = loginUserInfo;
},
SET_ROLES: (state, roles) => {
state.roles = roles;
@@ -67,7 +75,6 @@
return new Promise((resolve, reject) => {
getInfo()
.then((res) => {
- console.log("store-->",res);
const user = res.user;
let avatar = user.avatar || "";
if (!isHttp(avatar)) {
@@ -82,10 +89,12 @@
} else {
commit("SET_ROLES", ["ROLE_DEFAULT"]);
}
+ commit("SET_LOGINUSERINFO", user);
commit("SET_ID", user.userId);
commit("SET_NAME", user.userName);
commit("SET_AVATAR", avatar);
commit("SET_NICKNAME", user.nickName);
+ commit("SET_COMPANYNAME", user.companyName);
resolve(res);
})
.catch((error) => {
--
Gitblit v1.9.3