瀏覽代碼

add:新增需求8/9

Tang 3 年之前
父節點
當前提交
bd55b0f85a
共有 6 個文件被更改,包括 80 次插入24 次删除
  1. 21 20
      src/axios.js
  2. 30 4
      src/components/header/index.vue
  3. 1 0
      src/pages/home/index.vue
  4. 1 0
      src/pages/login/index.vue
  5. 22 0
      src/pages/refresh.vue
  6. 5 0
      src/router/index.js

+ 21 - 20
src/axios.js

@@ -1,9 +1,10 @@
 import axios from 'axios'
 import store from './store'
+import { Message } from 'element-ui'
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test
-export const BASE_URL = 'https://test.xyyxt.net'   //预发布
-// export const BASE_URL = 'http://192.168.1.24:5055'    //dev
+// export const BASE_URL = 'https://test.xyyxt.net'   //预发布
+export const BASE_URL = 'http://192.168.1.24:5055'    //dev
 // export const BASE_URL = 'http://120.79.166.78:19012'    //测试-外网
 export const tenantId = '867735392558919680'
 
@@ -43,7 +44,7 @@ request.interceptors.request.use(config => {
     config.headers['AuthorizationToken'] = 'WX ' + token // 让每个请求携带自定义 token 请根据实际情况自行修改
   }
   config.headers['TenantId'] = tenantId
-  
+
   return config
 }, err)
 
@@ -63,15 +64,15 @@ request.interceptors.response.use(async (response) => {
         // });
 
         // setTimeout(() => {
-          console.log('1231231')
-          store.commit('setCurrentRouter',router.currentRoute)
-          localStorage.removeItem('user_account')
-          localStorage.removeItem('token')
-          router.push({
-            path: '/login'
-          })
-
-          return Promise.reject(res)
+        console.log('1231231')
+        store.commit('setCurrentRouter', router.currentRoute)
+        localStorage.removeItem('user_account')
+        localStorage.removeItem('token')
+        router.push({
+          path: '/login'
+        })
+
+        return Promise.reject(res)
         // }, 1000);
       } else {
         let res = await refreshToken(response.config)
@@ -129,14 +130,14 @@ async function refreshToken(response) {
     // });
 
     // setTimeout(() => {
-      
-      localStorage.removeItem('user_account')
-      localStorage.removeItem('token')
-      console.log('33333')
-      store.commit('setCurrentRouter',router.currentRoute)
-      router.push({
-        path: '/login'
-      })
+
+    localStorage.removeItem('user_account')
+    localStorage.removeItem('token')
+    console.log('33333')
+    store.commit('setCurrentRouter', router.currentRoute)
+    router.push({
+      path: '/login'
+    })
     // }, 1000);
   }
 }

+ 30 - 4
src/components/header/index.vue

@@ -14,10 +14,30 @@
         <ul class="list">
           <li v-for="(item, index) in showNav(header.Nav)" :key="index">
             <a v-if="item.name == '首页'" @click="go('/index')">首页</a>
-            <a v-if="item.name == '走进祥粤'" @click="go('/about')">走进祥粤</a>
-            <a v-if="item.name == '课程'" @click="go('/course-list')">课程</a>
-            <a v-if="item.name == '直播'" @click="go('/live-list')">直播</a>
-            <a v-if="item.name == '题库'" @click="go('/bank-list')">题库</a>
+            <a
+              v-if="item.name == '走进祥粤'"
+              @click="go('/about')"
+              :style="$route.path === '/about' ? 'color:red;' : ''"
+              >走进祥粤</a
+            >
+            <a
+              v-if="item.name == '课程'"
+              @click="go('/course-list')"
+              :style="$route.path === '/course-list' ? 'color:red;' : ''"
+              >课程</a
+            >
+            <a
+              v-if="item.name == '直播'"
+              @click="go('/live-list')"
+              :style="$route.path === '/live-list' ? 'color:red;' : ''"
+              >直播</a
+            >
+            <a
+              v-if="item.name == '题库'"
+              @click="go('/bank-list')"
+              :style="$route.path === '/bank-list' ? 'color:red;' : ''"
+              >题库</a
+            >
           </li>
         </ul>
       </nav>
@@ -445,6 +465,12 @@ export default {
       }
     },
     go(path, query) {
+      if (path === this.$route.path) {
+        this.$router.push({
+          path: "refresh", //refresh路由地址和当前要刷新路由地址同级即可
+        });
+        return
+      }
       this.$router.push({
         path,
         query,

+ 1 - 0
src/pages/home/index.vue

@@ -1249,6 +1249,7 @@ export default {
                 }, 1000);
               })
               .catch((err) => {
+                this.$message.error(err.msg);
                 this.getLoginCodeLock = false;
               });
           }

+ 1 - 0
src/pages/login/index.vue

@@ -1041,6 +1041,7 @@ export default {
                 }, 1000);
               })
               .catch((err) => {
+                this.$message.error(err.msg)
                 this.getLoginCodeLock = false;
               });
           }

+ 22 - 0
src/pages/refresh.vue

@@ -0,0 +1,22 @@
+<!-- 空页面,负责中转到目标页面 -->
+<template>
+  <div></div>
+</template>
+ 
+<script>
+export default {
+  name: 'refresh',
+  data () {
+    return {
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.$router.replace(from.path)
+    })
+  }
+}
+ 
+</script>
+<style scoped>
+</style>

+ 5 - 0
src/router/index.js

@@ -20,6 +20,11 @@ const router =  new Router({
       redirect: '/home',
       component: resolve => require(['@/pages/home/index'],resolve)
     },
+    {
+      path: '/refresh',
+      name: '刷新页',
+      component: resolve => require(['@/pages/refresh'],resolve),
+    },
     {
       path: '/home',
       name: '首页',