Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wechat_app into dev
This commit is contained in:
@@ -113,7 +113,7 @@ export default {
|
|||||||
},
|
},
|
||||||
handleToTest({id, examinationDuration: time, examinationType }) {
|
handleToTest({id, examinationDuration: time, examinationType }) {
|
||||||
if(examinationType == 1) {
|
if(examinationType == 1) {
|
||||||
if(this.studyDuration && this.studyDuration < time) {
|
if(this.studyDuration < time) {
|
||||||
return uni.showModal({
|
return uni.showModal({
|
||||||
title: '考试说明',
|
title: '考试说明',
|
||||||
content: `「考试认证」类考试,需要在线课堂中学习普法知识满足${time}分钟才能参加,考试通过并审核后可获取知法明理证书。`,
|
content: `「考试认证」类考试,需要在线课堂中学习普法知识满足${time}分钟才能参加,考试通过并审核后可获取知法明理证书。`,
|
||||||
|
|||||||
@@ -190,7 +190,7 @@ export default {
|
|||||||
this.$u.toast('提交成功')
|
this.$u.toast('提交成功')
|
||||||
setTimeout(()=> {
|
setTimeout(()=> {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: `./result?assessmentType=${this.assessmentType}&time=${this.studyDuration}&rightCount=${this.rightCount}&examCount=${this.list.length}&score=${this.score}`
|
url: `./result?assessmentType=${this.assessmentType}&time=${this.studyDuration}&rightCount=${this.rightCount}&examCount=${this.list.length}&score=${this.score}&status=${this.status}`
|
||||||
})
|
})
|
||||||
}, 600)
|
}, 600)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user