diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 53ffcca..d4dd78c 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -37,6 +37,11 @@
custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;">
+
+
+
+
￥{{returnTotalMoney(item)}}
-
+
￥0.00
￥{{returnTotalMoney(item)}}
@@ -149,7 +154,6 @@
总计￥
-
{{to2(allPrice*1+seatFeePrice*1+packFee*1) }}
@@ -276,8 +280,7 @@
return goodsPrice.toFixed(2)
})
const youhuiAllPrice=computed(()=>{
- console.log(freePrice.value);
- return (freePrice.value*1+vipDiscountPrice.value*1).toFixed(2)
+ return (freePrice.value*1+vipDiscountPrice.value*1+props.orderInfo.fullCouponDiscountAmount+props.orderInfo.productCouponDiscountAmount+props.orderInfo.pointsDiscountAmount).toFixed(2)
})
const packFee = computed(() => {
const goodsPrice = props.data.reduce((prve, cur) => {
@@ -291,7 +294,7 @@
})
const allPrice = computed(() => {
- return (goodsOriginAllPrice.value-freePrice.value-vipDiscountPrice.value).toFixed(2)
+ return (goodsOriginAllPrice.value-youhuiAllPrice.value).toFixed(2)
})
const goodsNumber = computed(() => {
diff --git a/pagesOrder/index/compoents/order-item.vue b/pagesOrder/index/compoents/order-item.vue
index 7c8cf3f..f6804f7 100644
--- a/pagesOrder/index/compoents/order-item.vue
+++ b/pagesOrder/index/compoents/order-item.vue
@@ -30,8 +30,7 @@
{{goosZhonglei}}种商品，共{{goodsNumber}}件
-
+
{{item.productName}}
@@ -44,7 +43,7 @@
￥{{goodsPriceAmount(item)}}
-
+
￥0
@@ -52,24 +51,25 @@
￥{{goodsPriceAmount(item)}}
-
+
￥{{goodsVipPriceAmount(item)}}
- ￥{{goodsPriceAmount(item)}}
+ ￥{{goodsPriceAmount(item)}}
-
+
-
+
打包费
￥{{data.packFee||0}}
@@ -80,8 +80,24 @@
￥{{data.seatInfo.priceAmount}}
-
-
+
+
+ 满减券抵扣
+ -￥{{data.fullCouponDiscountAmount||0}}
+
+
+ 商品券抵扣
+ -￥{{data.productCouponDiscountAmount||0}}
+
+
+ 积分抵扣
+ -￥{{data.pointsDiscountAmount||0}}
+
+
+
+
+
订单备注
{{data.remark||'无'}}
@@ -103,7 +119,11 @@
import dayjs from 'dayjs';
import orderEnum from '@/commons/orderEnum.js'
import go from '@/commons/utils/go.js'
- import {isTui,canTuiKuan,canTuicai} from '@/commons/utils/goodsUtil.js'
+ import {
+ isTui,
+ canTuiKuan,
+ canTuicai
+ } from '@/commons/utils/goodsUtil.js'
import {
computed,
reactive,
@@ -115,11 +135,11 @@
data: {
type: Object,
default: () => {
- return{
- packFee:0,
- seatInfo:{
- productName:'客座费',
- priceAmount:0
+ return {
+ packFee: 0,
+ seatInfo: {
+ productName: '客座费',
+ priceAmount: 0
},
detailList: []
}
@@ -133,14 +153,16 @@
let $goodsMap = {}
let goosZhonglei = ref(0)
let goodsNumber = ref(0)
-
+
const priceSize = 9
- function goodsPriceAmount(item){
- return (item.price*item.num).toFixed(2)
+
+ function goodsPriceAmount(item) {
+ return (item.price * item.num).toFixed(2)
}
- function goodsVipPriceAmount(item){
- const price=props.data.memberId?item.memberPrice: item.price
- return (price*item.num).toFixed(2)
+
+ function goodsVipPriceAmount(item) {
+ const price = props.data.memberId ? item.memberPrice : item.price
+ return (price * item.num).toFixed(2)
}
// const packeFee=computed(()=>{
// return props.data.detailList.reduce((prve,cur)=>{
@@ -153,9 +175,9 @@
if (!item) {
return ''
}
- const minW=`${item.price}`.length * priceSize + 15
+ const minW = `${item.price}`.length * priceSize + 15
return {
- 'min-width':(minW<36?36:minW) + 'px'
+ 'min-width': (minW < 36 ? 36 : minW) + 'px'
}
}
// const computedPriceStyle = computed(() => {
diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
index 6c9fab4..16feb6c 100644
--- a/pagesOrder/pay-order/pay-order.vue
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -46,14 +46,14 @@
{{item.name}}
- ￥{{item.discountAmount}}
+ -￥{{item.discountAmount}}
-
+
服务员改价
diff --git a/pagesOrder/quan/quan.vue b/pagesOrder/quan/quan.vue
index beefb74..359bbdc 100644
--- a/pagesOrder/quan/quan.vue
+++ b/pagesOrder/quan/quan.vue
@@ -204,14 +204,14 @@
console.log(order.value);
const res = await $activateByOrderId(option)
canDikouGoodsArr = returnNewGoodsList(order.value.detailList || [])
- res.fullReductionCoupon = res.fullReductionCoupon.filter((v) => !v.use)
+ res.fullReductionCoupon = res.fullReductionCoupon.filter((v) => v.use)
res.productCoupon = res.productCoupon.map(v => {
const calcCoup = returnProductCoupon(v, canDikouGoodsArr, user.value)
return {
...calcCoup,
checked: false
}
- });
+ }).filter((v) => v.use);
myQuan.res = res
myQuan.hasAjax = true;
}
diff --git a/pagesOrder/quan_util.js b/pagesOrder/quan_util.js
index dd583c1..ae36220 100644
--- a/pagesOrder/quan_util.js
+++ b/pagesOrder/quan_util.js
@@ -18,11 +18,11 @@ export function returnNewGoodsList(arr) {
let goodsMap={}
return arr.filter(v => !isTui(v))
}
-//根据当前购物车商品以及数量,已选券对应商品数量，判断该券是否可用
+//根据当前购物车商品以及数量,已选券对应商品数量，判断该商品券是否可用
export function returnCoupCanUse(goodsArr=[],coup,selCoupArr=[]) {
- if(!coup.use){
- return false
- }
+ // if(!coup.use){
+ // return false
+ // }
const findGoods=goodsArr.filter(v=>v.productId==coup.proId)
if(!findGoods.length){
return false
@@ -36,10 +36,10 @@ export function returnCoupCanUse(goodsArr=[],coup,selCoupArr=[]) {
if(selCoupNumber>=findGoodsTotalNumber){
return false
}
- return findGoodsTotalNumber v.productId == coup.proId);
if(!item){
@@ -49,7 +49,9 @@ export function returnProductCoupon(coup, goodsArr, vipUser) {
const price = item ? (vipUser.isVip ? memberPrice : item.price) : 0;
const discountAmount=(price*coup.num).toFixed(2)
console.log(discountAmount);
- const canUse=!coup.use?false:(discountAmount>0)
+
+ const canUse=!coup.use?false:(discountAmount>0&&returnCoupCanUse(goodsArr,coup,selCoupArr))
+ // const canUse=discountAmount>0
return { ...coup, discountAmount: discountAmount,use:canUse}
}