wxd / MShopWeApp

Commit 039f96923a06aed753c4f26fca01703b14d65f7b

Authored by taiyuan
1 parent e06eabe1

优惠券修改

Inline Side-by-side
Showing 1 changed file with 15 additions and 9 deletions
packageB/pages/coupons/query/index.wxml
  View file @039f969
@@ -63,23 +63,22 @@ @@ -63,23 +63,22 @@
63 <block wx:if="{{detail.isby}}"> 63 <block wx:if="{{detail.isby}}">
64 <view class="coupon"> 64 <view class="coupon">
65 <view class="flex"> 65 <view class="flex">
66 - <view class="c-l"><text class="rmb fs40">20</text></view> 66 + <view class="c-l"><text class="fs40">包邮券</text></view>
67 <view class="c-r dash"> 67 <view class="c-r dash">
68 <view class="flex jc_sb ai_c"> 68 <view class="flex jc_sb ai_c">
69 <view class="pdr20"> 69 <view class="pdr20">
70 <view class="fs28 ellipsis-1x">包邮券</view> 70 <view class="fs28 ellipsis-1x">包邮券</view>
71 <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view> 71 <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view>
72 </view> 72 </view>
73 - <view class="shrink0"><text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.CashRepNo}}">{{filter.showBtnText(currentIndex)}}</text></view> 73 + <view class="shrink0"><text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.no}}">{{filter.showBtnText(currentIndex)}}</text></view>
74 </view> 74 </view>
75 <view class="c-time"> 75 <view class="c-time">
76 - <text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}}至{{ time.format_time(detail.use_end_time)}}</text> 76 + <text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}} 至 {{time.format_time(detail.use_end_time)}}</text>
77 <text wx:else>有效期:不限</text> 77 <text wx:else>有效期:不限</text>
78 </view> 78 </view>
79 </view> 79 </view>
80 </view> 80 </view>
81 </view> 81 </view>
82 - <!-- <view class="c-info arrow-down"> -->  
83 <view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}"> 82 <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> 83 <text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>
85 </view> 84 </view>
@@ -100,7 +99,7 @@ @@ -100,7 +99,7 @@
100 </view> 99 </view>
101 </view> 100 </view>
102 <view class="c-time"> 101 <view class="c-time">
103 - <text wx:if="{{detail.ValidDate!=null}}" class="ellipsis-1x">有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}</text> 102 + <text wx:if="{{detail.ValidDate}}" class="ellipsis-1x">有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}</text>
104 <text wx:else>有效期:不限</text> 103 <text wx:else>有效期:不限</text>
105 </view> 104 </view>
106 </view> 105 </view>
@@ -154,15 +153,22 @@ @@ -154,15 +153,22 @@
154 <view class="popup-container" hidden="{{!showQr}}"> 153 <view class="popup-container" hidden="{{!showQr}}">
155 <view class="t-r pdb20"><text class="iconfont icon-close fs40" bindtap="closeQr"></text></view> 154 <view class="t-r pdb20"><text class="iconfont icon-close fs40" bindtap="closeQr"></text></view>
156 <view class="popup"> 155 <view class="popup">
157 - <view class="popup-title">{{filter.getNum(details[useIndex].Sum)}}元微券</view>  
158 - <view class="pdt20 c-fe0000"><text class="rmb fs80">{{filter.getNum(details[useIndex].Sum)}}</text></view> 156 + <view class="popup-title">
  157 + <block wx:if="{{details[useIndex].isby == 1}}">包邮券</block>
  158 + <block wx:else>
  159 + {{filter.getNum(details[useIndex].Sum)}}元微券
  160 + </block>
  161 + </view>
  162 + <view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view>
159 <!-- <img src="" alt="" class="img-qr"/> --> 163 <!-- <img src="" alt="" class="img-qr"/> -->
160 <view class="qr-container"> 164 <view class="qr-container">
161 <canvas class="qrcode" canvas-id="qrcode"/> 165 <canvas class="qrcode" canvas-id="qrcode"/>
162 </view> 166 </view>
163 - <view class="pdt20 pdb10 fs26">{{details[useIndex].CashRepNo}}</view> 167 + <view class="pdt20 pdb10 fs26" wx:if="{{details[useIndex].CashRepNo}}">{{details[useIndex].CashRepNo}}</view>
  168 + <view class="pdt20 pdb10 fs26" wx:else>{{details[useIndex].no}}</view>
164 <view class="pdv30 c-7b fs26 bdt"> 169 <view class="pdv30 c-7b fs26 bdt">
165 - <text wx:if="{{details[useIndex].ValidDate!=null}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text> 170 + <text wx:if="{{details[useIndex].ValidDate}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text>
  171 + <text wx:elif="{{details[useIndex].use_end_time}}" class="ellipsis-1x">有效期:{{details[useIndex].use_start_time==null ? " " : time.format_time(details[useIndex].use_start_time)}} 至 {{time.format_time(details[useIndex].use_end_time)}}</text>
166 <text wx:else>有效期:不限</text> 172 <text wx:else>有效期:不限</text>
167 </view> 173 </view>
168 </view> 174 </view>