app更新对l2数据显示

apps/hand-factory/store/modules/user.js

@@ -7,13 +7,17 @@ import {
 } from "@/utils/validate"
 import {
 	login,
+	loginZinc1,
 	logout,
 	getInfo
 } from '@/api/login'
 import {
 	getToken,
 	setToken,
-	removeToken
+	removeToken,
+	getZinc1Token,
+	setZinc1Token,
+	removeZinc1Token
 } from '@/utils/auth'
 import defAva from '@/static/images/avatar.png'
 
@@ -56,25 +60,41 @@ const user = {
 	},
 
 	actions: {
-		// 登录
-		Login({
-			commit
-		}, userInfo) {
-			const username = userInfo.username.trim()
-			const password = userInfo.password
-			const code = userInfo.code
-			const uuid = userInfo.uuid
-			return new Promise((resolve, reject) => {
-				login(username, password, code, uuid).then(res => {
-					console.log('token', res)
-					setToken(res.data.token)
-					commit('SET_TOKEN', res.data.token)
-					resolve()
-				}).catch(error => {
-					reject(error)
+	// 登录（主系统登录成功即算登录成功，Zinc1系统静默登录）
+	Login({
+		commit
+	}, userInfo) {
+		const username = userInfo.username.trim()
+		const password = userInfo.password
+		const code = userInfo.code
+		const uuid = userInfo.uuid
+		return new Promise((resolve, reject) => {
+			// 先执行主系统登录
+			login(username, password, code, uuid).then(mainRes => {
+				// 主系统登录成功，立即保存token并resolve
+				if (mainRes && mainRes.data && mainRes.data.token) {
+					setToken(mainRes.data.token)
+					commit('SET_TOKEN', mainRes.data.token)
+				}
+				
+				// 主系统登录成功后，静默执行Zinc1登录（不等待结果，不显示任何错误）
+				loginZinc1(username, password, code, uuid).then(zinc1Res => {
+					// Zinc1登录成功，静默保存token
+					if (zinc1Res && zinc1Res.data && zinc1Res.data.token) {
+						setZinc1Token(zinc1Res.data.token)
+					}
+				}).catch(() => {
+					// Zinc1登录失败，完全静默处理，不做任何提示
 				})
+				
+				// 主系统登录成功即返回
+				resolve()
+			}).catch(error => {
+				// 只有主系统登录失败才reject
+				reject(error)
 			})
-		},
+		})
+	},
 
 		// 获取用户信息
 		GetInfo({
@@ -106,24 +126,25 @@ const user = {
 			})
 		},
 
-		// 退出系统
-		LogOut({
-			commit,
-			state
-		}) {
-			return new Promise((resolve, reject) => {
-				logout(state.token).then(() => {
-					commit('SET_TOKEN', '')
-					commit('SET_ROLES', [])
-					commit('SET_PERMISSIONS', [])
-					removeToken()
-					storage.clean()
-					resolve()
-				}).catch(error => {
-					reject(error)
-				})
+	// 退出系统
+	LogOut({
+		commit,
+		state
+	}) {
+		return new Promise((resolve, reject) => {
+			logout(state.token).then(() => {
+				commit('SET_TOKEN', '')
+				commit('SET_ROLES', [])
+				commit('SET_PERMISSIONS', [])
+				removeToken()
+				removeZinc1Token() // 同时清除Zinc1 token
+				storage.clean()
+				resolve()
+			}).catch(error => {
+				reject(error)
 			})
-		}
+		})
+	}
 	}
 }