diff --git a/src/api/index.js b/src/api/index.js index 29d9ef8..a4e7116 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -24,6 +24,7 @@ export default { curriculumGetSubsection: `nakadai/nakadai/curriculum/subsection/getSubsection`, // 根据小节id获取预览文件地址 getProjectBySystemId: 'occupationlab/occupationlab/projectManage/getProjectBySystemId', getTheMostRecentlyRunProject: 'python/python/getTheMostRecentlyRunProject', + whetherToRenewTheFee: 'nakadai/nakadai/curriculum/whetherToRenewTheFee', // 能力测评 canExperiment: `occupationlab/occupationlab/evaluationrecord/can_experiment`, // 查询是否能够开启实验 diff --git a/src/assets/img/wechat-code.jpeg b/src/assets/img/wechat-code.jpeg new file mode 100644 index 0000000..07a86ee Binary files /dev/null and b/src/assets/img/wechat-code.jpeg differ diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index 294fee9..0309a5d 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -164,9 +164,11 @@ $height: 64px; position: absolute; top: 0; left: 40px; + display: flex; + align-items: center; font-size: 28px; color: #568DF2; - line-height: $height; + height: $height; cursor: pointer; img { margin-right: 10px; @@ -226,7 +228,7 @@ $height: 64px; border-radius: 6px; } } -@media (max-width: 1430px) { +@media (max-width: 1680px) { .header { .logo { left: 20px; diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index 7c788a5..4f9b15e 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -234,9 +234,20 @@ export default { } } } -@media (max-width: 1430px) { +@media (max-width: 1680px) { .nav { - left: 52%; + left: 55%; + & > li { + margin: 0 10px; + } + } +} +@media (max-width: 1380px) { + .nav { + left: 58%; + & > li { + padding: 0 10px; + } } } \ No newline at end of file diff --git a/src/pages/info/list/index.vue b/src/pages/info/list/index.vue index 6459f39..7824b2f 100644 --- a/src/pages/info/list/index.vue +++ b/src/pages/info/list/index.vue @@ -123,7 +123,6 @@ export default { this.menuList = data // 从文章页返回的情况,需要回到之前进文章页的那个分类 const historyId = this.historyId - console.log("🚀 ~ file: index.vue ~ line 122 ~ getData ~ historyId", historyId) if (historyId) { this.setColumnId('') this.defaultIndex = historyId + '' @@ -132,7 +131,6 @@ export default { // 正常情况默认展示第一个分类下的文章列表 data.length && this.getDeepId(data) const id = this.deepId - console.log("🚀 ~ file: index.vue ~ line 133 ~ getData ~ id", id, data) if (id) { this.getContent(id) this.defaultIndex = id + '' @@ -147,7 +145,6 @@ export default { }, // 获取最深的层级的id getDeepId(data) { - console.log("🚀 ~ file: index.vue ~ line 148 ~ getDeepId ~ data", data) data.map(e => { if (e.children.length) { this.getDeepId(e.children) @@ -280,7 +277,7 @@ export default { } } .list-wrap{ - flex: 1; + width: calc(100% - 180px); margin-left: 24px; .list{ li{ diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index 345301e..6f774a2 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -43,7 +43,8 @@
- + 续费 +

{{ courseName }}

@@ -97,6 +98,14 @@ 确 定 + + + +
+

该课程订阅期限已到期，若需要续费请扫码添加客服咨询“

+ +
+
@@ -148,7 +157,9 @@ export default { projectVisible: false, projects: [], loading: false, - curProject: '' + curProject: '', + overdue: 0, //是否过期 + buyVisible: false }; }, computed: { @@ -159,7 +170,7 @@ export default { mounted() { this.insertScript(); this.getData(); - this.getChapter(); + this.getStatus() }, destroyed() { // 记录播放时长 @@ -182,10 +193,20 @@ export default { this.assessmentList = data.assessmentConfig; this.systemIds = data.systemIds }, + // 查询是否过期 + getStatus() { + this.$get(this.api.whetherToRenewTheFee, { + cid: this.courseId + }).then(({ isRenew }) => { + // 1正常显示资源，0显示续费 + this.overdue = isRenew + this.getChapter() + }).catch(res => {}) + }, 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) { + if (this.overdue && this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length) { this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name); } }, @@ -207,6 +228,10 @@ export default { document.body.removeChild(document.querySelector("#aliplayerScript")); }); }, + // 显示咨询弹框 + showBuy() { + this.buyVisible = true + }, transferType(ext) { const suf = ext.toLowerCase() if('jpg,jpeg,png,gif,svg,psd'.includes(suf)) return '图片' @@ -214,6 +239,8 @@ export default { return suf }, preview(row, chapterName) { + // 如果没过期，则正常预览，否则显示购买弹框 + if (this.overdue) { this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况 this.playauth = ""; this.coverUrl = ""; @@ -290,6 +317,9 @@ export default { this.iframeSrc = res.previewUrl; }).catch(err => {}); } + } else { + this.showBuy() + } }, closeIframe() { this.iframeSrc = ""; @@ -447,6 +477,10 @@ $height: 700px; padding: 16px; margin-left: 12px; background-color: #252528; + .renew { + width: 100%; + margin-bottom: 16px; + } .entry { display: block; width: 100%; @@ -536,6 +570,16 @@ $height: 700px; } } } +.buy { + text-align: center; + .tips { + margin-bottom: 10px; + font-size: 14px; + } + img { + width: 85%; + } +} .el-image-viewer__wrapper{ transform: translateY(-10px); transition: transform .5s; diff --git a/src/setting.js b/src/setting.js index fc0ccb8..d9ce6d6 100644 --- a/src/setting.js +++ b/src/setting.js @@ -27,7 +27,7 @@ if (isPro) { systemPath = `http://${location.hostname}:8093` host = "http://121.37.12.51/"; // 测试服 // host = 'https://www.occupationlab.com/' // 正式服 - // host = "http://192.168.31.151:9000/"; // 榕 + host = "http://192.168.31.51:9000/"; // 榕 // host = "http://192.168.31.137:9000/"; // 赓 }