diff --git a/pages/buy/buy.css b/pages/buy/buy.css
index ee7a8fb6..281ae7dc 100644
--- a/pages/buy/buy.css
+++ b/pages/buy/buy.css
@@ -69,21 +69,10 @@
/**
* 支付方式
*/
-.payment-list .item {
- width: calc(50% - 10rpx);
-}
-.payment-list .item:nth-child(2n) {
- float: right;
-}
-.payment-list .item:nth-child(2n+1) {
- float: left;
-}
.payment-list .item-content {
- padding: 0 10rpx;
- height: 80rpx;
- line-height: 80rpx;
+ padding: 40rpx 0;
}
-.payment-list .item-content image {
+.payment-list .item-content .icon {
width: 50rpx;
height: 50rpx !important;
}
@@ -92,8 +81,7 @@
line-height: 32rpx;
display: inline-block;
position: absolute;
- top: -16rpx;
- right: 0;
+ top: 12rpx;
color: #fff;
padding: 0 12rpx;
border-radius: 16rpx 0 16rpx 0;
@@ -140,15 +128,15 @@
/**
* 数据列表项
*/
-.buy-data-item,
+.buy-data-item,
.buy-data-item .right-value {
line-height: 80rpx;
}
.buy-data-item .right-value {
width: calc(100% - 260rpx);
-}
-.buy-data-item .right-value .right-value-content {
- width: calc(100% - 32rpx);
+}
+.buy-data-item .right-value .right-value-content {
+ width: calc(100% - 32rpx);
}
/*
@@ -191,21 +179,21 @@
}
.plugins-points-buy-container .desc {
color: #F37B1D;
-}
-
-.plugins-points-use-value {
- border-top-right-radius: 0 !important;
- border-bottom-right-radius: 0 !important;
- width: 130rpx;
- height: 38rpx;
- line-height: 38rpx;
-}
-
-.plugins-points-use-submit {
- border-top-left-radius: 0 !important;
- border-bottom-left-radius: 0 !important;
- height: 42rpx !important;
- line-height: 42rpx !important;
+}
+
+.plugins-points-use-value {
+ border-top-right-radius: 0 !important;
+ border-bottom-right-radius: 0 !important;
+ width: 130rpx;
+ height: 38rpx;
+ line-height: 38rpx;
+}
+
+.plugins-points-use-submit {
+ border-top-left-radius: 0 !important;
+ border-bottom-left-radius: 0 !important;
+ height: 42rpx !important;
+ line-height: 42rpx !important;
}
/**
@@ -254,12 +242,12 @@
background: #dfdfdf !important;
color: #c0c0c0 !important;
cursor: no-drop !important;
-}
-
-
-/**
- * 留言快捷选择 - 智能工具箱
- */
-.plugins-intellectstools-data-note-fast .note-fast-data-list {
- width: calc(100% - 112rpx);
+}
+
+
+/**
+ * 留言快捷选择 - 智能工具箱
+ */
+.plugins-intellectstools-data-note-fast .note-fast-data-list {
+ width: calc(100% - 112rpx);
}
\ No newline at end of file
diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
index 5e9961bf..0da37a8b 100644
--- a/pages/buy/buy.vue
+++ b/pages/buy/buy.vue
@@ -47,7 +47,7 @@
- {{$t('buy.buy.o7722q')}}
+ {{ $t('buy.buy.o7722q') }}
@@ -65,13 +65,13 @@
{{ spec.value }}
-
+
- {{ item.show_price_symbol }}{{ item.price }}
- {{ item.show_price_unit }}
-
+ {{ item.show_price_symbol }}{{ item.price }}
+ {{ item.show_price_unit }}
+
- {{ item.show_original_price_symbol }}{{ item.original_price }}{{ item.show_original_price_unit }}
+ {{ item.show_original_price_symbol }}{{ item.original_price }}{{ item.show_original_price_unit }}
x{{ item.stock }}
@@ -82,24 +82,24 @@
-
-
-
- {{$t('buy.buy.876tgh')}}
-
-
-
- {{ group.plugins_freightfee_data.default.fee_name }}
-
-
-
-
-
-
+
+
+
+ {{ $t('buy.buy.876tgh') }}
+
+
+
+ {{ group.plugins_freightfee_data.default.fee_name }}
+
+
+
+
+
+
- {{$t('buy.buy.45ovhs')}}
+ {{ $t('buy.buy.45ovhs') }}
{{ (plugins_choice_coupon_value || null) != null && (plugins_choice_coupon_value[group.id] || null) != null ? plugins_choice_coupon_value[group.id] : $t('buy.buy.553mxo') }}
@@ -111,7 +111,7 @@
- {{$t('buy.buy.58rs1a')}}
+ {{ $t('buy.buy.58rs1a') }}
x{{ item.stock }}
@@ -125,10 +125,10 @@
-
+
{{ item.name }}
- {{ item.tips }}
+ {{ item.tips }}
@@ -142,28 +142,28 @@
- {{$t('buy.buy.33fugm')}}{{ plugins_points_data.use_integral }}{{$t('buy.buy.6e4181')}}
+ {{ $t('buy.buy.33fugm') }}{{ plugins_points_data.use_integral }}{{ $t('buy.buy.6e4181') }}
- {{$t('buy.buy.33fugm')}}
+ {{ $t('buy.buy.33fugm') }}
-
- {{$t('buy.buy.4di4i2')}}
-
+
+ {{ $t('buy.buy.4di4i2') }}
+
- -{{ currency_symbol }}{{ plugins_points_data.discount_price }}
-
+ -{{ currency_symbol }}{{ plugins_points_data.discount_price }}
+
-
+
- {{$t('buy.buy.q800ri')}}{{ plugins_points_data.user_integral }}{{$t('buy.buy.w96878')}}
- {{$t('buy.buy.q800ri')}}{{ plugins_points_data.user_integral }}{{$t('buy.buy.186cxy')}}{{ plugins_points_data.use_integral }}{{$t('buy.buy.w96878')}}
+ {{ $t('buy.buy.q800ri') }}{{ plugins_points_data.user_integral }}{{ $t('buy.buy.w96878') }}
+ {{ $t('buy.buy.q800ri') }}{{ plugins_points_data.user_integral }}{{ $t('buy.buy.186cxy') }}{{ plugins_points_data.use_integral }}{{ $t('buy.buy.w96878') }}
- {{$t('buy.buy.q800ri')}}{{ plugins_points_data.user_integral }}{{$t('buy.buy.t04z1o')}}
+ {{ $t('buy.buy.q800ri') }}{{ plugins_points_data.user_integral }}{{ $t('buy.buy.t04z1o') }}
@@ -189,7 +189,7 @@
{{ user_note_value || $t('buy.buy.2rhko1') }}
- {{$t('buy.buy.q7jq76')}}
+ {{ $t('buy.buy.q7jq76') }}
@@ -201,12 +201,44 @@
-
-
-
-
- {{ item.name }}
- {{ item.tips }}
+
+
+
+
+
+ {{ item.name }}
+ {{ item.tips }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+ {{ item.name }}
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ payment_list_control ? '展开更多' : '收起更多' }}
+
+
+
@@ -215,11 +247,11 @@
- {{$t('buy.buy.wx78ju')}}
+ {{ $t('buy.buy.wx78ju') }}
{{ currency_symbol }}{{ total_price }}
-
+
@@ -238,7 +270,7 @@
- {{$t('buy.buy.2c3i88')}}
+ {{ $t('buy.buy.2c3i88') }}
@@ -272,7 +304,7 @@
- {{$t('buy.buy.8vqfp3')}}
+ {{ $t('buy.buy.8vqfp3') }}
@@ -280,17 +312,17 @@
{{ item.valid_number }}
- {{$t('buy.buy.0pgsrm')}}
+ {{ $t('buy.buy.0pgsrm') }}
{{ item.name }}
{{ item.describe }}
- {{ item.start_time }}{{$t('buy.buy.70u2vy')}}{{ item.end_time }}
+ {{ item.start_time }}{{ $t('buy.buy.70u2vy') }}{{ item.end_time }}
- {{$t('buy.buy.g2vt78')}}
+ {{ $t('buy.buy.g2vt78') }}
- {{$t('buy.buy.inyxpx')}}
+ {{ $t('buy.buy.inyxpx') }}
@@ -323,6 +355,9 @@
data_list_loding_msg: '',
params: null,
payment_list: [],
+ payment_index: 0,
+ payment_coin_index: -1,
+ payment_list_control: true,
goods_list: [],
address: null,
address_id: null,
@@ -360,8 +395,8 @@
popup_plugins_realstore_group_id: 0,
popup_plugins_realstore_card_index: 0,
// 智能工具箱
- plugins_intellectstools_data: null,
- // 运费
+ plugins_intellectstools_data: null,
+ // 运费
plugins_freightfee_choice_data: {},
// 支付弹窗参数
@@ -549,22 +584,22 @@
disabled: temp_dt.disabled || '',
// 未选择错误提示
error_msg: temp_dt.error_msg || this.$t('buy.buy.q8u066'),
- };
-
- // 商品数据处理
- var goods_list = data.goods_list;
- for(var i in goods_list) {
- // 扩展数据处理，
- var temp_extension_data = [];
- if((goods_list[i]['order_base'] || null) != null && (goods_list[i]['order_base']['extension_data'] || null) != null) {
- var temp_ext = goods_list[i]['order_base']['extension_data'];
- for(var t in temp_ext) {
- if(temp_ext[t]['is_buy_show'] == undefined || temp_ext[t]['is_buy_show'] == 1) {
- temp_extension_data.push(temp_ext[t]);
- }
- }
- }
- goods_list[i]['order_base']['extension_data'] = temp_extension_data;
+ };
+
+ // 商品数据处理
+ var goods_list = data.goods_list;
+ for (var i in goods_list) {
+ // 扩展数据处理，
+ var temp_extension_data = [];
+ if ((goods_list[i]['order_base'] || null) != null && (goods_list[i]['order_base']['extension_data'] || null) != null) {
+ var temp_ext = goods_list[i]['order_base']['extension_data'];
+ for (var t in temp_ext) {
+ if (temp_ext[t]['is_buy_show'] == undefined || temp_ext[t]['is_buy_show'] == 1) {
+ temp_extension_data.push(temp_ext[t]);
+ }
+ }
+ }
+ goods_list[i]['order_base']['extension_data'] = temp_extension_data;
}
// 设置数据
@@ -645,14 +680,14 @@
},
// 请求参数合并
- request_data_ext_params_merge(data) {
- // 运费
- var fee = this.plugins_freightfee_choice_data || null;
- if(fee != null) {
- for (var i in fee) {
- data['freightfee_id_' + i] = fee[i];
- }
- }
+ request_data_ext_params_merge(data) {
+ // 运费
+ var fee = this.plugins_freightfee_choice_data || null;
+ if (fee != null) {
+ for (var i in fee) {
+ data['freightfee_id_' + i] = fee[i];
+ }
+ }
// 优惠券
var coupon_ids = this.plugins_use_coupon_ids;
@@ -843,11 +878,28 @@
// 支付方式选择
payment_event(e) {
+ if (e.currentTarget.dataset.type == '1') {
+ this.setData({
+ payment_index: e.currentTarget.dataset.index,
+ payment_coin_index: -1,
+ });
+ } else {
+ this.setData({
+ payment_index: -1,
+ payment_coin_index: e.currentTarget.dataset.index,
+ });
+ }
this.setData({
payment_id: e.currentTarget.dataset.value,
});
this.init();
},
+ // 展开更多
+ change_coin_more_event() {
+ this.setData({
+ payment_list_control: !this.payment_list_control,
+ });
+ },
// 优惠劵弹层开启
plugins_coupon_open_event(e) {
@@ -858,7 +910,7 @@
// 选中处理
if (temp_list.length > 0) {
for (var i in temp_list) {
- temp_list[i]['is_active'] = (coupon_choice || null) !== null && (coupon_choice.id == temp_list[i]['id']) ? 1 : 0;
+ temp_list[i]['is_active'] = (coupon_choice || null) !== null && coupon_choice.id == temp_list[i]['id'] ? 1 : 0;
}
}
this.setData({
@@ -921,16 +973,16 @@
});
this.init();
}
- },
-
- // 运费选择事件
- plugins_freightfee_change_event(e) {
- var temp = this.plugins_freightfee_choice_data;
- temp[e.currentTarget.dataset.wid] = parseInt(e.detail.value);
- this.setData({
- plugins_freightfee_choice_data: temp,
- });
- this.init();
+ },
+
+ // 运费选择事件
+ plugins_freightfee_change_event(e) {
+ var temp = this.plugins_freightfee_choice_data;
+ temp[e.currentTarget.dataset.wid] = parseInt(e.detail.value);
+ this.setData({
+ plugins_freightfee_choice_data: temp,
+ });
+ this.init();
},
// 地址选择事件