From 61ced6bdf40951b41a1cd70d8f7440961d117cb1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 08 四月 2024 11:42:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/store/modules/user.js | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Source/ProjectWeb/src/store/modules/user.js b/Source/ProjectWeb/src/store/modules/user.js
index 3878f5f..a5bf964 100644
--- a/Source/ProjectWeb/src/store/modules/user.js
+++ b/Source/ProjectWeb/src/store/modules/user.js
@@ -2,7 +2,7 @@
import {Message} from 'element-ui'
import {setStore, getStore} from '@/util/store'
import {isURL, validatenull} from '@/util/validate'
-import {deepClone} from '@/util/util'
+import {deepClone,queryStringToObject} from '@/util/util'
import website from '@/config/website'
import {loginByUsername, loginBySocial, loginBySso, getUserInfo, logout, refreshToken, getButtons} from '@/api/user'
import {getTopMenu, getRoutes} from '@/api/system/menu'
@@ -36,13 +36,13 @@
items.forEach(item => {
item.pathValue = item.path;
item.path = '/' + item.code;
+ item.query = {}; // 鍒濆鍖� item.query
+ item.query = queryStringToObject(item.pathValue)
if (item.children && item.children.length > 0) {
updateCode(item.children);
}
});
}
-
-
const user = {
state: {
@@ -60,17 +60,16 @@
//鏍规嵁鐢ㄦ埛鍚嶇櫥褰�
LoginByUsername({commit}, userInfo) {
return new Promise((resolve, reject) => {
- loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key, ).then(res => {
+ loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key,).then(res => {
const data = res.data;
- if(data.success){
- debugger;
+ if (data.success) {
commit('SET_TOKEN', data.obj.sessionInfo.token);
commit('SET_REFRESH_TOKEN', data.obj.sessionInfo.token);
commit('SET_TENANT_ID', data.tenant_id);
commit('SET_USER_INFO', data.obj.sessionInfo);
commit('DEL_ALL_TAG');
commit('CLEAR_LOCK');
- }else {
+ } else {
Message({
message: data.msg,
type: 'error'
@@ -98,7 +97,7 @@
//鏍规嵁绗笁鏂逛俊鎭櫥褰�
LoginBySocial({commit}, userInfo) {
return new Promise((resolve) => {
- loginBySocial(userInfo.tenantId, userInfo.source, userInfo.state).then(res => {
+ loginBySocial(userInfo.tenantId, userInfo.source, userInfo.state).then(res => {
const data = res.data;
if (data.error_description) {
Message({
@@ -243,7 +242,6 @@
},
mutations: {
SET_TOKEN: (state, token) => {
- debugger;
setToken(token);
state.token = token;
setStore({name: 'token', content: state.token})
@@ -259,15 +257,15 @@
}
})
state.menuAll = menu
- setStore({ name: 'menuAll', content: state.menuAll })
+ setStore({name: 'menuAll', content: state.menuAll})
},
SET_MENU_ALL_NULL: (state) => {
state.menuAll = []
- setStore({ name: 'menuAll', content: state.menuAll })
+ setStore({name: 'menuAll', content: state.menuAll})
},
SET_MENU: (state, menu) => {
state.menu = menu
- setStore({ name: 'menu', content: state.menu })
+ setStore({name: 'menu', content: state.menu})
},
SET_REFRESH_TOKEN: (state, refreshToken) => {
setRefreshToken(refreshToken)
--
Gitblit v1.9.3