From 6afcf851d6f2db0de5cdaca31cad419f60895ede Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期二, 10 九月 2024 16:52:58 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/digitalCourses/digitalCoursesDetails/index.js | 125 +++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 42 deletions(-)
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index 23c4db3..8b78e3a 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -281,7 +281,6 @@
}
}
app.MG.store.getProductDetail(query).then(async res => {
- console.log('淇℃伅', res);
if (res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)) {
this.setData({
isBuy: true
@@ -311,22 +310,8 @@
if (res.datas.publishingUnit) {
await this.getBookPublishUnit(res.datas.publishingUnit)
}
- let lecturer = []
if (res.datas.datas.speaker && res.datas.datas.speaker.length > 0) {
- res.datas.datas.speaker.forEach(item => {
- if (res.datas.subItems && res.datas.subItems.QueryCms.length > 0) {
- res.datas.subItems.QueryCms.forEach(item1 => {
- if (JSON.parse(item.Data.Value).items[0] == item1.id) {
- lecturer.push({
- name: item1.name,
- icon: item1.icon ? item1.icon : '',
- description: item1.description ? item1.description : '',
- })
- }
- })
-
- }
- })
+ this.getSpeaker(res.datas.datas.speaker)
}
if (this.data.bookPath) {
this.getAboutBook(this.data.bookPath)
@@ -339,9 +324,66 @@
'<img style="max-width:100%;height:auto;display:block;margin-top:0;margin-bottom:0;"'
)
this.setData({
- lecturerList: lecturer,
digitalsData: res.datas,
loading: false
+ })
+ })
+ },
+ //鑾峰彇涓昏浜�
+ getSpeaker(list) {
+ let query = {
+ path: 'jsek_speaker',
+ fields: {
+ content: [],
+ positionalTitle: []
+ },
+ coverSize: {
+ height: 250
+ }
+ }
+ app.MG.resource.getItem(query).then((res) => {
+ let lecturerList = []
+ if (list && res.datas.length > 0) {
+ list.forEach((item) => {
+ if (res.datas && res.datas.length > 0) {
+ res.datas.forEach((item1) => {
+ if (JSON.parse(item.Data.Value).items[0] == item1.id) {
+ lecturerList.push({
+ name: item1.name,
+ positionalTitle: item1.positionalTitle,
+ icon: item1.icon,
+ description: item1.description ? item1.description : '鏆傛棤绠�浠�'
+ })
+ }
+ })
+ }
+ })
+ this.getPositionalTitle(lecturerList)
+ }
+ })
+ },
+ async getPositionalTitle(listStr) {
+ let list = []
+ let query = {
+ refCodes: ['positionalTitle']
+ }
+ await app.MG.store.getProductTypeField(query).then((res) => {
+ let option = JSON.parse(res[0].config).option
+ listStr.forEach((unit) => {
+ option.forEach((item) => {
+ if (item.value == unit.positionalTitle) {
+ unit.positionalName = item.name
+ }
+ })
+ list.push({
+ name: unit.name,
+ positionalTitle: unit.positionalName,
+ icon: unit.icon,
+ description: unit.description ? unit.description : '鏆傛棤绠�浠�'
+ })
+ })
+ this.setData({
+ lecturerList: list
})
})
},
@@ -692,8 +734,13 @@
onCorrelationBook(e) {
const item = e.currentTarget.dataset.item;
- this.digitalCoursesDetailsGet(item.id)
- this.getPlayerList()
+ // this.digitalCoursesDetailsGet(item.id)
+ // this.getPlayerList()
+ this.onLoad({
+ loading: true,
+ id: item.id,
+ path: item.idPath
+ })
},
// 鑾峰彇鐩稿叧璇剧▼
@@ -735,7 +782,7 @@
}
})
this.setData({
- relatedBookData: bookArr
+ relatedBookData: bookArr.slice(0, 6)
})
} else {
this.setData({
@@ -873,7 +920,6 @@
(data) => {
let width = data.width
let height = data.height
- console.log(width, height)
that.setData({
imageWidth: width,
imageHeight: height,
@@ -893,7 +939,6 @@
(data) => {
let width = data.width
let height = data.height
- console.log(width, height)
that.setData({
imageWidth: width,
imageHeight: height,
@@ -911,13 +956,11 @@
element: 'myCanvas',
progress(percent) {},
finish(url) {
- console.log("鐢熸垚鐨勫浘鐗囧湴鍧�", url)
wx.getFileSystemManager().readFile({
filePath: url,
encoding: 'base64',
success: (res) => {
let MyImageBase64 = 'data:image/jpg;base64,' + res.data
- console.log('MyImageBase64', MyImageBase64)
that.setData({
cbzsImg: MyImageBase64,
pubCertificateHide: false,
@@ -948,13 +991,11 @@
element: 'myCanvas1',
progress(percent) {},
finish(url) {
- console.log("鐢熸垚鐨勫浘鐗囧湴鍧�", url)
wx.getFileSystemManager().readFile({
filePath: url,
encoding: 'base64',
success: (res) => {
let MyImageBase641 = 'data:image/jpg;base64,' + res.data
- console.log('MyImageBase64', MyImageBase641)
that.setData({
rzzsImg: MyImageBase641,
pubCertificateHide: false,
@@ -1015,22 +1056,22 @@
onCertificate() {
- // if (!this.data.isBuy) {
- // wx.showToast({
- // title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
- // if (!this.data.isLearn) {
- // wx.showToast({
- // title: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
+ if (!this.data.isBuy) {
+ wx.showToast({
+ title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
+ if (!this.data.isLearn) {
+ wx.showToast({
+ title: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
if (this.data.isCertificate && this.data.isCertificate.state == 'WaitAudit') {
wx.showToast({
title: "鎮ㄧ敵璇风殑璇佷功姝ｅ湪瀹℃牳涓�",
--
Gitblit v1.9.1