From 648003a577ef7a03046269c77fc5cc64199945e7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 20 一月 2026 17:06:47 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan
---
src/store/modules/user.js | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1c0d1d2..f17234c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -2,6 +2,7 @@
import { getToken, setToken, removeToken } from '@/utils/auth'
import { isHttp, isEmpty } from "@/utils/validate"
import defAva from '@/assets/images/profile.jpg'
+import { defineStore } from 'pinia'
const useUserStore = defineStore(
'user',
@@ -98,9 +99,8 @@
loginCheckFactory(userInfo) {
const username = userInfo.username.trim()
const password = userInfo.password
- const factoryId = userInfo.currentFatoryId
return new Promise((resolve, reject) => {
- loginCheckFactory(username, password, factoryId).then(res => {
+ loginCheckFactory(username, password).then(res => {
setToken(res.token)
this.token = res.token
resolve()
@@ -109,15 +109,12 @@
})
})
},
- TideLogin({ commit }, code) {
+ TideLogin(code) {
return new Promise((resolve, reject) => {
tideLogin(code)
.then((res) => {
setToken(res.token);
- commit("SET_TOKEN", res.token);
- Vue.prototype.uploadHeader = {
- Authorization: "Bearer " + res.token,
- };
+ this.token = res.token
resolve();
})
.catch((error) => {
--
Gitblit v1.9.3