From a6a8e49af8c8172f4209dd94e65f53f17825cc44 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期四, 21 十一月 2024 17:30:12 +0800
Subject: [PATCH] 项目管理
---
src/store/modules/user.js | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 733c04a..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,10 +21,11 @@
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.data.token)
- this.token = res.data.token
+ 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()
}).catch(error => {
reject(error)
@@ -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