Merge branch 'master' of https://gitee.com/he2802/saas_applet

pages2/bank/question_record.vue

@@ -29,7 +29,7 @@
 					<view class="btn" v-if="record.status == 1" @click="doRepeat(record.examId, record.goodsId, record.moduleExamId, record.chapterExamId)">重做</view>
 					<navigator
 						:url="
-							'/pages2/bank/questionBankExplain?explain=1&id=' +
+							'/pages2/bank/questionBankExplain?id=' +
 								record.examId +
 								'&goodsid=' +
 								record.goodsId +
@@ -42,7 +42,7 @@
 					>
 						<view class="btn" v-if="record.status == 1">解析</view>
 					</navigator>
-					<navigator  hover-class="none" :url="'/pages2/bank/question_report?examId='+record.examId+'&hideBtns=1&id=' + record.recordId"><view class="btn" v-if="record.status == 1">报告</view></navigator>
+					<navigator  hover-class="none" :url="'/pages2/bank/question_report?examId='+record.examId+'&id=' + record.recordId"><view class="btn" v-if="record.status == 1">报告</view></navigator>
 					<navigator
 						:url="
 							'/pages2/bank/questionBankContinue?recordId=' +

pages2/bank/question_report.vue

@@ -104,9 +104,8 @@ export default {
 		
 	},
 	async onLoad(option) {
-		this.id = option.id;
+		this.recordId = option.id;
 		this.examId = option.examId;
-		this.hideBtns = Boolean(option.hideBtns);
 		
 		this.examWrongRecordWrongNum();
 		await this.bankExam();
@@ -249,7 +248,7 @@ export default {
 		},
 		examWrongRecordWrongNum() {
 			return new Promise(resolve => {
-				this.$api.examWrongRecordWrongNum(this.id).then(res => {
+				this.$api.examWrongRecordWrongNum(this.recordId).then(res => {
 					this.wrongRecordWrongNum = res.data.data;
 					resolve();
 				});
@@ -280,7 +279,7 @@ export default {
 		},
 		examReport() {
 			return new Promise(resolve => {
-				this.$api.examReport(this.id).then(res => {
+				this.$api.examReport(this.recordId).then(res => {
 					this.reportdata = res.data.data;
 					resolve()
 				});