wxd / MShopWeApp

Commit 83ecf95c20cf4b9b3e81dba8a2d4eea075f437be

Authored by yvan.ni
2 parents f2c47ac3 81ea86bb

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

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
pages/user/coupons/query/index.wxml
  View file @83ecf95
... ... @@ -102,7 +102,7 @@
102 102 <view wx:else>
103 103 <view class="text">有效期: 不限</view>
104 104 </view>
105   - <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}}
  105 + <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{detail.UseObjectID==null || detail.UseObjectID==''?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用{{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
106 106 </view>
107 107 </view>
108 108 </view>
... ...
pages/user/integral/integral.wxml
  View file @83ecf95
... ... @@ -38,8 +38,8 @@
38 38 <view class='time'>{{details.BillDate}}</view>
39 39 </view>
40 40 </view>
41   - <view class="val" style='color:{{(details.InIntegral!="0")?"green":""}}'>
42   - {{(details.OutIntegral==0)?"+":"-"}}{{(details.InIntegral==0)?details.OutIntegral:details.InIntegral}}积分 </view>
  41 + <view class="val" style='color:{{(details.InOutInt>0)?"green":""}}'>
  42 + {{(details.InOutInt>0)?"+":""}}{{filter.getNum(details.InOutInt)}}积分 </view>
43 43 </view>
44 44 <view style="clear:both"></view>
45 45 </block>
... ...