Commit 1ea7d9d3f9861c11052b3666c74075a5984cc571
Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp
Showing
3 changed files
with
5 additions
and
2 deletions
packageF/pages/giftpack/buygiftpack/giftpackbuy.js
packageF/pages/giftpack/giftpacklist/giftpacklist.js
| @@ -79,6 +79,8 @@ Page({ | @@ -79,6 +79,8 @@ Page({ | ||
| 79 | is_detail:1, //是详情页面的购买 | 79 | is_detail:1, //是详情页面的购买 |
| 80 | keyword:'', //门店搜索 | 80 | keyword:'', //门店搜索 |
| 81 | sec_i:-1,//选中分类门店 下标 | 81 | sec_i:-1,//选中分类门店 下标 |
| 82 | + | ||
| 83 | + is_gift_buy:1, //显示购买的备注 | ||
| 82 | }, | 84 | }, |
| 83 | onLoad: function (options) { | 85 | onLoad: function (options) { |
| 84 | if(options.transfer){ | 86 | if(options.transfer){ |
pages/giftpack/public/buy_com.wxml
| @@ -247,7 +247,7 @@ | @@ -247,7 +247,7 @@ | ||
| 247 | </block> | 247 | </block> |
| 248 | <block wx:else> | 248 | <block wx:else> |
| 249 | 249 | ||
| 250 | - <view class="fs28" style="padding:0 18rpx;color:#ff1a34">注：礼包采用虚拟发货形式，支付成功后即到账。</view> | 250 | + <view wx:if="{{is_gift_buy}}" class="fs28" style="padding:0 18rpx;color:#ff1a34">注：礼包采用虚拟发货形式，支付成功后即到账。</view> |
| 251 | 251 | ||
| 252 | <button bindtap="buy_libao" disabled="{{submit}}" style="display: block" class="spec-cart-btn {{buyType==2?'yellow':'red-b'}} fs32" data-action="add"> | 252 | <button bindtap="buy_libao" disabled="{{submit}}" style="display: block" class="spec-cart-btn {{buyType==2?'yellow':'red-b'}} fs32" data-action="add"> |
| 253 | <text wx:if="{{buyType==1}}">立即兑换</text> | 253 | <text wx:if="{{buyType==1}}">立即兑换</text> |