|
|
@@ -75,6 +75,7 @@ export default {
|
|
|
checkedAuto: 0, //判断是否为自动拼团
|
|
|
topify: '',
|
|
|
is_drop: '',
|
|
|
+ mer_id:'',//商户id
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -87,6 +88,7 @@ export default {
|
|
|
if(options.isdrop) {
|
|
|
this.is_drop = options.isdrop
|
|
|
}
|
|
|
+ this.mer_id = options.mer_id
|
|
|
this.checkedAuto = options.checked || 0;
|
|
|
this.topify = options.topify || 0;
|
|
|
if (options.type == 1) {
|
|
|
@@ -101,7 +103,7 @@ export default {
|
|
|
couponId: prepage.couponChecked.id, //优惠券编号
|
|
|
addressId: prepage.addressData.id, //地址编号
|
|
|
useIntegral: prepage.checkedPoints ? 1 : 0,
|
|
|
- is_drop: this.is_drop
|
|
|
+ is_drop: this.is_drop,
|
|
|
}).then(({ data }) => {
|
|
|
// 获取支付金额
|
|
|
this.money = data.result.pay_price;
|
|
|
@@ -154,7 +156,8 @@ export default {
|
|
|
from: 'app', //来源
|
|
|
// #endif
|
|
|
paytype: obj.payName ,//支付类型 weixin-微信 yue-余额
|
|
|
- is_drop: obj.is_drop
|
|
|
+ is_drop: obj.is_drop,
|
|
|
+ mer_id: obj.mer_id
|
|
|
})
|
|
|
.then(e => {
|
|
|
console.log(e,'zhifu+++++++++')
|
|
|
@@ -285,7 +288,8 @@ export default {
|
|
|
shipping_type: 1, //提货方式 1 快递 2自提
|
|
|
automatic: obj.checkedAuto,
|
|
|
topify: this.topify,
|
|
|
- is_drop: obj.is_drop
|
|
|
+ is_drop: obj.is_drop,
|
|
|
+ mer_id: obj.mer_id
|
|
|
};
|
|
|
// 判断是否拼团商品
|
|
|
if (obj.pinkid) {
|
