Commit 7e17dbd020a819aa7e8ab7cf3bf12182a0f296f7
1 parent
f6452c96
1. 预存的功能优化
Showing
4 changed files
with
21 additions
and
7 deletions
packageA/pages/chongzhi/chongzhi.wxml
| @@ -28,8 +28,8 @@ | @@ -28,8 +28,8 @@ | ||
| 28 | </view> | 28 | </view> |
| 29 | </view> | 29 | </view> |
| 30 | <!-- 下 --> | 30 | <!-- 下 --> |
| 31 | - <view class="bottom" wx:if="{{currentIndex == 0}}" catchtap="viewDetails" data-index="{{index}}" > | ||
| 32 | - <text class="btn" >立即使用</text> | 31 | + <view class="bottom" wx:if="{{currentIndex == 0}}" > |
| 32 | + <text catchtap="viewDetails" data-index="{{index}}" class="btn" >立即使用</text> | ||
| 33 | </view> | 33 | </view> |
| 34 | </view> | 34 | </view> |
| 35 | </block> | 35 | </block> |
packageA/pages/chongzhiDetails/chongzhiDetails.js
| 1 | // packageA//pages/chongzhiDetails/chongzhiDetails.js | 1 | // packageA//pages/chongzhiDetails/chongzhiDetails.js |
| 2 | var util = require('../../../utils/util.js'); | 2 | var util = require('../../../utils/util.js'); |
| 3 | const app = getApp(),os = app.globalData.setting; | 3 | const app = getApp(),os = app.globalData.setting; |
| 4 | +var regeneratorRuntime = require('../../../utils/runtime.js'); | ||
| 4 | 5 | ||
| 5 | Page({ | 6 | Page({ |
| 6 | 7 | ||
| @@ -13,6 +14,7 @@ Page({ | @@ -13,6 +14,7 @@ Page({ | ||
| 13 | show_img:null, | 14 | show_img:null, |
| 14 | url: app.globalData.setting.imghost, | 15 | url: app.globalData.setting.imghost, |
| 15 | type:0, //0是立即充值 1是购买后的 | 16 | type:0, //0是立即充值 1是购买后的 |
| 17 | + is_buying:0, | ||
| 16 | }, | 18 | }, |
| 17 | 19 | ||
| 18 | /** | 20 | /** |
| @@ -106,6 +108,8 @@ Page({ | @@ -106,6 +108,8 @@ Page({ | ||
| 106 | 108 | ||
| 107 | //-- 确定充值 -- | 109 | //-- 确定充值 -- |
| 108 | go_buy: function(e) { | 110 | go_buy: function(e) { |
| 111 | + if(this.data.is_buying) return false; | ||
| 112 | + this.data.is_buying=1; | ||
| 109 | 113 | ||
| 110 | var money = e.target.dataset.money; | 114 | var money = e.target.dataset.money; |
| 111 | var advance = e.target.dataset.advance; | 115 | var advance = e.target.dataset.advance; |
| @@ -132,6 +136,11 @@ Page({ | @@ -132,6 +136,11 @@ Page({ | ||
| 132 | } | 136 | } |
| 133 | }).then(res => { | 137 | }).then(res => { |
| 134 | console.log(res); | 138 | console.log(res); |
| 139 | + this.data.is_buying=0; | ||
| 140 | + if(res.data.code!=0){ | ||
| 141 | + getApp().confirmBox(res.data.msg); | ||
| 142 | + return false; | ||
| 143 | + } | ||
| 135 | 144 | ||
| 136 | 145 | ||
| 137 | var msg = res.data.data; | 146 | var msg = res.data.data; |
pages/user/deposit/prepaid/prepaid.js
| @@ -44,6 +44,10 @@ Page({ | @@ -44,6 +44,10 @@ Page({ | ||
| 44 | var money = e.target.dataset.name; | 44 | var money = e.target.dataset.name; |
| 45 | var s = e.target.dataset.money; | 45 | var s = e.target.dataset.money; |
| 46 | var advancek = e.target.dataset.advance; | 46 | var advancek = e.target.dataset.advance; |
| 47 | + | ||
| 48 | + var item_type=e.target.dataset.item_type; | ||
| 49 | + this.data.item_type=item_type; | ||
| 50 | + | ||
| 47 | console.log("sss", e.target.dataset.name); | 51 | console.log("sss", e.target.dataset.name); |
| 48 | this.setData({ | 52 | this.setData({ |
| 49 | showModal: true | 53 | showModal: true |
| @@ -76,7 +80,8 @@ Page({ | @@ -76,7 +80,8 @@ Page({ | ||
| 76 | var moneyone = e.target.dataset.moneyone; | 80 | var moneyone = e.target.dataset.moneyone; |
| 77 | var money = e.target.dataset.money; | 81 | var money = e.target.dataset.money; |
| 78 | var advancek = e.target.dataset.adv; | 82 | var advancek = e.target.dataset.adv; |
| 79 | - console.log(moneyone, "aaa", money); | 83 | + //console.log(moneyone, "aaa", money); |
| 84 | + | ||
| 80 | this.recharge(money, advancek); | 85 | this.recharge(money, advancek); |
| 81 | }, | 86 | }, |
| 82 | //确定接口 | 87 | //确定接口 |
| @@ -85,6 +90,8 @@ Page({ | @@ -85,6 +90,8 @@ Page({ | ||
| 85 | var user_id = getApp().globalData.user_id; | 90 | var user_id = getApp().globalData.user_id; |
| 86 | var store_id = os.stoid; | 91 | var store_id = os.stoid; |
| 87 | var recharge_type = 0; | 92 | var recharge_type = 0; |
| 93 | + if(this.data.item_type==2) recharge_type=6; | ||
| 94 | + | ||
| 88 | var buynum = 1; | 95 | var buynum = 1; |
| 89 | console.log(money, "有进来吗预存劵", advancek, user_id, store_id ); | 96 | console.log(money, "有进来吗预存劵", advancek, user_id, store_id ); |
| 90 | var e = this, | 97 | var e = this, |
pages/user/deposit/prepaid/prepaid.wxml
| @@ -12,10 +12,8 @@ | @@ -12,10 +12,8 @@ | ||
| 12 | </view> | 12 | </view> |
| 13 | <view class="right">备注: | 13 | <view class="right">备注: |
| 14 | <view class="">{{perpaid.ItemName}}</view> | 14 | <view class="">{{perpaid.ItemName}}</view> |
| 15 | - <view wx:if="{{perpaid.ItemType==1}}" class="ljcz" bindtap="submit" data-name="{{perpaid.BeginSum}}" | ||
| 16 | - data-advance="{{perpaid.AdvanceItemId}}" data-money="{{perpaid.NewSum}}">立即充值</view> | ||
| 17 | - | ||
| 18 | - <view wx:if="{{perpaid.ItemType==2}}" class="ljcz" bindtap="go_detail" data-advance="{{perpaid.AdvanceItemId}}">立即充值</view> | 15 | + <view class="ljcz" bindtap="submit" data-name="{{perpaid.BeginSum}}" data-item_type="{{perpaid.ItemType}}" |
| 16 | + data-advance="{{perpaid.AdvanceItemId}}" data-money="{{perpaid.NewSum}}">立即充值</view> | ||
| 19 | </view> | 17 | </view> |
| 20 | </view> | 18 | </view> |
| 21 | 19 |