From dd2776fe1313a24df76d426c123e8a04644eb0c2 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 12 Oct 2024 10:23:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../confirm-order/confirm-order.vue           |  9 ++++--
 pagesCreateOrder/index/components/car.vue     |  2 +-
 pagesCreateOrder/index/index.vue              | 32 ++++++++++++-------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue
index 0c9b654..074fbd9 100644
--- a/pagesCreateOrder/confirm-order/confirm-order.vue
+++ b/pagesCreateOrder/confirm-order/confirm-order.vue
@@ -523,6 +523,7 @@
 		}
 		// updateChoseCount()
 		const res = await Api.$createOrder(par)
+		uni.$emit('update:createOrderIndex')
 		console.log($shop.value);
 		console.log(res);
 		if ($shop.value.registerType == 'munchies') {
@@ -534,11 +535,14 @@
 			)
 		} else {
 			//后付
-			if (option.isCreateOrderToDetail) {
+			console.log(option.isCreateOrderToDetail);
+			if (option.isCreateOrderToDetail!='0') {
+				console.log('PAGES_ORDER_DETAIL');
 				go.to('PAGES_ORDER_DETAIL', {
 					id: res.id
 				},'redirect')
 			} else {
+				console.log('back');
 				uni.navigateBack({
 					delta: 2
 				})
@@ -584,9 +588,8 @@
 	}
 
 	onLoad((opt) => {
-		console.log('opt');
-		console.log(opt);
 		Object.assign(option, opt)
+		console.log(option,);
 		if (opt) {
 			table.value = {
 				tableId: opt.tableId,
diff --git a/pagesCreateOrder/index/components/car.vue b/pagesCreateOrder/index/components/car.vue
index 1d5366e..8055baa 100644
--- a/pagesCreateOrder/index/components/car.vue
+++ b/pagesCreateOrder/index/components/car.vue
@@ -126,7 +126,7 @@
 		const {tableId,name,maxCapacity,status,type}=props.table
 		go.to('PAGES_CONFIRM_ORDER',{
 			masterId:props.masterId,type,
-			tableId,name,maxCapacity,status,isCreateOrderToDetail:props.isCreateOrderToDetail
+			tableId,name,maxCapacity,status,isCreateOrderToDetail:props.isCreateOrderToDetail?1:0
 		})
 	}
 
diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index 692ad34..b618e81 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -1,18 +1,21 @@
 <template>
 	<view class="u-wrap">
-
+			
 		<view class="top bg-fff w-full">
-			<view class="u-flex  u-row-between choose-user" @tap="chooseTable">
-				<view>
-					<view v-if="!data.table.tableId">选择桌台</view>
-					<view class="u-flex" v-else>
-						<view class="u-m-l-20">{{data.table.name}}</view>
+			<template v-if="option.type!='add'">
+				<view class="u-flex  u-row-between choose-user" @tap="chooseTable">
+					<view>
+						<view v-if="!data.table.tableId">选择桌台</view>
+						<view class="u-flex" v-else>
+							<view class="u-m-l-20">{{data.table.name}}</view>
+						</view>
+					</view>
+					<view class="u-flex">
+						<uni-icons type="right" size="20" color="#999"></uni-icons>
 					</view>
 				</view>
-				<view class="u-flex">
-					<uni-icons type="right" size="20" color="#999"></uni-icons>
-				</view>
-			</view>
+			</template>
+			
 			<!-- <view class="u-flex  u-row-between choose-user" @tap="chooseUser">
 				<view>
 					<view v-if="!data.vipUser.id">选择用户</view>
@@ -374,8 +377,8 @@
 		await clearCart()
 		cars.length = 0
 		for (let i in data.tabbar) {
-			for (let k in data.tabbar[i].fgoods) {
-				data.tabbar[i].fgoods[k].chooseNumber = 0
+			for (let k in data.tabbar[i].foods) {
+				data.tabbar[i].foods[k].chooseNumber = 0
 			}
 		}
 	}
@@ -997,12 +1000,17 @@
 		watchUpdate()
 	})
 	let isCreateOrderToDetail = ref(false)
+	let option={type:''}
 	onLoad((opt) => {
 		console.log(opt)
+		option=opt
 		Object.assign(data.table, opt)
 		if (opt.useType) {
 			uni.setStorageSync('useType', opt.useType)
 		}
+		uni.setNavigationBarTitle({
+			title:(opt&&opt.type=='add')?'顾客加菜':'代客下单'
+		})
 		if (JSON.stringify(opt) == '{}') {
 			isCreateOrderToDetail.value = true
 		}