修复bug

common/request.js

@@ -4,14 +4,14 @@ import store from '@/store/index.js'
 import api from './api.js'
 var num = 1
 //接口api   
-// export const BASE_URL = 'https://api.xyyxt.net'   //release
+export const BASE_URL = 'https://api.xyyxt.net'   //release
 // export const BASE_URL = 'http://120.79.166.78:19009'   //预发布
-export const BASE_URL = 'http://42.192.164.187:19005'    //test 
+// export const BASE_URL = 'http://42.192.164.187:19005'    //test 
 // export const BASE_URL = 'http://192.168.1.222:5055'    //dev
 
  //图片上传api
-// export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
-export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
+export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
+// export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
 
 // export const socket_url = 'ws://42.192.164.187:19005/webSocket/'  //test
 // export const socket_url = 'ws://120.79.166.78:19009/webSocket/'  //预发布

components/course/courseChapter.vue

@@ -44,7 +44,7 @@
               <view class="eTag">{{
                 itemM.doType == 1 ? "练习" : "考试"
               }}</view>
-              <view style="margin-left: 15rpx">{{ itemM.name }}</view>
+              <view style="margin-left: 15rpx;flex:1;">{{ itemM.name }}</view>
             </view>
             <view v-if="isRebuild || itemM.rebuild > 0" class="tagRe"
               >待重修</view
@@ -610,14 +610,14 @@ export default {
   text-align: center;
 }
 .eTag {
-  width: 56rpx;
-  height: 28rpx;
+	width:56rpx;
+	height:42rpx;
+	text-align: center;
+	line-height: 42rpx;
+	font-size: 20rpx;
   background: #007aff;
   border-radius: 8rpx;
   color: #ffffff;
-  font-size: 20rpx;
-  text-align: center;
-  line-height: 28rpx;
 }
 .examBox {
   display: flex;

components/course/courseSection.vue

@@ -24,7 +24,7 @@
 				</view>
 				<view v-if="menuItem.sectionType==null">{{menuItem.name || ''}}</view>
 			</view>
-			<view style="font-size: 20rpx;color: #FF3B30;"  v-if="menuItem.liveStartTime && menuItem.sectionType != 3">
+			<view style="font-size: 20rpx;color: #FF3B30;"  v-if="menuItem.liveStartTime && menuItem.sectionType != 3 && isBuy">
 				<view class="tagWillPlay" v-if="menuItem.liveStartTime>nowTime">
 					<text>待开播</text>
 				</view>

pages/index/index.vue

@@ -771,7 +771,7 @@ export default {
 		.notice {
 			background:#fff;
 			border-radius: 16rpx;
-			margin-top:16rpx;
+			margin-top:32rpx;
 			overflow: hidden;
 			&__content {
 				padding:0 8rpx;
@@ -985,7 +985,7 @@ export default {
 	}
 	
 	.my-list {
-		margin-top:16rpx;
+		margin:32rpx 0;
 		display:flex;
 		justify-content: space-between;
 		&__item {

pages2/bank/collectById.vue

@@ -110,7 +110,7 @@ export default {
 		goodsCollectExamList() {
 			this.$api.goodsCollectExamList({
 				paperId:this.paperid,
-				orderGoodsId:this.orderGoodsId
+				goodsId:this.goodsid
 			}).then(res => {
 				this.testList = res.data 
 				let total = 0;
@@ -124,7 +124,7 @@ export default {
 		collectQuestionTypeList() {
 			this.$api.collectQuestionTypeList({
 				paperId:this.paperid,
-				orderGoodsId:this.orderGoodsId
+				goodsId:this.goodsid
 			}).then(res => {
 				this.typeList = res.data 
 				let total = 0;

pages2/bank/questionBank.vue

@@ -1139,6 +1139,7 @@ export default {
       let passScore = 0;
       let doWrongQuestionIds = []; //错题和未做题id(客观题)
       let doQuestionIds = []; //做过的题目id
+      let lessQuestionNum = 0;
       let rightQuestionIds = []; //做对的题目id
       this.questionList.forEach((item, index) => {
         // passScore = item.passScore
@@ -1152,7 +1153,9 @@ export default {
           } else {
             //错误
             item.scoreResult = 0;
-            doWrongQuestionIds.push(item.questionId);
+						if (item.ques) {
+							doWrongQuestionIds.push(item.questionId);
+						}
           }
           allScore += item.score;
           if (item.ques) {
@@ -1176,7 +1179,8 @@ export default {
             item.scoreResult = item.score;
             rightQuestionIds.push(item.questionId);
           } else {
-            let checkboxScore = item.score; //获取单题总分数
+            let hasPart = false;
+            let checkboxScore = 1; //获取单题总分数
             item.ques &&
               item.ques.forEach((ques, quesIndex) => {
                 //选错一个全扣
@@ -1192,11 +1196,13 @@ export default {
 
             //没选错
             if (checkboxScore) {
+              checkboxScore = 0;
               item.ans.forEach((ans, quesIndex) => {
                 //漏选只能得部分分数
                 if (item.ques) {
                   if (item.ques.indexOf(item.ans[quesIndex]) == -1) {
-                    checkboxScore = item.partScore;
+                    checkboxScore = +item.partScore;
+                    hasPart = true;
                   }
                 } else {
                   checkboxScore = 0;
@@ -1204,14 +1210,17 @@ export default {
               });
             }
 
-            if (checkboxScore <= 0) {
+            if (!hasPart) {
               //0分
               item.scoreResult = 0;
-              doWrongQuestionIds.push(item.questionId);
+							if (item.ques) {
+								doWrongQuestionIds.push(item.questionId);
+							}
             } else {
               //部分分
               // number++;
-              doWrongQuestionIds.push(item.questionId);
+              lessQuestionNum++;
+              // doWrongQuestionIds.push(item.questionId);
               item.scoreResult = checkboxScore;
               score += checkboxScore;
               // rightQuestionIds.push(item.questionId)
@@ -1230,7 +1239,9 @@ export default {
             rightQuestionIds.push(item.questionId);
           } else {
             item.scoreResult = 0;
-            doWrongQuestionIds.push(item.questionId);
+						if (item.ques) {
+							doWrongQuestionIds.push(item.questionId);
+						}
           }
           allScore += item.score;
           if (item.ques) {
@@ -1269,6 +1280,7 @@ export default {
           recordId: this.recordId,
           rightQuestionNum: number,
           status: 1,
+					lessQuestionNum:lessQuestionNum,
           moduleExamId: this.moduleId || 0,
           chapterExamId: this.chapterId || 0,
           doQuestionIds: doQuestionIds.join(","),
@@ -1342,7 +1354,7 @@ export default {
               score += item.score;
               number++;
             } else {
-              let checkboxScore = item.score; //获取单题总分数
+              let checkboxScore = 1; //获取单题总分数
               item.ques &&
                 item.ques.forEach((ques, quesIndex) => {
                   //选错一个全扣
@@ -1934,6 +1946,7 @@ export default {
       let passScore = 0;
       let doWrongQuestionIds = []; //错题和未做题id(客观题)
       let doQuestionIds = []; //做过的题目id
+      let lessQuestionNum = 0;
       let rightQuestionIds = []; //做对的题目id
       this.questionList.forEach((item, index) => {
         passScore = item.passScore;
@@ -1947,7 +1960,9 @@ export default {
           } else {
             //错误
             item.scoreResult = 0;
-            doWrongQuestionIds.push(item.questionId);
+						if (item.ques) {
+							doWrongQuestionIds.push(item.questionId);
+						}
           }
           allScore += item.score;
           if (item.ques) {
@@ -1971,7 +1986,8 @@ export default {
             item.scoreResult = item.score;
             rightQuestionIds.push(item.questionId);
           } else {
-            let checkboxScore = item.score; //获取单题总分数
+            let hasPart = false;
+            let checkboxScore = 1; //获取单题总分数
             item.ques &&
               item.ques.forEach((ques, quesIndex) => {
                 //选错一个全扣
@@ -1992,6 +2008,7 @@ export default {
                 if (item.ques) {
                   if (item.ques.indexOf(item.ans[quesIndex]) != -1) {
                     checkboxScore += item.partScore;
+                    hasPart = true;
                   }
                 } else {
                   checkboxScore = 0;
@@ -1999,14 +2016,17 @@ export default {
               });
             }
 
-            if (checkboxScore <= 0) {
+            if (!hasPart) {
               //0分
               item.scoreResult = 0;
-              doWrongQuestionIds.push(item.questionId);
+							if (item.ques) {
+								doWrongQuestionIds.push(item.questionId);
+							}
             } else {
               //部分分
               // number++;
-              doWrongQuestionIds.push(item.questionId);
+							lessQuestionNum++
+              // doWrongQuestionIds.push(item.questionId);
               item.scoreResult = checkboxScore;
               score += checkboxScore;
               // rightQuestionIds.push(item.questionId)
@@ -2025,7 +2045,9 @@ export default {
             rightQuestionIds.push(item.questionId);
           } else {
             item.scoreResult = 0;
-            doWrongQuestionIds.push(item.questionId);
+						if (item.ques) {
+							doWrongQuestionIds.push(item.questionId);
+						}
           }
           allScore += item.score;
           if (item.ques) {
@@ -2064,6 +2086,7 @@ export default {
           rightQuestionNum: number,
           orderGoodsId: this.orderGoodsId,
           status: 1,
+					lessQuestionNum:lessQuestionNum,
           moduleExamId: this.moduleId || 0,
           chapterExamId: this.chapterId || 0,
           doQuestionIds: doQuestionIds.join(","),

pages2/bank/questionBankContinue.vue

@@ -439,7 +439,7 @@
 				<view class="popupContent">
 					<scroll-view scroll-y="true" style="height: 506rpx;">
 						<view class="boxSty">
-							<view v-for="(item, index) in questionList" :key="index" @click="changeIndex(index)" :class="{isRight:isRight(item,index),isWrong:isWrong(item,index),isOver:isOver(item,index)}" class="liListSty">{{ index + 1 }}</view>
+							<view v-for="(item, index) in questionList" :key="index" @click="changeIndex(index)" :class="{isRight:isRight(item,index),isWrong:isWrong(item,index),isOver:isOver(item,index),isPart: isPart(item, index)}" class="liListSty">{{ index + 1 }}</view>
 						</view>
 					</scroll-view>
 				</view>
@@ -837,6 +837,7 @@ export default {
 			let doWrongQuestionIds = []; //错题和未做题id(客观题)
 			let doQuestionIds = []; //做过的题目id
 			let rightQuestionIds = []; //做对的题目id
+			let lessQuestionNum = 0;
 			this.questionList.forEach((item,index) => {
 				passScore = item.passScore
 				if(item.type == 1) {
@@ -866,7 +867,8 @@ export default {
 						number++
 						rightQuestionIds.push(item.questionId)
 					} else {
-						let checkboxScore = item.score;  //获取单题总分数
+            let hasPart = false;
+						let checkboxScore = 1;  //获取单题总分数
 						item.ques && item.ques.forEach((ques,quesIndex) => {
 							//选错一个全扣
 							if(item.ques) {
@@ -888,6 +890,7 @@ export default {
 									
 									if(item.ques.indexOf(item.ans[quesIndex]) != -1) {
 										checkboxScore += item.partScore;
+										hasPart = true;
 									}
 								} else {
 									checkboxScore = 0;
@@ -896,12 +899,13 @@ export default {
 						}
 						
 						
-						if(checkboxScore <= 0) { //0分
+						if(!hasPart) { //0分
 							item.scoreResult = 0;
 							doWrongQuestionIds.push(item.questionId)
 						} else { //部分分
 							// number++;
-							doWrongQuestionIds.push(item.questionId)
+							// doWrongQuestionIds.push(item.questionId)
+              lessQuestionNum++;
 							item.scoreResult = checkboxScore;
 							score += checkboxScore;
 							// rightQuestionIds.push(item.questionId)
@@ -955,6 +959,7 @@ export default {
 				totalScore:allScore,
 				recordId: this.recordId,
 				rightQuestionNum:number,
+				lessQuestionNum:lessQuestionNum,
 				status:1,
 				moduleExamId:this.moduleId || 0,
 				chapterExamId:this.chapterId || 0,
@@ -1085,6 +1090,7 @@ export default {
 			let doWrongQuestionIds = []; //错题和未做题id(客观题)
 			let doQuestionIds = []; //做过的题目id
 			let rightQuestionIds = []; //做对的题目id
+      let lessQuestionNum = 0;
 			this.questionList.forEach((item, index) => {
 				// passScore = item.passScore
 				if (item.type == 1) {
@@ -1096,7 +1102,9 @@ export default {
 						rightQuestionIds.push(item.questionId)
 					} else { //错误
 						item.scoreResult = 0;
-						doWrongQuestionIds.push(item.questionId)
+						if (item.ques) {
+							doWrongQuestionIds.push(item.questionId);
+						}
 					}
 					allScore += item.score;
 					if (item.ques) {
@@ -1121,7 +1129,8 @@ export default {
 						item.scoreResult = item.score;
 						rightQuestionIds.push(item.questionId)
 					} else {
-						let checkboxScore = item.score;  //获取单题总分数
+            let hasPart = false;
+						let checkboxScore = 1;  //获取单题总分数
 						item.ques && item.ques.forEach((ques,quesIndex) => {
 							//选错一个全扣
 							if(item.ques) {
@@ -1143,6 +1152,7 @@ export default {
 									
 									if(item.ques.indexOf(item.ans[quesIndex]) != -1) {
 										checkboxScore += item.partScore;
+                    hasPart = true;
 									}
 								} else {
 									checkboxScore = 0;
@@ -1151,12 +1161,15 @@ export default {
 						}
 						
 						
-						if(checkboxScore <= 0) { //0分
+						if(!hasPart) { //0分
 							item.scoreResult = 0;
-							doWrongQuestionIds.push(item.questionId)
+							if (item.ques) {
+								doWrongQuestionIds.push(item.questionId);
+							}
 						} else { //部分分
 							// number++;
-							doWrongQuestionIds.push(item.questionId)
+							lessQuestionNum++
+							// doWrongQuestionIds.push(item.questionId)
 							item.scoreResult = checkboxScore;
 							score += checkboxScore;
 							// rightQuestionIds.push(item.questionId)
@@ -1175,7 +1188,9 @@ export default {
 						rightQuestionIds.push(item.questionId)
 					} else {
 						item.scoreResult = 0;
-						doWrongQuestionIds.push(item.questionId)
+						if (item.ques) {
+							doWrongQuestionIds.push(item.questionId);
+						}
 					}
 					allScore += item.score;
 					if (item.ques) {
@@ -1211,6 +1226,7 @@ export default {
 					reportStatus:reportStatus,
 					recordId: this.recordId,
 					rightQuestionNum: number,
+					lessQuestionNum:lessQuestionNum,
 					status: 1,
 					moduleExamId:this.moduleId || 0,
 					chapterExamId:this.chapterId || 0,
@@ -1970,6 +1986,12 @@ export default {
 		background: #36C75A;
 	}
 	
+	&.isPart {
+	  border: 1rpx solid #eeeeee;
+	  color: #fff;
+	  background: #FFC53D;
+	}
+	
 	&.isWrong {
 		border:1rpx solid #EEEEEE;
 		color:#fff;

pages2/bank/question_report.vue

@@ -10,7 +10,28 @@
 
 			<view class="box">
 				<view class="left">
-					<view>{{ (((reportdata.rightQuestionNum / (reportdata.rightQuestionNum + wrongRecordWrongNum)) || 0) * 100).toFixed(0)}}%</view>
+					<view>
+						<!-- 练习 -->
+						<template v-if="examData.doType == 1">
+							{{
+								((reportdata.rightQuestionNum /
+									reportdata.doQuestionNum || 0).toFixed(0) *
+									100)
+									
+							}}%
+						</template>
+						<!-- 考试 -->
+						<template v-if="examData.doType == 2">
+							{{
+								((reportdata.rightQuestionNum /
+									reportdata.totalQuestionNum || 0).toFixed(0) *
+									100)
+									
+							}}%
+						</template>
+					<!-- {{ (((reportdata.rightQuestionNum / (reportdata.rightQuestionNum + wrongRecordWrongNum)) || 0) * 100).toFixed(0)}}% -->
+					
+					</view>
 					<view>正确率</view>
 					<view>不含简答/案例题</view>
 				</view>
@@ -25,7 +46,7 @@
 						<!-- <u-icon name="checkmark" color="#16D48B" size="48" style="margin-right: 14rpx;"></u-icon> -->
 						<image class="out_num"  src="/static/out_num.png" mode="widthFix"></image>
 						<view class="text">少选题数</view>
-						<text class="yellow">{{ reportdata.rightQuestionNum }}</text>
+						<text class="yellow">{{ reportdata.lessQuestionNum }}</text>
 					</view>
 					<view class="flex down">
 						<!-- <u-icon name="close" color="#FF3B30" size="38" style="margin-right: 26rpx;"></u-icon> -->

pages2/bank/question_statistics.vue

@@ -55,7 +55,14 @@
 											<view class="desc">
 												<view class="flex-auto">
 													正确率
-													<text class="green">{{article.totalQuestionNum != 0 ?((article.rightQuestionNum / article.totalQuestionNum * 100).toFixed(0)) : 0 +'%'}}</text>
+													<text class="green">
+														<template v-if="article.doType == 1">
+															{{article.doQuestionNum != 0 ?((article.rightQuestionNum / article.doQuestionNum * 100).toFixed(0)) + '%' : 0 +'%'}}
+														</template>
+														<template v-if="article.doType == 2">
+															{{article.totalQuestionNum != 0 ?((article.rightQuestionNum / article.totalQuestionNum * 100).toFixed(0)) + '%' : 0 +'%'}}
+														</template>
+													</text>
 												</view>
 												<view class="flex-auto">
 													已完成
@@ -88,7 +95,15 @@
 									<view class="desc">
 										<view class="flex-auto">
 											正确率
-											<text class="green">{{article.totalQuestionNum != 0 ?((article.rightQuestionNum / article.totalQuestionNum * 100).toFixed(0)) : 0 +'%'}}</text>
+											<text class="green">
+												<template v-if="article.doType == 1">
+													{{article.doQuestionNum != 0 ?((article.rightQuestionNum / article.doQuestionNum * 100).toFixed(0)) + '%' : 0 +'%'}}
+												</template>
+												<template v-if="article.doType == 2">
+													{{article.totalQuestionNum != 0 ?((article.rightQuestionNum / article.totalQuestionNum * 100).toFixed(0)) + '%' : 0 +'%'}}
+												</template>
+											</text>
+											
 										</view>
 										<view class="flex-auto">
 											已完成
@@ -110,7 +125,14 @@
 								<view class="desc">
 									<view class="flex-auto">
 										正确率
-										<text class="green">{{item1.totalQuestionNum != 0 ?((item1.rightQuestionNum / item1.totalQuestionNum * 100).toFixed(0)) : 0+'%'}}</text>
+										<text class="green">
+											<template v-if="item1.doType == 1">
+												{{item1.doQuestionNum != 0 ?((item1.rightQuestionNum / item1.doQuestionNum * 100).toFixed(0)) + '%' : 0 +'%'}}
+											</template>
+											<template v-if="item1.doType == 2">
+												{{item1.totalQuestionNum != 0 ?((item1.rightQuestionNum / item1.totalQuestionNum * 100).toFixed(0)) + '%' : 0 +'%'}}
+											</template>
+										</text>
 									</view>
 									<view class="flex-auto">
 										已完成

pages2/bank/wrongById.vue

@@ -112,7 +112,7 @@ export default {
 		wrongRecordList() {
 			this.$api.wrongRecordList({
 				paperId:this.paperid,
-				orderGoodsId:this.orderGoodsId
+				goodsId:this.goodsid
 			}).then(res => {
 				this.testList = res.data;
 				let total = 0;
@@ -126,7 +126,7 @@ export default {
 		wrongRecordTypeList() {
 			this.$api.wrongRecordTypeList({
 				paperId:this.paperid,
-				orderGoodsId:this.orderGoodsId
+				goodsId:this.goodsid
 			}).then(res => {
 				this.typeList = res.data;
 				

pages2/class/questionBank.vue

@@ -1367,7 +1367,8 @@ export default {
             score += item.score;
             number++;
           } else {
-            let checkboxScore = item.score; //获取单题总分数
+            let hasPart = false;
+            let checkboxScore = 1; //获取单题总分数
             item.ques &&
               item.ques.forEach((ques, quesIndex) => {
                 //选错一个全扣
@@ -1388,6 +1389,7 @@ export default {
                 if (item.ques) {
                   if (item.ques.indexOf(item.ans[quesIndex]) != -1) {
                     checkboxScore += item.partScore;
+                    hasPart = true;
                   }
                 } else {
                   checkboxScore = 0;
@@ -1395,7 +1397,7 @@ export default {
               });
             }
 
-            if (checkboxScore <= 0) {
+            if (!hasPart) {
               item.scoreResult = 0;
             } else {
               item.scoreResult = checkboxScore;
@@ -1473,6 +1475,7 @@ export default {
         let score = 0;
         let doQuestionNum = 0;
         let reportStatus = 0;
+				let lessQuestionNum = 0;
         this.questionList.forEach((item, index) => {
           if (item.type == 1) {
             if (item.ques == item.ans) {
@@ -1494,7 +1497,8 @@ export default {
               score += item.score;
               number++;
             } else {
-              let checkboxScore = item.score; //获取单题总分数
+							let hasPart = false;
+              let checkboxScore = 1; //获取单题总分数
               item.ques.forEach((ques, quesIndex) => {
                 //选错一个全扣
                 if (item.ques) {
@@ -1508,11 +1512,13 @@ export default {
 
               //没选错
               if (checkboxScore) {
+								checkboxScore = 0;
                 item.ans.forEach((ans, quesIndex) => {
                   //漏选扣一部分
                   if (item.ques) {
                     if (item.ques.indexOf(item.ans[quesIndex]) == -1) {
-                      checkboxScore = item.partScore;
+                      checkboxScore += item.partScore;
+											hasPart = true;
                     }
                   } else {
                     checkboxScore = 0;
@@ -1520,9 +1526,10 @@ export default {
                 });
               }
 
-              if (checkboxScore <= 0) {
+              if (!hasPart) {
                 item.scoreResult = 0;
               } else {
+								lessQuestionNum++
                 item.scoreResult = checkboxScore;
                 score += checkboxScore;
                 // number++;
@@ -1566,6 +1573,7 @@ export default {
             orderGoodsId: this.orderGoodsId,
             goodsId: this.goodsId,
             recordId: this.recordId,
+						lessQuestionNum:lessQuestionNum,
             performance: score,
             reportStatus: reportStatus,
             status: 1,
@@ -1995,6 +2003,7 @@ export default {
       let doWrongQuestionIds = []; //错题和未做题id(客观题)
       let doQuestionIds = []; //做过的题目id
       let rightQuestionIds = []; //做对的题目id
+      let lessQuestionNum = 0;
       this.questionList.forEach((item, index) => {
         passScore = item.passScore;
         if (item.type == 1) {
@@ -2007,7 +2016,10 @@ export default {
           } else {
             //错误
             item.scoreResult = 0;
-            doWrongQuestionIds.push(item.questionId);
+						if (item.ques) {
+							doWrongQuestionIds.push(item.questionId);
+						}
+            
           }
           allScore += item.score;
           if (item.ques) {
@@ -2031,7 +2043,8 @@ export default {
             item.scoreResult = item.score;
             rightQuestionIds.push(item.questionId);
           } else {
-            let checkboxScore = item.score; //获取单题总分数
+            let hasPart = false;
+            let checkboxScore = 1; //获取单题总分数
             item.ques &&
               item.ques.forEach((ques, quesIndex) => {
                 //选错一个全扣
@@ -2053,6 +2066,7 @@ export default {
                 if (item.ques) {
                   if (item.ques.indexOf(item.ans[quesIndex]) != -1) {
                     checkboxScore += item.partScore;
+										hasPart = true;
                   }
                 } else {
                   checkboxScore = 0;
@@ -2060,14 +2074,17 @@ export default {
               });
             }
 
-            if (checkboxScore <= 0) {
+            if (!hasPart) {
               //0分
               item.scoreResult = 0;
-              doWrongQuestionIds.push(item.questionId);
+							if (item.ques) {
+								doWrongQuestionIds.push(item.questionId);
+							}
             } else {
               //部分分
               // number++;
-              doWrongQuestionIds.push(item.questionId);
+              // doWrongQuestionIds.push(item.questionId);
+							lessQuestionNum++
               item.scoreResult = checkboxScore;
               score += checkboxScore;
               // rightQuestionIds.push(item.questionId)
@@ -2086,7 +2103,9 @@ export default {
             rightQuestionIds.push(item.questionId);
           } else {
             item.scoreResult = 0;
-            doWrongQuestionIds.push(item.questionId);
+						if (item.ques) {
+							doWrongQuestionIds.push(item.questionId);
+						}
           }
           allScore += item.score;
           if (item.ques) {
@@ -2161,7 +2180,9 @@ export default {
                   "&totalScore=" +
                   allScore +
                   "&reportStatus=" +
-                  reportStatus,
+                  reportStatus +
+									"&lessQuestionNum=" +
+									lessQuestionNum
               });
             }, 1000);
           }

pages2/class/question_report.vue

@@ -21,13 +21,13 @@
 					</view>
 					<view class="flex up">
 						<!-- <u-icon name="checkmark" color="#16D48B" size="48" style="margin-right: 14rpx;"></u-icon> -->
-						<image class="right_num"  src="/static/right_num.png" mode="widthFix"></image>
+						<image class="right_num"  src="/static/out_num.png" mode="widthFix"></image>
 						<view class="text">少选题数</view>
-						<text class="yellow">{{ rightQuestionNum }}</text>
+						<text class="yellow">{{ lessQuestionNum }}</text>
 					</view>
 					<view class="flex down">
 						<!-- <u-icon name="close" color="#FF3B30" size="38" style="margin-right: 26rpx;"></u-icon> -->
-						<image class="right_num"  src="/static/right_num.png" mode="widthFix"></image>
+						<image class="right_num"  src="/static/wrong_num.png" mode="widthFix"></image>
 						<view class="text">错误题数</view>
 						<text class="red">{{ doWrongQuestionNum }}</text>
 					</view>
@@ -72,6 +72,7 @@ export default {
 			doTime:'',
 			examTime:'',
 			reportStatus:null,
+			lessQuestionNum:0,
 		};
 	},
 	onUnload() {},
@@ -151,6 +152,7 @@ export default {
 		this.rightQuestionNum = +option.rightQuestionNum;
 		this.doWrongQuestionNum = +option.doWrongQuestionNum;
 		this.score = +option.score;
+		this.lessQuestionNum = option.lessQuestionNum;
 		this.totalScore = +option.totalScore;
 		// this.hideBtns = Boolean(option.hideBtns);
 		

pages2/wd/class.vue

@@ -80,7 +80,7 @@
 							</view>
 						</view>
 						<!-- 学时审核状态不可审核 -->
-						<template v-if="item.periodStatus == -1">
+						<template v-if="item.periodStatus == -1 || item.periodStatus == 2">
 
 							<view class="class-warm" v-if="item.classStatus == 1 || item.classStatus === null">
 								<view class="class-warm__text">
@@ -88,10 +88,10 @@
 										<template
 											v-if="sysTime >= item.serviceStartTime && sysTime <= item.serviceEndTime">
 											学习状态：
-											<text v-if="item.stuAllNum == 0">未学习</text>
+											<text v-if="item.stuAllNum+item.recordNum == 0">未学习</text>
 											<text
-												v-else-if="item.stuAllNum > 0 && item.stuAllNum < item.secAllNum">学习中</text>
-											<text v-else-if="item.stuAllNum >= item.secAllNum">已学完</text>
+												v-else-if="item.stuAllNum+item.recordNum > 0 && item.stuAllNum+item.recordNum < item.secAllNum+item.examNum">学习中</text>
+											<text v-else-if="item.stuAllNum+item.recordNum >= item.secAllNum+item.examNum">已学完</text>
 										</template>
 										<template v-else>
 											已过学习服务期，不可以学习了哦！
@@ -119,7 +119,7 @@
 								<view class="class-warm__text">
 									<view class="date">
 										<text v-if="item.periodStatus == 0">机构审核：学时审核不通过</text>
-										<text v-else-if="item.periodStatus == 2">学时待审核</text>
+										<!-- <text v-else-if="item.periodStatus == 2">学时待审核</text> -->
 										<text v-else-if="item.periodStatus == 3">学时审核中</text>
 										<text v-else-if="item.periodStatus == 1">
 											<text v-if="item.periodPlush > 0">学时已上报注册中心</text>

uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue

@@ -16,7 +16,7 @@
 				</view>
 				<view class="uni-navbar__header-container uni-navbar__content_view" @tap="onClickTitle">
 					<view class="uni-navbar__header-container-inner uni-navbar__content_view" v-if="title.length">
-						<text class="uni-nav-bar-text" :style="{color: color }">{{ title }}</text>
+						<text class="uni-nav-bar-text" style="white-space: nowrap;" :style="{color: color }">{{ title }}</text>
 					</view>
 					<!-- 标题插槽 -->
 					<slot />