Merge refs/remotes/origin/master into refs/heads/master

litian

2024-09-20 80cee152c8c7f314d43a05ae1994aeeecd28b08a

 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) {