From 8518d34749300422fa3c0cc4639739e6f816ac6c Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Fri, 10 Mar 2023 16:55:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E8=B7=B3=E8=BD=AC=E5=8F=82=E6=95=B0=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/liveBroadcast/LiveBroadcast.vue | 16 ++++++++--------
 src/views/survey/SurveyDetail.vue         |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue
index 67779f7..0753c4d 100644
--- a/src/views/liveBroadcast/LiveBroadcast.vue
+++ b/src/views/liveBroadcast/LiveBroadcast.vue
@@ -63,7 +63,7 @@
           </botton>
 
           <botton class="btn" :style="{
-		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
+		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(59, 191, 252)'}`,
 	}" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
           </botton>
           <!-- <botton style="background: #999" class="btn" @click="commitClick" v-if="data.isEvaluate == 0">
@@ -71,7 +71,7 @@
           </botton> -->
 
           <botton :style="{
-		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(59, 191, 252)'}`,
 	}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{
               data.isSurvery ? "已评估" :
                   "评估"
@@ -80,7 +80,7 @@
         </div>
         <div v-else class="threeBtn">
           <botton :style="{
-		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(59, 191, 252)'}`,
 	}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1&&data.isSurvery">{{
               data.isSurvery ? "已评估" :
                   "评估"
@@ -109,7 +109,7 @@
           </botton> -->
 
           <botton :style="{
-		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+		background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.isSurvery ? '#999' : 'rgb(59, 191, 252)'}`,
 	}" class="btn" @click="commitClick" v-if="data.isEvaluate && data.isEvaluate == 1">{{
               data.isSurvery ? "已评估" :
                   "评估"
@@ -202,7 +202,7 @@ import {ElMessage} from "element-plus";
 import {useTaskPage} from "@/api/useCommon";
 
 const {
-  query: {courseId: liveId, id: taskId, type, pName, sName, projectStatus, projectEndTime},
+  query: {courseId: liveId, id: taskId, type, pName, sName, projectStatus, projectEndTime, infoId},
 } = useRoute();
 const router = useRouter();
 const returnclick = () => {
@@ -326,18 +326,18 @@ const commitClick = () => {
 
   console.log({
     courseId: data.value.assessmentId,
-    taskIds: taskId,
+    infoId: liveId,
     chapterOrStageId: 0,
     pName: "直播",
     sName: data.value.liveName,
     type: 4
   })
-
+  console.log(data.value)
   router.push({
     path: "/surveydetail",
     query: {
       courseId: data.value.assessmentId,
-      infoId: data.value.liveId,
+      infoId: liveId,
       chapterOrStageId: 0,
       pName: "直播",
       sName: data.value.liveName,
diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue
index 583325e..4c52b4f 100644
--- a/src/views/survey/SurveyDetail.vue
+++ b/src/views/survey/SurveyDetail.vue
@@ -348,7 +348,7 @@ const returnclick = () => {
 	clearInterval(timers)
 	router.back();
 };
-const {nextPage,prevPage,hasPrev, hasNext} =  type==3 ? '' : useTaskPage()
+const {nextPage,prevPage,hasPrev, hasNext} =  type==3 ||  type==4 ? '' : useTaskPage()
 const fielPath = ref(import.meta.env.VITE_FILE_PATH);
 const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 });
 console.log(data)