diff --git a/src/api/index.js b/src/api/index.js index 6c0d5a0..7019745 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -30,10 +30,10 @@ export default { saveLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/save', updateLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/update', // 课程笔记 - addNote: `${host2}nakadai/curriculumNotes/addNote`, - curriculumNoteList: `${host2}nakadai/curriculumNotes/curriculumNoteList`, - deleteNotes: `${host2}nakadai/curriculumNotes/deleteNotes`, - updateNote: `${host2}nakadai/curriculumNotes/updateNote`, + addNote: `nakadai/curriculumNotes/addNote`, + curriculumNoteList: `nakadai/curriculumNotes/curriculumNoteList`, + deleteNotes: `nakadai/curriculumNotes/deleteNotes`, + updateNote: `nakadai/curriculumNotes/updateNote`, // 权限管理 getUserRolesPermissionMenu: `users/users/user-role/getUserRolesPermissionMenu`, @@ -363,6 +363,8 @@ export default { supplierList: `nakadai/supplier/supplierList`, tagsList: `nakadai/tags/tagsList`, listOfGoods: `nakadai/mall/listOfGoods`, + detailsOfGoods: `nakadai/mall/detailsOfGoods`, + addLearningRecord: `nakadai/mallCourseLearningRecord/addLearningRecord`, // 课程管理三级联查 courseDiscipline: `nakadai/nakadai/subject/courseDiscipline`, //课程学科类别 courseProfessionalClass: `nakadai/nakadai/subject/courseProfessionalClass`, //课程专业类 diff --git a/src/assets/img/exts/pdf.png b/src/assets/img/exts/pdf.png new file mode 100644 index 0000000..39e05f1 Binary files /dev/null and b/src/assets/img/exts/pdf.png differ diff --git a/src/assets/img/exts/pic.png b/src/assets/img/exts/pic.png new file mode 100644 index 0000000..6f63244 Binary files /dev/null and b/src/assets/img/exts/pic.png differ diff --git a/src/assets/img/exts/ppt.png b/src/assets/img/exts/ppt.png new file mode 100644 index 0000000..ac00198 Binary files /dev/null and b/src/assets/img/exts/ppt.png differ diff --git a/src/assets/img/exts/txt.png b/src/assets/img/exts/txt.png new file mode 100644 index 0000000..bb1276a Binary files /dev/null and b/src/assets/img/exts/txt.png differ diff --git a/src/assets/img/exts/video.png b/src/assets/img/exts/video.png new file mode 100644 index 0000000..d509482 Binary files /dev/null and b/src/assets/img/exts/video.png differ diff --git a/src/assets/img/exts/word.png b/src/assets/img/exts/word.png new file mode 100644 index 0000000..aeb4ddc Binary files /dev/null and b/src/assets/img/exts/word.png differ diff --git a/src/assets/img/eye.png b/src/assets/img/eye.png new file mode 100644 index 0000000..7ec0d63 Binary files /dev/null and b/src/assets/img/eye.png differ diff --git a/src/assets/img/hot.png b/src/assets/img/hot.png new file mode 100644 index 0000000..2ad58fc Binary files /dev/null and b/src/assets/img/hot.png differ diff --git a/src/assets/img/my-school.png b/src/assets/img/my-school.png new file mode 100644 index 0000000..a621c54 Binary files /dev/null and b/src/assets/img/my-school.png differ diff --git a/src/assets/img/platform.png b/src/assets/img/platform.png new file mode 100644 index 0000000..634860f Binary files /dev/null and b/src/assets/img/platform.png differ diff --git a/src/assets/img/product-bg.png b/src/assets/img/product-bg.png new file mode 100644 index 0000000..32bd9c8 Binary files /dev/null and b/src/assets/img/product-bg.png differ diff --git a/src/assets/img/sort.png b/src/assets/img/sort.png new file mode 100644 index 0000000..e0d456d Binary files /dev/null and b/src/assets/img/sort.png differ diff --git a/src/assets/img/type.png b/src/assets/img/type.png new file mode 100644 index 0000000..ae65fee Binary files /dev/null and b/src/assets/img/type.png differ diff --git a/src/pages/product/list/index.vue b/src/pages/product/list/index.vue index efac301..2de0136 100644 --- a/src/pages/product/list/index.vue +++ b/src/pages/product/list/index.vue @@ -1,83 +1,104 @@
-

+

{{ i + 1 }}. - {{ item.name }} + {{ item.projectName }}

@@ -98,115 +98,117 @@
{{ item.name }}
- - + @@ -385,24 +387,23 @@ export default { // 1正常显示资源，0显示续费 this.overdue = isRenew this.getChapter() + this.getProgress() }).catch(res => {}) }, + // 获取章节小节 async getChapter() { - let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}`); + let res = await this.$get(`${this.api.curriculumChapter}/${this.courseId}`); this.chapterList = res.chapterList; - const list = [] - res.chapterList.forEach(e => { - e.subsectionList.forEach(n => { - n.chapterId = e.id - list.push(n) - }) - }) - this.progressList = list - this.schedule = +(res.schedule.replace('%', '')) if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length) { 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}`); + this.progressList = res.list + this.schedule = +(res.schedule.replace('%', '')) + }, // 目录和进度切换 typeChange(id) { this.getChapter() @@ -489,14 +490,13 @@ export default { studySection(item) { item.whetherToStudyOrNot ? this.$post(`${this.api.deleteLearningProgress}?id=${item.learningProgressId}`).then(res => { - this.getChapter() + this.getProgress() }).catch(res => {}) : this.$post(this.api.saveLearningProgress, { - chapterId: item.chapterId, cid: this.courseId, - subsectionId: item.id, + projectId: item.projectId, }).then(res => { - this.getChapter() + this.getProgress() }).catch(res => {}) }, preview(row, chapterName, showDia = 0) { @@ -797,9 +797,6 @@ $height: 700px; /deep/.el-progress-bar { width: 92%; } - /deep/.el-progress__text { - color: #fff; - } .desc-wrap{ position: relative; .desc{ @@ -878,9 +875,6 @@ $height: 700px; border-radius: 50%; border: 1px solid #ccc; } - &.active{ - color: #fff; - } } } .buy { @@ -998,6 +992,9 @@ $height: 700px; } } +.tab-content { + width: 80%; +} /deep/.project-dia { .el-dialog__body { padding: 28px 32px; diff --git a/src/router/modules/product.js b/src/router/modules/product.js index 6a23cef..1cce350 100644 --- a/src/router/modules/product.js +++ b/src/router/modules/product.js @@ -14,10 +14,14 @@ export default { component: BasicLayout, children: [ { - name: `${pre}list`, path: `list`, component: () => import("@/pages/product/list"), meta: { title: "产品中心" } }, + { + path: `show`, + component: () => import("@/pages/product/show"), + meta: { title: "产品详情" } + }, ] }; \ No newline at end of file diff --git a/src/styles/page/station.scss b/src/styles/page/station.scss index 92695ed..0aae6d9 100644 --- a/src/styles/page/station.scss +++ b/src/styles/page/station.scss @@ -80,8 +80,11 @@ } /deep/.timeline { - padding-left: 12%; + padding-left: 9%; overflow: hidden; + .el-timeline-item { + padding-bottom: 40px; + } .el-timeline-item__node--normal { top: 30px; } @@ -96,7 +99,7 @@ .sign { position: relative; display: inline-block; - margin-left: -15%; + margin-left: -12.5%; font-size: 14px; color: #9076FF; } @@ -110,7 +113,7 @@ justify-content: space-between; align-items: center; padding-bottom: 10px; - margin: -32px 0 20px; + margin: -22px 0 20px; font-size: 18px; color: #9076FF; border-bottom: 1px dashed #bfbfbf;