From 2f58128ac3b1c025a32f64016328992bf9bf5b48 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 16 六月 2026 09:18:03 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_天津_君歌化工
---
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