Commit dafec6292b3162394675578bdd21f8e772d42a7a
1 parent
78622ca5
优惠券显示
Showing
2 changed files
with
5 additions
and
4 deletions
pages/user/coupons/coupons.wxml
| @@ -81,7 +81,8 @@ | @@ -81,7 +81,8 @@ | ||
| 81 | </view> | 81 | </view> |
| 82 | </view> | 82 | </view> |
| 83 | <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}"> | 83 | <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}"> |
| 84 | - <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text> | 84 | + <!--<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>--> |
| 85 | + <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}"><text style="margin-right: 15rpx">使用说明:</text>{{detail.Remark}}</text> | ||
| 85 | </view> | 86 | </view> |
| 86 | </block> | 87 | </block> |
| 87 | 88 | ||
| @@ -107,8 +108,8 @@ | @@ -107,8 +108,8 @@ | ||
| 107 | </view> | 108 | </view> |
| 108 | </view> | 109 | </view> |
| 109 | <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}"> | 110 | <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}"> |
| 110 | - <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1}}">{{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}};{{detail.Remark}}</text> | ||
| 111 | - <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else>使用说明: {{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}}</text> | 111 | + <view class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1!=''}}"><text style="margin-right: 15rpx">使用说明:</text>{{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}};{{detail.Remark1}}</view> |
| 112 | + <view class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else><text style="margin-right: 15rpx">使用说明:</text> {{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}}</view> | ||
| 112 | </view> | 113 | </view> |
| 113 | </block> | 114 | </block> |
| 114 | </view> | 115 | </view> |
pages/user/coupons/filter.wxs
| @@ -14,7 +14,7 @@ var numFr = { | @@ -14,7 +14,7 @@ var numFr = { | ||
| 14 | while (s.length <= rs + 2) { | 14 | while (s.length <= rs + 2) { |
| 15 | s += '0'; | 15 | s += '0'; |
| 16 | } | 16 | } |
| 17 | - return s; | 17 | + return f; |
| 18 | }, | 18 | }, |
| 19 | showBtnText: function(index) { | 19 | showBtnText: function(index) { |
| 20 | switch(index) { | 20 | switch(index) { |