Merge branch 'main' of https://gogs.mtavip.com/wangguoyu/uniProject

components/dialog/commonDialog.vue

@@ -6,7 +6,7 @@
 			<view class="common-title">{{title}}</view>
 			<view class="common-content" :class="dialogContentClass">{{content}}</view>
 			<view class="common-btn-box">
-				<view class="not-confirm-btn" @click="handleClose">{{notBtn}}</view>
+				<view class="not-confirm-btn" v-if="showNotBtn" @click="handleClose">{{notBtn}}</view>
 				<view class="confirm-btn" @click="confirmBtn">{{okBtn}}</view>
 			</view>
 		</view>
@@ -31,9 +31,12 @@
 	  	require: true,
 	    default: 'content-center-class'
 	  },
+	  showNotBtn: {
+		  type: Boolean,
+		  default: true
+	  },
 	  notBtn: {
 	    type: String,
-	  	require: true,
 	    default: '取消'
 	  },
 	  okBtn: {

pages/exam/exam.vue

@@ -93,13 +93,13 @@
 		<!-- 考试得分 -->
 		<submitScoreVue ref="subScoreRef" @confirm="handleScoreConfirm" @close="handleScoreClose"></submitScoreVue>
 		<!-- 人工 -->
-		<common-dialog ref="dl3ref" title="考试得分" :notBtn="false" content="等待人工评分结束后，可登录 “个人成绩” 模块，查看本次考试的成绩！"
+		<common-dialog ref="dl4ref" title="考试得分" :showNotBtn="false"  content="等待人工评分结束后，可登录 “个人成绩” 模块，查看本次考试的成绩！"
 			@confirm-btn="handleBack"></common-dialog>
 		<!-- 直接出成绩 -->
-		<common-dialog ref="dl4ref" title="考试得分" :notBtn="false"
+		<common-dialog ref="dl3ref" title="考试得分" :showNotBtn="false"
 			:content="`您的成绩，将在${seeResultTime}公布。您可以登录“个人成绩”模块，查看本次考试的成绩！`" @confirm-btn="handleBack"></common-dialog>
 		<!-- 不发布成绩 -->
-		<common-dialog ref="dl5ref" :notBtn="false" title="提示" content="交卷成功!"
+		<common-dialog ref="dl5ref" :showNotBtn="false" title="提示" content="交卷成功!"
 			@confirm-btn="handleBack"></common-dialog>
 	</view>
 </template>
@@ -529,9 +529,11 @@
 		ksApi.getClientKsSubmit(result).then(res => {
 			if (res.code == 0) {
 				let data1 = res.data;
+				console.log('data1',data1)
+				console.log('data1.waitGrade === false',data1.waitGrade === false)
 				// 清空缓存
 				removeCacheKs(data1.operId);
-				if (data1.waitGrade === false) {
+				if (data1.waitGrade == false) {
 					//  describe:修改bug seeResultFlag  发布成绩标记（0不发布、1立即发布、2定时发布)
 					if (data1.seeResultFlag === 1) {
 						subScoreRef.value.showDialog(data1);
@@ -681,8 +683,8 @@
 		// }
 
 		uni.navigateBack()
-		clearInterval(autoSaveInterval.value)
-		clearInterval(autoSaveInterval2.value)
+		autoSaveInterval.value && clearInterval(autoSaveInterval.value)
+		autoSaveInterval2.value && clearInterval(autoSaveInterval2.value)
 	}
 
 	function showAnswerCard() {