chenxiong 3 år sedan
förälder
incheckning
764b8e38a8

+ 2 - 2
pages/course/index.vue

@@ -40,7 +40,7 @@
 				<view class="listBox">
 					<navigator  hover-class="none" :url="'/pages3/course/detail?id='+item.goodsId" v-for="(item,index) in list1" :key="index" >
 						<view class="itemBox">
-							<image :src="$method.splitImgHost(item.coverUrl, true)" style="height: 316rpx;width: 100%;border-radius: 24rpx;"></image>
+							<image :src="$method.splitImgHost(item.coverUrl, true)" style="height: 367rpx;width: 100%;border-radius: 24rpx;"></image>
 							<view style="display: flex;margin-top: 13rpx;align-items: center;">
 								<view class="yearTag" v-if="item.year">{{item.year}}</view>
 								<view class="titleTag">{{item.goodsName}}</view>
@@ -61,7 +61,7 @@
 				<view class="listBox">
 					<navigator  hover-class="none" :url="'/pages2/bank/detail?id='+item.goodsId" v-for="(item,index) in list2" :key="index" >
 						<view class="itemBox">
-							<image :src="$method.splitImgHost(item.coverUrl, true)" style="height: 316rpx;width: 100%;border-radius: 24rpx;"></image>
+							<image :src="$method.splitImgHost(item.coverUrl, true)" style="height: 367rpx;width: 100%;border-radius: 24rpx;"></image>
 							<view style="display: flex;margin-top: 13rpx;align-items: center;">
 								<view class="yearTag" v-if="item.year">{{item.year}}</view>
 								<view class="titleTag" style="display: flex;justify-content: space-between;flex:1;">

+ 1 - 1
pages/index/index.vue

@@ -925,7 +925,7 @@ export default {
 					border-radius: 16rpx ;
 					overflow: hidden;
 					width: 320rpx;
-					height: 155rpx;
+					height: 180rpx;
 					
 					image {
 						width:100%;

+ 1 - 1
pages/shopping/shoppingCart.vue

@@ -601,7 +601,7 @@ page {
 					image {
 						display: block;
 						width: 278rpx;
-						height: 134rpx;
+						height: 156rpx;
 						
 					}
 				}

+ 1 - 1
pages2/bank/my_question.vue

@@ -151,7 +151,7 @@
 		.img {
 			width:100%;
 			border-radius: 24rpx;
-			height: 316rpx;
+			height: 376rpx;
 		}
 	}
 </style>

+ 1 - 1
pages2/bank/questionBank.vue

@@ -2957,7 +2957,7 @@ export default {
   &.isPart {
     border: 1rpx solid #eeeeee;
     color: #fff;
-    background: #fadb14;
+    background: #FFC53D;
   }
 
   &.isOver {

+ 1 - 1
pages2/bank/questionBankAllExplain.vue

@@ -1178,7 +1178,7 @@ export default {
   &.isPart {
     border: 1rpx solid #eeeeee;
     color: #fff;
-    background: #fadb14;
+    background: #FFC53D;
   }
 }
 .answerInfos {

+ 1 - 1
pages2/bank/questionBankExplainDetail.vue

@@ -2160,7 +2160,7 @@ export default {
   &.isPart {
     border: 1rpx solid #eeeeee;
     color: #fff;
-    background: #fadb14;
+    background: #FFC53D;
   }
 }
 .answerInfos {

+ 1 - 1
pages2/bank/questionBankWrongExplain.vue

@@ -1194,7 +1194,7 @@ export default {
   &.isPart {
     border: 1rpx solid #eeeeee;
     color: #fff;
-    background: #fadb14;
+    background: #FFC53D;
   }
 }
 .answerInfos {

+ 6 - 4
pages2/bank/question_record.vue

@@ -28,7 +28,7 @@
 					</view>
 				</view>
 				<view class="btns">
-					<view class="btn" v-if="record.status == 1" @click="doRepeat(record.examId, record.goodsId, record.moduleExamId, record.chapterExamId,index)">重做</view>
+					<view class="btn" v-if="record.status == 1" @click="doRepeat(record.examId, record.goodsId, record.moduleExamId, record.chapterExamId,index,record)">重做</view>
 					<view class="btn" @click="questionBankExplain(record)" v-if="record.status == 1">解析</view>
 					<view class="btn" @click="questionReport(record)" v-if="record.status == 1">报告</view>
 					<view class="btn continue" @click="doContinue(record,index)" v-if="record.status == 0 && record.historyExamJson">继续答题</view>
@@ -197,13 +197,15 @@ export default {
 						'&moduleId=' +
 						record.moduleExamId +
 						'&chapterId=' +
-						record.chapterExamId
+						record.chapterExamId + 
+						'&orderGoodsId=' +
+						record.orderGoodsId
 			})
 		},
 		/**
 		 * 去做题
 		 */
-		async doRepeat(id, goodsId, moduleId = 0, chapterId = 0,index) {
+		async doRepeat(id, goodsId, moduleId = 0, chapterId = 0,index,record) {
 			// await this.getDetail(goodsId);
 			this.itemIndex = '';
 			this.isRepeat = true;
@@ -216,7 +218,7 @@ export default {
 			}
 
 			uni.navigateTo({
-				url: '/pages2/bank/questionBank?id=' + id + '&goodsid=' + goodsId + '&moduleId=' + moduleId + '&chapterId=' + chapterId + ''
+				url: '/pages2/bank/questionBank?id=' + id + '&goodsid=' + goodsId + '&moduleId=' + moduleId + '&chapterId=' + chapterId + '&orderGoodsId=' + record.orderGoodsId
 			});
 		},
 		/**

+ 6 - 4
pages2/bank/question_record_list.vue

@@ -17,7 +17,7 @@
 					</view>
 				</view>
 				<view class="btns">
-					<view class="btn" v-if="record.status == 1" @click="doRepeat(record.examId, record.goodsId, record.moduleExamId, record.chapterExamId,index)">重做</view>
+					<view class="btn" v-if="record.status == 1" @click="doRepeat(record.examId, record.goodsId, record.moduleExamId, record.chapterExamId,index,record)">重做</view>
 					<view class="btn" @click="questionBankExplain(record)" v-if="record.status == 1">解析</view>
 					<view class="btn" @click="questionReport(record)" v-if="record.status == 1">报告</view>
 					<view class="btn continue" @click="doContinue(record,index)" v-if="record.status == 0 && record.historyExamJson">继续答题</view>
@@ -153,13 +153,15 @@ export default {
 						'&moduleId=' +
 						record.moduleExamId +
 						'&chapterId=' +
-						record.chapterExamId
+						record.chapterExamId + 
+						'&orderGoodsId=' +
+						record.orderGoodsId
 			})
 		},
 		/**
 		 * 去做题
 		 */
-		async doRepeat(id, goodsId, moduleId = 0, chapterId = 0,index) {
+		async doRepeat(id, goodsId, moduleId = 0, chapterId = 0,index,record) {
 			// await this.getDetail(goodsId);
 			this.itemIndex = '';
 			this.isRepeat = true;
@@ -172,7 +174,7 @@ export default {
 			}
 
 			uni.navigateTo({
-				url: '/pages2/bank/questionBank?id=' + id + '&goodsid=' + goodsId + '&moduleId=' + moduleId + '&chapterId=' + chapterId + ''
+				url: '/pages2/bank/questionBank?id=' + id + '&goodsid=' + goodsId + '&moduleId=' + moduleId + '&chapterId=' + chapterId + '&orderGoodsId='+record.orderGoodsId
 			});
 		},
 		/**

+ 30 - 7
pages2/bank/question_report.vue

@@ -16,14 +16,20 @@
 				</view>
 				<view class="right">
 					<view class="flex up">
-						<u-icon name="checkmark" color="#16D48B" size="48" style="margin-right: 14rpx;"></u-icon>
-						<!-- <image src="/static/5-4_03.png" mode=""></image> -->
+						<!-- <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>
 						<view class="text">正确题数</view>
 						<text class="green">{{ reportdata.rightQuestionNum }}</text>
 					</view>
+					<view class="flex up">
+						<!-- <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>
+					</view>
 					<view class="flex down">
-						<u-icon name="close" color="#FF3B30" size="38" style="margin-right: 26rpx;"></u-icon>
-						<!-- <image src="/static/5-4_03.png" mode=""></image> -->
+						<!-- <u-icon name="close" color="#FF3B30" size="38" style="margin-right: 26rpx;"></u-icon> -->
+						<image class="wrong_num" src="/static/wrong_num.png" mode="widthFix"></image>
 						<view class="text">错误题数</view>
 						<text class="red">{{ wrongRecordWrongNum }}</text>
 					</view>
@@ -397,7 +403,7 @@ page {
 
 		.left {
 			width: 250rpx;
-			height: 176rpx;
+			height: 272rpx;
 			background: #f5f5f5;
 			border-radius: 16rpx;
 			display: flex;
@@ -441,9 +447,22 @@ page {
 				border-radius: 16rpx;
 
 				image {
-					width: 30rpx;
-					height: 30rpx;
 					margin-right: 28rpx;
+					
+					&.right_num {
+						width:26rpx;
+					}
+					
+					&.out_num {
+						width:38rpx;
+						
+					}
+					
+					&.wrong_num {
+						width:30rpx;
+						
+					}
+					
 				}
 
 				.text {
@@ -463,6 +482,10 @@ page {
 					&.green {
 						color: #36C75A;
 					}
+					
+					&.yellow {
+						color:#FFC53D;
+					}
 				}
 			}
 		}

+ 1 - 1
pages2/class/questionBank.vue

@@ -2927,7 +2927,7 @@ export default {
   &.isPart {
     border: 1rpx solid #eeeeee;
     color: #fff;
-    background: #fadb14;
+    background: #FFC53D;
   }
 
   &.isOver {

+ 28 - 6
pages2/class/question_report.vue

@@ -14,14 +14,20 @@
 				</view>
 				<view class="right">
 					<view class="flex up">
-						<u-icon name="checkmark" color="#16D48B" size="48" style="margin-right: 14rpx;"></u-icon>
-						<!-- <image src="/static/5-4_03.png" mode=""></image> -->
+						<!-- <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>
 						<view class="text">正确题数</view>
 						<text class="green">{{ rightQuestionNum }}</text>
 					</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>
+						<view class="text">少选题数</view>
+						<text class="yellow">{{ rightQuestionNum }}</text>
+					</view>
 					<view class="flex down">
-						<u-icon name="close" color="#FF3B30" size="38" style="margin-right: 26rpx;"></u-icon>
-						<!-- <image src="/static/5-4_03.png" mode=""></image> -->
+						<!-- <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>
 						<view class="text">错误题数</view>
 						<text class="red">{{ doWrongQuestionNum }}</text>
 					</view>
@@ -269,9 +275,21 @@ page {
 				border-radius: 16rpx;
 
 				image {
-					width: 30rpx;
-					height: 30rpx;
 					margin-right: 28rpx;
+					
+					&.right_num {
+						width:26rpx;
+					}
+					
+					&.out_num {
+						width:38rpx;
+						
+					}
+					
+					&.wrong_num {
+						width:30rpx;
+						
+					}
 				}
 
 				.text {
@@ -291,6 +309,10 @@ page {
 					&.green {
 						color: #36C75A;
 					}
+					
+					&.yellow {
+						color:#FFC53D;
+					}
 				}
 			}
 		}

+ 1 - 1
pages2/order/index.vue

@@ -461,7 +461,7 @@ page {
 			justify-content: space-between;
 			
 			.goods-img {
-				height: 134rpx;
+				height: 156rpx;
 				width: 278rpx;
 				border-radius: 16rpx;
 				flex-shrink: 0;

+ 1 - 1
pages2/subject/collectBank.vue

@@ -1668,7 +1668,7 @@ export default {
   &.isPart {
     border: 1rpx solid #eeeeee;
     color: #fff;
-    background: #fadb14;
+    background: #FFC53D;
   }
 }
 .answerInfos {

+ 1 - 1
pages2/subject/collectTypeBank.vue

@@ -1659,7 +1659,7 @@ export default {
   &.isPart {
     border: 1rpx solid #eeeeee;
     color: #fff;
-    background: #fadb14;
+    background: #FFC53D;
   }
 }
 .answerInfos {

+ 1 - 1
pages2/subject/wrongBank.vue

@@ -1843,7 +1843,7 @@ export default {
   &.isPart {
     border: 1rpx solid #eeeeee;
     color: #fff;
-    background: #fadb14;
+    background: #FFC53D;
   }
 }
 .answerInfos {

+ 1 - 1
pages2/subject/wrongTypeBank.vue

@@ -1718,7 +1718,7 @@ export default {
   &.isPart {
     border: 1rpx solid #eeeeee;
     color: #fff;
-    background: #fadb14;
+    background: #FFC53D;
   }
 }
 .answerInfos {

+ 1 - 1
pages2/wd/class.vue

@@ -722,7 +722,7 @@
 			position: relative;
 
 			.class_img {
-				height: 316rpx;
+				height: 367rpx;
 				width: 100%;
 				border-radius: 24rpx;
 			}

BIN
static/out_num.png


BIN
static/right_num.png


BIN
static/wrong_num.png