diff --git a/commons/utils/dict.js b/commons/utils/dict.js
index c0c2995..1a02dc7 100644
--- a/commons/utils/dict.js
+++ b/commons/utils/dict.js
@@ -1,87 +1,260 @@
-
 export default {
-	orderStatus: [
-	    { label: "待支付", type: "unpaid" },
-	    { label: "制作中", type: "in_production" },
-	    { label: "待取餐", type: "wait_out" },
-	    { label: "订单完成", type: "done" },
-	    { label: "申请退单", type: "refunding" },
-	    { label: "退单", type: "refund" },
-	    { label: "部分退单", type: "part_refund" },
-	    { label: "取消订单", type: "cancelled" },
+	orderStatus: [{
+			label: "待支付",
+			type: "unpaid"
+		},
+		{
+			label: "制作中",
+			type: "in_production"
+		},
+		{
+			label: "待取餐",
+			type: "wait_out"
+		},
+		{
+			label: "订单完成",
+			type: "done"
+		},
+		{
+			label: "申请退单",
+			type: "refunding"
+		},
+		{
+			label: "退单",
+			type: "refund"
+		},
+		{
+			label: "部分退单",
+			type: "part_refund"
+		},
+		{
+			label: "取消订单",
+			type: "cancelled"
+		},
 	],
-	orderType: [
-	    { label: "收银", type: "cash" },
-	    { label: "小程序", type: "miniapp" },
+	orderType: [{
+			label: "收银",
+			type: "cash"
+		},
+		{
+			label: "小程序",
+			type: "miniapp"
+		},
 	],
-	dineMode: [
-		{ label: "堂食", type: "dine-in" },
-		{ label: "外带", type: "take-out" },
-		{ label: "外卖", type: "take-away" },
-    ],
-	payType: [
-		{ label: "主扫", type: "main_scan" },
-		{ label: "被扫", type: "back_scan" },
-		{ label: "微信小程序", type: "wechat_mini" },
-		{ label: "支付宝小程序", type: "alipay_mini" },
-		{ label: "会员支付", type: "vip_pay" },
-		{ label: "现金支付", type: "cash_pay" },
-		{ label: "挂账支付", type: "credit_pay" },
-    ],
-	bizCodes: [
-		{ label: "现金充值", type: "cashIn" },
-		{ label: "微信小程序充值", type: "wechatIn" },
-		{ label: "支付宝小程序充值", type: "alipayIn" },
-		{ label: "充值奖励", type: "awardIn" },
-		{ label: "充值退款", type: "rechargeRefund" },
-		{ label: "订单消费", type: "orderPay" },
-		{ label: "订单退款", type: "orderRefund" },
-		{ label: "管理员充值", type: "adminIn" },
-		{ label: "管理员消费", type: "adminOut" },
-    ],
-	platformType: [
-		{ label: '微信小程序', type: 'WX' },
-		{ label: '支付宝小程序', type: 'ALI' },
-		{ label: '收银机客户端', type: 'PC' },
-		{ label: 'PC管理端', type: 'WEB' },
-		{ label: 'APP管理端', type: 'APP' },
-		{ label: '收款码', type: 'H5' },
+	dineMode: [{
+			label: "堂食",
+			type: "dine-in"
+		},
+		{
+			label: "外带",
+			type: "take-out"
+		},
+		{
+			label: "外卖",
+			type: "take-away"
+		},
+	],
+	payType: [{
+			label: "主扫",
+			type: "main_scan"
+		},
+		{
+			label: "被扫",
+			type: "back_scan"
+		},
+		{
+			label: "微信小程序",
+			type: "wechat_mini"
+		},
+		{
+			label: "支付宝小程序",
+			type: "alipay_mini"
+		},
+		{
+			label: "会员支付",
+			type: "vip_pay"
+		},
+		{
+			label: "现金支付",
+			type: "cash_pay"
+		},
+		{
+			label: "挂账支付",
+			type: "credit_pay"
+		},
+	],
+	bizCodes: [{
+			label: "现金充值",
+			type: "cashIn"
+		},
+		{
+			label: "微信小程序充值",
+			type: "wechatIn"
+		},
+		{
+			label: "支付宝小程序充值",
+			type: "alipayIn"
+		},
+		{
+			label: "充值奖励",
+			type: "awardIn"
+		},
+		{
+			label: "充值退款",
+			type: "rechargeRefund"
+		},
+		{
+			label: "订单消费",
+			type: "orderPay"
+		},
+		{
+			label: "订单退款",
+			type: "orderRefund"
+		},
+		{
+			label: "管理员充值",
+			type: "adminIn"
+		},
+		{
+			label: "管理员消费",
+			type: "adminOut"
+		},
+	],
+	platformType: [{
+			label: '微信小程序',
+			type: 'WX'
+		},
+		{
+			label: '支付宝小程序',
+			type: 'ALI'
+		},
+		{
+			label: '收银机客户端',
+			type: 'PC'
+		},
+		{
+			label: 'PC管理端',
+			type: 'WEB'
+		},
+		{
+			label: 'APP管理端',
+			type: 'APP'
+		},
+		{
+			label: '收款码',
+			type: 'H5'
+		},
 	],
 	tableStatus: {
-		idle: { label: "空闲", type: "#3F9EFF" },
-		using: { label: "使用中", type: "#fa5555" },
-		subscribe: { label: "预定", type: "rgb(34, 191, 100)" },
-		closed: { label: "关台", type: "rgb(221,221,221)" },
-		opening: { label: "开台中", type: "#E6A23C" },
-		cleaning: { label: "待清台", type: "#FAAD14" },
-		paying: { label: "结算中", type: "#E6A23C" },
-		unbind: { label: "未绑定", type: "rgb(221,221,221)" }
+		unbound: {
+			label: "未绑定",
+			type: "#909090"
+		},
+		idle: {
+			label: "空闲",
+			type: "#3F9EFF"
+		},
+		ordering: {
+			label: "点餐中",
+			type: "#46AEA4"
+		},
+		unsettled: {
+			label: "未结账",
+			type: "#DD3F41"
+		},
+		paying: {
+			label: "支付中",
+			type: "#909090"
+		},
+		settled: {
+			label: "待清台",
+			type: "#FF9500"
+		},
+		closed: {
+			label: "关台",
+			type: "#DDDDDD"
+		},
+		subscribe: {
+			label: "预定",
+			type: "#58B22C"
+		},
 	},
-	invoicingType: [
-		{ label: '全部', type: '' },
-		{ label: '手动入库', type: 'manual-in' },
-		{ label: '手动出库', type: 'manual-out' },
-		{ label: '盘盈入库', type: 'win-in' },
-		{ label: '盘亏出库', type: 'loss-out' },
-		{ label: '订单退款入库', type: 'other-out' },
-		{ label: '订单消费出库', type: 'order-out' },
-		{ label: '损耗出库', type: 'damage-out' },
+	invoicingType: [{
+			label: '全部',
+			type: ''
+		},
+		{
+			label: '手动入库',
+			type: 'manual-in'
+		},
+		{
+			label: '手动出库',
+			type: 'manual-out'
+		},
+		{
+			label: '盘盈入库',
+			type: 'win-in'
+		},
+		{
+			label: '盘亏出库',
+			type: 'loss-out'
+		},
+		{
+			label: '订单退款入库',
+			type: 'other-out'
+		},
+		{
+			label: '订单消费出库',
+			type: 'order-out'
+		},
+		{
+			label: '损耗出库',
+			type: 'damage-out'
+		},
 	],
-	invoicingType: [
-		{ label: '全部', type: '' },
-		{ label: '手动入库', type: 'manual-in' },
-		{ label: '手动出库', type: 'manual-out' },
-		{ label: '盘盈入库', type: 'win-in' },
-		{ label: '盘亏出库', type: 'loss-out' },
-		{ label: '订单退款入库', type: 'other-out' },
-		{ label: '订单消费出库', type: 'order-out' },
-		{ label: '损耗出库', type: 'damage-out' },
+	invoicingType: [{
+			label: '全部',
+			type: ''
+		},
+		{
+			label: '手动入库',
+			type: 'manual-in'
+		},
+		{
+			label: '手动出库',
+			type: 'manual-out'
+		},
+		{
+			label: '盘盈入库',
+			type: 'win-in'
+		},
+		{
+			label: '盘亏出库',
+			type: 'loss-out'
+		},
+		{
+			label: '订单退款入库',
+			type: 'other-out'
+		},
+		{
+			label: '订单消费出库',
+			type: 'order-out'
+		},
+		{
+			label: '损耗出库',
+			type: 'damage-out'
+		},
 	],
-	refundType: [
-		{ label: '现金退款', type: 'cash' },
-		{ label: '原路退回', type: 'payBack' },
+	refundType: [{
+			label: '现金退款',
+			type: 'cash'
+		},
+		{
+			label: '原路退回',
+			type: 'payBack'
+		},
 	],
-	getDiceName(val,key){
+	getDiceName(val, key) {
 		let item = this[key].find(v => v.type == val)
 		return item ? item.label : ''
 	}
diff --git a/pageTable/index/components/table-item.vue b/pageTable/index/components/table-item.vue
index b43b414..4b07b46 100644
--- a/pageTable/index/components/table-item.vue
+++ b/pageTable/index/components/table-item.vue
@@ -1,194 +1,184 @@
 <template>
 	<view class="item color-fff border-r-12" :class="[computedClass]">
-		<view class="my-bg-main" :style="{'background-color':returnStutasColor(data.status)}">
+		<view class="my-bg-main" :style="{ 'background-color': returnStutasColor(data.status) }">
 			<view class="u-flex u-row-between">
-				<view class="u-font-32">{{data.name}}</view>
+				<view class="u-font-32">{{ data.name }}</view>
 				<view class="u-flex" @tap.stop="more">
 					<uni-icons type="more-filled" color="#fff" size="16"></uni-icons>
 				</view>
 			</view>
 			<view class="u-flex u-m-t-10 u-row-between">
-				<view>{{areaMap[data.areaId]||'' }}</view>
-				<view class="tag" :style="{color:returnStutasColor(data.status)}">
-					{{returnStutasText(data.status)}}
+				<view>{{ areaMap[data.areaId] || '' }}</view>
+				<view class="tag" :style="{ color: returnStutasColor(data.status) }">
+					{{ returnStutasText(data.status) }}
 				</view>
 			</view>
-
 		</view>
 		<view class="u-flex u-flex-col u-row-center u-col-center bg-fff bottom">
-			<template v-if="data.status!='using'">
-				<view class="  u-font-32" :style="{color:returnStutasColor(data.status)}">
-					{{returnStutasText(data.status)}}~
-				</view>
+			<template v-if="data.status != 'using'">
+				<view class="u-font-32" :style="{ color: returnStutasColor(data.status) }">{{ returnStutasText(data.status) }}~</view>
 			</template>
-			<view class=" w-full u-p-l-16 u-p-r-16 u-p-t-16 u-font-24">
-				<template v-if="data.status=='using'&& data.orderId">
+			<view class="w-full u-p-l-16 u-p-r-16 u-p-t-16 u-font-24">
+				<template v-if="data.status == 'using' && data.orderId">
 					<view class="color-666 u-text-left u-p-b-20 border-bottom">
-						<view class=""><text>已点</text><text class="u-m-l-20 color-333">{{data.productNum||0}}件</text>
+						<view class="">
+							<text>已点</text>
+							<text class="u-m-l-20 color-333">{{ data.productNum || 0 }}件</text>
+						</view>
+						<view class="u-m-t-10">
+							<text>金额</text>
+							<text class="u-m-l-20 color-333">{{ data.totalAmount || 0 }} 元</text>
+						</view>
+						<view class="u-m-t-10">
+							<text>待结</text>
+							<text class="u-m-l-20 color-333">{{ data.totalAmount || 0 }} 元</text>
 						</view>
-						<view class="u-m-t-10"><text>金额</text><text class="u-m-l-20 color-333">{{data.totalAmount||0}}
-								元</text> </view>
-						<view class="u-m-t-10"><text>待结</text><text class="u-m-l-20 color-333">{{data.totalAmount||0}}
-								元</text> </view>
 					</view>
-					<view class="u-flex u-row-between  u-font-20 u-p-b-20 u-p-t-20">
+					<view class="u-flex u-row-between u-font-20 u-p-b-20 u-p-t-20">
 						<text class="color-333">开台时间</text>
-						<text class="color-666"> {{data.useTime}}</text>
+						<text class="color-666">{{ data.useTime }}</text>
 					</view>
 				</template>
 				<template v-else>
 					<view class="u-flex u-row-center u-m-t-16">
 						<template v-if="data.id">
-							<template v-if="data.status =='unbind' ">
-								<my-button color="#333" :width="200" :height="56" type="default" @click="bind">
-									绑定码牌
-								</my-button>
+							<template v-if="data.status == 'unbind'">
+								<my-button color="#333" :width="200" :height="56" type="default" @click="bind">绑定码牌</my-button>
 							</template>
-							<template v-if="data.status=='idle'||(data.status=='using'&&!data.orderId) ">
-								<my-button color="#333" :width="150" :height="56" type="default" @click="diancan">
-									选择
-								</my-button>
+							<template v-if="data.status == 'idle' || (data.status == 'using' && !data.orderId)">
+								<my-button color="#333" :width="150" :height="56" type="default" @click="diancan">选择</my-button>
 							</template>
-							<template v-if="data.status=='cleaning' ">
-								<my-button color="#333" :width="150" :height="56" type="default" @click="qingtai">
-									清台
-								</my-button>
+							<template v-if="data.status == 'cleaning'">
+								<my-button color="#333" :width="150" :height="56" type="default" @click="qingtai">清台</my-button>
 							</template>
 						</template>
-						<my-button v-else :width="150" :height="56" type="default" disabled>
-							选择
-						</my-button>
+						<my-button v-else :width="150" :height="56" type="default" disabled>选择</my-button>
 					</view>
 				</template>
-
-
 			</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
-	import { computed, ref } from 'vue';
-	import myButton from '@/components/my-components/my-button'
-	import go from '@/commons/utils/go.js'
-	import { hasPermission } from '@/commons/utils/hasPermission.js'
-	import { shopTableClear } from '@/http/api/table.js'
-	
-	const emits = defineEmits(['more', 'update', 'bind'])
-	const props = defineProps({
-		data: {
-			type: Object,
-			default: () => {
-				return {}
-			}
-		},
-		areaMap: {
-			type: Object,
-			default: () => {}
+import { computed, ref } from 'vue';
+import myButton from '@/components/my-components/my-button';
+import go from '@/commons/utils/go.js';
+import { hasPermission } from '@/commons/utils/hasPermission.js';
+import { shopTableClear } from '@/http/api/table.js';
+
+const emits = defineEmits(['more', 'update', 'bind']);
+const props = defineProps({
+	data: {
+		type: Object,
+		default: () => {
+			return {};
 		}
-	})
-
-	const computedClass = computed(() => {
-		return props.data.status
-	})
-
-	function returnStutasText(key) {
-		const item = uni.$dict.tableStatus[key]
-		return item ? item.label : ''
+	},
+	areaMap: {
+		type: Object,
+		default: () => {}
 	}
-	
-	function returnStutasColor(key) {
-		const item = uni.$dict.tableStatus[key]
-		return item ? item.type : ''
+});
+
+const computedClass = computed(() => {
+	return props.data.status;
+});
+
+function returnStutasText(key) {
+	const item = uni.$dict.tableStatus[key];
+	return item ? item.label : '';
+}
+
+function returnStutasColor(key) {
+	const item = uni.$dict.tableStatus[key];
+	return item ? item.type : '';
+}
+
+/**
+ * 更多
+ */
+function more() {
+	if (props.data.status == 'done') {
+		return uni.showToast({
+			icon: 'none',
+			title: '桌台关闭中！'
+		});
 	}
+	emits('more');
+}
 
+/**
+ * 绑定码牌
+ */
+function bind() {
+	emits('bind', props.data);
+}
 
-	/**
-	 * 更多
-	 */
-	function more() {
-		if(props.data.status=='done'){
-			return uni.showToast({
-				icon:'none',
-				title:'桌台关闭中！'
-			})
+/**
+ * 选择下单
+ */
+async function diancan() {
+	hasPermission('允许下单').then((res) => {
+		console.log(res);
+		if (res) {
+			const useType = props.status == 'using' ? props.data.useType : undefined;
+			console.log(props.data);
+			go.to('PAGES_CREATE_ORDER', props.data);
 		}
-		emits('more')
-	}
-	
-	/**
-	 * 绑定码牌
-	 */
-	function bind() {
-		emits('bind',props.data)
-	}
-	
-	/**
-	 * 选择下单
-	 */
-	async function diancan() {
-		hasPermission('允许下单').then(res=>{
-			console.log(res)
-			if(res){
-				const useType = props.status == 'using' ? props.data.useType : undefined
-				console.log(props.data)
-				go.to('PAGES_CREATE_ORDER', props.data)
+	});
+}
+
+/**
+ * 清台
+ */
+function qingtai() {
+	let item = props.data;
+	uni.showModal({
+		title: '提示',
+		content: '确定要清台：' + item.name + '？',
+		success(res) {
+			if (res.confirm) {
+				shopTableClear({
+					id: item.id
+				}).then((res) => {
+					uni.$utils.showToast('清台成功');
+					emits('update');
+				});
 			}
-		})
-		
-	}
-	
-	/**
-	 * 清台
-	 */
-	function qingtai() {
-		let item = props.data
-		uni.showModal({
-			title: '提示',
-			content: '确定要清台：' + item.name + '？',
-			success(res) {
-				if (res.confirm) {
-					shopTableClear({
-						id: item.id,
-					}).then(res => {
-						uni.$utils.showToast('清台成功')
-						emits('update')
-					})
-				}
-			}
-		})
-	}
+		}
+	});
+}
 </script>
 
 <style lang="scss" scoped>
-	.item {
-		width: 330rpx;
-		box-sizing: border-box;
-		overflow: hidden;
-		box-shadow: 1px 1px 0 #eee;
-		border-color: #eee;
-
-		.bottom {
-			min-height: 224rpx;
-		}
-
-		.my-bg-main {
-			padding: 32rpx 28rpx;
-
-			.tag {
-				background-color: rgba(255, 255, 255, .7);
-				font-size: 24rpx;
-				color: $my-main-color;
-				border-radius: 8rpx;
-				padding: 2rpx 10rpx;
-			}
-		}
-
-		&.using {
-			.tag {
-				color: rgb(250, 85, 85);
-			}
-		}
+.item {
+	width: 330rpx;
+	box-sizing: border-box;
+	overflow: hidden;
+	box-shadow: 1px 1px 0 #eee;
+	border-color: #eee;
 
+	.bottom {
+		min-height: 224rpx;
 	}
-</style>
\ No newline at end of file
+
+	.my-bg-main {
+		padding: 24rpx 28rpx;
+
+		.tag {
+			background-color: rgba(255, 255, 255, 0.7);
+			font-size: 24rpx;
+			color: $my-main-color;
+			border-radius: 8rpx;
+			padding: 2rpx 10rpx;
+		}
+	}
+
+	&.using {
+		.tag {
+			color: rgb(250, 85, 85);
+		}
+	}
+}
+</style>
diff --git a/pageTable/index/index.vue b/pageTable/index/index.vue
index ccc01a7..dda36f5 100644
--- a/pageTable/index/index.vue
+++ b/pageTable/index/index.vue
@@ -1,28 +1,29 @@
 <template>
-	<view class="color-333 u-font-28  min-page bg-gray ">
-	
+	<view class="color-333 u-font-28 min-page bg-gray">
 		<up-sticky>
-			<view class="bg-fff u-p-l-30   u-p-b-30 u-relative">
-		
+			<view class="bg-fff u-p-l-30 u-p-b-30 u-relative">
 				<view class="input-wrapper">
 					<view class="input-main">
 						<view class="u-flex u-p-r-30 u-font-28" @click="pageData.statusShow = !pageData.statusShow">
-							<text class="u-m-r-10 u-line-1 " :class="{'color-main':pageData.query.status!=''}"
-								style="max-width: 100rpx;">{{pageData.statusName }}</text>
+							<text class="u-m-r-10 u-line-1" :class="{ 'color-main': pageData.query.status != '' }" style="max-width: 100rpx">{{ pageData.statusName }}</text>
 							<up-icon name="arrow-down" size="16"></up-icon>
 						</view>
-						<uni-easyinput clearable class='jeepay-search' :inputBorder="false"
+						<uni-easyinput
+							clearable
+							class="jeepay-search"
+							:inputBorder="false"
 							trim="all"
-							placeholder="搜索" 
+							placeholder="搜索"
 							v-model="pageData.query.name"
 							@clear="searchConfirm"
-							@confirm="searchConfirm">
+							@confirm="searchConfirm"
+						>
 							<template #prefixIcon>
 								<image src="@/static/iconImg/icon-search.svg" class="input-icon" />
 							</template>
 						</uni-easyinput>
 						<view class="u-m-l-4">
-							<button class="" type="text" @click="searchConfirm"> <text class="color-333">搜索</text></button>
+							<button class="" type="text" @click="searchConfirm"><text class="color-333">搜索</text></button>
 						</view>
 					</view>
 				</view>
@@ -30,423 +31,427 @@
 		</up-sticky>
 
 		<view class="list u-p-30">
-			<view class="my-bg-main table-type u-flex border-r-12 color-fff ">
-				<view class="item u-p-20" :class="{sel:pageData.area.sel===item.id}" @tap="changeAreaSel(item)"
-					v-for="(item,index) in pageData.area.list" :key="index">
+			<view class="my-bg-main table-type u-flex border-r-12 color-fff">
+				<view class="item u-p-20" :class="{ sel: pageData.area.sel == '' }" @tap="changeAreaSel({ id: '' })">
 					<view class="box">
-						<view class='up-line-1'>{{item.name}}</view>
-						<view class="u-m-t-10">0/12</view>
+						<view class="up-line-1">全部</view>
+						<!-- <view class="u-m-t-10">0/12</view> -->
+					</view>
+				</view>
+				<view class="item u-p-20" :class="{ sel: pageData.area.sel === item.id }" @tap="changeAreaSel(item)" v-for="(item, index) in pageData.area.list" :key="index">
+					<view class="box">
+						<view class="up-line-1">{{ item.name }}</view>
+						<!-- <view class="u-m-t-10">0/12</view> -->
 					</view>
 				</view>
 			</view>
-			
-			<view class="u-m-t-30 ">
+
+			<view class="u-m-t-30">
 				<template v-if="pageData.tabList.length">
 					<view class="u-flex u-flex-wrap u-row-between">
-						<view class="u-m-b-30" v-for="(item,index) in pageData.tabList" :key="index">
+						<view class="u-m-b-30" v-for="(item, index) in pageData.tabList" :key="index">
 							<table-item @bind="scanCode" @update="getTable" :areaMap="pageData.areaMap" @more="moreShow(item)" :data="item"></table-item>
 						</view>
 					</view>
-						<my-pagination :page="pageData.query.page" :totalElements="pageData.totalElements" :size="pageData.query.size"
-							@change="pageChange"></my-pagination>
+					<my-pagination :page="pageData.query.page" :totalElements="pageData.totalElements" :size="pageData.query.size" @change="pageChange"></my-pagination>
 				</template>
-				
-				<my-img-empty v-if="pageData.hasAjax&&!pageData.tabList.length" tips="未找到相关桌台"></my-img-empty>
+
+				<my-img-empty v-if="pageData.hasAjax && !pageData.tabList.length" tips="未找到相关桌台"></my-img-empty>
 			</view>
 		</view>
-
 	</view>
-	<my-action-sheet :active="4" @itemClick="actionSheetClick" ref="refMoreSheet" :list="actionSheet.list"
-		:title="actionSheet.title">
+	<my-action-sheet :active="4" @itemClick="actionSheetClick" ref="refMoreSheet" :list="actionSheet.list" :title="actionSheet.title">
 		<template #title>
-			<view class="color-999 u-p-30 u-text-center border-bottom">桌号：{{actionSheet.title}}</view>
+			<view class="color-999 u-p-30 u-text-center border-bottom">桌号：{{ actionSheet.title }}</view>
 		</template>
 	</my-action-sheet>
-	<up-picker :show="pageData.statusShow" :columns="pageData.statusList" keyName="label" @cancel="pageData.statusShow=false" @confirm="confirmStatus" ></up-picker>
+	<up-picker :show="pageData.statusShow" :columns="pageData.statusList" keyName="label" @cancel="pageData.statusShow = false" @confirm="confirmStatus"></up-picker>
 </template>
 
 <script setup>
-	import { onLoad, onReady, onShow, } from '@dcloudio/uni-app';
-	import { ref, reactive, computed, watch } from 'vue';
-	
-	import tableItem from './components/table-item'
-	
-	import go from '@/commons/utils/go.js';
-	import myActionSheet from '@/components/my-components/my-action-sheet';
-	import { hasPermission } from '@/commons/utils/hasPermission.js'
-	
-	import { getShopTable, shopTableBind, shopTableClear } from '@/http/api/table.js'
-	import { getShopArea } from '@/http/api/area.js'
-	import { printOrder } from '@/http/api/order.js'
-	import { getHistoryOrder } from '@/http/api/order.js'
-	
-	const pageData = reactive({
-		statusShow: false,
-		hasAjax: false,
-		areaMap: {},
-		query: {
-			page: 1,
-			size: 10,
-			status: '',
-			areaId: '',
-			name: '',
-		},
-		totalElements:0,
-		statusList: [[{
-			key: '',
-			label: '全部'
-		},...uni.$utils.objToArrary(uni.$dict.tableStatus)]],
-		statusName: '全部',
-		tabList: [],
-		area: {
-			list: [],
-			sel: ''
-		},
-		orderInfo: null,
-	})
+import { onLoad, onReady, onShow } from '@dcloudio/uni-app';
+import { ref, reactive, computed, watch } from 'vue';
 
-	const refMoreSheet = ref(null)
-	const actionSheet = reactive({
-		list: ['结账', '清台', '增减菜', '换台', '打印订单', '历史订单','绑定码牌'],
-		title: '',
-		selTable: ''
-	})
+import tableItem from './components/table-item';
 
-	watch(() => pageData.area.sel, (newval) => {
-		pageData.query.page = 1
-		getTable()
-	})
+import go from '@/commons/utils/go.js';
+import myActionSheet from '@/components/my-components/my-action-sheet';
+import { hasPermission } from '@/commons/utils/hasPermission.js';
 
-	onShow(opt => {
-		getData()
-	})
-	function getData() {
-		getTable()
-		getArea()
-	}
+import { getShopTable, shopTableBind, shopTableClear } from '@/http/api/table.js';
+import { getShopArea } from '@/http/api/area.js';
+import { printOrder } from '@/http/api/order.js';
+import { getHistoryOrder } from '@/http/api/order.js';
 
-	/**
-	 * 获取桌台列表
-	 */
-	async function getTable() {
-		const res = await getShopTable(pageData.query)
-		pageData.hasAjax = true
-		pageData.tabList = res.records
-		pageData.totalElements = res.totalRow
-	}
-	
-	/**
-	 * 获取区域
-	 */
-	async function getArea() {
-		const res = await getShopArea({ name: '', page: 1, size: 300 })
-		pageData.area.list = res.records
-		pageData.areaMap = res.records.reduce((prve, cur) => {
-			prve[cur.id] = cur.name
-			return prve
-		}, {})
-	}
-	
-	/**
-	 * 类型选择
-	 * @param {Object} e
-	 */
-	function confirmStatus(e){
-		pageData.statusShow = false
-		pageData.query.status = e.value[0].key
-		pageData.statusName = e.value[0].label
-		getTable()
-	}
+const pageData = reactive({
+	statusShow: false,
+	hasAjax: false,
+	areaMap: {},
+	query: {
+		page: 1,
+		size: 10,
+		status: '',
+		areaId: '',
+		name: ''
+	},
+	totalElements: 0,
+	statusList: [
+		[
+			{
+				key: '',
+				label: '全部'
+			},
+			...uni.$utils.objToArrary(uni.$dict.tableStatus)
+		]
+	],
+	statusName: '全部',
+	tabList: [],
+	area: {
+		list: [],
+		sel: ''
+	},
+	orderInfo: null
+});
 
-	/**
-	 * 区域选择确定
-	 * @param {Object} item
-	 */
-	function changeAreaSel(item) {
-		pageData.area.sel = item.id
-		pageData.query.areaId = item.id
-	}
-	
-	/**
-	 * 更多操作打开
-	 * @param {Object} table
-	 */
-	function moreShow(table) {
-		actionSheet.title = table.name
-		actionSheet.selTable = table
-		refMoreSheet.value.open()
-		if( actionSheet.selTable.orderId ){
-			getHistoryOrder({orderId: actionSheet.selTable.orderId}).then(res=>{
-				pageData.orderInfo = res
-			})
-		}
-	}
-	
-	/**
-	 * 更多操作选择
-	 * @param {Object} index
-	 */
-	async function actionSheetClick(index) {
-		console.log(index);
-		const item = actionSheet.selTable
-		if (index == 0) {
-			if (!item.orderId) {
-				return uni.$utils.showToast('该桌台暂无要结账的订单！')
-			}
-			const canJieZhang = await hasPermission('允许收款')
-			if(!canJieZhang){
-				return
-			}
-			return  toPay(item)
-		}
-		if (index == 1) {
-			//清台
-			return uni.showModal({
-				title: '提示',
-				content: '确定要清台：' + item.name + '？',
-				success(res) {
-					if (res.confirm) {
-						shopTableClear({
-							id: item.id,
-						}).then(res => {
-							uni.$utils.showToast('清台成功')
-							pageData.query.page = 1
-							getTable()
-						})
-					}
-				}
-			})
-		}
-		if (index == 2) {
-			return uni.$utils.showToast('待开放，请敬请期待！')
-		}
-		if (index == 3) {
-			return uni.$utils.showToast('待开放，请敬请期待！')
-		}
-		if (index == 4) {
-			//打印订单
-			if (!item.orderId) {
-				return uni.$utils.showToast('该桌台暂无要打印的订单！')
-			}							
-			
-			let res = await printOrder( {id: actionSheet.selTable.orderId, type: pageData.orderInfo.status == 'unpaid' ? 1 : 0 } )
-			return
-		}
-		if (index == 6) {
-			//绑定码牌
-			scanCode(item)
-			return
-		}
-		 uni.$utils.showToast('待开放，请敬请期待！')
-	}
-	
-	/**
-	 * 去结账
-	 * @param {Object} item
-	 */
-	function toPay(item) {
-		go.to('PAGES_ORDER_PAY', {
-			tableId: item.id,
-			tableName: item.name,
-			orderId: item.orderId,
-			discount: 1,
-			userId: item.userId
-		})
-	}
-	
-	/**
-	 * 绑定码牌
-	 * @param {Object} item
-	 */
-	function scanCode(item) {
-		
-		uni.scanCode({
-			onlyFromCamera: true,
-			success: function(res) {
-				console.log('条码类型：' + res.scanType);
-				console.log('条码内容：' + res.result);
-				let params = getQueryString(res.result);
-				shopTableBind({
-					"tableCode": params.code,
-					"id": item.id,
-				}).then(res => {
-					uni.$utils.showToast('桌台绑定成功')
-					setTimeout(()=>{
-						getTable()
-					},1500)
-				})
-			}
-		});
-	}
-	
-	/**
-	 * 解码
-	 * @param {Object} url
-	 */
-	function getQueryString(url) {
-		let params = {};
-		// 正则表达式来匹配URL中的查询字符串
-		let reg = /(?:\?|#|&){1}([^=]*)=([^&]*)/g;
-		url.replace(reg, (match, key, value) => {
-	        params[key] = value;
-		});
-		return params;
-		
-	}
+const refMoreSheet = ref(null);
+const actionSheet = reactive({
+	list: ['结账', '清台', '增减菜', '换台', '打印订单', '历史订单', '绑定码牌'],
+	title: '',
+	selTable: ''
+});
 
-	/**
-	 * 搜索
-	 */
-	function searchConfirm() {
+watch(
+	() => pageData.area.sel,
+	(newval) => {
 		pageData.query.page = 1;
-		getTable()
+		getTable();
 	}
+);
 
-	/**
-	 * 页数改变事件
-	 * @param {Object} page
-	 */
-	function pageChange(page) {
-		pageData.query.page = page
-		getTable()
+onShow((opt) => {
+	getData();
+});
+function getData() {
+	getTable();
+	getArea();
+}
+
+/**
+ * 获取桌台列表
+ */
+async function getTable() {
+	const res = await getShopTable(pageData.query);
+	pageData.hasAjax = true;
+	pageData.tabList = res.records;
+	pageData.totalElements = res.totalRow;
+}
+
+/**
+ * 获取区域
+ */
+async function getArea() {
+	const res = await getShopArea({ name: '', page: 1, size: 300 });
+	pageData.area.list = res.records;
+	pageData.areaMap = res.records.reduce((prve, cur) => {
+		prve[cur.id] = cur.name;
+		return prve;
+	}, {});
+}
+
+/**
+ * 类型选择
+ * @param {Object} e
+ */
+function confirmStatus(e) {
+	pageData.statusShow = false;
+	pageData.query.status = e.value[0].key;
+	pageData.statusName = e.value[0].label;
+	getTable();
+}
+
+/**
+ * 区域选择确定
+ * @param {Object} item
+ */
+function changeAreaSel(item) {
+	pageData.area.sel = item.id;
+	pageData.query.areaId = item.id;
+}
+
+/**
+ * 更多操作打开
+ * @param {Object} table
+ */
+function moreShow(table) {
+	actionSheet.title = table.name;
+	actionSheet.selTable = table;
+	refMoreSheet.value.open();
+	if (actionSheet.selTable.orderId) {
+		getHistoryOrder({ orderId: actionSheet.selTable.orderId }).then((res) => {
+			pageData.orderInfo = res;
+		});
 	}
+}
 
+/**
+ * 更多操作选择
+ * @param {Object} index
+ */
+async function actionSheetClick(index) {
+	console.log(index);
+	const item = actionSheet.selTable;
+	if (index == 0) {
+		if (!item.orderId) {
+			return uni.$utils.showToast('该桌台暂无要结账的订单！');
+		}
+		const canJieZhang = await hasPermission('允许收款');
+		if (!canJieZhang) {
+			return;
+		}
+		return toPay(item);
+	}
+	if (index == 1) {
+		//清台
+		return uni.showModal({
+			title: '提示',
+			content: '确定要清台：' + item.name + '？',
+			success(res) {
+				if (res.confirm) {
+					shopTableClear({
+						id: item.id
+					}).then((res) => {
+						uni.$utils.showToast('清台成功');
+						pageData.query.page = 1;
+						getTable();
+					});
+				}
+			}
+		});
+	}
+	if (index == 2) {
+		return uni.$utils.showToast('待开放，请敬请期待！');
+	}
+	if (index == 3) {
+		return uni.$utils.showToast('待开放，请敬请期待！');
+	}
+	if (index == 4) {
+		//打印订单
+		if (!item.orderId) {
+			return uni.$utils.showToast('该桌台暂无要打印的订单！');
+		}
 
+		let res = await printOrder({ id: actionSheet.selTable.orderId, type: pageData.orderInfo.status == 'unpaid' ? 1 : 0 });
+		return;
+	}
+	if (index == 6) {
+		//绑定码牌
+		scanCode(item);
+		return;
+	}
+	uni.$utils.showToast('待开放，请敬请期待！');
+}
+
+/**
+ * 去结账
+ * @param {Object} item
+ */
+function toPay(item) {
+	go.to('PAGES_ORDER_PAY', {
+		tableId: item.id,
+		tableName: item.name,
+		orderId: item.orderId,
+		discount: 1,
+		userId: item.userId
+	});
+}
+
+/**
+ * 绑定码牌
+ * @param {Object} item
+ */
+function scanCode(item) {
+	uni.scanCode({
+		onlyFromCamera: true,
+		success: function (res) {
+			console.log('条码类型：' + res.scanType);
+			console.log('条码内容：' + res.result);
+			let params = getQueryString(res.result);
+			shopTableBind({
+				tableCode: params.code,
+				id: item.id
+			}).then((res) => {
+				uni.$utils.showToast('桌台绑定成功');
+				setTimeout(() => {
+					getTable();
+				}, 1500);
+			});
+		}
+	});
+}
+
+/**
+ * 解码
+ * @param {Object} url
+ */
+function getQueryString(url) {
+	let params = {};
+	// 正则表达式来匹配URL中的查询字符串
+	let reg = /(?:\?|#|&){1}([^=]*)=([^&]*)/g;
+	url.replace(reg, (match, key, value) => {
+		params[key] = value;
+	});
+	return params;
+}
+
+/**
+ * 搜索
+ */
+function searchConfirm() {
+	pageData.query.page = 1;
+	getTable();
+}
+
+/**
+ * 页数改变事件
+ * @param {Object} page
+ */
+function pageChange(page) {
+	pageData.query.page = page;
+	getTable();
+}
 </script>
 
 <style lang="scss" scoped>
-	.fixed-top {
-		z-index: 10;
-	}
-	.input-wrapper {
+.fixed-top {
+	z-index: 10;
+}
+.input-wrapper {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding-top: 26rpx;
+	background-color: $J-bg-ff;
+
+	.input-main {
+		flex: 1;
 		display: flex;
-		justify-content: space-between;
 		align-items: center;
-		padding-top: 26rpx;
-		background-color: $J-bg-ff;
-	
-		.input-main {
+		height: 64rpx;
+
+		image {
+			padding: 22rpx;
+			width: 26rpx;
+			height: 26rpx;
+		}
+
+		input {
 			flex: 1;
-			display: flex;
-			align-items: center;
-			height: 64rpx;
-	
-			image {
-				padding: 22rpx;
-				width: 26rpx;
-				height: 26rpx;
-			}
-	
-			input {
-				flex: 1;
-				font-size: 27rpx;
-			}
-	
-			::v-deep uni-button {
-				font-size: 28rpx;
-				color: $my-main-color;
-				background: rgba(255, 255, 255, 1);
-			}
-	
-			::v-deep.uni-easyinput {
-				.uni-easyinput__content {
-					background-color: $J-bg-f5 !important;
-					border-radius: $J-b-r12;
-	
-					.uni-easyinput__content-input {
-						padding-left: 0 !important;
-	
-						.uni-input-input {
-							border-radius: $J-b-r12 !important;
-							overflow: hidden !important;
-						}
-					}
-	
-					.uni-input-placeholder {
-						font-size: 27rpx;
-					}
-	
-					.uni-icons {
-						color: rgba(230, 230, 230, 1) !important;
+			font-size: 27rpx;
+		}
+
+		::v-deep uni-button {
+			font-size: 28rpx;
+			color: $my-main-color;
+			background: rgba(255, 255, 255, 1);
+		}
+
+		::v-deep.uni-easyinput {
+			.uni-easyinput__content {
+				background-color: $J-bg-f5 !important;
+				border-radius: $J-b-r12;
+
+				.uni-easyinput__content-input {
+					padding-left: 0 !important;
+
+					.uni-input-input {
+						border-radius: $J-b-r12 !important;
+						overflow: hidden !important;
 					}
 				}
+
+				.uni-input-placeholder {
+					font-size: 27rpx;
+				}
+
+				.uni-icons {
+					color: rgba(230, 230, 230, 1) !important;
+				}
 			}
 		}
 	}
+}
 
-	.table-type {
-		flex-wrap: wrap;
-		padding: 0 10rpx 0 10rpx;
+.table-type {
+	flex-wrap: wrap;
+	padding: 0 10rpx 0 10rpx;
 
-		.item {
-			width: 25%;
-			margin-bottom: 10rpx;
+	.item {
+		width: 25%;
+		margin-bottom: 10rpx;
 
+		.box {
+			position: relative;
+			padding: 10rpx;
+			border-radius: 10rpx;
+
+			&::after {
+				position: absolute;
+				display: block;
+				content: '';
+				top: 0;
+				bottom: 0;
+				width: 2px;
+				border-radius: 2px;
+				right: -20rpx;
+				background-color: rgba(255, 255, 255, 0.5);
+			}
+		}
+
+		&:nth-of-type(4n) {
+			.box::after {
+				background-color: transparent;
+			}
+		}
+
+		&.sel {
 			.box {
-				position: relative;
-				padding: 10rpx;
-				border-radius: 10rpx;
-
-				&::after {
-					position: absolute;
-					display: block;
-					content: '';
-					top: 0;
-					bottom: 0;
-					width: 2px;
-					border-radius: 2px;
-					right: -20rpx;
-					background-color: rgba(255, 255, 255, .5);
-				}
-			}
-
-			&:nth-of-type(4n) {
-				.box::after {
-					background-color: transparent;
-				}
-			}
-
-			&.sel {
-				.box {
-					background-color: rgba(255, 255, 255, .6);
-				}
+				background-color: rgba(255, 255, 255, 0.6);
 			}
 		}
 	}
+}
 
-
-	.search-box {
-		background-color: #fff;
-		padding: 16rpx 0;
+.search-box {
+	background-color: #fff;
+	padding: 16rpx 0;
+	display: flex;
+	.search-btn {
+		padding: 0 30rpx;
+		box-sizing: border-box;
 		display: flex;
-		.search-btn {
-			padding: 0 30rpx;
-			box-sizing: border-box;
-			display: flex;
-			align-items: center;
-			// width: 164rpx;
-			transition: all .3s ease-in-out;
-			background-color: rgb(247, 247, 247);
-			border-radius: 100px;
-		}
+		align-items: center;
+		// width: 164rpx;
+		transition: all 0.3s ease-in-out;
+		background-color: rgb(247, 247, 247);
+		border-radius: 100px;
 	}
+}
 
-	.status {
-		position: absolute;
-		top: 100%;
-		left: 0;
-		right: 0;
-		z-index: 10;
-		background-color: #fff;
-	}
+.status {
+	position: absolute;
+	top: 100%;
+	left: 0;
+	right: 0;
+	z-index: 10;
+	background-color: #fff;
+}
 
+.icon-arrow-down-fill {
+	width: 16rpx;
+	height: 10rpx;
+}
 
-	.icon-arrow-down-fill {
-		width: 16rpx;
-		height: 10rpx;
-	}
-
-	.list {
-		// margin-top: 52px;
-	}
-</style>
\ No newline at end of file
+.list {
+	// margin-top: 52px;
+}
+</style>
diff --git a/pageTable/index/tableStatus.js b/pageTable/index/tableStatus.js
new file mode 100644
index 0000000..0908a19
--- /dev/null
+++ b/pageTable/index/tableStatus.js
@@ -0,0 +1,41 @@
+export default [{
+		label: "未绑定",
+		type: "unbound",
+		color: "#909090",
+	},
+	{
+		label: "空闲",
+		type: "idle",
+		color: "#3F9EFF",
+	},
+	{
+		label: "点餐中",
+		type: "ordering",
+		color: "#46AEA4",
+	},
+	{
+		label: "未结账",
+		type: "unsettled",
+		color: "#DD3F41",
+	},
+	{
+		label: "支付中",
+		type: "paying",
+		color: "#909090",
+	},
+	{
+		label: "待清台",
+		type: "settled ",
+		color: "#FF9500",
+	},
+	{
+		label: "关台",
+		type: "closed",
+		color: "#DDDDDD",
+	},
+	{
+		label: "预定",
+		type: "subscribe",
+		color: "#58B22C",
+	},
+];
\ No newline at end of file
diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue
index 36553c9..85d8bb9 100644
--- a/pagesCreateOrder/confirm-order/confirm-order.vue
+++ b/pagesCreateOrder/confirm-order/confirm-order.vue
@@ -1,1073 +1,1066 @@
 <template>
 	<view class="page-gray color-333 u-font-28">
 		<template v-if="true">
-			<view class="block u-p-t-32 u-p-b-32" v-if="pageData.table&&pageData.table.id">
+			<view class="block u-p-t-32 u-p-b-32" v-if="pageData.table && pageData.table.id">
 				<view>桌位号</view>
 				<view class="font-bold u-font-32 u-m-t-16">
-					{{pageData.table.name||''}}
+					{{ pageData.table.name || '' }}
 				</view>
 			</view>
 			<view class="block">
 				<view class="u-p-b-24 u-m-b-24 border-bottom">
 					<view>选择用户</view>
-					<view class="u-m-t-24 u-flex u-row-between " @tap="chooseUser">
-						<view v-if="!pageData.user||!pageData.user.id">选择用户</view>
-						<view class="u-flex" v-if="pageData.user&&pageData.user.id">
+					<view class="u-m-t-24 u-flex u-row-between" @tap="chooseUser">
+						<view v-if="!pageData.user || !pageData.user.id">选择用户</view>
+						<view class="u-flex" v-if="pageData.user && pageData.user.id">
 							<up-avatar :src="pageData.user.headImg" shape="square" :size="30"></up-avatar>
-							
+
 							<view class="u-m-l-20">
-								<view class="">{{pageData.user.nickName}}</view>
+								<view class="">{{ pageData.user.nickName }}</view>
 							</view>
-							<view class="u-font-24 u-m-l-30 u-text-center"><text>余额：</text><text
-									class="color-main">{{pageData.user.amount}}</text>
+							<view class="u-font-24 u-m-l-30 u-text-center">
+								<text>余额：</text>
+								<text class="color-main">{{ pageData.user.amount }}</text>
+							</view>
+							<view class="u-font-24 u-m-l-30 u-text-center">
+								<text>积分：</text>
+								<text class="color-main">{{ pageData.user.accountPoints }}</text>
 							</view>
-							<view class="u-font-24 u-m-l-30 u-text-center"><text>积分：</text><text
-									class="color-main">{{pageData.user.accountPoints}}</text></view>
 						</view>
 						<uni-icons type="right" color="#999" size="20" bold></uni-icons>
 					</view>
 				</view>
 				<view class="  ">
 					<view>就餐类型</view>
-					<view class="u-m-t-24 u-flex  ">
+					<view class="u-m-t-24 u-flex">
 						<view class="u-flex color-666">
-							<up-radio-group :disabled="option.type=='add'" v-model="pageData.eatTypes.active" placement="row">
-								<up-radio :customStyle="{marginRight: '30px'}" v-for="(item, index) in pageData.eatTypes.list"
-									:key="index" :label="item.name" :name="item.value">
-								</up-radio>
+							<up-radio-group :disabled="option.type == 'add'" v-model="pageData.eatTypes.active" placement="row">
+								<up-radio
+									:customStyle="{ marginRight: '30px' }"
+									v-for="(item, index) in pageData.eatTypes.list"
+									:key="index"
+									:label="item.name"
+									:name="item.value"
+								></up-radio>
 							</up-radio-group>
 						</view>
 					</view>
 				</view>
-
 			</view>
 
-			<template v-if="pageData.user&&pageData.user.id">
+			<template v-if="pageData.user && pageData.user.id">
 				<view class="block">
 					<view class="">
-						<view class="u-flex border-bottom u-p-b-24 ">
+						<view class="u-flex border-bottom u-p-b-24">
 							<up-avatar :src="pageData.user.headImg" shape="square" :size="60"></up-avatar>
 							<!-- <image class="headeimg" src="@/static/uni.png" mode=""></image> -->
 							<view class="u-m-l-32">
-								<view class="">{{pageData.user.nickName}}</view>
-								<view class="color-main  u-font-24">{{pageData.user.isVip?'会员':'' }}</view>
+								<view class="">{{ pageData.user.nickName }}</view>
+								<view class="color-main u-font-24">{{ pageData.user.isVip ? '会员' : '' }}</view>
 							</view>
 						</view>
 						<view class="u-flex u-m-t-24 u-row-between u-font-24 color-999">
 							<view class="u-flex">
 								<view>余额</view>
-								<view class="color-333 u-m-l-10"> {{pageData.user.amount}}</view>
+								<view class="color-333 u-m-l-10">{{ pageData.user.amount }}</view>
 							</view>
 							<view class="u-flex">
 								<view>积分</view>
-								<view class="color-333 u-m-l-10"> {{pageData.user.accountPoints}}</view>
+								<view class="color-333 u-m-l-10">{{ pageData.user.accountPoints }}</view>
 							</view>
 							<view class="u-flex">
 								<view class="u-text-center">订单数量</view>
-								<view class="color-333 u-m-l-10">{{pageData.user.orderNumber||0}}</view>
+								<view class="color-333 u-m-l-10">{{ pageData.user.orderNumber || 0 }}</view>
 							</view>
 						</view>
 					</view>
 				</view>
 			</template>
-			<template v-if="!pageData.shopInfo.isTableFee&&pageData.table&&pageData.table.id">
+			<template v-if="!pageData.shopInfo.isTableFee && pageData.table && pageData.table.id">
 				<!-- 不免餐位费 -->
 				<view class="block">
 					<view class="   ">
 						<view>用餐人数（人）</view>
-						<picker @change="userNumberChange" :value="userNumbers.defaultCateIndex"
-							:range="userNumbers.list">
-							<view class="u-m-t-24 u-flex u-row-between ">
-								<view class="color-333">{{userNumbers.defaultCateIndex*1+1+'人'}}</view>
+						<picker @change="userNumberChange" :value="userNumbers.defaultCateIndex" :range="userNumbers.list">
+							<view class="u-m-t-24 u-flex u-row-between">
+								<view class="color-333">{{ userNumbers.defaultCateIndex * 1 + 1 + '人' }}</view>
 								<uni-icons type="right" color="#999" size="16"></uni-icons>
 							</view>
 						</picker>
 					</view>
 				</view>
 			</template>
-		<!-- 	<template v-if="goods.list[0].tableId&&goods.list[0].orderId">
+			<!-- 	<template v-if="goods.list[0].tableId&&goods.list[0].orderId">
 				<view class="block" @tap="rotatingTables"
 					style="display: flex;align-items: center;justify-content: space-between;">
 					<view>转桌/并桌</view>
 					<uni-icons type="right" color="#999" size="16"></uni-icons>
 				</view>
 			</template> -->
-
 		</template>
 
 		<view class="block">
-			<view class="u-p-b-24  ">
+			<view class="u-p-b-24">
 				<view class="font-bold">订单备注</view>
-				<view class="u-m-t-32 u-flex ">
+				<view class="u-m-t-32 u-flex">
 					<uni-easyinput type="textarea" v-model="pageData.form.note" placeholder="请输入备注"></uni-easyinput>
 				</view>
 			</view>
-
 		</view>
 
 		<view class="block u-m-b-0">
 			<view class="u-flex">
 				<view>共</view>
-				<view class="fen font-bold">{{goods.list.length}}</view>
+				<view class="fen font-bold">{{ goods.list.length }}</view>
 				<view>份菜品</view>
 			</view>
 
 			<view class="goods u-m-t-32">
-				<view class="item u-m-b-48" @click="changeGoodsSel(index)" v-for="(item,index) in goods.list"
-					:key="index">
-					<view class="u-flex u-row-between ">
+				<view class="item u-m-b-48" @click="changeGoodsSel(index)" v-for="(item, index) in goods.list" :key="index">
+					<view class="u-flex u-row-between">
 						<view class="u-flex">
 							<image class="img" v-if="item.coverImg" :src="item.coverImg" mode=""></image>
-							<view
-								style="background-color: #3f9eff;	width: 84rpx;height: 84rpx;line-height: 84rpx;text-align: center;color: #fff;"
-								v-else>
-								临时菜
-							</view>
+							<view style="background-color: #3f9eff; width: 84rpx; height: 84rpx; line-height: 84rpx; text-align: center; color: #fff" v-else>临时菜</view>
 							<view class="u-m-l-32">
 								<view class="u-flex">
-									<view class="u-flex u-m-r-20" v-if="item.is_wait_call" style="flex-shrink: 0;" >
-										<uni-tag text="等叫"
-											custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;">
-										</uni-tag>
+									<view class="u-flex u-m-r-20" v-if="item.is_wait_call" style="flex-shrink: 0">
+										<uni-tag text="等叫" custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;"></uni-tag>
 									</view>
-									<view class="u-m-r-20 u-flex" v-if="item.is_gift" style="flex-shrink: 0;" >
-										<uni-tag text="赠送"
-											custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;">
-										</uni-tag>
+									<view class="u-m-r-20 u-flex" v-if="item.is_gift" style="flex-shrink: 0">
+										<uni-tag text="赠送" custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;"></uni-tag>
 									</view>
-									<view class="u-m-r-20 u-flex" v-if="item.pack_number>0" style="flex-shrink: 0;" >
+									<view class="u-m-r-20 u-flex" v-if="item.pack_number > 0" style="flex-shrink: 0">
 										<uni-tag
 											custom-style="background-color: #E6F0FF; border-color: #E6F0FF; color: #318AFE;"
-											size="small" text="打包" inverted type="success" />
+											size="small"
+											text="打包"
+											inverted
+											type="success"
+										/>
 									</view>
-									<view class="u-m-r-20 u-flex" v-if="item.is_print" style="flex-shrink: 0;" >
+									<view class="u-m-r-20 u-flex" v-if="item.is_print" style="flex-shrink: 0">
 										<uni-tag
 											custom-style="background-color: #E6F0FF; border-color: #E6F0FF; color: #318AFE;"
-											size="small" text="打印" inverted type="success" />
+											size="small"
+											text="打印"
+											inverted
+											type="success"
+										/>
 									</view>
 									<view>
-										{{item.name}}
+										{{ item.name }}
 									</view>
 								</view>
-								<view class="u-font-24 color-999 u-m-t-10">{{item.specInfo||' '}}</view>
+								<view class="u-font-24 color-999 u-m-t-10">{{ item.specInfo || ' ' }}</view>
 							</view>
 						</view>
 						<view class="">
-							<view class=" u-relative">
+							<view class="u-relative">
 								<template v-if="item.is_gift">
-									<text class="line-th color-999">￥{{$utils.toFixed(item.lowPrice*item.number,item) }}</text>
-									<view class="u-absolute" style="right: 0;bottom: 100%;">
+									<text class="line-th color-999">￥{{ $utils.toFixed(item.lowPrice * item.number, item) }}</text>
+									<view class="u-absolute" style="right: 0; bottom: 100%">
 										<text class="font-bold">￥0</text>
 									</view>
 								</template>
 								<template v-else>
-									<template v-if="item.discount_sale_amount&&item.discount_sale_amount*1>0">
-										<text
-											class="line-th color-999">￥{{$utils.toFixed(item.lowPrice*item.number,item) }}</text>
-										<view class="u-absolute" style="right: 0;bottom: 100%;">
-											<text
-												class="font-bold">￥{{$utils.toFixed(item.discount_sale_amount*item.number,item) }}</text>
+									<template v-if="item.discount_sale_amount && item.discount_sale_amount * 1 > 0">
+										<text class="line-th color-999">￥{{ $utils.toFixed(item.lowPrice * item.number, item) }}</text>
+										<view class="u-absolute" style="right: 0; bottom: 100%">
+											<text class="font-bold">￥{{ $utils.toFixed(item.discount_sale_amount * item.number, item) }}</text>
 										</view>
 									</template>
-									<template v-else-if="isVip&&item.lowMemberPrice&&item.lowMemberPrice*1!=item.lowPrice*1">
-										<text
-											class="line-th color-999">￥{{$utils.toFixed(item.lowPrice*item.number,item) }}</text>
-										<view class="u-absolute" style="right: 0;bottom: 100%;">
-											<text
-												class="font-bold">￥{{$utils.toFixed(item.lowMemberPrice*item.number,item) }}</text>
+									<template v-else-if="isVip && item.lowMemberPrice && item.lowMemberPrice * 1 != item.lowPrice * 1">
+										<text class="line-th color-999">￥{{ $utils.toFixed(item.lowPrice * item.number, item) }}</text>
+										<view class="u-absolute" style="right: 0; bottom: 100%">
+											<text class="font-bold">￥{{ $utils.toFixed(item.lowMemberPrice * item.number, item) }}</text>
 										</view>
 									</template>
 									<template v-else>
 										<view class="font-bold">
 											<text>￥</text>
-											<text class="">{{$utils.toFixed(item.lowPrice*item.number,item) }}</text>
+											<text class="">{{ $utils.toFixed(item.lowPrice * item.number, item) }}</text>
 										</view>
 									</template>
-
 								</template>
 							</view>
-							<view class="color-999 u-text-right u-font-24 u-m-t-12">×{{item.number}}</view>
+							<view class="color-999 u-text-right u-font-24 u-m-t-12">×{{ item.number }}</view>
 						</view>
 					</view>
 					<template v-if="item.remark">
 						<view class="u-p-20 bg-gray u-m-t-16">
-							{{item.remark}}
+							{{ item.remark }}
 						</view>
 					</template>
-					<scroll-view class="u-m-t-32" scroll-x="true" v-if="index==goods.sel">
-						<view class="  u-flex no-wrap  ">
-							<view class="u-flex u-m-r-20 " v-if="!item.is_gift">
-								<button class="tag" hover-class="hover-class"
-									@tap="showModel('discount',index)">单品打折</button>
+					<scroll-view class="u-m-t-32" scroll-x="true" v-if="index == goods.sel">
+						<view class="u-flex no-wrap">
+							<view class="u-flex u-m-r-20" v-if="!item.is_gift">
+								<button class="tag" hover-class="hover-class" @tap="showModel('discount', index)">单品打折</button>
 							</view>
-							<view class="u-flex u-m-r-20 ">
+							<view class="u-flex u-m-r-20">
 								<!-- <button class="tag" hover-class="hover-class" @tap="showModel('giveFood')">赠菜</button> -->
-								<button class="tag" hover-class="hover-class"
-									@tap="toggleItem(item,'is_gift')">{{item.is_gift?'取消赠送':'赠送'}}</button>
+								<button class="tag" hover-class="hover-class" @tap="toggleItem(item, 'is_gift')">{{ item.is_gift ? '取消赠送' : '赠送' }}</button>
 							</view>
-							<view class="u-flex u-m-r-20 ">
-								<button class="tag" hover-class="hover-class"
-									@tap="showModel('packNumber',index,item)">{{item.pack_number>0?'取消打包':'打包'}}</button>
+							<view class="u-flex u-m-r-20">
+								<button class="tag" hover-class="hover-class" @tap="showModel('packNumber', index, item)">{{ item.pack_number > 0 ? '取消打包' : '打包' }}</button>
 							</view>
-							<view class="u-flex u-m-r-20 ">
-								<button class="tag" hover-class="hover-class"
-									@tap="toggleItem(item,'is_wait_call')">{{item.is_wait_call?'取消等叫':'等叫'}}</button>
+							<view class="u-flex u-m-r-20">
+								<button class="tag" hover-class="hover-class" @tap="toggleItem(item, 'is_wait_call')">{{ item.is_wait_call ? '取消等叫' : '等叫' }}</button>
 							</view>
-							<view class="u-flex u-m-r-20 ">
-								<button class="tag" hover-class="hover-class"
-									@tap="toggleItem(item,'is_print')">{{item.is_print?'免厨打':'打印'}}</button>
+							<view class="u-flex u-m-r-20">
+								<button class="tag" hover-class="hover-class" @tap="toggleItem(item, 'is_print')">{{ item.is_print ? '免厨打' : '打印' }}</button>
 							</view>
-							<view class="u-flex u-m-r-20 ">
-								<button class="tag" hover-class="hover-class"
-									@tap="showModel('remark',index)">单品备注</button>
+							<view class="u-flex u-m-r-20">
+								<button class="tag" hover-class="hover-class" @tap="showModel('remark', index)">单品备注</button>
 							</view>
 						</view>
 					</scroll-view>
 				</view>
 			</view>
 			<view class="border-bottom">
-				<template v-if="$seatFee&&$seatFee.totalAmount">
-					<view class="u-flex u-row-between u-m-t-18 u-p-b-34 ">
+				<template v-if="$seatFee && $seatFee.totalAmount">
+					<view class="u-flex u-row-between u-m-t-18 u-p-b-34">
 						<view>
 							<text>桌位费</text>
 						</view>
-						<view>￥{{$seatFee.totalAmount.toFixed(2)||'0.00'}}</view>
+						<view>￥{{ $seatFee.totalAmount.toFixed(2) || '0.00' }}</view>
 					</view>
 				</template>
-				<template v-if="$packFee>0">
-					<view class="u-flex u-row-between u-m-t-18 u-p-b-34 ">
+				<template v-if="$packFee > 0">
+					<view class="u-flex u-row-between u-m-t-18 u-p-b-34">
 						<view>
 							<text>打包费</text>
 						</view>
-						<view>￥{{$packFee||'0.00'}}</view>
+						<view>￥{{ $packFee || '0.00' }}</view>
 					</view>
 				</template>
 			</view>
 
-
-
 			<view class="u-flex u-row-between u-m-t-38">
 				<view class="u-flex">
-					<view class="u-flex price" v-if="youhui*1>0">
+					<view class="u-flex price" v-if="youhui * 1 > 0">
 						<view class="">优惠金额</view>
-						<view class="font-bold u-font-32">￥{{$utils.toFixed(youhui) }}</view>
+						<view class="font-bold u-font-32">￥{{ $utils.toFixed(youhui) }}</view>
 					</view>
 				</view>
 
-				<view class="u-flex price  u-m-l-32">
+				<view class="u-flex price u-m-l-32">
 					<view class="">实收金额</view>
-					<view class="font-bold u-font-32">￥{{allPrice }}</view>
+					<view class="font-bold u-font-32">￥{{ allPrice }}</view>
 				</view>
 			</view>
-
-
 		</view>
 
-		<view :style="{height:bottomHeight+'px'}"></view>
+		<view :style="{ height: bottomHeight + 'px' }"></view>
 		<view class="safe-bottom fixed">
-
-
-			<view class="btn ">
+			<view class="btn">
 				<my-button shape="circle" @click="createAnOrder">
 					<view class="font-bold u-font-32">
-						{{(pageData.shopInfo.registerType=='before'||pageData.eatTypes.active=='take-out')?'结算': '下单'}}
+						{{ pageData.shopInfo.registerType == 'before' || pageData.eatTypes.active == 'take-out' ? '结算' : '下单' }}
 					</view>
 				</my-button>
 			</view>
-
 		</view>
-		<model-discount title="菜品减免" :ref="setModel" name="discount" :price="modelData.data.salePrice"
-			@confirm="discountconfirm"></model-discount>
+		<model-discount title="菜品减免" :ref="setModel" name="discount" :price="modelData.data.salePrice" @confirm="discountconfirm"></model-discount>
 		<give-food title="赠菜" :ref="setModel" name="giveFood"></give-food>
 		<one-remark @confirm="goodsOneRemarkConfirm" title="单品备注" :ref="setModel" name="remark"></one-remark>
 		<pack-number @confirm="goodsOnePackNumberConfirm" title="打包" :ref="setModel" name="packNumber"></pack-number>
 		<!-- <edit-discount title="优惠金额" :ref="setModel" name="editMoney" :price="allPrice"></edit-discount> -->
 	</view>
-
-
 </template>
 
 <script setup>
-	import { onLoad, onReady, onShow,onHide } from '@dcloudio/uni-app'
-	import { ref, inject, onUnmounted, nextTick, reactive, computed, watch } from 'vue';
-	
-	import modelDiscount from './components/discount'
-	import giveFood from './components/give-food'
-	import packNumber from './components/pack-number'
-	import oneRemark from './components/remark'
-	// import editDiscount from '@/pagesCreateOrder/components/edit-discount.vue'
-	
-	import { getSafeBottomHeight } from '@/commons/utils/safe-bottom.js'
-	import go from '@/commons/utils/go.js';
-	import { hasPermission } from '@/commons/utils/hasPermission.js'
-	import { getNowCart } from '@/pagesCreateOrder/util.js'
-	import { number } from 'uview-plus/libs/function/test';
-	
-	import { getShopInfo } from '@/http/api/shop.js'
-	import { getShopTableDetail } from '@/http/api/table.js'
-	import { getProductList } from '@/http/api/product.js'
-	import { createOrder,getHistoryOrder } from '@/http/api/order.js'
-	
-	const models = new Map();
-	const modelData = reactive({
-		data: {},
-		selIndex: -1
-	})
-	const option = reactive({
-		id: '',
-		tableId: "",
-	})
-	/**
-	 * 用餐人数
-	 */
-	const userNumbers = reactive({
-		list: new Array(100).fill(1).map((v, index) => {
-			// return index === 0 ? '无' : index + '人'
-			return (index + 1) + '人'
-		}),
-		defaultCateIndex: 0,
-	})
-	const f = reactive({})
-	
-	let $goods = []
-	const goods = reactive({
-		list: [],
-		sel: 0
-	})
-	const pageData = reactive({
-		shopInfo: {},
-		table: {},
-		user: {},
-		eatTypes: {
-			list: [{
-					name: "堂食",
-					value: "dine-in",
-				},
-				{
-					name: "外带",
-					value: "take-out",
-				}
-				// ,
-				// {
-				// 	name: "外卖",
-				// 	value: "take-away",
-				// }
-			],
-			active: 'dine-in',
-			isShow: false,
-		},
-		form: {
-			note: ""
-		},
-		orderInfo: {}
-	})
-	const websocketUtil = inject('websocketUtil'); // 注入 WebSocket 工具类实例
-	onLoad((opt) => {
-		Object.assign(option, opt)
-		console.log("opt====",opt);
-		if (opt.tableId||opt.tableCode) {
-			pageData.table.id = opt.tableId
-			pageData.table.tableCode = opt.tableCode
-		}
-		pageData.shopInfo = uni.getStorageSync('shopInfo')
-		getTbShopInfo()
-	
-	})
-	let bottomHeight = ref(100)
-	onReady(() => {
-		getSafeBottomHeight('safe-bottom').then(res => {
-			bottomHeight.value = res
-		})
-	})
-	watch(() => userNumbers.defaultCateIndex, (newval) => {
-		updateChoseCount()
-	})
+import { onLoad, onReady, onShow, onHide } from '@dcloudio/uni-app';
+import { ref, inject, onUnmounted, nextTick, reactive, computed, watch } from 'vue';
 
-	watch(() => pageData.eatTypes.active, (newval) => {
-		pageData.eatTypes.isShow = true
-		changeUseType()
-	})
-	onShow(() => {
-		init()
-		watchChooseuser()
-		watchChooseTable()
-	})
-	onHide(() => {
-		console.log("onHide")
-		websocketUtil.offMessage()
-	})
-	onUnmounted(() => {  
-		console.log("onUnmounted")
-		websocketUtil.offMessage()
-	}); 
-	
-	/**
-	 * 获取订单详情
-	 * @param {Object} tableCode
-	 */
-	async function getHistoryOrderDetail(tableCode){
-		let res = await getHistoryOrder({tableCode:tableCode});
-		pageData.orderInfo = res;
-	}
-	
-	//餐位费
-	const $seatFee = reactive({
-		totalNumber: 0,
-		totalAmount: 0,
-	})
-	
-	/**
-	 * 打包费
-	 */
-	const $packFee = computed(() => {
-		let packAmount = 0;
-		return goods.list.reduce((prve, cur) => {
-			return prve + (cur.packFee||0)*parseFloat(cur.pack_number).toFixed(2)
-		}, 0).toFixed(2)
-	})
-	
-	/**
-	 * 菜品数量
-	 */
-	const goodsNumber = computed(() => {
-		const result = goods.list.reduce((prve, cur) => {
-			return prve + cur.number
-		}, 0)
-		return result
-	})
+import modelDiscount from './components/discount';
+import giveFood from './components/give-food';
+import packNumber from './components/pack-number';
+import oneRemark from './components/remark';
+// import editDiscount from '@/pagesCreateOrder/components/edit-discount.vue'
 
-	/**
-	 * 判断是否是会员
-	 */
-	const isVip = computed(() => {
-		return pageData.shopInfo.isMemberPrice && pageData.user && pageData.user.id && pageData.user.isVip
-	})
-	
-	const discount_sale_amount = computed(() => {
-		return goods.list.filter((v) => v.discount_sale_amount && v.discount_sale_amount > 0)
-			.reduce((a, b) => {
-				const lowMemberPrice = b.lowMemberPrice ? b.lowMemberPrice : b.lowPrice
-				const tPrice = (isVip.value ? lowMemberPrice : b.lowPrice)
-				return a + b.number * (tPrice-b.discount_sale_amount);
-			}, 0);
-	})
-	
-	const goodsPrice = computed(() => {
-		const goodsTotalPrice = goods.list.reduce((prve, cur) => {
-			const lowMemberPrice = cur.lowMemberPrice ? cur.lowMemberPrice : cur.lowPrice
-			const tPrice = Math.floor(((isVip.value ? lowMemberPrice : cur.lowPrice) * cur.number)*100)/100
-			return prve + (cur.is_gift ? 0 : tPrice)
-		}, 0)
-		const tpackFee = $packFee.value > 0 ? $packFee.value*1 : 0
-	
-		return ((goodsTotalPrice - discount_sale_amount.value + tpackFee) || 0).toFixed(2)
-	})
-	
-	/**
-	 * 实收金额
-	 */
-	const allPrice = computed(() => {
-		const n = goodsPrice.value * 1 + $seatFee.totalAmount
-		return n.toFixed(2)
-	})
-	
-	/**
-	 * 计算优惠金额
-	 */
-	const youhui = computed(() => {
-		let goodsTotalPrice = 0
-		if (pageData.user && pageData.user.id && pageData.user.isVip) {
-			goodsTotalPrice = goods.list.reduce((prve, cur) => {
-				const tPrice = cur.lowPrice * cur.number
-				const tpackFee = (cur.pack_number*1) > 0 ? cur.packFee * (cur.pack_number*1) : 0
-				return prve + tPrice + tpackFee 
-			}, 0)
-			return (goodsTotalPrice + $seatFee.totalAmount) - allPrice.value
-		} else {
-			return (discount_sale_amount.value)
-		}
-		return (goodsTotalPrice + discount_sale_amount.value * 1).toFixed(2)
-	})
-	
-	/**
-	 * init
-	 */
-	async function init() {
-		nextTick(()=>{
-			onMessage()
-		})
-		// 获取商品列表
-		$goods = await getProductList({},'product', false)
-		// console.log("商品列表===",$goods)
-		getTableInfo(pageData.table)
-		
+import { getSafeBottomHeight } from '@/commons/utils/safe-bottom.js';
+import go from '@/commons/utils/go.js';
+import { hasPermission } from '@/commons/utils/hasPermission.js';
+import { getNowCart } from '@/pagesCreateOrder/util.js';
+import { number } from 'uview-plus/libs/function/test';
+
+import { getShopInfo } from '@/http/api/shop.js';
+import { getShopTableDetail } from '@/http/api/table.js';
+import { getProductList } from '@/http/api/product.js';
+import { createOrder, getHistoryOrder } from '@/http/api/order.js';
+
+const models = new Map();
+const modelData = reactive({
+	data: {},
+	selIndex: -1
+});
+const option = reactive({
+	id: '',
+	tableId: ''
+});
+/**
+ * 用餐人数
+ */
+const userNumbers = reactive({
+	list: new Array(100).fill(1).map((v, index) => {
+		// return index === 0 ? '无' : index + '人'
+		return index + 1 + '人';
+	}),
+	defaultCateIndex: 0
+});
+const f = reactive({});
+
+let $goods = [];
+const goods = reactive({
+	list: [],
+	sel: 0
+});
+const pageData = reactive({
+	shopInfo: {},
+	table: {},
+	user: {},
+	eatTypes: {
+		list: [
+			{
+				name: '堂食',
+				value: 'dine-in'
+			},
+			{
+				name: '外带',
+				value: 'take-out'
+			}
+			// ,
+			// {
+			// 	name: "外卖",
+			// 	value: "take-away",
+			// }
+		],
+		active: 'dine-in',
+		isShow: false
+	},
+	form: {
+		note: ''
+	},
+	orderInfo: {}
+});
+const websocketUtil = inject('websocketUtil'); // 注入 WebSocket 工具类实例
+onLoad((opt) => {
+	Object.assign(option, opt);
+	console.log('opt====', opt);
+	if (opt.tableId || opt.tableCode) {
+		pageData.table.id = opt.tableId;
+		pageData.table.tableCode = opt.tableCode;
 	}
-	
-	/**
-	 * socket消息监听
-	 */
-	function onMessage() {
-		websocketUtil.offMessage()
-		websocketUtil.onMessage(res => {  
-			let msg = JSON.parse(res);
-			console.log(msg)
-			let cartItem;
-			if( msg.msg_id ){
-				websocketUtil.send(JSON.stringify({
+	pageData.shopInfo = uni.getStorageSync('shopInfo');
+	getTbShopInfo();
+});
+let bottomHeight = ref(100);
+onReady(() => {
+	getSafeBottomHeight('safe-bottom').then((res) => {
+		bottomHeight.value = res;
+	});
+});
+watch(
+	() => userNumbers.defaultCateIndex,
+	(newval) => {
+		updateChoseCount();
+	}
+);
+
+watch(
+	() => pageData.eatTypes.active,
+	(newval) => {
+		pageData.eatTypes.isShow = true;
+		changeUseType();
+	}
+);
+onShow(() => {
+	init();
+	watchChooseuser();
+	watchChooseTable();
+});
+onHide(() => {
+	console.log('onHide');
+	websocketUtil.offMessage();
+});
+onUnmounted(() => {
+	console.log('onUnmounted');
+	websocketUtil.offMessage();
+});
+
+/**
+ * 获取订单详情
+ * @param {Object} tableCode
+ */
+async function getHistoryOrderDetail(tableCode) {
+	let res = await getHistoryOrder({ tableCode: tableCode });
+	pageData.orderInfo = res;
+}
+
+//餐位费
+const $seatFee = reactive({
+	totalNumber: 0,
+	totalAmount: 0
+});
+
+/**
+ * 打包费
+ */
+const $packFee = computed(() => {
+	let packAmount = 0;
+	return goods.list
+		.reduce((prve, cur) => {
+			return prve + (cur.packFee || 0) * parseFloat(cur.pack_number).toFixed(2);
+		}, 0)
+		.toFixed(2);
+});
+
+/**
+ * 菜品数量
+ */
+const goodsNumber = computed(() => {
+	const result = goods.list.reduce((prve, cur) => {
+		return prve + cur.number;
+	}, 0);
+	return result;
+});
+
+/**
+ * 判断是否是会员
+ */
+const isVip = computed(() => {
+	return pageData.shopInfo.isMemberPrice && pageData.user && pageData.user.id && pageData.user.isVip;
+});
+
+const discount_sale_amount = computed(() => {
+	return goods.list
+		.filter((v) => v.discount_sale_amount && v.discount_sale_amount > 0)
+		.reduce((a, b) => {
+			const lowMemberPrice = b.lowMemberPrice ? b.lowMemberPrice : b.lowPrice;
+			const tPrice = isVip.value ? lowMemberPrice : b.lowPrice;
+			return a + b.number * (tPrice - b.discount_sale_amount);
+		}, 0);
+});
+
+const goodsPrice = computed(() => {
+	const goodsTotalPrice = goods.list.reduce((prve, cur) => {
+		const lowMemberPrice = cur.lowMemberPrice ? cur.lowMemberPrice : cur.lowPrice;
+		const tPrice = Math.floor((isVip.value ? lowMemberPrice : cur.lowPrice) * cur.number * 100) / 100;
+		return prve + (cur.is_gift ? 0 : tPrice);
+	}, 0);
+	const tpackFee = $packFee.value > 0 ? $packFee.value * 1 : 0;
+
+	return (goodsTotalPrice - discount_sale_amount.value + tpackFee || 0).toFixed(2);
+});
+
+/**
+ * 实收金额
+ */
+const allPrice = computed(() => {
+	const n = goodsPrice.value * 1 + $seatFee.totalAmount;
+	return n.toFixed(2);
+});
+
+/**
+ * 计算优惠金额
+ */
+const youhui = computed(() => {
+	let goodsTotalPrice = 0;
+	if (pageData.user && pageData.user.id && pageData.user.isVip) {
+		goodsTotalPrice = goods.list.reduce((prve, cur) => {
+			const tPrice = cur.lowPrice * cur.number;
+			const tpackFee = cur.pack_number * 1 > 0 ? cur.packFee * (cur.pack_number * 1) : 0;
+			return prve + tPrice + tpackFee;
+		}, 0);
+		return goodsTotalPrice + $seatFee.totalAmount - allPrice.value;
+	} else {
+		return discount_sale_amount.value;
+	}
+	return (goodsTotalPrice + discount_sale_amount.value * 1).toFixed(2);
+});
+
+/**
+ * init
+ */
+async function init() {
+	nextTick(() => {
+		onMessage();
+	});
+	// 获取商品列表
+	$goods = await getProductList({}, 'product', false);
+	// console.log("商品列表===",$goods)
+	getTableInfo(pageData.table);
+}
+
+/**
+ * socket消息监听
+ */
+function onMessage() {
+	websocketUtil.offMessage();
+	websocketUtil.onMessage((res) => {
+		let msg = JSON.parse(res);
+		console.log(msg);
+		let cartItem;
+		if (msg.msg_id) {
+			websocketUtil.send(
+				JSON.stringify({
 					type: 'receipt',
-					msg_id: msg.msg_id,
-				}))
-			}
-			if( msg.status == 0 ){
-				infoBox.showToast(msg.msg||'操作失败')
-				return false;
-			}
-			
-			switch (msg.operate_type) {
-				case 'onboc_init':
-					goods.list = []
-					console.log(msg.data)
-					msg.data.map(item=>{
-						cartItem = getNowCart(item,$goods,pageData.user)
-						console.log(cartItem)
-						if( cartItem.isGrounding||cartItem.is_temporary == 1 ){
-							cartControls(cartItem,'add')
-						} else {
-							delCart(cartItem.id)
-						}
-						
-					})
-					if( pageData.eatTypes.isShow ){
-						if( pageData.eatTypes.active == 'take-out') {
-							cartItem.pack_number = cartItem.number
-						} else {
-							cartItem.pack_number = 0
-						}
-						let par = {
-							type:'onboc',
-							account: uni.getStorageSync("iToken").loginId,
-							shop_id: uni.getStorageSync("shopInfo").id,
-							operate_type:'batch',
-							table_code: pageData.table.tableCode,
-							is_pack: pageData.eatTypes.active == 'take-out' ? 1 : 0,
-						}
-						updateCart(par)
-					}
-					// 是否更新就餐人数
-					if (!$seatFee.totalNumber) {
-						updateChoseCount()
-					}
-					
-					pageData.eatTypes.isShow = false
-					break;
-				case 'onboc_add':
-				case 'add':
-					cartItem = getNowCart(msg.data,$goods,pageData.user)
-					cartControls(cartItem,'add')
-					break;
-				case 'onboc_edit':
-				case 'edit':
-					getCart()
-					break;
-				case 'onboc_del':
-				case 'del':
-					cartItem = getNowCart(msg.data,$goods,pageData.user)
-					cartControls(cartItem,'del')
-					break;
-				case 'onboc_cleanup':
-				case 'cleanup':
-					goods.list = []
-					$seatFee.totalNumber = 0
-					$seatFee.totalAmount = 0
-					userNumbers.defaultCateIndex = 0
-					init()
-					break;
-				case 'product_update':
-					init()
-					break;	
-			}
-			
-		}); 
-		
-	}
-	
-	
-	
-	/**
-	 * 删除购物车菜品
-	 */
-	function delCart (cartItem) {
-		let params = {
-			type:'onboc',
-			account: uni.getStorageSync("iToken").loginId,
-			shop_id: uni.getStorageSync("shopInfo").id,
-			is_gift: 0,
-			id: cartItem.id,
-			operate_type:'del',
-			table_code: cartItem.table_code,
+					msg_id: msg.msg_id
+				})
+			);
 		}
-		websocketUtil.send(JSON.stringify(params))
-	}
-	
-	/**
-	 * socket通知购物车商品数量修改处理
-	 */
-	function cartControls (cartItem,type) {
-		if( !pageData.table.tableCode ){
-			pageData.table.tableCode = cartItem.table_code
+		if (msg.status == 0) {
+			infoBox.showToast(msg.msg || '操作失败');
+			return false;
 		}
-		let cartIndex = 0;
-		goods.list.map((item,index)=>{
-			if(item.id == cartItem.id) {
-				cartIndex = index;
-			}
-		})
-		
-		if( type == 'del' ) {
-			goods.list.splice(cartIndex, 1)
-			return;
-		}
-		if( type == 'add' ){
-			goods.list.push(cartItem)
-		}
-		if( type == 'edit' ){
-			goods.list[cartIndex].number = cartItem.number
-		}
-	}
 
-	
-	/**
-	 * 获取购物车数据
-	 */
-	function getCart() {
-		// 初始化购物车
-		websocketUtil.send(JSON.stringify({
-			type:'onboc',
-			account: uni.getStorageSync("iToken").loginId,
-			shop_id: uni.getStorageSync("shopInfo").id,
-			operate_type:'init',
-			table_code: pageData.table.tableCode,
-		}))
-	}
-	
-	/**
-	 * 获取店铺信息
-	 */
-	async function getTbShopInfo() {
-		const res = await getShopInfo({id: uni.getStorageSync('shopInfo').id})
-		pageData.shopInfo = res
-		uni.setStorageSync('shopInfo',res)
-	}
-	
-	/**
-	 * 获取桌台信息
-	 */
-	async function getTableInfo(opt) {
-		const res = await getShopTableDetail({id: opt.id,tableCode: opt.tableCode})
-		Object.assign(pageData.table, res)
-		if(!pageData.shopInfo.isTableFee&&pageData.table&&pageData.table.id){
-			userNumbers.list = new Array(res.maxCapacity ? res.maxCapacity * 1 : 100).fill(1).map((v, index) => {
-				return (index + 1) + '人'
-			})
+		switch (msg.operate_type) {
+			case 'onboc_init':
+				goods.list = [];
+				console.log(msg.data);
+				msg.data.map((item) => {
+					cartItem = getNowCart(item, $goods, pageData.user);
+					console.log(cartItem);
+					if (cartItem.isGrounding || cartItem.is_temporary == 1) {
+						cartControls(cartItem, 'add');
+					} else {
+						delCart(cartItem.id);
+					}
+				});
+				if (pageData.eatTypes.isShow) {
+					if (pageData.eatTypes.active == 'take-out') {
+						cartItem.pack_number = cartItem.number;
+					} else {
+						cartItem.pack_number = 0;
+					}
+					let par = {
+						type: 'onboc',
+						account: uni.getStorageSync('iToken').loginId,
+						shop_id: uni.getStorageSync('shopInfo').id,
+						operate_type: 'batch',
+						table_code: pageData.table.tableCode,
+						is_pack: pageData.eatTypes.active == 'take-out' ? 1 : 0
+					};
+					updateCart(par);
+				}
+				// 是否更新就餐人数
+				if (!$seatFee.totalNumber) {
+					updateChoseCount();
+				}
+
+				pageData.eatTypes.isShow = false;
+				break;
+			case 'onboc_add':
+			case 'add':
+				cartItem = getNowCart(msg.data, $goods, pageData.user);
+				cartControls(cartItem, 'add');
+				break;
+			case 'onboc_edit':
+			case 'edit':
+				getCart();
+				break;
+			case 'onboc_del':
+			case 'del':
+				cartItem = getNowCart(msg.data, $goods, pageData.user);
+				cartControls(cartItem, 'del');
+				break;
+			case 'onboc_cleanup':
+			case 'cleanup':
+				goods.list = [];
+				$seatFee.totalNumber = 0;
+				$seatFee.totalAmount = 0;
+				userNumbers.defaultCateIndex = 0;
+				init();
+				break;
+			case 'product_update':
+				init();
+				break;
 		}
-		// 获取购物车数据
-		getCart()
-		// 获取购物车数据
-		getHistoryOrderDetail(opt.tableCode)
+	});
+}
+
+/**
+ * 删除购物车菜品
+ */
+function delCart(cartItem) {
+	let params = {
+		type: 'onboc',
+		account: uni.getStorageSync('iToken').loginId,
+		shop_id: uni.getStorageSync('shopInfo').id,
+		is_gift: 0,
+		id: cartItem.id,
+		operate_type: 'del',
+		table_code: cartItem.table_code
+	};
+	websocketUtil.send(JSON.stringify(params));
+}
+
+/**
+ * socket通知购物车商品数量修改处理
+ */
+function cartControls(cartItem, type) {
+	if (!pageData.table.tableCode) {
+		pageData.table.tableCode = cartItem.table_code;
 	}
-	
-	/**
-	 * 更新选择用户
-	 */
-	function watchChooseuser() {
-		uni.$off('choose-user')
-		uni.$on('choose-user', (data) => {
-			pageData.user = data
+	let cartIndex = 0;
+	goods.list.map((item, index) => {
+		if (item.id == cartItem.id) {
+			cartIndex = index;
+		}
+	});
+
+	if (type == 'del') {
+		goods.list.splice(cartIndex, 1);
+		return;
+	}
+	if (type == 'add') {
+		goods.list.push(cartItem);
+	}
+	if (type == 'edit') {
+		goods.list[cartIndex].number = cartItem.number;
+	}
+}
+
+/**
+ * 获取购物车数据
+ */
+function getCart() {
+	// 初始化购物车
+	websocketUtil.send(
+		JSON.stringify({
+			type: 'onboc',
+			account: uni.getStorageSync('iToken').loginId,
+			shop_id: uni.getStorageSync('shopInfo').id,
+			operate_type: 'init',
+			table_code: pageData.table.tableCode
 		})
+	);
+}
+
+/**
+ * 获取店铺信息
+ */
+async function getTbShopInfo() {
+	const res = await getShopInfo({ id: uni.getStorageSync('shopInfo').id });
+	pageData.shopInfo = res;
+	uni.setStorageSync('shopInfo', res);
+}
+
+/**
+ * 获取桌台信息
+ */
+async function getTableInfo(opt) {
+	let res = {};
+	if (opt.id) {
+		res = await getShopTableDetail({ id: opt.id, tableCode: opt.tableCode });
 	}
-	
-	/**
-	 * 就餐类型切换监听
-	 */
-	async function changeUseType() {
-		if (!goods.list.length) {
-			return
-		}
-		getCart()
+	Object.assign(pageData.table, res);
+	if (!pageData.shopInfo.isTableFee && pageData.table && pageData.table.id) {
+		userNumbers.list = new Array(res.maxCapacity ? res.maxCapacity * 1 : 100).fill(1).map((v, index) => {
+			return index + 1 + '人';
+		});
 	}
-	
-	/**
-	 * 购物车数据修改
-	 * @param {Object} par
-	 */
-	function updateCart (par) {
-		websocketUtil.send(JSON.stringify({
-			type:'onboc',
-			account: uni.getStorageSync("iToken").loginId,
-			shop_id: uni.getStorageSync("shopInfo").id,
-			operate_type:'edit',
+	// 获取购物车数据
+	getCart();
+	// 获取购物车数据
+	getHistoryOrderDetail(opt.tableCode);
+}
+
+/**
+ * 更新选择用户
+ */
+function watchChooseuser() {
+	uni.$off('choose-user');
+	uni.$on('choose-user', (data) => {
+		pageData.user = data;
+	});
+}
+
+/**
+ * 就餐类型切换监听
+ */
+async function changeUseType() {
+	if (!goods.list.length) {
+		return;
+	}
+	getCart();
+}
+
+/**
+ * 购物车数据修改
+ * @param {Object} par
+ */
+function updateCart(par) {
+	websocketUtil.send(
+		JSON.stringify({
+			type: 'onboc',
+			account: uni.getStorageSync('iToken').loginId,
+			shop_id: uni.getStorageSync('shopInfo').id,
+			operate_type: 'edit',
 			table_code: pageData.table.tableCode,
 			...par
-		}))
-		getCart()
-	}
-	
-	/**
-	 * 菜品赠送/等叫/打印修改
-	 * @param {Object} item
-	 */
-	function toggleItem(item,key) {
-		let par = {
-			id: item.id,
-			product_id: item.product_id	,
-			sku_id: item.sku_id		
-		}
-		par[key] = item[key] == 0 ? 1 : 0
-		updateCart(par)
-	}
+		})
+	);
+	getCart();
+}
 
-	
-	/**
-	 * 单品打折
-	 * @param {Object} form
-	 */
-	async function discountconfirm(form) {
-		if (form.discountMoney != '.') {
-			let str = ''
-			if (form.notes) {
-				form.notes.forEach(ele => {
-					if (ele.checked) {
-						str = str + ele.name + ','
-					}
-				})
-			}
-			let lowMemberPrice = modelData.data.lowMemberPrice ? modelData.data.lowMemberPrice : modelData.data.lowPrice
-			let tPrice = (isVip.value ? lowMemberPrice : modelData.data.lowPrice)
-			let discount_sale_amount = modelData.data.is_gift ? 0 : form.discountMoney
-			let par = {
-				id: modelData.data.id,
-				product_id: modelData.data.product_id,
-				sku_id: modelData.data.sku_id,	
-				discount_sale_amount: discount_sale_amount,		
-				discount_sale_note:  str + form.note,		
-			}
-			updateCart(par)
+/**
+ * 菜品赠送/等叫/打印修改
+ * @param {Object} item
+ */
+function toggleItem(item, key) {
+	let par = {
+		id: item.id,
+		product_id: item.product_id,
+		sku_id: item.sku_id
+	};
+	par[key] = item[key] == 0 ? 1 : 0;
+	updateCart(par);
+}
+
+/**
+ * 单品打折
+ * @param {Object} form
+ */
+async function discountconfirm(form) {
+	if (form.discountMoney != '.') {
+		let str = '';
+		if (form.notes) {
+			form.notes.forEach((ele) => {
+				if (ele.checked) {
+					str = str + ele.name + ',';
+				}
+			});
 		}
-	}
-	
-	/**
-	 * 打包
-	 */
-	function goodsOnePackNumberConfirm (e) {
-		let par = {
-			id: modelData.data.id,
-			product_id: modelData.data.product_id	,
-			sku_id: modelData.data.sku_id,
-			pack_number: e
-		}
-		updateCart(par)
-	}
-	
-	/**
-	 * 单品备注确认
-	 * @param {Object} e
-	 */
-	async function goodsOneRemarkConfirm(e) {
+		let lowMemberPrice = modelData.data.lowMemberPrice ? modelData.data.lowMemberPrice : modelData.data.lowPrice;
+		let tPrice = isVip.value ? lowMemberPrice : modelData.data.lowPrice;
+		let discount_sale_amount = modelData.data.is_gift ? 0 : form.discountMoney;
 		let par = {
 			id: modelData.data.id,
 			product_id: modelData.data.product_id,
 			sku_id: modelData.data.sku_id,
-			remark: e.remark
-		}
-		updateCart(par)
+			discount_sale_amount: discount_sale_amount,
+			discount_sale_note: str + form.note
+		};
+		updateCart(par);
 	}
-	
-	/**
-	 * 设置弹窗信息
-	 * @param {Object} el
-	 */
-	function setModel(el) {
-		if (el && el.$attrs['name']) {
-			models.set(el.$attrs['name'], el);
-		}
+}
+
+/**
+ * 打包
+ */
+function goodsOnePackNumberConfirm(e) {
+	let par = {
+		id: modelData.data.id,
+		product_id: modelData.data.product_id,
+		sku_id: modelData.data.sku_id,
+		pack_number: e
+	};
+	updateCart(par);
+}
+
+/**
+ * 单品备注确认
+ * @param {Object} e
+ */
+async function goodsOneRemarkConfirm(e) {
+	let par = {
+		id: modelData.data.id,
+		product_id: modelData.data.product_id,
+		sku_id: modelData.data.sku_id,
+		remark: e.remark
+	};
+	updateCart(par);
+}
+
+/**
+ * 设置弹窗信息
+ * @param {Object} el
+ */
+function setModel(el) {
+	if (el && el.$attrs['name']) {
+		models.set(el.$attrs['name'], el);
 	}
-	
-	/**
-	 * 打开弹窗
-	 * @param {Object} key
-	 * @param {Object} index
-	 */
-	function showModel(key, index, item) {
-		modelData.data = goods.list[index]
-		modelData.selIndex = index
-		const model = models.get(key)
-		console.log("弹窗数据===",modelData.data)
-		if( key == 'packNumber'){
-			if( modelData.data.type == 'weight' && item.pack_number <= 0){
-				let par = {
-					id: modelData.data.id,
-					product_id: modelData.data.product_id,
-					sku_id: modelData.data.sku_id,
-					pack_number: 1
-				}
-				updateCart(par)
-				return false;
-			}
-			if( item.pack_number > 0 ){
-				let par = {
-					id: modelData.data.id,
-					product_id: modelData.data.product_id,
-					sku_id: modelData.data.sku_id,
-					pack_number: 0
-				}
-				updateCart(par)
-				return false;
-			}
-			model && model.open({
+}
+
+/**
+ * 打开弹窗
+ * @param {Object} key
+ * @param {Object} index
+ */
+function showModel(key, index, item) {
+	modelData.data = goods.list[index];
+	modelData.selIndex = index;
+	const model = models.get(key);
+	console.log('弹窗数据===', modelData.data);
+	if (key == 'packNumber') {
+		if (modelData.data.type == 'weight' && item.pack_number <= 0) {
+			let par = {
+				id: modelData.data.id,
+				product_id: modelData.data.product_id,
+				sku_id: modelData.data.sku_id,
+				pack_number: 1
+			};
+			updateCart(par);
+			return false;
+		}
+		if (item.pack_number > 0) {
+			let par = {
+				id: modelData.data.id,
+				product_id: modelData.data.product_id,
+				sku_id: modelData.data.sku_id,
+				pack_number: 0
+			};
+			updateCart(par);
+			return false;
+		}
+		model &&
+			model.open({
 				number: item.number
-			})
-			
-		} else {
-			model && model.open({
+			});
+	} else {
+		model &&
+			model.open({
 				packNumber: modelData.data.remark || ''
-			})
+			});
+	}
+}
+
+function formatPrice(n) {
+	return (Math.floor(n * 100) / 100).toFixed(2);
+}
+
+function rotatingTables() {
+	uni.navigateTo({
+		url: '/pagesCreateOrder/confirm-order/rotatingTables?item=' + JSON.stringify(goods.list)
+	});
+}
+
+/**
+ * 更新就餐人数
+ */
+async function updateChoseCount() {
+	const maxCapacity = pageData.table && pageData.table.id ? pageData.table.maxCapacity || 0 : 100;
+	if (pageData.table && pageData.table.id && userNumbers.defaultCateIndex * 1 + 1 > maxCapacity) {
+		uni.$utils.showToast('当前台桌最大人数为: ' + maxCapacity);
+		userNumbers.defaultCateIndex = maxCapacity - 1;
+		return;
+	}
+	console.log(pageData.shopInfo);
+	console.log(!pageData.shopInfo.isTableFee);
+	if (!pageData.shopInfo.isTableFee && pageData.table && pageData.table.id && goods.list.length > 0) {
+		//不免餐位费
+		console.log('不免餐位费');
+		let seatFee = {
+			totalNumber: userNumbers.defaultCateIndex * 1 + 1,
+			totalAmount: (userNumbers.defaultCateIndex * 1 + 1) * pageData.shopInfo.tableFee
+		};
+		Object.assign($seatFee, seatFee);
+		userNumbers.defaultCateIndex = $seatFee.totalNumber - 1;
+	}
+}
+
+/**
+ * 选择就餐人数
+ * @param {Object} e
+ */
+function userNumberChange(e) {
+	userNumbers.defaultCateIndex = e.detail.value;
+}
+
+function chooseUser() {
+	go.to('PAGES_CHOOSE_USER');
+}
+
+function chooseTable() {
+	go.to('PAGES_CHOOSE_TABLE', {
+		...pageData.table
+	});
+}
+
+function watchChooseTable() {
+	uni.$off('choose-table');
+	uni.$on('choose-table', (data) => {
+		pageData.table = data;
+		console.log('台桌信息', pageData.table);
+	});
+}
+
+function changeGoodsSel(index) {
+	goods.sel = index;
+}
+
+/**
+ * 创建订单
+ */
+async function createAnOrder() {
+	if (pageData.shopInfo.registerType == 'before' || pageData.eatTypes.active == 'take-out') {
+		const canJiesuan = await hasPermission('允许收款');
+		if (!canJiesuan) {
+			return;
 		}
 	}
 
-	function formatPrice(n) {
-		return (Math.floor(n*100)/100).toFixed(2)
+	let vipPrice = isVip.value ? 1 : 0;
+	let placeNum = pageData.orderInfo ? pageData.orderInfo.placeNum + 1 : 1;
+	let originAmount = goodsPrice.value * 1 + youhui.value * 1;
+	let par = {
+		shopId: pageData.shopInfo.id, //店铺Id
+		userId: pageData.user.userId, //用户Id
+		tableCode: pageData.table.tableCode, //台桌编码
+		dineMode: pageData.eatTypes.active, //用餐模式 堂食 dine-in 外带 take-out 外卖 take-away
+		remark: pageData.form.note, //备注
+		seatNum: 0, //用餐人数
+		packFee: $packFee.value, //打包费
+		originAmount: originAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格
+		placeNum: placeNum, //当前订单下单次数
+		waitCall: 0, //是否等叫 0 否 1 等叫
+		vipPrice: vipPrice //是否使用会员价
+	};
+	if (!pageData.shopInfo.isTableFee && pageData.table && pageData.table.id) {
+		par.seatNum = userNumbers.defaultCateIndex * 1 + 1;
+	}
+	if (pageData.orderInfo) {
+		par.orderId = pageData.orderInfo.id;
 	}
 
-	function rotatingTables() {
-		uni.navigateTo({
-			url: '/pagesCreateOrder/confirm-order/rotatingTables?item='+JSON.stringify(goods.list),
+	const res = await createOrder(par);
+	uni.$emit('update:createOrderIndex');
+	websocketUtil.send(
+		JSON.stringify({
+			type: 'onboc',
+			account: uni.getStorageSync('iToken').loginId,
+			shop_id: uni.getStorageSync('shopInfo').id,
+			operate_type: 'cleanup',
+			table_code: pageData.table.tableCode
 		})
-	}
-	
-	/**
-	 * 更新就餐人数
-	 */
-	async function updateChoseCount() {
-		const maxCapacity = pageData.table&&pageData.table.id ? (pageData.table.maxCapacity || 0) : 100
-		if (pageData.table&&pageData.table.id && userNumbers.defaultCateIndex * 1 + 1 > maxCapacity) {
-			uni.$utils.showToast('当前台桌最大人数为: ' + maxCapacity)
-			userNumbers.defaultCateIndex = maxCapacity - 1
-			return
-		}
-		console.log(pageData.shopInfo)
-		console.log(!pageData.shopInfo.isTableFee)
-		if (!pageData.shopInfo.isTableFee && pageData.table && pageData.table.id && goods.list.length > 0) {
-			//不免餐位费
-			console.log("不免餐位费")
-			let seatFee = {
-				totalNumber: userNumbers.defaultCateIndex * 1 + 1,
-				totalAmount: (userNumbers.defaultCateIndex * 1 + 1) * pageData.shopInfo.tableFee,
-			}
-			Object.assign($seatFee, seatFee)
-			userNumbers.defaultCateIndex = $seatFee.totalNumber - 1
-		}
-
-	}
-	
-	/**
-	 * 选择就餐人数
-	 * @param {Object} e
-	 */
-	function userNumberChange(e) {
-		userNumbers.defaultCateIndex = e.detail.value
-	}
-
-	function chooseUser() {
-		go.to('PAGES_CHOOSE_USER')
-	}
-
-	function chooseTable() {
-		go.to('PAGES_CHOOSE_TABLE', {
-			...pageData.table
-		})
-	}
-	
-	function watchChooseTable() {
-		uni.$off('choose-table')
-		uni.$on('choose-table', (data) => {
-			pageData.table = data
-			console.log("台桌信息",pageData.table);
-		})
-	}
-
-	function changeGoodsSel(index) {
-		goods.sel = index
-	}
-	
-
-	/**
-	 * 创建订单
-	 */
-	async function createAnOrder() {
-		
-		if (pageData.shopInfo.registerType == 'before' || pageData.eatTypes.active == 'take-out') {
-			const canJiesuan = await hasPermission('允许收款')
-			if (!canJiesuan) {
-				return
-			}
-		}
-	
-		let vipPrice = isVip.value ? 1 : 0
-		let placeNum = pageData.orderInfo ? pageData.orderInfo.placeNum + 1 : 1;
-		let originAmount = goodsPrice.value*1+youhui.value*1
-		let par = {
-			shopId: pageData.shopInfo.id, 			//店铺Id
-			userId: pageData.user.userId,			//用户Id
-			tableCode: pageData.table.tableCode,	//台桌编码
-			dineMode: pageData.eatTypes.active,		//用餐模式 堂食 dine-in 外带 take-out 外卖 take-away
-			remark: pageData.form.note,				//备注
-			seatNum: 0,								//用餐人数
-			packFee: $packFee.value,				//打包费
-			originAmount: originAmount,			//订单原金额（包含打包费+餐位费） 不含折扣价格
-			placeNum: placeNum,						//当前订单下单次数
-			waitCall: 0,							//是否等叫 0 否 1 等叫
-			vipPrice: vipPrice,		                //是否使用会员价
-		}
-		if(!pageData.shopInfo.isTableFee&&pageData.table&&pageData.table.id){
-			par.seatNum = userNumbers.defaultCateIndex * 1 + 1
-		}
-		if(pageData.orderInfo){
-			par.orderId = pageData.orderInfo.id
-		}
-		
-		const res = await createOrder(par)
-		uni.$emit('update:createOrderIndex')
-		websocketUtil.send(JSON.stringify({
-			type:'onboc',
-			account: uni.getStorageSync("iToken").loginId,
-			shop_id: uni.getStorageSync("shopInfo").id,
-			operate_type:'cleanup',
-			table_code: pageData.table.tableCode,
-		}))
-		uni.removeStorageSync("table_code")
-		if (pageData.shopInfo.registerType == 'before' || pageData.eatTypes.active == 'take-out') {
-			//先付
-			return go.to('PAGES_ORDER_PAY', {
+	);
+	uni.removeStorageSync('table_code');
+	if (pageData.shopInfo.registerType == 'before' || pageData.eatTypes.active == 'take-out') {
+		//先付
+		return go.to(
+			'PAGES_ORDER_PAY',
+			{
 				orderId: res.id,
 				isNowPay: true
-			}, 'redirect')
-		} else {
-			//后付
-			if (option.isCreateOrderToDetail != '0') {
-				go.to('PAGES_ORDER_DETAIL', {
+			},
+			'redirect'
+		);
+	} else {
+		//后付
+		if (option.isCreateOrderToDetail != '0') {
+			go.to(
+				'PAGES_ORDER_DETAIL',
+				{
 					id: res.id
-				}, 'redirect')
-			} else {
-				uni.navigateBack({
-					delta: 2
-				})
-			}
-
-		
+				},
+				'redirect'
+			);
+		} else {
+			uni.navigateBack({
+				delta: 2
+			});
 		}
-		uni.showToast({
-			title: '提交成功',
-			icon: 'none'
-		})
-		
 	}
-
-	
-
+	uni.showToast({
+		title: '提交成功',
+		icon: 'none'
+	});
+}
 </script>
 
 <style lang="scss" scoped>
-	.fen {
-		color: #FF9F2E;
-	}
+.fen {
+	color: #ff9f2e;
+}
 
-	.page-gray {
-		padding: 32rpx 28rpx 0 28rpx;
-	}
+.page-gray {
+	padding: 32rpx 28rpx 0 28rpx;
+}
 
-	.headeimg {
-		width: 84rpx;
-		height: 84rpx;
-		border-radius: 12rpx 12rpx 12rpx 12rpx;
-	}
+.headeimg {
+	width: 84rpx;
+	height: 84rpx;
+	border-radius: 12rpx 12rpx 12rpx 12rpx;
+}
 
-	.block {
-		background-color: #fff;
-		padding: 32rpx 24rpx;
-		border-radius: 18rpx;
-		margin-bottom: 32rpx;
-	}
+.block {
+	background-color: #fff;
+	padding: 32rpx 24rpx;
+	border-radius: 18rpx;
+	margin-bottom: 32rpx;
+}
 
-	.textarea {
-		border-radius: 12rpx 12rpx 12rpx 12rpx;
-		padding: 32rpx 0 32rpx 24rpx;
-		border: 1px solid #999999;
-		overflow: hidden;
-	}
+.textarea {
+	border-radius: 12rpx 12rpx 12rpx 12rpx;
+	padding: 32rpx 0 32rpx 24rpx;
+	border: 1px solid #999999;
+	overflow: hidden;
+}
 
-	.goods {
-		// padding-bottom: 30rpx;
-		border-bottom: 1px dashed #E5E5E5;
+.goods {
+	// padding-bottom: 30rpx;
+	border-bottom: 1px dashed #e5e5e5;
 
-		.item {
-			.img {
-				width: 84rpx;
-				height: 84rpx;
-				border-radius: 8rpx 8rpx 8rpx 8rpx;
-			}
+	.item {
+		.img {
+			width: 84rpx;
+			height: 84rpx;
+			border-radius: 8rpx 8rpx 8rpx 8rpx;
 		}
 	}
+}
 
-	.headeimg {
+.headeimg {
+	width: 60rpx;
+	height: 60rpx;
+	display: flex;
+	background-color: #eee;
+	border-radius: 12rpx;
+	overflow: hidden;
+
+	.img {
 		width: 60rpx;
 		height: 60rpx;
-		display: flex;
-		background-color: #eee;
-		border-radius: 12rpx;
-		overflow: hidden;
-
-		.img {
-			width: 60rpx;
-			height: 60rpx;
-		}
 	}
+}
 
-	.price {
-		color: #EB4F4F;
+.price {
+	color: #eb4f4f;
+}
+
+.opacity0 {
+	opacity: 0;
+}
+
+.fixed {
+	position: fixed;
+}
+
+.safe-bottom {
+	padding: 34rpx 28rpx;
+	background-color: #fff;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 10;
+
+	.btn {
+		padding: 0 88rpx 56rpx 88rpx;
 	}
+}
 
-	.opacity0 {
-		opacity: 0;
-	}
+.tag {
+	background-color: #fff;
+	border: 1px solid #e5e5e5;
+	line-height: inherit;
+	font-size: 24rpx;
+	color: #666666;
+	padding: 6rpx 16rpx;
+	border-radius: 100rpx;
+}
 
-	.fixed {
-		position: fixed;
-	}
-
-	.safe-bottom {
-		padding: 34rpx 28rpx;
-		background-color: #fff;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 10;
-
-		.btn {
-			padding: 0 88rpx 56rpx 88rpx;
-		}
-	}
-
-	.tag {
-		background-color: #fff;
-		border: 1px solid #E5E5E5;
-		line-height: inherit;
-		font-size: 24rpx;
-		color: #666666;
-		padding: 6rpx 16rpx;
-		border-radius: 100rpx;
-	}
-
-	.hover-class {
-		background-color: #E5E5E5;
-	}
-</style>
\ No newline at end of file
+.hover-class {
+	background-color: #e5e5e5;
+}
+</style>