闫增涛
2024-04-09 1efd950a5b40ef3bf37a8afd738ff574f68cea35
packageBookService/pages/bookServices/detail/index.wxml
@@ -59,7 +59,7 @@
          </view>
        </view>
        <view class="detail-right">
          <view class="book-name">{{bookDetail.name}}</view>
          <view class="book-name showTow">{{bookDetail.name}}</view>
          <view class="book-message">
            <view class="message-li" wx:if="{{bookDetail.seriesName}}">
              <view class="li-title">丛书名:</view>
@@ -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="暂无数据" />
@@ -274,6 +269,7 @@
        >
          <view wx:if="{{!loading}}">
            <test-resource
              id="test-resource"
              list="{{test}}"
              bookInfo="{{bookDetail}}"
              mockData="{{mockData}}"
@@ -351,7 +347,11 @@
      </view>
      <view class="btn-text">纸质样书申请</view>
    </view>
    <view class="bottom-btn tryRead" bind:tap="goRead" wx:if="{{!bookBuy}}">
    <view
      class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}"
      bind:tap="goRead"
      wx:if="{{!bookBuy}}"
    >
      <view>
        <t-image src="/static/images/bookService/detail/shidu.png"></t-image>
      </view>
@@ -361,12 +361,21 @@
    <view
      class="shopCar shopCarColor"
      bind:tap="addBookShopcCar"
      wx:if="{{!bookBuy}}"
      wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
      >加入购物车</view
    >
    <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy}}"
    <view
      class="buy buyColor"
      bind:tap="buyBtn"
      wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
      >立即购买</view
    >
    <view
      class="buy receiveColor"
      bind:tap="buyBtn"
      wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}"
      >免费领取</view
    >
    <view class="buy read" bind:tap="goRead" wx:if="{{bookBuy}}">立即查看</view>
  </view>
</view>