Kaynağa Gözat

修改样式

chenxiong 3 yıl önce
ebeveyn
işleme
375d4e54c0

+ 2 - 2
components/course/courseChapter.vue

@@ -102,7 +102,7 @@ export default {
 			if(this.learningOrder == 1) {
 				if(this.canLearn) {
 					
-					if(item.answerNum - item.doNum > 0) {
+					if(item.answerNum - item.doNum > 0 && item.answerNum > 0) {
 						this.$set(this.list[index],'doNum',(item.doNum+1))
 						console.log(this.list[index])
 						uni.navigateTo({
@@ -123,7 +123,7 @@ export default {
 					})
 				}
 			} else {
-				if(item.answerNum - item.doNum > 0) {
+				if(item.answerNum - item.doNum > 0 && item.answerNum > 0) {
 					this.$set(this.list[index],'doNum',(item.doNum+1))
 					console.log(this.list[index])
 					uni.navigateTo({

+ 2 - 2
pages/index/index.vue

@@ -578,11 +578,11 @@ export default {
 						position:relative;
 						
 						&.red {
-							color:red;
+							color:#FF3B30;
 						}
 						
 						&.green {
-							color:green;
+							color:#36C75A;
 						}
 						
 						&.blue {

+ 67 - 28
pages2/bank/questionBank.vue

@@ -17,7 +17,6 @@
 								<text>{{ bankIndex + 1 }}/{{ questionList.length }}</text>
 							</view>
 							<view style="color: #666;font-size: 28rpx;">{{ countdown(lastTime) }}</view>
-							<view class="leftLetters"></view>
 						</view>
 						<view class="titles"><rich-text :nodes="bank.content"></rich-text></view>
 					</view>
@@ -102,7 +101,9 @@
 							<view v-if="!bank.ques">
 								<view v-for="(item, index) in judge" :key="index" class="lisSty" @click="judgeSelect(index, bankIndex)">
 									<view class="activeTI">{{ ast[index] }}</view>
-									{{ item }}
+									<view class="flex_auto">
+										{{ item }}
+									</view>
 								</view>
 							</view>
 							<view v-if="bank.ques">
@@ -110,7 +111,9 @@
 									<text :class="{ right: index == bank.ques || index == bank.ans, wrong: index == bank.ques && bank.ques != bank.ans }" class="activeTI">
 										{{ ast[index] }}
 									</text>
-									{{ item }}
+									<view class="flex_auto">
+										{{ item }}
+									</view>
 								</view>
 							</view>
 						</view>
@@ -178,6 +181,11 @@
 							
 							<template v-if="ansItem.type == 1">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>单选</text>
+										</view>
+									</view>
 									<view class="titles"><rich-text :nodes="ansItem.content"></rich-text></view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view
@@ -187,7 +195,9 @@
 											@click="radioSelectChild(option.optionsId, ansIndex, bankIndex)"
 										>
 											<view class="activeTI">{{ ast[childIndex] }}</view>
-											<rich-text class="textChild" :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text class="textChild" :nodes="option.content"></rich-text>
+											</view>
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
@@ -201,7 +211,9 @@
 											>
 												{{ ast[childIndex] }}
 											</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
 										</view>
 									</view>
 								</view>
@@ -220,6 +232,11 @@
 
 							<template v-if="ansItem.type == 2">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>多选</text>
+										</view>
+									</view>
 									<view class="titles"><rich-text :nodes="ansItem.content"></rich-text></view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view
@@ -229,7 +246,9 @@
 											@click="checkboxSelectChild(bankIndex, ansIndex, childindex)"
 										>
 											<view :class="{ checked: option.checked }" class="activeTI">{{ ast[childindex] }}</view>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
 										</view>
 									</view>
 									<view v-if="!bank.ques[ansIndex]" class="submit_checkbox" :class="{disabled:!isCheckboxChecked(ansItem.optionsList)}" @click="checkboxSubmitChild(bankIndex, ansIndex)">确认答案</view>
@@ -238,7 +257,9 @@
 											<text :class="{ right: right(bankIndex, ansIndex, option), wrong: wrong(bankIndex, ansIndex, option) }" class="activeTI">
 												{{ ast[childindex] }}
 											</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
 										</view>
 									</view>
 								</view>
@@ -262,11 +283,18 @@
 
 							<template v-if="ansItem.type == 3">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>判断</text>
+										</view>
+									</view>
 									<view class="titles"><rich-text :nodes="ansItem.content"></rich-text></view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in judge" :key="childindex" class="lisSty" @click="judgeSelectChild(ansIndex, childindex, bankIndex)">
 											<view class="activeTI">{{ ast[childindex] }}</view>
-											{{ option }}
+											<view class="flex_auto">
+												{{ option }}
+											</view>
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
@@ -280,7 +308,9 @@
 											>
 												{{ ast[childindex] }}
 											</text>
-											{{ option }}
+											<view class="flex_auto">
+												{{ option }}
+											</view>
 										</view>
 									</view>
 								</view>
@@ -299,6 +329,11 @@
 							<!-- 简答题 -->
 							<template v-if="ansItem.type == 5">
 								<view class="pad_8 titBox_title">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>简答</text>
+										</view>
+									</view>
 									<view><rich-text :nodes="ansItem.content"></rich-text></view>
 								</view>
 								<view class="pad_8 titBox_title">
@@ -1958,12 +1993,12 @@ export default {
 
 	&.right {
 		color: #fff;
-		background: green;
+		background: #36C75A;
 	}
 
 	&.wrong {
 		color: #fff;
-		background: red;
+		background: #FF3B30;
 	}
 
 	&.checked {
@@ -1973,6 +2008,10 @@ export default {
 }
 
 .submit_checkbox {
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
 	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
@@ -2084,7 +2123,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color: #fff;
-					background: red;
+					background: #FF3B30;
 					border-radius: 50%;
 				}
 
@@ -2120,25 +2159,25 @@ export default {
 		}
 	}
 }
+.leftLetters {
+	display: flex;
+	align-items: center;
+	width: 220rpx;
+	.btnType {
+		padding: 5rpx 10rpx;
+		border: 1rpx solid #007aff;
+		border-radius: 10rpx;
+		background-color: rgba(0, 122, 255, 0.1);
+		font-size: 28rpx;
+		color: #007aff;
+		margin-right: 15rpx;
+	}
+}
 .firstLetter {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	margin-bottom: 30rpx;
-	.leftLetters {
-		display: flex;
-		align-items: center;
-		width: 220rpx;
-		.btnType {
-			padding: 5rpx 10rpx;
-			border: 1rpx solid #007aff;
-			border-radius: 10rpx;
-			background-color: rgba(0, 122, 255, 0.1);
-			font-size: 28rpx;
-			color: #007aff;
-			margin-right: 15rpx;
-		}
-	}
 }
 .popupView {
 	height: 100%;
@@ -2273,13 +2312,13 @@ export default {
 	&.isRight {
 		border: 1rpx solid #eeeeee;
 		color: #fff;
-		background: green;
+		background: #36C75A;
 	}
 
 	&.isWrong {
 		border: 1rpx solid #eeeeee;
 		color: #fff;
-		background: red;
+		background: #FF3B30;
 	}
 }
 .answerInfos {

+ 72 - 28
pages2/bank/questionBankAllExplain.vue

@@ -88,13 +88,14 @@
 							<view v-if="!bank.ques">
 								<view v-for="(item, index) in judge" :key="index" class="lisSty">
 									<view class="activeTI">{{ ast[index] }}</view>
-									{{ item }}
+									<view class="flex_auto">{{ item }}</view>
 								</view>
 							</view>
 							<view  v-if="bank.ques">
 								<view v-for="(item, index) in judge" :key="index" class="lisSty">
 									<text :class="{right:(index == bank.ques) || (index == bank.ans),wrong:(index == bank.ques) && (bank.ques != bank.ans)}"  class="activeTI">{{ ast[index] }}</text>
-									{{ item }}
+									<view class="flex_auto">{{ item }}</view>
+									
 								</view>
 							</view> 
 						</view>
@@ -150,19 +151,30 @@
 						<view v-for="(ansItem,ansIndex) in bank.jsonStr" v-if="bank.current == ansIndex" :key="ansIndex">
 							<template v-if="ansItem.type == 1">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>单选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<view class="activeTI">{{ ast[childIndex] }}</view>
-											<rich-text class="textChild" :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text class="textChild" :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
 										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view>
 								</view>
@@ -182,19 +194,30 @@
 							
 							<template v-if="ansItem.type == 2">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>多选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in ansItem.optionsList" :key="childindex" class="lisSty">
 											<view :class="{checked:option.checked}" class="activeTI">{{ ast[childindex] }}</view>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view>
 									<view v-if="bank.ques && bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in ansItem.optionsList" :key="childindex" class="lisSty">
 											<text :class="{right:right(bankIndex,ansIndex,option),wrong:wrong(bankIndex,ansIndex,option)}"  class="activeTI">{{ ast[childindex] }}</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view>
 								</view>
@@ -218,19 +241,30 @@
 							
 							<template v-if="ansItem.type == 3">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>判断</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in judge" :key="childindex" class="lisSty">
 											<view class="activeTI">{{ ast[childindex] }}</view>
-											{{ option }}
+											
+											<view class="flex_auto">
+												{{ option }}
+											</view>
+											
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in judge" :key="childindex" class="lisSty">
 											<text :class="{right:(childindex == bank.ques[ansIndex]) || (childindex == bank.ans[ansIndex]),wrong:(childindex == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childindex] }}</text>
-											{{ option }}
+											<view class="flex_auto">
+												{{ option }}
+											</view>
 										</view>
 									</view>
 								</view>
@@ -252,6 +286,11 @@
 							<!-- 简答题 -->
 							<template v-if="ansItem.type == 5">
 								<view class="pad_8 titBox_title">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>简答</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -521,12 +560,12 @@ export default {
 	
 	&.right {
 		color:#fff;
-		background:green;
+		background:#36C75A;
 	}
 	
 	&.wrong {
 		color:#fff;
-		background:red;
+		background:#FF3B30;
 	}
 	
 	&.checked {
@@ -536,7 +575,11 @@ export default {
 }
 
 .submit_checkbox {
-	margin:20rpx auto;
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
+	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
 	background: rgba(0, 122, 255, 1);
@@ -644,7 +687,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color:#fff;
-					background:red;
+					background:#FF3B30;
 					border-radius:50%;
 				}
 				
@@ -680,25 +723,26 @@ export default {
 		}
 	}
 }
+.leftLetters {
+	display: flex;
+	align-items: center;
+	width: 220rpx;
+	.btnType {
+		padding: 5rpx 10rpx;
+		border: 1rpx solid #007aff;
+		border-radius: 10rpx;
+		background-color: rgba(0, 122, 255, 0.1);
+		font-size: 28rpx;
+		color: #007aff;
+		margin-right: 15rpx;
+	}
+}
 .firstLetter {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	margin-bottom: 30rpx;
-	.leftLetters {
-		display: flex;
-		align-items: center;
-		width: 220rpx;
-		.btnType {
-			padding: 5rpx 10rpx;
-			border: 1rpx solid #007aff;
-			border-radius: 10rpx;
-			background-color: rgba(0, 122, 255, 0.1);
-			font-size: 28rpx;
-			color: #007aff;
-			margin-right: 15rpx;
-		}
-	}
+	
 }
 .popupView {
 	height: 100%;
@@ -835,13 +879,13 @@ export default {
 	&.isRight {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: green;
+		background: #36C75A;
 	}
 	
 	&.isWrong {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: red;
+		background: #FF3B30;
 	}
 }
 .answerInfos {

+ 68 - 27
pages2/bank/questionBankContinue.vue

@@ -171,19 +171,29 @@
 						<view v-for="(ansItem,ansIndex) in bank.jsonStr" v-if="bank.current == ansIndex" :key="ansIndex">
 							<template v-if="ansItem.type == 1">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>单选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty" @click="radioSelectChild(option.optionsId,ansIndex,bankIndex)">
 											<view class="activeTI">{{ ast[childIndex] }}</view>
-											<rich-text class="textChild" :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text class="textChild" :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
 										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
 										</view>
 									</view> 
 								</view>
@@ -203,13 +213,20 @@
 							
 							<template v-if="ansItem.type == 2">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>多选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in ansItem.optionsList" :key="childindex" class="lisSty" @click="checkboxSelectChild(bankIndex,ansIndex,childindex)">
 											<view :class="{checked:option.checked}" class="activeTI">{{ ast[childindex] }}</view>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
 										</view>
 									</view>
 									<view v-if="!bank.ques[ansIndex]" class="submit_checkbox" :class="{disabled:!isCheckboxChecked(ansItem.optionsList)}" @click="checkboxSubmitChild(bankIndex,ansIndex)">
@@ -218,7 +235,9 @@
 									<view v-if="bank.ques && bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in ansItem.optionsList" :key="childindex" class="lisSty">
 											<text :class="{right:right(bankIndex,ansIndex,option),wrong:wrong(bankIndex,ansIndex,option)}"  class="activeTI">{{ ast[childindex] }}</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
 										</view>
 									</view> 
 								</view>
@@ -242,19 +261,28 @@
 							
 							<template v-if="ansItem.type == 3">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>判断</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in judge" :key="childindex" class="lisSty" @click="judgeSelectChild(ansIndex,childindex,bankIndex)">
 											<view class="activeTI">{{ ast[childindex] }}</view>
-											{{ option }}
+											<view class="flex_auto">
+												{{ option }}
+											</view>
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in judge" :key="childindex" class="lisSty">
 											<text :class="{right:(childindex == bank.ques[ansIndex]) || (childindex == bank.ans[ansIndex]),wrong:(childindex == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childindex] }}</text>
-											{{ option }}
+											<view class="flex_auto">
+												{{ option }}
+											</view>
 										</view>
 									</view> 
 								</view>
@@ -276,7 +304,12 @@
 							<!-- 简答题 -->
 							<template v-if="ansItem.type == 5">
 								<view class="pad_8 titBox_title">
-									<view>
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>简答</text>
+										</view>
+									</view>
+									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 								</view>
@@ -1451,12 +1484,12 @@ export default {
 	
 	&.right {
 		color:#fff;
-		background:green;
+		background:#36C75A;
 	}
 	
 	&.wrong {
 		color:#fff;
-		background:red;
+		background:#FF3B30;
 	}
 	
 	&.checked {
@@ -1466,7 +1499,15 @@ export default {
 }
 
 .submit_checkbox {
-	margin:20rpx auto;
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
+	margin: 20rpx auto;
+	left:0;
+	right:0;
+	bottom:120rpx;
+	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
 	background: rgba(0, 122, 255, 1);
@@ -1578,7 +1619,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color:#fff;
-					background:red;
+					background:#FF3B30;
 					border-radius:50%;
 				}
 				
@@ -1614,25 +1655,25 @@ export default {
 		}
 	}
 }
+.leftLetters {
+	display: flex;
+	align-items: center;
+	width: 220rpx;
+	.btnType {
+		padding: 5rpx 10rpx;
+		border: 1rpx solid #007aff;
+		border-radius: 10rpx;
+		background-color: rgba(0, 122, 255, 0.1);
+		font-size: 28rpx;
+		color: #007aff;
+		margin-right: 15rpx;
+	}
+}
 .firstLetter {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	margin-bottom: 30rpx;
-	.leftLetters {
-		display: flex;
-		align-items: center;
-		width: 220rpx;
-		.btnType {
-			padding: 5rpx 10rpx;
-			border: 1rpx solid #007aff;
-			border-radius: 10rpx;
-			background-color: rgba(0, 122, 255, 0.1);
-			font-size: 28rpx;
-			color: #007aff;
-			margin-right: 15rpx;
-		}
-	}
 }
 .popupView {
 	height: 100%;
@@ -1769,13 +1810,13 @@ export default {
 	&.isRight {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: green;
+		background: #36C75A;
 	}
 	
 	&.isWrong {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: red;
+		background: #FF3B30;
 	}
 }
 .answerInfos {

+ 44 - 20
pages2/bank/questionBankExplain.vue

@@ -120,6 +120,11 @@
 						<view v-for="(ansItem,ansIndex) in bank.jsonStr" v-if="bank.current == ansIndex" :key="ansIndex">
 							<template v-if="ansItem.type == 1">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>单选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -145,6 +150,11 @@
 							
 							<template v-if="ansItem.type == 2">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>多选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -172,6 +182,11 @@
 							
 							<template v-if="ansItem.type == 3">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>判断</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -199,6 +214,11 @@
 							<!-- 简答题 -->
 							<template v-if="ansItem.type == 5">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>简答</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -536,12 +556,12 @@ export default {
 	
 	&.right {
 		color:#fff;
-		background:green;
+		background:#36C75A;
 	}
 	
 	&.wrong {
 		color:#fff;
-		background:red;
+		background:#FF3B30;
 	}
 	
 	&.checked {
@@ -551,7 +571,11 @@ export default {
 }
 
 .submit_checkbox {
-	margin:20rpx auto;
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
+	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
 	background: rgba(0, 122, 255, 1);
@@ -659,7 +683,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color:#fff;
-					background:red;
+					background:#FF3B30;
 					border-radius:50%;
 				}
 				
@@ -695,25 +719,25 @@ export default {
 		}
 	}
 }
+.leftLetters {
+	display: flex;
+	align-items: center;
+	width: 220rpx;
+	.btnType {
+		padding: 5rpx 10rpx;
+		border: 1rpx solid #007aff;
+		border-radius: 10rpx;
+		background-color: rgba(0, 122, 255, 0.1);
+		font-size: 28rpx;
+		color: #007aff;
+		margin-right: 15rpx;
+	}
+}
 .firstLetter {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	margin-bottom: 30rpx;
-	.leftLetters {
-		display: flex;
-		align-items: center;
-		width: 220rpx;
-		.btnType {
-			padding: 5rpx 10rpx;
-			border: 1rpx solid #007aff;
-			border-radius: 10rpx;
-			background-color: rgba(0, 122, 255, 0.1);
-			font-size: 28rpx;
-			color: #007aff;
-			margin-right: 15rpx;
-		}
-	}
 }
 .popupView {
 	height: 100%;
@@ -850,13 +874,13 @@ export default {
 	&.isRight {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: green;
+		background: #36C75A;
 	}
 	
 	&.isWrong {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: red;
+		background: #FF3B30;
 	}
 }
 .answerInfos {

+ 76 - 29
pages2/bank/questionBankExplainDetail.vue

@@ -95,13 +95,18 @@
 							<view v-if="!bank.ques">
 								<view v-for="(item, index) in judge" :key="index" class="lisSty" @click="judgeSelect(index,bankIndex)">
 									<view class="activeTI">{{ ast[index] }}</view>
-									{{ item }}
+									<view class="flex_auto">
+										{{ item }}
+									</view>
+									
 								</view>
 							</view>
 							<view v-if="bank.ques">
 								<view v-for="(item, index) in judge" :key="index" class="lisSty">
 									<text :class="{right:(index == bank.ques) || (index == bank.ans),wrong:(index == bank.ques) && (bank.ques != bank.ans)}"  class="activeTI">{{ ast[index] }}</text>
-									{{ item }}
+									<view class="flex_auto">
+										{{ item }}
+									</view>
 								</view>
 							</view> 
 						</view>
@@ -173,19 +178,30 @@
 						<view v-for="(ansItem,ansIndex) in bank.jsonStr" v-if="bank.current == ansIndex" :key="ansIndex">
 							<template v-if="ansItem.type == 1">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>单选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty" @click="radioSelectChild(option.optionsId,ansIndex,bankIndex)">
 											<view class="activeTI">{{ ast[childIndex] }}</view>
-											<rich-text class="textChild" :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text class="textChild" :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
 										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view> 
 								</view>
@@ -205,13 +221,21 @@
 							
 							<template v-if="ansItem.type == 2">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>多选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in ansItem.optionsList" :key="childindex" class="lisSty" @click="checkboxSelectChild(bankIndex,ansIndex,childindex)">
 											<view :class="{checked:option.checked}" class="activeTI">{{ ast[childindex] }}</view>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view>
 									<view v-if="!bank.ques[ansIndex]" class="submit_checkbox" @click="checkboxSubmitChild(bankIndex,ansIndex)">
@@ -220,7 +244,10 @@
 									<view v-if="bank.ques && bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in ansItem.optionsList" :key="childindex" class="lisSty">
 											<text :class="{right:right(bankIndex,ansIndex,option),wrong:wrong(bankIndex,ansIndex,option)}"  class="activeTI">{{ ast[childindex] }}</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view> 
 								</view>
@@ -244,19 +271,30 @@
 							
 							<template v-if="ansItem.type == 3">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>判断</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in judge" :key="childindex" class="lisSty" @click="judgeSelectChild(ansIndex,childindex,bankIndex)">
 											<view class="activeTI">{{ ast[childindex] }}</view>
-											{{ option }}
+											<view class="flex_auto">
+												{{ option }}
+											</view>
+											
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in judge" :key="childindex" class="lisSty">
 											<text :class="{right:(childindex == bank.ques[ansIndex]) || (childindex == bank.ans[ansIndex]),wrong:(childindex == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childindex] }}</text>
-											{{ option }}
+											
+											<view class="flex_auto">
+												{{ option }}
+											</view>
 										</view>
 									</view> 
 								</view>
@@ -278,7 +316,12 @@
 							<!-- 简答题 -->
 							<template v-if="ansItem.type == 5">
 								<view class="pad_8 titBox_title">
-									<view>
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>简答</text>
+										</view>
+									</view>
+									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 								</view>
@@ -1405,12 +1448,12 @@ export default {
 	
 	&.right {
 		color:#fff;
-		background:green;
+		background:#36C75A;
 	}
 	
 	&.wrong {
 		color:#fff;
-		background:red;
+		background:#FF3B30;
 	}
 	
 	&.checked {
@@ -1420,7 +1463,11 @@ export default {
 }
 
 .submit_checkbox {
-	margin:20rpx auto;
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
+	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
 	background: rgba(0, 122, 255, 1);
@@ -1528,7 +1575,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color:#fff;
-					background:red;
+					background:#FF3B30;
 					border-radius:50%;
 				}
 				
@@ -1564,25 +1611,25 @@ export default {
 		}
 	}
 }
+.leftLetters {
+	display: flex;
+	align-items: center;
+	width: 220rpx;
+	.btnType {
+		padding: 5rpx 10rpx;
+		border: 1rpx solid #007aff;
+		border-radius: 10rpx;
+		background-color: rgba(0, 122, 255, 0.1);
+		font-size: 28rpx;
+		color: #007aff;
+		margin-right: 15rpx;
+	}
+}
 .firstLetter {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	margin-bottom: 30rpx;
-	.leftLetters {
-		display: flex;
-		align-items: center;
-		width: 220rpx;
-		.btnType {
-			padding: 5rpx 10rpx;
-			border: 1rpx solid #007aff;
-			border-radius: 10rpx;
-			background-color: rgba(0, 122, 255, 0.1);
-			font-size: 28rpx;
-			color: #007aff;
-			margin-right: 15rpx;
-		}
-	}
 }
 .popupView {
 	height: 100%;
@@ -1719,13 +1766,13 @@ export default {
 	&.isRight {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: green;
+		background: #36C75A;
 	}
 	
 	&.isWrong {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: red;
+		background: #FF3B30;
 	}
 }
 .answerInfos {

+ 78 - 28
pages2/bank/questionBankTest.vue

@@ -92,13 +92,20 @@
 							<view v-if="!bank.ques">
 								<view v-for="(item, index) in judge" :key="index" class="lisSty" @click="judgeSelect(index,bankIndex)">
 									<view class="activeTI">{{ ast[index] }}</view>
-									{{ item }}
+									
+									<view class="flex_auto">
+										{{ item }}
+									</view>
 								</view>
 							</view>
 							<view v-if="bank.ques">
 								<view v-for="(item, index) in judge" :key="index" class="lisSty">
 									<text :class="{right:(index == bank.ques) || (index == bank.ans),wrong:(index == bank.ques) && (bank.ques != bank.ans)}"  class="activeTI">{{ ast[index] }}</text>
-									{{ item }}
+									
+									<view class="flex_auto">
+										{{ item }}
+									</view>
+									
 								</view>
 							</view> 
 						</view>
@@ -164,19 +171,31 @@
 						<view v-for="(ansItem,ansIndex) in bank.jsonStr" v-if="bank.current == ansIndex" :key="ansIndex">
 							<template v-if="ansItem.type == 1">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>单选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty" @click="radioSelectChild(option.optionsId,ansIndex,bankIndex)">
 											<view class="activeTI">{{ ast[childIndex] }}</view>
-											<rich-text class="textChild" :nodes="option.content"></rich-text>
+											
+											<view class="flex_auto">
+												<rich-text class="textChild" :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
 										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view> 
 								</view>
@@ -196,13 +215,21 @@
 							
 							<template v-if="ansItem.type == 2">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>多选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in ansItem.optionsList" :key="childindex" class="lisSty" @click="checkboxSelectChild(bankIndex,ansIndex,childindex)">
 											<view :class="{checked:option.checked}" class="activeTI">{{ ast[childindex] }}</view>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view>
 									<view v-if="!bank.ques[ansIndex]" class="submit_checkbox" :class="{disabled:!isCheckboxChecked(ansItem.optionsList)}" @click="checkboxSubmitChild(bankIndex,ansIndex)">
@@ -211,7 +238,10 @@
 									<view v-if="bank.ques && bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in ansItem.optionsList" :key="childindex" class="lisSty">
 											<text :class="{right:right(bankIndex,ansIndex,option),wrong:wrong(bankIndex,ansIndex,option)}"  class="activeTI">{{ ast[childindex] }}</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view> 
 								</view>
@@ -235,19 +265,30 @@
 							
 							<template v-if="ansItem.type == 3">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>判断</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 									<view v-if="!bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in judge" :key="childindex" class="lisSty" @click="judgeSelectChild(ansIndex,childindex,bankIndex)">
 											<view class="activeTI">{{ ast[childindex] }}</view>
-											{{ option }}
+											<view class="flex_auto">
+												{{ option }}
+											</view>
+											
 										</view>
 									</view>
 									<view v-if="bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in judge" :key="childindex" class="lisSty">
 											<text :class="{right:(childindex == bank.ques[ansIndex]) || (childindex == bank.ans[ansIndex]),wrong:(childindex == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childindex] }}</text>
-											{{ option }}
+											
+											<view class="flex_auto">
+												{{ option }}
+											</view>
 										</view>
 									</view> 
 								</view>
@@ -270,6 +311,11 @@
 							<template v-if="ansItem.type == 5">
 								
 								<view class="pad_8 titBox_title">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>简答</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -992,12 +1038,12 @@ export default {
 	
 	&.right {
 		color:#fff;
-		background:green;
+		background:#36C75A;
 	}
 	
 	&.wrong {
 		color:#fff;
-		background:red;
+		background:#FF3B30;
 	}
 	
 	&.checked {
@@ -1007,7 +1053,11 @@ export default {
 }
 
 .submit_checkbox {
-	margin:20rpx auto;
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
+	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
 	background: rgba(0, 122, 255, 1);
@@ -1119,7 +1169,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color:#fff;
-					background:red;
+					background:#FF3B30;
 					border-radius:50%;
 				}
 				
@@ -1155,25 +1205,25 @@ export default {
 		}
 	}
 }
+.leftLetters {
+	display: flex;
+	align-items: center;
+	width: 220rpx;
+	.btnType {
+		padding: 5rpx 10rpx;
+		border: 1rpx solid #007aff;
+		border-radius: 10rpx;
+		background-color: rgba(0, 122, 255, 0.1);
+		font-size: 28rpx;
+		color: #007aff;
+		margin-right: 15rpx;
+	}
+}
 .firstLetter {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	margin-bottom: 30rpx;
-	.leftLetters {
-		display: flex;
-		align-items: center;
-		width: 220rpx;
-		.btnType {
-			padding: 5rpx 10rpx;
-			border: 1rpx solid #007aff;
-			border-radius: 10rpx;
-			background-color: rgba(0, 122, 255, 0.1);
-			font-size: 28rpx;
-			color: #007aff;
-			margin-right: 15rpx;
-		}
-	}
 }
 .popupView {
 	height: 100%;
@@ -1301,13 +1351,13 @@ export default {
 	&.isRight {
 		border:0;
 		color:#fff;
-		background: green;
+		background: #36C75A;
 	}
 	
 	&.isWrong {
 		border:0;
 		color:#fff;
-		background: red;
+		background: #FF3B30;
 	}
 	
 	&.disabled {

+ 45 - 21
pages2/bank/questionBankWrongExplain.vue

@@ -146,6 +146,11 @@
 						<view v-for="(ansItem,ansIndex) in bank.jsonStr" v-if="bank.current == ansIndex" :key="ansIndex">
 							<template v-if="ansItem.type == 1">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>单选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -176,6 +181,11 @@
 							
 							<template v-if="ansItem.type == 2">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>多选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -212,6 +222,11 @@
 							
 							<template v-if="ansItem.type == 3">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>判断</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -246,7 +261,12 @@
 							<!-- 简答题 -->
 							<template v-if="ansItem.type == 5">
 								<view class="pad_8 titBox_title">
-									<view>
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>简答</text>
+										</view>
+									</view>
+									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 								</view>
@@ -533,12 +553,12 @@ export default {
 	
 	&.right {
 		color:#fff;
-		background:green;
+		background:#36C75A;
 	}
 	
 	&.wrong {
 		color:#fff;
-		background:red;
+		background:#FF3B30;
 	}
 	
 	&.checked {
@@ -548,7 +568,11 @@ export default {
 }
 
 .submit_checkbox {
-	margin:20rpx auto;
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
+	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
 	background: rgba(0, 122, 255, 1);
@@ -657,7 +681,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color:#fff;
-					background:red;
+					background:#FF3B30;
 					border-radius:50%;
 				}
 				
@@ -693,25 +717,25 @@ export default {
 		}
 	}
 }
+.leftLetters {
+	display: flex;
+	align-items: center;
+	width: 220rpx;
+	.btnType {
+		padding: 5rpx 10rpx;
+		border: 1rpx solid #007aff;
+		border-radius: 10rpx;
+		background-color: rgba(0, 122, 255, 0.1);
+		font-size: 28rpx;
+		color: #007aff;
+		margin-right: 15rpx;
+	}
+}
 .firstLetter {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	margin-bottom: 30rpx;
-	.leftLetters {
-		display: flex;
-		align-items: center;
-		width: 220rpx;
-		.btnType {
-			padding: 5rpx 10rpx;
-			border: 1rpx solid #007aff;
-			border-radius: 10rpx;
-			background-color: rgba(0, 122, 255, 0.1);
-			font-size: 28rpx;
-			color: #007aff;
-			margin-right: 15rpx;
-		}
-	}
 }
 .popupView {
 	height: 100%;
@@ -848,13 +872,13 @@ export default {
 	&.isRight {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: green;
+		background: #36C75A;
 	}
 	
 	&.isWrong {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: red;
+		background: #FF3B30;
 	}
 }
 .answerInfos {

+ 2 - 2
pages2/bank/question_report.vue

@@ -449,11 +449,11 @@ page {
 					color: #e12626;
 
 					&.red {
-						color: red;
+						color: #FF3B30;
 					}
 
 					&.green {
-						color: green;
+						color: #36C75A;
 					}
 				}
 			}

+ 46 - 22
pages2/class/questionBank.vue

@@ -62,7 +62,7 @@
 									<view class="flex_auto">{{ item.content }}</view>
 								</view>
 							</view>
-							<view v-if="!bank.ques" class="submit_checkbox" :class="{disabled:isCheckboxChecked(bank.jsonStr)}" @click="checkboxSubmit(bankIndex)">确认答案</view>
+							<view v-if="!bank.ques" class="submit_checkbox" :class="{disabled:!isCheckboxChecked(bank.jsonStr)}" @click="checkboxSubmit(bankIndex)">确认答案</view>
 							<view v-if="bank.ques">
 								<view v-for="(item, index) in bank.jsonStr" :key="index" class="lisSty">
 									<text
@@ -174,6 +174,11 @@
 						<view v-for="(ansItem, ansIndex) in bank.jsonStr" v-if="bank.current == ansIndex" :key="ansIndex">
 							<template v-if="ansItem.type == 1">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>单选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -217,6 +222,11 @@
 
 							<template v-if="ansItem.type == 2">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>多选</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -231,7 +241,7 @@
 											<rich-text :nodes="option.content"></rich-text>
 										</view>
 									</view>
-									<view v-if="!bank.ques[ansIndex]" class="submit_checkbox" :class="{disabled:isCheckboxChecked(bank.jsonStr)}" @click="checkboxSubmitChild(bankIndex, ansIndex)">确认答案</view>
+									<view v-if="!bank.ques[ansIndex]" class="submit_checkbox" :class="{disabled:!isCheckboxChecked(bank.jsonStr)}" @click="checkboxSubmitChild(bankIndex, ansIndex)">确认答案</view>
 									<view v-if="bank.ques && bank.ques[ansIndex]">
 										<view v-for="(option, childindex) in ansItem.optionsList" :key="childindex" class="lisSty">
 											<text :class="{ right: right(bankIndex, ansIndex, option), wrong: wrong(bankIndex, ansIndex, option) }" class="activeTI">
@@ -261,6 +271,11 @@
 
 							<template v-if="ansItem.type == 3">
 								<view class="pad_8 titBox">
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>判断</text>
+										</view>
+									</view>
 									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
@@ -300,7 +315,12 @@
 							<!-- 简答题 -->
 							<template v-if="ansItem.type == 5">
 								<view class="pad_8 titBox_title">
-									<view>
+									<view class="leftLetters">
+										<view class="btnType">
+											<text>简答</text>
+										</view>
+									</view>
+									<view class="titles">
 										<rich-text :nodes="ansItem.content"></rich-text>
 									</view>
 								</view>
@@ -1967,12 +1987,12 @@ export default {
 
 	&.right {
 		color: #fff;
-		background: green;
+		background: #36C75A;
 	}
 
 	&.wrong {
 		color: #fff;
-		background: red;
+		background: #FF3B30;
 	}
 
 	&.checked {
@@ -1982,6 +2002,10 @@ export default {
 }
 
 .submit_checkbox {
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
 	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
@@ -2093,7 +2117,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color: #fff;
-					background: red;
+					background: #FF3B30;
 					border-radius: 50%;
 				}
 
@@ -2129,25 +2153,25 @@ export default {
 		}
 	}
 }
+.leftLetters {
+	display: flex;
+	align-items: center;
+	width: 220rpx;
+	.btnType {
+		padding: 5rpx 10rpx;
+		border: 1rpx solid #007aff;
+		border-radius: 10rpx;
+		background-color: rgba(0, 122, 255, 0.1);
+		font-size: 28rpx;
+		color: #007aff;
+		margin-right: 15rpx;
+	}
+}
 .firstLetter {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	margin-bottom: 30rpx;
-	.leftLetters {
-		display: flex;
-		align-items: center;
-		width: 220rpx;
-		.btnType {
-			padding: 5rpx 10rpx;
-			border: 1rpx solid #007aff;
-			border-radius: 10rpx;
-			background-color: rgba(0, 122, 255, 0.1);
-			font-size: 28rpx;
-			color: #007aff;
-			margin-right: 15rpx;
-		}
-	}
 }
 .popupView {
 	height: 100%;
@@ -2282,13 +2306,13 @@ export default {
 	&.isRight {
 		border: 1rpx solid #eeeeee;
 		color: #fff;
-		background: green;
+		background: #36C75A;
 	}
 
 	&.isWrong {
 		border: 1rpx solid #eeeeee;
 		color: #fff;
-		background: red;
+		background: #FF3B30;
 	}
 }
 .answerInfos {

+ 2 - 2
pages2/class/question_report.vue

@@ -284,11 +284,11 @@ page {
 					color: #e12626;
 
 					&.red {
-						color: red;
+						color: #FF3B30;
 					}
 
 					&.green {
-						color: green;
+						color: #36C75A;
 					}
 				}
 			}

+ 2 - 2
pages2/order/confirm_success.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view>
-			<view style="padding: 30rpx;">
+			<view style="padding: 8rpx;">
 				<view class="box1">
 					<view class="box1_t1">
 						<u-icon name="checkmark-circle" color="#34C759" size="32"></u-icon><text style="margin-left: 8rpx;">您的订单已支付成功!</text></view>
@@ -227,7 +227,7 @@ export default {
 		width: 100%;
 		background: #FFFFFF;
 		border-radius: 16rpx;
-		margin-top: 30rpx;
+		margin-top: 16rpx;
 	}
 	.box1_t2{
 		font-size: 24rpx;

+ 10 - 6
pages2/subject/collectBank.vue

@@ -892,12 +892,12 @@ export default {
 	
 	&.right {
 		color:#fff;
-		background:green;
+		background:#36C75A;
 	}
 	
 	&.wrong {
 		color:#fff;
-		background:red;
+		background:#FF3B30;
 	}
 	
 	&.checked {
@@ -907,7 +907,11 @@ export default {
 }
 
 .submit_checkbox {
-	margin:20rpx auto;
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
+	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
 	background: rgba(0, 122, 255, 1);
@@ -1019,7 +1023,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color:#fff;
-					background:red;
+					background:#FF3B30;
 					border-radius:50%;
 				}
 				
@@ -1208,13 +1212,13 @@ export default {
 	&.isRight {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: green;
+		background: #36C75A;
 	}
 	
 	&.isWrong {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: red;
+		background: #FF3B30;
 	}
 }
 .answerInfos {

+ 10 - 6
pages2/subject/collectTypeBank.vue

@@ -892,12 +892,12 @@ export default {
 	
 	&.right {
 		color:#fff;
-		background:green;
+		background:#36C75A;
 	}
 	
 	&.wrong {
 		color:#fff;
-		background:red;
+		background:#FF3B30;
 	}
 	
 	&.checked {
@@ -907,7 +907,11 @@ export default {
 }
 
 .submit_checkbox {
-	margin:20rpx auto;
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
+	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
 	background: rgba(0, 122, 255, 1);
@@ -1019,7 +1023,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color:#fff;
-					background:red;
+					background:#FF3B30;
 					border-radius:50%;
 				}
 				
@@ -1208,13 +1212,13 @@ export default {
 	&.isRight {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: green;
+		background: #36C75A;
 	}
 	
 	&.isWrong {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: red;
+		background: #FF3B30;
 	}
 }
 .answerInfos {

+ 10 - 6
pages2/subject/wrongBank.vue

@@ -1059,12 +1059,12 @@ export default {
 	
 	&.right {
 		color:#fff;
-		background:green;
+		background:#36C75A;
 	}
 	
 	&.wrong {
 		color:#fff;
-		background:red;
+		background:#FF3B30;
 	}
 	
 	&.checked {
@@ -1074,7 +1074,11 @@ export default {
 }
 
 .submit_checkbox {
-	margin:20rpx auto;
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
+	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
 	background: rgba(0, 122, 255, 1);
@@ -1182,7 +1186,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color:#fff;
-					background:red;
+					background:#FF3B30;
 					border-radius:50%;
 				}
 				
@@ -1371,13 +1375,13 @@ export default {
 	&.isRight {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: green;
+		background: #36C75A;
 	}
 	
 	&.isWrong {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: red;
+		background: #FF3B30;
 	}
 }
 .answerInfos {

+ 10 - 6
pages2/subject/wrongTypeBank.vue

@@ -947,12 +947,12 @@ export default {
 	
 	&.right {
 		color:#fff;
-		background:green;
+		background:#36C75A;
 	}
 	
 	&.wrong {
 		color:#fff;
-		background:red;
+		background:#FF3B30;
 	}
 	
 	&.checked {
@@ -962,7 +962,11 @@ export default {
 }
 
 .submit_checkbox {
-	margin:20rpx auto;
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:120rpx;
+	margin: 20rpx auto;
 	width: 526rpx;
 	height: 80rpx;
 	background: rgba(0, 122, 255, 1);
@@ -1070,7 +1074,7 @@ export default {
 					text-align: center;
 					line-height: 30rpx;
 					color:#fff;
-					background:red;
+					background:#FF3B30;
 					border-radius:50%;
 				}
 				
@@ -1259,13 +1263,13 @@ export default {
 	&.isRight {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: green;
+		background: #36C75A;
 	}
 	
 	&.isWrong {
 		border:1rpx solid #EEEEEE;
 		color:#fff;
-		background: red;
+		background: #FF3B30;
 	}
 }
 .answerInfos {

+ 1 - 1
pages2/verify/input.vue

@@ -961,7 +961,7 @@ page {
 	height: 100%;
 }
 /deep/ .u-collapse-title {
-	color: red;
+	color: #FF3B30;
 	font-size: 24rpx;
 }
 .collapse-item {

+ 1 - 1
pages2/verify/input2.vue

@@ -324,7 +324,7 @@ page {
 </style>
 <style scope>
 /deep/ .u-collapse-title {
-	color: red;
+	color: #FF3B30;
 	font-size: 24rpx;
 }
 .collapse-item {

+ 11 - 2
pages3/polyv/detail.vue

@@ -44,8 +44,8 @@
 				</u-row>
 			</view>
 			<u-line color="#D6D6DB" />
-			<view style="display: flex;justify-content: center;">
-				<view><u-tabs :list="list" font-size="24" bar-width="24" :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
+			<view>
+				<view><u-tabs gutter="0" :item-width="itemWidth()" :list="list" font-size="32" bar-width="24" :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
 			</view>
 			<u-line color="#D6D6DB" />
 		</view>
@@ -440,6 +440,12 @@ export default {
 		});
 	},
 	methods: {
+		/**
+		 * 计算tabs宽度
+		 */
+		itemWidth() {
+			return 100/this.list.length + '%'
+		},
 		/**
 		 * 获取讲义权限
 		 */
@@ -1237,6 +1243,9 @@ export default {
 			this.$api.courseDetail(this.courseId).then(res => {
 				if (res.data.code == 200) {
 					self.detail = res.data.data;
+					uni.setNavigationBarTitle({
+						title:self.detail.courseName
+					})
 				}
 			});
 		},

+ 1 - 1
pages3/static/polyv-sdk/components/polyv/polyv.wxss

@@ -100,7 +100,7 @@
   top: 0;
   right: 0;
   width: 124rpx;
-  background-color: green;
+  background-color: #36C75A;
   color: #fff;
   font-size: 26rpx;
   line-height: 31px;