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

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