From c96612e8a63ecef9590be0f8b5199277ec94e5b9 Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期三, 18 九月 2024 18:43:12 +0800 Subject: [PATCH] 云学习购买目录,修改bug --- packageBookService/pages/bookServices/detail/buyResource/index.js | 631 +++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 390 insertions(+), 241 deletions(-) diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.js b/packageBookService/pages/bookServices/detail/buyResource/index.js index 34db152..dd5debe 100644 --- a/packageBookService/pages/bookServices/detail/buyResource/index.js +++ b/packageBookService/pages/bookServices/detail/buyResource/index.js @@ -10,19 +10,24 @@ learn: [], openLearnids: [], bookId: "", - loading: false, + loading: true, shoppingList: [], shoppingCartGetId: [], methodId: [], paymentPage: false, superior: false, checkAllState: true, + productLinkPath: '', + refCode: '', + naData: false, + bookRefCode: [] }, /** * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇 */ onLoad(options) { + this.getBookInfo(options.bookId); const systInfo = wx.getSystemInfoSync(); const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅 const navBarHeight = @@ -31,14 +36,10 @@ barHeight: systInfo.statusBarHeight, navBarHeight: navBarHeight, bookId: options.bookId, - }); - this.getResourceClass(); - this.getResourceData({ productLinkPath: options.productLinkPath, - refCode: options.refCode, + refCode: options.refCode }); this.getShoppingCartProductGet(); - this.getBookInfo(options.bookId); }, /** @@ -75,6 +76,7 @@ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜� */ onShareAppMessage() {}, + onShareTimeline() {}, changeCheckAll(e) { this.setData({ checkAllState: e.detail.value, @@ -83,111 +85,180 @@ goBack() { wx.navigateBack(); }, - // 鑾峰彇鏁欏璧勬簮 浜戝涔� 浜戞祴璇� - getResourceData(type) { + + // 鑾峰彇鎵�鏈夊瓙椤规暟閲� + 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, newArr, path) { + for (const item of rootList) { + if (path == item.productLinkPath.replace('\\' + item.id, '')) { + 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 = this.insertAndSortObjectsByProductLinkPath(newArr, item) + // 鎻掕繘鏁扮粍鍚� 浠庡師鏁版嵁涓垹闄� + rootList = rootList.filter(nitem => nitem.id != item.id) + } + } + //缁欐暟缁勯噷闈㈠啀娣诲姞涓�涓猚hildren鐨勭┖鏁扮粍 + for (const i of newArr) { + i.children = [] + this.getTreeList(rootList, 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 => newObj.id < obj.id); + // 濡傛灉娌℃湁鎵惧埌鍚堥�傜殑浣嶇疆锛屽垯鏀惧湪鏁扮粍鏈熬 + if (insertIndex === -1) { + insertIndex = array.length; + } + // 鎻掑叆鏂板璞″埌鏁扮粍 + array.splice(insertIndex, 0, newObj); + // 娴嬭瘯6 姝e紡5 + // 瀵规暟缁勮繘琛屾帓搴� + array.sort((a, b) => { + if (a.id < b.id) return -1; + if (a.id > b.id) return 1; + return 0; + }); + // 杩斿洖鏇存柊鍚庣殑鏁扮粍 + return array; + }, + + // 閬嶅巻鏍戠粨鏋勮浆鎹负鏁扮粍鏂规硶 + handleTreeData(array) { + const flattenedArray = []; + array.forEach((node) => { + // 灏嗗綋鍓嶈妭鐐规坊鍔犲埌灞曞紑鐨勬暟缁勪腑 + flattenedArray.push(node); + // 閫掑綊澶勭悊瀛愯妭鐐� + if (node.children && node.children.length > 0) { + const childrenArray = this.handleTreeData(node.children); + flattenedArray.push(...childrenArray); + } + }); + return flattenedArray; + }, + // 閫掑綊鏍戠粨鏋勶紝濡傛灉鐖剁骇鏈夐攢鍞柟寮�(鏈夋晥鏈�)锛屽幓鎺夋墍鏈夊瓙闆嗙殑閿�鍞柟寮� + clearTreeSealmethod(clearSaleMethod, tree) { + for (let item of tree) { + const saleData = item.saleMethod && + item.saleMethod.length ? + item.saleMethod.find((citem) => citem.SaleType == 'Normal') : null + if ( + ((saleData && new Date(saleData.EndDate).getTime() >= new Date().getTime() && new Date(saleData.BeginDate).getTime() <= new Date().getTime()) || + clearSaleMethod) && item.children && item.children.length + ) { + item.children.forEach((ditem) => (ditem.saleMethod = [])) + } + if (item.children && item.children.length) + this.clearTreeSealmethod( + saleData && new Date(saleData.EndDate).getTime() >= new Date().getTime() && new Date(saleData.BeginDate).getTime() <= new Date().getTime(), + item.children + ) + } + return tree + }, + // 鍕鹃�夌鐢� + handleTreeCheck(tree) { + for (const item of tree) { + const saleData = item.saleMethod && + item.saleMethod.length ? + item.saleMethod.find((citem) => citem.SaleType == 'Normal') : undefined + if (saleData && new Date(saleData.EndDate).getTime() >= new Date().getTime() && new Date(saleData.BeginDate).getTime() <= new Date().getTime()) { + item.disabled = false + } else { + item.disabled = true + } + if (item.children && item.children.length) this.handleTreeCheck(item.children) + } + return tree + }, + // 鑾峰彇浜戝涔� + getResourceDataList(type) { this.setData({ loading: true, noResources: false, }); let query = { - path: "*", - queryType: "*", - productId: this.data.bookId, + path: '*', + queryType: '*', + productId: this.data.bookDetail.id, cmsPath: type.productLinkPath, + cmsType: '*', itemFields: { - SysType: "CmsFolder", + SysType: 'CmsFolder', // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁� - selectType: [], - freeFile: [], - file: [], - resourcesClassification: [], - isDownload: [], - jsek_resourceBrief: [], - jsek_link: [], - jsek_questionBank: [], - }, - pading: { - start: 0, - size: 999, - }, - }; - 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 == "jsek_teachingResources" || - type.refCode == "jsek_cloudLearning" - ) { - if (res.datas.cmsDatas[0].datas.length > 0) { - res.datas.cmsDatas[0].datas.forEach((item) => { - (item.checked = false), (item.checkAll = true); - }); - const list = await this.getAllResource(res.datas.cmsDatas[0].datas); - if (type.refCode == "jsek_teachingResources") { - this.setData({ - teach: list, - loading: false, - }); - this.findChildIds(this.data.teach, (this.data.openTeachids = [])); - } else if (type.refCode == "jsek_cloudLearning") { - const result = []; - res.datas.cmsDatas[0].datas.forEach((item) => { - item.checked = false; - }); - this.findChildIds(list, result); - this.setData({ - learn: list, - loading: false, - openLearnids: result, - }); - } - } else { - // 鏃犳暟鎹� - } - } 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) => { - console.log(e); - }); - }, - // 鑾峰彇tag涓嬫墍鏈夎祫婧� - async getAllResource(data) { - if (!data.length) return false; - for (let i = 0; i < data.length; i++) { - let item = data[i]; - if (item.sysType == "CmsFolder" && item.childrenCount > 0) { - item.children = []; - item.children = await this.getFolderItem(item.productLinkPath); - await this.getAllResource(item.children); - } - } - return data; - }, - // 鑾峰彇璧勬簮鎺ュ彛 - async getFolderItem(path) { - let query = { - path: "*", - queryType: "*", - productId: this.data.bookId, - cmsPath: path, - itemFields: { - SysType: "CmsFolder", - // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁� + learnSelectType: [], selectType: [], freeFile: [], file: [], @@ -196,47 +267,60 @@ isDownload: [], jsek_resourceBrief: [], jsek_link: [], - accessType: [], + jsek_questionBank: [] }, pading: { start: 0, - size: 999, + size: 999 }, - }; - const data = await app.MG.store.getProductDetail(query); - data.datas.cmsDatas[0].datas.forEach((item) => { - this.data.resourceClassList.forEach((type) => { - if (type.value == item.resourcesClassification) - item.resourceClass = type.name; - }); - // 缃戦〉 涓嶈兘涓嬭浇 绉佹湁鏂囦欢 - if (item.sysType == "CmsItem") { - if (item.selectType == "webpage") { - item.disabled = true; - } else { - if (item.isDownload != 1) { - item.disabled = true; - } - } - if (item.file) { - if (item.fileMap[item.file].protectType == "Private") - item.disabled = true; - } + } + app.MG.store.getProductDetail(query).then((res) => { + if (!res.datas.cmsDatas[0].datas.length) { + return this.setData({ + noResources: true, + loading: false, + }); } - }); - data.datas.cmsDatas[0].datas.forEach((item) => { - item.checked = false; - item.isbuy = this.resourceIsBuy(item); - item.isShopCar = this.isShoppingCart(item); - }); - return data.datas.cmsDatas[0].datas; + let list = [] + res.datas.cmsDatas[0].datas.forEach((item) => { + item.checked = false; + // if (item.sysType == 'CmsItem') { + // item.isbuy = this.resourceIsBuy(item); + // item.isShopCar = this.isShoppingCart(item); + // } + }); + // 鏄剧ず 闇�瑕佽喘涔扮殑鍜岄渶瑕佸厤璐归鍙栫殑 + this.getTreeList(res.datas.cmsDatas[0].datas, list, query.cmsPath) + list = this.ensureTreeConsistency(list) + list = this.changeResourceChildren(list) + list = this.clearTreeSealmethod(false, list) + list = this.handleTreeCheck(list) + this.handleTreeData(list).forEach(item => { + item.isbuy = this.resourceIsBuy(item); + item.isShopCar = this.isShoppingCart(item); + }) + console.log('淇敼鍚庝簯', list); + let result = []; + let arr = res.datas.cmsDatas[0].datas.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, + }); + }) }, - getBookInfo(id) { - this.setData({ - "mockData'.id": 0, - "mockData.price": 0, - "mockData.count": 0, - }); + + async getBookInfo(id) { const query = { path: "*", queryType: "*", @@ -269,12 +353,17 @@ freeEpubPage: [], //epub璇曡鐧惧垎姣� }, }; - app.MG.store.getProductDetail(query).then(async (res) => { + await app.MG.store.getProductDetail(query).then(async (res) => { this.setData({ bookDetail: res.datas, buyIdList: res.datas.purchasedSaleMethodIdList, }); + this.getResourceDataList({ + productLinkPath: this.data.productLinkPath, + refCode: this.data.refCode, + }) }); + }, // 鑾峰彇宸茶喘涔板晢鍝� getShoppingCartProductGet() { @@ -298,32 +387,73 @@ // 鍒ゆ柇璧勬簮鏄惁璐拱 resourceIsBuy(data) { if (data.saleMethod && data.saleMethod.length) { - const isSHow = this.data.buyIdList.some( - (item) => item == data.saleMethod[0].Id + const saleData = data.saleMethod.find((item) => item.SaleType == 'Normal') + if (saleData.State == 'Disable') return false + const isShow = this.data.buyIdList.some( + (item) => item == saleData.Id ); - return !isSHow; + // 宸茬粡璐拱 + if (isShow) return false + // 鏈喘涔帮紝鏌ョ湅閿�鍞柟寮忔槸鍚﹁繃鏈� + if (!isShow) { + const flag = new Date(saleData.EndDate).getTime() >= new Date().getTime() && + new Date(saleData.BeginDate).getTime() <= new Date().getTime() + if (flag) { + // 涓鸿繃鏈� 锛岄渶瑕佽喘涔� + return true + } else { + // 宸茶繃鏈� 鏃犻渶璐拱 + return false + } + } } else { return false; } }, + // 鍒ゆ柇璧勬簮鍔犲叆璐墿杞︽寜閽槸鍚︽樉绀� isShoppingCart(data) { if (data.saleMethod && data.saleMethod.length) { - if (data.saleMethod[0].Price <= 0) return false; + const saleData = data.saleMethod.find((item) => item.SaleType == 'Normal') + // 鍏堝垽鏂槸鍚﹀厤璐� + if (saleData.Price <= 0) return false // 鍐嶅垽鏂槸鍚﹁喘涔� - const isBuy = this.data.buyIdList.some( - (item) => item == data.saleMethod[0].Id - ); + const isBuy = this.data.buyIdList.some((item) => item == saleData.Id) if (isBuy) { // 璐拱浜� - return false; + return false } else { // 鍒ゆ柇鏄惁鍔犲叆璐墿杞� - const isSHow = this.data.shoppingCartGetId.some( - (item) => item == data.saleMethod[0].Id - ); - return !isSHow; + const isShow = this.data.shoppingCartGetId.some((item) => item == saleData.Id) + if (isShow) return false + // 鏈喘涔帮紝鏌ョ湅閿�鍞柟寮忔槸鍚﹁繃鏈� + if (!isShow) { + const flag = new Date(saleData.EndDate).getTime() >= new Date().getTime() && + new Date(saleData.BeginDate).getTime() <= new Date().getTime() + if (flag) { + // 涓鸿繃鏈� 锛岄渶瑕佽喘涔� + return true + } else { + // 宸茶繃鏈� 鏃犻渶璐拱 + return false + } + } } + // if (data.saleMethod[0].Price <= 0) return false; + // // 鍐嶅垽鏂槸鍚﹁喘涔� + // const isBuy = this.data.buyIdList.some( + // (item) => item == data.saleMethod[0].Id + // ); + // if (isBuy) { + // // 璐拱浜� + // return false; + // } else { + // // 鍒ゆ柇鏄惁鍔犲叆璐墿杞� + // const isSHow = this.data.shoppingCartGetId.some( + // (item) => item == data.saleMethod[0].Id + // ); + // return !isSHow; + // } } else { return false; } @@ -356,104 +486,102 @@ } } }, - // 鑾峰彇璧勬簮鎵�灞炲垎绫� - getResourceClass() { - let query = { - refCodes: ["resourcesClassification"], - }; - app.MG.store.getProductTypeField(query).then((res) => { - this.setData({ - resourceClassList: JSON.parse(res[0].config).option, - }); - }); - }, checkAll() { const child = this.selectComponent("#tree"); child.checkAll(); }, //璐拱鎸夐挳 batchPurchase() { - let saleMethodIds = []; - let requests = []; - let item = []; - let selectAllId = []; - const child = this.selectComponent("#tree"); - item = child.data.superiorPurchaseSaleMethodId; - const sonItem = child.data.sonPurchaseSaleMethodId; - let selectAll = child.data.selectAll; - if (selectAll) { - selectAll.forEach((item) => { - if (item.saleMethod != 0) { - selectAllId.push(item.saleMethod[0].Id); - } - }); - app.MG.store - .initOrder({ - requests: selectAllId.map((id) => ({ - saleMethodId: id, - count: 1, - })), - }) - .then((res) => { - if (res) { - wx.navigateTo({ - url: "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber, - }); - selectAllId = []; - child.setData({ - selectAll: [], - }); - } - }); + if (!this.data.learn.length) { + return wx.showToast({ + icon: "error", + title: '鏆傛棤鏁版嵁', + }) } - if (item) { - // 鎷垮埌id - item.forEach((items) => { - if (items.saleMethod != 0) { - saleMethodIds.push(items.saleMethod[0].Id); - } - }); - app.MG.store - .initOrder({ - requests: saleMethodIds.map((id) => ({ - saleMethodId: id, - count: 1, - })), - }) - .then((res) => { - if (res) { - wx.navigateTo({ - url: "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber, - }); + // 淇敼鍚庢柟娉� + const checkData = this.handleTreeData(this.data.learn).filter(item => item.checked == true) + console.log('閫変腑', checkData); + // let saleMethodIds = []; + // let requests = []; + // let item = []; + // let selectAllId = []; + // const child = this.selectComponent("#tree"); + // item = child.data.superiorPurchaseSaleMethodId; + // const sonItem = child.data.sonPurchaseSaleMethodId; + // let selectAll = child.data.selectAll; + // if (selectAll.length) { + // selectAll.forEach((item) => { + // if (item.saleMethod != 0) { + // selectAllId.push(item.saleMethod[0].Id); + // } + // }); + // app.MG.store + // .initOrder({ + // requests: selectAllId.map((id) => ({ + // saleMethodId: id, + // count: 1, + // })), + // }) + // .then((res) => { + // if (res) { + // wx.navigateTo({ + // url: "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber, + // }); + // selectAllId = []; + // child.setData({ + // selectAll: [], + // }); + // } + // }); + // } + // if (item) { + // // 鎷垮埌id + // item.forEach((items) => { + // if (items.saleMethod != 0) { + // saleMethodIds.push(items.saleMethod[0].Id); + // } + // }); + // app.MG.store + // .initOrder({ + // requests: saleMethodIds.map((id) => ({ + // saleMethodId: id, + // count: 1, + // })), + // }) + // .then((res) => { + // if (res) { + // wx.navigateTo({ + // url: "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber, + // }); - child.setData({ - superiorPurchaseSaleMethodId: [], // 浣跨敤setData鏂规硶娓呯┖sonPurchaseSaleMethodId鏁版嵁 - }); - } - }); - } - if (item.length == 0 && sonItem) { - app.MG.store - .initOrder({ - requests: sonItem.map((id) => ({ - saleMethodId: id, - count: 1, - })), - }) - .then((res) => { - if (res) { - wx.navigateTo({ - url: "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber, - }); - this.setData({ - paymentPage: true, - }); - child.setData({ - sonPurchaseSaleMethodId: [], // 浣跨敤setData鏂规硶娓呯┖sonPurchaseSaleMethodId鏁版嵁 - }); - } - }); - } + // child.setData({ + // superiorPurchaseSaleMethodId: [], // 浣跨敤setData鏂规硶娓呯┖sonPurchaseSaleMethodId鏁版嵁 + // }); + // } + // }); + // } + // if (item.length == 0 && sonItem) { + // app.MG.store + // .initOrder({ + // requests: sonItem.map((id) => ({ + // saleMethodId: id, + // count: 1, + // })), + // }) + // .then((res) => { + // if (res) { + // wx.navigateTo({ + // url: "/pages/cart/paymentPage/index?orderNumber=" + res.orderNumber, + // }); + // this.setData({ + // paymentPage: true, + // }); + // child.setData({ + // sonPurchaseSaleMethodId: [], // 浣跨敤setData鏂规硶娓呯┖sonPurchaseSaleMethodId鏁版嵁 + // }); + // } + // }); + // } }, // 绔犺妭鍕鹃�夋柟娉� @@ -508,5 +636,26 @@ this.setData({ learn: updated }) + }, + upDateShopCar(id, tree) { + for (let item of tree) { + if (item.id == id) { + item.isShopCar = false + } else { + if (item.children && item.children.length) this.upDateShopCar(id, item.children) + } + } + return tree + }, + // 鏇存柊璐墿杞﹀浘鏍� + updateCloudLearning(e) { + const { + id + } = e.detail + console.log(id); + const list = this.upDateShopCar(id, this.data.learn) + this.setData({ + learn: list + }) } }); \ No newline at end of file -- Gitblit v1.9.1