From 80cee152c8c7f314d43a05ae1994aeeecd28b08a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 20 九月 2024 18:35:47 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/detail/components/tree/index.js | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 74bb4ae..c5c622c 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -66,7 +66,6 @@
purchaseList: []
},
ready() {},
-
onLoad() {},
observers: {
treeList: function (newValue) {
@@ -233,8 +232,8 @@
// title: '鏆傛湭寮�鍞�',
// })
const buyList = learn.filter((citem) => this.properties.buyIds.includes(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').Id))
- // 璧勬簮鍜屾湰韬兘鏈喘涔�
- if (!buyList.length) {
+ if (!buyList.length && learn.length) {
+ // 璧勬簮鍜屾湰韬兘鏈喘涔� 涓� 鐖剁骇鎴栨湰韬湁閿�鍞柟寮�
const itemSaleMethod = item.saleMethod && item.saleMethod.length ? item.saleMethod.find(citem => citem.SaleType == 'Normal') : undefined
return wx.showToast({
icon: 'error',
@@ -253,7 +252,7 @@
) {
url = "/packageDomain/pages/resourceDetails/myAudio/index";
}
- if (item.selectType == "picture") {
+ if (item.selectType == "picture" || item.selectType == 'document') {
url = "/packageDomain/pages/resourceDetails/document/index";
}
wx.navigateTo({
@@ -412,7 +411,6 @@
this.setData({
openIds: this.data.openIds,
});
- wx.hideLoading()
},
// 瀛愰」鍕鹃��
checkResource(e) {
@@ -483,7 +481,6 @@
this.triggerEvent("changeListChecked", myEventDetail, myEventOption);
}
}
- wx.hideLoading()
},
// 鍔犲叆璐墿杞�
async onCloudShoppingCart(e) {
--
Gitblit v1.9.1