From 159fafce5c16df95e6782b60bd644b71701acd32 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 六月 2022 16:11:49 +0800
Subject: [PATCH] 1.页面可调用接口登录

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

diff --git a/src/permission.js b/src/permission.js
index 7881f68..89024f9 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,7 +3,7 @@
 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
@@ -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
@@ -36,14 +36,24 @@
           // next()
 
           // 鎷夊彇info
-          const info = await store.dispatch('user/getInfo')
+          // const info = await store.dispatch('user/getInfo')
           // 鐢熸垚鍙闂殑璺敱琛�
-          await store.dispatch('permission/generateRoutes', info)
+          // await store.dispatch('permission/generateRoutes')
+
           // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
-          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 })
         } catch (error) {
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')

--
Gitblit v1.9.3