guoxiaohuan 4 years ago
parent
commit
37cffa5d2c
1 changed files with 9 additions and 6 deletions
  1. 9 6
      src/router/index.js

+ 9 - 6
src/router/index.js

@@ -83,18 +83,21 @@ const router = new VueRouter({
     routes,
 })
 const ignore = ['/404']
+
 router.beforeEach(async (to, from, next) => {
     // 取出刷新时的 ssoToken, 路由拦截时app.vue 生命周期还没有执行,store中还没有数据,
     let beforeunload = localStorage.getItem('beforeunload'),
         __token = null
     beforeunload && (__token = JSON.parse(beforeunload).ssoToken)
     if (!ignore.includes(to.path)) {
-        // let token = __token || store.getters['ssoToken']
-        let token = store.getters['ssoToken']
-        if (query().token) {
-            store.commit('SETSSOTOKEN', query().token)
-            sessionStorage.setItem('SSOTOKEN', query().token)
-        } else if (token) {
+        //都是需要token检验的页面 首先优先获取路由上带的token
+        let token = to.query.token ? to.query.token : store.getters['ssoToken'] ? store.getters['ssoToken'] : __token
+        // 开发环境模式token有模式值
+        if (process.env.NODE_ENV == 'aly' || process.env.NODE_ENV == 'serve') {
+            token = 'admin:chuyushu'
+        }
+        // console.log('token====', token)
+        if (token) {
             store.commit('SETSSOTOKEN', token)
             if (to.path == '/') {
                 next('/group')