From e060ad2b2da9884e00b36796548eacc6a2b9a5d3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 29 三月 2024 09:44:30 +0800
Subject: [PATCH] 图书详情，列表页bug修改

---
 packageBookService/pages/bookServices/detail/index.wxml |   76 ++++++++++++++++++-------------------
 1 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index d1aebb2..715cdf0 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/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>
@@ -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"
@@ -165,7 +165,12 @@
         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,19 +183,16 @@
             <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': ''}}"
         >
@@ -229,6 +231,7 @@
         </t-tab-panel>
         <t-tab-panel
           label="浜戝涔�"
+          icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
           value="jsek_cloudLearning"
           style="{{tabPanelstyle}}"
         >
@@ -256,21 +259,25 @@
         </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-tabs>
@@ -322,35 +329,26 @@
       </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 class="shopCar shopCarColor" bind:tap="addBookShopcCar"
       >鍔犲叆璐墿杞�</view
     >
+    <view class="buy buyColor" bind:tap="buyBtn">绔嬪嵆璐拱</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"
+      class="buy shopCarColor"
       bind:tap="goRead"
-      wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}"
+      wx:if="{{tabValue == 'brief' && bookBuy}}"
       >绔嬪嵆鏌ョ湅</view
     >
+    <view
+      class="buy shopCarColor"
+      bind:tap="goRead"
+      wx:if="{{tabValue == 'brief' && !bookBuy}}"
+      >鍦ㄧ嚎璇曡</view
+    >
   </view>
 </view>
+
+<view class="loading" wx:if="{{pageLoading}}">
+  <t-loading loading="{{pageLoading}}" size="40"></t-loading>
+</view>

--
Gitblit v1.9.1