From e0710860edbb875653aa825ff499a89908386068 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 10 May 2021 10:12:46 +0800
Subject: [PATCH] 服务卡的优化   和  券兑换的影藏

---
 packageA/pages/cardList/cardList.wxml   |  2 +-
 packageA/pages/goodsInfo/goodsInfo.wxml |  2 +-
 pages/user/coupons/coupons.wxml         | 11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packageA/pages/cardList/cardList.wxml b/packageA/pages/cardList/cardList.wxml
index 2f5d45a..efb3a19 100644
--- a/packageA/pages/cardList/cardList.wxml
+++ b/packageA/pages/cardList/cardList.wxml
@@ -40,7 +40,7 @@
 					<view class="flex fdc space-bt f1 pdl20">
 						<view>
 							<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
-							<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:0}}</view>
+							<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:'不限'}}</view>
 						</view>
 						<view class="flex space-bt ali-c">
 							<view class="price">{{item.money}}</view>
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index ba90b79..280e68b 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -40,7 +40,7 @@
 			
 			<view class="goods-num" style="margin-bottom: 10rpx;">
 			  <view class="sales">销量：{{data.sales_sum}}</view>
-			  <view class="sales">有效天数：{{data.validDays?data.validDays:0}}</view>
+			  <view class="sales">有效天数：{{data.validDays?data.validDays:'不限'}}</view>
 			</view>
 				 
           </view>
diff --git a/pages/user/coupons/coupons.wxml b/pages/user/coupons/coupons.wxml
index b061963..d11839d 100644
--- a/pages/user/coupons/coupons.wxml
+++ b/pages/user/coupons/coupons.wxml
@@ -22,9 +22,14 @@
 
 <view class='noCoupons' wx:if='{{details.length==0 && isset}}'>
   <image src='{{iurl}}miniapp/images/user/wqnone.png'></image>
-  <view class='no_wz1'>没有微券？</view>
-  <view class='no_wz2'>快去兑换吧</view>
-  <view class='no_btn' bindtap='exchange'>立即兑换</view>
+  <block wx:if="{{is_show_dhwz}}">
+	  <view class='no_wz1'>没有微券？</view>
+	  <view class='no_wz2'>快去兑换吧</view>
+	  <view class='no_btn' bindtap='exchange'>立即兑换</view>
+  </block>
+  <block wx:else>
+	   <view class='no_wz1'>暂无数据</view>
+  </block>  
 </view>
 <view wx:else>
   <block wx:for="{{details}}" wx:for-index="idx" wx:for-item="detail">
--
libgit2 0.21.4