From b609f77709c4646daf155341475ae14fc0c7943d Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期五, 27 六月 2025 13:25:30 +0800
Subject: [PATCH] 修改
---
src/store/modules/user.js | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d439c44..9900234 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,8 @@
import { login, logout, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
import defAva from '@/assets/images/profile.jpg'
-
+import Cookies from "js-cookie";
+import {getUserById} from "@/api/sysUsers";
const useUserStore = defineStore(
'user',
{
@@ -20,8 +21,9 @@
const password = userInfo.password
const code = userInfo.code
const uuid = userInfo.uuid
- return new Promise((resolve, reject) => {
- login(username, password, code, uuid).then(res => {
+ const identity = userInfo.identity
+ return new Promise( (resolve, reject) => {
+ login(username, password, code, uuid, identity).then( async res => {
setToken(res.token)
this.token = res.token
resolve()
@@ -36,7 +38,6 @@
getInfo().then(res => {
const user = res.user
const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
-
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
this.roles = res.roles
this.permissions = res.permissions
@@ -46,6 +47,7 @@
this.id = user.userId
this.name = user.userName
this.avatar = avatar
+ Cookies.set('userInfo',JSON.stringify(user))
resolve(res)
}).catch(error => {
reject(error)
--
Gitblit v1.9.2