From 6aba48776b8a3c7112adc7627f1b4a71be6770fb Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 03 四月 2024 17:04:58 +0800
Subject: [PATCH] 1

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

diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 715cdf0..2c8f67f 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -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
@@ -159,7 +159,7 @@
     </view>
     <view class="book-resource">
       <t-tabs
-        defaultValue="{{tabValue}}"
+        value="{{tabValue}}"
         bind:change="onTabsChange"
         t-class="custom-tabs"
         t-class-content="custom-panel"
@@ -236,12 +236,14 @@
           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"
@@ -252,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="鏆傛棤鏁版嵁" />
@@ -279,6 +288,19 @@
           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>
@@ -329,23 +351,23 @@
       </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"
+    <view
+      class="shopCar shopCarColor"
+      bind:tap="addBookShopcCar"
+      wx:if="{{!bookBuy}}"
       >鍔犲叆璐墿杞�</view
     >
-    <view class="buy buyColor" bind:tap="buyBtn">绔嬪嵆璐拱</view>
-    <view
-      class="buy shopCarColor"
-      bind:tap="goRead"
-      wx:if="{{tabValue == 'brief' && bookBuy}}"
-      >绔嬪嵆鏌ョ湅</view
+    <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy}}"
+      >绔嬪嵆璐拱</view
     >
-    <view
-      class="buy shopCarColor"
-      bind:tap="goRead"
-      wx:if="{{tabValue == 'brief' && !bookBuy}}"
-      >鍦ㄧ嚎璇曡</view
-    >
+    <view class="buy read" bind:tap="goRead" wx:if="{{bookBuy}}">绔嬪嵆鏌ョ湅</view>
   </view>
 </view>
 

--
Gitblit v1.9.1