From 14925f0af39853a8e0b211b50a353efb631fc356 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sun, 25 Dec 2022 19:09:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E9=87=8C=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue         | 25 ++++++++---------------
 src/views/liveBroadcast/LiveBroadcast.vue |  5 ++---
 src/views/moreActive/MoreActive.vue       |  2 --
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 035429e..146f001 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -35,9 +35,8 @@
 				</div>
 			</div>
 			<div style="display: flex">
-				<botton v-if="!isAllowSign" class="btn" style="margin-right: 20px; background: #999" @click="signClick">签到
-				</botton>
-				<botton v-if="isAllowSign" class="btn" style="margin-right: 20px" :style="{
+				
+				<botton  class="btn" style="margin-right: 20px" :style="{
 					background: data.signFlag ? '#999' : 'rgb(57, 146, 249)',
 				}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
 				</botton>
@@ -112,13 +111,10 @@
 									</div>
 								</div>
 
-								<div v-if="dayjs(data.workDto.submitEndTime).isBefore(dayjs())" @click="toWork" class="submit"
-									style="background: #999">已结束</div>
-								<div v-if="dayjs().isBefore(dayjs(data.workDto.submitStartTime))" @click="toWork" class="submit"
-									style="background: #999">未开始</div>
+								
 								<div
-									:style="{ background: new Date(data.planDto.beginTime).getTime() > new Date().getTime() ? '#999' : '' }"
-									class="submit" @click="toWork" v-else>
+									:style="{ background: new Date(data.planDto?.beginTime).getTime() > new Date().getTime() ? '#999' : '' }"
+									class="submit" @click="toWork" >
 									交作业
 								</div>
 							</div>
@@ -141,11 +137,8 @@
 										<div class="tag3" style="margin-left: 11px">考试</div>
 									</div>
 								</div>
-								<div v-if="dayjs(data.value.workDto.examinationEndTime).isBefore(dayjs())" class="submit"
-									style="background: #999" @click="toExamItem(data.examinationDto)">已结束</div>
-								<div v-if="dayjs().isBefore(dayjs(data.value.workDto.examinationStartTime))" class="submit"
-									style="background: #999">未开始</div>
-								<div v-else
+								
+								<div 
 									:style="{ background: new Date(data.planDto.beginTime).getTime() > new Date().getTime() ? '#999' : '' }"
 									class="submit" @click="toExamItem(data.examinationDto)">
 									去考试
@@ -348,7 +341,7 @@ function toWork() {
 		let date2 = new Date().getTime()
 		if (date1 > date2) {
 			ElMessage.warning("未到开始时间，请耐心等待！");
-			return;
+
 		}
 	}
 	router.push({
@@ -372,7 +365,7 @@ function toExamItem(obj) {
 		let date2 = new Date().getTime()
 		if (date1 > date2) {
 			ElMessage.warning("未到开始时间，请耐心等待！");
-			return;
+			
 		}
 	}
 	console.log("obj", obj.examinationTestId);
diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue
index df36543..ef926b6 100644
--- a/src/views/liveBroadcast/LiveBroadcast.vue
+++ b/src/views/liveBroadcast/LiveBroadcast.vue
@@ -50,9 +50,8 @@
 					background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : 'rgb(59, 191, 252)'}`,
 				}" @click="showClick">观看
 				</botton>
-				<botton v-if="!isAllowSign" class="btn" style="margin-right: 20px; background: #999" @click="signClick">签到
-				</botton>
-				<botton v-else class="btn" :style="{
+				
+				<botton  class="btn" :style="{
 					background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
 				}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
 				</botton>
diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue
index 60cdf95..d54e89d 100644
--- a/src/views/moreActive/MoreActive.vue
+++ b/src/views/moreActive/MoreActive.vue
@@ -45,8 +45,6 @@
           <div style="margin-left: 8px">{{ data?.activityAddress }}</div>
         </div>
       </div>
-      <botton v-if="!isAllowSign" class="btn" style="margin-right: 20px; background: #999" @click="signClick">签到
-				</botton>
       <botton class="btn" :style="{background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`, }" @click="signClick" >{{ data.signFlag ? "已签到" : "签到" }}
       </botton>
     </div>

From dd9eebcfb923d19c3231e83d5b73c5d58a77c462 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sun, 25 Dec 2022 19:22:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 1292d10..61e36da 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,7 +36,7 @@ import {useStore} from "vuex";
 import {onMounted} from "vue";
 import router from "@/router";
 
-console.log("版本1.0.4------------");
+console.log("版本1.0.5------------");
 const store = useStore();
 onMounted(() => {
   getUserInfo();