From 6955399f408332149aa7d4078cb24e01d34263df Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期二, 26 三月 2024 15:13:08 +0800
Subject: [PATCH] 书展列表bug

---
 packageBookService/pages/bookServices/detail/index.wxml |   78 +++++++++++++++++++++++++--------------
 1 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 91c67d6..5787248 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -14,19 +14,19 @@
     <view class="book-detail">
       <view class="detail-left">
         <view class="book-img">
-          <t-image src="{{bookDetail.icon}}" mode="aspectFill" width="120" height="170" aria-label="{{bookDetail.name}}" />
+          <image loading="" src="{{bookDetail.icon}}" mode="aspectFill" aria-label="{{bookDetail.name}}" />
         </view>
         <view class="book-use">
           <view class="collect" bind:tap="setCollect">
             <view>
-              <t-image src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}"></t-image>
-              <t-image src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}"></t-image>
+              <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" />
+              <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" />
             </view>
             <view class="use-title">鏀惰棌</view>
           </view>
           <view class="suggest" bind:tap="suggestBtn">
             <view>
-              <t-image src="/static/images/bookService/detail/suggest.png"></t-image>
+              <image loading="" src="/static/images/bookService/detail/suggest.png" />
             </view>
             <view class="use-title">鎴戣寤鸿</view>
           </view>
@@ -56,7 +56,7 @@
             <view class="class-name showTow">{{bookDetail.class}}</view>
           </view>
         </view>
-        <t-image src="/static/images/bookService/detail/square.png" class="right-background"></t-image>
+        <image src="/static/images/bookService/detail/square.png" class="right-background" />
       </view>
     </view>
     <!-- 閿�鍞俊鎭� -->
@@ -65,11 +65,11 @@
         <!-- 鐢靛瓙涔﹀敭浠� -->
         <view class="electron-price">
           <view>
-            <t-image src="/static/images/bookService/detail/electon-price.png"></t-image>
+            <image src="/static/images/bookService/detail/electon-price.png" />
           </view>
           <view class="price">
             <view class="price-text">楼{{bookDetail.price == '0.00' ? '鍏嶈垂' :bookDetail.price}}</view>
-            <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}} <view class="line"></view>
+            <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}}
             </view>
           </view>
           <view> </view>
@@ -77,7 +77,7 @@
         <!-- 绾歌川涔﹀敭浠� -->
         <view class="paper-price">
           <view>
-            <t-image src="/static/images/bookService/detail/paper-price.png"></t-image>
+            <image src="/static/images/bookService/detail/paper-price.png" />
           </view>
           <view class="price">楼{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
             bookDetail.paperPrice}}</view>
@@ -85,63 +85,85 @@
       </view>
       <!-- 缃戝簵 -->
       <view class="book-web">
-        <t-image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd"></t-image>
-        <t-image src="/static/images/bookService/detail/tmall.png" width="32" height="22" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}"></t-image>
-        <t-image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}"></t-image>
-        <t-image src="/static/images/bookService/detail/jd.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}"></t-image>
+        <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" />
+        <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" />
+        <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" />
+        <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" />
       </view>
     </view>
   </view>
   <view class="book-resource">
     <t-tabs defaultValue="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
       <t-tab-panel label="鍥句功绠�浠�" value="brief" style="{{tabPanelstyle}}">
-        <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}"></book-brief>
+        <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content && bookDetail.authorIntroduction}}"></book-brief>
+        <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}" class="noData">
+          <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+        </view>
       </t-tab-panel>
-      <t-tab-panel label="鐢靛瓙涔�" value="1" style="{{tabPanelstyle}}">
-        鐢靛瓙涔�
+      <t-tab-panel label="鐢靛瓙涔�" value="jsek_eBook" style="{{tabPanelstyle}}">
+        <epub-view fileInfo="{{fileInfo}}" id="eBook" class="webView"></epub-view>
       </t-tab-panel>
       <t-tab-panel label="鏁欏璧勬簮" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
-        <view wx:if="{{!loading && teach.length}}">
-          <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" bind:applyResource="applyResource"></teach-resource>
-          <tree bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" openTeachids="{{openTeachids}}"></tree>
+        <view wx:if="{{!loading && teach.length && !noResources}}">
+          <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
+          <tree openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}"></tree>
         </view>
         <t-loading theme="circular" size="60rpx" class="loading" loading="{{loading}}" />
+        <view wx:if="{{noResources}}" class="noData">
+          <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+        </view>
       </t-tab-panel>
       <t-tab-panel label="浜戝涔�" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
         <view wx:if="{{!loading && learn.length}}">
-          <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource"></learn-resource>
-          <tree bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" 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}}"></tree>
+        </view>
+        <view wx:if="{{noResources}}" class="noData">
+          <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
         </view>
       </t-tab-panel>
       <t-tab-panel label="浜戞祴璇�" value="questionBank" style="{{tabPanelstyle}}">
         <view wx:if="{{!loading && test.length}}">
           <test-resource list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}"></test-resource>
         </view>
+        <view wx:if="{{noResources}}" class="noData">
+          <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+        </view>
       </t-tab-panel>
-      <t-tab-panel label="浜戠瑪璁�" value="jesk_note" style="{{tabPanelstyle}}">
-        <note bookInfo="{{bookDetail}}" id="note" class="note-list" bind:changeLoaidng="changeLoaidng"></note>
+      <t-tab-panel label="浜戠瑪璁�" value="jsek_note" style="{{tabPanelstyle}}">
+        <note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
       </t-tab-panel>
     </t-tabs>
   </view>
   <!-- 璐拱鎸夐挳 -->
   <view class="box-bottom">
-    <view class="bottom-btn">
+    <view class="bottom-btn" bind:tap="appplyElectronicBook">
       <view>
-        <t-image src="/static/images/bookService/detail/ebook.png"></t-image>
+        <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image>
       </view>
       <view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view>
     </view>
-    <view class="bottom-btn">
+    <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' ? 'disabledColor' : 'shopCarColor' }}" bind:tap="addBookShopcCar">鍔犲叆璐墿杞�</view>
-    <view class="buy  {{tabValue == 'jsek_teachingResources' ? 'disabledColor' : 'buyColor' }}" bind:tap="buyBtn">绔嬪嵆璐拱</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>
 <!-- 鎴戣寤鸿寮圭獥 -->
 <suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
 <!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 -->
-<t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
\ No newline at end of file
+<t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
+
+<view class="applyBox" bindtap="goApply">
+  <view class="box">
+    <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
+    <view class="num" wx:if="{{num > 0}}">{{num}}</view>
+  </view>
+</view>
\ No newline at end of file

--
Gitblit v1.9.1