From d36afe0969b42325c8f2229e32230778e5770b07 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 22 Nov 2024 18:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BC=98=E6=83=A0=E7=AD=89=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/extra.vue       |   4 +-
 pagesOrder/detail/components/list - 副本.vue | 548 +++++++++++++++++++
 pagesOrder/detail/components/list.vue        |  60 +-
 pagesOrder/detail/detail.vue                 |   5 +
 4 files changed, 591 insertions(+), 26 deletions(-)
 create mode 100644 pagesOrder/detail/components/list - 副本.vue

diff --git a/pagesOrder/detail/components/extra.vue b/pagesOrder/detail/components/extra.vue
index 8d67ab5..86440d5 100644
--- a/pagesOrder/detail/components/extra.vue
+++ b/pagesOrder/detail/components/extra.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="default-box-padding bg-fff border-r-12 u-m-t-20" v-if="packeFee>0||data.priceAmount>0">
+	<view class="default-box-padding bg-fff border-r-12 u-m-t-20" v-if="packeFee>0||data.priceAmount>0||data.returnAmount>0">
 		<view class="u-flex u-row-between">
 			<view class="font-bold">附加费</view>
 			<template v-if="extraCanTuicai(orderInfo,data)">
@@ -24,7 +24,7 @@
 						<view class="tag yitui u-m-l-10">{{data.status=='refunding'?'退款中': '已退'}}</view>
 					</view>
 					<view class="line-th">x{{data.num||0}}</view>
-					<view class="line-th">￥{{data.priceAmount}}</view>
+					<view class="line-th">￥{{data.priceAmount||data.returnAmount}}</view>
 				</view>
 			</template>
 			<!-- <view class="u-flex u-row-right u-m-t-24">
diff --git a/pagesOrder/detail/components/list - 副本.vue b/pagesOrder/detail/components/list - 副本.vue
new file mode 100644
index 0000000..8aec0e9
--- /dev/null
+++ b/pagesOrder/detail/components/list - 副本.vue	
@@ -0,0 +1,548 @@
+<template>
+	<view class="default-box-padding bg-fff border-r-24 u-m-t-32" v-if="data.length">
+		<view class=" font-bold u-p-b-32 border-bottom u-m-b-24" v-if="orderInfo.tableName">
+			<text class="">桌号：</text>
+			<text class="">{{orderInfo.tableName||""}}</text>
+		</view>
+		<view class="  color-999 border-bottom u-p-b-24">
+			<text>共</text>
+			<text class="color-333 "> {{goodsNumber}}</text>
+			<text>份菜品</text>
+		</view>
+		<view class="u-m-b-20 " v-for="(order,orderIndex) in data" :key="orderIndex">
+			<view class="u-p-t-24"> 第{{ order.placeNum }}次下单
+			</view>
+			<view class="u-m-t-24 list">
+				<view class="item  u-m-b-32" v-for="(item,index) in order.info" :key="index">
+					<view class="u-flex u-col-top">
+						<view class="u-flex">
+							<image class="img" :src="item.coverImg||item.productImg" mode=""></image>
+						</view>
+						<view class="u-p-l-32 u-flex-1">
+							<view class="u-flex u-row-between u-col-top">
+
+								<view class="">
+									<view class="u-flex">
+										<view class="tui" v-if="isTui(item)">
+											{{item.status=='refunding'?'退款中':'已退'}}
+										</view>
+										<view
+											:class="{'line-th':item.status=='return'||item.status=='refund'||item.status=='refunding'}">
+											{{item.name||item.productName}}
+										</view>
+									</view>
+									<view class="u-flex u-m-t-8">
+										<view class="u-m-r-20 u-flex " v-if="item.gift">
+											<uni-tag text="赠送"
+												custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;">
+											</uni-tag>
+										</view>
+										<view class="u-m-r-20 u-flex " v-if="item.userCouponId">
+											<uni-tag :text=" productCouponDikou(item)"
+												custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;">
+											</uni-tag>
+										</view>
+										<view class="u-m-r-20 u-flex" v-if="item.pack">
+											<uni-tag
+												custom-style="background-color: #E6F0FF; border-color: #E6F0FF; color: #318AFE;"
+												size="small" text="打包" inverted type="success" />
+										</view>
+										<view class="u-m-r-20 u-font-24 u-flex" v-if="item.returnAmount">
+											<view class="color-666">退款金额:</view>
+											<view class="color-999 u-m-l-6">{{item.returnAmount}}</view>
+										</view>
+									</view>
+									<view class="color-999 u-font-24 u-m-t-8">{{item.productSkuName||''}}</view>
+
+
+									<view class="u-m-t-12 color-666 u-font-24" v-if="item.note">
+										备注：{{item.note}}
+									</view>
+								</view>
+								<view class="u-text-right u-m-t-28">
+									<template v-if="isTui(item)">
+										<view>￥0.00</view>
+										<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}
+										</view>
+									</template>
+									<template v-else-if="isGift(item)||item.userCouponId">
+										<view>￥0.00</view>
+										<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}
+										</view>
+									</template>
+									<template v-else>
+										<template v-if="returnCanTuiMoney(item)*1!=returnTotalMoney(item)*1">
+											<view>￥{{returnCanTuiMoney(item)}}</view>
+											<view class=" color-666 line-th">
+												￥{{returnTotalMoney(item)}}</view>
+										</template>
+										<template v-else>
+											<view>￥{{returnTotalMoney(item)}}</view>
+										</template>
+										<!-- <template
+											v-if="user.isVip&&item.isMember&&returnVipMoney(item)>0&&returnVipMoney(item)!=returnTotalMoney(item)">
+											<view>￥{{returnVipMoney(item)}}</view>
+											<view class=" color-666 line-th">
+												￥{{returnTotalMoney(item)}}</view>
+										</template>
+										<template v-else>
+											<view>￥{{returnTotalMoney(item)}}</view>
+										</template> -->
+									</template>
+									<view class="u-m-t-22 color-999 u-font-24">X{{item.number||item.num}}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<template v-if="canTuicai(orderInfo,item)">
+						<view class="u-flex u-row-right gap-20 u-m-t-24">
+							<!-- <my-button :height="60" color="#333" plain type="cancel" shape="circle">更多操作</my-button> -->
+							<my-button :width="128" :height="48" plain shape="circle" @tap="tuicai(item,index)"><text
+									class="no-wrap">退菜</text></my-button>
+						</view>
+					</template>
+					<template v-if="canTuiKuan(orderInfo,item)">
+						<view class="u-flex u-row-right gap-20 u-m-t-20">
+							<my-button :width="128" :height="48" plain shape="circle" @tap="tuikuan(item,index)"><text
+									class="no-wrap">{{item.userCouponId?'退券':'退款' }}</text> </my-button>
+						</view>
+					</template>
+
+				</view>
+			</view>
+			<!-- <view class="bg-gray u-p-20 u-m-t-20" v-if="orderInfo.remark">
+				<view>备注</view>
+				<view class="u-m-t-10">{{orderInfo.remark}}</view>
+			</view> -->
+		</view>
+
+		<view class="u-m-t-32">
+			<view class="u-flex u-row-between border-top  u-p-t-32">
+				<view>
+					<template v-if="orderInfo.status=='unpaid'">
+						<view class="tag no-pay">
+							未支付
+						</view>
+					</template>
+					<template v-if="orderInfo.status=='refund'">
+						<view class="tag refund">
+							退款成功
+						</view>
+					</template>
+				</view>
+
+				<view class="u-flex">
+					<view class="u-flex u-m-r-24" v-if="youhuiAllPrice>0">
+						<view class="color-red u-m-r-6 ">
+							已优惠￥{{youhuiAllPrice}}
+						</view>
+						<up-icon name="info-circle" color="#999" :size="14" @click="youhuiDetailShow"></up-icon>
+					</view>
+
+					<view>
+						<text>小计￥</text>
+						<text class="font-bold u-font-32">{{allPrice}}</text>
+					</view>
+
+				</view>
+			</view>
+
+			<template v-if="orderInfo.refundAmount">
+				<view class="u-flex u-row-between u-m-t-32">
+					<view>退款金额</view>
+					<view class="color-999">
+						<text class="">{{(orderInfo.refundAmount).toFixed(2)}}</text>
+					</view>
+				</view>
+				<view class="u-flex u-row-between u-m-t-32">
+					<view>退款原因</view>
+					<view class="color-999">
+						<text class="">{{orderInfo.refundRemark||''}}</text>
+					</view>
+				</view>
+				<view class="u-flex u-row-between u-m-t-32 u-p-b-24 border-bottom">
+					<view></view>
+					<view class="">
+						<text class="">退款成功</text>
+					</view>
+				</view>
+			</template>
+			<view class="u-flex u-row-between u-m-t-20">
+				<view></view>
+				<view>
+					<text>总计￥</text>
+					<text class="font-bold u-font-32">{{to2(allPrice*1+seatFeePrice*1+packFee*1) }}</text>
+				</view>
+			</view>
+			<view class="u-flex u-row-between u-m-t-20" v-if="orderInfo.status=='closed'">
+				<view></view>
+				<view>
+					<text>实付￥</text>
+					<text class="font-bold u-font-32">{{to2(orderInfo.amount) }}</text>
+				</view>
+			</view>
+			<!-- <view class="u-flex u-row-between u-m-t-20">
+				<view></view>
+				<view>
+					<text>原价￥</text>
+					<text class="font-bold u-font-32">{{to2(orderInfo.originAmount||0) }}</text>
+				</view>
+			</view> -->
+			<view class="u-m-t-24">
+				<my-button @tap="printOrder" type="cancel" :color="color.ColorMain">重新打印</my-button>
+			</view>
+		</view>
+		<up-popup :round="10" :show="pop.youhui" mode="center" closeOnClickOverlay @close="youhuiDetailHide">
+			<view class="u-p-30" style="width: 80vw;">
+				<view class="font-bold  u-text-center">优惠详情</view>
+				<view class="u-m-t-32">
+					<view class="u-flex u-row-between u-m-b-18" v-if="vipDiscountPrice*1>0">
+						<view>会员优惠</view>
+						<view class="color-red">
+							<text>￥</text>
+							<text>{{vipDiscountPrice}}</text>
+						</view>
+					</view>
+					<view class="u-flex u-row-between u-m-b-18" v-if="discountAmount">
+						<view>打折</view>
+						<view class="color-red">
+							<text>￥</text>
+							<text>{{to2(discountAmount) }}</text>
+						</view>
+					</view>
+					<view class="u-flex u-row-between " v-if="orderInfo.fullCouponDiscountAmount*1>0">
+						<view>满减券抵扣</view>
+						<view class="color-red">
+							<text>￥</text>
+							<text>{{to2(orderInfo.fullCouponDiscountAmount) }}</text>
+						</view>
+					</view>
+					<view class="u-flex u-row-between u-m-t-18" v-if="productCouponDiscountAmount*1>0">
+						<view>商品券抵扣</view>
+						<view class="color-red">
+							<text>￥</text>
+							<text> {{productCouponDiscountAmount }}</text>
+						</view>
+					</view>
+					<!-- <view class="u-flex u-row-between u-m-t-18"
+						v-if="orderInfo.productCouponDiscountAmount||productCoupPrice*1>0">
+						<view>商品券抵扣</view>
+						<view class="color-red">
+							<text>￥</text>
+							<text> {{to2(orderInfo.productCouponDiscountAmount||productCoupPrice) }}</text>
+						</view>
+					</view> -->
+					<view class="u-flex u-row-between u-m-t-18" v-if="orderInfo.pointsDiscountAmount">
+						<view>积分抵扣</view>
+						<view class="color-red">
+							<text>￥</text>
+							<text>{{to2(orderInfo.pointsDiscountAmount) }}</text>
+						</view>
+					</view>
+
+				</view>
+			</view>
+		</up-popup>
+	</view>
+</template>
+
+<script setup>
+	import {
+		computed,
+		reactive
+	} from 'vue';
+	import color from '@/commons/color.js'
+	import {
+		hasPermission
+	} from '@/commons/utils/hasPermission.js'
+	import {
+		isTui,
+		isTuiCai,
+		isGift,
+		canTuiKuan,
+		canTuicai,
+		numSum
+	} from '@/commons/utils/goodsUtil.js'
+	const pop = reactive({
+		youhui: false
+	})
+
+	function youhuiDetailShow() {
+		pop.youhui = true
+	}
+
+	function productCouponDikou(item) {
+		return '商品券抵扣￥' + returnProductCoupPrice(item)
+	}
+
+	function youhuiDetailHide() {
+		pop.youhui = false
+	}
+	const props = defineProps({
+		orderInfo: {
+			type: Object,
+			default: () => {}
+		},
+		data: {
+			type: Array,
+			default: () => []
+		},
+		seatFee: {
+			type: Object,
+			default: () => {}
+		},
+		user: {
+			type: Object,
+			default: () => {
+				return {
+					id: '',
+					isVip: false
+				}
+			}
+		}
+	})
+
+	function returnProductCoupPrice(item) {
+		if (!item.isMember) {
+			return item.price * item.num
+		}
+		const price = item.memberPrice ? item.memberPrice : item.price
+		return price * item.num
+	}
+	const productCouponDiscountAmount = computed(() => {
+		// if(props.orderInfo.productCouponDiscountAmount){
+		// 	return orderInfo.productCouponDiscountAmount.toFixed(2)
+		// }
+		if (!props.data.length) {
+			return 0
+		}
+		const n = props.data.reduce((prve, cur) => {
+			const curTotal = cur.info.filter(v => v.userCouponId).reduce((a, b) => {
+				return a + returnProductCoupPrice(b)
+			}, 0)
+			return prve + curTotal
+		}, 0)
+		console.log(n);
+		return n.toFixed(2)
+	})
+	const emits = defineEmits(['tuicai', 'tuikuan', 'printOrder'])
+
+	function returnVipMoney(item) {
+		if (!item.memberPrice || !props.user.isVip) {
+			return 0
+		}
+		return (item.memberPrice * item.num).toFixed(2)
+	}
+
+	function returnTotalMoney(item) {
+		return (item.price * item.num).toFixed(2)
+	}
+	
+	const canTuiKuanPrice = computed(() => {
+		return props.data.reduce((prve,cur)=>{
+			// const curTotal=cur.info.filter(v=>!v.userCouponId).reduce((a,b)=>{
+			// 	return a+b.priceAmount*1
+			// },0)
+			const curTotal=cur.info.filter(v=>canTuiKuan(props.orderInfo,v)&&!v.userCouponId).reduce((a,b)=>{
+				return a+b.priceAmount*1
+			},0)
+			return prve+curTotal
+		},0)
+	})
+	function returnCanTuiMoney(item) {
+		console.log(canTuiKuanPrice.value);
+		if(props.orderInfo.status=='unpaid'){
+			return returnTotalMoney(item)
+		}else{
+			return (item.priceAmount/(canTuiKuanPrice.value+seatFeePrice.value*1)*props.orderInfo.amount).toFixed(2)
+		}
+	}
+
+	function to2(n) {
+		if (!n) {
+			return 0
+		}
+		return n.toFixed(2)
+	}
+
+	function tuicai(item, index) {
+		emits('tuicai', item, index)
+	}
+
+	function tuikuan(item, index) {
+		hasPermission('允许退款').then(res => {
+			if (res) {
+				emits('tuikuan', {...item,priceAmount:returnCanTuiMoney(item)}, index)
+			}
+		})
+	}
+
+	function printOrder() {
+		emits('printOrder')
+	}
+
+
+	const seatFeePrice = computed(() => {
+		if (!props.seatFee.priceAmount) {
+			return 0
+		}
+		const n = props.seatFee.priceAmount * (isTui(props.seatFee) ? 0 : 1)
+		return n.toFixed(2)
+	})
+	const discountAmount = computed(() => {
+		if (props.orderInfo.discountAmount) {
+			return props.orderInfo.discountAmount
+		}
+		console.log(props.orderInfo.originAmount * (1 - props.orderInfo.discountRatio));
+		return (props.orderInfo.originAmount * (1 - props.orderInfo.discountRatio))
+	})
+	const goodsOriginAllPrice = computed(() => {
+		const goodsPrice = props.data.reduce((prve, cur) => {
+			const curTotal = cur.info.reduce((a,
+				b) => {
+				return a + (b.num * b.price)
+			}, 0)
+			return prve + curTotal
+		}, 0)
+		return goodsPrice.toFixed(2)
+	})
+
+
+
+	const freePrice = computed(() => {
+		const goodsPrice = props.data.reduce((prve, cur) => {
+			const curTotal = cur.info.filter(v => v.gift == true || isGift(v)).reduce((a,
+				b) => {
+				const price = (b.isMember && b.memberPrice) ? b.memberPrice : b.price
+				return a + (b.num * price)
+			}, 0)
+			return prve + curTotal
+		}, 0)
+		return goodsPrice.toFixed(2)
+	})
+	const vipDiscountPrice = computed(() => {
+		if (!props.user.isVip) {
+			return 0
+		}
+		const goodsPrice = props.data.reduce((prve, cur) => {
+			const curTotal = cur.info.filter(v => v.gift != true && v.status !== "return" && (v.isMember &&
+				v.memberPrice) && (v.memberPrice != v.price)).reduce((
+				a,
+				b) => {
+				return a + (b.num * (b.price - b.memberPrice))
+			}, 0)
+			return prve + curTotal
+		}, 0)
+		return goodsPrice.toFixed(2)
+	})
+
+	const productCoupPrice = computed(() => {
+		if (props.orderInfo.status == 'closed') {
+			return props.orderInfo.productCouponDiscountAmount
+		}
+		const goodsPrice = props.data.reduce((a, b) => {
+			const curTotal = b.info.filter(v => v.gift != true && v.userCouponId).reduce((prve,
+				cur) => {
+				const isVip = props.user.isVip && cur.isMember
+				const memberPrice = cur.memberPrice ? cur.memberPrice : cur.price
+				const price = isVip ? memberPrice : cur.price
+				const curTotal = price * cur.num
+				return prve + curTotal
+			}, 0)
+			return a + curTotal
+		}, 0)
+		return goodsPrice.toFixed(2)
+	})
+
+	const youhuiAllPrice = computed(() => {
+		return (freePrice.value * 1 + vipDiscountPrice.value * 1 + props.orderInfo.fullCouponDiscountAmount + props
+			.orderInfo.pointsDiscountAmount + (props.orderInfo.status == 'unpaid' ? productCoupPrice.value :
+				productCouponDiscountAmount.value) * 1 + (props.orderInfo.discountAmount ||
+				0)).toFixed(2)
+
+	})
+	const packFee = computed(() => {
+		//不是退菜只要有打包费的都计算，包括赠送
+		const goodsPrice = props.data.reduce((prve, cur) => {
+			const curTotal = cur.info.filter(v => v.status !== "return").reduce((a,
+				b) => {
+				return a + b.packAmount
+			}, 0)
+			return prve + curTotal
+		}, 0)
+		return goodsPrice.toFixed(2)
+
+	})
+	const allPrice = computed(() => {
+		const n = goodsOriginAllPrice.value - youhuiAllPrice.value
+		return (n < 0 ? 0 : n).toFixed(2)
+		
+		// if (props.orderInfo.status == 'unpaid') {
+		// 	const n = goodsOriginAllPrice.value - youhuiAllPrice.value
+		// 	return (n < 0 ? 0 : n).toFixed(2)
+		// }
+		// return props.orderInfo.amount
+	})
+
+	const goodsNumber = computed(() => {
+		let result = 0
+		result = props.data.reduce((a, b) => {
+			const bTotal = b.info.reduce((prve, cur) => {
+				return prve + (cur.number || cur.num) * 1;
+			}, 0);
+			return a + bTotal
+		}, 0)
+		return result
+	})
+</script>
+
+<style lang="scss" scoped>
+	.img {
+		width: 152rpx;
+		height: 152rpx;
+		border-radius: 6px;
+	}
+
+	.border-top {
+		border-color: #F6F6F6;
+	}
+
+	.border-r-24 {
+		border-radius: 24rpx;
+	}
+
+	.border-bottom {
+		// border-color: rgb(240, 240, 240);
+		border-color: #F6F6F6;
+	}
+
+	.line-th {
+		text-decoration: line-through;
+	}
+
+	.tag {
+		padding: 4rpx 8rpx 2rpx 10rpx;
+		border-radius: 8rpx;
+		font-size: 24rpx;
+
+		&.no-pay {
+			background-color: rgb(170, 170, 170);
+			color: #fff;
+		}
+
+		&.refund {
+			background-color: #FCE7E7;
+			padding: 8rpx 20rpx 6rpx 22rpx;
+			color: #EB4F4F;
+		}
+	}
+
+	.tui {
+		background-color: rgb(239, 239, 239);
+		border-radius: 4rpx;
+		margin-right: 6rpx;
+		color: #666;
+		padding: 0 4rpx;
+		font-size: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index f952fec..3230e8a 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -136,9 +136,8 @@
 						<view class="color-red u-m-r-6 ">
 							已优惠￥{{youhuiAllPrice}}
 						</view>
-						<up-icon name="info-circle" color="#999" :size="14" @click="youhuiDetailShow"></up-icon>
+						<!-- <up-icon name="info-circle" color="#999" :size="14" @click="youhuiDetailShow"></up-icon> -->
 					</view>
-
 					<view>
 						<text>小计￥</text>
 						<text class="font-bold u-font-32">{{allPrice}}</text>
@@ -174,13 +173,13 @@
 					<text class="font-bold u-font-32">{{to2(allPrice*1+seatFeePrice*1+packFee*1) }}</text>
 				</view>
 			</view>
-			<view class="u-flex u-row-between u-m-t-20" v-if="orderInfo.status=='closed'">
+			<!-- <view class="u-flex u-row-between u-m-t-20" v-if="orderInfo.status=='closed'">
 				<view></view>
 				<view>
 					<text>实付￥</text>
 					<text class="font-bold u-font-32">{{to2(orderInfo.amount) }}</text>
 				</view>
-			</view>
+			</view> -->
 			<!-- <view class="u-flex u-row-between u-m-t-20">
 				<view></view>
 				<view>
@@ -337,24 +336,32 @@
 	function returnTotalMoney(item) {
 		return (item.price * item.num).toFixed(2)
 	}
-	
+
 	const canTuiKuanPrice = computed(() => {
-		return props.data.reduce((prve,cur)=>{
+		return props.data.reduce((prve, cur) => {
 			// const curTotal=cur.info.filter(v=>!v.userCouponId).reduce((a,b)=>{
 			// 	return a+b.priceAmount*1
 			// },0)
-			const curTotal=cur.info.filter(v=>canTuiKuan(props.orderInfo,v)&&!v.userCouponId).reduce((a,b)=>{
-				return a+b.priceAmount*1
-			},0)
-			return prve+curTotal
-		},0)
+			const curTotal = cur.info.filter(v => canTuiKuan(props.orderInfo, v) && !v.userCouponId)
+				.reduce((a, b) => {
+					return a + b.priceAmount * 1
+				}, 0)
+			return prve + curTotal
+		}, 0)
 	})
+
 	function returnCanTuiMoney(item) {
 		console.log(canTuiKuanPrice.value);
-		if(props.orderInfo.status=='unpaid'){
+		if (props.orderInfo.status == 'unpaid') {
 			return returnTotalMoney(item)
-		}else{
-			return (item.priceAmount/(canTuiKuanPrice.value+seatFeePrice.value*1)*props.orderInfo.amount).toFixed(2)
+		} else {
+			if(props.orderInfo.pointsDiscountAmount>0||props.orderInfo.fullCouponDiscountAmount>0){
+				
+				return (item.priceAmount / (canTuiKuanPrice.value + seatFeePrice.value * 1) * canTuiKuanPrice.value).toFixed(
+					2)
+			}else{
+				return item.priceAmount
+			}
 		}
 	}
 
@@ -372,7 +379,10 @@
 	function tuikuan(item, index) {
 		hasPermission('允许退款').then(res => {
 			if (res) {
-				emits('tuikuan', {...item,priceAmount:returnCanTuiMoney(item)}, index)
+				emits('tuikuan', {
+					...item,
+					priceAmount: returnCanTuiMoney(item)
+				}, index)
 			}
 		})
 	}
@@ -455,12 +465,14 @@
 	})
 
 	const youhuiAllPrice = computed(() => {
+		if(props.orderInfo.status!='unpaid'){
+			return (goodsOriginAllPrice.value-allPrice.value-discountAmount.value).toFixed(2)
+		}
 		return (freePrice.value * 1 + vipDiscountPrice.value * 1 + props.orderInfo.fullCouponDiscountAmount + props
 			.orderInfo.pointsDiscountAmount + (props.orderInfo.status == 'unpaid' ? productCoupPrice.value :
 				productCouponDiscountAmount.value) * 1 + (props.orderInfo.discountAmount ||
 				0)).toFixed(2)
 
-
 	})
 	const packFee = computed(() => {
 		//不是退菜只要有打包费的都计算，包括赠送
@@ -475,14 +487,14 @@
 
 	})
 	const allPrice = computed(() => {
-		const n = goodsOriginAllPrice.value - youhuiAllPrice.value
-		return (n < 0 ? 0 : n).toFixed(2)
-		
-		// if (props.orderInfo.status == 'unpaid') {
-		// 	const n = goodsOriginAllPrice.value - youhuiAllPrice.value
-		// 	return (n < 0 ? 0 : n).toFixed(2)
-		// }
-		// return props.orderInfo.amount
+		if (props.orderInfo.status == 'unpaid') {
+			const n = goodsOriginAllPrice.value - youhuiAllPrice.value
+			return (n < 0 ? 0 : n).toFixed(2)
+		}
+		const seatFee=props.orderInfo.seatInfo?(props.orderInfo.seatInfo.priceAmount||props.orderInfo.seatInfo.returnAmount):0
+		console.log('seatFee');
+		console.log(seatFee);
+		return (props.orderInfo.amount-seatFee).toFixed(2)
 	})
 
 	const goodsNumber = computed(() => {
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index a4dbfb4..1b4c88b 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -9,6 +9,11 @@
 		:user="user"
 			:data="orderDetail.goodsList" :seatFee="orderDetail.seatFee" @tuicai="onTuiCai"></goods-list>
 		<!-- <template v-if="orderDetail.seatFee.totalNumber&&orderDetail.seatFee.totalAmount"> -->
+		
+		<view class="default-box-padding bg-fff border-r-12 u-m-t-20 u-flex u-row-between" v-if="orderDetail.info.discountAmount>0">
+			<view>服务员改价</view>
+			<view class="color-red">-￥{{orderDetail.info.discountAmount}}</view>
+		</view>
 		<template v-if="true">
 			<extra-vue @tuicai="onSeatFeeTuicai" @tuikuan="onSeatFeeTuiKuan" :orderInfo="orderDetail.info"
 				:data="orderDetail.seatFee"></extra-vue>