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/index.js | 986 ++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 680 insertions(+), 306 deletions(-) diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js index e500b90..44051f6 100644 --- a/packageBookService/pages/bookServices/detail/index.js +++ b/packageBookService/pages/bookServices/detail/index.js @@ -1,15 +1,20 @@ // pages/bookServices/detail/index.js import Toast from "tdesign-miniprogram/toast"; import tool from "../../../../assets/js/toolClass"; +import moment from 'moment' import { loginInfo } from "../../../../assets/js/login"; +import FormData from '../../../../utils/formdata/index.js'; const app = getApp(); Page({ /** * 椤甸潰鐨勫垵濮嬫暟鎹� */ data: { + // 杩涢〉闈㈤粯璁ゅ垏鎹� 灞曞紑鐨刬d + // defaultactiveTeachid 鏁欏璧勬簮 + // defaultactiveLearnid 浜戝涔� bookId: "", barHeight: "", navBarHeight: "", @@ -35,6 +40,7 @@ teach: [], learn: [], test: [], + jslx: true, openTeachids: [], openLearnids: [], openTestids: [], @@ -45,6 +51,9 @@ applyState: "", // 鏁欏璧勬簮鐢宠鐘舵�� deadline: "", // 鏁欏璧勬簮鐢宠鏈夋晥鏃ユ湡, isshowDrawBtn: true, // 浜戝涔犻鍙栨煡鐪嬫寜閽槸鍚︽樉绀� + isShowBuyCloundMenu: false, // 浜戝涔犲叏閮ㄨ喘涔版寜閽槸鍚︽樉绀� + isCloundHaveSaleMethod: false, // 浜戝涔犳槸鍚︽湁閿�鍞柟寮� + cloundMenuIsBuy: false, rejectCause: "", // 涓嬭浇鎷掔粷鍘熷洜 buyIdList: [], shoppingCartGetId: [], // 宸茶喘涔癷d鍒楄〃 @@ -80,6 +89,7 @@ electronicBookList: [], //鏍蜂功鍗曠數瀛愪功 paperBookCount: 0, //绾歌川涔﹀墿浣欐鏁� ebookCount: 0, //鐢靛瓙涔﹀墿浣欐鏁� + resourceCodeList: [], // 璧勬簮refcode鍒楄〃 userInfo: {}, pageLoading: true, fileInfo: { @@ -154,7 +164,49 @@ ], showIndex: '', successOrderNumber: '', - applicationState: '' // 鐢靛瓙鏍蜂功鐢宠鐘舵�� + applicationState: '', // 鐢靛瓙鏍蜂功鐢宠鐘舵�� + dialogBox: false, + resourceInfo: { + resourceName: '', + fileType: '', + description: '', + agree: false + }, + resourceVisible: false, + resourceValue: [], + fileTypeList: [{ + label: '闊抽', + value: '闊抽' + }, + { + label: '瑙嗛', + value: '瑙嗛' + }, + { + label: '鍥剧墖', + value: '鍥剧墖' + }, + { + label: 'PDF', + value: 'PDF' + }, + { + label: '璧勬簮鍖�', + value: '璧勬簮鍖�' + }, + { + label: '鏂囨。', + value: '鏂囨。' + }, + { + label: '鍏朵粬', + value: '鍏朵粬' + } + ], + fileList: [], + isShowUp: true, + protocolShow: false, + protocolTxt: '' }, resetTree: function (e) { @@ -175,20 +227,24 @@ bookId: options.id + "", barHeight: systInfo.statusBarHeight, navBarHeight: navBarHeight, - }); - this.setData({ options: { id: options.id, - name: options.name, + name: decodeURI(options.name), storeInfo: options.storeInfo, }, }); wx.setNavigationBarTitle({ - title: options.name, + title: decodeURI(options.name), }) + let token = wx.getStorageSync(app.config.tokenKey) + if (!token) { + loginInfo(app, (data) => { + if (data) {} else {} + }) + } this.getBookInfo(options.id); - this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫� - const token = wx.getStorageSync(app.config.tokenKey); + // this.getResourceClass(); // 鑾峰彇璧勬簮鎵�灞炲垎绫� + token = wx.getStorageSync(app.config.tokenKey) if (token) { this.getShoppingCartProductGet(); this.getApplyInfo(options.id); @@ -203,12 +259,14 @@ this.getSelectPaperBookCount(); this.getSelectBookCount(); } - }, + if (options.tabValue) { + this.setData({ + tabValue: options.tabValue, + }); - /** - * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚 - */ - onReady() {}, + + } + }, /** * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず @@ -230,21 +288,6 @@ }, /** - * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌 - */ - onHide() {}, - - /** - * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇 - */ - onUnload() {}, - - /** - * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔 - */ - onPullDownRefresh() {}, - - /** * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁� */ onReachBottom() { @@ -254,10 +297,6 @@ } }, - /** - * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜� - */ - onShareAppMessage() {}, // 鏍煎紡鍖栨棩鏈� formatDate(dateString) { if (!dateString) { @@ -373,6 +412,7 @@ dangdangLink: [], weidianLink: [], content: [], + catalogue: [], authorIntroduction: [], // isApplyPaperBook: [], // isApplyEBook: [], @@ -385,10 +425,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 +445,29 @@ 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); + } + } + if (this.data.tabValue == 'questionBank' || this.data.tabValue == 'jsek_cloudLearning' || this.data.tabValue == 'jsek_teachingResources') { + const checkData = this.data.cmsDatas.find( + (item) => item.refCode == this.data.tabValue + ); + if (this.data.tabValue == "questionBank") { + this.getResourceData(checkData) + } else { + this.getResourceDataList(checkData) } } @@ -441,18 +497,36 @@ } } this.setData({ - "bookDetail.publicationDate": this.formatDate( - this.data.bookDetail.publicationDate - ), + "bookDetail.publicationDate": moment(this.data.bookDetail.publicationDate).format("YYYY骞碝M鏈�"), "bookDetail.price": this.numFormat(this.data.bookDetail.price), "bookDetail.oldPrice": this.numFormat(this.data.bookDetail.oldPrice), "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('refcode', this.data.resourceCodeList); + }) }, //璇锋眰瀛愬晢鍝佺殑鏂囦欢 getSubTtem() { @@ -512,14 +586,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 +607,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 +615,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 +644,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 +726,6 @@ this.setData({ showIndex: '1' }) - console.log(this.data.bookDetail.icon, '0111111'); - console.log(this.data.bookDetail.name, '45688'); }, // 璺宠浆缃戝簵 goShop(e) { @@ -652,7 +733,7 @@ link } = e.currentTarget.dataset; wx.navigateTo({ - url: `/packageBookService/pages/bookServices/webpage/index?url=${link}`, + url: `/packageBookService/pages/bookServices/linkPage/index?path=${link}`, }); }, // tag鍒囨崲 @@ -668,9 +749,9 @@ e.detail.label == "浜戞祴璇�" ) { const checkData = this.data.cmsDatas.find( - (item) => item.refCode == e.detail.value + (item) => item.refCode == this.data.tabValue ); - + if (!this.data.resourceClassList.length) this.getResourceClass() if (checkData) { if (e.detail.value == "jsek_cloudLearning") { this.setData({ @@ -690,9 +771,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); @@ -773,10 +852,9 @@ }, // 鎵佸钩鍖栨暟鎹浆鎹ree - getTreeList(rootList, pathLength, newArr, path, addNum) { + getTreeList(rootList, 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 (path == item.productLinkPath.replace('\\' + item.id, '')) { if (item.sysType == 'CmsItem') { if (item.selectType == 'webpage') { item.disabled = true @@ -791,13 +869,15 @@ } // newArr.push(item) // 鍦ㄦ彃鍏ヨ繃绋嬩腑瀵规暟鎹繘琛屾帓搴� - newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item, addNum) + newArr = this.insertAndSortObjectsByProductLinkPath(newArr, item) + // 鎻掕繘鏁扮粍鍚� 浠庡師鏁版嵁涓垹闄� + rootList = rootList.filter(nitem => nitem.id != item.id) } } //缁欐暟缁勯噷闈㈠啀娣诲姞涓�涓猚hildren鐨勭┖鏁扮粍 for (const i of newArr) { i.children = [] - this.getTreeList(rootList, pathLength + addNum, i.children, i.productLinkPath, addNum) + this.getTreeList(rootList, i.children, i.productLinkPath) if (i.children.length == 0) { delete i.children } @@ -822,31 +902,43 @@ }, // 鎺掑簭鏁扮粍 鎸夌収productLinkPath - insertAndSortObjectsByProductLinkPath(array, newObj, addNum) { + insertAndSortObjectsByProductLinkPath(array, newObj) { // 鏌ユ壘鏂板璞″簲璇ユ彃鍏ョ殑浣嶇疆 - 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))); - + 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 (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 - addNum, a.productLinkPath.length)) > Number(b.productLinkPath.substring(b.productLinkPath.length - addNum, b.productLinkPath.length))) { - return 1; - } - // a must be equal to b + if (a.id < b.id) return -1; + if (a.id > b.id) return 1; return 0; }); - // 杩斿洖鏇存柊鍚庣殑鏁扮粍 return array; + }, + // 閫掑綊鏍戠粨鏋勶紝濡傛灉鐖剁骇鏈夐攢鍞柟寮�(鏈夋晥鏈�)锛屽幓鎺夋墍鏈夊瓙闆嗙殑閿�鍞柟寮� + 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 }, // 鏁欏璧勬簮 浜戝涔� 鑾峰彇 getResourceDataList(type) { @@ -857,7 +949,7 @@ let query = { path: '*', queryType: '*', - storeInfo: this.data.options.storeInfo, + // storeInfo: this.data.options.storeInfo, productId: this.data.bookDetail.id, cmsPath: type.productLinkPath, cmsType: '*', @@ -880,7 +972,8 @@ size: 999 }, } - app.MG.store.getProductDetail(query).then((res) => { + app.MG.store.getProductDetailNoChildren(query).then((res) => { + console.log('鏈鐞嗚祫婧�', res.datas.cmsDatas[0].datas); if (!res.datas.cmsDatas[0].datas.length) { return this.setData({ noResources: true, @@ -888,88 +981,97 @@ }); } let list = [] - // 娴嬭瘯 6浣�// 姝e紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝e紡璋冪敤浼�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); - } - } + // 鍒ゆ柇浜戝涔犳湁鏃犻攢鍞柟寮忓拰鏈夋晥鏈� + const cloundSaleMethod = + type.saleMethod && type.saleMethod.length ? + type.saleMethod.find((citem) => citem.SaleType == 'Normal') : + null + let flags = + type.refCode == 'jsek_cloudLearning' && + cloundSaleMethod && + new Date().getTime() <= new Date(cloundSaleMethod.EndDate).getTime() && + new Date().getTime() >= new Date(cloundSaleMethod.BeginDate).getTime() + res.datas.cmsDatas[0].datas.forEach((item) => { + // 浜戝涔犱笂鏈夐攢鍞柟寮忥紝鍘绘帀浜戝涔犱笅鎵�鏈夐攢鍞柟寮� + if (flags) item.saleMethod = [] + 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 (res.datas.cmsDatas[0].datas.some((item) => item.sysType == 'CmsFolder')) { + if (!res.datas.cmsDatas[0].datas.some((item) => item.sysType == 'CmsItem')) { + // 1.鍙湁鐩綍锛屾病鏈夎祫婧� + list = res.datas.cmsDatas[0].datas + } else { + this.getTreeList(res.datas.cmsDatas[0].datas, list, query.cmsPath) + list = this.ensureTreeConsistency(list) + list = this.changeResourceChildren(list) + } + } else { + // 3.鍙湁璧勬簮锛屾病鏈夌洰褰� + list = res.datas.cmsDatas[0].datas + } + let result = []; + if (type.refCode == "jsek_teachingResources") { + this.findChildIds(list, result); + this.setData({ + openTeachids: result, + loading: false, + teach: list, }); - 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 => item.saleMethod.length && item.saleMethod[0].Price > 0) - this.setData({ - isGoBuyResource: tag > -1 ? true : false - }) - } else { - this.setData({ - isGoBuyResource: false - }) - } - } - const addNum = query.cmsPath.length > 12 ? 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); - 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, - }); - } + } else if (type.refCode == "jsek_cloudLearning") { + // 浜戝涔犱笂鏃犻攢鍞柟寮忥紝璧扮洰褰� 璧勬簮 閿�鍞柟寮忓幓闄ゆ柟娉� + if (!flags) list = this.clearTreeSealmethod(false, list) + // 鍒ゆ柇棰嗗彇鏌ョ湅鏄惁鏄剧ず(浜戝涔狅紝鎴栬祫婧愮洰褰曪紝鏈夊敭浠蜂负0) + let isshowDrawBtn = res.datas.cmsDatas[0].datas.some( + (item) => + item.saleMethod.length && + item.saleMethod.find((citem) => citem.SaleType == 'Normal').Price == 0 && + new Date(item.saleMethod.find((citem) => citem.SaleType == 'Normal').EndDate).getTime() >= new Date().getTime() && + new Date(item.saleMethod.find((citem) => citem.SaleType == 'Normal').BeginDate).getTime() <= new Date().getTime() + ) || (flags && cloundSaleMethod.Price == 0) + // 鍒ゆ柇浜戝涔犲叏閮ㄨ喘涔版寜閽槸鍚︽樉绀� + let isShowBuyCloundMenu = flags && cloundSaleMethod.Price >= 0 + // 鍒ゆ柇璐墿杞︽寜閽拰閿佹寜閽槸鍚︽樉绀� + this.handleTreeData(list).forEach(item => { + item.isbuy = this.resourceIsBuy(item); + item.isShopCar = this.isShoppingCart(item); + }) + this.findChildIds(list, result); + this.setData({ + isshowDrawBtn, + isShowBuyCloundMenu, + isCloundHaveSaleMethod: flags, + learn: list, + loading: false, + openLearnids: result, + learnPath: type.productLinkPath + }); } }) }, // 鑾峰彇 浜戞祴璇� 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: { @@ -996,37 +1098,53 @@ if (type.refCode == "questionBank") { let data = [] let result = []; - if (this.data.options.storeInfo == 'jsek_jslx') { + 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) { - this.setData({ + that.setData({ test: data, loading: false, openTeachids: result, }); } else { - this.setData({ + that.setData({ noResources: true, loading: false, }); } } else { - data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' && item.childrenFolderCount > 0); + 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 > 12 ? 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, + that.getTreeList(data, list, query.cmsPath) + 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 { - this.setData({ + that.setData({ noResources: true, loading: false, }); @@ -1038,91 +1156,7 @@ 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: "*", - storeInfo: this.data.options.storeInfo, - productId: this.data.bookDetail.id, - cmsPath: path, - itemFields: { - SysType: "CmsFolder", - // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁� - selectType: [], - freeFile: [], - file: [], - protectedFile: [], - resourcesClassification: [], - isDownload: [], - jsek_resourceBrief: [], - jsek_link: [], - accessType: [], - learnSelectType: [], - }, - pading: { - start: 0, - size: 999, - }, - }; - let data = await app.MG.store.getProductDetail(query); - // 濡傛灉item灞傜骇閲屾湁floder锛屽垹闄loder - const flag = data.datas.cmsDatas[0].datas.findIndex( - (item) => item.sysType == "CmsItem" - ); - if (flag > -1) - data.datas.cmsDatas[0].datas = data.datas.cmsDatas[0].datas.filter( - (item) => item.sysType == "CmsItem" - ); - data.datas.cmsDatas[0].datas.forEach((item) => { - // if (item.sysType == "CmsFolder" && flag > -1) { - // item.isShow = false; - // } else { - // item.isShow = true; - // } - 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 && item.fileMap && item.fileMap[item.file]) { - if (item.fileMap[item.file].protectType == "Private") - item.disabled = true; - } - } - }); - data.datas.cmsDatas[0].datas.forEach((item) => { - if (this.data.tabValue == "jsek_teachingResources") { - item.checked = false; - } else if (this.data.tabValue == "jsek_cloudLearning") { - item.checked = false; - item.isbuy = this.isShowNeedBuy(item); - item.isShopCar = this.isShoppingCart(item); - } - }); - return data.datas.cmsDatas[0].datas; - }, + // 鑾峰彇灞曞紑椤� findChildIds(data, result) { let index = 0 @@ -1130,7 +1164,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++) { @@ -1248,9 +1282,7 @@ url, }); } - } else { - console.log(222); - } + } else {} } else { wx.showToast({ title: "鍟嗗搧涓嶅湪鏈夋晥鏈�", @@ -1301,7 +1333,6 @@ applyState: "Normal", deadline: "姘镐箙", }); - console.log("鏈夋晥鏃ユ湡", this.data.deadline); } else { let endTime = new Date(endDate + " 23:59:59").getTime(); this.setData({ @@ -1554,10 +1585,25 @@ // 鍒ゆ柇璧勬簮鏄惁璐拱 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; } @@ -1600,20 +1646,30 @@ // 鍒ゆ柇璧勬簮鍔犲叆璐墿杞︽寜閽槸鍚︽樉绀� 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 + } + } } } else { return false; @@ -1647,7 +1703,7 @@ flattenedArray.push(...childrenArray); } }); - return flattenedArray.filter((item) => item.sysType == "CmsItem"); + return flattenedArray; }, // 浜戝涔犱竴閿鍙� async getFreeResource() { @@ -1662,19 +1718,34 @@ // 鍑虹幇閿欒锛岃繑鍥瀎alse } }); + } + // 棰嗗彇鏌ョ湅 锛屽厛鐪嬩簯瀛︿範涓婄殑 鍐嶇湅璧勬簮涓婄殑 + const cloundMenu = this.data.resourceCodeList.find((item) => item.refCode == 'jsek_cloudLearning') + const cloundMenuSaleMethod = + cloundMenu.saleMethod && cloundMenu.saleMethod.length ? + cloundMenu.saleMethod.find((ditem) => ditem.SaleType == 'Normal') : + undefined + let query = {} + if (this.data.isCloundHaveSaleMethod && !cloundMenuSaleMethod.Price) { + // 浜戝涔犱笂鏈夐攢鍞柟寮忥紝涓斾负0鍏冿紝鐩存帴棰嗗彇浜戝涔� + query = { + remarks: '浜戝涔�', + requests: [{ + saleMethodId: cloundMenuSaleMethod.Id, + count: 1 + }] + } } else { - let arr = this.handleTreeData(this.data.learn).filter((item) => - this.resourceIsBuy(item) - ); + // 棰嗗彇璧勬簮 + let arr = this.handleTreeData(this.data.learn).filter(item => this.resourceIsBuy(item)) let freeIds = arr.filter((item) => { - return item.saleMethod[0].Price == 0; - }); + return item.saleMethod.find((citem) => citem.SaleType == 'Normal').Price == 0 + }) if (!freeIds.length) return wx.showToast({ icon: "error", title: "鏆傛棤鍏嶈垂璧勬簮", }); - child.changeReceive(true); let requests = []; freeIds.forEach((item, index) => { if (this.resourceIsBuy(item)) { @@ -1684,34 +1755,35 @@ }); } }); - let query = { + query = { remarks: "浜戝涔�", requests, }; - try { - const initOrderRes = await app.MG.store.initOrder(query); - let parameter = { - orderNum: initOrderRes.orderNumber, - }; - // 纭璁㈠崟 - const confirmOrderRes = await app.MG.store.confirmOrder(parameter); - 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); + } + child.changeReceive(true); + try { + const initOrderRes = await app.MG.store.initOrder(query); + let parameter = { + orderNum: initOrderRes.orderNumber, + }; + // 纭璁㈠崟 + const confirmOrderRes = await app.MG.store.confirmOrder(parameter); + 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); } }, // 浜戝涔犱竴閿喘涔� @@ -1726,7 +1798,8 @@ }, }); } - let shopList = this.handleTreeData(this.data.learn).filter((item) => + let shopList = this.handleTreeData(this.data.learn).filter(item => item.cmsType == 'cmsItem') + shopList = shopList.filter((item) => this.resourceIsBuy(item) ); this.getShoppingCartProductGet(); @@ -1762,6 +1835,11 @@ title: "璇烽噸璇�", }); } + }, + // 浜戝涔犲瓧娈佃喘涔� + async buyCloundMenu() { + const cloundData = this.data.resourceCodeList.find(item => item.refCode == 'jsek_cloudLearning') + }, // 鍙樹负鎵�鏈塩heck true findAndUpdateItemsByIds(tree, ids) { @@ -2099,9 +2177,8 @@ } }); 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' @@ -2211,7 +2288,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: "璇ヤ功宸茬敵璇凤紒", @@ -2415,4 +2492,301 @@ 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]; + if (item.children.length > 0) { + 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) { + let useArr = item.children ? item.children : [] + this.changeList(list, openid, useArr) + } else { + num += 1 + this.increaseTreeData(item.children, list, openid) + } + } + + }, + // 閫掑綊鍓嶄袱灞傦紝鎵惧嚭闇�瑕佸睍寮�鐨� + changeList(isList, id, childrenList) { + for (let dindex = 0; dindex < isList.length; dindex++) { + const ditem = isList[dindex]; + if (ditem.id == id) { + ditem.children = childrenList + return true + } else { + this.changeList(ditem.children, id, childrenList) + } + } + return childrenList + }, + uploadFile(e) { + this.setData({ + dialogBox: true, + isShowUp: true + }); + }, + closeDialog() { + this.setData({ + dialogBox: false, + resourceInfo: { + resourceName: '', + fileType: '', + description: '', + agree: false + }, + }); + }, + onCloseProtocol() { + this.setData({ + protocolShow: false, + }); + }, + onVisibleChange(e) { + this.setData({ + protocolShow: e.detail.visible, + }); + }, + //鏌ョ湅鍗忚 + getAgreement() { + let query = { + path: 'jsek_protocol', + fields: { + content: [], + } + } + app.MG.resource.getItem(query).then((res) => { + try { + + const data = res.datas.find((e) => e.refCode == 'jsek_authorizationAndConsentLetter') + this.setData({ + protocolTxt: data && data.content ? data.content : '鏆傛棤鍗忚', + protocolShow: true + }); + } catch (error) { + this.setData({ + protocolTxt: '鏆傛棤鍗忚', + protocolShow: true, + }); + } + }) + + }, + onNameInput(e) { + this.setData({ + 'resourceInfo.resourceName': e.detail.value, + }); + }, + onResourcePicker(e) { + this.setData({ + resourceValue: [this.data.resourceInfo.fileType], + resourceVisible: true, + }); + }, + onPickerChange(e) { + const { + value + } = e.detail; + this.setData({ + resourceVisible: false, + resourceValue: value, + 'resourceInfo.fileType': value.join(' '), + }); + }, + onPickerCancel(e) { + this.setData({ + resourceVisible: false, + }); + }, + textareaChange(e) { + this.setData({ + 'resourceInfo.description': e.detail.value, + }); + }, + onChange() { + if (this.data.resourceInfo.agree) { + this.setData({ + 'resourceInfo.agree': false, + }); + } else { + this.setData({ + 'resourceInfo.agree': true, + }); + } + }, + uploadPicture() { + var that = this; + wx.chooseMessageFile({ + count: 1, + type: 'file', + success(res) { + const isLt2M = res.tempFiles[0].size / 1024 / 1024 < 50 + if (!isLt2M) { + return wx.showToast({ + title: "涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 50MB!", + icon: "none", + duration: 1000, + }); + } + const FileName = res.tempFiles[0].name.split('.')[0] + const Extension = res.tempFiles[0].name.split('.')[1] + var medioType = '' + const audioData = ['mp3', 'mp3'] + const videoData = ['mp4', 'avi'] + const pdfData = ['pdf'] + const Compression = ['rar', 'zip'] + const pictureData = ['jpg', 'png'] + const documentData = ['doc', 'docx', 'xls', 'xlsx', "ppt", "pptx"] + if (audioData.indexOf(Extension) > -1) { + medioType = '闊抽' + } else if (videoData.indexOf(Extension) > -1) { + medioType = '瑙嗛' + } else if (pdfData.indexOf(Extension) > -1) { + medioType = 'PDF' + } else if (Compression.indexOf(Extension) > -1) { + medioType = '璧勬簮鍖�' + } else if (pictureData.indexOf(Extension) > -1) { + medioType = '鍥剧墖' + } else if (documentData.indexOf(Extension) > -1) { + medioType = '鏂囨。' + } else { + medioType = '鍏朵粬' + } + wx.getFileSystemManager().getFileInfo({ + filePath: res.tempFiles[0].path, //閫夋嫨鍥剧墖杩斿洖鐨勭浉瀵硅矾寰� + // encoding: 'binary', //缂栫爜鏍煎紡 + success: ress => { + //鎴愬姛鐨勫洖璋� + let md5 = ress.digest; + let formData = new FormData(); + formData.append('Md5', md5); + formData.append('FileName', FileName); + formData.append('FileType', res.tempFiles[0].type); + formData.appendFile("file", res.tempFiles[0].path); + const data = formData.getData(); + let _token = wx.getStorageSync(app.config.tokenKey); + let header = {}; + if (_token == null) { + header["Authorization"] = `Basic ${Base64.encode(website.clientId + ":" + website.clientSecret)}`; + } else { + header["Authorization"] = `Bearer ` + _token; + } + new Promise((resolve, reject) => { + wx.request({ + url: app.config.requestCtx + '/file/api/ApiUpload', + method: 'POST', + header: { + 'content-type': data.contentType, + ...header + }, + data: data.buffer, + success(res1) { + resolve(res1.data); + if (res1.data) { + let file = [{ + name: res.tempFiles[0].name, + md5: md5, + type: medioType, + FileType: Extension + }] + that.setData({ + "resourceInfo.resourceName": FileName, + "resourceInfo.fileType": medioType, + + fileList: file, + isShowUp: false + }) + } + } + }) + }) + } + }) + } + }) + + }, + handleRemove(e) { + this.setData({ + isShowUp: true, + fileList: [] + }); + }, + confirmM() { + if (this.data.resourceInfo.resourceName == '') { + return wx.showToast({ + icon: "error", + title: "璇峰~鍐欒祫婧愬悕绉�", + }); + } + if (this.data.resourceInfo.fileType == '') { + return wx.showToast({ + icon: "error", + title: "璇烽�夋嫨璧勬簮绫诲瀷", + }); + } + + if (!this.data.fileList.length) { + return wx.showToast({ + icon: "error", + title: "璇蜂笂浼犺祫婧愭枃浠�", + }); + } + if (!this.data.resourceInfo.agree) { + return wx.showToast({ + icon: "none", + title: "璇峰悓鎰忋�婃巿鏉冨悓鎰忎功銆嬶紒", + }); + } + let query = { + topicIdOrRefCode: "uploadFiles", + name: this.data.bookDetail.name, + content: JSON.stringify(JSON.parse(JSON.stringify(this.data.fileList))), + type: 'UserSubmit', + description: this.data.resourceInfo.description, + cmsTypeRefCode: '', + newDataListRequest: [] + } + app.MG.ugc.newTopicMessage(query).then((res) => { + wx.showToast({ + icon: "success", + title: "璇蜂笂浼犺祫婧愭枃浠�", + }); + this.closeDialog() + }) + }, + getCloundIsBuy() { + let flag = false + if (!this.data.isCloundHaveSaleMethod) flag = false + const cloundData = this.data.resourceCodeList.find(item => item.refCode == 'jsek_cloudLearning') + const saleData = cloundData.saleMethod.find(item => item.SaleType == "Normal") + if (!saleData) flag = false + flag = this.data.buyIdList.some(item => item == saleData.Id) + this.setData({ + cloundMenuIsBuy: flag + }) + } +}) \ No newline at end of file -- Gitblit v1.9.1