guhongwei 4 年之前
父节点
当前提交
faa95b8a40
共有 2 个文件被更改,包括 21 次插入21 次删除
  1. 20 20
      src/router/index.js
  2. 1 1
      src/views/user/parts/clickBtn.vue

+ 20 - 20
src/router/index.js

@@ -272,26 +272,26 @@ const router = new VueRouter({
   routes,
 });
 
-// router.beforeEach(async (to, form, next) => {
-//   if (to.name == 'user_index') {
-//     let res = await store.dispatch('login/toGetUser');
-//     if (res && res.uid) {
-//       next();
-//     } else {
-//       let key = sessionStorage.getItem('token');
-//       let user = jwt.decode(key);
-//       if (user && user.uid) {
-//         store.commit('setUser', user, { root: true });
-//         next();
-//       } else {
-//         next({ name: 'login' });
-//       }
-//     }
-//   } else {
-//     let res = await store.dispatch('login/toGetUser');
-//     next();
-//   }
-// });
+router.beforeEach(async (to, form, next) => {
+  if (to.name == 'user_index') {
+    let res = await store.dispatch('login/toGetUser');
+    if (res && res.uid) {
+      next();
+    } else {
+      let key = sessionStorage.getItem('token');
+      let user = jwt.decode(key);
+      if (user && user.uid) {
+        store.commit('setUser', user, { root: true });
+        next();
+      } else {
+        next({ name: 'login' });
+      }
+    }
+  } else {
+    let res = await store.dispatch('login/toGetUser');
+    next();
+  }
+});
 const originalPush = VueRouter.prototype.push;
 VueRouter.prototype.push = function push(location, onResolve, onReject) {
   if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject);

+ 1 - 1
src/views/user/parts/clickBtn.vue

@@ -88,7 +88,7 @@ export default {
         message: '退出成功',
         type: 'success',
       });
-      this.$router.push({ path: '/live/index' });
+      this.$router.push({ path: '/login' });
     },
     //修改密码
     change() {