diff --git a/src/App.vue b/src/App.vue index f1ee79c..fda837e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ import { GET_USER_INFO } from "@/api/ThirdApi"; import { getCookie } from "@/api/utils"; import { USER_INFO } from "@/api/api"; -console.log("版本2.1.5------------"); +console.log("版本2.1.6------------"); const store = useStore(); const router = useRouter(); diff --git a/src/api/request.js b/src/api/request.js index 20c92f2..80b605a 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -100,7 +100,7 @@ export async function request(_url, params) { console.log('window.location.', window, router) if (response.code === 1000) { delCookie() - (import.meta.env.MODE === 'development' || import.meta.env.MODE === 'test') ? router.push({ path: '/login', query: { returnUrl: router.currentRoute.value.fullPath } }) : window.open(window.location.protocol + import.meta.env.VITE_BASE_LOGIN_URL + encodeURI(window.location.protocol + import.meta.env.VITE_BOE_BASE_URL + import.meta.env.VITE_BASE + router.currentRoute.value.fullPath), '_top') + (import.meta.env.MODE === 'development' || import.meta.env.MODE === 'test') ? router.push({ path: '/login', query: { returnUrl: router.currentRoute.value.fullPath } }) : window.open(window.location.protocol + import.meta.env.VITE_BASE_LOGIN_URL + encodeURIComponent(window.location.protocol + import.meta.env.VITE_BOE_BASE_URL + import.meta.env.VITE_BASE + router.currentRoute.value.fullPath), '_top') } if (response.code === 2001) { router.push({ path: '/FaceTeachSignUp', query: { courseId: router.currentRoute.value.query.courseId, type: 3 } }) diff --git a/src/router/index.js b/src/router/index.js index ee107cb..b8fc624 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-02-08 09:50:10 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-03-07 21:52:35 + * @LastEditTime: 2023-03-08 13:40:18 * @FilePath: /stu_h5/src/router/index.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -24,11 +24,13 @@ const router = createRouter({ }) router.beforeEach((to, from, next) => { console.log('toooooooo', to) + console.log('encodeURI', encodeURI(to.fullPath),) + console.log('encodeURIComponent', encodeURIComponent(window.location.protocol + import.meta.env.VITE_BOE_BASE_URL + import.meta.env.VITE_BASE + to.fullPath)) if (!getCookie('token')) { if (import.meta.env.MODE === "development" || import.meta.env.MODE === "test") { to.path.includes('/login') ? next() : next({ path: '/login', query: { returnUrl: to.fullPath } }) } else { - window.location.href = window.location.protocol + import.meta.env.VITE_BASE_LOGIN_URL + encodeURI(window.location.protocol + import.meta.env.VITE_BOE_BASE_URL + import.meta.env.VITE_BASE + to.fullPath) + window.location.href = window.location.protocol + import.meta.env.VITE_BASE_LOGIN_URL + encodeURIComponent(window.location.protocol + import.meta.env.VITE_BOE_BASE_URL + import.meta.env.VITE_BASE + to.fullPath) } } next() diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 6fd98aa..8d96c4d 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -42,7 +42,7 @@
{{ data.isRefused ? "审核拒绝"