From 6b32ec29b1cd3ed12845d543e18da18f8456cdda Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 18 十月 2022 18:18:33 +0800
Subject: [PATCH] 1.安灯设置开发完成
---
src/permission.js | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 7881f68..fd74217 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,12 +3,12 @@
import { Message } from 'element-ui'
import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style
-import { getToken } from '@/utils/auth' // get token from cookie
+import { getCookie, getToken } from '@/utils/auth' // get token from cookie
import getPageTitle from '@/utils/get-page-title'
NProgress.configure({ showSpinner: false }) // NProgress Configuration
-const whiteList = ['/login'] // no redirect whitelist
+const whiteList = ['/login', '/zhkb', '/ckgl', '/cgdd', '/bzcj', '/dccj', '/zpcj', '/back'] // no redirect whitelist
router.beforeEach(async(to, from, next) => {
// start progress bar
@@ -18,8 +18,8 @@
document.title = getPageTitle(to.meta.title)
// determine whether the user has logged in
- const hasToken = getToken()
-
+ // const hasToken = getToken()
+ const hasToken = getCookie('admin')
if (hasToken) {
if (to.path === '/login') {
// if is logged in, redirect to the home page
@@ -31,19 +31,20 @@
next()
} else {
try {
- // get user info
- // await store.dispatch('user/getInfo')
- // next()
-
// 鎷夊彇info
- const info = await store.dispatch('user/getInfo')
+ // const info = await store.dispatch('user/getInfo')
+ // 鎷夊彇鑿滃崟淇℃伅琛�
+ const menu = await store.dispatch('user/getMenu')
// 鐢熸垚鍙闂殑璺敱琛�
- await store.dispatch('permission/generateRoutes', info)
+ await store.dispatch('permission/generateRoutes', menu)
+
// 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
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