From b38eb035c3782025257d9b582e5a0db45f7881b8 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 02 四月 2024 10:39:16 +0800
Subject: [PATCH] 菜单跳转

---
 Source/ProjectWeb/src/store/modules/user.js |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Source/ProjectWeb/src/store/modules/user.js b/Source/ProjectWeb/src/store/modules/user.js
index 1bcbe7b..1a65fee 100644
--- a/Source/ProjectWeb/src/store/modules/user.js
+++ b/Source/ProjectWeb/src/store/modules/user.js
@@ -50,18 +50,19 @@
       return new Promise((resolve, reject) => {
         loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key, ).then(res => {
           const data = res.data;
-          if (data.error_description) {
-            Message({
-              message: data.error_description,
-              type: 'error'
-            })
-          } else {
-            commit('SET_TOKEN', data.access_token);
-            commit('SET_REFRESH_TOKEN', data.refresh_token);
+          if(data.success){
+            debugger;
+            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);
+            commit('SET_USER_INFO', data.obj.sessionInfo);
             commit('DEL_ALL_TAG');
             commit('CLEAR_LOCK');
+          }else {
+            Message({
+              message: data.msg,
+              type: 'error'
+            })
           }
           resolve();
         }).catch(error => {
@@ -210,7 +211,7 @@
           });
           commit('SET_MENU_ALL', menu)
           commit('SET_MENU', menu)
-          dispatch('GetButtons');
+          //dispatch('GetButtons');
           resolve(menu)
         })
       })
@@ -228,6 +229,7 @@
   },
   mutations: {
     SET_TOKEN: (state, token) => {
+      debugger;
       setToken(token);
       state.token = token;
       setStore({name: 'token', content: state.token})

--
Gitblit v1.9.3