diff --git a/pages.json b/pages.json index 63cf7cc..044d69f 100644 --- a/pages.json +++ b/pages.json @@ -149,6 +149,41 @@ { "navigationBarTitleText" : "学习" } + }, + { + "path" : "pages/YNEduApp/exam/examination", + "style" : + { + "navigationStyle" : "custom" + } + }, + { + "path" : "pages/YNEduApp/exam/examinationDetails", + "style" : + { + "navigationStyle" : "custom" + } + }, + { + "path" : "pages/YNEduApp/exam/examinationList", + "style" : + { + "navigationBarTitleText" : "考试记录" + } + }, + { + "path" : "pages/YNEduApp/exam/examinationResultDetails", + "style" : + { + "navigationBarTitleText" : "考试结果详情" + } + }, + { + "path" : "pages/YNEduApp/learn/pdfStudy", + "style" : + { + "navigationBarTitleText" : "pdf学习" + } } ], "globalStyle": { diff --git a/pages/YNEduApp/exam/beforeExam.vue b/pages/YNEduApp/exam/beforeExam.vue index 42a2ee8..f4fb4d6 100644 --- a/pages/YNEduApp/exam/beforeExam.vue +++ b/pages/YNEduApp/exam/beforeExam.vue @@ -60,9 +60,9 @@ export default { }, // 进入考试 handleEnterExam() { - // uni.navigateTo({ - // url: '/pages/YNEduApp/exam/exam' - // }) + uni.navigateTo({ + url: '/pages/YNEduApp/exam/examination' + }) } } } diff --git a/pages/YNEduApp/exam/examination.vue b/pages/YNEduApp/exam/examination.vue new file mode 100644 index 0000000..eb52156 --- /dev/null +++ b/pages/YNEduApp/exam/examination.vue @@ -0,0 +1,493 @@ + + + + + diff --git a/pages/YNEduApp/exam/examinationDetails.vue b/pages/YNEduApp/exam/examinationDetails.vue new file mode 100644 index 0000000..8b472fa --- /dev/null +++ b/pages/YNEduApp/exam/examinationDetails.vue @@ -0,0 +1,284 @@ + + + + + diff --git a/pages/YNEduApp/exam/examinationList.vue b/pages/YNEduApp/exam/examinationList.vue new file mode 100644 index 0000000..0faacc2 --- /dev/null +++ b/pages/YNEduApp/exam/examinationList.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/pages/YNEduApp/exam/examinationResultDetails.vue b/pages/YNEduApp/exam/examinationResultDetails.vue new file mode 100644 index 0000000..9088128 --- /dev/null +++ b/pages/YNEduApp/exam/examinationResultDetails.vue @@ -0,0 +1,725 @@ + + + + + diff --git a/pages/YNEduApp/learn/learn.vue b/pages/YNEduApp/learn/learn.vue index c7db3ac..a9509b2 100644 --- a/pages/YNEduApp/learn/learn.vue +++ b/pages/YNEduApp/learn/learn.vue @@ -60,10 +60,11 @@ export default { this.showVideo = false }, handleStudyItem(item) { + console.log('🚀 ~ handleStudyItem ~ item:', item, item.url.includes('.pdf')) if (item.url.includes('.pdf')) { - // uni.navigateTo({ - // url: '/pages/YNEduApp/exam/exam' - // }) + uni.navigateTo({ + url: '/pages/YNEduApp/learn/pdfStudy', + }) } else { this.states = item this.showVideo = true diff --git a/pages/YNEduApp/learn/pdfStudy.vue b/pages/YNEduApp/learn/pdfStudy.vue new file mode 100644 index 0000000..f2a13e2 --- /dev/null +++ b/pages/YNEduApp/learn/pdfStudy.vue @@ -0,0 +1,19 @@ + + + diff --git a/static/images/correct.png b/static/images/correct.png new file mode 100644 index 0000000..0b73060 Binary files /dev/null and b/static/images/correct.png differ diff --git a/static/images/result-bg.png b/static/images/result-bg.png new file mode 100644 index 0000000..0fcfef4 Binary files /dev/null and b/static/images/result-bg.png differ