From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/digitalCourses/digitalCoursesDetails/index.js | 94 +++++++++++++++++++++++------------------------
1 files changed, 46 insertions(+), 48 deletions(-)
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index 57eed2f..fb2dde1 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -179,6 +179,9 @@
this.digitalCoursesDetailsGet(options.id)
this.getPlayerList()
this.getType()
+ // this.setData({
+ // userName: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).name,
+ // })
},
/**
@@ -192,11 +195,12 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
- if (this.data.tabValue == 2) {
+ if (this.data.tabValue == 2 && this.data.selectActive == 'learn') {
+ console.log(12333)
this.getPlayerList()
this.getResource()
+ this.getRelationBook()
}
-
},
/**
@@ -240,6 +244,7 @@
keys: [this.data.bookId + '']
})
.then((res) => {
+ console.log(1, res);
if (res.length > 0) {
this.setData({
playerList: JSON.parse(res[0].value)
@@ -307,7 +312,7 @@
expire: res.false
})
}
- res.datas.publicationDate = moment(res.datas.publicationDate).format('YYYY骞碝M鏈�')
+ res.datas.publicationDate = res.datas.publicationDate ? moment(res.datas.publicationDate).format('YYYY骞碝M鏈�') : ''
res.datas.price = res.datas.price.toFixed(2)
res.datas.oldPrice = res.datas.oldPrice.toFixed(2)
wx.setNavigationBarTitle({
@@ -530,12 +535,17 @@
if (this.data.selectActive === 'learn') {
let list = []
// 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�17 鍐呴儴浼�6
- let addNum = query.cmsPath.length > 5 ? 7 : query.cmsPath.length > 6 ? 8 : 6
- const num = query.cmsPath.length + addNum
if (learn.some((item) => item.sysType == 'CmsFolder')) {
- this.getTreeList(learn, num, list, '\\', addNum)
- list = this.ensureTreeConsistency(list)
+ // 1.鍙湁鐩綍锛屾病鏈夎祫婧�
+ if (!learn.some((item) => item.sysType == 'CmsItem')) {
+ list = learn
+ } else {
+ // 2.鐩綍鍜岃祫婧愰兘鏈�
+ this.getTreeList(learn, list, query.cmsPath)
+ list = this.ensureTreeConsistency(list)
+ }
} else {
+ // 3.鍙湁璧勬簮锛屾病鏈夌洰褰�
list = learn
}
let result = [];
@@ -545,22 +555,18 @@
learnList: list,
openTeachids: result,
});
- console.log(1, this.data.learnList, this.data.playerList)
}
} else {
const data = test.filter(
(item) => item.type == 'questionBankFolder' && item.childrenFolderCount > 0
)
-
if (data.length > 0) {
let list = []
- let addNum = query.cmsPath.length > 5 ? 7 : query.cmsPath.length > 6 ? 8 : 6
- const num = query.cmsPath.length + addNum
- this.getTreeList(data, num, list, '\\', addNum)
+ this.getTreeList(data, list, query.cmsPath)
list = this.ensureTreeConsistency(list)
let result = [];
- this.findChildIds(list[0].children, result)
- this.countLeafNodes(list[0].children)
+ this.findChildIds(list[0]?.children, result)
+ this.countLeafNodes(list[0]?.children)
this.setData({
testList: list[0].children,
openTeachids: result,
@@ -589,10 +595,9 @@
})
},
// 鎵佸钩鍖栨暟鎹浆鎹ree
- getTreeList(rootList, pathLength, newArr, path, addNum) {
+ getTreeList(rootList, newArr, path) {
for (const item of rootList) {
- // 姝ゅ鍘熸湰 item.productLinkPath.length == pathLength 浣� productLinkPath 闀垮害涓埆涔﹀瓨鍦�4銆�5浣嶄氦閿�
- if ((pathLength - item.productLinkPath.length >= 0 && pathLength - item.productLinkPath.length <= 3) && item.productLinkPath.includes(path)) {
+ if (path == item.productLinkPath.replace('\\' + item.id, '')) {
if (item.sysType == 'CmsItem') {
if (item.selectType == 'webpage') {
item.disabled = true
@@ -607,15 +612,16 @@
}
// newArr.push(item)
// 鍦ㄦ彃鍏ヨ繃绋嬩腑瀵规暟鎹繘琛屾帓搴�
- newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item, addNum)
+ newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item)
+ // 鎻掕繘鏁扮粍鍚� 浠庡師鏁版嵁涓垹闄�
+ rootList = rootList.filter(nitem => nitem.id != item.id)
}
}
//缁欐暟缁勯噷闈㈠啀娣诲姞涓�涓猚hildren鐨勭┖鏁扮粍
for (const i of newArr) {
i.children = []
- this.getTreeList(rootList, pathLength + addNum, i.children, i.productLinkPath, addNum)
+ this.getTreeList(rootList, i.children, i.productLinkPath)
if (i.children.length == 0) {
- newArr[0].istry = true
delete i.children
}
}
@@ -639,29 +645,21 @@
},
// 鎺掑簭鏁扮粍 鎸夌収productLinkPath
- insertAndSortObjectsByProductLinkPath(array, newObj, addNum) {
+ insertAndSortObjectsByProductLinkPath(array, newObj) {
// 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆
- let insertIndex = array.findIndex(obj => Number(newObj.productLinkPath.substring(newObj.productLinkPath.length - addNum, newObj.productLinkPath.length)) < Number(obj.productLinkPath.substring(obj.productLinkPath.length - addNum, obj.productLinkPath.length)));
-
+ let insertIndex = array.findIndex(obj => newObj.id < obj.id);
// 濡傛灉娌℃湁鎵惧埌鍚堥�傜殑浣嶇疆锛屽垯鏀惧湪鏁扮粍鏈熬
if (insertIndex === -1) {
insertIndex = array.length;
}
// 鎻掑叆鏂板璞″埌鏁扮粍
array.splice(insertIndex, 0, newObj);
- // 娴嬭瘯6 姝ｅ紡5
// 瀵规暟缁勮繘琛屾帓搴�
array.sort((a, b) => {
- if (Number(a.productLinkPath.substring(a.productLinkPath.length - addNum, a.productLinkPath.length)) < Number(b.productLinkPath.substring(b.productLinkPath.length - addNum, b.productLinkPath.length))) {
- return -1;
- }
- if (Number(a.productLinkPath.substring(a.productLinkPath.length - addNum, a.productLinkPath.length)) > Number(b.productLinkPath.substring(b.productLinkPath.length - addNum, b.productLinkPath.length))) {
- return 1;
- }
- // a must be equal to b
+ if (a.id < b.id) return -1;
+ if (a.id > b.id) return 1;
return 0;
});
-
// 杩斿洖鏇存柊鍚庣殑鏁扮粍
return array;
},
@@ -1100,22 +1098,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