优化会员,商品,下单
This commit is contained in:
@@ -39,8 +39,6 @@
|
||||
@clickPointsamount='clickPointsamount' @learcoupons="learcoupons">
|
||||
</orderInfoAfter>
|
||||
|
||||
<!-- 先支付后下单 -->
|
||||
<!-- <orderInfoBefore ref="orderInfoBefore" :listinfo="listinfo" v-else></orderInfoBefore> -->
|
||||
<!-- 充值免单 -->
|
||||
<!-- <block v-if="listinfo.useType == 'dine-in-after'">
|
||||
<rechargeFree
|
||||
@@ -196,39 +194,34 @@
|
||||
// listinfo.couponInfoList = JSON.parse(listinfo.couponInfoList)
|
||||
// }
|
||||
}
|
||||
|
||||
try {
|
||||
// 历史订单
|
||||
if (listinfo.detailMap) {
|
||||
let combinedArray = [];
|
||||
for (const key in listinfo.detailMap) {
|
||||
if (listinfo.detailMap.hasOwnProperty(key)) {
|
||||
let subArray = listinfo.detailMap[key];
|
||||
combinedArray = [...combinedArray, ...subArray]
|
||||
}
|
||||
// 历史订单
|
||||
if (listinfo.detailMap) {
|
||||
let combinedArray = [];
|
||||
for (const key in listinfo.detailMap) {
|
||||
if (listinfo.detailMap.hasOwnProperty(key)) {
|
||||
let subArray = listinfo.detailMap[key];
|
||||
combinedArray = [...combinedArray, ...subArray]
|
||||
}
|
||||
listinfo.combinedArray = combinedArray
|
||||
listinfo.packFee = await cartStore.getTotalPackFee(listinfo.combinedArray)
|
||||
// 计算购物车商品费用
|
||||
listinfo.totalPrices = await cartStore.getTotalTotalPrices(listinfo
|
||||
.combinedArray)
|
||||
// 餐位费listinfo.seatNum
|
||||
listinfo.Seatcharge = await cartStore.getTotalSeatcharge(listinfo.seatNum)
|
||||
}
|
||||
if (listinfo.discountInfo) {
|
||||
const discountObj = JSON.parse(listinfo.discountInfo);
|
||||
const tempArray = [];
|
||||
for (const [key, value] of Object.entries(discountObj)) {
|
||||
tempArray.push({
|
||||
name: key,
|
||||
amount: value
|
||||
});
|
||||
}
|
||||
listinfo.discountInfo = tempArray;
|
||||
console.log(tempArray)
|
||||
listinfo.combinedArray = combinedArray
|
||||
listinfo.packFee = await cartStore.getTotalPackFee(listinfo.combinedArray)
|
||||
// 计算购物车商品费用
|
||||
listinfo.totalPrices = await cartStore.getTotalTotalPrices(listinfo
|
||||
.combinedArray)
|
||||
// 餐位费listinfo.seatNum
|
||||
listinfo.Seatcharge = await cartStore.getTotalSeatcharge(listinfo.seatNum)
|
||||
}
|
||||
if (listinfo.discountInfo) {
|
||||
const discountObj = JSON.parse(listinfo.discountInfo);
|
||||
const tempArray = [];
|
||||
for (const [key, value] of Object.entries(discountObj)) {
|
||||
tempArray.push({
|
||||
name: key,
|
||||
amount: value
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
|
||||
listinfo.discountInfo = tempArray;
|
||||
console.log(tempArray)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -241,19 +234,25 @@
|
||||
// console.log(listinfo.combinedArray, listinfo.packFee, listinfo.totalPrices, listinfo.Seatcharge,
|
||||
// listinfo.Productroll, listinfo.coupondiscountAmount)
|
||||
// 打包费packFee 计算购物车商品费用totalPrices 餐位费Seatcharge
|
||||
let sum = (is_type.value != 0 ? listinfo.packFee : 0) + listinfo.totalPrices + (is_type.value ==
|
||||
0 ? listinfo.Seatcharge : 0);
|
||||
listinfo.originAmount = Math.round(sum * 100) / 100;
|
||||
try {
|
||||
let sum = (is_type.value != 0 ? listinfo.packFee : 0) + listinfo.totalPrices + (is_type
|
||||
.value ==
|
||||
0 ? listinfo.Seatcharge : 0);
|
||||
listinfo.originAmount = Math.round(sum * 100) / 100;
|
||||
|
||||
// 打包费packFee 计算购物车商品费用totalPrices 餐位费Seatcharge 商品卷Productroll 优惠卷coupondiscountAmount 积分listinfo.pointsDiscountAmount
|
||||
let sums = (is_type.value != 0 ? listinfo.packFee : 0) + listinfo.totalPrices + (is_type.value ==
|
||||
0 ? listinfo.Seatcharge : 0) - (listinfo.Productroll || 0) - (listinfo
|
||||
.coupondiscountAmount || 0) - (listinfo.pointsDiscountAmount || 0);
|
||||
listinfo.totalCost = Math.round(sums * 100) / 100;
|
||||
// 积分
|
||||
if (listinfo.totalCost && listinfo.status == 'unpaid') {
|
||||
uni.$u.debounce(await memberPointscalcUsablePoints(), 500)
|
||||
// 打包费packFee 计算购物车商品费用totalPrices 餐位费Seatcharge 商品卷Productroll 优惠卷coupondiscountAmount 积分listinfo.pointsDiscountAmount
|
||||
let sums = (is_type.value != 0 ? listinfo.packFee : 0) + listinfo.totalPrices + (is_type
|
||||
.value ==
|
||||
0 ? listinfo.Seatcharge : 0) - (listinfo.Productroll || 0) - (listinfo
|
||||
.coupondiscountAmount || 0) - (listinfo.pointsDiscountAmount || 0);
|
||||
listinfo.totalCost = Math.round(sums * 100) / 100;
|
||||
// 积分
|
||||
if (listinfo.totalCost && listinfo.status == 'unpaid') {
|
||||
uni.$u.debounce(await memberPointscalcUsablePoints(), 500)
|
||||
|
||||
}
|
||||
} catch (error) {
|
||||
//TODO handle the exception
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -434,7 +433,7 @@
|
||||
} catch (error) {
|
||||
//TODO handle the exception
|
||||
}
|
||||
orderorderInfo()
|
||||
await orderorderInfo()
|
||||
}
|
||||
|
||||
onUnmounted(() => {
|
||||
|
||||
Reference in New Issue
Block a user