From 4c2836116a7ea09ec7f237b02fb0410832794240 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 21 五月 2026 11:06:35 +0800
Subject: [PATCH] 登录问题修改
---
src/store/modules/user.ts | 85 ++++++++++++++++++++++++------------------
1 files changed, 48 insertions(+), 37 deletions(-)
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 140e0a3..07b0f1c 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,9 +1,9 @@
-import {logout, getInfo, loginCheckFactory} from "@/api/login";
+import { logout, getInfo, loginCheckFactory } from "@/api/login";
import { getRouters as getRoutersApi } from "@/api/menu";
import { getToken, setToken, removeToken } from "@/utils/auth";
import defAva from "@/static/images/profile.jpg";
import { defineStore } from "pinia";
-import config from '@/config.js'
+import config from "@/config.js";
export interface LoginForm {
userName: string;
@@ -28,43 +28,54 @@
actions: {
// 閮ㄩ棬鐧诲綍
loginCheckFactory(userInfo: any) {
- const userName = userInfo.userName
- const password = userInfo.password
+ const userName = userInfo.userName.trim();
+ const password = userInfo.password;
+ const factoryId = userInfo.factoryId;
return new Promise((resolve, reject) => {
- loginCheckFactory(userName, password).then((res: any) => {
- setToken(res.token)
- this.token = res.token
- resolve(null)
- }).catch((error: any) => {
- reject(error)
- })
- })
+ loginCheckFactory(userName, password, factoryId)
+ .then((res: any) => {
+ const token = res.token || res.data?.token;
+ if (token) {
+ setToken(token);
+ this.token = token;
+ resolve(null);
+ } else {
+ reject("鏈幏鍙栧埌鐧诲綍浠ょ墝");
+ }
+ })
+ .catch((error: any) => {
+ reject(error);
+ });
+ });
},
// 鑾峰彇鐢ㄦ埛淇℃伅
getInfo() {
return new Promise((resolve, reject) => {
getInfo()
.then((res: any) => {
- const user = res.user
- let avatar = user.avatar || ""
- avatar = config.baseUrl + '/profile/' + avatar
- if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
- this.roles = res.roles
- this.permissions = res.permissions
+ // 鍏煎 res.data 缁撴瀯
+ const data = res.data || res;
+ const user = data.user || {};
+ let avatar = user.avatar || "";
+ avatar = config.baseUrl + "/profile/" + avatar;
+ if (data.roles && data.roles.length > 0) {
+ // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
+ this.roles = data.roles;
+ this.permissions = data.permissions;
} else {
- this.roles = ['ROLE_DEFAULT']
+ this.roles = ["ROLE_DEFAULT"];
}
- 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()
- resolve(res);
+ this.id = user.userId || "";
+ this.name = user.userName || "";
+ this.avatar = avatar;
+ 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();
+ resolve(data);
})
- .catch((error) => {
+ .catch(error => {
reject(error);
});
});
@@ -83,19 +94,19 @@
removeToken();
resolve(null);
})
- .catch((error) => {
+ .catch(error => {
reject(error);
});
});
},
getCurrentTime() {
const now = new Date();
- const year = now.getFullYear(); // 鑾峰彇骞翠唤
- const month = String(now.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝瑕�+1锛屽苟琛ラ浂
- const day = String(now.getDate()).padStart(2, '0'); // 鏃ユ湡琛ラ浂
- const hours = String(now.getHours()).padStart(2, '0'); // 灏忔椂琛ラ浂
- const minutes = String(now.getMinutes()).padStart(2, '0'); // 鍒嗛挓琛ラ浂
- const seconds = String(now.getSeconds()).padStart(2, '0'); // 绉掓暟琛ラ浂
+ const year = now.getFullYear(); // 鑾峰彇骞翠唤
+ const month = String(now.getMonth() + 1).padStart(2, "0"); // 鏈堜唤浠�0寮�濮嬶紝瑕�+1锛屽苟琛ラ浂
+ const day = String(now.getDate()).padStart(2, "0"); // 鏃ユ湡琛ラ浂
+ const hours = String(now.getHours()).padStart(2, "0"); // 灏忔椂琛ラ浂
+ const minutes = String(now.getMinutes()).padStart(2, "0"); // 鍒嗛挓琛ラ浂
+ const seconds = String(now.getSeconds()).padStart(2, "0"); // 绉掓暟琛ラ浂
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
// 鑾峰彇璺敱鏉冮檺
@@ -107,7 +118,7 @@
this.routers = res.data || [];
resolve(res);
})
- .catch((error) => {
+ .catch(error => {
reject(error);
});
});
--
Gitblit v1.9.3