Merge branch 'develop' into 'test'

修改跳转进入路由后的逻辑 See merge request !129

Merge branch 'develop' into 'test'
e31b6c1e · 姜雷 · 8167011d · 7f0c400a · e31b6c1e
Commit e31b6c1e authored May 30, 2019 by 姜雷
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

permission.js src/lib/permission.js +4 -2

No files found.
--- a/src/lib/permission.js
+++ b/src/lib/permission.js
@@ -63,8 +63,10 @@ const configRoutePermission = (
      if (whiteList.indexOf(to.path) !== -1) {
        next();
      } else {
-        next('/login');
+        store.dispatch('FedLogOut').then(() => {
-        NProgress.done();
+          next({ path: '/login' });
+          NProgress.done();
+        });
      }
    }
  });