From e6e3ff9166c219af461bad39edf0019db7c65315 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 29 十月 2025 15:05:36 +0800
Subject: [PATCH] 外购成品报检相关问题调整
---
src/store/modules/user.js | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 54d35ca..06acd91 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,8 @@
-import { login, logout, getInfo } from "@/api/login";
+import { login, logout, getInfo, LoginBySSO } from "@/api/login";
import { getToken, setToken, removeToken } from "@/utils/auth";
import { isHttp, isEmpty } from "@/utils/validate";
import defAva from "@/assets/images/profile.jpg";
+import Vue from "vue";
const user = {
state: {
@@ -10,6 +11,8 @@
name: "",
avatar: "",
nickName: "",
+ nameEn: "",
+ userName: "",
roles: [],
permissions: [],
},
@@ -29,6 +32,12 @@
},
SET_NICKNAME: (state, nickName) => {
state.nickName = nickName;
+ },
+ SET_NAMEEN: (state, nameEn) => {
+ state.nameEn = nameEn;
+ },
+ SET_USERNAME: (state, userName) => {
+ state.userName = userName;
},
SET_ROLES: (state, roles) => {
state.roles = roles;
@@ -50,6 +59,9 @@
.then((res) => {
setToken(res.token);
commit("SET_TOKEN", res.token);
+ Vue.prototype.uploadHeader = {
+ Authorization: "Bearer " + res.token,
+ };
resolve();
})
.catch((error) => {
@@ -57,7 +69,23 @@
});
});
},
-
+ // 鍗曠偣鐧诲綍
+ LoginBySSO({ commit }, accessToken) {
+ return new Promise((resolve, reject) => {
+ LoginBySSO(accessToken)
+ .then((res) => {
+ setToken(res.token);
+ commit("SET_TOKEN", res.token);
+ Vue.prototype.uploadHeader = {
+ Authorization: "Bearer " + res.token,
+ };
+ resolve();
+ })
+ .catch((error) => {
+ reject(error);
+ });
+ })
+ },
// 鑾峰彇鐢ㄦ埛淇℃伅
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
@@ -81,6 +109,8 @@
commit("SET_NAME", user.userName);
commit("SET_AVATAR", avatar);
commit("SET_NICKNAME", user.nickName);
+ commit("SET_NAMEEN", user.nameEn);
+ commit("SET_USERNAME", user.userName);
resolve(res);
})
.catch((error) => {
@@ -93,12 +123,16 @@
LogOut({ commit, state }) {
return new Promise((resolve, reject) => {
logout(state.token)
- .then(() => {
- commit("SET_TOKEN", "");
- commit("SET_ROLES", []);
- commit("SET_PERMISSIONS", []);
- removeToken();
- resolve();
+ .then((res) => {
+ if (res.data) {
+ window.location.href = res.data
+ } else {
+ commit("SET_TOKEN", "");
+ commit("SET_ROLES", []);
+ commit("SET_PERMISSIONS", []);
+ removeToken();
+ resolve();
+ }
})
.catch((error) => {
reject(error);
--
Gitblit v1.9.3