Merge branch 'dw_master' into boe_dongwu0919

src/App.vue

@@ -34,7 +34,7 @@ import {USER_PERMISSION, VALIDATE_TOKEN} from "@/api/apis";
 const store = useStore();
 const isLogin = ref(false);
 
-console.log("版本3.3.1------------");
+console.log("版本3.3.2------------");
 
 
 // 监听关闭浏览器

src/api/config.js

@@ -9,6 +9,8 @@
 import {message} from "ant-design-vue";
 import axios from "axios";
 import router from "@/router";
+import {REFRESH_TOKEN_API} from "@/api/ThirdApi";
+import {boeRequest} from "@/api/request";
 // import { getCookie } from '../api/method'
 // const Qs = require("qs");
 
@@ -57,13 +59,15 @@ http.interceptors.response.use(
             return response;
         }
         if (code === 1000) {
-            (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? 
+            window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
-            router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) : 
-            (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
             // TODO token过期后退出登录 清空当前用户标记 - 为了刷新页面使用
             localStorage.removeItem('refreshPage')
             return Promise.reject(response);
         }
+        if (code === 1001) {
+            window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
+            return Promise.reject(response);
+        }
         show ? message.error(msg):message.error('系统接口数据异常，请联系管理员');
         console.log("api %o", msg);
         return Promise.reject(response);

src/api/confign.js

@@ -49,7 +49,7 @@ http.interceptors.response.use(
              message.error('token过期请重新登陆'); 
         }
         if (code === 1000) {
-            (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
+            window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
             return Promise.reject(response);
         }
         // show && message.error(msg);

src/api/configz.js

@@ -51,7 +51,7 @@ http.interceptors.response.use(
             message.error('token过期请重新登陆'); 
        }
         if (code === 1000) {
-            (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
+            window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
             return Promise.reject(response);
         }
         // show && message.error(msg);

src/api/request.js

@@ -495,9 +495,7 @@ export async function request(_url, params) {
       return res;
     }
     if (res.code === 1000 || res.code === 1002) {
-      (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ?
+      window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
-        router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) :
-        (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
       localStorage.removeItem('refreshPage')
       return Promise.reject(res);
     }else if(res.code=== 1001){

src/components/NavTop.vue

@@ -90,7 +90,7 @@ const logOut = async () => {
   store.replaceState(createStore({state: {openpages: []}}).state);
   localStorage.clear();
   sessionStorage.clear();
-  (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: '/login'}) : (window.location.href = window.location.protocol + process.env.VUE_APP_LOGIN_URL)
+  window.location.href = window.location.protocol + process.env.VUE_APP_LOGIN_URL
 };
 </script>
 <style scoped lang="scss">

src/components/student/OnlineClassModelStudent.vue

@@ -288,6 +288,7 @@ const openDrawer = (raw) => {
 
 const changePagination = (page) => {
   searchParams.value.pageNo = page;
+  searchStu();
 };
 
 function del(id) {