Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //     store.dispatch('VerifyConfigList', []).then(() => {
-  //       next()
-  //     })
-  //   }
-  //   if (store.getters.permission_routers === undefined) {
-  //     store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //       next()
-  //     })
-  //   } else {
-  //     next()
-  //   }
-  //   return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+        store.dispatch('VerifyConfigList', []).then(() => {
+          next()
+        })
+      }
+      if (store.getters.permission_routers === undefined) {
+        store.dispatch('xt_GenerateRoutes', []).then(() => {
+          next()
+        })
+      } else {
+        next()
+      }
+    return
   // 线上注释
 
   NProgress.start()