From c083e18e4e4550414257d00975cb6e99ed282e69 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 15 六月 2026 11:11:48 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_宁夏_万通
---
src/store/modules/user.ts | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 07b0f1c..7a8afc6 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -23,10 +23,9 @@
currentLoginTime: "",
roles: Array(),
permissions: [],
- routers: [], // 璺敱鏉冮檺鏁版嵁
+ routers: [],
}),
actions: {
- // 閮ㄩ棬鐧诲綍
loginCheckFactory(userInfo: any) {
const userName = userInfo.userName.trim();
const password = userInfo.password;
@@ -34,7 +33,7 @@
return new Promise((resolve, reject) => {
loginCheckFactory(userName, password, factoryId)
.then((res: any) => {
- const token = res.token || res.data?.token;
+ const token = res.token || (res.data && res.data.token);
if (token) {
setToken(token);
this.token = token;
@@ -48,7 +47,6 @@
});
});
},
- // 鑾峰彇鐢ㄦ埛淇℃伅
getInfo() {
return new Promise((resolve, reject) => {
getInfo()
@@ -80,7 +78,6 @@
});
});
},
- // 閫�鍑虹郴缁�
logOut() {
return new Promise<null>((resolve, reject) => {
logout()
@@ -109,7 +106,6 @@
const seconds = String(now.getSeconds()).padStart(2, "0"); // 绉掓暟琛ラ浂
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
- // 鑾峰彇璺敱鏉冮檺
getRouters() {
return new Promise((resolve, reject) => {
getRoutersApi()
--
Gitblit v1.9.3