From f674ae5bb1660503e00afab71b9cbf1a3ff8b507 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Mon, 6 Jan 2020 11:19:30 +0800
Subject: [PATCH] 优惠券的显示格式修复

---
 pages/user/coupons/coupons.wxml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/user/coupons/coupons.wxml b/pages/user/coupons/coupons.wxml
index 938ead2..595edc7 100644
--- a/pages/user/coupons/coupons.wxml
+++ b/pages/user/coupons/coupons.wxml
@@ -34,15 +34,15 @@
     </view>
     <view class="moneys">{{filter.getNum(detail.Sum)}}元微券</view>
     <view class="car-rim">
-      <view class="coupon_from">微券来源: {{detail.Operator==null?'微信商城':detail.Operator}}</view>
+      <view class="coupon_from">微券来源: {{detail.Operator==null?'微信商城':detail.Operator==''?"微信商城":detail.Operator}}</view>
       <view wx:if="{{detail.ValidDate!=null&&detail.BeginDate!=null}}">
         <!-- 不指定格式则默认输出：yyyy-MM-dd hh:mm:ss 格式 -->
-        <view class="text">有效期: {{detail.BeginDate==null?"":time.replace_time2(detail.BeginDate)}}至{{time.replace_time2(detail.ValidDate)}}</view>
+        <view class="text">有效期: {{(detail.BeginDate==null || detail.BeginDate=='')?"":time.replace_time2(detail.BeginDate)}}至{{time.replace_time2(detail.ValidDate)}}</view>
       </view>
       <view wx:else>
         <view class="text">有效期:不限</view>
       </view>
-      <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{detail.UseObjectID==null?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用{{detail.region_list_name==null?"":",不包邮地区:"+region_list_name}}
+      <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用{{detail.region_list_name==null?"":",不包邮地区:"+region_list_name}}
       </view>
 
     </view>
--
libgit2 0.21.4