From f1788b2fdf6b4dbf8cbc22ac691bdc8839a1f0f6 Mon Sep 17 00:00:00 2001 From: lixg Date: Tue, 7 Mar 2023 13:42:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 6 +++--- src/views/faceteach/FaceTeachSignUp.vue | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 1c2f4ca..5957ede 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-06 18:36:53 + * @LastEditTime: 2023-03-07 12:53:34 * @FilePath: /stu_h5/src/router/index.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -26,9 +26,9 @@ router.beforeEach((to, from, next) => { console.log('toooooooo', to) 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 } }) + to.path.includes('/login') ? next() : next({ path: '/login', query: { returnUrl: import.meta.env.VITE_BASE + to.fullPath } }) } else { - window.location.href = window.location.protocol + import.meta.env.VITE_BASE_LOGIN_URL + import.meta.env.VITE_BASE + to.fullPath + window.location.href = window.location.protocol + import.meta.env.VITE_BASE_LOGIN_URL + 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 7f9cf97..0e84b82 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -48,7 +48,21 @@ :style="{ background: data.isSignUp ? '#999' : 'rgb(57, 146, 249)', }" - >{{ data.isSignUp ? "已报名" : "立即报名" }} + >{{ + data.isRefused + ? "审核拒绝" + : data.isSignUp + ? "已报名" + : "立即报名" + }} + + + 重新报名 @@ -211,7 +225,7 @@ let timer = null; // 报名 function onLineSignUp() { - if (data.value.isSignUp) { + if (data.value.isSignUp && data.value.isSignUp) { return; } request(FACETEACH_SIGNUP, { courseId });