diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index 6cb18e8d..7ffd491a 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -203,21 +203,23 @@ - - - - {{ item.name }} - {{ item.tips }} - - - + + + + + {{ item.name }} + {{ item.tips }} + + + + - + - + @@ -229,7 +231,7 @@ - + @@ -361,7 +363,9 @@ data_list_loding_msg: '', params: null, payment_list: [], - payment_index: 0, + payment_index: -1, + payment_id: 0, + payment_type: 'system-pay', goods_list: [], address: null, address_id: null, @@ -404,7 +408,7 @@ plugins_freightfee_choice_data: {}, // 虚拟币 plugins_coin_data: null, - plugins_coin_choice_index: -1, + plugins_coin_index: -1, plugins_coin_more_control: true, // 支付弹窗参数 @@ -534,7 +538,8 @@ }); var data = this.params; data['address_id'] = this.address_id; - data['payment_id'] = this.payment_id; + data['payment_id'] = this.payment_id; + data['payment_type'] = this.payment_type; data['site_model'] = this.site_model; uni.request({ url: app.globalData.get_request_url('index', 'buy'), @@ -551,8 +556,21 @@ this.setData({ currency_symbol: data.currency_symbol || app.globalData.currency_symbol(), payment_list: data.payment_list || [], - payment_id: data.default_payment_id || '', - }); + payment_id: data.default_payment_id || 0, + payment_type: data.default_payment_type || 'system-pay', + }); + + // 支付选中索引 + if(this.payment_list.length > 0 && parseInt(this.payment_id) > 0 && this.payment_type == 'system-pay') { + for(var i in this.payment_list) { + if(this.payment_id == this.payment_list[i]['id']) { + this.setData({ + payment_index: i + }); + break; + } + } + } // 订单是否已提交、直接进入支付页面 if ((data.is_order_submit || 0) == 1) { @@ -773,7 +791,8 @@ // 表单数据 var data = this.params; data['address_id'] = this.address_id; - data['payment_id'] = this.payment_id; + data['payment_id'] = this.payment_id; + data['payment_type'] = this.payment_type; data['user_note'] = this.user_note_value; data['site_model'] = this.site_model; @@ -883,22 +902,26 @@ // 支付方式选择 payment_event(e) { - if (e.currentTarget.dataset.type == '1') { - this.setData({ - payment_index: e.currentTarget.dataset.index, - plugins_coin_choice_index: -1, - }); - } else { - this.setData({ - payment_index: -1, - plugins_coin_choice_index: e.currentTarget.dataset.index, - }); - } this.setData({ - payment_id: e.currentTarget.dataset.value, + payment_id: e.currentTarget.dataset.value, + payment_type: 'system-pay', + payment_index: e.currentTarget.dataset.index, + plugins_coin_index: -1, }); this.init(); - }, + }, + + // 虚拟币支付方式选择 + coin_payment_event(e) { + this.setData({ + payment_id: e.currentTarget.dataset.value, + payment_type: 'plugins-coin', + plugins_coin_index: e.currentTarget.dataset.index, + payment_index: -1, + }); + this.init(); + }, + // 展开更多 change_coin_more_event() { this.setData({