From 20a26aa0c12c05c3f96afc163c6532c6b1b5cf8e Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 21 三月 2024 09:24:01 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

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

diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index abfcb94..14524ff 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -35,20 +35,20 @@
       <view class="detail-right">
         <view class="book-name">{{bookDetail.name}}</view>
         <view class="book-message">
-          <view class="message-li">
+          <view class="message-li" wx:if="{{bookDetail.seriesName}}">
             <view class="li-title">涓涗功鍚嶏細</view>
             <view class="li-content">{{bookDetail.seriesName}}</view>
           </view>
           <view class="message-li">
-            <view class="li-title">浣滆�咃細</view>
+            <view class="li-title" wx:if="{{bookDetail.author}}">浣滆�咃細</view>
             <view class="li-content">{{bookDetail.author}}</view>
           </view>
-          <view class="message-li">
+          <view class="message-li" wx:if="{{bookDetail.isbn}}">
             <view class="li-title">ISBN锛�</view>
             <view class="li-content">{{bookDetail.isbn}}</view>
           </view>
           <view class="message-li">
-            <view class="li-title">鍑虹増鏃堕棿锛�</view>
+            <view class="li-title" wx:if="{{bookDetail.publicationDate}}">鍑虹増鏃堕棿锛�</view>
             <view class="li-content">{{bookDetail.publicationDate}}</view>
           </view>
           <view class="message-li" wx:if="{{bookDetail.class}}" style="height: 80rpx">
@@ -56,6 +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>
       </view>
     </view>
     <!-- 閿�鍞俊鎭� -->
@@ -109,7 +110,7 @@
       <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>
+          <tree id="tree" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
         </view>
       </t-tab-panel>
       <t-tab-panel label="浜戞祴璇�" value="questionBank" style="{{tabPanelstyle}}">
@@ -136,8 +137,8 @@
       </view>
       <view class="btn-text">绾歌川鏍蜂功鐢宠</view>
     </view>
-    <view class="shopCar" bind:tap="addBookShopcCar">鍔犲叆璐墿杞�</view>
-    <view class="buy" bind:tap="buyBtn">绔嬪嵆璐拱</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>
 </scroll-view>
 <!-- 鎴戣寤鸿寮圭獥 -->

--
Gitblit v1.9.1