diff --git a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue index d8ddb94..4912d43 100644 --- a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue +++ b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue @@ -7,7 +7,7 @@
- +
@@ -77,6 +77,9 @@ export default { }, toDetail(id) { uni.navigateTo({url: "./classDetail?id=" + id}) + }, + toStudy() { + this.currIndex == 1 } } } diff --git a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue index da0bfd1..bfe219e 100644 --- a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue +++ b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue @@ -110,8 +110,25 @@ export default { } }) }, - handleToTest({id, examination_duration: time }) { - console.log(time); + handleToTest({id, examination_duration: time, examinationType }) { + console.log(time, examinationType); + if(examinationType == 1) { + if(this.studyDuration && this.studyDuration < time) { + uni.showModal({ + title: '考试说明', + content: `「考试认证」类考试,需要在线课堂中学习普法知识满足${time}分钟才能参加,考试通过并审核后可获取知法明理证书。`, + confirmText: '去学习', + confirmColor: '#2D7DFF', + success: (res)=> { + if (res.confirm) { + this.$emit('toStudy') + } else if (res.cancel) { + // 停留 + } + } + }); + } + } if(!this.user.areaId) { this.showAuth = true; this.testId = id; diff --git a/src/project/qujing/AppLegalLearning/result.vue b/src/project/qujing/AppLegalLearning/result.vue index 499f1b7..5a6311a 100644 --- a/src/project/qujing/AppLegalLearning/result.vue +++ b/src/project/qujing/AppLegalLearning/result.vue @@ -11,8 +11,11 @@
结果
-
- 通过 +
+ 学富五车 + 才高八斗 + 合格 + 不合格
diff --git a/src/project/qujing/AppLegalLearning/testForm.vue b/src/project/qujing/AppLegalLearning/testForm.vue index 2965809..541f456 100644 --- a/src/project/qujing/AppLegalLearning/testForm.vue +++ b/src/project/qujing/AppLegalLearning/testForm.vue @@ -190,7 +190,7 @@ export default { this.$u.toast('提交成功') setTimeout(()=> { uni.navigateTo({ - url: `./result?status=${this.status}&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}` }) }, 600) }