From 1cad6ba03f8cb848352c6739c54395128e73485f Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 26 三月 2024 16:00:53 +0800
Subject: [PATCH] 资源购买页布局调整

---
 packageBookService/pages/bookServices/detail/index.wxml |  119 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index b55720f..723b7c7 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -19,33 +19,35 @@
     <view class="book-detail">
       <view class="detail-left">
         <view class="book-img">
-          <t-image
-            src="{{bookDetail.icon}}"
+          <image
+            loading=""
+            src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
             mode="aspectFill"
-            width="120"
-            height="170"
             aria-label="{{bookDetail.name}}"
           />
         </view>
         <view class="book-use">
           <view class="collect" bind:tap="setCollect">
             <view>
-              <t-image
+              <image
+                loading=""
                 src="/static/images/bookService/detail/collect.png"
                 wx:if="{{!bookDetail.isFavourite}}"
-              ></t-image>
-              <t-image
+              />
+              <image
+                loading=""
                 src="/static/images/bookService/detail/collecting.png"
                 wx:if="{{bookDetail.isFavourite}}"
-              ></t-image>
+              />
             </view>
             <view class="use-title">鏀惰棌</view>
           </view>
           <view class="suggest" bind:tap="suggestBtn">
             <view>
-              <t-image
+              <image
+                loading=""
                 src="/static/images/bookService/detail/suggest.png"
-              ></t-image>
+              />
             </view>
             <view class="use-title">鎴戣寤鸿</view>
           </view>
@@ -81,10 +83,10 @@
             <view class="class-name showTow">{{bookDetail.class}}</view>
           </view>
         </view>
-        <t-image
+        <image
           src="/static/images/bookService/detail/square.png"
           class="right-background"
-        ></t-image>
+        />
       </view>
     </view>
     <!-- 閿�鍞俊鎭� -->
@@ -93,62 +95,58 @@
         <!-- 鐢靛瓙涔﹀敭浠� -->
         <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
+              >{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
+              bookDetail.price}}</view
             >
             <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}"
-              >楼{{bookDetail.oldPrice}} <view class="line"></view>
+              >楼{{bookDetail.oldPrice}}
             </view>
           </view>
           <view> </view>
         </view>
         <!-- 绾歌川涔﹀敭浠� -->
-        <view class="paper-price">
+        <view class="paper-price" wx:if="{{bookDetail.paperPrice}}">
           <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
+            >{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
+            '楼'+bookDetail.paperPrice}}</view
           >
         </view>
       </view>
       <!-- 缃戝簵 -->
       <view class="book-web">
-        <t-image
+        <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
+        />
+        <image
+          class="tmall-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
+        />
+        <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"
+        />
+        <image
+          src="/static/images/bookService/detail/weidian.png"
           bind:tap="goShop"
           data-link="{{bookDetail.weidianLink}}"
           wx:if="{{bookDetail.weidianLink}}"
-        ></t-image>
+        />
       </view>
     </view>
   </view>
@@ -173,8 +171,12 @@
           <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="鏁欏璧勬簮"
@@ -185,10 +187,12 @@
           <teach-resource
             applyState="{{applyState}}"
             rejectCause="{{rejectCause}}"
+            deadline="{{deadline}}"
             bind:applyResource="applyResource"
             applyResourceLoading="{{applyResourceLoading}}"
           ></teach-resource>
           <tree
+            openIds="{{openTeachids}}"
             bookInfo="{{bookDetail}}"
             treeList="{{teach}}"
             tab="{{tabValue}}"
@@ -218,9 +222,12 @@
             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}}"
@@ -248,13 +255,8 @@
           <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>
@@ -262,7 +264,10 @@
   <view class="box-bottom">
     <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>
@@ -275,14 +280,34 @@
       <view class="btn-text">绾歌川鏍蜂功鐢宠</view>
     </view>
     <view
-      class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jesk_note') ? 'disabledColor' : 'shopCarColor' }}"
+      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 == 'jesk_note') ? 'disabledColor' : 'buyColor' }}"
+      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>
@@ -306,7 +331,7 @@
 <view class="applyBox" bindtap="goApply">
   <view class="box">
     <t-image
-      src="/static/images/home/yangshuForm.png"
+      src="/static/images/home/yangshuForm1.png"
       mode="heightFix"
       class="img"
     />

--
Gitblit v1.9.1