Ver código fonte

系统信息问题解决

gcj 3 anos atrás
pai
commit
83917871f1
2 arquivos alterados com 19 adições e 12 exclusões
  1. 18 11
      src/permission.js
  2. 1 1
      src/views/login.vue

+ 18 - 11
src/permission.js

@@ -3,7 +3,7 @@ import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-import { getToken, getConfig } from '@/utils/auth' // get token from cookie
+import { getToken, removeToken, getConfig } from '@/utils/auth' // get token from cookie
 import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
@@ -19,18 +19,25 @@ router.beforeEach(async (to, from, next) => {
   NProgress.done()
   const hasToken = getToken()
   if (hasToken) {
-    if (to.path === '/login') {
-      // if is logged in, redirect to the home page
-      next({ path: '/EnterSys' })
-      NProgress.done()
-    } else {
-      try {
-        next()
-      } catch (error) {
-        Message.error(error || 'Has Error')
-        next(`/login?redirect=${to.path}`)
+    let config = getConfig();
+    if (config) {
+      if (to.path === '/login') {
+        // if is logged in, redirect to the home page
+        next({ path: '/EnterSys' })
         NProgress.done()
+      } else {
+        try {
+          next()
+        } catch (error) {
+          Message.error(error || 'Has Error')
+          next(`/login?redirect=${to.path}`)
+          NProgress.done()
+        }
       }
+    } else {
+      removeToken();
+      next(`/login?redirect=${to.path}`)
+      NProgress.done()
     }
   } else {
     /* has no token*/

+ 1 - 1
src/views/login.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="login-container">
+  <div class="login-container" v-if="configInfor">
     <div class="login-left">
       <div class="login-texts">
         <p>