Explorar el Código

fix: kaifain routes injecting

Acathur hace 5 años
padre
commit
4b0abdcd8f
Se han modificado 2 ficheros con 32 adiciones y 25 borrados
  1. 1 1
      layouts/kaifain_v2.vue
  2. 31 24
      plugins/router.js

+ 1 - 1
layouts/kaifain_v2.vue

@@ -28,7 +28,7 @@ export default {
           target = `https://${MOB_HOST}/`
         }
 
-        window.location.href = target
+        window.location.replace(target)
       }
     }
   }

+ 31 - 24
plugins/router.js

@@ -7,35 +7,42 @@ export default ({ app, context, req, store}) => {
     if (isKaifain) {
       const kaifainIndex = routes.find(v => v.name === 'kaifain')
       const kaifainSearch = routes.find(v => v.name === 'kaifainSearch')
+      const kaifainRoutes = []
 
-      const kaifainPageNow = {
-        name: 'kaifainPage_$',
-        path: '/page/:page',
-        component: kaifainIndex.component
+      // search
+      if (!routes.find(v => v.name === 'kaifainSearch_$')) {
+        kaifainRoutes.push({
+          name: 'kaifainSearch_$',
+          path: '/search',
+          component: kaifainSearch.component
+        })
       }
-      const kaifainCategoryNow = {
-        name: 'kaifainCategory_$',
-        path: '/c/:cat_id',
-        component: kaifainIndex.component
-      }
-      const kaifainSearchNow = {
-        name: 'kaifainSearch_$',
-        path: '/search',
-        component: kaifainSearch.component
+
+      // page
+      if (!routes.find(v => v.name === 'kaifainPage_$')) {
+        kaifainRoutes.push({
+          name: 'kaifainPage_$',
+          path: '/page/:page',
+          component: kaifainIndex.component
+        })
       }
 
-      const kaifainOrderList = [
-        kaifainSearchNow,
-        kaifainCategoryNow,
-        kaifainPageNow
-      ]
+      // category
+      if (!routes.find(v => v.name === 'kaifainCategory_$')) {
+        kaifainRoutes.push({
+          name: 'kaifainCategory_$',
+          path: '/c/:cat_id',
+          component: kaifainIndex.component
+        })
+      }
 
-      try {
-        routes.unshift(...kaifainOrderList)
-        app.router.matcher.addRoutes(kaifainOrderList)
-        kaifainInjected = true
-      } catch (e) {
-        console.log(e)
+      if (kaifainRoutes.length) {
+        try {
+          routes.unshift(...kaifainRoutes)
+          app.router.matcher.addRoutes(kaifainRoutes)
+        } catch (e) {
+          console.log(e)
+        }
       }
     }
   }