|
|
@ -2,7 +2,7 @@
|
|
|
|
* @Author: ch
|
|
|
|
* @Author: ch
|
|
|
|
* @Date: 2022-03-20 14:14:53
|
|
|
|
* @Date: 2022-03-20 14:14:53
|
|
|
|
* @LastEditors: ch
|
|
|
|
* @LastEditors: ch
|
|
|
|
* @LastEditTime: 2022-05-25 16:04:45
|
|
|
|
* @LastEditTime: 2022-05-26 14:31:36
|
|
|
|
* @Description: file content
|
|
|
|
* @Description: file content
|
|
|
|
-->
|
|
|
|
-->
|
|
|
|
<template>
|
|
|
|
<template>
|
|
|
@ -123,6 +123,7 @@ export default {
|
|
|
|
if(query.mode === 'cart'){
|
|
|
|
if(query.mode === 'cart'){
|
|
|
|
res = await ApiGetBeforeCartOrder({
|
|
|
|
res = await ApiGetBeforeCartOrder({
|
|
|
|
cartIds: query.ids,
|
|
|
|
cartIds: query.ids,
|
|
|
|
|
|
|
|
isVirtual :this.productType == 2 && true,
|
|
|
|
recipientAddressId : this.address.id
|
|
|
|
recipientAddressId : this.address.id
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -132,6 +133,7 @@ export default {
|
|
|
|
productSkuId : query.skuId,
|
|
|
|
productSkuId : query.skuId,
|
|
|
|
quantity : query.num,
|
|
|
|
quantity : query.num,
|
|
|
|
activityId : query.activityId,
|
|
|
|
activityId : query.activityId,
|
|
|
|
|
|
|
|
isVirtual : this.productType == 2 && true,
|
|
|
|
activityTimeId : query.activityTimeId,
|
|
|
|
activityTimeId : query.activityTimeId,
|
|
|
|
// 1正常购买 2活动购买
|
|
|
|
// 1正常购买 2活动购买
|
|
|
|
activityType : query.activityType,
|
|
|
|
activityType : query.activityType,
|
|
|
@ -169,6 +171,7 @@ export default {
|
|
|
|
orderSource : this.$store.state.openId ? 5 : 4,
|
|
|
|
orderSource : this.$store.state.openId ? 5 : 4,
|
|
|
|
// #endif
|
|
|
|
// #endif
|
|
|
|
recipientAddressId : this.address.id,
|
|
|
|
recipientAddressId : this.address.id,
|
|
|
|
|
|
|
|
isVirtual :this.productType == 2 && true,
|
|
|
|
shoppingCartIds : query.ids ? query.ids.split(',') : [],
|
|
|
|
shoppingCartIds : query.ids ? query.ids.split(',') : [],
|
|
|
|
products : this.orderInfo.products.map(i => ({
|
|
|
|
products : this.orderInfo.products.map(i => ({
|
|
|
|
activityId : query.activityId,
|
|
|
|
activityId : query.activityId,
|
|
|
|