1

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);

src/views/login.vue

@@ -89,6 +89,7 @@ export default {
       let data = this.webform;
       const res = await this.toLogin({ user: data });
       if (res.uid) {
+        console.log(res);
         this.$router.push({ path: '/user/index' });
       }
     },

src/views/user/index.vue

@@ -49,34 +49,11 @@ export default {
     };
   },
   created() {},
-  methods: {
-    sesstoken() {
-      if (this.token) {
-        sessionStorage.setItem('token', this.token);
-        let user = jwt.decode(this.token);
-        if (user && user.uid) {
-          this.setUser(user);
-        }
-      } else {
-        this.$router.push({ path: '/login' });
-      }
-    },
-  },
+  methods: {},
   computed: {
     ...mapState(['user']),
-    token() {
-      return this.$route.query.token;
-    },
-  },
-  watch: {
-    token: {
-      immediate: true,
-      deep: true,
-      handler(val) {
-        this.sesstoken();
-      },
-    },
   },
+  watch: {},
   mounted() {
     this.title = this.$route.meta.title;
     this.isleftarrow = this.$route.meta.isleftarrow;