From dc934dfd63fecff84d0bf996418e041b9bd4ea59 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 30 四月 2024 18:16:13 +0800
Subject: [PATCH] bug修改
---
packageBookService/pages/bookServices/detail/index.js | 355 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 322 insertions(+), 33 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index bddc6e9..e5b7821 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -37,6 +37,8 @@
openTeachids: [],
openLearnids: [],
openTestids: [],
+ isGoBuyResource: true,
+ learnPath: '',
applyResourceState: false, // 鐢宠鏁欏璧勬簮鎸夐挳闃叉姈
resourceClassList: [], // 璧勬簮鎵�灞炲垎绫�
applyState: "", // 鏁欏璧勬簮鐢宠鐘舵��
@@ -150,7 +152,8 @@
},
],
showIndex: '',
- successOrderNumber: ''
+ successOrderNumber: '',
+ applicationState: '' // 鐢靛瓙鏍蜂功鐢宠鐘舵��
},
resetTree: function (e) {
@@ -522,7 +525,6 @@
this.setData({
noFile: true,
});
- // debugger
if (this.data.bookDetail.pdf) {
this.setData({
"fileInfo.bookName": this.data.bookDetail.name,
@@ -671,15 +673,23 @@
"buyResourceData.refCode": checkData.refCode,
});
}
- if (
- (e.detail.value == "jsek_teachingResources" &&
- !this.data.teach.length) ||
- (e.detail.value == "jsek_cloudLearning" && !this.data.learn.length) ||
- (e.detail.value == "questionBank" && !this.data.test.length)
- ) {
+ // if (
+ // (e.detail.value == "jsek_teachingResources" &&
+ // !this.data.teach.length) ||
+ // (e.detail.value == "jsek_cloudLearning" && !this.data.learn.length) ||
+ // (e.detail.value == "questionBank" && !this.data.test.length)
+ // ) {
+ // if (e.detail.value == "jsek_teachingResources") {
+ // wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
+ // }
+ // this.getResourceData(checkData);
+ // }
+ if ((e.detail.value == "jsek_teachingResources" && !this.data.teach.length) || (e.detail.value == "jsek_cloudLearning" && !this.data.learn.length)) {
if (e.detail.value == "jsek_teachingResources") {
wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
}
+ this.getResourceDataList(checkData)
+ } else if (e.detail.value == "questionBank" && !this.data.test.length) {
this.getResourceData(checkData);
}
if (e.detail.value == "questionBank" && token) this.getMockData();
@@ -718,7 +728,231 @@
});
});
},
- // 鑾峰彇鏁欏璧勬簮 浜戝涔� 浜戞祴璇�
+
+ // 鑾峰彇鎵�鏈夊瓙椤规暟閲�
+ getChildrenItem(data) {
+ let num = 0
+
+ function getNum(data) {
+ for (let index = 0; index < data.length; index++) {
+ const item = data[index];
+ if (item.sysType == 'CmsItem') {
+ num += 1
+ } else if (item.sysType == 'CmsFolder') {
+ if (item.children && item.children.length)
+ getNum(item.children)
+ }
+ }
+ }
+ getNum(data)
+ return num
+ },
+
+ // 缁欑洰褰曟坊鍔犲瓙椤规暟閲�
+ changeResourceChildren(list) {
+ const changeList = (list) => {
+ for (let index = 0; index < list.length; index++) {
+ const item = list[index];
+ if (item.sysType == 'CmsFolder' && item.children && item.children.length) {
+ item.childrenItem = this.getChildrenItem([item])
+ changeList(item.children)
+ } else if (item.sysType == 'CmsFolder' && item.children && !item.children.length) {
+ item.childrenItem = 0
+ } else if (item.sysType == 'CmsFolder' && !item.children) {
+ item.childrenItem = 0
+ }
+ }
+ }
+ changeList(list)
+ return list
+ },
+
+ // 鎵佸钩鍖栨暟鎹浆鎹ree
+ getTreeList(rootList, pathLength, 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 (item.sysType == 'CmsItem') {
+ if (item.selectType == 'webpage') {
+ item.disabled = true
+ } else {
+ if (item.isDownload != 1) {
+ item.disabled = true
+ }
+ }
+ if (item.file && item.fileMap && item.fileMap[item.file]) {
+ if (item.fileMap[item.file].protectType == 'Private') item.disabled = true
+ }
+ }
+ // newArr.push(item)
+ // 鍦ㄦ彃鍏ヨ繃绋嬩腑瀵规暟鎹繘琛屾帓搴�
+ newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item)
+ }
+ }
+ //缁欐暟缁勯噷闈㈠啀娣诲姞涓�涓猚hildren鐨勭┖鏁扮粍
+ for (const i of newArr) {
+ i.children = []
+ this.getTreeList(rootList, pathLength + 6, i.children, i.productLinkPath)
+ if (i.children.length == 0) {
+ delete i.children
+ }
+ }
+ return newArr
+ },
+
+ // 鍘婚櫎鏍戠粨鏋勫浣欓」
+ ensureTreeConsistency(tree) {
+ for (let index = 0; index < tree.length; index++) {
+ const item = tree[index];
+ if (item.children && item.children.length) {
+ const isFloder = item.children.findIndex(citem => citem.sysType == 'CmsFolder')
+ const isItem = item.children.findIndex(citem => citem.sysType == 'CmsItem')
+ if (isFloder > -1 && isItem > -1) {
+ item.children = item.children.filter(ditem => ditem.sysType == 'CmsItem')
+ }
+ this.ensureTreeConsistency(item.children)
+ }
+ }
+ return tree
+ },
+
+ // 鎺掑簭鏁扮粍 鎸夌収productLinkPath
+ insertAndSortObjectsByProductLinkPath(array, newObj) {
+ // 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆
+ let insertIndex = array.findIndex(obj => Number(newObj.productLinkPath.substring(newObj.productLinkPath.length - 6, newObj.productLinkPath.length)) < Number(obj.productLinkPath.substring(obj.productLinkPath.length - 6, obj.productLinkPath.length)));
+
+ // 濡傛灉娌℃湁鎵惧埌鍚堥�傜殑浣嶇疆锛屽垯鏀惧湪鏁扮粍鏈熬
+ 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 - 5, a.productLinkPath.length)) < Number(b.productLinkPath.substring(b.productLinkPath.length - 5, b.productLinkPath.length))) {
+ return -1;
+ }
+ if (Number(a.productLinkPath.substring(a.productLinkPath.length - 5, a.productLinkPath.length)) > Number(b.productLinkPath.substring(b.productLinkPath.length - 5, b.productLinkPath.length))) {
+ return 1;
+ }
+ // a must be equal to b
+ return 0;
+ });
+
+ // 杩斿洖鏇存柊鍚庣殑鏁扮粍
+ return array;
+ },
+ // 鏁欏璧勬簮 浜戝涔� 鑾峰彇
+ getResourceDataList(type) {
+ this.setData({
+ loading: true,
+ noResources: false,
+ });
+ let query = {
+ path: '*',
+ queryType: '*',
+ productId: this.data.bookDetail.id,
+ cmsPath: type.productLinkPath,
+ cmsType: '*',
+ itemFields: {
+ SysType: 'CmsFolder',
+ // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
+ selectType: [],
+ learnSelectType: [],
+ freeFile: [],
+ file: [],
+ protectedFile: [],
+ resourcesClassification: [],
+ isDownload: [],
+ jsek_resourceBrief: [],
+ jsek_link: [],
+ jsek_questionBank: []
+ },
+ pading: {
+ start: 0,
+ size: 999
+ },
+ }
+ app.MG.store.getProductDetail(query).then((res) => {
+ if (!res.datas.cmsDatas[0].datas.length) {
+ return this.setData({
+ noResources: true,
+ loading: false,
+ });
+ }
+ let list = []
+ // 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�17 鍐呴儴浼�6
+ //鏁欏璧勬簮 浜戝涔�
+ if (
+ type.refCode == "jsek_teachingResources" ||
+ type.refCode == "jsek_cloudLearning"
+ ) {
+ res.datas.cmsDatas[0].datas.forEach((item) => {
+ item.checked = false;
+ if (item.sysType == 'CmsItem') {
+ // 鏁欏璧勬簮 绫诲瀷鍚嶇О璧嬪��
+ this.data.resourceClassList.forEach((type) => {
+ if (type.value == item.resourcesClassification)
+ item.resourceClass = type.name;
+ });
+ if (this.data.tabValue == "jsek_teachingResources") {} else if (this.data.tabValue == "jsek_cloudLearning") {
+ item.isbuy = this.isShowNeedBuy(item);
+ item.isShopCar = this.isShoppingCart(item);
+ }
+ }
+ });
+ if (type.refCode == "jsek_cloudLearning") {
+ this.setData({
+ learnPath: type.productLinkPath
+ })
+ const dataList = res.datas.cmsDatas[0].datas
+ if (dataList.length) {
+ const tag = dataList.findIndex(item => this.isShowNeedBuy(item))
+ this.setData({
+ isGoBuyResource: tag > -1 ? true : false
+ })
+ } else {
+ this.setData({
+ isGoBuyResource: false
+ })
+ }
+ }
+ const num = query.cmsPath.length + 6
+ this.getTreeList(res.datas.cmsDatas[0].datas, num, list, '\\')
+ list = this.ensureTreeConsistency(list)
+ list = this.changeResourceChildren(list)
+ console.log('淇敼鍚庝簯', list);
+ let result = [];
+ if (type.refCode == "jsek_teachingResources") {
+ this.findChildIds(list, result);
+ this.setData({
+ teach: list,
+ loading: false,
+ openTeachids: result,
+ });
+ } else if (type.refCode == "jsek_cloudLearning") {
+ let arr = this.handleTreeData(list).filter(
+ (item) => item.saleMethod[0]
+ );
+ let freeIds = arr.filter((item) => {
+ return item.saleMethod[0].Price == 0;
+ });
+ if (!freeIds.length)
+ this.setData({
+ isshowDrawBtn: false,
+ });
+ this.findChildIds(list, result);
+ this.setData({
+ learn: list,
+ loading: false,
+ openLearnids: result,
+ });
+ }
+ }
+ })
+ },
+ // 鑾峰彇 浜戞祴璇�
getResourceData(type) {
this.setData({
loading: true,
@@ -1111,7 +1345,6 @@
},
// 鐢宠鏁欏璧勬簮
applyResource() {
-
// if (this.data.applyResourceState) {
// return wx.showToast({
// icon: "error",
@@ -1397,7 +1630,6 @@
},
updateShoppingCartHidden() {
-
const isSHow = this.data.shoppingCartGetId.some(
(item) => item == data.saleMethod[0].Id
);
@@ -1410,10 +1642,7 @@
const checkData = this.data.cmsDatas.find(
(item) => item.refCode == "jsek_cloudLearning"
);
- this.getResourceData(checkData);
-
-
-
+ this.getResourceDataList(checkData);
},
// 閬嶅巻鏍戠粨鏋勮浆鎹负鏁扮粍鏂规硶
handleTreeData(array) {
@@ -1475,21 +1704,19 @@
};
// 纭璁㈠崟
const confirmOrderRes = await app.MG.store.confirmOrder(parameter);
- console.log(confirmOrderRes.orderNumber, 'confirmOrderRes.orderNumber');
-
-
-
if (confirmOrderRes.orderNumber) {
child.changeReceive(false);
wx.showToast({
title: "棰嗗彇鎴愬姛",
});
this.getBookInfo(this.data.bookId);
+ this.getResourceDataList({
+ refCode: 'jsek_cloudLearning',
+ productLinkPath: this.data.learnPath
+ })
this.setData({
successOrderNumber: confirmOrderRes.orderNumber
})
-
-
}
} catch (error) {
console.log(error);
@@ -1772,6 +1999,10 @@
}
wx.setStorageSync("bookPathList", JSON.stringify(bookPathList));
+ this.setData({
+ learn: [],
+ teach: []
+ })
this.onLoad({
id: e.detail.id,
name: e.detail.name,
@@ -1798,8 +2029,6 @@
});
return false;
}
-
- // debugger
wx.navigateTo({
url: "/packageBookService/pages/components/webView/index?md5=" +
this.data.fileInfo.md5 +
@@ -1813,6 +2042,7 @@
this.data.bookBuy +
"&bookId=" +
this.data.bookDetail.id,
+
});
},
@@ -1877,6 +2107,20 @@
list.push(item);
}
});
+ const smBook = list.find(item => item.content[0].id == this.data.bookDetail.id)
+ console.log('宸茬敵璇�', smBook);
+ if (smBook && smBook.state == 'Normal') {
+ const flag = new Date(smBook.feedBack.endDate + '23:59:59').getTime() > new Date().getTime()
+ if (flag) {
+ this.setData({
+ applicationState: 'Normal'
+ })
+ } else {
+ this.setData({
+ applicationState: 'overdue'
+ })
+ }
+ }
this.setData({
alreadyElectronicBookList: list,
});
@@ -1913,6 +2157,23 @@
//鐢宠鐢靛瓙鏍蜂功
appplyElectronicBook() {
+ // 鍏堝垽鏂笅鏁欏笀璁よ瘉锛屾湭瀵瑰師鏈夐�昏緫淇敼
+ let role = this.data.userInfo != null ? this.data.userInfo.role : null;
+ if (role && role == "Teacher") {} else {
+ return wx.showModal({
+ title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�", //鎻愮ず鐨勬爣棰�
+ content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�", //鎻愮ず鐨勫唴瀹�
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
+ success: function (res) {
+ if (res.confirm) {
+ wx.navigateTo({
+ url: "/packageDomain/pages/teacherCertification/index",
+ });
+ } else if (res.cancel) {}
+ },
+ });
+ }
if (
this.data.bookDetail.isApplyBook == 2 ||
this.data.bookDetail.isApplyBook == 4
@@ -1948,15 +2209,27 @@
return false;
}
let isApply = this.data.alreadyElectronicBookList.find(
- (eitem) => eitem.id == this.data.bookDetail.id
+ (eitem) => eitem.content[0].id == this.data.bookDetail.id
);
if (isApply) {
- wx.showToast({
- title: "璇ヤ功宸茬敵璇凤紒",
- icon: "none",
- duration: 1000,
- });
- return false;
+ if (isApply.state == 'WaitAudit') {
+ wx.showToast({
+ title: "璇ヤ功宸茬敵璇凤紒",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ } else if (isApply.state == 'Normal') {
+ const flag = new Date(isApply.feedBack.endDate + '23:59:59').getTime() > new Date().getTime()
+ if (flag) {
+ wx.showToast({
+ title: "璇ヤ功宸茬敵璇凤紒",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ }
+ }
}
if (this.data.electronicBookList.length >= 2) {
wx.showToast({
@@ -1992,6 +2265,22 @@
},
//鐢宠绾歌川鏍蜂功
appplyPaperBook() {
+ let role = this.data.userInfo != null ? this.data.userInfo.role : null;
+ if (role && role == "Teacher") {} else {
+ return wx.showModal({
+ title: "灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�", //鎻愮ず鐨勬爣棰�
+ content: "璇峰厛杩涜鏁欏笀璁よ瘉锛�", //鎻愮ず鐨勫唴瀹�
+ confirmColor: "#ff6c00",
+ cancelColor: "#949494",
+ success: function (res) {
+ if (res.confirm) {
+ wx.navigateTo({
+ url: "/packageDomain/pages/teacherCertification/index",
+ });
+ } else if (res.cancel) {}
+ },
+ });
+ }
if (
this.data.bookDetail.isApplyBook == 3 ||
this.data.bookDetail.isApplyBook == 4
@@ -2008,7 +2297,7 @@
return false;
}
let isApply = this.data.alreadyPaperBookList.find(
- (pitem) => pitem.id == this.data.bookDetail.id
+ (pitem) => pitem.content[0].id == this.data.bookDetail.id
);
if (isApply) {
wx.showToast({
@@ -2084,13 +2373,13 @@
this.setData({
electronicBookList: eList,
});
- wx.setStorageSync("electronicBookList", eList);
+ wx.setStorageSync("electronicBookList", JSON.stringify(eList));
} else {
pList.push(itemAttr);
this.setData({
paperBookList: pList,
});
- wx.setStorageSync("paperBookList", pList);
+ wx.setStorageSync("paperBookList", JSON.stringify(pList));
}
this.setData({
num: this.data.num + 1,
--
Gitblit v1.9.1