From 92a0bff4761945ea8fb7a682915ba342cbb51b8d Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 10 七月 2024 12:18:39 +0800
Subject: [PATCH] yinpin
---
packageBookService/pages/bookServices/detail/components/tree/index.js | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 1c287fe..72a7a3a 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -122,15 +122,16 @@
},
// 鍒ゆ柇璧勬簮鏄惁璐拱
resourceIsBuy(data) {
- if (data.saleMethod && data.saleMethod.length) {
- if (data.saleMethod[0].State == "Disable") return false;
- const isSHow = this.properties.buyIds.some(
- (item) => item == data.saleMethod[0].Id
- );
- return !isSHow;
- } else {
- return false;
- }
+ return true
+ // if (data.saleMethod && data.saleMethod.length) {
+ // if (data.saleMethod[0].State == "Disable") return false;
+ // const isSHow = this.properties.buyIds.some(
+ // (item) => item == data.saleMethod[0].Id
+ // );
+ // return !isSHow;
+ // } else {
+ // return false;
+ // }
},
// 璺宠浆闊宠棰戞挱鏀惧櫒
goPlayer(e) {
@@ -173,7 +174,8 @@
}
if (
this.properties.tab == "jsek_cloudLearning" &&
- this.resourceIsBuy(item)
+ // this.resourceIsBuy(item)
+ item.saleMethod.length > 0
) {
return wx.showToast({
icon: "error",
@@ -181,16 +183,16 @@
"璇峰厛璐拱璇ヨ祫婧�" : "璇峰厛鐐瑰嚮棰嗗彇鏌ョ湅鎸夐挳",
});
}
- if (
- item.saleMethod.length == 0 &&
- item.sysType == "CmsItem" &&
- this.properties.tab == "jsek_cloudLearning"
- ) {
- return wx.showToast({
- icon: "error",
- title: "鏆傛湭寮�濮嬮攢鍞紝璇疯仈绯荤鐞嗗憳",
- });
- }
+ // if (
+ // item.saleMethod.length == 0 &&
+ // item.sysType == "CmsItem" &&
+ // this.properties.tab == "jsek_cloudLearning"
+ // ) {
+ // return wx.showToast({
+ // icon: "error",
+ // title: "鏆傛湭寮�濮嬮攢鍞紝璇疯仈绯荤鐞嗗憳",
+ // });
+ // }
if (this.properties.tab == "jsek_teachingResources" && (item.file || item.freeFile)) {
let file = item.fileMap[item.file] ? item.fileMap[item.file] : item.fileMap[item.freeFile]
if (file && file.protectType !== "Public") {
@@ -208,11 +210,8 @@
wx.navigateTo({
url: `${url}?productLinkPath=${item.productLinkPath}&parentProductLinkPath=${parentProductLinkPath}&parentName=${parentName}&activeId=${item.id}&bookId=${this.properties.bookInfo.id}&bookName=${this.properties.bookInfo.name}&cmsId=${this.properties.bookInfo.rootCmsItemId}&formPath=${this.properties.tab}&applyState=${this.properties.applyState}&deadline=${this.properties.deadline}`,
});
-<<<<<<< Updated upstream
-=======
// debugger
->>>>>>> Stashed changes
if (item.selectType == "pdf" || item.selectType == "document") {
const fileLink = item.file ? item.file : item.freeFile
console.log(fileLink);
@@ -221,12 +220,7 @@
fileLink +
"&fileName=" +
item.name +
-<<<<<<< Updated upstream
- "&fileType=pdf" +
- "&bookBuy=true"
-=======
"&fileType=pdf" + "&bookBuy=true"
->>>>>>> Stashed changes
});
}
// if (item.selectType == "document") {
--
Gitblit v1.9.1