From a79f9ce3cc4e79719b6dfdbf58d90d81fdb82d1a Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 30 Jul 2024 15:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/station/list/index.vue | 13 +++---
src/pages/station/preview/index.vue | 62 ++++++++++++++++-------------
src/pages/station/product/index.vue | 15 ++++++-
3 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/src/pages/station/list/index.vue b/src/pages/station/list/index.vue
index 187e3a8..b1a98aa 100644
--- a/src/pages/station/list/index.vue
+++ b/src/pages/station/list/index.vue
@@ -110,9 +110,11 @@ export default {
}
},
toProduct (item) {
- // 未过期
- if (item.isInEffect) {
- const links = item.nonAssociatedLinks
+ const links = item.nonAssociatedLinks
+ // 已过期 / 没有cid并且没有链接，则跳转到产品详情
+ if (!item.isInEffect || (!item.cid && !links)) {
+ this.$router.push(`product?id=${item.mallId}`)
+ } else {
// 有链接
if (links && links.length) {
if (links.length === 1) {
@@ -122,11 +124,8 @@ export default {
this.links = item.nonAssociatedLinks
}
} else {
- this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}&keyword=${this.keyword}&active=${this.active}`)
+ this.$router.push(`/station/preview?courseId=${item.cid || ''}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}&keyword=${this.keyword}&active=${this.active}`)
}
- } else {
- // 续费
- this.$router.push(`product?id=${item.mallId}`)
}
},
// tab切换
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index 02bc39a..5b3dfc4 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -413,7 +413,7 @@ export default {
},
destroyed () {
// 记录播放时长
- Util.local.get(Setting.tokenKey) && this.$post(this.api.playRecordSave, {
+ Util.local.get(Setting.tokenKey) && this.courseId && this.$post(this.api.playRecordSave, {
courseId: this.courseId,
courseType: 0,
playTime: Math.ceil((Date.now() - this.startTime) / 1000 / 60)
@@ -429,23 +429,25 @@ export default {
this.addRecord()
},
async getData () {
- const { data } = await this.$post(`${this.api.curriculumDetail}?cid=${this.courseId}&mallId=${this.mallId}`);
- this.routes = [
- {
- name: '实验台',
- path: `list?keyword=${this.$route.query.keyword || ''}&active=${this.$route.query.active || 0}`
- },
- {
- name: data.curriculumName
- }
- ]
-
- this.courseName = data.curriculumName;
- this.briefIntroduction = data.briefIntroduction;
- this.teachingObjectives = data.teachingObjectives;
- this.assessmentList = data.assessmentConfig;
- this.systemIds = data.systemIds
- this.queryProject()
+ if (this.courseId) {
+ const { data } = await this.$post(`${this.api.curriculumDetail}?cid=${this.courseId}&mallId=${this.mallId}`);
+ this.routes = [
+ {
+ name: '实验台',
+ path: `list?keyword=${this.$route.query.keyword || ''}&active=${this.$route.query.active || 0}`
+ },
+ {
+ name: data.curriculumName
+ }
+ ]
+
+ this.courseName = data.curriculumName;
+ this.briefIntroduction = data.briefIntroduction;
+ this.teachingObjectives = data.teachingObjectives;
+ this.assessmentList = data.assessmentConfig;
+ this.systemIds = data.systemIds
+ this.queryProject()
+ }
this.getStatus()
},
// 记录最近使用
@@ -465,20 +467,24 @@ export default {
},
// 获取章节小节
async getChapter () {
- let res = await this.$get(`${this.api.curriculumChapter}/${this.courseId}`);
- this.chapterList = res.chapterList;
- if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length && !this.commentId) {
- this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 1);
+ if (this.courseId) {
+ let res = await this.$get(`${this.api.curriculumChapter}/${this.courseId}`);
+ this.chapterList = res.chapterList;
+ if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length && !this.commentId) {
+ this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 1);
+ }
}
},
// 获取学习进度
async getProgress () {
- let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}&systemId=${this.systemIds}&mallId=${this.mallId}`);
- this.progressList = res.list
- if (res.list.length) this.archProject = res.list[0].projectId
- this.maximumScores.length || this.getMaximumScore()
- this.plan = res.plan
- this.schedule = +(res.schedule.replace('%', ''))
+ if (this.courseId) {
+ let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}&systemId=${this.systemIds}&mallId=${this.mallId}`);
+ this.progressList = res.list
+ if (res.list.length) this.archProject = res.list[0].projectId
+ this.maximumScores.length || this.getMaximumScore()
+ this.plan = res.plan
+ this.schedule = +(res.schedule.replace('%', ''))
+ }
},
// 获取最高分列表
async getMaximumScore () {
diff --git a/src/pages/station/product/index.vue b/src/pages/station/product/index.vue
index 61ac241..cbc55fe 100644
--- a/src/pages/station/product/index.vue
+++ b/src/pages/station/product/index.vue
@@ -48,7 +48,8 @@
{{ form.goodsRes.typeName }}
-
+
+
@@ -145,7 +146,8 @@ export default {
chapterList: [],
hots: [],
linkVisible: false,
- height: ''
+ height: '',
+ overdue: 0, //是否过期
};
},
computed: {
@@ -193,6 +195,7 @@ export default {
next()
},
mounted () {
+ this.getStatus()
this.getData()
this.getHot()
},
@@ -233,6 +236,14 @@ export default {
this.chapterList = res.chapterList
}
},
+ // 查询是否过期
+ async getStatus () {
+ const { isRenew } = await this.$get(this.api.whetherToRenewTheFee, {
+ mallId: this.id
+ })
+ // 1正常显示资源，0显示续费
+ this.overdue = isRenew
+ },
// tab切换
tabChange ({ id }) {
this.curTab = id