合并桌问题与称重退款

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(() => {

pagesOrder/detail/components/tuicai.vue

@@ -6,22 +6,23 @@
 					{{data.productName}}
 				</view>
 				<view class="u-flex  u-m-t-32" :class="{'gray':data.productId=='-999'}">
-					<up-number-box :min="1" :max="data.num" :buttonSize="44" v-model="number" integer :disabled="data.productId=='-999'">
+					<up-number-box :min="0" :max="data.num" :buttonSize="44" v-model="number" integer
+						:disabled="data.productId=='-999'">
 						<template #minus>
 							<view class="minus number-box-btn">
 							</view>
 						</template>
 						<template #input>
 							<view class="u-flex-1 u-row-center u-text-center input">
-								<up-input
-								 :disabled="data.productId=='-999'"
-								 @change="parseIntNumber($event,false)" @blur="parseIntNumber($event,true)"
-									v-model="number" border="none" type="number"></up-input>
+								<up-input :disabled="data.productId=='-999'" @change="parseIntNumber($event,false)"
+									@blur="parseIntNumber($event,true)" v-model="number" border="none"
+									type="number"></up-input>
 							</view>
 						</template>
 						<template #plus>
 							<view class="plus number-box-btn">
-								<up-icon v-if="data.productId=='-999'" name="plus" color="#ccc" size="16" bold></up-icon>
+								<up-icon v-if="data.productId=='-999'" name="plus" color="#ccc" size="16"
+									bold></up-icon>
 								<up-icon v-else name="plus" color="#999" size="16" bold></up-icon>
 							</view>
 						</template>
@@ -50,8 +51,7 @@
 			<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="onModelClose" shape="circle" bgColor="#fff" type="cancel"
-						box-shadow>取消</my-button>
+					<my-button @tap="onModelClose" shape="circle" bgColor="#fff" type="cancel" box-shadow>取消</my-button>
 				</view>
 			</view>
 
@@ -71,7 +71,7 @@
 			type: Object,
 			default: () => {
 				return {
-					productId:'-999'
+					productId: '-999'
 				}
 			}
 		},
@@ -86,7 +86,7 @@
 	const emits = defineEmits(['update:show', 'confirm'])
 	let model = ref(null)
 	let modelShow = ref(props.show)
-	let number = ref(1)
+	let number = ref(0)
 	const tags = ref([{
 		label: "点错",
 		checked: false
@@ -108,8 +108,11 @@
 		if (newval > props.data.num) {
 			newval = props.data.num
 		}
-		if (newval < 1) {
-			newval = 1
+		// 判断是否是称重商品。如果是可以输入小数
+		if (props.data.isWeight != 1) {
+			if (newval < 1) {
+				newval = 1
+			}
 		}
 		if (isNow) {
 			number.value = parseInt(newval)
@@ -138,10 +141,10 @@
 	function toggleModelShow(show) {
 		modelShow.value = show ? true : false
 	}
-	
-	
+
+
 	function onModelClose() {
-		number.value=1
+		number.value = 1
 		modelShow.value = false
 	}
 
@@ -151,17 +154,17 @@
 
 	function open() {
 		model.value.open()
-		if(props.data.productId=='-999'){
-			number.value=props.data.num
+		if (props.data.productId == '-999') {
+			number.value = props.data.num
 		}
 	}
 
 	function close() {
 		model.value.close()
-		tags.value.map(v=>{
-			v.checked=false
+		tags.value.map(v => {
+			v.checked = false
 		})
-		form.note=''
+		form.note = ''
 	}
 
 	function confirm() {
@@ -206,12 +209,14 @@
 	::v-deep .uni-input-input {
 		text-align: center;
 	}
-	.gray{
-		.minus::after{
+
+	.gray {
+		.minus::after {
 			border-color: #ccc;
 		}
-		
+
 	}
+
 	.minus {
 		&::after {
 			content: '';