From ad00b46a249a08c06a1395f714b5bc1fcb277297 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 31 Oct 2024 09:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/extra.vue    | 24 +++++++++++------------
 pagesOrder/detail/components/list.vue     |  3 ++-
 pagesOrder/detail/detail.vue              | 24 +++++++++++------------
 pagesOrder/index/compoents/order-item.vue |  2 +-
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/pagesOrder/detail/components/extra.vue b/pagesOrder/detail/components/extra.vue
index 28da433..e467f22 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.totalAmount>0">
+	<view class="default-box-padding bg-fff border-r-12 u-m-t-20" v-if="packeFee>0||data.priceAmount>0">
 		<view class="u-flex u-row-between">
 			<view class="font-bold">附加费</view>
 			<template v-if="extraCanTuicai(orderInfo,data)">
@@ -10,21 +10,21 @@
 			</template>
 		</view>
 		<view>
-			<template v-if="data.status!='return'">
-				<view class="u-flex u-row-between u-m-t-24" v-if="data.totalAmount*1>0">
-					<view>{{data.name||'餐位费'}}</view>
-					<view>x{{data.number||0}}</view>
-					<view class="price-min-width">￥{{data.totalAmount}}</view>
+			<template v-if="data.status!='return'&&data.status!='refund'&&data.status!='refunding'">
+				<view class="u-flex u-row-between u-m-t-24" v-if="data.priceAmount*1>0">
+					<view>{{data.productName||'餐位费'}}</view>
+					<view>x{{data.num||0}}</view>
+					<view class="price-min-width">￥{{data.priceAmount}}</view>
 				</view>
 			</template>
 			<template v-else>
 				<view class="u-flex u-row-between u-m-t-24 color-999">
 					<view class="u-flex">
-						<view class="line-th ">{{data.name||'餐位费'}}</view>
-						<view class="tag yitui u-m-l-10">已退</view>
+						<view class="line-th ">{{data.productName||'餐位费'}}</view>
+						<view class="tag yitui u-m-l-10">{{data.status=='refunding'?'退款中': '已退'}}</view>
 					</view>
-					<view class="line-th">x{{data.number||0}}</view>
-					<view class="line-th">￥{{data.totalAmount}}</view>
+					<view class="line-th">x{{data.num||0}}</view>
+					<view class="line-th">￥{{data.priceAmount}}</view>
 				</view>
 			</template>
 			<!-- <view class="u-flex u-row-right u-m-t-24">
@@ -54,10 +54,10 @@
 		returnPackFee
 	} from '@/commons/utils/goodsUtil.js'
 	function extraCanTuicai(orderInfo,data){
-		return orderInfo.status=='unpaid'&&data.status!='return'&&data.totalAmount*1>0
+		return orderInfo.status=='unpaid'&&data.status!='return'&&data.priceAmount*1>0
 	}
 	function extraCanTuiKuan(orderInfo,data){
-		return orderInfo.status=='closed'&&data.status!='return'&&data.totalAmount*1>0
+		return orderInfo.status=='closed'&&data.status!='return'&&data.priceAmount*1>0
 	}
 	const props = defineProps({
 		data: {
diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index fff9252..6331700 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -129,6 +129,7 @@
 				<view></view>
 				<view>
 					<text>总计￥</text>
+					<!-- <text class="font-bold u-font-32">{{numSum([allPrice,seatFeePrice,packFee]) }}</text> -->
 					<text class="font-bold u-font-32">{{to2(allPrice*1+seatFeePrice*1+packFee*1) }}</text>
 				</view>
 			</view>
@@ -147,7 +148,7 @@
 	import {
 		hasPermission
 	} from '@/commons/utils/hasPermission.js'
-	import {isTui,canTuiKuan,canTuicai} from '@/commons/utils/goodsUtil.js'
+	import {isTui,canTuiKuan,canTuicai,numSum} from '@/commons/utils/goodsUtil.js'
 	const emits = defineEmits(['tuicai', 'tuikuan', 'printOrder'])
 
 	function returnTotalMoney(item) {
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 1ffd61f..1f8d590 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -75,7 +75,7 @@
 	})
 
 	function onSeatFeeTuicai(seatFee) {
-		seatFee={...seatFee,num:seatFee.number,productName:seatFee.name}
+		seatFee={...seatFee,num:seatFee.num,productName:seatFee.productName}
 		console.log(seatFee);
 		tuicai.show = true
 		tuicai.isSeatFee = seatFee
@@ -94,26 +94,25 @@
 			return
 		}
 		const {
-			id,
+			id,cartId,
 			productId,
 			productSkuId,
-			name,
-			cartId,
-			number,
-			totalAmount,
-			salePrice
+			productName,
+			num,
+			priceAmount,
+			price
 		} = seatFee
 		go.to('PAGES_ORDER_TUIKUAN', {
 			orderId:orderDetail.info.id,
-			id:seatFee.id,
+			id:cartId,
 			productId,
 			productSkuId,
-			productName:name,
-			num:number,
+			productName,
+			num,
 			number: 0,
 			productSkuName: '',
-			priceAmount:totalAmount,
-			price:salePrice
+			priceAmount,
+			price
 		})
 	}
 
@@ -282,6 +281,7 @@
 				}
 
 			}
+			console.log(res.seatInfo);
 			orderDetail.seatFee = res.seatInfo|| {
 				name: '客座费',
 				number: res.seatCount,
diff --git a/pagesOrder/index/compoents/order-item.vue b/pagesOrder/index/compoents/order-item.vue
index c6ba5c6..83334d3 100644
--- a/pagesOrder/index/compoents/order-item.vue
+++ b/pagesOrder/index/compoents/order-item.vue
@@ -121,7 +121,7 @@
 	
 	const priceSize = 9
 	function goodsPriceAmount(item){
-		return item.price*item.num
+		return (item.price*item.num).toFixed(2)
 	}
 	// const packeFee=computed(()=>{
 	// 	return props.data.detailList.reduce((prve,cur)=>{