wxd / MShopWeApp

Commit 3bdc12e53aa675e30ac432f302c21616cffd4fe6

Authored by 后端开发-许程
2 parents 9b0c24d5 f674ae5b

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
pages/user/coupons/coupons.wxml
  View file @3bdc12e
... ... @@ -34,15 +34,15 @@
34 34 </view>
35 35 <view class="moneys">{{filter.getNum(detail.Sum)}}元微券</view>
36 36 <view class="car-rim">
37   - <view class="coupon_from">微券来源: {{detail.Operator==null?'微信商城':detail.Operator}}</view>
  37 + <view class="coupon_from">微券来源: {{detail.Operator==null?'微信商城':detail.Operator==''?"微信商城":detail.Operator}}</view>
38 38 <view wx:if="{{detail.ValidDate!=null&&detail.BeginDate!=null}}">
39 39 <!-- 不指定格式则默认输出：yyyy-MM-dd hh:mm:ss 格式 -->
40   - <view class="text">有效期: {{detail.BeginDate==null?"":time.replace_time2(detail.BeginDate)}}至{{time.replace_time2(detail.ValidDate)}}</view>
  40 + <view class="text">有效期: {{(detail.BeginDate==null || detail.BeginDate=='')?"":time.replace_time2(detail.BeginDate)}}至{{time.replace_time2(detail.ValidDate)}}</view>
41 41 </view>
42 42 <view wx:else>
43 43 <view class="text">有效期:不限</view>
44 44 </view>
45   - <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}}
  45 + <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}}
46 46 </view>
47 47  
48 48 </view>
... ...