From d01fef96a53c0a0dcaded9c250b6b264e761d409 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 7 Mar 2023 15:21:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E6=8A=A5=E5=90=8D=E9=A1=B5=E9=9D=A2=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BC=80=E8=AF=BE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeachSignUp.vue | 72 +++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 17de29a..1c3d9ba 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -29,8 +29,7 @@
{{ - dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:MM') + " 至 " + - dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM') + data.planDto?.beginTime + " 至 " + data.planDto?.endTime }}
@@ -39,12 +38,22 @@
{{ data.planDto?.address }}
- + {{ data.isRefused ? '审核拒绝' : data.isSignUp? '已报名' :'立即报名' }} - + 重新报名
@@ -371,8 +380,56 @@ const download = (url) => { const downloads = (url) => { ElMessage.warning("未在有效时间范围内，请耐心等待！"); }; -let timer = null; +//判断能否报名 +function isSignClick() { + let beginTime = new Date(data.value.planDto?.beginTime).getTime(); + let endTime = + !data.value.planDto?.afterStart || data.value.afterStart == "0" + ? new Date(data.value.planDto?.endTime).getTime() + : new Date(data.value.planDto?.beginTime).getTime(); + let nowTime = new Date().getTime(); + if ( + data.value.planDto?.beforeStart && + data.value.planDto?.afterStart && + data.value.beforeStart !== "0" && + data.value.afterStart !== "0" + ) { + //有开始前有开始后 + beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; + endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; + console.log("1111"); + } else if ( + data.value.planDto?.beforeStart && + !data.value.planDto?.afterStart && + data.value.beforeStart !== "0" && + data.value.afterStart == "0" + ) { + //只有开始前无开始后 + beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; + console.log("11112222"); + } else if ( + !data.value.planDto?.beforeStart && + data.value.planDto?.afterStart && + data.value.beforeStart == "0" && + data.value.afterStart !== "0" + ) { + //无开始前有开始后 + endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; + console.log("1111333"); + } + if (nowTime < endTime && nowTime > beginTime) { + state.isAllowSign = true; + } else { + state.isAllowSign = false; + } + console.log(state.isAllowSign) +} + + +watch(data,()=>{ + isSignClick(); +}) // 查看更多-展开回复列表 function lookMore(i) { @@ -549,6 +606,11 @@ function submitReplayComment() { // 报名 function onLineSignUp(isAgain) { + if (!state.isAllowSign) { + // console.log("data.signFlag", data.value.signFlag, isAllowSign); + ElMessage.warning("未在允许报名时间范围内"); + return; + } if(data.value.isSignUp && !isAgain){ return; } From b7d9bdb99f6e6dfbde7a3575c87065ebfcf9750a Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 7 Mar 2023 15:33:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E6=8A=A5=E5=90=8D=E9=A1=B5=E9=9D=A2=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BC=80=E8=AF=BE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeachSignUp.vue | 40 ++----------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 1c3d9ba..6e4e824 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -381,44 +381,11 @@ const downloads = (url) => { ElMessage.warning("未在有效时间范围内，请耐心等待！"); }; -//判断能否报名 +//判断能否报名 (TODO-大于面授课截止时间就不能报名了，其余均可以) function isSignClick() { - let beginTime = new Date(data.value.planDto?.beginTime).getTime(); - let endTime = - !data.value.planDto?.afterStart || data.value.afterStart == "0" - ? new Date(data.value.planDto?.endTime).getTime() - : new Date(data.value.planDto?.beginTime).getTime(); + let endTime = new Date(data.value.planDto?.endTime).getTime() let nowTime = new Date().getTime(); - if ( - data.value.planDto?.beforeStart && - data.value.planDto?.afterStart && - data.value.beforeStart !== "0" && - data.value.afterStart !== "0" - ) { - //有开始前有开始后 - beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; - endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; - console.log("1111"); - } else if ( - data.value.planDto?.beforeStart && - !data.value.planDto?.afterStart && - data.value.beforeStart !== "0" && - data.value.afterStart == "0" - ) { - //只有开始前无开始后 - beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; - console.log("11112222"); - } else if ( - !data.value.planDto?.beforeStart && - data.value.planDto?.afterStart && - data.value.beforeStart == "0" && - data.value.afterStart !== "0" - ) { - //无开始前有开始后 - endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; - console.log("1111333"); - } - if (nowTime < endTime && nowTime > beginTime) { + if (nowTime < endTime) { state.isAllowSign = true; } else { state.isAllowSign = false; @@ -426,7 +393,6 @@ function isSignClick() { console.log(state.isAllowSign) } - watch(data,()=>{ isSignClick(); })