yuwandanmian 1 年間 前
コミット
a683c9484a

+ 1 - 1
src/api/user.js

@@ -33,7 +33,7 @@ export function getInfo(token) {
 
 export function logout() {
   return request({
-    url: '/vue-admin-template/user/logout',
+    url: '/logout',
     method: 'post',
   });
 }

+ 1 - 1
src/axios/index.js

@@ -91,7 +91,7 @@ service.interceptors.response.use(
         // 清除缓存的权限菜单
         sessionStorage.removeItem("route");
         //跳转登录页面
-        router.push({path:`/login?redirect=${router.currentRoute.fullPath}`})
+        router.push({path:`/login`})
         return
       }
       messageOnce.error({

+ 1 - 1
src/axios/index2.js

@@ -90,7 +90,7 @@ service2.interceptors.response.use(
         // 清除缓存的权限菜单
         sessionStorage.removeItem("route");
         //跳转登录页面
-        router.push({path:`/login?redirect=${router.currentRoute.fullPath}`})
+        router.push({path:`/login`})
         return
       }
       messageOnce.error({

+ 1 - 1
src/axios/index3.js

@@ -90,7 +90,7 @@ service3.interceptors.response.use(
         // 清除缓存的权限菜单
         sessionStorage.removeItem("route");
         //跳转登录页面
-        router.push({path:`/login?redirect=${router.currentRoute.fullPath}`})
+        router.push({path:`/login`})
         return
       }
       messageOnce.error({

+ 8 - 6
src/layout/components/Navbar.vue

@@ -43,12 +43,14 @@ export default {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar');
     },
-    logout() {
-      setToken('');
-      // 清除缓存的权限菜单
-      sessionStorage.removeItem("route")
-      sessionStorage.removeItem("preUrl")
-      this.$router.push(`/login`);
+    async logout() {
+      // setToken('');
+      // // 清除缓存的权限菜单
+      // sessionStorage.removeItem("route")
+      // sessionStorage.removeItem("preUrl")
+      // this.$router.push(`/login`);
+      await this.$store.dispatch('user/logout')
+      this.$router.push(`/login?id=123123`)
     },
   },
 };

+ 2 - 2
src/permission.js

@@ -39,7 +39,7 @@ router.beforeEach(async (to, from, next) => {
           // remove token and go to login page to re-login
           // await store.dispatch('user/resetToken');
           Message.error(error || 'Has Error');
-          next(`/login?redirect=${to.path}`);
+          next(`/login`);
           NProgress.done();
         }
       }
@@ -52,7 +52,7 @@ router.beforeEach(async (to, from, next) => {
       next();
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.path}`);
+      next(`/login`);
       NProgress.done();
     }
   }

+ 2 - 2
src/router/index.js

@@ -794,7 +794,7 @@ router.beforeEach(async (to, from, next) => {
               })
             })
         }).catch(err =>{//失败则直接跳转登录页面
-          next(`/login?redirect=${to.path}`);
+          next(`/login`);
         })
       }else{//从缓存中读取用户权限列表,并添加菜单到侧边栏和路由元
         menu.parseRoute(JSON.parse(sessionStorage.getItem("route")),[]).then(res =>{
@@ -813,7 +813,7 @@ router.beforeEach(async (to, from, next) => {
       next();
     } else {
       // 其他没有访问权限的页面将被重定向到登录页面。
-      next(`/login?redirect=${to.path}`);
+      next(`/login`);
     }
   }
 

+ 2 - 6
src/store/modules/user.js

@@ -89,13 +89,9 @@ const actions = {
     return new Promise((resolve, reject) => {
       logout(state.token)
         .then(() => {
-          // 清除缓存的权限菜单
           sessionStorage.removeItem("route")
-
-          removeToken(); // must remove  token  first
-          resetRouter();
-          commit('RESET_STATE');
-          resolve();
+          removeToken()
+          resolve()
         })
         .catch(error => {
           reject(error);