From 8eb51062ccc5ae1ecbbf7e312ffc4bf83deef874 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 18 Oct 2024 17:48:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E9=80=80?=
 =?UTF-8?q?=E8=8F=9C=E5=BC=B9=E7=AA=97=E5=85=B3=E9=97=AD=E6=9C=AA=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E9=A4=90=E4=BD=8D=E8=B4=B9=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E6=97=B6=E9=99=90=E5=88=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/extra.vue    | 4 ++--
 pagesOrder/detail/components/tuicai.vue   | 3 ++-
 pagesOrder/detail/detail.vue              | 2 ++
 pagesOrder/index/compoents/order-item.vue | 5 +++--
 pagesOrder/index/index.vue                | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pagesOrder/detail/components/extra.vue b/pagesOrder/detail/components/extra.vue
index ad38e62..0032d6b 100644
--- a/pagesOrder/detail/components/extra.vue
+++ b/pagesOrder/detail/components/extra.vue
@@ -10,14 +10,14 @@
 			</template>
 		</view>
 		<template v-if="data.status!='return'">
-			<view class="u-flex u-row-between u-m-t-20">
+			<view class="u-flex u-row-between u-m-t-24">
 				<view>{{data.name||'餐位费'}}</view>
 				<view>x{{data.number}}</view>
 				<view>￥{{data.totalAmount}}</view>
 			</view>
 		</template>
 		<template v-else>
-			<view class="u-flex u-row-between u-m-t-20 color-999">
+			<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>
diff --git a/pagesOrder/detail/components/tuicai.vue b/pagesOrder/detail/components/tuicai.vue
index a00929f..930ccc6 100644
--- a/pagesOrder/detail/components/tuicai.vue
+++ b/pagesOrder/detail/components/tuicai.vue
@@ -44,7 +44,7 @@
 			</view>
 		</template>
 		<template #btn>
-			<view class="u-p-t-18 u-p-l-30 u-p-r-30 u-p-b-30">
+			<view class="u-p-t-18 u-p-l-30 u-p-r-30 u-p-b-10">
 				<my-button box-shadow shape="circle" @tap="confirm">确认退菜</my-button>
 				<view class="u-m-t-10">
 					<my-button @tap="toggleModelShow" shape="circle" bgColor="#fff" type="cancel"
@@ -133,6 +133,7 @@
 	}
 
 	function onModelClose() {
+		number.value=1
 		modelShow.value = false
 	}
 
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 7d03d3c..724176f 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -75,6 +75,8 @@
 	})
 
 	function onSeatFeeTuicai(seatFee) {
+		seatFee={...seatFee,num:seatFee.number,productName:seatFee.name}
+		console.log(seatFee);
 		tuicai.show = true
 		tuicai.isSeatFee = seatFee
 		tuicai.selGoods = seatFee
diff --git a/pagesOrder/index/compoents/order-item.vue b/pagesOrder/index/compoents/order-item.vue
index 870870c..c9dcd6d 100644
--- a/pagesOrder/index/compoents/order-item.vue
+++ b/pagesOrder/index/compoents/order-item.vue
@@ -40,7 +40,7 @@
 						</view>
 						<view class="u-flex u-flex-1 u-row-right">
 							<view>×{{item.num}}</view>
-							<view class="u-m-l-24 u-text-right" :style="computedPriceStyle()">￥{{item.price}}</view>
+							<view class="u-text-right" :style="computedPriceStyle()">￥{{item.price}}</view>
 						</view>
 					</view>
 				</view>
@@ -98,8 +98,9 @@
 		if (!item) {
 			return ''
 		}
+		const minW=`${item.price}`.length * priceSize + 15
 		return {
-			'min-width': `${item.price}`.length * priceSize + 'px'
+			'min-width':(minW<36?36:minW) + 'px'
 		}
 	}
 	// const computedPriceStyle = computed(() => {
diff --git a/pagesOrder/index/index.vue b/pagesOrder/index/index.vue
index 72888c9..379d18c 100644
--- a/pagesOrder/index/index.vue
+++ b/pagesOrder/index/index.vue
@@ -88,7 +88,7 @@
 	}
 	async function init() {
 		console.log(order.data.query);
-		const {content,totalElements}=await Api.tbOrderInfoData({...order.data.query,page:order.data.query.page,searchText:search.val})
+		const {content,totalElements}=await Api.tbOrderInfoData({...order.data.query,page:order.data.query.page,keyword:search.val})
 		uni.stopPullDownRefresh()
 		order.setVal('list',content)
 		console.log(order.data.list);