Commit 0e77eba8a1ba704b6883f719d253180aba238b77
Merge branch 'dev_oa_luo43' into dev
Showing
9 changed files
with
58 additions
and
9 deletions
packageE/pages/user/monthgiftbag/payment/payment.js
| @@ -21,8 +21,22 @@ Page({ | @@ -21,8 +21,22 @@ Page({ | ||
| 21 | }); | 21 | }); |
| 22 | var money = parseFloat(options.money).toFixed(2), order_sn = options.order_sn; | 22 | var money = parseFloat(options.money).toFixed(2), order_sn = options.order_sn; |
| 23 | this.setData({allmoney:money,order_sn:order_sn}) | 23 | this.setData({allmoney:money,order_sn:order_sn}) |
| 24 | + // if (money*1 > 0) { | ||
| 25 | + // var encourage = this.selectComponent("#encourage"); //组件的id | ||
| 26 | + // if (encourage){ | ||
| 27 | + // encourage.get_encourage(); | ||
| 28 | + // } | ||
| 29 | + // } | ||
| 30 | + }, | ||
| 31 | + onReady(){ | ||
| 32 | + // console.error(6666); | ||
| 33 | + if (this.data.allmoney*1 > 0) { | ||
| 34 | + var encourage = this.selectComponent("#encourage"); //组件的id | ||
| 35 | + if (encourage){ | ||
| 36 | + encourage.get_encourage(); | ||
| 37 | + } | ||
| 38 | + } | ||
| 24 | }, | 39 | }, |
| 25 | - | ||
| 26 | goto: function () { | 40 | goto: function () { |
| 27 | var url = '/pages/index/index/index'; | 41 | var url = '/pages/index/index/index'; |
| 28 | getApp().goto(url) | 42 | getApp().goto(url) |
packageE/pages/user/monthgiftbag/payment/payment.json
packageE/pages/user/monthgiftbag/payment/payment.wxml
| @@ -53,4 +53,8 @@ | @@ -53,4 +53,8 @@ | ||
| 53 | </view> | 53 | </view> |
| 54 | </view> | 54 | </view> |
| 55 | </view> | 55 | </view> |
| 56 | -</view> | ||
| 57 | \ No newline at end of file | 56 | \ No newline at end of file |
| 57 | +</view> | ||
| 58 | + | ||
| 59 | + | ||
| 60 | +<!-- 满足抽奖提醒 --> | ||
| 61 | +<show_encourage id="encourage"></show_encourage> | ||
| 58 | \ No newline at end of file | 62 | \ No newline at end of file |
packageG/pages/payment/pay_success/pay_success.js
| @@ -133,9 +133,13 @@ Page({ | @@ -133,9 +133,13 @@ Page({ | ||
| 133 | }; | 133 | }; |
| 134 | 134 | ||
| 135 | 135 | ||
| 136 | - | ||
| 137 | }, | 136 | }, |
| 138 | - | 137 | + onReady(){ |
| 138 | + var encourage = this.selectComponent("#encourage"); //组件的id | ||
| 139 | + if (encourage){ | ||
| 140 | + encourage.get_encourage(); | ||
| 141 | + } | ||
| 142 | + }, | ||
| 139 | goto: function() { | 143 | goto: function() { |
| 140 | var url= '/pages/index/index/index'; | 144 | var url= '/pages/index/index/index'; |
| 141 | getApp().goto(url) | 145 | getApp().goto(url) |
packageG/pages/payment/pay_success/pay_success.json
packageG/pages/payment/pay_success/pay_success.wxml
| @@ -148,4 +148,8 @@ | @@ -148,4 +148,8 @@ | ||
| 148 | 148 | ||
| 149 | <view class="shequn" style="margin-top:20rpx；" bindtap="gotoshequn" wx:if="{{banner}}" data-url="{{banner[0].ad_weapplink}}"> | 149 | <view class="shequn" style="margin-top:20rpx；" bindtap="gotoshequn" wx:if="{{banner}}" data-url="{{banner[0].ad_weapplink}}"> |
| 150 | <image src="{{banner[0].ad_code}}" mode="widthFix" style="width: 100%;border-radius: 15rpx;" /> | 150 | <image src="{{banner[0].ad_code}}" mode="widthFix" style="width: 100%;border-radius: 15rpx;" /> |
| 151 | -</view> | ||
| 152 | \ No newline at end of file | 151 | \ No newline at end of file |
| 152 | +</view> | ||
| 153 | + | ||
| 154 | + | ||
| 155 | +<!-- 满足抽奖提醒 --> | ||
| 156 | +<show_encourage id="encourage"></show_encourage> | ||
| 153 | \ No newline at end of file | 157 | \ No newline at end of file |
pages/giftpack/payment/payment.js
| @@ -21,6 +21,18 @@ Page({ | @@ -21,6 +21,18 @@ Page({ | ||
| 21 | }); | 21 | }); |
| 22 | var money = parseFloat(options.money), order_sn = options.order_sn; | 22 | var money = parseFloat(options.money), order_sn = options.order_sn; |
| 23 | this.setData({allmoney:money,order_sn:order_sn}) | 23 | this.setData({allmoney:money,order_sn:order_sn}) |
| 24 | + | ||
| 25 | + | ||
| 26 | + | ||
| 27 | + }, | ||
| 28 | + onReady(){ | ||
| 29 | + // console.error(6666); | ||
| 30 | + if (this.data.allmoney*1 > 0) { | ||
| 31 | + var encourage = this.selectComponent("#encourage"); //组件的id | ||
| 32 | + if (encourage){ | ||
| 33 | + encourage.get_encourage(); | ||
| 34 | + } | ||
| 35 | + } | ||
| 24 | }, | 36 | }, |
| 25 | 37 | ||
| 26 | goto: function () { | 38 | goto: function () { |
pages/giftpack/payment/payment.json
pages/giftpack/payment/payment.wxml
| @@ -54,4 +54,8 @@ | @@ -54,4 +54,8 @@ | ||
| 54 | </view> | 54 | </view> |
| 55 | </view> | 55 | </view> |
| 56 | </view> | 56 | </view> |
| 57 | -</view> | ||
| 58 | \ No newline at end of file | 57 | \ No newline at end of file |
| 58 | +</view> | ||
| 59 | + | ||
| 60 | + | ||
| 61 | +<!-- 满足抽奖提醒 --> | ||
| 62 | +<show_encourage id="encourage"></show_encourage> | ||
| 59 | \ No newline at end of file | 63 | \ No newline at end of file |