From 9bca5ca91f2ec5107c6e10c8d18588636213bd58 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 16 一月 2026 16:56:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/store/modules/user.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1c0d1d2..4f3eab4 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,12 +109,12 @@
})
})
},
- TideLogin({ commit }, code) {
+ TideLogin(code) {
return new Promise((resolve, reject) => {
tideLogin(code)
.then((res) => {
setToken(res.token);
- commit("SET_TOKEN", res.token);
+ this.token = res.token
Vue.prototype.uploadHeader = {
Authorization: "Bearer " + res.token,
};
--
Gitblit v1.9.3