From f16816cbc74f7ac3e47f026dc565e0ae12e54c16 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 28 Mar 2023 14:04:03 +0800
Subject: [PATCH] =?UTF-8?q?--demand=20=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeachSignUp.vue | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue
index 68ac8a2..d697cb1 100644
--- a/src/views/faceteach/FaceTeachSignUp.vue
+++ b/src/views/faceteach/FaceTeachSignUp.vue
@@ -34,13 +34,13 @@
             <img style="width: 16px; height: 18px" src="../../assets/image/position.png"/>
             <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
           </div>
-          <div class="time" style="margin-top: 37px">
+          <div class="time" style="margin-top: 37px" v-if="!isCourseEnd">
             <botton 
               class="btn" 
               style="margin-right: 20px;width: 160px;height: 46px;" 
               v-if="data.planDto.applyFlag" 
               @click="onLineSignUp(false)" 
-              :style="{	background: isAllowSign?data.isSignUp || data.isRefused ? '#999' : 'rgb(57, 146, 249)':'#999'}">
+              :style="{	background: (data.isSignUp || data.isRefused) ? '#999' : 'rgb(57, 146, 249)'}">
               {{
                 data.isRefused ? '审核拒绝' : data.isSignUp? '已报名' :'立即报名'
               }}
@@ -348,16 +348,7 @@ const { query: {courseId} } = useRoute();
 const {data = {}} = useRequest(STU_OFFCOURSE_DETAIL, {courseId});
 const teacherInfo = useUserInfo( computed(() => data.value?.planDto?.teacherId));
 const activeName = ref("first");
-// const isAllowSign = computed(() => dayjs().isBetween(dayjs(data.value.planDto?.beginTime).subtract(data.value.beforeStart || 0, "minute"), dayjs(data.value.afterStart ? data.value.planDto?.beginTime : data.value.planDto?.endTime).add(data.value.afterStart || 0, "minute")));
-const isAllowSign = computed(() => {
-  let nowTime = new Date().getTime();
-  let courseBeginTime = new Date(data.value.planDto?.beginTime).getTime();
-  if(nowTime>courseBeginTime){
-    return false
-  }else{
-    return true
-  }
-});
+const isCourseEnd = computed(() => dayjs(data.value.planDto?.endTime).isBefore(dayjs()));
 
 const handleClick = (tab, event) => {
   console.log("附件", tab, event);
@@ -525,8 +516,8 @@ function submitReplayComment() {
 }
 // 报名
 function onLineSignUp(isAgain) {
-  if (!isAllowSign.value) {
-    ElMessage.warning("未在允许报名时间范围内");
+  if (isCourseEnd.value) {
+    ElMessage.warning("该课程已经结束无法报名");
     return;
   }
   if(data.value.isSignUp && !isAgain){