From 9d5789148e866f95f86d975011a9ef39d534c807 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 17 七月 2024 17:37:19 +0800
Subject: [PATCH] 拼树结构优化
---
packageBookService/pages/bookServices/detail/index.js | 233 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 121 insertions(+), 112 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 4181ea1..d0fa544 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -16,6 +16,7 @@
options: {
id: "",
name: "",
+ storeInfo: '',
},
bookDetail: {},
bookClass: [],
@@ -179,13 +180,14 @@
options: {
id: options.id,
name: options.name,
+ storeInfo: options.storeInfo,
},
});
wx.setNavigationBarTitle({
title: options.name,
})
this.getBookInfo(options.id);
- this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
+ // this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫�
const token = wx.getStorageSync(app.config.tokenKey);
if (token) {
this.getShoppingCartProductGet();
@@ -348,6 +350,7 @@
"mockData.count": 0,
});
const query = {
+ storeInfo: this.data.options.storeInfo,
path: "*",
queryType: "*",
productId: id,
@@ -386,6 +389,7 @@
this.setData({
bookDetail: res.datas,
buyIdList: res.datas.purchasedSaleMethodIdList,
+ pageLoading: false
});
if (res.datas.cmsDatas && res.datas.cmsDatas.length) {
this.setData({
@@ -401,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);
}
}
@@ -446,7 +455,7 @@
"bookDetail.paperPrice": this.numFormat(
this.data.bookDetail.paperPrice
),
- pageLoading: false,
+
});
console.log("鍥句功淇℃伅", this.data.bookClass);
});
@@ -509,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,
});
}
}
@@ -530,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) {
@@ -538,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,
});
}
}
@@ -567,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
+ })
+ }
+ }
+ });
}
- });
- }
- });
+
+ }
+ });
+ }
+
});
},
// 鏀惰棌
@@ -640,6 +658,8 @@
this.setData({
showIndex: '1'
})
+ console.log(this.data.bookDetail.icon, '0111111');
+ console.log(this.data.bookDetail.name, '45688');
},
// 璺宠浆缃戝簵
goShop(e) {
@@ -665,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({
@@ -685,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);
@@ -768,7 +786,7 @@
},
// 鎵佸钩鍖栨暟鎹浆鎹ree
- getTreeList(rootList, pathLength, newArr, path) {
+ getTreeList(rootList, pathLength, newArr, path, addNum) {
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)) {
@@ -786,13 +804,17 @@
}
// newArr.push(item)
// 鍦ㄦ彃鍏ヨ繃绋嬩腑瀵规暟鎹繘琛屾帓搴�
- newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item)
+ newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item, addNum)
+ // 鎻掕繘鏁扮粍鍚� 浠庡師鏁版嵁涓垹闄�
+ rootList = rootList.filter(nitem => nitem.id != item.id)
}
}
//缁欐暟缁勯噷闈㈠啀娣诲姞涓�涓猚hildren鐨勭┖鏁扮粍
+ // let addnum1 = pathLength - path.length == 6 ? 6 : 7
for (const i of newArr) {
i.children = []
- this.getTreeList(rootList, pathLength + 6, i.children, i.productLinkPath)
+ 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
}
@@ -817,10 +839,9 @@
},
// 鎺掑簭鏁扮粍 鎸夌収productLinkPath
- insertAndSortObjectsByProductLinkPath(array, newObj) {
+ insertAndSortObjectsByProductLinkPath(array, newObj, addNum) {
// 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆
- 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)));
-
+ 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)));
// 濡傛灉娌℃湁鎵惧埌鍚堥�傜殑浣嶇疆锛屽垯鏀惧湪鏁扮粍鏈熬
if (insertIndex === -1) {
insertIndex = array.length;
@@ -830,10 +851,10 @@
// 娴嬭瘯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))) {
+ 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 - 5, a.productLinkPath.length)) > Number(b.productLinkPath.substring(b.productLinkPath.length - 5, b.productLinkPath.length))) {
+ 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
@@ -852,6 +873,7 @@
let query = {
path: '*',
queryType: '*',
+ storeInfo: this.data.options.storeInfo,
productId: this.data.bookDetail.id,
cmsPath: type.productLinkPath,
cmsType: '*',
@@ -874,7 +896,7 @@
size: 999
},
}
- app.MG.store.getProductDetail(query).then((res) => {
+ app.MG.store.getProductDetailNoChildren(query).then((res) => {
if (!res.datas.cmsDatas[0].datas.length) {
return this.setData({
noResources: true,
@@ -918,18 +940,19 @@
})
}
}
- const num = query.cmsPath.length + 6
- this.getTreeList(res.datas.cmsDatas[0].datas, num, list, '\\')
+ 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);
this.setData({
- teach: list,
- loading: false,
openTeachids: result,
+ loading: false,
+ teach: list,
});
} else if (type.refCode == "jsek_cloudLearning") {
let arr = this.handleTreeData(list).filter(
@@ -961,8 +984,10 @@
let query = {
path: "*",
queryType: "*",
+ storeInfo: this.data.options.storeInfo,
productId: this.data.bookDetail.id,
cmsPath: type.productLinkPath,
+ cmsType: '*',
itemFields: {
SysType: "CmsFolder",
// 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
@@ -983,67 +1008,47 @@
app.MG.store
.getProductDetail(query)
.then(async (res) => {
- if (!res.datas.cmsDatas[0].datas.length) {
- return this.setData({
- noResources: true,
- loading: false,
- });
- }
// 浜戞祴璇曪紝閫掑綊璇锋眰閲屽眰鏁版嵁
if (type.refCode == "questionBank") {
- const data = res.datas.cmsDatas[0].datas.filter(
- (item) => item.refCode == "jsek_questionBank"
- );
- if (data.length) return this.getResourceData(data[0]);
- }
- //鏁欏璧勬簮 浜戝涔�
- if (
- type.refCode == "jsek_teachingResources" ||
- type.refCode == "jsek_cloudLearning"
- ) {
- if (res.datas.cmsDatas[0].datas.length > 0) {
- res.datas.cmsDatas[0].datas.forEach((item) => {
- item.checked = false;
- });
- const list = await this.getAllResource(res.datas.cmsDatas[0].datas);
- let result = [];
- if (type.refCode == "jsek_teachingResources") {
- this.findChildIds(list, result);
+ let data = []
+ let result = [];
+ if (this.data.options.storeInfo == 'jsek_jslx') {
+ data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder');
+ if (data.length > 0) {
this.setData({
- teach: list,
+ test: data,
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);
+ } else {
this.setData({
- learn: list,
+ noResources: true,
loading: false,
- openLearnids: result,
});
}
- console.log(list, '浜戝缈�789');
} else {
- // 鏃犳暟鎹�
+ data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.childrenFolderCount > 0);
+ if (data.length > 0) {
+ let list = []
+ // 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�17 鍐呴儴浼�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)
+ this.findChildIds(list[0].children, result);
+ this.setData({
+ test: list[0].children,
+ loading: false,
+ openTeachids: result,
+ });
+ } else {
+ this.setData({
+ noResources: true,
+ loading: false,
+ });
+ }
}
- } else if (type.refCode == "jsek_questionBank") {
- // const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
- this.setData({
- test: res.datas.cmsDatas[0].datas,
- loading: false,
- });
- } else {
- console.log("鍏朵粬");
}
})
.catch((e) => {
@@ -1068,6 +1073,7 @@
let query = {
path: "*",
queryType: "*",
+ storeInfo: this.data.options.storeInfo,
productId: this.data.bookDetail.id,
cmsPath: path,
itemFields: {
@@ -1137,30 +1143,33 @@
// 鑾峰彇灞曞紑椤�
findChildIds(data, result) {
let index = 0
- for (let i = 0; i < data.length; i++) {
- if (index < 3) {
- const item = data[i]
- if (item.childrenFolderCount > 0) {
- result.push(item.id)
- for (let j = 0; j < item.children.length; j++) {
- if (index < 3) {
- const childrenItme = item.children[j]
- if (item.childrenCount > 0) {
- result.push(childrenItme.id)
- index += 1
+ if (data)
+ for (let i = 0; i < data.length; i++) {
+ if (index < 3) {
+ const item = data[i]
+ if (item.children && item.children.length > 0) {
+ result.push(item.id)
+ if (item.children) {
+ for (let j = 0; j < item.children.length; j++) {
+ if (index < 3) {
+ const childrenItme = item.children[j]
+ if (item.childrenCount > 0) {
+ result.push(childrenItme.id)
+ index += 1
+ }
+ } else {
+ break
+ }
}
- } else {
- break
}
+ } else if (item.childrenCount > 0) {
+ result.push(item.id)
+ index += 1
}
- } else if (item.childrenCount > 0) {
- result.push(item.id)
- index += 1
+ } else {
+ break
}
- } else {
- break
}
- }
},
// 鍥句功娣诲姞璐墿杞�
@@ -1232,7 +1241,6 @@
// 鍙戣捣璁㈠崟鍒濆鍖栬姹傚苟绛夊緟缁撴灉
const res = await app.MG.store.initOrder(query);
// 鑾峰彇璁㈠崟鍙峰苟璧嬪�肩粰 orderNumber.value
- console.log(res, 'res456');
bookOrdersId = res.orderNumber;
// 妫�鏌ヨ鍗曞彿鏄惁瀛樺湪
if (bookOrdersId) {
@@ -2110,7 +2118,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'
@@ -2220,7 +2228,8 @@
});
return false;
} else if (isApply.state == 'Normal') {
- const flag = new Date(isApply.feedBack.endDate + '23:59:59').getTime() > new Date().getTime()
+ console.log(isApply.state, "isApply.state")
+ const flag = new Date(isApply.feedBack.endDate + ' 23:59:59').getTime() > new Date().getTime()
if (flag) {
wx.showToast({
title: "璇ヤ功宸茬敵璇凤紒",
--
Gitblit v1.9.1