From f5012732b75608342ebec504174a0759b4172271 Mon Sep 17 00:00:00 2001 From: wangdong <1551135706@qq.com> Date: Sun, 24 Mar 2024 14:03:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/learning.js | 12 +++++ components/Course/offlineStyleCourse.vue | 2 +- pages/activity/index.vue | 10 ++-- pages/index/index.vue | 36 +++++++------- pages/learning/index.vue | 24 ++++++--- pages/learningCenter/brushQuestion.vue | 62 ++++++++++++++++++------ pages/learningCenter/recite.vue | 35 +++++++++---- pages/learningCenter/reciteContent.vue | 26 ++++++++-- pages/learningCenter/reciteDetail.vue | 61 ++++++++++++++++++++--- pages/special/question_index.vue | 12 +++-- pages/store/goodsCate.vue | 2 +- pages/topic/problem_detail.vue | 1 - pages/topic/question_detail.vue | 10 ++-- pages/topic/question_sheet.vue | 2 +- 14 files changed, 220 insertions(+), 75 deletions(-) diff --git a/api/learning.js b/api/learning.js index 4de1c8f..f3feb7a 100644 --- a/api/learning.js +++ b/api/learning.js @@ -2,4 +2,16 @@ import http from "@/utils/request"; export function getLearningData(params){ return http.get("/clearance/grade_index", params) +} + +export function clearanceSubject(params){ + return http.get("/clearance/clearanceSubject", params) +} + +export function clearanceSubjectChapter(params){ + return http.get("/clearance/clearanceSubjectChapter", params) +} + +export function specialTestPaper(params){ + return http.get("/Topic/specialTestPaper", params) } \ No newline at end of file diff --git a/components/Course/offlineStyleCourse.vue b/components/Course/offlineStyleCourse.vue index fc74b7a..c389f5a 100644 --- a/components/Course/offlineStyleCourse.vue +++ b/components/Course/offlineStyleCourse.vue @@ -52,7 +52,7 @@ .offline-special-item { margin-bottom: 19rpx; background: #fff; - padding: 25rpx 32rpx; + padding: 25rpx 20rpx 25rpx 32rpx; &:last-child { margin-bottom: 0; } diff --git a/pages/activity/index.vue b/pages/activity/index.vue index 09f69c1..e2168f5 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -18,13 +18,13 @@ - 报名时间：{{ activity.signup_start_time.split(' ')[0] }} — {{ - activity.signup_end_time.split(' ')[0] + 报名时间：{{ activity.signup_start_time }} — {{ + activity.signup_end_time }} - 活动时间：{{ activity.start_time.split(' ')[0] }} — {{ activity.end_time.split(' ')[0] }} + 活动时间：{{ activity.start_time }} — {{ activity.end_time }} @@ -185,6 +185,10 @@ export default { getActivityDetail({ id: this.id }) .then((res) => { let data = res.data; + // data.activity.signup_start_time = data.activity.signup_start_time && data.activity.signup_start_time.split(' ')[0]; + // data.activity.signup_end_time = data.activity.signup_end_time && data.activity.signup_end_time.split(' ')[0]; + // data.activity.start_time = data.activity.start_time && data.activity.start_time.split(' ')[0]; + // data.activity.end_time = data.activity.end_time && data.activity.end_time.split(' ')[0]; this.activity = data.activity; this.siteName = data.Auth_site_name; this.isMember = data.is_member; diff --git a/pages/index/index.vue b/pages/index/index.vue index 5a4a066..d3e6138 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -153,24 +153,26 @@ 更多 > - - - - - - {{ item.store_name }} - - {{ label }} + diff --git a/pages/learning/index.vue b/pages/learning/index.vue index 2fc6eb1..41dc28d 100644 --- a/pages/learning/index.vue +++ b/pages/learning/index.vue @@ -13,7 +13,7 @@ 我的考试: - {{ myExam.examName }} + {{ myExam.examName }} 开考时间: @@ -66,10 +66,10 @@ 背诵过关 - 更多 > + - + {{ item.name }} @@ -79,10 +79,10 @@ 刷题过关 - 更多 > + - + {{ item.name }} @@ -93,7 +93,7 @@ {{ item.menuName }} - 更多 > + 更多 > @@ -210,7 +210,7 @@ import store from "@/store"; toMoreCourse(key) { if (key === 'offline_courses') { uni.navigateTo({ - url: '/pages/activity/activity_list' + url: `/pages/activity/activity_list?gradeId=${this.myExam.gradeId}&subjectId=${this.myExam.subjectId}` }); } else { uni.navigateTo({ @@ -218,6 +218,16 @@ import store from "@/store"; }) } }, + handleReciteClick(item) { + uni.navigateTo({ + url: `/pages/learningCenter/recite?id=${item.id}` + }) + }, + handleQestionClick(item) { + uni.navigateTo({ + url: `/pages/learningCenter/brushQuestion?id=${item.id}` + }) + }, }, }; diff --git a/pages/learningCenter/brushQuestion.vue b/pages/learningCenter/brushQuestion.vue index c3feea1..04f0539 100644 --- a/pages/learningCenter/brushQuestion.vue +++ b/pages/learningCenter/brushQuestion.vue @@ -12,49 +12,66 @@ + 错题集 diff --git a/pages/learningCenter/reciteContent.vue b/pages/learningCenter/reciteContent.vue index cc0624d..1883538 100644 --- a/pages/learningCenter/reciteContent.vue +++ b/pages/learningCenter/reciteContent.vue @@ -20,13 +20,13 @@ @@ -215,7 +261,7 @@ width: 100%; height: 130rpx; justify-content: center; - padding-left: 30rpx; + // padding-left: 30rpx; background: #fff; box-shadow: 0rpx -19rpx 54rpx 0rpx rgba(34,34,34,0.05); flex-shrink: 0; @@ -223,14 +269,15 @@ color: #666; font-size: 30rpx; &.next { - width: 550rpx; + // width: 550rpx; + width: 690rpx; height: 88rpx; background: linear-gradient(0deg, #0F74BB 0%, #3293FF 100%); border-radius: 44rpx; color: #fff; line-height: 88rpx; text-align: center; - margin-left: 44rpx; + // margin-left: 44rpx; } } } diff --git a/pages/special/question_index.vue b/pages/special/question_index.vue index 137f746..c15f3eb 100644 --- a/pages/special/question_index.vue +++ b/pages/special/question_index.vue @@ -100,14 +100,20 @@ isAlipay: false, isBalance: false, isOpenWeixing: false, - status: -1 + status: -1, + is_analysis: 0, }; }, - onLoad({ id, isMember }) { + onLoad({ id, isMember, is_analysis }) { this.id = Number(id); this.isMember = isMember; this.getDetail(); this.getAuthInfo(); + if (is_analysis) { + this.is_analysis = is_analysis; + } else { + this.is_analysis = 0; + } }, onShow() { if (this.isOpenWeixing && this.orderId) { @@ -127,7 +133,7 @@ if (this.status == 1) this.$util.setStorage(`exam_time${id}`, 0); console.log(this.$util.getStorage(`exam_time${id}`)); uni.navigateTo({ - url: `/pages/topic/question_detail?test_id=${id}` + url: `/pages/topic/question_detail?test_id=${id}&is_analysis=${this.is_analysis}` }); }, async getAuthInfo() { diff --git a/pages/store/goodsCate.vue b/pages/store/goodsCate.vue index 3185f49..633120e 100644 --- a/pages/store/goodsCate.vue +++ b/pages/store/goodsCate.vue @@ -1,6 +1,6 @@ - + 回答{{ item.is_correct === 2 ? "正确" : "错误" }} @@ -111,7 +111,6 @@ class="button flex flex-column flex-center" :class="{ disabled: !!questions[activeIndex].is_correct }" @click="submitQuestion" - v-if="!is_analysis" > 确认提交 @@ -210,10 +209,11 @@ export default { } else { this.exam_time = 0; } - - if (e_id && parseInt(is_analysis)) { + if (parseInt(is_analysis)) { this.is_analysis = 1; - this.e_id = e_id; + } + if (e_id) { + this.e_id = e_id || ''; this.getQuestions(); } else { this.getSituation(); diff --git a/pages/topic/question_sheet.vue b/pages/topic/question_sheet.vue index f1957c1..86fbcac 100644 --- a/pages/topic/question_sheet.vue +++ b/pages/topic/question_sheet.vue @@ -31,7 +31,7 @@ > - + 提交考试