From e23780b8f7569afa9c7f48501bf4019e22168036 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Sat, 25 Jul 2020 09:37:40 +0800
Subject: [PATCH] 优惠券的显示优化

---
 packageA/pages/quan_list/quan_list.wxml | 4 ++--
 packageA/pages/quan_pro/quan_pro.wxml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packageA/pages/quan_list/quan_list.wxml b/packageA/pages/quan_list/quan_list.wxml
index 0840d24..0311530 100644
--- a/packageA/pages/quan_list/quan_list.wxml
+++ b/packageA/pages/quan_list/quan_list.wxml
@@ -19,11 +19,11 @@
               <view class="fs28 co_b" style="margin-top: 15rpx">{{item.name}}</view>
               <view style="margin-top: 5rpx">所有门店通用</view>
               <view wx:if="{{item.endtype==0}}">有效期              
-                 <text wx:if="{{item.starttype==1 && item.startdays>0}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
+                 <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
                   <text wx:if="{{item.starttype==0 && item.use_start_time>0}}"> {{filters.format_time(item.use_start_time)}}</text>至
                   <text wx:if="{{item.use_start_time>0}}"> {{filters.format_time(item.use_end_time)}}</text><text wx:else>不限</text>
               </view>
-              <view wx:else>有效期 <text wx:if="{{item.starttype==1 && item.startdays>0}}">{{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: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 6573005..219c326 100644
--- a/packageA/pages/quan_pro/quan_pro.wxml
+++ b/packageA/pages/quan_pro/quan_pro.wxml
@@ -24,13 +24,13 @@
                 </view>
             </view>
             <view wx:if="{{q_data.endtype==0}}" class="lower fs30">有效期
-                 <text wx:if="{{q_data.startdays>0 && q_data.starttype==1}}">  {{filters.format_time(getcurday+3600*24*q_data.startdays)}}</text>
+                 <text wx:if="{{q_data.starttype==1}}">  {{filters.format_time(getcurday+3600*24*q_data.startdays)}}</text>
                 <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.startdays>0 && q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}至</text>
+              <text wx:if="{{ q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}至</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