|
@@ -91,24 +91,25 @@ const router = new VueRouter({
|
|
|
});
|
|
|
|
|
|
router.beforeEach(async (to, form, next) => {
|
|
|
- if (to.name == 'account_user') {
|
|
|
- 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();
|
|
|
- }
|
|
|
+ next();
|
|
|
+ // if (to.name == 'account_user') {
|
|
|
+ // 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) {
|