From 92d98d931ef4199c06fb220d2b85a5b5e5e7701c Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 10 八月 2023 10:25:20 +0800
Subject: [PATCH] 1.角色权限优化

---
 src/permission.js |   41 ++++++++++++++++++++++++++---------------
 1 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index b6ef584..0272301 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -40,21 +40,32 @@
           const jwt = decode(localStorage.getItem('token'))
           localStorage.setItem('usercode', jwt.usercode)
 
-          // 鎷夊彇鑿滃崟淇℃伅琛�
-          const menu = await store.dispatch('user/getMenu')
-          // 鐢熸垚鍙闂殑璺敱琛�
-          await store.dispatch('permission/generateRoutes', menu)
-
-          // eslint-disable-next-line require-atomic-updates
-          // store.state.settings.orgType = getCookie('description')  //娉ㄩ噴鎺�
-
-          // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
-          router.addRoutes(store.getters.addRouters)
-
-          // hack鏂规硶 纭繚addRoutes宸插畬鎴�
-          next({ ...to, replace: true })
-
-          // next()
+          const code = await store.dispatch('user/getUserTorgData')
+          if (code === '200') {
+            // 鎷夊彇鑿滃崟淇℃伅琛�
+            const menu = await store.dispatch('user/getMenu')
+            // 鐢熸垚鍙闂殑璺敱琛�
+            await store.dispatch('permission/generateRoutes', menu)
+            // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
+            router.addRoutes(store.getters.addRouters)
+            // hack鏂规硶 纭繚addRoutes宸插畬鎴�
+            next({ ...to, replace: true })
+          }
+          // // 鎷夊彇鑿滃崟淇℃伅琛�
+          // const menu = await store.dispatch('user/getMenu')
+          // // 鐢熸垚鍙闂殑璺敱琛�
+          // await store.dispatch('permission/generateRoutes', menu)
+          //
+          // // eslint-disable-next-line require-atomic-updates
+          // // store.state.settings.orgType = getCookie('description')  //娉ㄩ噴鎺�
+          //
+          // // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
+          // router.addRoutes(store.getters.addRouters)
+          //
+          // // hack鏂规硶 纭繚addRoutes宸插畬鎴�
+          // 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