zhengchengwu 6 years ago
parent
commit
9804dcf10d
3 changed files with 29 additions and 29 deletions
  1. BIN
      src/assets/logo/logo.png
  2. 16 16
      src/router/index.js
  3. 13 13
      src/xt_permission.js

BIN
src/assets/logo/logo.png View File


+ 16 - 16
src/router/index.js View File

@@ -785,37 +785,37 @@ export const xt_asyncRouterMap = [
785 785
         component: () => import('@/xt_pages/stock/stockInOrder'),
786 786
         name: 'stockInOrder',
787 787
         meta: { title: 'stockInOrder', noCache: true }
788
-      }, {
789
-        path: '/stock/in/other',
790
-        component: () => import('@/xt_pages/stock/otherStockInOrder'),
791
-        name: 'otherStockInOrder',
792
-        meta: { title: 'otherStockInOrder', noCache: true }
793 788
       }, {
794 789
         path: '/stock/return',
795 790
         component: () => import('@/xt_pages/stock/salesReturnOrder'),
796 791
         name: 'salesReturnOrder',
797 792
         meta: { title: 'salesReturnOrder', noCache: true }
798
-      }, {
799
-        path: '/stock/return/other',
800
-        component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
801
-        name: 'otherSalesReturnOrder',
802
-        meta: { title: 'otherSalesReturnOrder', noCache: true }
803
-      },
793
+      }, 
804 794
       {
805 795
         path: '/stock/out',
806 796
         component: () => import('@/xt_pages/stock/stockOutOrder'),
807 797
         name: 'stockOutOrder',
808 798
         meta: { title: 'stockOutOrder', noCache: true }
809
-      }, {
810
-        path: '/stock/out/other',
811
-        component: () => import('@/xt_pages/stock/otherStockOutOrder'),
812
-        name: 'otherStockOutOrder',
813
-        meta: { title: 'otherStockOutOrder', noCache: true }
814 799
       }, {
815 800
         path: '/stock/cancel',
816 801
         component: () => import('@/xt_pages/stock/cancelStockOrder'),
817 802
         name: 'cancelStockOrder',
818 803
         meta: { title: 'cancelStockOrder', noCache: true }
804
+      }, {
805
+        path: '/stock/in/other',
806
+        component: () => import('@/xt_pages/stock/otherStockInOrder'),
807
+        name: 'otherStockInOrder',
808
+        meta: { title: 'otherStockInOrder', noCache: true }
809
+      }, {
810
+        path: '/stock/return/other',
811
+        component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
812
+        name: 'otherSalesReturnOrder',
813
+        meta: { title: 'otherSalesReturnOrder', noCache: true }
814
+      },{
815
+        path: '/stock/out/other',
816
+        component: () => import('@/xt_pages/stock/otherStockOutOrder'),
817
+        name: 'otherStockOutOrder',
818
+        meta: { title: 'otherStockOutOrder', noCache: true }
819 819
       }, {
820 820
         path: '/stock/cancel/other',
821 821
         component: () => import('@/xt_pages/stock/otherCancelStockOrder'),

+ 13 - 13
src/xt_permission.js View File

@@ -10,19 +10,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
10 10
 
11 11
 router.beforeEach((to, from, next) => {
12 12
   // 线上注释
13
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
14
-    store.dispatch('VerifyConfigList', []).then(() => {
15
-      next()
16
-    })
17
-  }
18
-  if (store.getters.permission_routers === undefined) {
19
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
20
-      next()
21
-    })
22
-  } else {
23
-    next()
24
-  }
25
-  return
13
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
14
+  //   store.dispatch('VerifyConfigList', []).then(() => {
15
+  //     next()
16
+  //   })
17
+  // }
18
+  // if (store.getters.permission_routers === undefined) {
19
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
20
+  //     next()
21
+  //   })
22
+  // } else {
23
+  //   next()
24
+  // }
25
+  // return
26 26
   // 线上注释
27 27
 
28 28
   NProgress.start()