From ec509d1186b372a4d1235477445419a7e4418dc4 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 11 Oct 2024 15:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=9A=90=E8=97=8F=E4=B8=80=E4=BA=9B=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/list.vue  | 2 +-
 pagesOrder/detail/components/order.vue | 8 ++++----
 pagesOrder/detail/detail.vue           | 7 +++----
 pagesOrder/tuikuan/tuikuan.vue         | 6 +++++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 0e733ac..8b2eaee 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -92,7 +92,7 @@
 				<view class="u-flex u-row-between u-m-t-32">
 					<view>退款原因</view>
 					<view class="color-999">
-						<text class="">0.00</text>
+						<text class="">{{orderInfo.refundRemark||''}}</text>
 					</view>
 				</view>
 				<view class="u-flex u-row-between u-m-t-32 u-p-b-24 border-bottom">
diff --git a/pagesOrder/detail/components/order.vue b/pagesOrder/detail/components/order.vue
index 4143de0..7b44686 100644
--- a/pagesOrder/detail/components/order.vue
+++ b/pagesOrder/detail/components/order.vue
@@ -20,10 +20,10 @@
 			<view>支付方式</view>
 			<view>{{data.payType||''}}</view>
 		</view>
-		<view class="u-flex u-row-between u-m-t-20">
+		<!-- <view class="u-flex u-row-between u-m-t-20">
 			<view>预约时间</view>
 			<view></view>
-		</view>
+		</view> -->
 		<view class="u-flex u-row-between u-m-t-20">
 			<view>下单时间</view>
 			<view><up-text v-if="data.createdAt" mode="date" :text="data.createdAt"></up-text></view>
@@ -32,10 +32,10 @@
 			<view>订单编号</view>
 			<view>{{data.orderNo}}</view>
 		</view>
-		<view class="u-flex u-row-between u-m-t-20">
+		<!-- <view class="u-flex u-row-between u-m-t-20">
 			<view>商家备注</view>
 			<my-button plain shape="circle" :width="160" :height="60">编辑</my-button>
-		</view>
+		</view> -->
 	</view>
 </template>
 
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 9412ce8..22c32d9 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -12,7 +12,7 @@
 				:data="orderDetail.seatFee"></extra-vue>
 		</template>
 		<order-vue :data="orderDetail.info" :table="options" :seatFee="orderDetail.seatFee"></order-vue>
-		<step-vue></step-vue>
+		<!-- <step-vue></step-vue> -->
 		<view style="height: 200rpx;"></view>
 		<view class="u-fixed bottom bg-fff ">
 			<view class="u-flex u-abso">
@@ -95,8 +95,8 @@
 			salePrice
 		} = seatFee
 		go.to('PAGES_ORDER_TUIKUAN', {
-			id:orderDetail.info.id,
-			cartId:seatFee.id,
+			orderId:orderDetail.info.id,
+			id:seatFee.id,
 			productId,
 			productSkuId,
 			productName:name,
@@ -253,7 +253,6 @@
 			for (let i in res.detailList) {
 				const goods = res.detailList[i]
 				if (goods.productName != '客座费') {
-					console.log(goods);
 					if (goodsMap.hasOwnProperty(goods.placeNum)) {
 						goodsMap[goods.placeNum].push(goods)
 					} else {
diff --git a/pagesOrder/tuikuan/tuikuan.vue b/pagesOrder/tuikuan/tuikuan.vue
index 97b4dff..dc2feee 100644
--- a/pagesOrder/tuikuan/tuikuan.vue
+++ b/pagesOrder/tuikuan/tuikuan.vue
@@ -160,9 +160,13 @@
 			return infoBox.showToast('退款商品数量不能为0！')
 		}
 		const selTag=tuikuan.list[tuikuan.sel]
+		const noteResult=`${selTag?selTag:''}${note.value?(','+note.value):''}` 
+		if (!noteResult) {
+			return infoBox.showToast('请输入或选择退款原因！')
+		}
 		await $returnOrder({
 			"orderId": option.orderId,
-			"note":`${selTag?selTag:''}${note.value?(','+note.value):''}` ,
+			"note":noteResult,
 			"orderDetails":orderDetail.goodsList.filter(v=>v.number*1).map(v=>{
 				return {
 					id:v.id,