From 6e173210a874ff7601aa68eab56e912f5619c79c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 21 五月 2026 15:32:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_英泽防锈' into dev_宁夏_英泽防锈
---
src/store/modules/user.js | 92 +++++++++++++++++++++++++++-------------------
1 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ea358d1..ac97976 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -7,14 +7,14 @@
const useUserStore = defineStore(
'user',
{
- state: () => ({
- token: getToken(),
- id: '',
- name: '',
- avatar: '',
- roles: [],
- permissions: [],
- aiEnabled: 0
+ state: () => ({
+ token: getToken(),
+ id: '',
+ name: '',
+ avatar: '',
+ roles: [],
+ permissions: [],
+ aiEnabled: 0
}),
actions: {
// 鐧诲綍
@@ -25,8 +25,13 @@
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
- setToken(res.token)
- this.token = res.token
+ const token = res?.token || res?.data?.token
+ if (!token) {
+ reject(new Error('鏈幏鍙栧埌鐧诲綍浠ょ墝'))
+ return
+ }
+ setToken(token)
+ this.token = token
resolve()
}).catch(error => {
reject(error)
@@ -47,7 +52,8 @@
getInfo() {
return new Promise((resolve, reject) => {
getInfo().then(res => {
- const user = res.user
+ res = res.data
+ const user = res.user || {}
let avatar = user.avatar || ""
avatar = import.meta.env.VITE_APP_BASE_API + '/profile/' + avatar
if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
@@ -56,34 +62,34 @@
} else {
this.roles = ['ROLE_DEFAULT']
}
- this.id = user.userId
- this.name = user.userName
+ this.id = user.userId || ''
+ this.name = user.userName || ''
this.avatar = avatar
- this.currentFactoryName = user.currentFactoryName
- this.nickName = user.nickName
- this.roleName = user.roles[0].roleName
- this.currentDeptId = user.tenantId
- this.currentLoginTime = this.getCurrentTime()
- this.aiEnabled = Number(res.aiEnabled) === 1 ? 1 : 0
- resolve(res)
- }).catch(error => {
- reject(error)
- })
- })
+ this.currentFactoryName = user.currentFactoryName || ''
+ this.nickName = user.nickName || ''
+ this.roleName = Array.isArray(user.roles) && user.roles.length > 0 ? (user.roles[0].roleName || '') : ''
+ this.currentDeptId = user.tenantId || ''
+ this.currentLoginTime = this.getCurrentTime()
+ this.aiEnabled = Number(res.aiEnabled) === 1 ? 1 : 0
+ resolve(res)
+ }).catch(error => {
+ reject(error)
+ })
+ })
},
// 閫�鍑虹郴缁�
logOut() {
return new Promise((resolve, reject) => {
logout(this.token).then(() => {
- this.token = ''
- this.roles = []
- this.permissions = []
- this.aiEnabled = 0
- removeToken()
- resolve()
- }).catch(error => {
- reject(error)
- })
+ this.token = ''
+ this.roles = []
+ this.permissions = []
+ this.aiEnabled = 0
+ removeToken()
+ resolve()
+ }).catch(error => {
+ reject(error)
+ })
})
},
// 鐧诲綍鏍￠獙
@@ -104,8 +110,13 @@
const password = userInfo.password
return new Promise((resolve, reject) => {
loginCheckFactory(username, password).then(res => {
- setToken(res.token)
- this.token = res.token
+ const token = res?.token || res?.data?.token
+ if (!token) {
+ reject(new Error('鏈幏鍙栧埌鐧诲綍浠ょ墝'))
+ return
+ }
+ setToken(token)
+ this.token = token
resolve()
}).catch(error => {
reject(error)
@@ -116,10 +127,15 @@
return new Promise((resolve, reject) => {
tideLogin(code)
.then((res) => {
- setToken(res.token);
- this.token = res.token
+ const token = res?.token || res?.data?.token
+ if (!token) {
+ reject(new Error('鏈幏鍙栧埌鐧诲綍浠ょ墝'))
+ return
+ }
+ setToken(token);
+ this.token = token
Vue.prototype.uploadHeader = {
- Authorization: "Bearer " + res.token,
+ Authorization: "Bearer " + token,
};
resolve();
})
--
Gitblit v1.9.3