线上书展bug3

yiming

2024-04-03 8c794be279e13aa477af7ebbe4bc97570b7da816

 packageBookService/pages/bookServices/detail/index.wxml

@@ -1,6 +1,6 @@
<!--pages/bookServices/detail/index.wxml-->
<!--导航区域 -->
<view class="page-bookService">
<view class="page-bookService" wx:if="{{!pageLoading}}">
  <view style="width: 100%; height: {{barHeight}}px; "></view>
  <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
    <view>
@@ -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
@@ -98,7 +98,7 @@
      <view class="book-sale">
        <view class="book-price">
          <!-- 电子书售价 -->
          <view class="electron-price">
          <view class="electron-price" wx:if="{{bookDetail.price}}">
            <view>
              <image
                src="/static/images/bookService/detail/electon-price.png"
@@ -159,13 +159,18 @@
    </view>
    <view class="book-resource">
      <t-tabs
        defaultValue="{{tabValue}}"
        value="{{tabValue}}"
        bind:change="onTabsChange"
        t-class="custom-tabs"
        t-class-content="custom-panel"
        class="tab-class"
      >
        <t-tab-panel label="图书简介" value="brief" style="{{tabPanelstyle}}">
        <t-tab-panel
          label="图书简介"
          icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
          value="brief"
          style="{{tabPanelstyle}}"
        >
          <book-brief
            content="{{bookDetail.content}}"
            authorIntroduction="{{bookDetail.authorIntroduction}}"
@@ -178,23 +183,22 @@
            <t-empty icon="folder-open" description="暂无数据" />
          </view>
        </t-tab-panel>
        <t-tab-panel
        <!-- <t-tab-panel
          label="电子书"
          icon="{{tabValue == 'jsek_eBook' ? eBookClickIcon : eBookIcon}}"
          value="jsek_eBook"
          style="{{tabPanelstyle}}"
        >
          <epub-view
            fileInfo="{{fileInfo}}"
            id="eBook"
            class="webView"
          ></epub-view>
        </t-tab-panel>
        </t-tab-panel> -->
        <t-tab-panel
          label="教学资源"
          icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
          value="jsek_teachingResources"
          class="{{loading ? 'loading': ''}}"
        >
          <view wx:if="{{!loading && teach.length && !noResources}}">
          <view
            wx:if="{{!loading && teach.length && !noResources && applyState}}"
          >
            <teach-resource
              applyState="{{applyState}}"
              rejectCause="{{rejectCause}}"
@@ -203,12 +207,14 @@
              applyResourceLoading="{{applyResourceLoading}}"
            ></teach-resource>
            <tree
              id="teach-tree"
              openIds="{{openTeachids}}"
              bookInfo="{{bookDetail}}"
              treeList="{{teach}}"
              tab="{{tabValue}}"
              applyState="{{applyState}}"
              bind:downloadTeach="downloadTeach"
              bind:handleTree="handleTree"
              openTeachids="{{openTeachids}}"
              wx:if="{{teach.length}}"
            ></tree>
@@ -225,16 +231,19 @@
        </t-tab-panel>
        <t-tab-panel
          label="云学习"
          icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
          value="jsek_cloudLearning"
          style="{{tabPanelstyle}}"
        >
          <view wx:if="{{!loading && learn.length}}">
<<<<<<< Updated upstream
            <learn-resource
              bind:getFreeResource="getFreeResource"
              bind:allAddShoppiingCar="allAddShoppiingCar"
              id="learn-resource"
              buyResourceData="{{buyResourceData}}"
              bookId="{{bookDetail.id}}"
              isshowDrawBtn="{{isshowDrawBtn}}"
            ></learn-resource>
            <tree
              id="tree"
@@ -245,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="暂无数据" />
@@ -252,74 +268,41 @@
        </t-tab-panel>
        <t-tab-panel
          label="云测试"
          icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
          value="questionBank"
          style="{{tabPanelstyle}}"
        >
          <view wx:if="{{!loading && test.length}}">
          <view wx:if="{{!loading}}">
            <test-resource
              list="{{test}}"
              bookInfo="{{bookDetail}}"
              mockData="{{mockData}}"
              bind:buyMock="buyMock"
            ></test-resource>
          </view>
          <view wx:if="{{noResources}}" class="noData">
            <t-empty icon="folder-open" description="暂无数据" />
          </view>
        </t-tab-panel>
        <t-tab-panel label="云笔记" value="jsek_note" style="{{tabPanelstyle}}">
        <t-tab-panel
          label="云笔记"
          icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}"
          value="jsek_note"
          style="{{tabPanelstyle}}"
        >
          <note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
        </t-tab-panel>
        <t-tab-panel
          label="相关图书"
          icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}"
          value="related_books"
          style="{{tabPanelstyle}}"
        >
          <related-books
            relatedBookData="{{relatedBookData}}"
            relatedBookLoading="{{relatedBookLoading}}"
            noRelatedBookData="{{noRelatedBookData}}"
            bind:goBookDetails="goBookDetails"
          ></related-books>
        </t-tab-panel>
      </t-tabs>
    </view>
    <!-- 购买按钮 -->
    <view class="box-bottom">
      <view class="bottom-btn" bind:tap="appplyElectronicBook">
        <view>
          <t-image
            loading=""
            src="/static/images/bookService/detail/ebook.png"
          ></t-image>
        </view>
        <view class="btn-text">电子样书申请</view>
      </view>
      <view class="bottom-btn" bind:tap="appplyPaperBook">
        <view>
          <t-image
            src="/static/images/bookService/detail/paper-book.png"
          ></t-image>
        </view>
        <view class="btn-text">纸质样书申请</view>
      </view>
      <view
        class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}"
        bind:tap="addBookShopcCar"
        wx:if="{{tabValue != 'jsek_eBook'}}"
        >加入购物车</view
      >
      <view
        class="buy  {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}"
        bind:tap="buyBtn"
        wx:if="{{tabValue != 'jsek_eBook'}}"
        >立即购买</view
      >
      <view
        class="shopCar shopCarColor"
        bind:tap="addBookShopcCar"
        wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
        >加入购物车</view
      >
      <view
        class="buy buyColor"
        bind:tap="buyBtn"
        wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
        >立即购买</view
      >
      <view
        class="read buyColor"
        bind:tap="goRead"
        wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}"
        >立即查看</view
      >
    </view>
  </scroll-view>
  <!-- 我要建议弹窗 -->
@@ -349,4 +332,45 @@
      <view class="num" wx:if="{{num > 0}}">{{num}}</view>
    </view>
  </view>
  <!-- 购买按钮 -->
  <view class="box-bottom">
    <view class="bottom-btn" bind:tap="appplyElectronicBook">
      <view>
        <t-image
          loading=""
          src="/static/images/bookService/detail/ebook.png"
        ></t-image>
      </view>
      <view class="btn-text">电子样书申请</view>
    </view>
    <view class="bottom-btn" bind:tap="appplyPaperBook">
      <view>
        <t-image
          src="/static/images/bookService/detail/paper-book.png"
        ></t-image>
      </view>
      <view class="btn-text">纸质样书申请</view>
    </view>
    <view class="bottom-btn tryRead" bind:tap="goRead" wx:if="{{!bookBuy}}">
      <view>
        <t-image src="/static/images/bookService/detail/shidu.png"></t-image>
      </view>
      <view class="btn-text">试读</view>
    </view>

    <view
      class="shopCar shopCarColor"
      bind:tap="addBookShopcCar"
      wx:if="{{!bookBuy}}"
      >加入购物车</view
    >
    <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy}}"
      >立即购买</view
    >
    <view class="buy read" bind:tap="goRead" wx:if="{{bookBuy}}">立即查看</view>
  </view>
</view>

<view class="loading" wx:if="{{pageLoading}}">
  <t-loading loading="{{pageLoading}}" size="40"></t-loading>
</view>