From 80232d691dd9c4989985b570ce4d745e5d2bc3f7 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期三, 20 三月 2024 18:34:19 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

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

diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index b67b340..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>
     <!-- 閿�鍞俊鎭� -->
@@ -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