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

闫增涛

2024-04-03 5e649be819c7297c79c21c6dc120b4b6b362db9e

 packageBookService/pages/bookServices/detail/index.wxml

@@ -21,7 +21,7 @@
  >
    <!-- 图书详情 -->
    <view class="book-box">
      <view class="book-detail">
      <view class="book-detail" id="book-detail">
        <view class="detail-left">
          <view class="book-img">
            <image
@@ -159,7 +159,7 @@
    </view>
    <view class="book-resource">
      <t-tabs
        defaultValue="{{tabValue}}"
        value="{{tabValue}}"
        bind:change="onTabsChange"
        t-class="custom-tabs"
        t-class-content="custom-panel"
@@ -236,6 +236,7 @@
          style="{{tabPanelstyle}}"
        >
          <view wx:if="{{!loading && learn.length}}">
<<<<<<< Updated upstream
            <learn-resource
              bind:getFreeResource="getFreeResource"
              bind:allAddShoppiingCar="allAddShoppiingCar"
@@ -253,6 +254,13 @@
              buyIds="{{buyIdList}}"
              openLearnids="{{openLearnids}}"
            ></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="暂无数据" />
@@ -287,7 +295,12 @@
          value="related_books"
          style="{{tabPanelstyle}}"
        >
          <related-books relatedBookData="{{relatedBookData}}"></related-books>
          <related-books
            relatedBookData="{{relatedBookData}}"
            relatedBookLoading="{{relatedBookLoading}}"
            noRelatedBookData="{{noRelatedBookData}}"
            bind:goBookDetails="goBookDetails"
          ></related-books>
        </t-tab-panel>
      </t-tabs>
    </view>