Merge branch 'dev' into test

This commit is contained in:
zyy 2019-09-04 19:07:43 +08:00
commit 2dadba36dd
2 changed files with 5 additions and 6 deletions

View File

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

View File

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