From af2e38d1d72633d03afdb6e75f8d30b7ef0d0aee Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期一, 29 七月 2024 15:24:30 +0800 Subject: [PATCH] 图书详情页添加对云学习目录整体购买的判断 --- packageBookService/pages/bookServices/detail/index.js | 343 +++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 250 insertions(+), 93 deletions(-) diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js index 57f03e7..4214b0e 100644 --- a/packageBookService/pages/bookServices/detail/index.js +++ b/packageBookService/pages/bookServices/detail/index.js @@ -35,6 +35,7 @@ teach: [], learn: [], test: [], + jslx: true, openTeachids: [], openLearnids: [], openTestids: [], @@ -80,6 +81,7 @@ electronicBookList: [], //鏍蜂功鍗曠數瀛愪功 paperBookCount: 0, //绾歌川涔﹀墿浣欐鏁� ebookCount: 0, //鐢靛瓙涔﹀墿浣欐鏁� + resourceCodeList: [], // 璧勬簮refcode鍒楄〃 userInfo: {}, pageLoading: true, fileInfo: { @@ -154,7 +156,8 @@ ], showIndex: '', successOrderNumber: '', - applicationState: '' // 鐢靛瓙鏍蜂功鐢宠鐘舵�� + applicationState: '', // 鐢靛瓙鏍蜂功鐢宠鐘舵�� + }, resetTree: function (e) { @@ -187,7 +190,7 @@ title: options.name, }) this.getBookInfo(options.id); - this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫� + // this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫� const token = wx.getStorageSync(app.config.tokenKey); if (token) { this.getShoppingCartProductGet(); @@ -385,10 +388,11 @@ }, }; app.MG.store.getProductDetail(query).then(async (res) => { - console.log(res.datas, 'res.datas'); + this.getResourceCode(id, res.datas.rootCmsItemId) this.setData({ bookDetail: res.datas, buyIdList: res.datas.purchasedSaleMethodIdList, + pageLoading: false }); if (res.datas.cmsDatas && res.datas.cmsDatas.length) { this.setData({ @@ -404,14 +408,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,10 +458,30 @@ "bookDetail.paperPrice": this.numFormat( this.data.bookDetail.paperPrice ), - pageLoading: false, + }); - console.log("鍥句功淇℃伅", this.data.bookClass); }); + }, + getResourceCode(bookId, cmsId) { + let query = { + path: '*', + queryType: '*', + productId: bookId, + cmsPath: cmsId, + itemFields: { + SysType: 'Cms' + }, + pading: { + start: 99, + size: 0 + } + } + app.MG.store.getProductDetail(query).then((res) => { + this.setData({ + resourceCodeList: res.datas.cmsDatas[0].datas + }) + // console.log('鍥句功璧勬簮', res.datas.cmsDatas[0].datas) + }) }, //璇锋眰瀛愬晢鍝佺殑鏂囦欢 getSubTtem() { @@ -512,14 +541,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 +562,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 +570,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 +599,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 + }) + } + } + }); } - }); - } - }); + + } + }); + } + }); }, // 鏀惰棌 @@ -643,8 +681,6 @@ this.setData({ showIndex: '1' }) - console.log(this.data.bookDetail.icon, '0111111'); - console.log(this.data.bookDetail.name, '45688'); }, // 璺宠浆缃戝簵 goShop(e) { @@ -670,7 +706,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 +726,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); @@ -792,12 +826,16 @@ // newArr.push(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 + 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 } @@ -825,7 +863,6 @@ insertAndSortObjectsByProductLinkPath(array, newObj, addNum) { // 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆 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; @@ -880,7 +917,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, @@ -913,7 +950,19 @@ learnPath: type.productLinkPath }) const dataList = res.datas.cmsDatas[0].datas - if (dataList.length) { + // 鍏堝垽鏂槸鍚﹀惁涔颁簯瀛︿範鏁翠釜鐩綍 + let couldId = null + let codeData = null + if (this.data.resourceCodeList.length) { + codeData = this.data.resourceCodeList.find(item => item.refCode == 'jsek_cloudLearning') + if (codeData && codeData.saleMethod && codeData.saleMethod.length) + couldId = codeData.saleMethod[0].Id + } + if (couldId) { + this.setData({ + isGoBuyResource: this.data.buyIdList.indexOf(couldId) > -1 ? false : true + }) + } else if (dataList.length) { const tag = dataList.findIndex(item => item.saleMethod.length && item.saleMethod[0].Price > 0) this.setData({ isGoBuyResource: tag > -1 ? true : false @@ -924,19 +973,23 @@ }) } } - 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(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); + const newUSeList = this.deleteTreeData(list, result) + console.log('鏍戝墧闄�', result, newUSeList); + console.log('鏍戝姞涓�', this.increaseTreeData(list, newUSeList, 16094)); + 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,15 +1014,16 @@ }, // 鑾峰彇 浜戞祴璇� getResourceData(type) { - this.setData({ + var that = this + that.setData({ loading: true, noResources: false, }); let query = { path: "*", queryType: "*", - storeInfo: this.data.options.storeInfo, - productId: this.data.bookDetail.id, + storeInfo: that.data.options.storeInfo, + productId: that.data.bookDetail.id, cmsPath: type.productLinkPath, cmsType: '*', itemFields: { @@ -992,31 +1046,65 @@ 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.type == 'questionBankFolder' && item.childrenFolderCount > 0); - if (data.length > 0) { - let list = [] - console.log(query.cmsPath, query.cmsPath.length) - // 娴嬭瘯 6浣�// 姝e紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝e紡璋冪敤浼�17 鍐呴儴浼�6 - const addNum = query.cmsPath.length > 12 ? 7 : query.cmsPath.length > 14 ? 8 : 6 - const num = query.cmsPath.length + addNum - this.getTreeList(data, num, list, '\\', addNum) - list = this.ensureTreeConsistency(list) - let result = []; - this.findChildIds(list[0].children, result); - this.setData({ - test: list[0].children, - loading: false, - openTeachids: result, - }); - console.log(this.data.test, "test") + let data = [] + let result = []; + const isTSFW = res.datas.cmsDatas[0].datas.filter( + (item) => + item.type == 'questionBankFolder' && + (item.name == '濉┖棰�' || + item.name == '鍒ゆ柇棰�' || + item.name == '鍗曢�夐' || + item.name == '澶氶�夐' || + item.name == '绠�绛旈') + ) + if (that.data.options.storeInfo == 'jsek_jslx') { + data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder'); + if (data.length > 0) { + that.setData({ + test: data, + loading: false, + openTeachids: result, + }); + } else { + that.setData({ + noResources: true, + loading: false, + }); + } + } else { + if (isTSFW.length > 0) { + data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.childrenFolderCount > 0) + that.setData({ + jslx: false, + }); + } else { + data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder') + that.setData({ + jslx: true, + }); + } + if (data.length > 0) { + let list = [] + // 娴嬭瘯 6浣�// 姝e紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝e紡璋冪敤浼�17 鍐呴儴浼�6 + + const addNum = query.cmsPath.length > 10 ? 7 : query.cmsPath.length > 14 ? 8 : 6 + const num = query.cmsPath.length + addNum + that.getTreeList(data, num, list, '\\', addNum) + list = that.ensureTreeConsistency(list) + that.findChildIds(list[0].children, result); + that.setData({ + test: list.length == 1 && list[0].name == '棰樺簱' ? list[0].children : list, + loading: false, + openTeachids: result, + }); + } else { + that.setData({ + noResources: true, + loading: false, + }); + } } } }) @@ -1112,30 +1200,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 } - } }, // 鍥句功娣诲姞璐墿杞� @@ -1231,9 +1322,7 @@ url, }); } - } else { - console.log(222); - } + } else {} } else { wx.showToast({ title: "鍟嗗搧涓嶅湪鏈夋晥鏈�", @@ -1536,7 +1625,16 @@ }, // 鍒ゆ柇璧勬簮鏄惁璐拱 resourceIsBuy(data) { - if (data.saleMethod && data.saleMethod.length) { + let couldId = null + let codeData = null + if (this.data.resourceCodeList.length) { + codeData = this.data.resourceCodeList.find(item => item.refCode == 'jsek_cloudLearning') + if (codeData && codeData.saleMethod && codeData.saleMethod.length) + couldId = codeData.saleMethod[0].Id + } + if (couldId) { + return this.data.buyIdList.indexOf(couldId) > -1 ? false : true + } else if (data.saleMethod && data.saleMethod.length) { const isSHow = this.data.buyIdList.some( (item) => item == data.saleMethod[0].Id ); @@ -1582,7 +1680,16 @@ }, // 鍒ゆ柇璧勬簮鍔犲叆璐墿杞︽寜閽槸鍚︽樉绀� isShoppingCart(data) { - if (data.saleMethod && data.saleMethod.length) { + let couldId = null + let codeData = null + if (this.data.resourceCodeList.length) { + codeData = this.data.resourceCodeList.find(item => item.refCode == 'jsek_cloudLearning') + if (codeData && codeData.saleMethod && codeData.saleMethod.length) + couldId = codeData.saleMethod[0].Id + } + if (couldId) { + return this.data.buyIdList.indexOf(couldId) > -1 ? false : true + } else if (data.saleMethod && data.saleMethod.length) { if (data.saleMethod[0].Price <= 0) return false; // 鍐嶅垽鏂槸鍚﹁喘涔� const isBuy = this.data.buyIdList.some( @@ -2084,7 +2191,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' @@ -2194,7 +2301,7 @@ }); return false; } else if (isApply.state == 'Normal') { - const flag = new Date(isApply.feedBack.endDate + '23:59:59').getTime() > new Date().getTime() + const flag = new Date(isApply.feedBack.endDate + ' 23:59:59').getTime() > new Date().getTime() if (flag) { wx.showToast({ title: "璇ヤ功宸茬敵璇凤紒", @@ -2398,4 +2505,54 @@ teach: tree, }); }, -}); \ No newline at end of file + + // 鍓旈櫎鏍戠粨鏋勫浣欙紝鍙繚鐣欏垵濮嬮渶瑕佸睍寮�鐨� + // 绗竴姝ワ細淇濈暀鏍戠粨鏋勫墠涓ゅ眰锛屽苟灏嗗睍寮�椤瑰姞鍏ユ暟缁� + deleteTreeData(list, openids) { + let resultList = [] + for (let index = 0; index < list.length; index++) { + const item = list[index]; + for (let cindex = 0; cindex < item.children.length; cindex++) { + const citem = item.children[cindex]; + citem.children = [] + } + resultList.push(item) + } + for (let index = 0; index < openids.length; index++) { + const id = openids[index]; + // 灞曞紑椤瑰姞鍏ユ暟缁� + this.increaseTreeData(list, resultList, id) + } + return resultList + }, + // 浼犻�抜ds锛屽皢闇�瑕佸睍寮�鐨刬d鐨刢hildren 璧嬪�� + increaseTreeData(treeList, list, openid) { + + let num = 0; + // let useData = treeList.find(item => item.id == openid) + for (let index = 0; index < treeList.length; index++) { + const item = treeList[index]; + if (item.id == openid && num >= 3) { + debugger + let useArr = item.children ? item.children : [] + changeList(list, openid, useArr) + } else { + num += 1 + this.increaseTreeData(item.children, list, openid) + } + } + // 閫掑綊鍓嶄袱灞傦紝鎵惧嚭闇�瑕佸睍寮�鐨� + const changeList = (isList, id, childrenList) => { + for (let dindex = 0; dindex < isList.length; dindex++) { + const ditem = isList[cindex]; + if (ditem.id == id) { + diitem.children = childrenList + return true + } else { + changeList(ditem.children, id, childrenList) + } + } + } + return list + } +}) \ No newline at end of file -- Gitblit v1.9.1