Browse Source

第三方登录

ZaiZai 1 year ago
parent
commit
a1641a7232
2 changed files with 20 additions and 23 deletions
  1. 19 22
      src/router/index.js
  2. 1 1
      src/router/modules/token.js

+ 19 - 22
src/router/index.js

@@ -1,26 +1,23 @@
 import * as vueRouter from 'vue-router'
-import baseData from "./modules/base";
-import {getToken} from '~src/api/util/auth'
-import {getRouterData, getTokenRouter} from './routers'
-import NProgress from "nprogress";
-import "~src/styles/app/nprogress.scss";
-import {getStoreValue} from "~uti/storage";
+import baseData from './modules/base'
+import { getToken } from '~src/api/util/auth'
+import { getRouterData, getTokenRouter } from './routers'
+import NProgress from 'nprogress'
+import '~src/styles/app/nprogress.scss'
+import { getStoreValue } from '~uti/storage'
 import website from '~src/config/index'
 
 //设置路由数据
 const router = vueRouter.createRouter({
     history: vueRouter.createWebHashHistory(),
-    routes: baseData
-});
+    routes: baseData,
+})
 
 //路由拦截
 router.beforeResolve(async (to) => {
-    NProgress.start();
-    const token = getToken()
-
-    if (to.path === '/login') {
-        return true
-    } else if (to.path === '/auth') {
+    NProgress.start()
+    const token = getToken(), auth = ['/login', '/auth', '/auth-token']
+    if (auth.indexOf(to.path) !== -1) {
         return true
     } else if (!token) {
         return '/login'
@@ -33,7 +30,7 @@ router.beforeResolve(async (to) => {
         if (role_id === website.role_id) {
             //如果等于总管理,判断项目ID(总管理时,进入其他页面,必须先选择项目)
             if (!projectId) {
-                window.$message?.warning('请先选择项目');
+                window.$message?.warning('请先选择项目')
                 return '/user/project'
             } else {
                 const res = await getRouterData(to.name)
@@ -56,19 +53,19 @@ router.beforeResolve(async (to) => {
 
 router.afterEach((to) => {
     //根据当前跳转的路由设置显示在浏览器标签的title
-    let pageTitle = to.meta['title'];
-    if (to.path !== "/") {
-        window.document.title =  pageTitle ? pageTitle : '';
+    let pageTitle = to.meta['title']
+    if (to.path !== '/') {
+        window.document.title = pageTitle ? pageTitle : ''
     } else {
-        window.document.title = '';
+        window.document.title = ''
     }
     window.scrollTo(0, 0)
-    NProgress.done();
+    NProgress.done()
 })
 
-export function setupRouter(app){
+export function setupRouter(app) {
     app.use(router)
     return router
 }
 
-export default router;
+export default router

+ 1 - 1
src/router/modules/token.js

@@ -10,5 +10,5 @@ export default [
     'transfer-preliminary-examination',
     'transfer-writing-conclusion',
     'transfer-write-report',
-    'test-index'
+    'test-index',
 ]