修改

src/components/subject/Calculation.vue

@@ -52,7 +52,7 @@
           </view>
           <view
             class="AnswerContent"
-            v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)"
+            v-if="!isOperate"
             style="margin-top: 30rpx"
           >
             <view>

src/components/subject/Cloze.vue

@@ -40,7 +40,7 @@
 										v-html="item3.Content"></view>
 								</template>
 							</view>
-							<template v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)">
+							<template v-if="!isOperate">
 								<view class="AnswerContent" style="margin-bottom:20px;">
 									<view>
 										<text style="color: #8c8a94">正确答案：</text>
@@ -70,7 +70,7 @@
 							</template>
 						</view>
 					</view>
-					<view class="AnswerContent" v-if="!isOperate&&item1.AnswerParse&&(ExamStatus==2||ExamStatus==3)" style="margin-top:20px;">
+					<view class="AnswerContent" v-if="!isOperate&&item1.AnswerParse" style="margin-top:20px;">
 						<view style="margin-top: 20rpx; word-wrap: break-word">
 							<text style="color: #8c8a94">解析：</text>
 							<text style="color: #000">{{ item1.AnswerParse }}</text>

src/components/subject/Dataquestion.vue

@@ -53,7 +53,7 @@
               </template>
             </view>
           </view>
-          <view class="AnswerContent" v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)">
+          <view class="AnswerContent" v-if="!isOperate">
             <view>
               您的答案：
               <template v-if="item1.AnswerList && item1.AnswerList.length > 0">

src/components/subject/EntryProblem.vue

@@ -53,7 +53,7 @@
               </template>
             </view>
           </view>
-          <view class="AnswerContent" v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)">
+          <view class="AnswerContent" v-if="!isOperate">
             <view>
               您的答案：
               <template v-if="item1.AnswerList && item1.AnswerList.length > 0">

src/components/subject/FillInTheBlanks.vue

@@ -47,7 +47,7 @@
               </template>
             </view>
           </view>
-          <view class="AnswerContent" v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)">
+          <view class="AnswerContent" v-if="!isOperate">
             <view>
               您的答案：
               <template v-if="item1.AnswerList && item1.AnswerList.length > 0">

src/components/subject/ListenTopic.vue

@@ -182,7 +182,7 @@
                   </view>
                 </view>
                 <template
-                  v-if="!isOperate && (ExamStatus == 2 || ExamStatus == 3)"
+                  v-if="!isOperate"
                 >
                   <view class="AnswerContent">
                     <view>
@@ -239,8 +239,7 @@
             class="AnswerContent"
             v-if="
               !isOperate &&
-              item1.AnswerParse &&
-              (ExamStatus == 2 || ExamStatus == 3)
+              item1.AnswerParse
             "
           >
             <view style="word-wrap: break-word">

src/components/subject/MultipleChoice.vue

@@ -64,7 +64,7 @@
               </template>
             </view>
           </view>
-          <view class="AnswerContent" v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)">
+          <view class="AnswerContent" v-if="!isOperate">
             <view>
               <text style="color: #8c8a94">正确答案：</text>
               <text class="isTrueAnswer">{{ item1.Answer }}</text

src/components/subject/Other.vue

@@ -32,7 +32,7 @@
 							<view class="viewAnswerContent" style="margin-top:20px;" v-html="item1.Answer"></view>
 						</template>
 					</view>
-					<view class="AnswerContent" v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)">
+					<view class="AnswerContent" v-if="!isOperate">
 					  <view>
 					  	<text style="color: #8c8a94">正确答案：</text>
 					  	<text class="isTrueAnswer">{{ item1.Answer }}</text>，

src/components/subject/SharingChoose.vue

@@ -49,7 +49,7 @@
 							</template>
 						</template>
 						<template v-else>
-							<view class="AnswerContent" v-if="ExamStatus==2||ExamStatus==3">
+							<view class="AnswerContent">
 								<view>
 									<text style="color: #8c8a94">正确答案：</text>
 									<text class="isTrueAnswer">{{ item1.Answer }}</text>，

src/components/subject/SortingProblem.vue

@@ -80,7 +80,7 @@
               </template>
             </template>
             <template v-else>
-              <view class="AnswerContent" v-if="ExamStatus==2||ExamStatus==3">
+              <view class="AnswerContent">
                 <view>
                   <text style="color: #8c8a94">正确答案：</text>
                   <text class="isTrueAnswer">{{ item1.Answer }}</text

src/components/subject/Spoken.vue

@@ -48,7 +48,7 @@
 			  <view class="viewAnswerContent" style="margin-top:15px;" v-html="item1.Answer"></view>
 			</template>
           </view>
-		  <view class="AnswerContent" v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)">
+		  <view class="AnswerContent" v-if="!isOperate">
 		    <view>
 		      您的答案：
 		      <view class="viewAnswerContent" style="margin-top: 10px">

src/components/subject/easyQuestion.vue

@@ -52,7 +52,7 @@
           </view>
           <view
             class="AnswerContent"
-            v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)"
+            v-if="!isOperate"
             style="margin-top: 30rpx"
           >
             <view>

src/components/subject/examNotice.vue

@@ -2,7 +2,7 @@
 	<view>
 		<van-nav-bar fixed>
 			<template #left>
-				<van-icon name="cross" style="font-size: 32rpx; color: #111" @click="back" />
+				<van-icon name="cross" style="font-size: 32rpx; color: #111" @click="backToIndex" />
 			</template>
 			<template #title>
 				<view style="
@@ -13,7 +13,7 @@
           ">考试须知</view>
 			</template>
 		</van-nav-bar>
-		<view class="answer-Notice">
+		<view class="answer-Notice" v-if="dataList">
 			<view style="width:100%;text-align:center;">
 				<img style="width:169px;height:134px;"
 					src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/examNotice.png"
@@ -23,15 +23,15 @@
 				<!-- 考试已开始 -->
 				<template v-if="ExamStatus==2">
 					<template v-if="!isShowLate">
-						<view>1.本场考试满分{{paperData.Publish.ExamScore}}分</view>
+						<view>1.本场考试满分{{dataList.Publish.ExamScore}}分</view>
 						<view style="margin:18rpx 0">
-							2.考试时长{{paperData.Publish.ExamTimes}}分钟，开考后{{paperData.Publish.SubmitTimes}}分钟内禁止交卷</view>
-						<view v-if="paperData.Publish.ExamNotice" style="display:flex;">
-							3.<view v-html="paperData.Publish.ExamNotice"></view>
+							2.考试时长{{dataList.Publish.ExamTimes}}分钟，开考后{{dataList.Publish.SubmitTimes}}分钟内禁止交卷</view>
+						<view v-if="dataList.Publish.ExamNotice" style="display:flex;">
+							3.<view v-html="dataList.Publish.ExamNotice"></view>
 						</view>
 					</template>
 					<template v-else>
-						<view style="text-align: center;">对不起，您本次考试迟到{{paperData.Publish.EnterTimes}}分钟，不能参加考试</view>
+						<view style="text-align: center;">对不起，您本次考试已经迟到，{{dataList.Publish.EnterTimes}}分钟后不能参加考试</view>
 					</template>
 				</template>
 				<template v-if="ExamStatus==1">
@@ -44,7 +44,7 @@
 		</view>
 		<view class="submitBox">
 			<template v-if="ExamStatus==2">
-				<view class="submit" :class="{disabled: !canClick}" v-if="!isShowLate" @click="back">
+				<view class="submit" :class="{disabled: !canClick}" v-if="!isShowLate" @click="EnterExam">
 					我已知晓<text v-if="totalTime>0">（{{totalTime}}s）</text>
 				</view>
 				<view class="submit" v-else @click="backToIndex">
@@ -73,23 +73,25 @@
 		computed,
 		onMounted,
 	} from "vue";	
+	import { getPaperDetail } from "../../api/exam";
 	export default {
 		props: {
-			paperData: Object,
-			ExamStatus: Number
+			ExamStatus: Number,
+			msg:Object
 		},
 		setup(props, ctx) {
 			let Gid = uni.getStorageSync("userInfo").Id;
 			let data = reactive({
-				paperData: props.paperData,
 				ExamStatus: props.ExamStatus,
+				dataList:{},
+				msg: props.msg,
 				totalTime: 5,
 			    canClick: true ,//添加canClick
 				isShowLate:false
 			});
 			let methods = {
 				//隐藏答题卡
-				back() {
+				EnterExam() {
 					if (!data.canClick) return
 					ctx.emit("hideNotice");
 				},
@@ -110,33 +112,42 @@
 				  dateTime = yy + "-" + mm + "-" + dd + " " + hh + ":" + mf + ":" + ss;
 				  return dateTime;
 				},
+				async getPaperDetail() {
+				  let res = await getPaperDetail(data.msg);
+				  if (res) {
+				    if (res.Code == 1) {
+				      data.dataList = res.Data;
+				      if(data.dataList.Publish.EnterTimes&&data.dataList.Publish.EnterTimes>0){
+				      	let time1 = data.dataList.Publish.ExamStartTime;
+				      	let time2 = methods.getNowTime();
+				      	var d1 = new Date(time1);
+				      	var d2 = new Date(time2);
+				      	let TimeDis = parseInt(d2 - d1) / 1000 / 60;
+				      	if (TimeDis > data.dataList.Publish.EnterTimes) {
+				      	  data.isShowLate=true
+				      	}
+				      }
+				      if(!data.isShowLate){
+				      	data.canClick = false
+				      	let clock = setInterval(() => {
+				      		data.totalTime--
+				      		if (data.totalTime == 0) {
+				      			clearInterval(clock)
+				      			// this.totalTime = 5
+				      			data.canClick = true //这里重新开启
+				      		}
+				      	}, 1000);
+				      }
+				    }
+				  }
+				},
 				//返回首页
 				backToIndex(){
 					uni.navigateBack();
 				}
 			};
-			onMounted(() => {				
-				if(props.paperData.Publish.EnterTimes&&props.paperData.Publish.EnterTimes>0){
-					let time1 = props.paperData.Publish.ExamStartTime;
-					let time2 = methods.getNowTime();
-					var d1 = new Date(time1);
-					var d2 = new Date(time2);
-					let TimeDis = parseInt(d2 - d1) / 1000 / 60;
-					if (TimeDis > props.paperData.Publish.EnterTimes) {
-					  data.isShowLate=true
-					}
-				}
-				if(!data.isShowLate){
-					data.canClick = false
-					let clock = setInterval(() => {
-						data.totalTime--
-						if (data.totalTime == 0) {
-							clearInterval(clock)
-							// this.totalTime = 5
-							data.canClick = true //这里重新开启
-						}
-					}, 1000);
-				}
+			onMounted(() => {		
+				methods.getPaperDetail();
 			});
 			return {
 				...toRefs(data),

src/components/subject/judge.vue

@@ -37,7 +37,7 @@
 							</template>
 						</view>
 					</view>
-					<view class="AnswerContent" v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)">
+					<view class="AnswerContent" v-if="!isOperate">
 						<view>
 							<text style="color: #8c8a94">正确答案：</text>
 							<text class="isTrueAnswer">{{item1.Answer}}</text>，

src/components/subject/nounExplanation.vue

@@ -50,7 +50,7 @@
           </view>
           <view
             class="AnswerContent"
-            v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)"
+            v-if="!isOperate"
             style="margin-top: 30rpx"
           >
             <view>

src/components/subject/readingCompre.vue

@@ -114,7 +114,7 @@
 												<view v-html="item3.Content" class="chooseName"></view>
 											</view>
 										</view>
-										<view class="AnswerContent" v-if="ExamStatus==2||ExamStatus==3">
+										<view class="AnswerContent">
 											<view>
 												<text style="color: #8c8a94">正确答案：</text>
 												<text class="isTrueAnswer">{{item1.QuestionAnswerList[index2].SubAnswer}}</text>，
@@ -138,7 +138,7 @@
 										</view>
 									</view>
 									<view style="word-wrap: break-word; margin: 0 30rpx 30rpx 30rpx"
-										class="AnswerContent" v-if="item1.AnswerParse&&(ExamStatus==2||ExamStatus==3)">
+										class="AnswerContent" v-if="item1.AnswerParse">
 										<text style="color: #8c8a94">解析：</text>
 										<text style="color: #000">{{ item1.AnswerParse }}</text>
 									</view>

src/components/subject/shortAnswer.vue

@@ -49,7 +49,7 @@
           </view>
           <view
             class="AnswerContent"
-            v-if="!isOperate&&(ExamStatus==2||ExamStatus==3)"
+            v-if="!isOperate"
             style="margin-top: 30rpx"
           >
             <view>

src/pages/exam/examPaper.vue

@@ -345,7 +345,7 @@
       />
     </view>
     <view class="answer-con" v-if="isShowNotice">
-      <examNotice :paperData="peaperDetail" :ExamStatus="ExamStatus" @hideNotice="hideNotice" />
+      <examNotice :msg="msg" :ExamStatus="ExamStatus" @hideNotice="hideNotice" />
     </view>
     <van-toast id="van-toast" />
   </view>
@@ -604,9 +604,10 @@ export default {
 	  }
 	  if(this.ExamStatus == 3||this.ExamStatus==5){
 	    this.isOperate = false
+		this.msg.isShowAnswer = true;
 	  }
     }
-	await this.getPaperDetail();
+	await this.getPaperDetail();	
     if (options.showScore) {
       this.isShowAnswer = true;
       this.isShowAnswerSee = true;