From 1f099e2174a6c39a6215735b05707c388720ec02 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 30 Oct 2024 13:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=B8=8A=E7=A9=BA=E5=80=BC=E6=98=AFundefined?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E5=8F=B0=E6=A1=8C=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=92=8C=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8D=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesCreateOrder/choose-table/choose-table.vue |  2 +-
 .../confirm-order/confirm-order.vue            | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pagesCreateOrder/choose-table/choose-table.vue b/pagesCreateOrder/choose-table/choose-table.vue
index 2aeaba7..fbee499 100644
--- a/pagesCreateOrder/choose-table/choose-table.vue
+++ b/pagesCreateOrder/choose-table/choose-table.vue
@@ -166,7 +166,7 @@
 	async function getTable() {
 		// let state=status.list[status.active].key
 		// state=state?(state=='all'?'':state):''
-		const areaId=area.list[area.defaultCateIndex].id
+		const areaId=area.list[area.defaultCateIndex].id||''
 		let {
 			content,total
 		} = await $table.get({...query,areaId,name:searchValue.value,state:'idle'})
diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue
index 9da9aa8..3dd0852 100644
--- a/pagesCreateOrder/confirm-order/confirm-order.vue
+++ b/pagesCreateOrder/confirm-order/confirm-order.vue
@@ -340,7 +340,7 @@
 			//不免餐位费
 			const res = await Api.$choseCount({
 				masterId: option.masterId,
-				tableId: table.value.tableId,
+				tableId: table.value.tableId||'',
 				num: userNumbers.defaultCateIndex+1,
 			})
 			Object.assign($seatFee, res)
@@ -369,7 +369,7 @@
 			isPack,
 			isGift,
 			masterId: option.masterId,
-			tableId: table.value.tableId,
+			tableId: table.value.tableId||'',
 			productId,
 			num: number,
 			skuId
@@ -427,7 +427,7 @@
 		console.log(option);
 		const submitPar = {
 			masterId: option.masterId,
-			tableId: table.value.tableId,
+			tableId: table.value.tableId||"",
 			vipUserId: user.value.id ? user.value.id : '',
 			type: user.value.id ? 0 : 1 //0 设置 1 取消
 		}
@@ -510,7 +510,7 @@
 		page: 0,
 		size: 300,
 		masterId: option.masterId,
-		tableId: table.value.tableId
+		tableId: table.value.tableId||''
 	}) {
 		const {
 			records,
@@ -550,13 +550,13 @@
 		note: note.value,
 		postPay: true,
 		orderId: '',
-		tableId: table.value.tableId
+		tableId: table.value.tableId||''
 	}) {
 		if (!$shop.value.isTableFee) {
 			//不免餐位费
 			await Api.$choseCount({
 				masterId: option.masterId,
-				tableId: table.value.tableId,
+				tableId: table.value.tableId||"",
 				num: userNumbers.defaultCateIndex+1,
 			})
 		}
@@ -616,7 +616,7 @@
 			cartId: cart.id,
 			productId: cart.productId,
 			skuId: cart.skuId,
-			tableId: option.tableId,
+			tableId: option.tableId||"",
 			note: e.remark,
 			num: cart.number // 0会删除此商品
 		})
@@ -637,7 +637,7 @@
 		console.log(option,);
 		if (opt) {
 			table.value = {
-				tableId: opt.tableId,
+				tableId: opt.tableId||'',
 				name: opt.name
 			}
 		}
@@ -673,7 +673,7 @@
 		}
 		const res = await Api.$changeUseType({
 			useType,
-			tableId,
+			tableId:tableId||'',
 			cartIds: goods.list.map((v) => v.id),
 		})
 		getCart()