From 3371af971fa92b81302b1f0342db9f6c15c6cd3e Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Mon, 8 Mar 2021 18:02:48 +0800
Subject: [PATCH] 优惠券显示优化

---
 packageA/pages/quan/quan.wxml           | 7 ++++++-
 packageA/pages/quan_list/quan_list.wxml | 8 +++++++-
 packageA/pages/quan_pro/quan_pro.wxml   | 6 +++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packageA/pages/quan/quan.wxml b/packageA/pages/quan/quan.wxml
index c344c6d..29dca2c 100644
--- a/packageA/pages/quan/quan.wxml
+++ b/packageA/pages/quan/quan.wxml
@@ -29,7 +29,12 @@
 							   <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}至</text> <text wx:if="{{item.days>0}}">{{filters.format_time(getcurday+3600*24*item.days)}}</text><text wx:else>不限</text>
 							</view>				
 						</view>
-						<view class="price">￥<text class="fs40">{{filters.toFix(item.money,2)}}</text>   <image  src="{{imghost}}miniapp/images/coupon_img/sharelinke.png"  class="sharelink"></image></view>
+						<view class="price">￥<text class="fs40">{{filters.toFix(item.money,2)}}</text>  
+					
+						 <image wx:if="{{item.is_share==1}}"  src="{{imghost}}miniapp/images/coupon_img/sharelinke.png"  class="sharelink"></image>
+				
+
+						 </view>
 						
 					</view>
 					<view class="flex ai-center jc_sb pdt20">
diff --git a/packageA/pages/quan_list/quan_list.wxml b/packageA/pages/quan_list/quan_list.wxml
index 73ad493..1eb28bc 100644
--- a/packageA/pages/quan_list/quan_list.wxml
+++ b/packageA/pages/quan_list/quan_list.wxml
@@ -25,7 +25,13 @@
                   <text wx:if="{{item.starttype==0 && item.use_start_time>0}}"> {{filters.format_time(item.use_start_time)}}</text>至
                   <text wx:if="{{item.use_end_time>0}}"> {{filters.format_time(item.use_end_time)}}</text><text wx:else>不限</text>
               </view>
-              <view wx:else>有效期 <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}至</text> <text wx:if="{{item.days>0}}">{{filters.format_time(getcurday+3600*24*item.days)}}</text><text wx:else>不限</text></view>
+              <view wx:else>有效期 <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
+                <text wx:else>{{filters.format_time(getcurday)}}</text>
+                至
+                 <text wx:if="{{item.days>0}}">{{filters.format_time(getcurday+3600*24*item.days)}}</text>
+                 <text wx:else>不限</text>
+                
+                </view>
               <view>每人限领：<text wx:if="{{item.everyone_num>0}}">{{item.everyone_num}}</text><text wx:else>不限</text></view>
               <!-- 领取按钮 -->
               <view data-ind="{{index}}"  data-cid="{{item.id}}" catchtap="get_quan">
diff --git a/packageA/pages/quan_pro/quan_pro.wxml b/packageA/pages/quan_pro/quan_pro.wxml
index 1a84485..899be99 100644
--- a/packageA/pages/quan_pro/quan_pro.wxml
+++ b/packageA/pages/quan_pro/quan_pro.wxml
@@ -33,9 +33,9 @@
                 <text wx:if="{{q_data.use_start_time>0 && q_data.starttype==0}}"> {{filters.format_time(q_data.use_start_time)}}</text>至
                 <text wx:if="{{q_data.use_end_time>0}}"> {{filters.format_time(q_data.use_end_time)}}</text><text wx:else>不限</text>
             </view>
-            <view wx:else class="lower fs30">有效期 
-
-              <text wx:if="{{ q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}至</text>
+            <view wx:else class="lower fs30">有效期
+              <text wx:if="{{ q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}</text>
+              <text wx:else>{{filters.format_time(getcurday)}}</text>至
             <text wx:if="{{q_data.days>0}}">  {{filters.format_time(getcurday+3600*24*q_data.days)}}</text><text wx:else>不限</text></view>
 
         </view>
--
libgit2 0.21.4