Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/mobile

pages/exam/answer.vue

@@ -42,7 +42,7 @@
 			<view class="info-row" v-if="curItem.type !== 3 && showAnswer">
 				正确答案：<text v-for="(item,a) in curItem.optionList" :key="a">{{item.isAnswer?toLetter(a+1):''}}</text>
 			</view>
-			<view class="info-row" v-if="curItem.analysis">
+			<view class="info-row" v-if="showAnalysis && curItem.analysis">
 				解析：{{curItem.analysis}}
 			</view>
 		</view>
@@ -86,7 +86,7 @@
 
 		},
 		onLoad(options) {
-			//console.log(options, 'options')
+			console.log(options, 'options')
 			this.answerId = options.id;
 			if(options.showAnswer){
 				this.showAnswer=options.showAnswer=='true'? true:false;

pages/exam/exam.vue

@@ -299,9 +299,9 @@
 						this.testStatus = 2;
 						this.startReckon();
 						//60秒后执行保存处理,这里和pc端不一致，不做延迟，直接保存考试信息
-						//window.setTimeout(function() {
-						//$this.saveUserTest();
-						//}, 10000);
+						// window.setTimeout(function() {
+						$this.saveUserTest();
+						// }, 10000);
 					} else {
 						this.startButton = false;
 						uni.showLoading({