czg_team/cashier_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更换正式环境，测试修改

Browse Source
This commit is contained in:
GaoHao
2025-03-25 21:49:33 +08:00
parent f01bc839f7
commit 7fe5d028e4
71 changed files with 930 additions and 2016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pagesOrder/detail/components/list.vue
View File

@@ -80,17 +80,20 @@
</view>
<view class="u-text-right u-m-t-28">
<template v-if="item.refundNum>0||item.returnNum>0">
<!-- <view>￥{{mathFloorPrice( - mathFloorPrice(parseFloat(item.returnNum*item.unitPrice),item) - mathFloorPrice(parseFloat(item.refundNum*item.unitPrice),item))}}</view> -->
<view>￥{{mathFloorPrice( parseFloat(mathFloorPrice(item.num*item.unitPrice),item) - (parseFloat(mathFloorPrice(item.returnNum*item.unitPrice,item)) + parseFloat(mathFloorPrice(item.refundNum*item.unitPrice,item))))}}</view>
<view>￥{{mathFloorPrice( parseFloat(mathFloorPrice(item.num*item.unitPrice,item)) - (parseFloat(mathFloorPrice(item.returnNum*item.unitPrice,item)) + parseFloat(mathFloorPrice(item.refundNum*item.unitPrice,item))))}}</view>
<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}</view>
</template>
<template v-else-if="item.userCouponId">
<view>￥0.00</view>
<template v-else-if="item.couponNum > 0">
<view>￥{{mathFloorPrice((item.num-item.couponNum)*item.unitPrice,item)}}</view>
<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}</view>
</template>
<template v-else-if="item.discountSaleAmount > 0">
<view>￥{{mathFloorPrice(item.num*item.discountSaleAmount,item)}}</view>
<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}</view>
</template>
<template v-else-if="isVip == 1">
<view>￥{{item.num*item.memberPrice}}</view>
<view class="line-th color-666 ">￥{{item.num*item.price}}</view>
<view>￥{{mathFloorPrice(item.num*item.memberPrice,item)}}</view>
<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}</view>
</template>
<template v-else>
<template v-if="returnCanTuiMoney(item)*1!=returnTotalMoney(item)*1">
@@ -206,7 +209,7 @@
</view>
<view class="u-m-t-24">
<view class="u-m-t-24" v-if="orderInfo.status == 'unpaid'||orderInfo.status == 'done'">
<my-button @tap="printOrder" type="cancel" :color="color.ColorMain">重新打印</my-button>
</view>
</view>
@@ -374,12 +377,13 @@
* 总优惠金额
*/
const discountsPrice = computed(() => {
// 满减券优惠
let fullCouponDiscountAmount = props.orderInfo.fullCouponDiscountAmount
let fullCouponDiscountAmount = props.orderInfo.status == 'done' ? props.orderInfo.fullCouponDiscountAmount : 0
// 商品券优惠
let productCouponDiscountAmount = props.orderInfo.productCouponDiscountAmount
let productCouponDiscountAmount = props.orderInfo.status == 'done' ? props.orderInfo.productCouponDiscountAmount : 0
// 积分抵扣优惠
let pointsDiscountAmount = props.orderInfo.pointsDiscountAmount
let pointsDiscountAmount = props.orderInfo.status == 'done' ? props.orderInfo.pointsDiscountAmount : 0
return (parseFloat(vipDiscountPrice.value) + parseFloat(discountSaleAmount.value) + discountAmount.value + fullCouponDiscountAmount + productCouponDiscountAmount + pointsDiscountAmount).toFixed(2)
})
@@ -394,14 +398,13 @@
let memberPrice = cur.memberPrice ? cur.memberPrice : cur.price
let tPrice = (isVip.value ? memberPrice : cur.price)
tPrice = cur.memberPrice != cur.unitPrice&& cur.price != cur.unitPrice ? cur.unitPrice : tPrice
console.log(tPrice)
let Total = Math.floor(tPrice * cur.num * 100) / 100
return prve + Total - (cur.returnNum*tPrice) - (cur.refundNum*cur.unitPrice)
}, 0)
return a + curTotal
}, 0)
console.log("菜品金额==",goodsPrice)
// console.log("菜品金额==",goodsPrice)
return goodsPrice.toFixed(2)
})
@@ -495,7 +498,7 @@
function returnTotalMoney(item) {
return (Math.floor(item.num*item.unitPrice*100)/100).toFixed(2)
return (Math.floor(item.num*item.price*100)/100).toFixed(2)
}
function returnCanTuiMoney(item) {
// if (props.orderInfo.status == 'unpaid') {
@@ -566,7 +569,7 @@
obj.number = '0.00'
obj.skuName = obj.skuName || ''
obj.unitPrice = obj.unitPrice
obj.num = obj.num - obj.returnNum - obj.refundNum
obj.num = obj.num - obj.returnNum - obj.refundNum - obj.couponNum
obj.priceAmount = mathFloorPrice(obj.num*obj.unitPrice ,obj)
})
arr = [...arr,...infoLit]