闫增涛
2024-04-03 2fabb6c52d7a933c49dd896bb2b3ab25d77381b4
packageBookService/pages/bookServices/detail/index.wxml
@@ -236,7 +236,6 @@
          style="{{tabPanelstyle}}"
        >
          <view wx:if="{{!loading && learn.length}}">
<<<<<<< Updated upstream
            <learn-resource
              bind:getFreeResource="getFreeResource"
              bind:allAddShoppiingCar="allAddShoppiingCar"
@@ -245,6 +244,7 @@
              bookId="{{bookDetail.id}}"
              isshowDrawBtn="{{isshowDrawBtn}}"
            ></learn-resource>
            <tree
              id="tree"
              openIds="{{openLearnids}}"
@@ -253,14 +253,9 @@
              treeList="{{learn}}"
              buyIds="{{buyIdList}}"
              openLearnids="{{openLearnids}}"
              bind:updateShoppingCartHidden="updateShoppingCartHidden"
              bind:updateCloudLearning="updateCloudLearning"
            ></tree>
=======
            <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}"></learn-resource>
            <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree>
>>>>>>> Stashed changes
          </view>
          <view wx:if="{{noResources}}" class="noData">
            <t-empty icon="folder-open" description="暂无数据" />