暂存

pages/miniClass/classInfo.vue

@@ -283,8 +283,8 @@
 											<text>{{item.title}}</text>
 										</view>
 										<view :class="['leve2']">
-											<view :class="[item.zhedie ? '' : 'zhedie']">
-												{{item.content}}
+											<view :class="[item.zhedie ? '' : 'zhedie']" v-html="item.content">
+												
 											</view>
 
 										</view>
@@ -297,7 +297,7 @@
 												<text style="" class="date">日期：{{item.createTime}}</text>
 											</view>
 											<view class="">
-												<view class="score" v-if="item.scoreSuccess == 1">
+												<view class="score" v-if="item.scoreSuccess >= 1">
 													分数：{{item.score}}
 												</view>
 											</view>
@@ -434,7 +434,8 @@
 			</view>
 		</u-popup>
 		<!-- <addCerInfo v-if="showSubmitInfoBlank" :submitInfo="submitInfo" @close="closeManager" ></addCerInfo> -->
-		<u-popup key="5" :show="showSubmitInfoBlank" :round="10" @close="closeManager">
+		<u-popup key="5" :show="showSubmitInfoBlank" :round="10" @close="closeManager" z-index="998"
+			overlay-style="z-index:998">
 			<view class="guanli userinfoPup">
 				<view class="" style="text-align: center; margin-bottom: 40rpx;">
 					<h3>信息确认</h3>
@@ -673,7 +674,7 @@
 			if (this.thisClass.state == '3' || this.thisClass.state == '2') {
 				var ll = await this.getPaperList()
 				console.log('this.paperList.length', this.paperList.length);
-				if (!this.showAlert && this.paperList.length <= 0) {
+				if (!this.showAlert && this.paperList.length <= 0 && this.thisClass.state == '3') {
 					uni.showModal({
 						title: '提示',
 						content: '您好,当前教学进度已进入考试周,请尽快完成最终的笔试考试,如在结班之前未完成考试,则卷面成绩记为0分',
@@ -1057,7 +1058,8 @@
 					type = 'A'
 				}else{
 					uni.showToast({
-						title:'您的成绩未达到证书水平，请继续努力'
+						title:'您的成绩未达到证书水平，请继续努力',
+						icon: 'none'
 					})
 					 return
 				}
@@ -1115,7 +1117,7 @@
 						if (res.code == 0) {
 							this.performanceScore = res.result
 							console.log('平时成绩e-------', this.performanceScore);
-							if (this.performanceScore.userScore < 60) {
+							if (this.performanceScore.userScore < 60 && this.thisClass.state == '2') {
 								this.getNewCLassInfo()
 							}else{
 								// >= 60

pages/miniClass/xindeList.vue

@@ -10,11 +10,11 @@
 							<view class="leve1 flex_box">
 								<text>{{item.title}}</text>
 							</view>
-							<view class="leve2">
-								{{item.content}}
+							<view class="leve2" v-html="item.content">
+								<!-- {{item.content}} -->
 							</view>
 							<view class="leve3">
-								<view class="score" v-if="item.scoreSuccess == 1">
+								<view class="score" v-if="item.scoreSuccess >= 1">
 									分数：{{item.score}}
 								</view>
 								<view class="score noscore" v-else>未评分</view>
@@ -62,7 +62,8 @@
 					</view>
 					<!--  -->
 					<template
-						v-if="roleCode.includes('4') && curReplay.scoreSuccess != 1  || roleCode.includes('5') && curReplay.scoreSuccess != 1 && (classState == '1' || classState == '3')">
+						v-if="roleCode.includes('4') && curReplay.scoreSuccess != 1  || 
+						roleCode.includes('5') && curReplay.scoreSuccess != 1 && (classState == '1' || classState == '3')">
 						<view class="" style="  padding: 10rpx 10rpx; margin-top: 20rpx;">
 							<view class="scoreBox flex_box">
 								<text>分数</text>