fix Login页面相关的问题

public/index.html

@@ -38,8 +38,8 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.103:8080/pms-am';
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.49:8080/pms-am'; // tengyun
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.49:8080/pms-am'; // tengyun
-    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.62:8080/pms-am'; // tao
+    // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.62:8080/pms-am'; // tao
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.21:8080/pms-am'; // xv
     // window.SITE_CONFIG['apiURL'] = 'http://localhost:3000/p//////ms-am'; // xv
     </script>

src/router/index.js

@@ -9,6 +9,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import http from '@/utils/request'
 import { isURL } from '@/utils/validate'
+import { isAuthentcated } from '../utils'
 
 Vue.use(Router)
 
@@ -82,8 +83,14 @@ router.beforeEach((to, from, next) => {
   // 添加动态(菜单)路由
   // 已添加或者当前路由为页面路由, 可直接访问
   if (window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] || fnCurrentRouteIsPageRoute(to, pageRoutes)) {
+    // 如果是在已认证的情况下直接访问登录界面
+    if (to.name === 'login') {
+      return next('/')
+    }
     return next()
   }
+
+  if (isAuthentcated()) {
     // 获取字典列表, 添加并全局变量保存
     http.get('/sys/dict/type/all').then(({ data: res }) => {
       if (res.code !== 0) {
@@ -91,6 +98,7 @@ router.beforeEach((to, from, next) => {
       }
       window.SITE_CONFIG['dictList'] = res.data
     }).catch(() => { })
+
     // 获取菜单列表, 添加并全局变量保存
     http.get('/sys/menu/nav').then(({ data: res }) => {
       if (res.code !== 0) {
@@ -103,6 +111,11 @@ router.beforeEach((to, from, next) => {
     }).catch(() => {
       next({ name: 'login' })
     })
+
+  } else {
+    next({ name: 'login' })
+  }
+
 })
 
 /**

src/utils/index.js

@@ -97,3 +97,7 @@ export function treeDataTranslate (data, id = 'id', pid = 'pid') {
   }
   return res
 }
+
+export function isAuthentcated() {
+  return Cookies.get('token')
+}