From 8a66618254338978c6ea4315896e24c8571fc372 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期一, 15 七月 2024 18:54:06 +0800
Subject: [PATCH] 资源
---
packageBookService/pages/bookServices/detail/index.js | 90 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 5a990bc..870f733 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -187,7 +187,7 @@
title: options.name,
})
this.getBookInfo(options.id);
- this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
+ // this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
const token = wx.getStorageSync(app.config.tokenKey);
if (token) {
this.getShoppingCartProductGet();
@@ -389,6 +389,7 @@
this.setData({
bookDetail: res.datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
+ pageLoading: false
});
if (res.datas.cmsDatas && res.datas.cmsDatas.length) {
this.setData({
@@ -404,14 +405,19 @@
this.getSubTtem();
// 鑾峰彇鍥句功鍒嗙被
if (res.datas.bookClassification) {
+ let classData = []
const bookClassification = JSON.parse(res.datas.bookClassification);
if (Array.isArray(bookClassification) && bookClassification.length) {
for (let index = 0; index < bookClassification.length; index++) {
const element = bookClassification[index];
const iconType = element[0];
const classType = element[1];
- await this.getBookClass(iconType, classType);
+ classData.push({
+ iconType,
+ classType
+ })
}
+ await this.getBookClass(classData);
}
}
@@ -449,7 +455,7 @@
"bookDetail.paperPrice": this.numFormat(
this.data.bookDetail.paperPrice
),
- pageLoading: false,
+
});
console.log("鍥句功淇℃伅", this.data.bookClass);
});
@@ -512,14 +518,14 @@
"fileInfo.bookName": this.data.bookDetail.name,
"fileInfo.fileType": "pdf",
"fileInfo.md5": res.datas[0].bookshelf_pdf,
- "fileInfo.freePage": res.datas[0].bookshelf_probationPage,
+ "fileInfo.freePage": res.datas[0].bookshelf_probationPage ? res.datas[0].bookshelf_probationPage : 30,
});
} else if (res.datas[0].bookshelf_protectedEpub) {
this.setData({
"fileInfo.bookName": this.data.bookDetail.name,
"fileInfo.fileType": "epub",
"fileInfo.md5": res.datas[0].bookshelf_protectedEpub,
- "fileInfo.freePage": res.datas[0].bookshelf_freeEpub,
+ "fileInfo.freePage": res.datas[0].bookshelf_freeEpub ? res.datas[0].bookshelf_freeEpub : 30,
});
}
}
@@ -533,7 +539,7 @@
"fileInfo.bookName": this.data.bookDetail.name,
"fileInfo.fileType": "pdf",
"fileInfo.md5": this.data.bookDetail.pdf,
- "fileInfo.freePage": this.data.bookDetail.probationPage,
+ "fileInfo.freePage": this.data.bookDetail.probationPage ? this.data.bookDetail.probationPage : 30,
});
} else if (this.data.bookDetail.protectedEpub) {
@@ -541,7 +547,7 @@
"fileInfo.bookName": this.data.bookDetail.name,
"fileInfo.fileType": "epub",
"fileInfo.md5": this.data.bookDetail.protectedEpub,
- "fileInfo.freePage": this.data.bookDetail.freeEpubPage,
+ "fileInfo.freePage": this.data.bookDetail.freeEpubPage ? this.data.bookDetail.freeEpubPage : 30,
});
}
}
@@ -570,28 +576,37 @@
});
},
// 鑾峰彇鍥句功鍒嗙被
- async getBookClass(iconType, classType) {
+ async getBookClass(list) {
let name = "";
const query = {
refCodes: ["bookClassification"],
};
await app.MG.store.getProductTypeField(query).then((res) => {
- JSON.parse(res[0].config).option.forEach((item) => {
- if (item.value == iconType) {
- item.child.forEach((citem) => {
- if (citem.value == classType) {
- const flag = this.data.bookClass.findIndex((ditem) => ditem == citem.name)
- if (flag == -1) {
- let list = this.data.bookClass
- list.push(citem.name)
- this.setData({
- bookClass: list
- })
- }
+ for (let aindex = 0; aindex < list.length; aindex++) {
+ const aitem = list[aindex];
+ const iconType = aitem.iconType
+ const classType = aitem.classType
+ JSON.parse(res[0].config).option.forEach((item) => {
+ if (item.value == iconType) {
+ if (item.child && item.child.length) {
+ item.child.forEach((citem) => {
+ if (citem.value == classType) {
+ const flag = this.data.bookClass.findIndex((ditem) => ditem == citem.name)
+ if (flag == -1) {
+ let list = this.data.bookClass
+ list.push(citem.name)
+ this.setData({
+ bookClass: list
+ })
+ }
+ }
+ });
}
- });
- }
- });
+
+ }
+ });
+ }
+
});
},
// 鏀惰棌
@@ -670,7 +685,7 @@
const checkData = this.data.cmsDatas.find(
(item) => item.refCode == e.detail.value
);
-
+ if (!this.data.resourceClassList.length) this.getResourceClass()
if (checkData) {
if (e.detail.value == "jsek_cloudLearning") {
this.setData({
@@ -690,9 +705,7 @@
// 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)
- }
+ wx.setStorageSync('teachResourcesPath', checkData.productLinkPath)
this.getResourceDataList(checkData)
} else if (e.detail.value == "questionBank" && !this.data.test.length) {
this.getResourceData(checkData);
@@ -795,9 +808,11 @@
}
}
//缁欐暟缁勯噷闈㈠啀娣诲姞涓�涓猚hildren鐨勭┖鏁扮粍
+ // let addnum1 = pathLength - path.length == 6 ? 6 : 7
for (const i of newArr) {
i.children = []
- this.getTreeList(rootList, pathLength + addNum, i.children, i.productLinkPath, addNum)
+ let addnum1 = i.productLinkPath.length - path.length == 6 ? 6 : 7
+ this.getTreeList(rootList, pathLength + addnum1, i.children, i.productLinkPath, addnum1)
if (i.children.length == 0) {
delete i.children
}
@@ -880,7 +895,8 @@
size: 999
},
}
- app.MG.store.getProductDetail(query).then((res) => {
+ app.MG.store.getProductDetailNoChildren(query).then((res) => {
+ console.log(res.datas.cmsDatas[0].datas, 2345)
if (!res.datas.cmsDatas[0].datas.length) {
return this.setData({
noResources: true,
@@ -924,12 +940,13 @@
})
}
}
- const addNum = query.cmsPath.length > 12 ? 7 : query.cmsPath.length > 14 ? 8 : 6
+ console.log(query.cmsPath, 111)
+ const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 14 ? 8 : 6
const num = query.cmsPath.length + addNum
this.getTreeList(res.datas.cmsDatas[0].datas, num, list, '\\', addNum)
list = this.ensureTreeConsistency(list)
list = this.changeResourceChildren(list)
- console.log('淇敼鍚庝簯', list);
+ console.log('淇敼鍚�', list);
let result = [];
if (type.refCode == "jsek_teachingResources") {
this.findChildIds(list, result);
@@ -1015,7 +1032,8 @@
if (data.length > 0) {
let list = []
// 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�17 鍐呴儴浼�6
- const addNum = query.cmsPath.length > 12 ? 7 : query.cmsPath.length > 14 ? 8 : 6
+
+ const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 14 ? 8 : 6
const num = query.cmsPath.length + addNum
this.getTreeList(data, num, list, '\\', addNum)
list = this.ensureTreeConsistency(list)
@@ -1130,7 +1148,7 @@
for (let i = 0; i < data.length; i++) {
if (index < 3) {
const item = data[i]
- if (item.childrenFolderCount > 0) {
+ if (item.children && item.children.length > 0) {
result.push(item.id)
if (item.children) {
for (let j = 0; j < item.children.length; j++) {
@@ -2101,7 +2119,7 @@
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()
+ const flag = new Date(smBook.feedBack.endDate + ' 23:59:59').getTime() > new Date().getTime()
if (flag) {
this.setData({
applicationState: 'Normal'
@@ -2212,9 +2230,7 @@
return false;
} else if (isApply.state == 'Normal') {
console.log(isApply.state, "isApply.state")
- const flag = new Date(isApply.feedBack.endDate + '23:59:59').getTime() > new Date().getTime()
- console.log(isApply.feedBack.endDate, new Date()
- 'ooo')
+ const flag = new Date(isApply.feedBack.endDate + ' 23:59:59').getTime() > new Date().getTime()
if (flag) {
wx.showToast({
title: "璇ヤ功宸茬敵璇凤紒",
--
Gitblit v1.9.1