Commit 624f9d29f17bae4e59a91fe89002fb82b7f48902

Authored by WXD-SEASON\season
1 parent 764943e4

120705

packageD/pages/user/coupons/coupons.wxml
... ... @@ -46,7 +46,8 @@
46 46 <view class="c-r dash">
47 47 <view class="flex jc_sb ai_c">
48 48 <view class="pdr20">
49   - <view class="fs28 ellipsis-1x">{{filter.getNum(detail.Sum)}}元微券</view>
  49 + <view class="fs28 ellipsis-1x" wx:if="{{detail.ActName}}">{{detail.ActName}}</view>
  50 + <view class="fs28 ellipsis-1x" wx:else>{{filter.getNum(detail.Sum)}}元微券</view>
50 51 <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: {{detail.SendMan==null?'线下发放':detail.SendMan==''?"线下发放":detail.SendMan}}</view>
51 52 </view>
52 53 <view class="shrink0">
... ... @@ -117,8 +118,9 @@
117 118 <view class="popup">
118 119 <view class="popup-title">
119 120 <block wx:if="{{details[useIndex].isby == 1}}">包邮券</block>
  121 + <block wx:if="{{details[useIndex].ActName}}">{{details[useIndex].ActName}}</block>
120 122 <block wx:else>
121   - {{filter.getNum(details[useIndex].Sum)}}元微券
  123 + {{filter.getNum(details[useIndex].Sum)}}元微券
122 124 </block>
123 125 </view>
124 126 <!-- <view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view> -->
... ...