guoxiaohuan 4 年之前
父节点
当前提交
bd386503e1
共有 2 个文件被更改,包括 42 次插入42 次删除
  1. 31 31
      src/router/index.js
  2. 11 11
      src/store/index.js

+ 31 - 31
src/router/index.js

@@ -74,37 +74,37 @@ const router = new VueRouter({
 //不需要token的路由
 const ignore = ['/404']
 router.beforeEach(async (to, from, next) => {
-    // if (!ignore.includes(to.path)) {
-    //     const token = query().token
-    //     const ssoToken = store.getters['ssoToken']
-    //     if (ssoToken) {
-    //         store.commit('SETSSOTOKEN', ssoToken)
-    // await store.dispatch('getUserInfo', router)
-    await store.dispatch('getFloors')
-    await store.dispatch('getBrand')
-    //         next()
-    //     } else if (token) {
-    //         store.commit('SETSSOTOKEN', token)
-    //         await store.dispatch('getUserInfo', router)
-    //         next()
-    //     } else {
-    //         let lastRoute = {
-    //             path: to.path,
-    //             params: to.params,
-    //             query: to.query,
-    //         }
-    //         store.commit('SETLASTROUTER', lastRoute)
-    //         let ssoServer = 'http://oauth.wanda-dev.cn'
-    //         let systemcode = 'CAD156',
-    //             signal = new Date().getTime(),
-    //             version = '1.0.0',
-    //             returnUrl = window.location.protocol + '//' + window.location.host
+    if (!ignore.includes(to.path)) {
+        const token = query().token
+        const ssoToken = store.getters['ssoToken']
+        if (ssoToken) {
+            store.commit('SETSSOTOKEN', ssoToken)
+            await store.dispatch('getUserInfo', router)
+            await store.dispatch('getFloors')
+            await store.dispatch('getBrand')
+            next()
+        } else if (token) {
+            store.commit('SETSSOTOKEN', token)
+            await store.dispatch('getUserInfo', router)
+            next()
+        } else {
+            let lastRoute = {
+                path: to.path,
+                params: to.params,
+                query: to.query,
+            }
+            store.commit('SETLASTROUTER', lastRoute)
+            let ssoServer = 'http://oauth.wanda-dev.cn'
+            let systemcode = 'CAD156',
+                signal = new Date().getTime(),
+                version = '1.0.0',
+                returnUrl = window.location.protocol + '//' + window.location.host
 
-    //         window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
-    //     }
-    // } else {
-    next()
-    //     return
-    // }
+            window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
+        }
+    } else {
+        next()
+        return
+    }
 })
 export default router

+ 11 - 11
src/store/index.js

@@ -113,17 +113,17 @@ export default new Vuex.Store({
         // 获取项目列表、userId
         async getUserInfo({ commit }, palyload) {
             await login({}).then((res) => {
-                // if (res.result == 'success') {
-                //     // token校验成功 拿到权限
-                //     //commit("SETISREQUESTtAUTH", true)
-                //     if (res.permissions.length == 0) {
-                //         router.push('/404')
-                //     }
-                //     commit('SETAUTHMSG', res)
-                // } else {
-                //     commit('SETISREQUESTtAUTH', false)
-                //     router.push('/404')
-                // }
+                if (res.result == 'success') {
+                    // token校验成功 拿到权限
+                    //commit("SETISREQUESTtAUTH", true)
+                    if (res.permissions.length == 0) {
+                        router.push('/404')
+                    }
+                    commit('SETAUTHMSG', res)
+                } else {
+                    commit('SETISREQUESTtAUTH', false)
+                    router.push('/404')
+                }
             })
         },
         getFloors(context) {