Commit 4277d040a634297e43632b8ffefc769ee87a4374

Authored by yvan.ni
1 parent d821c6ce

显示提示语

components/my_confirm/my_confirm.js
@@ -10,6 +10,8 @@ Component({ @@ -10,6 +10,8 @@ Component({
10 title: null, //标题 10 title: null, //标题
11 s_text: null, //确定的提示语 11 s_text: null, //确定的提示语
12 c_text: null, //取消的提示语 12 c_text: null, //取消的提示语
  13 +
  14 + is_show_txt:0,
13 }, 15 },
14 16
15 methods: { 17 methods: {
@@ -22,6 +24,18 @@ Component({ @@ -22,6 +24,18 @@ Component({
22 }) 24 })
23 this.data.success = success; 25 this.data.success = success;
24 this.data.cancle = cancle; 26 this.data.cancle = cancle;
  27 +
  28 +
  29 + var ck1=content.indexOf('购买该礼包');
  30 + var ck2=content.indexOf('兑换该礼包');
  31 + var ck3=content.indexOf('领取该礼包');
  32 +
  33 + if(ck1 || ck2 || ck3){
  34 + this.setData({
  35 + is_show_txt:1
  36 + })
  37 + }
  38 +
25 }, 39 },
26 open_cancel: function (yu_e_show){ 40 open_cancel: function (yu_e_show){
27 this.setData({ 41 this.setData({
components/my_confirm/my_confirm.wxml
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 <view style="position: relative"> 6 <view style="position: relative">
7 <view class="shut" bindtap="close_yu_e">ⅹ</view> 7 <view class="shut" bindtap="close_yu_e">ⅹ</view>
8 <view class="fs32 xc-black3 flex jc-center ai-center" style="padding: 10rpx 20rpx;min-height:220rpx;"><text>{{title}}</text></view> 8 <view class="fs32 xc-black3 flex jc-center ai-center" style="padding: 10rpx 20rpx;min-height:220rpx;"><text>{{title}}</text></view>
  9 + <view class="fs24" style="color:#ff1a34;position: relative; left:20rpx;top:-20rpx">注:礼包采用虚拟发货形式,支付成功后即到账。</view>
9 <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;"> 10 <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;">
10 <view bindtap="go_sure" class="fs30 white flex jc-center ai-center ck_btn" style="margin-right: 20rpx;background:#ececea;">{{s_text}}</view> 11 <view bindtap="go_sure" class="fs30 white flex jc-center ai-center ck_btn" style="margin-right: 20rpx;background:#ececea;">{{s_text}}</view>
11 <view bindtap='go_cancle' class="fs30 xc-ash flex jc-center ai-center ck_btn color" >{{c_text}}</view> 12 <view bindtap='go_cancle' class="fs30 xc-ash flex jc-center ai-center ck_btn color" >{{c_text}}</view>
packageE/pages/user/monthgiftbag/public/buy_com.wxml
@@ -252,6 +252,7 @@ @@ -252,6 +252,7 @@
252 </view> 252 </view>
253 </block> 253 </block>
254 <block wx:else> 254 <block wx:else>
  255 + <view class="fs28" style="padding:0 18rpx;color:#ff1a34">注:礼包采用虚拟发货形式,支付成功后即到账。</view>
255 <button bindtap="buy_libao" disabled="{{submit}}" style="display: block" class="spec-cart-btn {{buyType==2?'yellow':'red-b'}} fs32" data-action="add"> 256 <button bindtap="buy_libao" disabled="{{submit}}" style="display: block" class="spec-cart-btn {{buyType==2?'yellow':'red-b'}} fs32" data-action="add">
256 <text wx:if="{{buyType==1}}">立即兑换</text> 257 <text wx:if="{{buyType==1}}">立即兑换</text>
257 <text wx:if="{{buyType==2}}">立即购买</text> 258 <text wx:if="{{buyType==2}}">立即购买</text>
pages/giftpack/public/buy_com.wxml
@@ -246,6 +246,9 @@ @@ -246,6 +246,9 @@
246 </view> 246 </view>
247 </block> 247 </block>
248 <block wx:else> 248 <block wx:else>
  249 +
  250 + <view class="fs28" style="padding:0 18rpx;color:#ff1a34">注:礼包采用虚拟发货形式,支付成功后即到账。</view>
  251 +
249 <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">
250 <text wx:if="{{buyType==1}}">立即兑换</text> 253 <text wx:if="{{buyType==1}}">立即兑换</text>
251 <text wx:if="{{buyType==2}}">立即购买</text> 254 <text wx:if="{{buyType==2}}">立即购买</text>