Kaynağa Gözat

Merge branch 'xinxi' into develop

YaolongHan 4 yıl önce
ebeveyn
işleme
0ef04771a5
2 değiştirilmiş dosya ile 19 ekleme ve 18 silme
  1. 17 16
      src/router/index.js
  2. 2 2
      src/store/index.js

+ 17 - 16
src/router/index.js

@@ -88,7 +88,7 @@ const router = new VueRouter({
 const ignore = ["/404"]
 
 router.beforeEach(async (to, from, next) => {
-    console.log('to', from.path, to.path)
+    console.log('to', from.path, to)
     // 取出刷新时的 ssoToken, 路由拦截时app.vue 生命周期还没有执行,store中还没有数据,
     let beforeunload = localStorage.getItem("beforeunload"),
         __token = null
@@ -140,16 +140,17 @@ router.beforeEach(async (to, from, next) => {
             await store.dispatch("getFloors")
             await store.dispatch("getBrand")
             // 如果在跳转获取token之前保存了指定的路径,则后去token后需要跳转到相关页面
-            // if (sessionStorage.getItem("TOURL")) {
-            //     // 如果去的地址等于缓存的地址
-            //     if (sessionStorage.getItem("TOURL") == to.path) {
-            //         next()
-            //     } else {
-            //         next(sessionStorage.getItem("TOURL"))
-            //     }
-            // } else {
+            if (sessionStorage.getItem("TOURL")) {
+                // 如果去的地址等于缓存的地址
+                if (sessionStorage.getItem("TOURL") == to.path) {
+                    sessionStorage.setItem("TOURL", '')
+                    next()
+                } else {
+                    next(sessionStorage.getItem("TOURL"))
+                }
+            } else {
                 next()
-            // }
+            }
         } else {
             let lastRoute = {
                 path: to.path,
@@ -165,12 +166,12 @@ router.beforeEach(async (to, from, next) => {
                 signal = new Date().getTime(),
                 version = "1.0.0";
             // 获取token前需要保存跳转前路径
-            // if (!ignore.includes(to.path)) {
-            //     sessionStorage.setItem("TOURL", to.path)
-            // } else {
-            //     // 如果重定向前为404则跳入/
-            //     sessionStorage.setItem("TOURL", '/')
-            // }
+            if (!ignore.includes(to.path)) {
+                sessionStorage.setItem("TOURL", to.path)
+            } else {
+                // 如果重定向前为404则跳入/
+                sessionStorage.setItem("TOURL", '/')
+            }
             window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
         }
     } else {

+ 2 - 2
src/store/index.js

@@ -14,9 +14,9 @@ import router from '../router'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        // ssoToken: 'admin:chuyushu',
+        ssoToken: 'admin:chuyushu',
         // ssoToken: '',
-        ssoToken: null,
+        // ssoToken: null,
         plazaName: '',
         isPreview: false,
         lastRoute: '',