From dce80cdcb3cc3fc2072a1edd90d9c5a22fb3024d Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 22 Jul 2021 15:29:08 +0800
Subject: [PATCH] 积分的显示

---
 packageA/pages/myGift/myGift.wxml               | 14 +++++++++++++-
 packageA/pages/myGiftDetails/myGiftDetails.wxml | 15 ++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml
index 191cb46..52eca65 100644
--- a/packageA/pages/myGift/myGift.wxml
+++ b/packageA/pages/myGift/myGift.wxml
@@ -15,7 +15,19 @@
 						<!-- 价格 -->
 						<view class="flex jc_sb ai-center pdb10">
 							<view class="flex ai-center">
-								<view class="c-red fs28"><text class="rmb">{{item.lbprice}}</text>/{{item.lbintegral}}积分</view>
+								<view class="c-red fs28">
+									<block wx:if="{{item.lbprice>0 && item.lbintegral}}">
+										<text class="rmb">{{item.lbprice}}</text>/{{item.lbintegral}}积分
+									</block>
+									<block wx:elif="{{item.lbprice>0 || item.lbintegral}}">
+										<block wx:if="{{item.lbprice>0}}" >
+										   <text class="rmb">{{item.lbprice}}</text>
+										</block>
+										<block wx:if="{{item.lbintegral>0}}">
+										   {{item.lbintegral}}积分
+										</block>
+									</block>
+								</view>
 								<view class="fs22 c-a4 line-through mgl10">零售价{{item.oldprice}}</view>
 							</view>
 							<view class="fs24 c-a4">已售{{item.salenum}}件</view>
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index 0235561..74e8787 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -9,7 +9,20 @@
 		<!-- 价格 -->
 		<view class="flex jc_sb ai-center pdb10">
 			<view class="flex ai-center">
-				<view class="c-red fs36"><text class="rmb">{{details.lbprice}}</text>/{{details.lbintegral}}积分</view>
+				<view class="c-red fs36">
+					<block wx:if="{{details.lbprice>0 && details.lbintegral>0 }}">
+						<text class="rmb">{{details.lbprice}}</text>/{{details.lbintegral}}积分
+					</block>
+					<block wx:elif="{{details.lbprice>0 || details.lbintegral>0 }}">
+						<block wx:if="{{details.lbprice>0}}" >
+					    	<text class="rmb">{{details.lbprice}}</text>
+						</block>
+						<block wx:if="{{details.lbintegral>0}}" >
+						    {{details.lbintegral}}积分
+				    	</block>
+					</block>
+
+				</view>
 				<view class="fs22 c-a4 line-through mgl10">零售价{{details.oldprice}}</view>
 			</view>
 			<view class="fs24 c-a4">已售{{details.salenum}}件</view>
--
libgit2 0.21.4