From 6e6d4f6688d0f110993dc2055289e640a5fd29bb Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 14 三月 2025 18:25:40 +0800
Subject: [PATCH] excel
---
packageBookService/pages/bookServices/detail/components/tree/index.js | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index a6e144b..cf3f46c 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -211,12 +211,13 @@
let file = item.fileMap[item.file] ? item.fileMap[item.file] : item.fileMap[item.freeFile]
if (file && file.protectType !== "Public") {
return wx.showToast({
- icon: "error",
+ icon: "none",
title: "璧勬簮涓嶅彲鐢紝璇疯仈绯荤鐞嗗憳",
});
}
}
if (this.properties.tab == "jsek_cloudLearning") {
+
// 1.鎵惧嚭鎵�鏈夌埗绾х洰褰曞拰鏈韩(鏈夐攢鍞柟寮�) 鍜� 浜戝涔犳湰韬�(鏈夐攢鍞柟寮�) 鏀惧埌涓�涓暟缁� 涓虹┖鍒欐殏鏈紑鏀鹃攢鍞�
let learn = []
if (this.properties.isCloundHaveSaleMethod) {
@@ -226,7 +227,7 @@
// 1.2 浜戝涔犳棤閿�鍞柟寮忥紝灏嗙埗绾х洰褰曞拰鏈韩鍔犲叆鏁扮粍
learn = this.handleTreeData(this.properties.learnList).filter(
(citem) => citem.saleMethod &&
- citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal') &&
+ citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal' && ditem.Price > 0) &&
new Date(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').EndDate).getTime() >= new Date().getTime() &&
new Date(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').BeginDate).getTime() <= new Date().getTime() &&
item.productLinkPath.includes(citem.productLinkPath)
@@ -240,6 +241,16 @@
icon: 'error',
title: '璇峰厛璐拱璇ヨ祫婧�',
})
+ if (item.protectedFile || item.freeFile) {
+ let file = item.fileMap[item.protectedFile] ? item.fileMap[item.protectedFile] : item.fileMap[item.freeFile]
+ if (file && file.protectType !== "Public") {
+ return wx.showToast({
+ icon: 'none',
+ title: "璧勬簮涓嶅彲鐢紝璇疯仈绯荤鐞嗗憳",
+ });
+ }
+ }
+
}
let url;
if (item.selectType == "video" || item.learnSelectType == "video") {
@@ -498,7 +509,7 @@
});
if (shoppingCartGetId.includes(saleMethodId)) {
wx.showToast({
- icon: "error",
+ icon: "success",
title: "宸叉坊鍔�",
});
this.setData({
--
Gitblit v1.9.1