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 | 460 +++++++++++++++++++++++++-------------------------------
1 files changed, 207 insertions(+), 253 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 86016ed..44051f6 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -51,6 +51,9 @@
applyState: "", // 鏁欏璧勬簮鐢宠鐘舵��
deadline: "", // 鏁欏璧勬簮鐢宠鏈夋晥鏃ユ湡,
isshowDrawBtn: true, // 浜戝涔犻鍙栨煡鐪嬫寜閽槸鍚︽樉绀�
+ isShowBuyCloundMenu: false, // 浜戝涔犲叏閮ㄨ喘涔版寜閽槸鍚︽樉绀�
+ isCloundHaveSaleMethod: false, // 浜戝涔犳槸鍚︽湁閿�鍞柟寮�
+ cloundMenuIsBuy: false,
rejectCause: "", // 涓嬭浇鎷掔粷鍘熷洜
buyIdList: [],
shoppingCartGetId: [], // 宸茶喘涔癷d鍒楄〃
@@ -266,11 +269,6 @@
},
/**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {},
-
- /**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
@@ -290,21 +288,6 @@
},
/**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
- onHide() {},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {},
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {},
-
- /**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
onReachBottom() {
@@ -314,11 +297,6 @@
}
},
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {},
- onShareTimeline() {},
// 鏍煎紡鍖栨棩鏈�
formatDate(dateString) {
if (!dateString) {
@@ -545,8 +523,9 @@
}
app.MG.store.getProductDetail(query).then((res) => {
this.setData({
- resourceCodeList: res.datas.cmsDatas[0].datas
+ resourceCodeList: res.datas.cmsDatas[0].datas,
})
+ console.log('refcode', this.data.resourceCodeList);
})
},
//璇锋眰瀛愬晢鍝佺殑鏂囦欢
@@ -941,6 +920,26 @@
// 杩斿洖鏇存柊鍚庣殑鏁扮粍
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) {
this.setData({
@@ -950,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: '*',
@@ -974,6 +973,7 @@
},
}
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,
@@ -981,84 +981,82 @@
});
}
let list = []
- // 娴嬭瘯 6浣�// 姝ｅ紡 5浣�// 娴嬭瘯璋冪敤浼�20锛屽唴閮�7 姝ｅ紡璋冪敤浼�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
- // 鍏堝垽鏂槸鍚﹀惁涔颁簯瀛︿範鏁翠釜鐩綍
- 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
- })
- } else {
- this.setData({
- isGoBuyResource: false
- })
- }
- }
- this.getTreeList(res.datas.cmsDatas[0].datas, list, query.cmsPath)
- list = this.ensureTreeConsistency(list)
- list = this.changeResourceChildren(list)
- let result = [];
- if (type.refCode == "jsek_teachingResources") {
- this.findChildIds(list, result);
- // const newUSeList = this.deleteTreeData(list, result)
- this.setData({
- openTeachids: result,
- loading: false,
- teach: list,
- });
- } 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
+ });
}
})
},
@@ -1158,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
@@ -1670,20 +1584,26 @@
},
// 鍒ゆ柇璧勬簮鏄惁璐拱
resourceIsBuy(data) {
- 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
+ if (data.saleMethod && data.saleMethod.length) {
+ 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;
}
@@ -1725,30 +1645,31 @@
},
// 鍒ゆ柇璧勬簮鍔犲叆璐墿杞︽寜閽槸鍚︽樉绀�
isShoppingCart(data) {
- 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;
+ if (data.saleMethod && data.saleMethod.length) {
+ 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;
@@ -1782,7 +1703,7 @@
flattenedArray.push(...childrenArray);
}
});
- return flattenedArray.filter((item) => item.sysType == "CmsItem");
+ return flattenedArray;
},
// 浜戝涔犱竴閿鍙�
async getFreeResource() {
@@ -1797,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)) {
@@ -1819,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);
}
},
// 浜戝涔犱竴閿喘涔�
@@ -1861,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();
@@ -1897,6 +1835,11 @@
title: "璇烽噸璇�",
});
}
+ },
+ // 浜戝涔犲瓧娈佃喘涔�
+ async buyCloundMenu() {
+ const cloundData = this.data.resourceCodeList.find(item => item.refCode == 'jsek_cloudLearning')
+
},
// 鍙樹负鎵�鏈塩heck true
findAndUpdateItemsByIds(tree, ids) {
@@ -2834,5 +2777,16 @@
});
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