A

apps/exams/Tpl/default/Index/examsroom_w3g.html

@@ -331,26 +331,28 @@
 			<p class="testPaperLei flex1">（{{currentQuestionTypeName}}）</p>
 			<p class="testPaperLei flex1">（{{currentQuestionTypeName}}）</p>
 			<img v-if="currentQuestion.is_collect == 0" @click="onCollect(1)" class="testPaperColl" src="__THEME__/img/collect0.png">
 			<img v-if="currentQuestion.is_collect == 0" @click="onCollect(1)" class="testPaperColl" src="__THEME__/img/collect0.png">
 			<img v-if="currentQuestion.is_collect == 1" @click="onCollect(0)" class="testPaperColl" src="__THEME__/img/collect1.png">
 			<img v-if="currentQuestion.is_collect == 1" @click="onCollect(0)" class="testPaperColl" src="__THEME__/img/collect1.png">
-		</div>
-		<div class="testPaperInfo">某种糖果的进价为12元/千克，现购进这种糖果若干千克，每天销售10千克，且从第二天起每天都比前一天降价2元/千克。已知以6元/千克的价格销售的那天正好卖完最后10千克，且总销售额是总进货成本的2倍。问总共进了多少千克这种糖果？</div>
-		<ul>
-			<li class="testPaperAnswer box">
-				<span class="testPaperAnswer_num testPaperAnswer_numAt">A</span>
-				<p class="testPaperAnswer_desc flex1">180</p>
-			</li>
-			<li class="testPaperAnswer box">
-				<span class="testPaperAnswer_num">B</span>
-				<p class="testPaperAnswer_desc flex1">180且总销售额是总进货成本的2倍且总销售额是总进货成本的2倍且总销售额是总进货成本的2倍且总销售额是总进货成本的2倍且总销售额是总进货成本的2倍</p>
-			</li>
-			<li class="testPaperAnswer box">
-				<span class="testPaperAnswer_num">A</span>
-				<p class="testPaperAnswer_desc flex1">180</p>
-			</li>
-			<li class="testPaperAnswer box">
-				<span class="testPaperAnswer_num">A</span>
-				<p class="testPaperAnswer_desc flex1">180</p>
-			</li>
-		</ul>
+		</div>
+		<template v-if="showChoiceQuestion">
+			<div v-html="currentQuestion.content" class="testPaperInfo"></div>
+			<ul>
+				<li class="testPaperAnswer box">
+					<span class="testPaperAnswer_num testPaperAnswer_numAt">A</span>
+					<p class="testPaperAnswer_desc flex1">180</p>
+				</li>
+				<li class="testPaperAnswer box">
+					<span class="testPaperAnswer_num">B</span>
+					<p class="testPaperAnswer_desc flex1">180且总销售额是总进货成本的2倍且总销售额是总进货成本的2倍且总销售额是总进货成本的2倍且总销售额是总进货成本的2倍且总销售额是总进货成本的2倍</p>
+				</li>
+				<li class="testPaperAnswer box">
+					<span class="testPaperAnswer_num">A</span>
+					<p class="testPaperAnswer_desc flex1">180</p>
+				</li>
+				<li class="testPaperAnswer box">
+					<span class="testPaperAnswer_num">A</span>
+					<p class="testPaperAnswer_desc flex1">180</p>
+				</li>
+			</ul>
+		</template>
 	</div>
 	</div>
 	<div class="testPaperBtns boxCn">
 	<div class="testPaperBtns boxCn">
 		<p class="testPaperBtn testPaperBtn1" style="width: 15rem;">下一题</p>
 		<p class="testPaperBtn testPaperBtn1" style="width: 15rem;">下一题</p>
@@ -362,7 +364,7 @@
 	<!-- 解析 -->
 	<!-- 解析 -->
 	<div class="testPaperJiedaPage">
 	<div class="testPaperJiedaPage">
 		<div class="box testPaperJiedaBox">
 		<div class="box testPaperJiedaBox">
-			<span class="testPaperJiedaBtn box">收起解析<img class="testPaperJiedaBtn_icon" src="../img/openBtn.png"></span>
+			<span class="testPaperJiedaBtn box">收起解析<img class="testPaperJiedaBtn_icon" src="__THEME__/img/openBtn.png"></span>
 		</div>
 		</div>
 		<ul class="testPaperAnswers">
 		<ul class="testPaperAnswers">
 			<li class="testPaperAnswer">正确答案：<span class="testPaperAnswer_n">B</span></li>
 			<li class="testPaperAnswer">正确答案：<span class="testPaperAnswer_n">B</span></li>
@@ -418,7 +420,12 @@
 		},
 		},
 		computed: {
 		computed: {
 			totalQuestion: function() {
 			totalQuestion: function() {
-				return this.currentQuestions.length
+				let count = 0
+				let data = this.paperOptions.options_questions_data
+				this.paperOptions.options_type.forEach( r => {
+					count += data[r.question_type]
+				})
+				return count
 			},
 			},
 			currentQuestions: function() {
 			currentQuestions: function() {
 				let optionType = this.currentQuestionType
 				let optionType = this.currentQuestionType
@@ -431,11 +438,18 @@
 				return this.paperOptions.options_type[this.currentType]
 				return this.paperOptions.options_type[this.currentType]
 			},
 			},
 			currentQuestionTypeName: function() {
 			currentQuestionTypeName: function() {
-				let type = this.currentQuestionType
-				return type.type_info.question_type_title
+				return this.currentQuestionType.type_info.question_type_title
+			},
+			currentQuestionTypeKey: function() {
+				return this.currentQuestionType.question_type_key
 			},
 			},
 			currentQuestion: function() {
 			currentQuestion: function() {
 				return this.currentQuestions[this.current]
 				return this.currentQuestions[this.current]
+			},
+			//Helper
+			showChoiceQuestion: function() {
+				let key = this.currentQuestionTypeKey
+				return key == 'radio' || key == 'multiselect' || key == 'judge'
 			}
 			}
 		},
 		},
 		created: function() {
 		created: function() {