From c93c13d1cfe288d431109ae1eafd7a9fc6d58746 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 13 六月 2023 10:23:17 +0800
Subject: [PATCH] 1.递交

---
 src/permission.js |   23 +++++++----------------
 1 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 89024f9..fd55dde 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/login'] // no redirect whitelist
+const whiteList = ['/login', '/zhkb', '/ckgl', '/cgdd', '/back'] // no redirect whitelist
 
 router.beforeEach(async(to, from, next) => {
   // start progress bar
@@ -31,29 +31,20 @@
         next()
       } else {
         try {
-          // get user info
-          // await store.dispatch('user/getInfo')
-          // next()
-
           // 鎷夊彇info
           // const info = await store.dispatch('user/getInfo')
+          // 鎷夊彇鑿滃崟淇℃伅琛�
+          const menu = await store.dispatch('user/getMenu')
           // 鐢熸垚鍙闂殑璺敱琛�
-          // await store.dispatch('permission/generateRoutes')
+          await store.dispatch('permission/generateRoutes', menu)
 
           // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
-          // router.addRoutes(store.getters.addRouters)
+          router.addRoutes(store.getters.addRouters)
 
           // hack鏂规硶 纭繚addRoutes宸插畬鎴�
-          // next({ ...to, replace: true })
+          next({ ...to, replace: true })
 
-          // console.log(store.getters.addRouters, 1)
-          // const s = store.getters.addRouters
-          // router.addRoutes(s)
-          // if (s) {
-          //   console.log(s)
-          // }
-          next()
-          // next({ ...to, replace: true })
+          // next()
         } catch (error) {
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')

--
Gitblit v1.9.3