Merge branch 'dev' into test

src/api/management/userexam.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 
-/** 获取考题列表*/
+/** 获取用户试题列表*/
 export function generateExamList(examId) {
 	return request({
 		url: `/api/userExam/${examId}/generate`,

src/views/exam/detail/examDetail.vue

@@ -146,9 +146,7 @@ export default {
 						}
 					});
 				});
-				const resp = await generateExamList(this.examDetails.id);
-				this.examList = resp.data.userExamQuestionsVOs;
-				this.userExam = resp.data;
+
 			}
 		},
 		buy() {
@@ -168,6 +166,7 @@ export default {
 			const data = this.examDetails;
 			try {
 				const response = await generateExamList(data.id);
+				this.examList = response.data.userExamQuestionsVOs;
 				this.userExam = response.data;
 				const list = response.data.userExamQuestionsVOs;
 				await this.$store.dispatch('exam/setUsedTime', this.userExam.usedTime);
@@ -191,9 +190,9 @@ export default {
 				}
 			}
 		},
-		exmaStart() {
+		async exmaStart() {
 			this.loading = true;
-			this.examDetail();
+			await this.examDetail();
 			if (this.examList.length) {
 				examNotify({ examId: this.$route.params.examId }).then(resp => {
 					const query = {