合并桌问题与称重退款

pagesOrder/detail/components/list.vue

@@ -4,7 +4,7 @@
 			<text class="">桌号：</text>
 			<text class="">{{orderInfo.tableName||""}}</text>
 		</view>
-		<view class=" font-bold u-p-b-32 border-bottom u-m-b-24">
+		<view class=" font-bold u-p-b-32 border-bottom u-m-b-24" v-if="orderInfo.tableName">
 			<view class="block" @tap="rotatingTables"
 				style="display: flex;align-items: center;justify-content: space-between;">
 				<view>转桌/并桌</view>
@@ -571,11 +571,15 @@
 				res.salePrice = res.price
 				// 数量 number
 				res.number = res.num
+				res.masterId = props.orderInfo.masterId
+				res.useType = props.orderInfo.useType
+				res.tableId = props.orderInfo.tableId
 				arr.push(res)
 			})
 		})
 		uni.navigateTo({
-			url: '/pagesCreateOrder/confirm-order/rotatingTables?item=' + JSON.stringify(arr),
+			url: '/pagesCreateOrder/confirm-order/rotatingTables?item=' + JSON.stringify(arr) + '&tableId=' + props
+				.orderInfo.tableId
 		})
 	}
 	const goodsNumber = computed(() => {