From 61a2db936dcbc3d5aebe8ff850bcaab76e3b3785 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 15 六月 2026 11:09:18 +0800
Subject: [PATCH] 合并恢复
---
src/store/modules/user.ts | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 0813795..7a8afc6 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -33,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;
--
Gitblit v1.9.3