From d6e1c83f883381bb3db5af5a965346861d2e32b0 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Wed, 7 May 2025 17:48:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=86=E7=BB=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/env.development.js                        |    3 +-
 manifest.json                                 |   13 +-
 .../edit-group-goods/components/goods.vue     |  145 +-
 .../edit-group-goods/edit-group-goods.vue     |  656 ++--
 pageGoodsGroup/index/components/category.vue  |  294 +-
 pageGoodsGroup/index/index.vue                |  635 ++--
 pages.json                                    |    7 +-
 pagesCreateOrder/index/components/car.vue     |  597 ++--
 pagesCreateOrder/index/index.vue              | 2773 +++++++++--------
 vite.config.js                                |    3 +-
 10 files changed, 2599 insertions(+), 2527 deletions(-)

diff --git a/env/env.development.js b/env/env.development.js
index 3f3c1c5..3c04506 100644
--- a/env/env.development.js
+++ b/env/env.development.js
@@ -4,6 +4,5 @@ export default {
 	'JEEPAY_BASE_URL_WSS': 'ws://192.168.1.31:2348' ,// sockets
 	// 'JEEPAY_BASE_URL': 'https://cashier.sxczgkj.com/', // 请求URL（生产环境）
 	// 'JEEPAY_BASE_URL_H5': 'https://cashier.sxczgkj.com/',
-	// 'JEEPAY_BASE_URL_WSS': 'wss://czgeatws.sxczgkj.com/wss' // sockets
-	
+	// 'JEEPAY_BASE_URL_WSS': 'wss://czgeatws.sxczgkj.com/wss' // sockets	
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index a8853e9..e8304d6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -166,18 +166,7 @@
             "enable" : true
         },
         "devServer" : {
-            "disableHostCheck" : true,
-            "proxy" : {
-                "/api" : {
-                    // 需要被代理的后台地址
-                    "target" : "https://tapi.cashier.sxczgkj.cn",
-                    "changeOrigin" : true,
-                    "secure" : true,
-                    "pathRewrite" : {
-                        "/api" : ""
-                    }
-                }
-            }
+            "disableHostCheck" : true
         },
         "sdkConfigs" : {
             "maps" : {
diff --git a/pageGoodsGroup/edit-group-goods/components/goods.vue b/pageGoodsGroup/edit-group-goods/components/goods.vue
index 94b47e2..5b57e61 100644
--- a/pageGoodsGroup/edit-group-goods/components/goods.vue
+++ b/pageGoodsGroup/edit-group-goods/components/goods.vue
@@ -7,106 +7,111 @@
 						<up--image :width="63" :height="63" :radius="3" :src="data.coverImg"></up--image>
 					</view>
 					<view class="w-full info u-p-l-30">
-						<view class=" color-333  u-flex u-row-between">
+						<view class="color-333 u-flex u-row-between">
 							<view class="u-flex">
-								<text class="u-m-r-24">{{data.name}}</text>
+								<text class="u-m-r-24">{{ data.name }}</text>
 							</view>
 						</view>
-						<view class="u-flex  u-m-t-10 u-row-right">
+						<view class="u-flex u-m-t-10 u-row-right">
 							<view class="btn-default btn" @tap="del">删除</view>
 						</view>
 					</view>
 				</view>
-
 			</view>
 		</template>
 		<template v-else>
-			<view class=" u-flex  u-p-l-30 u-p-r-30  u-p-t-16 u-p-b-16" @click="goodsClick">
-				<my-radio disabled @click.stop="goodsClick" :modelValue="data.checked"></my-radio>
-				<view class="u-flex u-m-l-32">
-					<text class="">{{data.name}}</text>
+			<view class="goods-wrap">
+				<view class="goods-item u-flex" @click="goodsClick">
+					<my-radio @click="goodsClick" :modelValue="data.checked"></my-radio>
+					<view class="u-flex u-m-l-10">
+						<text class="">{{ data.name }}</text>
+					</view>
 				</view>
 			</view>
 		</template>
 	</view>
-
 </template>
 
 <script setup>
-	const emits = defineEmits(['goodsClick', 'del'])
+const emits = defineEmits(['goodsClick', 'del']);
 
-	const props = defineProps({
-		isBind: {
-			type: Boolean,
-			default: false
-		},
-		index: {
-			type: Number
-		},
-		data: {
-			type: Object,
-			default: () => {
-				return {
-					checked:false,
-				}
-			}
-		},
-		showDetail: {
-			type: Boolean,
-			default: false
+const props = defineProps({
+	isBind: {
+		type: Boolean,
+		default: false
+	},
+	index: {
+		type: Number
+	},
+	data: {
+		type: Object,
+		default: () => {
+			return {
+				checked: false
+			};
 		}
-	})
-
-	function goodsClick(){
-		emits('goodsClick',props.index)
-	}
-	
-	function del() {
-		emits('del', props.index)
+	},
+	showDetail: {
+		type: Boolean,
+		default: false
 	}
+});
 
+function goodsClick() {
+	emits('goodsClick', props.index);
+}
+
+function del() {
+	emits('del', props.index);
+}
 </script>
 
 <style lang="scss" scoped>
-	$imgSize: 126rpx;
+$imgSize: 126rpx;
 
-	.btn {
-		padding: 6rpx 28rpx;
-		border-radius: 100rpx;
-		border: 2rpx solid transparent;
-	}
+.btn {
+	padding: 6rpx 28rpx;
+	border-radius: 100rpx;
+	border: 2rpx solid transparent;
+}
 
-	.btn-default {
-		border-color: #999;
-		color: #999;
-	}
+.btn-default {
+	border-color: #999;
+	color: #999;
+}
 
-	.img {
-		width: $imgSize;
-		height: $imgSize;
-	}
+.img {
+	width: $imgSize;
+	height: $imgSize;
+}
 
-	.goods {
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-		background-color: #fff;
-		padding: 32rpx 28rpx 32rpx 28rpx;
-		font-size: 28rpx;
+.goods {
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	background-color: #fff;
+	padding: 32rpx 28rpx 32rpx 28rpx;
+	font-size: 28rpx;
 
-		.skus {
-			background: #F9F9F9;
-			border-radius: 14rpx 14rpx 14rpx 14rpx;
-			padding: 20rpx;
+	.skus {
+		background: #f9f9f9;
+		border-radius: 14rpx 14rpx 14rpx 14rpx;
+		padding: 20rpx;
 
-			.sku {
-				color: #000;
-				font-weight: 700;
-				padding: 6rpx 40rpx;
-			}
+		.sku {
+			color: #000;
+			font-weight: 700;
+			padding: 6rpx 40rpx;
+		}
 
-			.skds {
-				gap: 10rpx 50rpx;
-			}
+		.skds {
+			gap: 10rpx 50rpx;
 		}
 	}
-
-</style>
\ No newline at end of file
+}
+.goods-wrap {
+	padding: 0 20upx;
+	.goods-item {
+		padding: 20upx 0;
+		border-bottom: 1px solid #ececec;
+	}
+}
+</style>
diff --git a/pageGoodsGroup/edit-group-goods/edit-group-goods.vue b/pageGoodsGroup/edit-group-goods/edit-group-goods.vue
index 8884984..a97b127 100644
--- a/pageGoodsGroup/edit-group-goods/edit-group-goods.vue
+++ b/pageGoodsGroup/edit-group-goods/edit-group-goods.vue
@@ -1,19 +1,22 @@
 <template>
 	<view class="safe-page min-page">
 		<up-sticky>
-			<view class="bg-fff u-p-l-30   u-p-b-24">
-				
+			<view class="bg-fff u-p-l-30 u-p-b-24">
 				<view class="input-wrapper">
 					<view class="input-main">
 						<view class="u-flex u-p-r-30 u-font-28" @click="onCategoryShowChange(true)">
-							<text class="u-m-r-10 u-line-1"
-								style="max-width: 100rpx;">{{pageData.categoryName||'全部' }}</text>
+							<text class="u-m-r-10 u-line-1" style="max-width: 100rpx">{{ pageData.categoryName || '全部' }}</text>
 							<up-icon name="arrow-down" size="16"></up-icon>
 						</view>
-						<uni-easyinput clearable class='jeepay-search' :inputBorder="false"
-							:placeholder="pageData.search.placeholder" v-model="pageData.query.name"
+						<uni-easyinput
+							clearable
+							class="jeepay-search"
+							:inputBorder="false"
+							:placeholder="pageData.search.placeholder"
+							v-model="pageData.query.name"
 							@clear="searchFunc"
-							@confirm="searchFunc">
+							@confirm="searchFunc"
+						>
 							<template #prefixIcon>
 								<image src="@/static/iconImg/icon-search.svg" class="input-icon" />
 							</template>
@@ -23,393 +26,390 @@
 						</view>
 					</view>
 				</view>
-				<view class="u-flex  states1 u-row-between  u-font-28">
-					<view class=" u-flex-1  item  u-flex u-row-center tranistion u-text-center color-333"
-						:class="{'active':pageData.stateCurrent==index}" @tap="statesTableClick(index)"
-						v-for="(item,index) in statesTabsList" :key="index">
-						<view class="text">{{item}}</view>
+				<view class="u-flex states1 u-row-between u-font-28">
+					<view
+						class="u-flex-1 item u-flex u-row-center tranistion u-text-center color-333"
+						:class="{ active: pageData.stateCurrent == index }"
+						@tap="statesTableClick(index)"
+						v-for="(item, index) in statesTabsList"
+						:key="index"
+					>
+						<view class="text">{{ item }}</view>
 					</view>
 				</view>
-
 			</view>
 		</up-sticky>
-		<template v-if="pageData.stateCurrent==0">
-			<view class="goods-list  u-p-30">
+		<template v-if="pageData.stateCurrent == 0">
+			<view class="goods-list u-p-30">
 				<template v-if="pageData.bindGoodsList.length">
-					<view class="u-m-b-32" v-for="(item,index) in pageData.bindGoodsList" :key="index">
-						<my-goods isBind :index="index" :data="item" @del="goodsDel"
-						 :showDetail="pageData.showGoodsDetail"></my-goods>
+					<view class="u-m-b-32" v-for="(item, index) in pageData.bindGoodsList" :key="index">
+						<my-goods isBind :index="index" :data="item" @del="goodsDel" :showDetail="pageData.showGoodsDetail"></my-goods>
 					</view>
 				</template>
-				<template v-if="pageData.hasAjax&&!pageData.bindGoodsList.length">
-					<my-img-empty :tips="isSearch?'未搜索到相关绑定商品':'暂无绑定商品' "></my-img-empty>
+				<template v-if="pageData.hasAjax && !pageData.bindGoodsList.length">
+					<my-img-empty :tips="isSearch ? '未搜索到相关绑定商品' : '暂无绑定商品'"></my-img-empty>
 				</template>
-				<view style="height: 100rpx;"></view>
+				<view style="height: 100rpx"></view>
 			</view>
 		</template>
 		<template v-else>
-			<view class="goods-list  u-p-30">
+			<view class="goods-list u-p-30">
 				<view class="bg-fff border-r-18 u-p-t-16 u-p-b-16 box-shadow">
 					<template v-if="pageData.goodsList.length">
-						<view class="" v-for="(item,index) in pageData.goodsList" :key="index">
-							<my-goods @goodsClick="goodsClick" :index="index" :data="item" 
-								:showDetail="pageData.showGoodsDetail"></my-goods>
+						<view class="" v-for="(item, index) in pageData.goodsList" :key="index">
+							<my-goods @goodsClick="goodsClick" :index="index" :data="item" :showDetail="pageData.showGoodsDetail"></my-goods>
 						</view>
 					</template>
-					<template v-if="pageData.hasAjax&&!pageData.goodsList.length">
+					<template v-if="pageData.hasAjax && !pageData.goodsList.length">
 						<my-img-empty tips="未找到相关商品"></my-img-empty>
 					</template>
 				</view>
 				<view class="fixed-b">
 					<my-button shape="circle" @click="save">确定</my-button>
 				</view>
-				<view style="height: 100rpx;"></view>
+				<view style="height: 100rpx"></view>
 			</view>
 		</template>
 
 		<!-- 分类 -->
 		<my-category v-model:isShow="pageData.categoryShow" @confirm="setCategory"></my-category>
 	</view>
-
 </template>
 
 <script setup>
-	import { onLoad, onShow } from '@dcloudio/uni-app';
-	import { reactive, ref, watch } from 'vue';
-	import myGoods from './components/goods.vue'
-	import myCategory from './components/category.vue'
-	import { hasPermission } from '@/commons/utils/hasPermission.js';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import { reactive, ref, watch } from 'vue';
+import myGoods from './components/goods.vue';
+import myCategory from './components/category.vue';
+import { hasPermission } from '@/commons/utils/hasPermission.js';
 
-	import { categoryPage } from '@/http/api/cateGory.js'
-	import { getProductPage,getProdGroupDetail,updateProdGroup } from '@/http/api/product.js'
-	
-	const pageData = reactive({
-		stateCurrent: 0,
-		search: {
-			value: '',
-			placeholder: '输入搜索的商品'
-		},
-		showGoodsDetail: false,
-		bindGoodsList: [],
-		goodsList: [],
-		query: {
-			page: 1,
-			size: 999,
-			categoryId: '',
-			name: '',
-			id: "",
-		},
-		category: '',
-		categoryList: [], //分类列表
-		categoryShow: false,
-		categoryName: '',
-		hasAjax: false
-	})
-	
-	
-	
-	let isSearch=ref(false)
-	const statesTabsList = ['已添加', '未添加']
-	const control = ref(null)
-	const model = ref(null)
-	const option = reactive({})
-	//分类
-	const category = ref(null)
-	onLoad((opt) => {
-		Object.assign(option, opt)
-		init()
-	})
-	onShow(() => {
-		
-	})
-	watch(() => pageData.query.categoryId, (newval) => {
-		if(pageData.stateCurrent==1){
-			getGoodsList()
-		}else{
-			getGroupBindGoods()
-		}
-	})
-	
-	watch(() => pageData.stateCurrent, (newval) => {
-		if (newval==1) {
-			getGoodsList()
-		} else {
-			getGroupBindGoods()
-		}
-	})
-	async function init() {
-		await getGroupBindGoods()
-		getGoodsList()
-	}
-	
-	/**
-	 * 搜索
-	 */
-	async function searchFunc() {
-		isSearch.value=true
-		if (pageData.stateCurrent) {
-			getGoodsList()
-		} else {
-			const res = await getProdGroupDetail(option.id)
-			pageData.bindGoodsList = res.productList.filter(v=>{
-				return v.name.includes(pageData.query.name)&&(pageData.query.categoryId==''?true:v.categoryId==pageData.query.categoryId)
-			})
-		}
-	}
-	
-	/**
-	 * 获取商品列表
-	 */
-	function getGoodsList() {
-		getProductPage(pageData.query).then(res => {
-			pageData.hasAjax = true
-			let goodsList = res.records.map(v => {
-				return {
-					...v,
-					checked: false
-				}
-			})
-			pageData.goodsList = goodsList.filter(v => {
-				return !pageData.bindGoodsList.find(bindGoods => bindGoods.id == v.id)
-			})
-	
-		})
-	}
-	
-	/**
-	 * 获取分组详情
-	 */
-	async function getGroupBindGoods() {
-		let res = await getProdGroupDetail(option.id)
-		pageData.bindGoodsList = res.productList.filter(v=>{
-			return pageData.query.categoryId === '' ? true : (v.categoryId==pageData.query.categoryId)&&(v.name.includes(pageData.query.name))
-		})
-	}
-	
-	/**
-	 * 已添加/未添加切换
-	 * @param {Object} index
-	 */
-	function statesTableClick(index) {
-		pageData.stateCurrent = index
-	}
-	
-	/**
-	 * 分类选择
-	 * @param {Object} show
-	 */
-	function onCategoryShowChange(show) {
-		pageData.categoryShow = show
-	}
-	
-	/**
-	 * 分类选择确定
-	 * @param {Object} category
-	 */
-	function setCategory(category) {
-		pageData.query.categoryId = category.id
-		pageData.categoryName = category.name
-	}
-	
-	/**
-	 * 绑定商品
-	 */
-	async function save() {
-		const res = await hasPermission('允许修改分组')
-		if (!res) {
-			return
-		}
-		await updateProdGroup({
-			...option,
-			productIds: [...pageData.bindGoodsList.map(v => v.id), ...pageData.goodsList.filter(v => v.checked)
-				.map(v => v.id)
-			]
-		})
-		pageData.stateCurrent = 0
-	}
+import { categoryPage } from '@/http/api/cateGory.js';
+import { getProductPage, getProdGroupDetail, updateProdGroup } from '@/http/api/product.js';
 
-	
-	/**
-	 * 删除商品
-	 * @param {Object} index
-	 */
-	async function goodsDel(index) {
-		const res = await hasPermission('允许修改分组')
-		if (!res) {
-			return
+const pageData = reactive({
+	stateCurrent: 0,
+	search: {
+		value: '',
+		placeholder: '输入搜索的商品'
+	},
+	showGoodsDetail: false,
+	bindGoodsList: [],
+	goodsList: [],
+	query: {
+		page: 1,
+		size: 999,
+		categoryId: '',
+		name: '',
+		id: ''
+	},
+	// 原始已绑定的上商品列表
+	bindOriginGoodsList: [],
+	category: '',
+	categoryList: [], //分类列表
+	categoryShow: false,
+	categoryName: '',
+	hasAjax: false
+});
+
+let isSearch = ref(false);
+const statesTabsList = ['已添加', '未添加'];
+const control = ref(null);
+const model = ref(null);
+const option = reactive({});
+//分类
+const category = ref(null);
+onLoad((opt) => {
+	Object.assign(option, opt);
+	init();
+});
+onShow(() => {});
+watch(
+	() => pageData.query.categoryId,
+	(newval) => {
+		if (pageData.stateCurrent == 1) {
+			getGoodsList();
+		} else {
+			getGroupBindGoods();
 		}
-		const goods = pageData.bindGoodsList[index]
-		uni.showModal({
-			title: '提示',
-			content: '是否确认将' + goods.name + '从该分组中移除',
-			success: function(res) {
-				if (res.confirm) {
-					pageData.bindGoodsList.splice(index, 1)
-					updateProdGroup({
-						...option,
-						productIds: pageData.bindGoodsList.map(v => v.id)
-					})
-				} else if (res.cancel) {}
-			}
+	}
+);
+
+watch(
+	() => pageData.stateCurrent,
+	(newval) => {
+		if (newval == 1) {
+			getGoodsList();
+		} else {
+			getGroupBindGoods();
+		}
+	}
+);
+async function init() {
+	await getGroupBindGoods();
+	getGoodsList();
+}
+
+/**
+ * 搜索
+ */
+async function searchFunc() {
+	isSearch.value = true;
+	if (pageData.stateCurrent) {
+		getGoodsList();
+	} else {
+		const res = await getProdGroupDetail(option.id);
+		pageData.bindGoodsList = res.productList.filter((v) => {
+			return v.name.includes(pageData.query.name) && (pageData.query.categoryId == '' ? true : v.categoryId == pageData.query.categoryId);
 		});
 	}
+}
 
-	function goodsClick(e) {
-		pageData.goodsList[e].checked = !pageData.goodsList[e].checked
+/**
+ * 获取商品列表
+ */
+function getGoodsList() {
+	getProductPage(pageData.query).then((res) => {
+		pageData.hasAjax = true;
+		let goodsList = res.records.map((v) => {
+			return {
+				...v,
+				checked: false
+			};
+		});
+		pageData.goodsList = goodsList.filter((v) => {
+			return !pageData.bindOriginGoodsList.find((bindGoods) => bindGoods.id == v.id);
+		});
+	});
+}
+
+/**
+ * 获取分组详情
+ */
+async function getGroupBindGoods() {
+	let res = await getProdGroupDetail(option.id);
+	pageData.bindOriginGoodsList = res.productList;
+	pageData.bindGoodsList = res.productList.filter((v) => {
+		return pageData.query.categoryId === '' ? true : v.categoryId == pageData.query.categoryId && v.name.includes(pageData.query.name);
+	});
+}
+
+/**
+ * 已添加/未添加切换
+ * @param {Object} index
+ */
+function statesTableClick(index) {
+	pageData.stateCurrent = index;
+}
+
+/**
+ * 分类选择
+ * @param {Object} show
+ */
+function onCategoryShowChange(show) {
+	pageData.categoryShow = show;
+}
+
+/**
+ * 分类选择确定
+ * @param {Object} category
+ */
+function setCategory(category) {
+	pageData.query.categoryId = category.id;
+	pageData.categoryName = category.name;
+}
+
+/**
+ * 绑定商品
+ */
+async function save() {
+	const res = await hasPermission('允许修改分组');
+	if (!res) {
+		return;
 	}
+	await updateProdGroup({
+		...option,
+		productIds: [...pageData.bindOriginGoodsList.map((v) => v.id), ...pageData.goodsList.filter((v) => v.checked).map((v) => v.id)]
+	});
+	pageData.stateCurrent = 0;
+}
 
-	
+/**
+ * 删除商品
+ * @param {Object} index
+ */
+async function goodsDel(index) {
+	const res = await hasPermission('允许修改分组');
+	if (!res) {
+		return;
+	}
+	const goods = pageData.bindOriginGoodsList[index];
+	uni.showModal({
+		title: '提示',
+		content: '是否确认将' + goods.name + '从该分组中移除',
+		success: function (res) {
+			if (res.confirm) {
+				pageData.bindGoodsList.splice(index, 1);
+				pageData.bindOriginGoodsList.splice(index, 1);
+				updateProdGroup({
+					...option,
+					productIds: pageData.bindOriginGoodsList.map((v) => v.id)
+				});
+			} else if (res.cancel) {
+			}
+		}
+	});
+}
+
+function goodsClick(e) {
+	pageData.goodsList[e].checked = !pageData.goodsList[e].checked;
+}
 </script>
 <style scoped>
-	page {
-		background: #F9F9F9;
-	}
+page {
+	background: #f9f9f9;
+}
 </style>
 <style lang="scss" scoped>
-	.stock-btns {
-		padding: 0 100rpx;
+.stock-btns {
+	padding: 0 100rpx;
+	display: flex;
+	flex-direction: column;
+	gap: 20rpx;
+}
+
+.safe-page {
+	background: #f9f9f9;
+}
+
+.icon-guige {
+	width: 42rpx;
+	height: 42rpx;
+}
+
+.bg-fff {
+	background-color: #fff;
+}
+
+.myTabs {
+	margin: 0 auto;
+	width: 434rpx;
+	height: 64rpx;
+}
+
+.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;
-		flex-direction: column;
-		gap: 20rpx;
-	}
-
-	.safe-page {
-		background: #F9F9F9;
-	}
-
-	.icon-guige {
-		width: 42rpx;
-		height: 42rpx;
-	}
-
-	.bg-fff {
-		background-color: #fff;
-	}
-
-	.myTabs {
-		margin: 0 auto;
-		width: 434rpx;
-		height: 64rpx;
-	}
-
-	.input-wrapper {
-		display: flex;
-		justify-content: space-between;
 		align-items: center;
-		padding-top: 26rpx;
-		background-color: $J-bg-ff;
+		height: 64rpx;
 
-		.input-main {
+		image {
+			padding: 22rpx;
+			width: 26rpx;
+			height: 26rpx;
+		}
+
+		input {
 			flex: 1;
-			display: flex;
-			align-items: center;
-			height: 64rpx;
+			font-size: 27rpx;
+		}
 
-			image {
-				padding: 22rpx;
-				width: 26rpx;
-				height: 26rpx;
-			}
+		::v-deep uni-button {
+			font-size: 28rpx;
+			color: $my-main-color;
+			background: rgba(255, 255, 255, 1);
+		}
 
-			input {
-				flex: 1;
-				font-size: 27rpx;
-			}
+		::v-deep.uni-easyinput {
+			.uni-easyinput__content {
+				background-color: $J-bg-f5 !important;
+				border-radius: $J-b-r12;
 
-			::v-deep uni-button {
-				font-size: 28rpx;
-				color: $my-main-color;
-				background: rgba(255, 255, 255, 1);
-			}
+				.uni-easyinput__content-input {
+					padding-left: 0 !important;
 
-			::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-input {
+						border-radius: $J-b-r12 !important;
+						overflow: hidden !important;
 					}
+				}
 
-					.uni-input-placeholder {
-						font-size: 27rpx;
-					}
+				.uni-input-placeholder {
+					font-size: 27rpx;
+				}
 
-					.uni-icons {
-						color: rgba(230, 230, 230, 1) !important;
-					}
+				.uni-icons {
+					color: rgba(230, 230, 230, 1) !important;
 				}
 			}
 		}
 	}
+}
 
-	.input-icon {
-		position: relative;
-		z-index: 10;
-	}
+.input-icon {
+	position: relative;
+	z-index: 10;
+}
 
-	.search-button {
-		position: absolute;
-		right: 0;
-		background-color: transparent !important;
-		color: transparent !important;
-	}
+.search-button {
+	position: absolute;
+	right: 0;
+	background-color: transparent !important;
+	color: transparent !important;
+}
 
-	.states1 {
-		margin-top: 24rpx;
+.states1 {
+	margin-top: 24rpx;
 
-		.item {
-			font-size: 28rpx;
-			color: #666;
+	.item {
+		font-size: 28rpx;
+		color: #666;
+
+		.text {
+			position: relative;
+			padding-top: 14rpx;
+			padding-bottom: 16rpx;
+
+			&::after {
+				content: '';
+				display: block;
+				position: absolute;
+				transition: all 0.2s ease-in-out;
+				left: 10rpx;
+				right: 10rpx;
+				bottom: 0;
+				height: 4rpx;
+				background: transparent;
+				border-radius: 12rpx 12rpx 12rpx 12rpx;
+			}
+		}
+
+		&.active {
+			color: $my-main-color;
+			border-radius: 8rpx 8rpx 8rpx 8rpx;
 
 			.text {
-				position: relative;
-				padding-top: 14rpx;
-				padding-bottom: 16rpx;
-
 				&::after {
-					content: '';
-					display: block;
-					position: absolute;
-					transition: all .2s ease-in-out;
-					left: 10rpx;
-					right: 10rpx;
-					bottom: 0;
-					height: 4rpx;
-					background: transparent;
-					border-radius: 12rpx 12rpx 12rpx 12rpx;
+					background-color: $my-main-color;
 				}
 			}
-
-			&.active {
-				color: $my-main-color;
-				border-radius: 8rpx 8rpx 8rpx 8rpx;
-
-				.text {
-					&::after {
-						background-color: $my-main-color;
-					}
-				}
-
-			}
-
 		}
-
-
 	}
+}
 
-	.fixed-b {
-		position: fixed;
-		bottom: calc(env(safe-area-inset-bottom) + 16rpx);
-		/* #ifdef H5 */
-		bottom: 50rpx;
-		/* #endif */
-		left: 110rpx;
-		right: 110rpx;
-	}
-</style>
\ No newline at end of file
+.fixed-b {
+	position: fixed;
+	bottom: calc(env(safe-area-inset-bottom) + 16rpx);
+	/* #ifdef H5 */
+	bottom: 50rpx;
+	/* #endif */
+	left: 110rpx;
+	right: 110rpx;
+}
+</style>
diff --git a/pageGoodsGroup/index/components/category.vue b/pageGoodsGroup/index/components/category.vue
index e07ecae..03a3766 100644
--- a/pageGoodsGroup/index/components/category.vue
+++ b/pageGoodsGroup/index/components/category.vue
@@ -1,12 +1,12 @@
 <template>
-	<view class=" goods">
+	<view class="goods">
 		<view class="u-flex u-font-24 u-col-center u-row-between u-p-b-16 border-bottom">
 			<view class="u-flex u-col-center">
 				<view class="u-font-24">
 					<text>排序</text>
-					<text class="u-m-l-12">{{data.sort}}</text>
+					<text class="u-m-l-12">{{ data.sort }}</text>
 				</view>
-				<view class="u-flex u-m-l-16 " @click="editSort">
+				<view class="u-flex u-m-l-16" @click="editSort">
 					<image src="/pageGoodsGroup/static/image/icon-edit.svg" class="icon-edit" mode=""></image>
 				</view>
 			</view>
@@ -15,20 +15,23 @@
 				<up-switch :activeValue="1" :inactiveValue="0" v-model="data.status" @change="isShowChange" :size="18"></up-switch>
 			</view>
 		</view>
-		<view class="u-m-t-24 u-p-l-54 ">
+		<view class="u-m-t-24">
 			<view class="u-flex-1 u-flex u-col-top">
 				<view class="color-666 no-wrap">分组名</view>
-				<view class="color-333 u-m-l-60">{{data.name}}</view>
-				<view class="u-flex u-m-l-16 " @click="editName">
+				<view class="color-333 u-m-l-60">{{ data.name }}</view>
+				<view class="u-flex u-m-l-16" @click="editName">
 					<image src="/pageGoodsGroup/static/image/icon-edit.svg" class="icon-edit" mode=""></image>
 				</view>
 			</view>
 			<view class="u-flex u-m-t-24">
 				<view class="color-666">售卖时间</view>
-				<view class="color-main u-m-l-32" v-if="data.saleStartTime&&data.saleEndTime">
-					<text>{{data.saleStartTime}}</text>
-					<text>-</text>
-					<text>{{data.saleEndTime}}</text>
+				<view class="color-main u-m-l-32" v-if="data.saleStartTime && data.saleEndTime">
+					<text>{{ data.saleStartTime }}</text>
+					<text> - </text>
+					<text>{{ data.saleEndTime }}</text>
+				</view>
+				<view class="color-main u-m-l-32" v-else>
+					<text>00:00:00 - 23:59:59</text>
 				</view>
 			</view>
 		</view>
@@ -37,176 +40,169 @@
 			<view class="btn-default btn" @click="del">删除</view>
 			<view class="btn-primary btn u-m-l-38" @click="toEdit">编辑</view>
 		</view>
-
 	</view>
 </template>
 
 <script setup>
-	import { computed, ref, watchEffect } from 'vue';
-	import mySwitch from '@/components/my-components/my-switch.vue'
-	import go from '@/commons/utils/go.js';
+import { computed, ref, watchEffect } from 'vue';
+import mySwitch from '@/components/my-components/my-switch.vue';
+import go from '@/commons/utils/go.js';
 
+const emits = defineEmits(['changeClick', 'edit', 'editName', 'editSort', 'del', 'isShowChange']);
 
-	const emits = defineEmits(['changeClick','edit', 'editName','editSort', 'del', 'isShowChange'])
-
-	const props = defineProps({
-		index: {
-			type: Number
-		},
-		data: {
-			type: Object,
-			default: () => {
-				return {
-					status:true
-				}
-			}
-		},
-	})
-
-
-	function isShowChange() {
-		emits('isShowChange', {
-			...props.data,
-		})
+const props = defineProps({
+	index: {
+		type: Number
+	},
+	data: {
+		type: Object,
+		default: () => {
+			return {
+				status: true
+			};
+		}
 	}
+});
 
-	let isSellNone = ref(true)
-	isSellNone.value = props.isSellNone
+function isShowChange() {
+	emits('isShowChange', {
+		...props.data
+	});
+}
 
-	function isSellNoneChange() {
-		console.log(isSellNone.value);
-		console.log('isSellNoneChange');
-	}
+let isSellNone = ref(true);
+isSellNone.value = props.isSellNone;
 
-	let checked = ref(false)
+function isSellNoneChange() {
+	console.log(isSellNone.value);
+	console.log('isSellNoneChange');
+}
 
+let checked = ref(false);
 
-	function changeClick() {
-		emits('changeClick', props.index)
-	}
+function changeClick() {
+	emits('changeClick', props.index);
+}
 
-	
-	function del() {
-		emits('del', props.index)
-	}
-	function editName() {
-		emits('editName', props.index)
-	}
-	//携带参数type edit跳转到商品添加页面，编辑与添加同一页面，根据type值来判断
-	function editSort() {
-		emits('editSort', props.index)
-	}
-	function toEdit() {
-		emits('edit', props.index)
-	}
+function del() {
+	emits('del', props.index);
+}
+function editName() {
+	emits('editName', props.index);
+}
+//携带参数type edit跳转到商品添加页面，编辑与添加同一页面，根据type值来判断
+function editSort() {
+	emits('editSort', props.index);
+}
+function toEdit() {
+	emits('edit', props.index);
+}
 </script>
 
 <style lang="scss" scoped>
-	$imgSize: 126rpx;
-	$price-color: #F02C45;
+$imgSize: 126rpx;
+$price-color: #f02c45;
 
-	.btn {
-		padding: 6rpx 28rpx;
-		border-radius: 100rpx;
-		font-size: 24rpx;
-		border: 1px solid transparent;
-	}
+.btn {
+	padding: 6rpx 28rpx;
+	border-radius: 100rpx;
+	font-size: 24rpx;
+	border: 1px solid transparent;
+}
 
-	.btn-primary {
-		border-color: $my-main-color;
-		color: $my-main-color;
-	}
+.btn-primary {
+	border-color: $my-main-color;
+	color: $my-main-color;
+}
 
-	.btn-default {
-		border-color: #999;
-		color: #999;
-	}
+.btn-default {
+	border-color: #999;
+	color: #999;
+}
 
-	.price {
-		color: $price-color;
-	}
+.price {
+	color: $price-color;
+}
 
-	.h-100 {
-		height: $imgSize;
-	}
+.h-100 {
+	height: $imgSize;
+}
 
-	.img {
-		width: $imgSize;
-		height: $imgSize;
-	}
+.img {
+	width: $imgSize;
+	height: $imgSize;
+}
 
-	.icon-arrow-right {
-		width: 32rpx;
-		height: 32rpx;
-	}
+.icon-arrow-right {
+	width: 32rpx;
+	height: 32rpx;
+}
 
-	.stock {
-		padding-right: 46rpx;
-		position: relative;
-	}
+.stock {
+	padding-right: 46rpx;
+	position: relative;
+}
 
-	.icon-edit {
-		width: 24rpx;
-		height: 24rpx;
-	}
+.icon-edit {
+	width: 24rpx;
+	height: 24rpx;
+}
 
-	.stock::after {
-		content: '';
-		position: absolute;
-		right: 10rpx;
-		top: 50%;
-		transform: translateY(-50%);
-		display: block;
-		width: 16rpx;
-		border: 2rpx solid #333333;
-	}
+.stock::after {
+	content: '';
+	position: absolute;
+	right: 10rpx;
+	top: 50%;
+	transform: translateY(-50%);
+	display: block;
+	width: 16rpx;
+	border: 2rpx solid #333333;
+}
 
-	.goods {
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-		background-color: #fff;
-		padding: 32rpx 28rpx 32rpx 28rpx;
-		font-size: 28rpx;
+.goods {
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	background-color: #fff;
+	padding: 32rpx 28rpx 32rpx 28rpx;
+	font-size: 28rpx;
 
-		.skus {
-			background: #F9F9F9;
-			border-radius: 14rpx 14rpx 14rpx 14rpx;
-			padding: 28rpx 42rpx;
+	.skus {
+		background: #f9f9f9;
+		border-radius: 14rpx 14rpx 14rpx 14rpx;
+		padding: 28rpx 42rpx;
 
-			.sku {
-				color: #000;
-				font-weight: 700;
-				padding: 6rpx 40rpx;
+		.sku {
+			color: #000;
+			font-weight: 700;
+			padding: 6rpx 40rpx;
+		}
+
+		.skds {
+			gap: 10rpx 50rpx;
+		}
+
+		.skd {
+			padding: 14rpx 40rpx;
+			background: #f0f2f5;
+			border-radius: 4rpx;
+			position: relative;
+			color: #666;
+			overflow: hidden;
+
+			.tag {
+				position: absolute;
+				right: 0;
+				top: 0;
+				font-size: 12rpx;
+				right: 0;
+				padding: 2rpx 4rpx;
+				border-radius: 0rpx 4rpx 4rpx 4rpx;
 			}
 
-			.skds {
-				gap: 10rpx 50rpx;
+			.tag-primary {
+				background-color: $my-main-color;
+				color: #fff;
 			}
-
-			.skd {
-				padding: 14rpx 40rpx;
-				background: #F0F2F5;
-				border-radius: 4rpx;
-				position: relative;
-				color: #666;
-				overflow: hidden;
-
-				.tag {
-					position: absolute;
-					right: 0;
-					top: 0;
-					font-size: 12rpx;
-					right: 0;
-					padding: 2rpx 4rpx;
-					border-radius: 0rpx 4rpx 4rpx 4rpx;
-				}
-
-				.tag-primary {
-					background-color: $my-main-color;
-					color: #fff;
-				}
-			}
-
-
 		}
 	}
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/pageGoodsGroup/index/index.vue b/pageGoodsGroup/index/index.vue
index f047bdd..ee1edeb 100644
--- a/pageGoodsGroup/index/index.vue
+++ b/pageGoodsGroup/index/index.vue
@@ -1,23 +1,24 @@
 <template>
 	<view class="safe-page min-page">
 		<view class="goods-list u-p-30">
-			<view class="u-m-b-32" v-for="(item,index) in pageData.list" :key="index">
-				<my-category 
-					@del="groupDel" 
-					@editName="popupShow($event,'name',true)"
-					@editSort="popupShow($event,'sort',true)" 
-					@edit="actionsShow" 
-					@isShowChange="isSHowChange" :index="index" :data="item"
-					:showDetail="pageData.showGoodsDetail"></my-category>
+			<view class="u-m-b-32" v-for="(item, index) in pageData.list" :key="index">
+				<my-category
+					@del="groupDel"
+					@editName="popupShow($event, 'name', true)"
+					@editSort="popupShow($event, 'sort', true)"
+					@edit="actionsShow"
+					@isShowChange="isSHowChange"
+					:index="index"
+					:data="item"
+					:showDetail="pageData.showGoodsDetail"
+				></my-category>
 			</view>
-			<view class="u-m-t-44" v-if="pageData.list.length>0">
-				<my-pagination :page="pageData.query.page" :size="pageData.query.size" :totalElements="pageData.totalElements"
-					@change="pageChange"></my-pagination>
-				<view style="height: 200rpx;"></view>
+			<view class="u-m-t-44" v-if="pageData.list.length > 0">
+				<my-pagination :page="pageData.query.page" :size="pageData.query.size" :totalElements="pageData.totalElements" @change="pageChange"></my-pagination>
+				<view style="height: 200rpx"></view>
 			</view>
 		</view>
 
-
 		<view class="fixed-b">
 			<my-button :height="80" shape="circle" font-weight="700" @tap="toAddGroup">新建分组</my-button>
 		</view>
@@ -27,40 +28,41 @@
 	<edit-name @save="updataGroup" :item="popup.selData" v-model:show="popup.name.show"></edit-name>
 	<edit-time @save="updataGroup" :item="popup.selData" v-model:show="popup.time.show"></edit-time>
 
-	<up-action-sheet :round="10" @select="actionSelect" @close="actionsHide" cancelText="取消" :actions="actions.list"
-		:show="actions.show"></up-action-sheet>
+	<up-action-sheet :round="10" @select="actionSelect" @close="actionsHide" cancelText="取消" :actions="actions.list" :show="actions.show"></up-action-sheet>
 </template>
 
 <script setup>
-	import { reactive, ref } from 'vue';
-	import { onShow } from '@dcloudio/uni-app'
-	import go from '@/commons/utils/go.js';
-	import myCategory from './components/category.vue'
-	import editSort from './components/edit-sort.vue';
-	import editName from './components/edit-name.vue';
-	import editTime from './components/edit-time.vue';
-	import { getProdGroupPage, addProdGroup, updateProdGroup, delProdGroup,editProdGroup } from '@/http/api/product.js'
-	
-	const pageData = reactive({
-		showGoodsDetail: false,
-		query: {
-			page: 1,
-			size: 10,
-		},
-		totalElements: 0,
-		list: [],
-		selCategory: ''
-	})
-	
-	/**
-	 * 编辑列表
-	 */
-	const actions = reactive({
-		list: [{
+import { reactive, ref } from 'vue';
+import { onShow } from '@dcloudio/uni-app';
+import go from '@/commons/utils/go.js';
+import myCategory from './components/category.vue';
+import editSort from './components/edit-sort.vue';
+import editName from './components/edit-name.vue';
+import editTime from './components/edit-time.vue';
+import { getProdGroupPage, addProdGroup, updateProdGroup, delProdGroup, editProdGroup } from '@/http/api/product.js';
+
+const pageData = reactive({
+	showGoodsDetail: false,
+	query: {
+		page: 1,
+		size: 10
+	},
+	totalElements: 0,
+	list: [],
+	selCategory: ''
+});
+
+/**
+ * 编辑列表
+ */
+const actions = reactive({
+	list: [
+		{
 			name: '排序',
 			color: '#333',
 			fontSize: '16'
-		}, {
+		},
+		{
 			name: '管理商品',
 			color: '#333',
 			fontSize: '16'
@@ -70,311 +72,310 @@
 			color: '#333',
 			fontSize: '16'
 		}
-		],
-		show: false,
-	})
-	
-	
-	/**
-	 * 编辑数据
-	 */
-	const popup = reactive({
-		selIndex: -1,
-		selData: {
-			sort: ''
-		},
-		sort: {
-			show: false
-		},
-		name:{
-			show: false
-		},
-		time:{
-			show: false
-		}
-	})
-	
-	onShow(() => {
-		getList()
-	})
-	
-	/**
-	 * 获取分组数据
-	 */
-	async function getList() {
-		const res = await getProdGroupPage(pageData.query)
-		pageData.list = res.records
-		pageData.totalElements = res.totalRow
-		if(res.records.length <= 0&&res.totalPage>1) {
-			pageData.query.page = res.totalPage
-			getList()
-		}
-	}
-	
-	/**
-	 * 编辑列表显示
-	 * @param {Object} e
-	 */
-	function actionsShow(e) {
-		popup.selData = pageData.list[e]
-		popup.selIndex = e
-		actions.show = true
-	}
-	
-	/**
-	 * 编辑列表隐藏
-	 */
-	function actionsHide() {
-		actions.show = false
-	}
-	
-	/**
-	 * 编辑列表选择
-	 * @param {Object} e
-	 */
-	function actionSelect(e) {
-		if (e.name == '排序') {
-			return popupShow(popup.selIndex, 'sort', true)
-		}
-		if (e.name == '管理商品') {
-			const {id,status,name,sort}=popup.selData
-			return go.to('PAGES_GOODS_GROUP_EDIT_GOODS', {
-				id,status,name,sort
-			})
-		}
-		if (e.name == '售卖时间') {
-			return popupShow(popup.selIndex, 'time', true)
-		}
-	}
-	
-	/**
-	 * 编辑打开
-	 * @param {Object} e
-	 * @param {Object} key
-	 * @param {Object} show
-	 */
-	function popupShow(e, key, show) {
-		popup[key].show = show
-		popup.selIndex = e
-		popup.selData = pageData.list[e]
-	}
+	],
+	show: false
+});
 
-	/**
-	 * 编辑确认
-	 * @param {Object} e
-	 */
-	async function updataGroup(e) {
-		console.log(e)
-		const res = await editProdGroup(e)
-		popup.sort.show = false;
-		popup.name.show = false;
-		popup.time.show = false;
-		pageData.list[popup.selIndex] = e
-		uni.$utils.showToast('更新成功')
-		getList()
+/**
+ * 编辑数据
+ */
+const popup = reactive({
+	selIndex: -1,
+	selData: {
+		sort: ''
+	},
+	sort: {
+		show: false
+	},
+	name: {
+		show: false
+	},
+	time: {
+		show: false
 	}
-		
-	/**
-	 * 状态修改
-	 * @param {Object} data
-	 */
-	async function isSHowChange(data) {
-		const res = await editProdGroup({
-			...data
-		})
-		uni.$utils.showToast('更新成功')
-		
-	}
-	
+});
 
-	const goodsSortModel = ref(null)
-	const goodsTypeModel = ref(null)
-	let sort = ref(0)
-	const goodsTypeModelData = reactive({
-		selCategory: '',
-		title: '',
-		index: null,
-		useTypes: [{
-				name: '堂食',
-				isOpen: true
-			},
-			{
-				name: '自取',
-				isOpen: true
-			},
-			{
-				name: '外卖',
-				isOpen: true
-			},
-			{
-				name: '快递',
-				isOpen: true
-			}
-		]
-	})
-	
-	/**
-	 * 新增分组
-	 */
-	function toAddGroup() {
-		go.to('PAGES_GOODS_GROUP_EDIT', {
-			type: 'add'
-		})
-	}
+onShow(() => {
+	getList();
+});
 
-	/**
-	 * 删除分组
-	 * @param {Object} index
-	 */
-	function groupDel(index) {
-		uni.showModal({
-			title: '提示',
-			content: '请确保此分组下没有任何商品确认删除?',
-			success: res => {
-				if (res.confirm) {
-					delProdGroup(pageData.list[index].id).then(res => {
-						uni.$utils.showToast('删除成功')
-						setTimeout(()=>{
-							getList()
-						},1500)
-					})
-				}
-			},
-			fail: () => {},
-			complete: () => {}
+/**
+ * 获取分组数据
+ */
+async function getList() {
+	const res = await getProdGroupPage(pageData.query);
+	pageData.list = res.records;
+	pageData.totalElements = res.totalRow;
+	if (res.records.length <= 0 && res.totalPage > 1) {
+		pageData.query.page = res.totalPage;
+		getList();
+	}
+}
+
+/**
+ * 编辑列表显示
+ * @param {Object} e
+ */
+function actionsShow(e) {
+	popup.selData = pageData.list[e];
+	popup.selIndex = e;
+	actions.show = true;
+}
+
+/**
+ * 编辑列表隐藏
+ */
+function actionsHide() {
+	actions.show = false;
+}
+
+/**
+ * 编辑列表选择
+ * @param {Object} e
+ */
+function actionSelect(e) {
+	if (e.name == '排序') {
+		return popupShow(popup.selIndex, 'sort', true);
+	}
+	if (e.name == '管理商品') {
+		const { id, status, name, sort } = popup.selData;
+		return go.to('PAGES_GOODS_GROUP_EDIT_GOODS', {
+			id,
+			status,
+			name,
+			sort
 		});
 	}
-
-
-	// 页数改变事件
-	function pageChange(page) {
-		pageData.query.page = page
-		getList()
+	if (e.name == '售卖时间') {
+		return popupShow(popup.selIndex, 'time', true);
 	}
+}
 
+/**
+ * 编辑打开
+ * @param {Object} e
+ * @param {Object} key
+ * @param {Object} show
+ */
+function popupShow(e, key, show) {
+	popup[key].show = show;
+	popup.selIndex = e;
+	popup.selData = pageData.list[e];
+}
+
+/**
+ * 编辑确认
+ * @param {Object} e
+ */
+async function updataGroup(e) {
+	console.log(e);
+	const res = await editProdGroup(e);
+	popup.sort.show = false;
+	popup.name.show = false;
+	popup.time.show = false;
+	pageData.list[popup.selIndex] = e;
+	uni.$utils.showToast('更新成功');
+	getList();
+}
+
+/**
+ * 状态修改
+ * @param {Object} data
+ */
+async function isSHowChange(data) {
+	const res = await editProdGroup({
+		...data
+	});
+	uni.$utils.showToast('更新成功');
+}
+
+const goodsSortModel = ref(null);
+const goodsTypeModel = ref(null);
+let sort = ref(0);
+const goodsTypeModelData = reactive({
+	selCategory: '',
+	title: '',
+	index: null,
+	useTypes: [
+		{
+			name: '堂食',
+			isOpen: true
+		},
+		{
+			name: '自取',
+			isOpen: true
+		},
+		{
+			name: '外卖',
+			isOpen: true
+		},
+		{
+			name: '快递',
+			isOpen: true
+		}
+	]
+});
+
+/**
+ * 新增分组
+ */
+function toAddGroup() {
+	go.to('PAGES_GOODS_GROUP_EDIT', {
+		type: 'add'
+	});
+}
+
+/**
+ * 删除分组
+ * @param {Object} index
+ */
+function groupDel(index) {
+	uni.showModal({
+		title: '提示',
+		content: '请确保此分组下没有任何商品确认删除?',
+		success: (res) => {
+			if (res.confirm) {
+				delProdGroup(pageData.list[index].id).then((res) => {
+					uni.$utils.showToast('删除成功');
+					setTimeout(() => {
+						getList();
+					}, 1500);
+				});
+			}
+		},
+		fail: () => {},
+		complete: () => {}
+	});
+}
+
+// 页数改变事件
+function pageChange(page) {
+	pageData.query.page = page;
+	getList();
+}
 </script>
 <style scoped>
-	page {
-		background: #F9F9F9;
-	}
+page {
+	background: #f1f1f1;
+}
 </style>
 <style lang="scss" scoped>
-	.stock-btns {
-		padding: 0 100rpx;
+.stock-btns {
+	padding: 0 100rpx;
+	display: flex;
+	flex-direction: column;
+	gap: 20rpx;
+}
+
+.safe-page {
+	background: #f1f1f1;
+}
+
+.icon-guige {
+	width: 42rpx;
+	height: 42rpx;
+}
+
+.bg-fff {
+	background-color: #fff;
+}
+
+.myTabs {
+	margin: 0 auto;
+	width: 434rpx;
+	height: 64rpx;
+}
+
+.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;
-		flex-direction: column;
-		gap: 20rpx;
-	}
-
-	.safe-page {
-		background: #F9F9F9;
-	}
-
-	.icon-guige {
-		width: 42rpx;
-		height: 42rpx;
-	}
-
-	.bg-fff {
-		background-color: #fff;
-	}
-
-	.myTabs {
-		margin: 0 auto;
-		width: 434rpx;
-		height: 64rpx;
-	}
-
-	.input-wrapper {
-		display: flex;
-		justify-content: space-between;
 		align-items: center;
-		padding-top: 26rpx;
-		background-color: $J-bg-ff;
+		height: 64rpx;
 
-		.input-main {
+		image {
+			padding: 22rpx;
+			width: 26rpx;
+			height: 26rpx;
+		}
+
+		input {
 			flex: 1;
-			display: flex;
-			align-items: center;
-			height: 64rpx;
+			font-size: 27rpx;
+		}
 
-			image {
-				padding: 22rpx;
-				width: 26rpx;
-				height: 26rpx;
-			}
+		::v-deep uni-button {
+			font-size: 28rpx;
+			color: $my-main-color;
+			background: rgba(255, 255, 255, 1);
+		}
 
-			input {
-				flex: 1;
-				font-size: 27rpx;
-			}
+		::v-deep.uni-easyinput {
+			.uni-easyinput__content {
+				background-color: $J-bg-f5 !important;
+				border-radius: $J-b-r12;
 
-			::v-deep uni-button {
-				font-size: 28rpx;
-				color: $my-main-color;
-				background: rgba(255, 255, 255, 1);
-			}
+				.uni-easyinput__content-input {
+					padding-left: 0 !important;
 
-			::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-input {
+						border-radius: $J-b-r12 !important;
+						overflow: hidden !important;
 					}
+				}
 
-					.uni-input-placeholder {
-						font-size: 27rpx;
-					}
+				.uni-input-placeholder {
+					font-size: 27rpx;
+				}
 
-					.uni-icons {
-						color: rgba(230, 230, 230, 1) !important;
-					}
+				.uni-icons {
+					color: rgba(230, 230, 230, 1) !important;
 				}
 			}
 		}
 	}
+}
 
-	.input-icon {
-		position: relative;
-		z-index: 10;
+.input-icon {
+	position: relative;
+	z-index: 10;
+}
+
+.search-button {
+	position: absolute;
+	right: 0;
+	background-color: transparent !important;
+	color: transparent !important;
+}
+
+.states1 {
+	margin-top: 78rpx;
+
+	.item {
+		font-size: 24rpx;
+		color: #666;
+		margin-right: 70rpx;
+		background: #f4f4f4;
+		border-radius: 8rpx 8rpx 8rpx 8rpx;
 	}
 
-	.search-button {
-		position: absolute;
-		right: 0;
-		background-color: transparent !important;
-		color: transparent !important;
+	.item.active {
+		background: #e6f0ff;
+		color: $my-main-color;
+		border-radius: 8rpx 8rpx 8rpx 8rpx;
 	}
+}
 
-	.states1 {
-		margin-top: 78rpx;
-
-		.item {
-			font-size: 24rpx;
-			color: #666;
-			margin-right: 70rpx;
-			background: #F4F4F4;
-			border-radius: 8rpx 8rpx 8rpx 8rpx;
-		}
-
-		.item.active {
-			background: #E6F0FF;
-			color: $my-main-color;
-			border-radius: 8rpx 8rpx 8rpx 8rpx;
-		}
-	}
-
-	.fixed-b {
-		position: fixed;
-		left: 110rpx;
-		right: 110rpx;
-		bottom: 110rpx;
-	}
-</style>
\ No newline at end of file
+.fixed-b {
+	position: fixed;
+	left: 110rpx;
+	right: 110rpx;
+	bottom: 110rpx;
+}
+</style>
diff --git a/pages.json b/pages.json
index cb9ba1d..96100cf 100644
--- a/pages.json
+++ b/pages.json
@@ -14,7 +14,8 @@
 			"style": {
 				"navigationBarTitleText": "首页（自定义导航）",
 				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white"
 			}
 		},
 
@@ -219,7 +220,7 @@
 				}
 			]
 		},
-		
+
 		{
 			"root": "pageWorkControl",
 			"pages": [{
@@ -265,7 +266,7 @@
 				}
 			}]
 		},
-		
+
 		{
 			"root": "pageRecharge",
 			"pages": [{
diff --git a/pagesCreateOrder/index/components/car.vue b/pagesCreateOrder/index/components/car.vue
index ce062cb..0707c20 100644
--- a/pagesCreateOrder/index/components/car.vue
+++ b/pagesCreateOrder/index/components/car.vue
@@ -1,82 +1,79 @@
 <template>
 	<view>
-
 		<view class="mask" @tap="hideGoods" v-if="switchGoods"></view>
 		<view class="car border-top u-flex u-row-between u-col-bottom u-relative">
 			<view class="u-absolute goods bg-fff">
-				<view
-					class="u-p-t-32 color-666 border-bottom bg-fff u-absolute total u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between">
-					<view>已添加{{goodsNumber.toFixed(0)}}件商品</view>
+				<view class="u-p-t-32 color-666 border-bottom bg-fff u-absolute total u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between">
+					<view>已添加{{ goodsNumber.toFixed(0) }}件商品</view>
 					<view class="color-666">
 						<uni-icons color="#666" type="trash"></uni-icons>
-						<text class="u-m-l-10" @tap="setModalShow('clear',true,'cart','是否清空全部已添加的商品')">清空购物车</text>
+						<text class="u-m-l-10" @tap="setModalShow('clear', true, 'cart', '是否清空全部已添加的商品')">清空购物车</text>
 					</view>
 				</view>
-				<scroll-view scroll-y="true" class="tranistion" :style="{height:switchGoods?'50vh':0 }">
+				<scroll-view scroll-y="true" class="tranistion" :style="{ height: switchGoods ? '50vh' : 0 }">
 					<!-- 占位 -->
-					<view class="u-p-t-32 color-666 border-bottom u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between"
-						style="opacity: 0;">
-						<view>已添加{{goodsNumber.toFixed(0)}}件商品</view>
+					<view class="u-p-t-32 color-666 border-bottom u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between" style="opacity: 0">
+						<view>已添加{{ goodsNumber.toFixed(0) }}件商品</view>
 						<view class="color-666">
 							<uni-icons color="#666" type="trash"></uni-icons>
 							<text class="u-m-l-10">清空</text>
 						</view>
 					</view>
 					<!-- 占位 -->
-					<view class="color-333 item border-top u-flex u-row-center u-row-between"
-						v-for="(item,index) in data" :key="index">
+					<view class="color-333 item border-top u-flex u-row-center u-row-between" v-for="(item, index) in data" :key="index">
 						<view>
-							<view class="up-line-1" >{{item.name}}</view>
-							<view class="u-m-t-10 u-font-24 color-666 up-line-1">{{item.specInfo||''}}</view>
+							<view class="up-line-1">{{ item.name }}</view>
+							<view class="u-m-t-10 u-font-24 color-666 up-line-1">{{ item.specInfo || '' }}</view>
 						</view>
-						<view class="u-flex" style="flex-shrink: 0;">
-							<view class="font-bold red u-m-r-32">￥{{formatPrice(item.lowPrice*item.number) }}</view>
-							<view class="u-flex" @tap="updateNumber(false,index,item)">
+						<view class="u-flex" style="flex-shrink: 0">
+							<view class="font-bold red u-m-r-32">￥{{ formatPrice(item.lowPrice * item.number) }}</view>
+							<view class="u-flex" @tap="updateNumber(false, index, item)">
 								<image src="/pagesCreateOrder/static/images/icon-reduce-black.svg" class="icon" mode="" />
 							</view>
 							<view class="u-m-l-30 u-m-r-30 color-333">
-								{{item.number.toFixed(2)}}
+								{{ item.number.toFixed(2) }}
 							</view>
-							<view class="u-flex" @tap="updateNumber(true,index,item)" >
-								<image src="/pagesCreateOrder/static/images/icon-add-black.svg"  class="icon "  :class="{'grayscale': item.type == 'package'&&item.groupType == 1}" mode="" />
+							<view class="u-flex" @tap="updateNumber(true, index, item)">
+								<image
+									src="/pagesCreateOrder/static/images/icon-add-black.svg"
+									class="icon"
+									:class="{ grayscale: item.type == 'package' && item.groupType == 1 }"
+									mode=""
+								/>
 							</view>
-
 						</view>
 					</view>
-					<view style="margin: 50rpx auto 110rpx auto;" v-if="!data.length">
+					<view style="margin: 50rpx auto 110rpx auto" v-if="!data.length">
 						<my-empty text="暂未有添加商品"></my-empty>
 					</view>
-					
 					<!-- 历史订单 -->
-					
-					<view v-if="historyOrder.length > 0"
-						class="u-p-t-32 u-p-b-32 u-p-r-28 u-p-l-28 u-m-t-40 bg-fff u-flex u-row-between">
-						<view class="color-333" style="font-weight: bold;">历史订单</view>
+					<view v-if="historyOrder.length > 0" class="u-p-t-32 u-p-b-32 u-p-r-28 u-p-l-28 u-m-t-40 bg-fff u-flex u-row-between">
+						<view class="color-333" style="font-weight: bold">历史订单</view>
 						<view class="color-666">
 							<uni-icons color="#666" type="trash"></uni-icons>
-							<text class="u-m-l-10" @tap="setModalShow('clear',true,'allHistoryOrder','清空历史订单')">清空历史订单</text>
+							<text class="u-m-l-10" @tap="setModalShow('clear', true, 'allHistoryOrder', '清空历史订单')">清空历史订单</text>
 						</view>
 					</view>
-					<view v-for="(item,index) in historyOrder" :key="index">
-						<view v-if="historyOrder.length > 0"
-							class="u-p-t-32 border-top bg-fff u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between">
-							<view class="color-333" style="font-size: 30rpx;">第{{item.placeNum}}次下单</view>
+					<view v-for="(item, index) in historyOrder" :key="index">
+						<view v-if="historyOrder.length > 0" class="u-p-t-32 border-top bg-fff u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between">
+							<view class="color-333" style="font-size: 30rpx">第{{ item.placeNum }}次下单</view>
 							<view class="color-666">
 								<uni-icons color="#666" type="trash"></uni-icons>
-								<text class="u-m-l-10" @tap="setModalShow('clear',true,item.placeNum,'清空第'+item.placeNum+'次下单历史订单')">清空</text>
+								<text class="u-m-l-10" @tap="setModalShow('clear', true, item.placeNum, '清空第' + item.placeNum + '次下单历史订单')">清空</text>
 							</view>
 						</view>
-						<view class="color-333 item border-top u-flex u-row-center u-row-between"
-							v-for="(v,i) in item.info" :key="i">
-							<view style="display: flex;align-items: center;">
-								<view class="up-line-1" style="margin-right: 10rpx;">{{v.productName}}</view>
-								<uni-tag v-if="v.returnNum>0" :text="'退菜X'+v.returnNum"
-									custom-style="background-color: #EB4F4F; border-color: #EB4F4F; color: #fff;">
-								</uni-tag>
+						<view class="color-333 item border-top u-flex u-row-center u-row-between" v-for="(v, i) in item.info" :key="i">
+							<view style="display: flex; align-items: center">
+								<view class="up-line-1" style="margin-right: 10rpx">{{ v.productName }}</view>
+								<uni-tag
+									v-if="v.returnNum > 0"
+									:text="'退菜X' + v.returnNum"
+									custom-style="background-color: #EB4F4F; border-color: #EB4F4F; color: #fff;"
+								></uni-tag>
 							</view>
-							<view class="u-flex" style="flex-shrink: 0;">
-								<view class="font-bold red u-m-r-32">￥{{formatPrice(v.price*(v.num - v.returnNum)) }}</view>
-								<view class="u-m-l-30 u-m-r-30 color-333"> X{{v.num.toFixed(2)}} </view>
+							<view class="u-flex" style="flex-shrink: 0">
+								<view class="font-bold red u-m-r-32">￥{{ formatPrice(v.price * (v.num - v.returnNum)) }}</view>
+								<view class="u-m-l-30 u-m-r-30 color-333">X{{ v.num.toFixed(2) }}</view>
 							</view>
 						</view>
 					</view>
@@ -84,299 +81,311 @@
 			</view>
 			<view class="icon-car-box" @tap="toggleGoods">
 				<image src="/pagesCreateOrder/static/images/icon-car.svg" class="icon-car" />
-				<view class="dot" v-if="goodsNumber>0">{{goodsNumber}}</view>
+				<view class="dot" v-if="goodsNumber > 0">{{ goodsNumber }}</view>
 			</view>
 			<view class="price font-bold u-flex">
 				<view>￥</view>
-				<view>{{allPrice}}</view>
+				<view>{{ allPrice }}</view>
 			</view>
 			<my-button shape="circle" height="80" width="220" @tap="toConfimOrder">
-				<text class="u-font-32 font-bold">{{table.type=='add'?'确认加菜':'去下单'}} </text>
+				<text class="u-font-32 font-bold">{{ table.type == 'add' ? '确认加菜' : '去下单' }}</text>
 			</my-button>
-
-
 		</view>
-		<up-modal title="提示" :content="modal.title" :show="modal.clear" showCancelButton closeOnClickOverlay
-			@confirm="confirmModelConfirm" @cancel="setModalShow('clear',false)" @close="setModalShow('clear',false)"
-			width="300px"></up-modal>
+		<up-modal
+			title="提示"
+			:content="modal.title"
+			:show="modal.clear"
+			showCancelButton
+			closeOnClickOverlay
+			@confirm="confirmModelConfirm"
+			@cancel="setModalShow('clear', false)"
+			@close="setModalShow('clear', false)"
+			width="300px"
+		></up-modal>
 	</view>
 </template>
 
 <script setup>
-	import { computed, reactive, ref, watch } from 'vue';
-	import myButton from '@/components/my-components/my-button.vue'
-	import go from '@/commons/utils/go.js';
-	import infoBox from '@/commons/utils/infoBox.js';
-	import { formatPrice } from '@/commons/utils/format.js';
+import { computed, reactive, ref, watch } from 'vue';
+import myButton from '@/components/my-components/my-button.vue';
+import go from '@/commons/utils/go.js';
+import infoBox from '@/commons/utils/infoBox.js';
+import { formatPrice } from '@/commons/utils/format.js';
+import { $trturnPayAfter } from '../util.js'
 
-	const props = defineProps({
-		data: {
-			type: Array,
-			default: () => {
-				return []
-			}
-		},
-		historyOrder: {
-			type: Array,
-			default: () => {
-				return []
-			}
-		},
-		isCreateOrderToDetail: {
-			type: Boolean,
-			default: false
-		},
-		orderInfo: {
-			type: Object,
-			default: () => {
-				return {
-					id: ''
-				}
-			}
-		},
-		table: {
-			type: Object,
-			default: () => {
-				return {
-					tableId: ''
-				}
-			}
+const props = defineProps({
+	data: {
+		type: Array,
+		default: () => {
+			return [];
 		}
-	})
-	let allHistoryOrder = ref([]);
-	const allPrice = computed(() => {
-		let cartPrice = props.data.reduce((prve, cur) => {
-			let price = Math.floor((cur.lowPrice * cur.number)*100)/100
-			return prve + price
-		}, 0)
-		let historyOrderPrice = allHistoryOrder.value.reduce((prve, cur) => {
-			let price = Math.floor((cur.price * (cur.num-cur.returnNum))*100)/100
-			return prve + price
-		}, 0)
-		
-		return (cartPrice + historyOrderPrice).toFixed(2)
-	})
-	
-	const goodsNumber = computed(() => {
-		let result = 0
-		let cart = props.data.reduce((prve, cur) => {
-			return prve + cur.number
-		}, 0)
-		
-		let historyOrderNum = allHistoryOrder.value.reduce((prve, cur) => {
-			return prve + cur.num
-		}, 0)
-		result = cart + historyOrderNum
-		result = result > 0 ? result.toFixed(2) : 0
-		return result >= 99 ? 99 : parseFloat(result)
-	})
-	watch(() => props.historyOrder, (newval) => {
+	},
+	historyOrder: {
+		type: Array,
+		default: () => {
+			return [];
+		}
+	},
+	isCreateOrderToDetail: {
+		type: Boolean,
+		default: false
+	},
+	orderInfo: {
+		type: Object,
+		default: () => {
+			return {
+				id: ''
+			};
+		}
+	},
+	table: {
+		type: Object,
+		default: () => {
+			return {
+				tableId: ''
+			};
+		}
+	}
+});
+let allHistoryOrder = ref([]);
+const allPrice = computed(() => {
+	let cartPrice = props.data.reduce((prve, cur) => {
+		let price = Math.floor(cur.lowPrice * cur.number * 100) / 100;
+		return prve + price;
+	}, 0);
+	let historyOrderPrice = allHistoryOrder.value.reduce((prve, cur) => {
+		let price = Math.floor(cur.price * (cur.num - cur.returnNum) * 100) / 100;
+		return prve + price;
+	}, 0);
+
+	return (cartPrice + historyOrderPrice).toFixed(2);
+});
+
+const goodsNumber = computed(() => {
+	let result = 0;
+	let cart = props.data.reduce((prve, cur) => {
+		return prve + cur.number;
+	}, 0);
+
+	// let historyOrderNum = allHistoryOrder.value.reduce((prve, cur) => {
+	// 	return prve + cur.num;
+	// }, 0);
+	result = cart;
+	result = result > 0 ? result.toFixed(2) : 0;
+	return result >= 99 ? 99 : parseFloat(result);
+});
+watch(
+	() => props.historyOrder,
+	(newval) => {
 		allHistoryOrder.value = [];
-		newval.forEach(item=>{
-			allHistoryOrder.value = [...allHistoryOrder.value,...item.info]
-		})
-	})
-	const modal = reactive({
-		key: '',
-		title: '',
-		type: '',
-		clear: false
-	})
+		newval.forEach((item) => {
+			allHistoryOrder.value = [...allHistoryOrder.value, ...item.info];
+		});
+	}
+);
+const modal = reactive({
+	key: '',
+	title: '',
+	type: '',
+	clear: false
+});
 
-	function confirmModelConfirm() {
-		if (modal.key == 'clear') {
-			clear()
-		}
+function confirmModelConfirm() {
+	if (modal.key == 'clear') {
+		clear();
+	}
+}
+
+function setModalShow(key = 'show', show = true, type = '', title = '') {
+	// if (key == 'clear' && show && props.data.length <= 0) {
+	// 	return infoBox.showToast('购物车是空的！')
+	// }
+	if (title) {
+		modal.title = title;
+	}
+	if (type) {
+		modal.type = type;
+	}
+	modal.key = key;
+	modal[key] = show;
+	console.log(modal);
+}
+
+const edmits = defineEmits(['clear', 'updateNumber']);
+
+// mask
+let switchGoods = ref(false);
+
+function hideGoods() {
+	switchGoods.value = false;
+}
+
+function showGoods() {
+	switchGoods.value = true;
+}
+
+function toggleGoods() {
+	switchGoods.value = !switchGoods.value;
+}
+
+function toConfimOrder() {
+	if (props.data.length <= 0 && allHistoryOrder.value.length <= 0) {
+		return infoBox.showToast('还没有选择商品');
+	}
+	const { name, status, type } = props.table;
+	if (props.data.length <= 0 && allHistoryOrder.value.length > 0) {
+		go.to('PAGES_ORDER_PAY', {
+			orderId: props.orderInfo.id
+		});
+		return;
 	}
 
-	function setModalShow(key = 'show',show = true, type = '' , title = '') {
-		// if (key == 'clear' && show && props.data.length <= 0) {
-		// 	return infoBox.showToast('购物车是空的！')
-		// }
-		if( title ){ modal.title = title }
-		if( type ){ modal.type = type }
-		modal.key = key
-		modal[key] = show
-		console.log(modal);
-	}
-
-	const edmits = defineEmits(['clear', 'updateNumber'])
-
-	// mask
-	let switchGoods = ref(false)
-
-	function hideGoods() {
-		switchGoods.value = false
-	}
-
-	function showGoods() {
-		switchGoods.value = true
-	}
-
-	function toggleGoods() {
-		switchGoods.value = !switchGoods.value
-	}
-
-	function toConfimOrder() {
-		if ( props.data.length <= 0 && allHistoryOrder.value.length <= 0 ) {
-			return infoBox.showToast('还没有选择商品')
-		}
-		const { name,  status, type } = props.table
-		if ( props.data.length <= 0 && allHistoryOrder.value.length > 0 ) {
-			go.to('PAGES_ORDER_PAY', {
-				orderId: props.orderInfo.id,
-			})
-			return 
-		}
-		
-		
-		if (props.table.id == '' && props.table.tableCode == '') {
-			go.to('PAGES_CONFIRM_ORDER', {
-				isCreateOrderToDetail: props.isCreateOrderToDetail ? 1 : 0
-			})
-			return
-		}
+	if (props.table.id == '' && props.table.tableCode == '') {
 		go.to('PAGES_CONFIRM_ORDER', {
-			type: type,
-			tableId: props.table.id,
-			tableCode: props.table.tableCode,
-			name:name,
-			status:status,
 			isCreateOrderToDetail: props.isCreateOrderToDetail ? 1 : 0
-		})
+		});
+		return;
 	}
 
+	let shopInfo = uni.getStorageSync('shopInfo');
+	console.log($trturnPayAfter(shopInfo));
 
+	go.to('PAGES_CONFIRM_ORDER', {
+		type: type,
+		tableId: props.table.id,
+		tableCode: props.table.tableCode,
+		name: name,
+		status: status,
+		isCreateOrderToDetail: props.isCreateOrderToDetail ? 1 : 0
+	});
+}
 
-	function updateNumber(isAdd, index, goods) {
-		const step = isAdd ? 1 : -1
-		const newval = goods.number + step
-		if(goods.type == 'package'&&goods.groupType == 1&&isAdd){
-			return
-		}
-		const par = {
-			num: newval,
-			index: index,
-			goods: goods
-		}
-		edmits('updateNumber', par)
+function updateNumber(isAdd, index, goods) {
+	const step = isAdd ? 1 : -1;
+	const newval = goods.number + step;
+	if (goods.type == 'package' && goods.groupType == 1 && isAdd) {
+		return;
 	}
+	const par = {
+		num: newval,
+		index: index,
+		goods: goods
+	};
+	edmits('updateNumber', par);
+}
 
-	function clear() {
-		if ( modal.type == 'cart') {
-			hideGoods()
-		}
-		setModalShow('clear', false)
-		edmits('clear',modal.type)
+function clear() {
+	if (modal.type == 'cart') {
+		hideGoods();
 	}
-
+	setModalShow('clear', false);
+	edmits('clear', modal.type);
+}
 </script>
 
 <style lang="scss" scoped>
-	$car-size: 96rpx;
-	$car-top: -16rpx;
+$car-size: 96rpx;
+$car-top: -16rpx;
 
-	@mixin fixedAll {
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
+@mixin fixedAll {
+	position: fixed;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+}
+
+.total {
+	left: 0;
+	right: 0;
+	top: 0;
+	z-index: 1;
+}
+
+.icon {
+	width: 40rpx;
+	height: 40rpx;
+}
+.grayscale {
+	filter: opacity(60%);
+}
+.mask {
+	@include fixedAll;
+	background: rgba(51, 51, 51, 0.5);
+}
+
+.goods {
+	position: absolute;
+	bottom: 100%;
+	left: 0;
+	right: 0;
+	transition: all 0.2s ease-in-out;
+	overflow: hidden;
+
+	.item {
+		padding: 32rpx 28rpx;
 	}
+}
 
-	.total {
-		left: 0;
-		right: 0;
-		top: 0;
-		z-index: 1;
-	}
+.border-bottom {
+	border-bottom: 1px solid #e5e5e5;
+}
 
-	.icon {
-		width: 40rpx;
-		height: 40rpx
-	}
-	.grayscale{
-		filter: opacity(60%)
-	}
-	.mask {
-		@include fixedAll;
-		background: rgba(51, 51, 51, 0.5);
-	}
+.border-top {
+	border-top: 1px solid #e5e5e5;
+}
 
+.red {
+	color: #eb4f4f;
+}
 
+.car {
+	padding: 0 28rpx;
+	position: relative;
+	background-color: #fff;
+	padding-top: 10rpx;
+	padding-bottom: calc(40rpx + env(safe-area-inset-bottom));
+	/* #ifdef H5 */
+	padding-bottom: 68rpx;
 
-	.goods {
+	/* #endif */
+	.icon-car-box {
 		position: absolute;
-		bottom: 100%;
-		left: 0;
-		right: 0;
-		transition: all .2s ease-in-out;
-		overflow: hidden;
+		left: 28rpx;
+		top: $car-top;
+		display: flex;
+		width: $car-size;
+		height: $car-size;
+		justify-content: center;
+		align-items: center;
+		z-index: 2;
 
-		.item {
-			padding: 32rpx 28rpx;
-		}
-	}
-
-	.border-bottom {
-		border-bottom: 1px solid #E5E5E5;
-	}
-
-	.border-top {
-		border-top: 1px solid #E5E5E5;
-	}
-
-	.red {
-		color: #EB4F4F;
-	}
-
-	.car {
-		padding: 0 28rpx;
-		position: relative;
-		background-color: #fff;
-		padding-top: 10rpx;
-		padding-bottom: calc(40rpx + env(safe-area-inset-bottom));
-		/* #ifdef H5 */
-		padding-bottom: 68rpx;
-
-		/* #endif */
-		.icon-car-box {
+		.dot {
 			position: absolute;
-			left: 28rpx;
-			top: $car-top;
+			right: 0;
+			top: 0;
+			width: 28rpx;
+			height: 28rpx;
+			background: #eb4f4f;
+			border-radius: 50%;
 			display: flex;
-			width: $car-size;
-			height: $car-size;
 			justify-content: center;
 			align-items: center;
-			z-index: 2;
-
-			.dot {
-				position: absolute;
-				right: 0;
-				top: 0;
-				width: 28rpx;
-				height: 28rpx;
-				background: #EB4F4F;
-				border-radius: 50%;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				font-size: 20rpx;
-				font-weight: bold;
-				color: #FFFFFF;
-			}
-		}
-
-		.price {
-			color: #EB4F4F;
-			margin-left: calc(38rpx + $car-size);
-			transform: translateY(calc($car-top / 2));
-		}
-
-		.icon-car {
-			width: $car-size;
-			height: $car-size;
+			font-size: 20rpx;
+			font-weight: bold;
+			color: #ffffff;
 		}
 	}
-</style>
\ No newline at end of file
+
+	.price {
+		color: #eb4f4f;
+		margin-left: calc(38rpx + $car-size);
+		transform: translateY(calc($car-top / 2));
+	}
+
+	.icon-car {
+		width: $car-size;
+		height: $car-size;
+	}
+}
+</style>
diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index 81c6778..a39f82e 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="u-wrap">
-		<view class="u-fixed position-all" style="z-index: 999;" v-if="!canXiadan" @click="xiadanClick"></view>
+		<view class="u-fixed position-all" style="z-index: 999" v-if="!canXiadan" @click="xiadanClick"></view>
 		<view class="top bg-fff w-full">
-			<template v-if="option.type!='add'">
-				<view class="u-flex  u-row-between choose-user" @tap="chooseTable">
+			<template v-if="option.type != 'add'">
+				<view class="u-flex u-row-between choose-user" @tap="chooseTable">
 					<view>
 						<view v-if="!data.table.id">选择桌台</view>
 						<view class="u-flex" v-else>
-							<view class="u-m-l-20">{{data.table.name}}</view>
+							<view class="u-m-l-20">{{ data.table.name }}</view>
 						</view>
 					</view>
 					<view class="u-flex">
@@ -16,11 +16,9 @@
 				</view>
 			</template>
 
-			<view class="search u-flex u-col-center ">
+			<view class="search u-flex u-col-center">
 				<view class="u-flex-1">
-					<uni-search-bar bgColor="#F9F9F9" cancelButton="none" placeholder="搜索店内商品" @confirm="search"
-						@clear="clearSearch" v-model="searchValue">
-					</uni-search-bar>
+					<uni-search-bar bgColor="#F9F9F9" cancelButton="none" placeholder="搜索店内商品" @confirm="search" @clear="clearSearch" v-model="searchValue"></uni-search-bar>
 				</view>
 				<view class="u-flex" @click="scanCode">
 					<image src="/pagesCreateOrder/static/images/icon-saoma.svg" class="icon-saoma" mode=""></image>
@@ -29,15 +27,18 @@
 		</view>
 		<template v-if="!isSearch">
 			<view class="u-menu-wrap">
-				<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view"
-					:scroll-top="data.scrollTop" :scroll-into-view="data.itemId">
-					<view v-for="(item,index) in data.tabbar" :key="index" class="u-tab-item"
-						:class="[data.current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)">
-						<text class="u-line-3">{{item.name}}</text>
+				<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="data.scrollTop" :scroll-into-view="data.itemId">
+					<view
+						v-for="(item, index) in data.tabbar"
+						:key="index"
+						class="u-tab-item"
+						:class="[data.current == index ? 'u-tab-item-active' : '']"
+						@tap.stop="swichMenu(index)"
+					>
+						<text class="u-line-3">{{ item.name }}</text>
 					</view>
 				</scroll-view>
-				<scroll-view :scroll-top="data.scrollRightTop" scroll-y scroll-with-animation class="right-box"
-					@scroll="rightScroll">
+				<scroll-view :scroll-top="data.scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll">
 					<view class="page-view u-p-l-24">
 						<view class="list-tight-top">
 							<template v-if="lingshi.show">
@@ -47,23 +48,23 @@
 								</view>
 							</template>
 							<template v-else>
-								<view style="height: 24px;"></view>
+								<view style="height: 24px"></view>
 							</template>
 						</view>
-						<view class="class-item" :id="'item' + index" v-for="(item , index) in data.tabbar"
-							:key="index">
-							<view class="item-title" :class="{active:data.current == index}">
-								<text>{{item.name}}</text>
+						<view class="class-item" :id="'item' + index" v-for="(item, index) in data.tabbar" :key="index">
+							<view class="item-title" :class="{ active: data.current == index }">
+								<text>{{ item.name }}</text>
 							</view>
 							<view class="item-container">
 								<view class="thumb-box" v-for="(goodsItem, goodsIndex) in item.foods" :key="goodsIndex">
-									<list-goods-item 
-										@chooseGuige="chooseGuige($event,index)"
-										@add="goodsUpdate($event,index,true)" 
-										@reduce="goodsUpdate($event,index,false)"
-										@tapweigh="tapweigh($event,index)" 
+									<list-goods-item
+										@chooseGuige="chooseGuige($event, index)"
+										@add="goodsUpdate($event, index, true)"
+										@reduce="goodsUpdate($event, index, false)"
+										@tapweigh="tapweigh($event, index)"
 										:index="goodsIndex"
-										:data="goodsItem"></list-goods-item>
+										:data="goodsItem"
+									></list-goods-item>
 								</view>
 							</view>
 						</view>
@@ -73,602 +74,633 @@
 		</template>
 		<template v-else>
 			<view class="u-menu-wrap">
-				<scroll-view class=" u-flex-1" scroll-y scroll-with-animation>
+				<scroll-view class="u-flex-1" scroll-y scroll-with-animation>
 					<view class="u-p-l-30 u-p-r-30">
-						<view class="u-font-28 color-666 ">搜索</view>
-						<view class="u-flex u-m-t-20  u-flex-wrap u-row-between">
+						<view class="u-font-28 color-666">搜索</view>
+						<view class="u-flex u-m-t-20 u-flex-wrap u-row-between">
 							<view class="u-m-b-30" v-for="(goodsItem, goodsIndex) in searchResult" :key="goodsIndex">
-								<list-goods-item 
-									:img="{width:'330rpx',height:'330rpx'}"
-									@chooseGuige="chooseGuige(goodsItem.goodsIndex,goodsItem.index)"
-									@add="searchGoodsUpdate(goodsItem,goodsIndex,true)"
-									@reduce="searchGoodsUpdate(goodsItem,goodsIndex,false)"
-									@tapweigh="tapweigh(goodsItem.goodsIndex,goodsItem.index)"
-									:index="goodsItem.goodsIndex" :data="goodsItem"></list-goods-item>
+								<list-goods-item
+									:img="{ width: '330rpx', height: '330rpx' }"
+									@chooseGuige="chooseGuige(goodsItem.goodsIndex, goodsItem.index)"
+									@add="searchGoodsUpdate(goodsItem, goodsIndex, true)"
+									@reduce="searchGoodsUpdate(goodsItem, goodsIndex, false)"
+									@tapweigh="tapweigh(goodsItem.goodsIndex, goodsItem.index)"
+									:index="goodsItem.goodsIndex"
+									:data="goodsItem"
+								></list-goods-item>
 							</view>
 						</view>
 						<my-img-empty v-if="!searchResult.length" tips="未搜索到相关商品"></my-img-empty>
 					</view>
-
 				</scroll-view>
-
 			</view>
 		</template>
 
 		<view class="bottom w-full">
-			<my-car :isCreateOrderToDetail="isCreateOrderToDetail" @updateNumber="carsNumberChange"
-				 :table="data.table" :data="cars" :orderInfo="data.orderInfo" :historyOrder="data.historyOrder" @clear="cleaCart"></my-car>
+			<my-car
+				:isCreateOrderToDetail="isCreateOrderToDetail"
+				@updateNumber="carsNumberChange"
+				:table="data.table"
+				:data="cars"
+				:orderInfo="data.orderInfo"
+				@clear="cleaCart"
+			></my-car>
 		</view>
 		<!-- 套餐选择规格 -->
 		<taocanModel ref="taocanModelRef" @confirm="taocanConfirm" :goodsData="selGoods"></taocanModel>
 		<!-- 选择规格 -->
-		<guige-model @update-sku="updateSkuSel" @confirm="guigeConfirm" ref="chooseGuigeModel" :goodsData="selGoods"
-			:title="guigeModelData.title" :sku-map="guigeModelData.chooseGoods.skuMap"
-			:skus="guigeModelData.chooseGoods.skus"></guige-model>
-		
+		<guige-model
+			@update-sku="updateSkuSel"
+			@confirm="guigeConfirm"
+			ref="chooseGuigeModel"
+			:goodsData="selGoods"
+			:title="guigeModelData.title"
+			:sku-map="guigeModelData.chooseGoods.skuMap"
+			:skus="guigeModelData.chooseGoods.skus"
+		></guige-model>
 		<!-- 称重 -->
-		<weigh-item ref="refweighitem" @weighgoodsUpdate='goodsUpdate'></weigh-item>
+		<weigh-item ref="refweighitem" @weighgoodsUpdate="goodsUpdate"></weigh-item>
+		<!-- 历史订单按钮 -->
+		<view class="history-button" v-if="data.historyOrderNum > 0 && data.table.id" @click="go.to('PAGES_ORDER_DETAIL', { id: data.orderInfo.id })">
+			<text>历史订单</text>
+			<text class="num">{{ data.historyOrderNum }}</text>
+		</view>
 	</view>
-
 </template>
 <script setup>
-	import { onLoad, onReady, onShow, onUnload, onHide } from '@dcloudio/uni-app';
-	import { inject, computed, reactive, ref, nextTick, watch, getCurrentInstance, onUnmounted, onBeforeUnmount } from 'vue';
-	
-	import guigeModel from './components/guige'
-	import taocanModel from './components/taocanModel.vue'
-	import weighItem from './components/weigh.vue'
-	import listGoodsItem from './components/list-goods-item.vue'
-	import myCar from './components/car'
-	
-	import util from './util.js';
-	import go from '@/commons/utils/go.js';
-	import { getNowCart } from '@/pagesCreateOrder/util.js'
-	import storageManage from '@/commons/utils/storageManage.js'
-	import { hasPermission } from '@/commons/utils/hasPermission.js'
-	import WebsocketUtil  from '@/commons/utils/websocket.js'
-	
-	import { getShopTable,getShopTableDetail } from '@/http/api/table.js'
-	import { getProductList } from '@/http/api/product.js'
-	import { categoryPage } from '@/http/api/cateGory.js'
-	import { getShopInfo } from '@/http/api/shop.js'
-	import { getHistoryOrder, cancelOrder, rmPlaceOrder } from '@/http/api/order.js'
+import { onLoad, onReady, onShow, onUnload, onHide } from '@dcloudio/uni-app';
+import { inject, computed, reactive, ref, nextTick, watch, getCurrentInstance, onUnmounted, onBeforeUnmount } from 'vue';
 
-	const modal = reactive({
-		key: '',
-		clear: false,
-		data: ''
-	})
-	//临时菜
-	const lingshi = reactive({
-		show: true
-	})
-	//附加费
-	const extraFee = reactive({
-		show: false
-	})
-	const cars = reactive([])
-	const data = reactive({
-		scrollTop: 0, //tab标题的滚动条位置
-		oldScrollTop: 0,
-		current: 0, // 预设当前项的值
-		menuHeight: 0, // 左边菜单的高度
-		menuItemHeight: 0, // 左边菜单item的高度
-		itemId: '', // 栏目右边scroll-view用于滚动的id
-		tabbar: storageManage.cacheGoods() || [],
-		menuItemPos: [],
-		arr: [], //左右联动布局节点信息
-		scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
-		timer: null, // 定时器
-		topZhanwei: 136 + 24,
-		// 选择用户
-		vipUser: {
-			id: "",
-		},
-	
-		table: {
-			id: "",
-		},
-		socketData: {
-			type:'onboc',
-			account: uni.getStorageSync("iToken").loginId,
-			shop_id: uni.getStorageSync("shopInfo").id,
-			is_gift: 0
-		},
-		orderId: null,
-		isGoodsAdd: true,
-		goodsData: null,
-		orderInfo: null,
-		historyOrder: [],
-	})
-	const guigeModelData = reactive({
-		title: '',
-		chooseGoods: {
-			skuMap: {},
-			item: '',
-			skus: []
-		}
-	})
-	const chooseGuigeModel = ref(null)
-	const cartItemId = ref(null)
-	let isCreateOrderToDetail = ref(false)
-	let option = {
-		type: ''
+import guigeModel from './components/guige';
+import taocanModel from './components/taocanModel.vue';
+import weighItem from './components/weigh.vue';
+import listGoodsItem from './components/list-goods-item.vue';
+import myCar from './components/car';
+
+import util from './util.js';
+import go from '@/commons/utils/go.js';
+import { getNowCart } from '@/pagesCreateOrder/util.js';
+import storageManage from '@/commons/utils/storageManage.js';
+import { hasPermission } from '@/commons/utils/hasPermission.js';
+import WebsocketUtil from '@/commons/utils/websocket.js';
+
+import { getShopTable, getShopTableDetail } from '@/http/api/table.js';
+import { getProductList } from '@/http/api/product.js';
+import { categoryPage } from '@/http/api/cateGory.js';
+import { getShopInfo } from '@/http/api/shop.js';
+import { getHistoryOrder, cancelOrder, rmPlaceOrder } from '@/http/api/order.js';
+
+const modal = reactive({
+	key: '',
+	clear: false,
+	data: ''
+});
+//临时菜
+const lingshi = reactive({
+	show: true
+});
+//附加费
+const extraFee = reactive({
+	show: false
+});
+const cars = reactive([]);
+const data = reactive({
+	scrollTop: 0, //tab标题的滚动条位置
+	oldScrollTop: 0,
+	current: 0, // 预设当前项的值
+	menuHeight: 0, // 左边菜单的高度
+	menuItemHeight: 0, // 左边菜单item的高度
+	itemId: '', // 栏目右边scroll-view用于滚动的id
+	tabbar: storageManage.cacheGoods() || [],
+	menuItemPos: [],
+	arr: [], //左右联动布局节点信息
+	scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
+	timer: null, // 定时器
+	topZhanwei: 136 + 24,
+	// 选择用户
+	vipUser: {
+		id: ''
+	},
+
+	table: {
+		id: ''
+	},
+	socketData: {
+		type: 'onboc',
+		account: uni.getStorageSync('iToken').loginId,
+		shop_id: uni.getStorageSync('shopInfo').id,
+		is_gift: 0
+	},
+	orderId: null,
+	isGoodsAdd: true,
+	goodsData: null,
+	orderInfo: null,
+	historyOrder: [],
+	historyOrderNum: 0
+});
+const guigeModelData = reactive({
+	title: '',
+	chooseGoods: {
+		skuMap: {},
+		item: '',
+		skus: []
 	}
-	const taocanModelRef = ref()
-	const websocketUtil = inject('websocketUtil'); // 注入 WebSocket 工具类实例
-	onLoad((opt) => {
-		option = opt
-		Object.assign(data.table, opt)
-		console.log(opt)
-		uni.setNavigationBarTitle({
-			title: (opt && opt.type == 'add') ? '顾客加菜' : '代客下单'
-		})
-		if (JSON.stringify(opt) == '{}') {
-			isCreateOrderToDetail.value = true
-		}
-		if(uni.getStorageSync("table_code")&&!opt.tableCode){
-			data.table.tableCode = uni.getStorageSync("table_code")
-		}
-		
-		// init()
-		xiadanClick()
-	})
-	watch(() => data.table.id, (newval, oldval) => {
+});
+const chooseGuigeModel = ref(null);
+const cartItemId = ref(null);
+let isCreateOrderToDetail = ref(false);
+let option = {
+	type: ''
+};
+const taocanModelRef = ref();
+const websocketUtil = inject('websocketUtil'); // 注入 WebSocket 工具类实例
+onLoad((opt) => {
+	option = opt;
+	Object.assign(data.table, opt);
+	console.log(opt);
+	uni.setNavigationBarTitle({
+		title: opt && opt.type == 'add' ? '顾客加菜' : '代客下单'
+	});
+	if (JSON.stringify(opt) == '{}') {
+		isCreateOrderToDetail.value = true;
+	}
+	if (uni.getStorageSync('table_code') && !opt.tableCode) {
+		data.table.tableCode = uni.getStorageSync('table_code');
+	}
+
+	// init()
+	xiadanClick();
+});
+watch(
+	() => data.table.id,
+	(newval, oldval) => {
 		if (option.type != 'add') {
-			onSelTable()
+			onSelTable();
 		}
-	})
-	onShow(() => {
-		
-		nextTick(()=>{
+	}
+);
+onShow(() => {
+	nextTick(() => {
+		uni.showLoading({
+			title: '购物车加载中',
+			mask: true
+		});
+		watchChooseTable();
+		watchUpdate();
+		watchSocketOpen();
+		data.isGoodsAdd = true;
+
+		init();
+		onMessage();
+	});
+});
+onReady(() => {
+	getElRect('list-tight-top').then((res) => {
+		data.topZhanwei = res.height;
+	});
+	getMenuItemTop();
+});
+
+onHide(() => {
+	console.log('onHide');
+	uni.$off('is-socket-open');
+	websocketUtil.offMessage();
+});
+onUnmounted(() => {
+	uni.$off('is-socket-open');
+	websocketUtil.offMessage();
+});
+
+/**
+ * 判断是否允许下单
+ */
+let canXiadan = ref(false);
+async function xiadanClick() {
+	canXiadan.value = await hasPermission('允许下单');
+}
+
+let $originGoods = [];
+let $category = [];
+
+async function init() {
+	if (option.type == 'add') {
+		setTabBar($category, $originGoods, []);
+	}
+	let shopInfo = await getShopInfo({ id: uni.getStorageSync('shopInfo').id });
+	uni.setStorageSync('shopInfo', shopInfo);
+	// 获取分类数据
+	let categoryRes = await categoryPage({ page: 1, size: 300 });
+	$category = categoryRes.records;
+	// 获取商品数据
+	const goodsRes = await getGoods();
+	const goods = goodsRes.filter((v) => {
+		let isShow = true;
+		if (v.type != 'sku') {
+			isShow = v.skuList.length >= 1;
+		}
+		return isShow;
+	});
+	$originGoods = goods;
+
+	if (option.type == 'add') {
+		cars.length = 0;
+		initCart();
+		setTabBar($category, goods, []);
+		return;
+	}
+
+	setTabBar($category, goods, cars);
+
+	initCart();
+}
+
+/**
+ * 获取订单详情
+ */
+async function getHistoryOrderDetail() {
+	data.historyOrder = [];
+	let res = await getHistoryOrder({ tableCode: data.table.tableCode });
+	data.orderInfo = res;
+	if (res) {
+		data.historyOrder = Object.entries(data.orderInfo.detailMap).map(([key, value]) => ({
+			info: value,
+			placeNum: key
+		}));
+
+		console.log('data.historyOrder===', data.historyOrder);
+
+		let allHistoryOrder = data.historyOrder.map((item) => {
+			return [...item.info];
+		});
+
+		// console.log('allHistoryOrder===', allHistoryOrder.flat());
+		data.historyOrderNum = 0;
+		allHistoryOrder.flat().map((item) => {
+			data.historyOrderNum += item.num;
+		});
+		// console.log('data.historyOrderNum===', data.historyOrderNum);
+	}
+}
+
+/**
+ * 监听socket是否连接正常
+ */
+function watchSocketOpen() {
+	uni.$off('is-socket-open');
+	uni.$on('is-socket-open', (res) => {
+		console.log('is-socket-open===', res);
+		if (res) {
+			data.isGoodsAdd = true;
+			initCart();
+		} else {
 			uni.showLoading({
 				title: '购物车加载中',
 				mask: true
 			});
-			watchChooseTable()
-			watchUpdate()
-			watchSocketOpen()
-			data.isGoodsAdd = true;
-			
-			init()
-			onMessage()
-		})
-	
-	
-	})
-	onReady(() => {
-		getElRect('list-tight-top').then(res => {
-			data.topZhanwei = res.height
-		})
-		getMenuItemTop()
-		
-	})
+			data.isGoodsAdd = false;
+		}
+	});
+}
 
-	onHide(() => {
-		console.log("onHide")
-		uni.$off('is-socket-open')
-		websocketUtil.offMessage()
-	})
-	onUnmounted(() => {  
-		uni.$off('is-socket-open')
-		websocketUtil.offMessage()
-	}); 
-	
-	
-	/**
-	 * 判断是否允许下单
-	 */
-	let canXiadan = ref(false)
-	async function xiadanClick() {
-		canXiadan.value = await hasPermission('允许下单')
-	}
-	
-	let $originGoods = []
-	let $category = []
-	
-	async function init() {
-		if (option.type == 'add') {
-			setTabBar($category, $originGoods, [])
-		}
-		let shopInfo = await getShopInfo({id:uni.getStorageSync('shopInfo').id})
-		uni.setStorageSync("shopInfo",shopInfo)
-		// 获取分类数据
-		let categoryRes = await categoryPage({ page: 1, size: 300 })
-		$category = categoryRes.records
-		// 获取商品数据
-		const goodsRes = await getGoods()
-		const goods = goodsRes.filter((v) => {
-			let isShow = true;
-			if (v.type != "sku") {
-				isShow = v.skuList.length >= 1;
-			}
-			return isShow;
-		});
-		$originGoods = goods;
-	
-		if (option.type == 'add') {
-			cars.length = 0
-			initCart()
-			setTabBar($category, goods, [])
-			return
-		}
-	
-		setTabBar($category, goods, cars)
-		
-		initCart()
-	}
-	
-	/**
-	 * 获取订单详情
-	 */
-	async function getHistoryOrderDetail(){
-		data.historyOrder = [];
-		let res = await getHistoryOrder({tableCode:data.table.tableCode});
-		data.orderInfo = res;
-		if( res ){
-			data.historyOrder = Object.entries(data.orderInfo.detailMap).map(([key, value]) => ({
-				info: value,
-				placeNum: key
-			}))
-		}
-	}
-	
-	/**
-	 * 监听socket是否连接正常
-	 */
-	function watchSocketOpen (){
-		uni.$off('is-socket-open')
-		uni.$on('is-socket-open', (res) => {
-			console.log("is-socket-open===",res)
-			if( res){
-				data.isGoodsAdd = true;
-				initCart()
-			} else {
-				uni.showLoading({
-					title: '购物车加载中',
-					mask: true
-				});
-				data.isGoodsAdd = false;
-			}
-		})
-	}
-	
-	/**
-	 * socket消息监听
-	 */
-	function onMessage (){
-		websocketUtil.offMessage()
-		websocketUtil.onMessage(async res => {  
-			let msg = JSON.parse(res);
-			let cartItem;
-			let cartArr = [];
-			// console.log("onMessage===",msg)
-			if( msg.msg_id ){
-				websocketUtil.send(JSON.stringify({
+/**
+ * socket消息监听
+ */
+function onMessage() {
+	websocketUtil.offMessage();
+	websocketUtil.onMessage(async (res) => {
+		let msg = JSON.parse(res);
+		let cartItem;
+		let cartArr = [];
+		// console.log("onMessage===",msg)
+		if (msg.msg_id) {
+			websocketUtil.send(
+				JSON.stringify({
 					type: 'receipt',
-					msg_id: msg.msg_id,
-				}))
-			}
-			if( msg.status == 0 ){
-				if ( msg.type == "no_suit_num") {
-					uni.showModal({
-						title: '提示',
-						showCancel: false,
-						content: msg.msg,
-						success: function (res) {
-							if (res.confirm) {
-								console.log(cartItemId.value)
-								delCart(cartItemId.value)
-								initCart()
-								console.log('用户点击确定');
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
+					msg_id: msg.msg_id
+				})
+			);
+		}
+		if (msg.status == 0) {
+			if (msg.type == 'no_suit_num') {
+				uni.showModal({
+					title: '提示',
+					showCancel: false,
+					content: msg.msg,
+					success: function (res) {
+						if (res.confirm) {
+							console.log(cartItemId.value);
+							delCart(cartItemId.value);
+							initCart();
+							console.log('用户点击确定');
+						} else if (res.cancel) {
+							console.log('用户点击取消');
 						}
-					});
-					data.isGoodsAdd = true;
-					return;
-				}
-				uni.$utils.showToast(msg.msg||'操作失败')
+					}
+				});
 				data.isGoodsAdd = true;
 				return;
 			}
-			if ( msg.data ) {
-				cartArr = data.tabbar.reduce((prve,cur)=>{
-					prve = [...prve,...cur.foods]
-					return prve
-				},[])
-			}
-			
-			switch (msg.operate_type) {
-				case 'onboc_init':
-					cars.length = 0
-					// console.log("购物车信息onboc_init===",msg)
-					if( !data.table.tableCode ){
-						data.table.tableCode = msg.table_code
-						uni.setStorageSync("table_code",msg.table_code)
-					}
-					// console.log("商品信息===",cartArr)
-					msg.data.map(item=>{
-						cartItem = getNowCart(item,cartArr)
-						if( cartItem.isGrounding||cartItem.is_temporary == 1 ){
-							cartControls(cartItem,'add')
-						} else {
-							delCart(cartItem.id)
-						}
-					})
-					getHistoryOrderDetail()
-					uni.hideLoading()
-					break;
-				case 'onboc_add':
-				case 'add':
-					cartItem = getNowCart(msg.data,cartArr)
-					cartControls(cartItem,'add')
-					uni.$utils.showToast('操作成功')
-					break;
-				case 'onboc_edit':
-				case 'edit':
-					cartItem = getNowCart(msg.data,cartArr)
-					cartControls(cartItem,'edit')
-					uni.$utils.showToast('操作成功')
-					break;
-				case 'onboc_del':
-				case 'del':
-					cartItem = getNowCart(msg.data,cartArr)
-					cartControls(cartItem,'del')
-					break;
-				case 'onboc_cleanup':
-				case 'cleanup':
-					cars.length = 0
-					for (let i in data.tabbar) {
-						for (let k in data.tabbar[i].foods) {
-							data.tabbar[i].foods[k].chooseNumber = 0
-						}
-					}
-					getHistoryOrderDetail()
-					break;
-				case 'init':
-				case 'rottable':
-					if( data.table.tableCode == msg.data.new_table_code){
-						initCart()
-					} else {
-						data.table.tableCode = msg.data.new_table_code
-						let resData = await getShopTableDetail({tableCode:msg.data.new_table_code})
-						data.table = resData
-						initCart()
-					}
-					break;
-				case 'product_update':
-					init()
-					break;
-				case 'clearOrder':
-					getHistoryOrderDetail()
-					break;	
-			}
-			
-		}); 
-	}
-	
-	/**
-	 * 初始化购物车
-	 */
-	function initCart () {
-		let params = {
-			...data.socketData,
-			operate_type:'init',
-			table_code: data.table.tableCode,
-		}
-		console.log("购物车初始化参数===",params)
-		websocketUtil.send(JSON.stringify(params))
-	}
-	
-	/**
-	 * 购物车添加菜品
-	 */
-	function editCart (par,operate_type) {
-		cartItemId.value = par.id
-		if( !data.isGoodsAdd ){ return; }
-		let params = {
-			...data.socketData,
-			operate_type: operate_type,
-			table_code: data.table.tableCode,
-			product_id: '',
-			is_print: 1,
-			sku_id: '',			 //	
-			number: 1,			 //数量
-		}
-		Object.assign(params, par)
-		console.log('购物车添加菜品参数===',params)
-		websocketUtil.send(JSON.stringify(params))
-		data.isGoodsAdd = false;
-	}
-	
-	/**
-	 * 删除购物车菜品
-	 */
-	function delCart (id) {
-		let params = {
-			...data.socketData,
-			id: id,
-			operate_type:'del',
-			table_code: data.table.tableCode,
-		}
-		console.log('购物车删除菜品参数===',params)
-		websocketUtil.send(JSON.stringify(params))
-	}
-	
-	/**
-	 * 清除购物车
-	 */
-	async function cleaCart (e) {
-		if( e == 'cart' ){
-			let params = {
-				...data.socketData,
-				operate_type:'cleanup',
-				table_code: data.table.tableCode,
-			}
-			console.log('购物车清空菜品参数===',params)
-			websocketUtil.send(JSON.stringify(params))
-		} else if ( e == 'allHistoryOrder' ) {
-			await cancelOrder({orderId: data.orderInfo.id, shopId: uni.getStorageSync("shopInfo").id })
-			let params = {
-				...data.socketData,
-				operate_type:'clearOrder',
-				table_code: data.table.tableCode,
-			}
-			websocketUtil.send(JSON.stringify(params))
-			initCart()
-		} else {
-			await rmPlaceOrder({orderId: data.orderInfo.id, placeNum: e, shopId: uni.getStorageSync("shopInfo").id })
-			let params = {
-				...data.socketData,
-				operate_type:'clearOrder',
-				table_code: data.table.tableCode,
-			}
-			websocketUtil.send(JSON.stringify(params))
-			initCart()
-		}
-	
-	}
-	
-	
-		
-	/**
-	 * 获取商品列表
-	 */
-	function getGoods() {
-		const showLoading = data.tabbar.length <= 0 ? true : false
-		return getProductList({},'product', showLoading)
-	}
-	
-	/**
-	 * 获取桌台信息
-	 */
-	async function getTableInfo() {
-		const res = await getShopTable({
-			status: 'idle',
-		})
-		if (res && res.records[0]) {
-			data.table = {
-				...res.records[0],
-			}
-		}
-	}
-	
-	/**
-	 * 前往选择桌台
-	 */
-	function chooseTable() {
-		go.to('PAGES_CHOOSE_TABLE', {
-			...data.table
-		})
-	}
-	
-	/**
-	 * 选择桌台完成
-	 */
-	function watchChooseTable() {
-		uni.$off('choose-table')
-		uni.$on('choose-table', (item) => {
-			onChooseTable(item)
-		})
-	}
-	
-	/**
-	 * 选择桌台完成
-	 * @param {Object} item
-	 */
-	async function onChooseTable(item) {
-		if (!item) {
-			// #ifdef MP-WEIXIN
-			uni.showModal({
-				title: '提示',
-				content: '桌台不存在或不是该店铺的桌台'
-			})
-			// #endif
-			// #ifndef MP-WEIXIN
-			uni.$utils.showToast('桌台不存在或不是该店铺的桌台')
-			// #endif
-			return
-		}
-		console.log('---table:detail-----',item);
-		console.log('---table_code-----',data.table.tableCode);
-		console.log('---new_table_code-----',item.tableCode);
-		let params = {
-			...data.socketData,
-			operate_type: 'rottable',
-			table_code: data.table.tableCode,
-			new_table_code: item.tableCode,
-		}
-		if (data.table.id || cars.length <= 0) {
-			data.table = {
-				...item
-			}
-			if( cars.length > 0){
-				websocketUtil.send(JSON.stringify(params))
-			} else{
-				initCart()
-			}
+			uni.$utils.showToast(msg.msg || '操作失败');
+			data.isGoodsAdd = true;
 			return;
 		}
-		if (item.status == "unbind") {
-			return uni.$utils.showToast('该台桌未绑定，清先去桌台管理里绑定码牌')
+		if (msg.data) {
+			cartArr = data.tabbar.reduce((prve, cur) => {
+				prve = [...prve, ...cur.foods];
+				return prve;
+			}, []);
 		}
-		if (item.status != "idle") {
-			return uni.$utils.showToast('该台桌已在使用中')
-		}
-		data.table = item
-		if( cars.length > 0){
-			websocketUtil.send(JSON.stringify(params))
-		}
-		// initCart()
-	}
-	
-	/**
-	 * 菜品操作
-	 * @param {Object} foodsindex
-	 * @param {Object} index
-	 * @param {Object} isAdd
-	 * @param {Object} searchGoodsIndex
-	 * @param {Object} showCurrentInput
-	 */
-	async function goodsUpdate(foodsindex, index, isAdd, searchGoodsIndex, showCurrentInput) { // showCurrentInput 称重才会传的参数
-		// if (!data.table.id) {
-		// 	return uni.$utils.showToast('请先选择桌台', 0.5).then(res => {
-		// 		chooseTable()
-		// 	})
-		// }
-		
-		if( !data.isGoodsAdd ){ return;}
-		let $goods = data.tabbar[index].foods[foodsindex]
-		if ($goods.type !== 'sku') {
-			//单规格
-			let goodsInCarIndex = cars.findIndex((carsGoods) => {
-				return carsGoods.sku_id == $goods.skuList[0].id && carsGoods.product_id == $goods.id;
-			});
-			let product_id = $goods.id
-			let product_type = $goods.type
-			let sku_id = $goods.skuList[0].id
-			let suitNum = $goods.skuList[0].suitNum || 1
-			if (goodsInCarIndex !== -1) {
-				//更新
-				let cartItem = cars[goodsInCarIndex]
-				let number = isAdd ? cartItem.number + 1 : + cartItem.number - 1
-				if( !isAdd ){
-					if (number === 0 || number < suitNum) {
-						//移除
-						setSearchGoods(searchGoodsIndex, 0)
-						delCart(cartItem.id)
+
+		switch (msg.operate_type) {
+			case 'onboc_init':
+				cars.length = 0;
+				// console.log("购物车信息onboc_init===",msg)
+				if (!data.table.tableCode) {
+					data.table.tableCode = msg.table_code;
+					uni.setStorageSync('table_code', msg.table_code);
+				}
+				// console.log("商品信息===",cartArr)
+				msg.data.map((item) => {
+					cartItem = getNowCart(item, cartArr);
+					if (cartItem.isGrounding || cartItem.is_temporary == 1) {
+						cartControls(cartItem, 'add');
+					} else {
+						delCart(cartItem.id);
+					}
+				});
+				getHistoryOrderDetail();
+				uni.hideLoading();
+				break;
+			case 'onboc_add':
+			case 'add':
+				cartItem = getNowCart(msg.data, cartArr);
+				cartControls(cartItem, 'add');
+				uni.$utils.showToast('操作成功');
+				break;
+			case 'onboc_edit':
+			case 'edit':
+				cartItem = getNowCart(msg.data, cartArr);
+				cartControls(cartItem, 'edit');
+				uni.$utils.showToast('操作成功');
+				break;
+			case 'onboc_del':
+			case 'del':
+				cartItem = getNowCart(msg.data, cartArr);
+				cartControls(cartItem, 'del');
+				break;
+			case 'onboc_cleanup':
+			case 'cleanup':
+				cars.length = 0;
+				for (let i in data.tabbar) {
+					for (let k in data.tabbar[i].foods) {
+						data.tabbar[i].foods[k].chooseNumber = 0;
 					}
 				}
-				
-				// 不影响之前的代码  称重number单独处理 
-				if ($goods.type == 'weight' && showCurrentInput) {
-					number = Number(showCurrentInput)
+				getHistoryOrderDetail();
+				break;
+			case 'init':
+			case 'rottable':
+				if (data.table.tableCode == msg.data.new_table_code) {
+					initCart();
+				} else {
+					data.table.tableCode = msg.data.new_table_code;
+					let resData = await getShopTableDetail({ tableCode: msg.data.new_table_code });
+					data.table = resData;
+					initCart();
 				}
-				
-				editCart({
+				break;
+			case 'product_update':
+				init();
+				break;
+			case 'clearOrder':
+				getHistoryOrderDetail();
+				break;
+		}
+	});
+}
+
+/**
+ * 初始化购物车
+ */
+function initCart() {
+	let params = {
+		...data.socketData,
+		operate_type: 'init',
+		table_code: data.table.tableCode
+	};
+	console.log('购物车初始化参数===', params);
+	websocketUtil.send(JSON.stringify(params));
+}
+
+/**
+ * 购物车添加菜品
+ */
+function editCart(par, operate_type) {
+	cartItemId.value = par.id;
+	if (!data.isGoodsAdd) {
+		return;
+	}
+	let params = {
+		...data.socketData,
+		operate_type: operate_type,
+		table_code: data.table.tableCode,
+		product_id: '',
+		is_print: 1,
+		sku_id: '', //
+		number: 1 //数量
+	};
+	Object.assign(params, par);
+	console.log('购物车添加菜品参数===', params);
+	websocketUtil.send(JSON.stringify(params));
+	data.isGoodsAdd = false;
+}
+
+/**
+ * 删除购物车菜品
+ */
+function delCart(id) {
+	let params = {
+		...data.socketData,
+		id: id,
+		operate_type: 'del',
+		table_code: data.table.tableCode
+	};
+	console.log('购物车删除菜品参数===', params);
+	websocketUtil.send(JSON.stringify(params));
+}
+
+/**
+ * 清除购物车
+ */
+async function cleaCart(e) {
+	if (e == 'cart') {
+		let params = {
+			...data.socketData,
+			operate_type: 'cleanup',
+			table_code: data.table.tableCode
+		};
+		console.log('购物车清空菜品参数===', params);
+		websocketUtil.send(JSON.stringify(params));
+	} else if (e == 'allHistoryOrder') {
+		await cancelOrder({ orderId: data.orderInfo.id, shopId: uni.getStorageSync('shopInfo').id });
+		let params = {
+			...data.socketData,
+			operate_type: 'clearOrder',
+			table_code: data.table.tableCode
+		};
+		websocketUtil.send(JSON.stringify(params));
+		initCart();
+	} else {
+		await rmPlaceOrder({ orderId: data.orderInfo.id, placeNum: e, shopId: uni.getStorageSync('shopInfo').id });
+		let params = {
+			...data.socketData,
+			operate_type: 'clearOrder',
+			table_code: data.table.tableCode
+		};
+		websocketUtil.send(JSON.stringify(params));
+		initCart();
+	}
+}
+
+/**
+ * 获取商品列表
+ */
+function getGoods() {
+	const showLoading = data.tabbar.length <= 0 ? true : false;
+	return getProductList({}, 'product', showLoading);
+}
+
+/**
+ * 获取桌台信息
+ */
+async function getTableInfo() {
+	const res = await getShopTable({
+		status: 'idle'
+	});
+	if (res && res.records[0]) {
+		data.table = {
+			...res.records[0]
+		};
+	}
+}
+
+/**
+ * 前往选择桌台
+ */
+function chooseTable() {
+	go.to('PAGES_CHOOSE_TABLE', {
+		...data.table
+	});
+}
+
+/**
+ * 选择桌台完成
+ */
+function watchChooseTable() {
+	uni.$off('choose-table');
+	uni.$on('choose-table', (item) => {
+		onChooseTable(item);
+	});
+}
+
+/**
+ * 选择桌台完成
+ * @param {Object} item
+ */
+async function onChooseTable(item) {
+	if (!item) {
+		// #ifdef MP-WEIXIN
+		uni.showModal({
+			title: '提示',
+			content: '桌台不存在或不是该店铺的桌台'
+		});
+		// #endif
+		// #ifndef MP-WEIXIN
+		uni.$utils.showToast('桌台不存在或不是该店铺的桌台');
+		// #endif
+		return;
+	}
+	console.log('---table:detail-----', item);
+	console.log('---table_code-----', data.table.tableCode);
+	console.log('---new_table_code-----', item.tableCode);
+	let params = {
+		...data.socketData,
+		operate_type: 'rottable',
+		table_code: data.table.tableCode,
+		new_table_code: item.tableCode
+	};
+	if (data.table.id || cars.length <= 0) {
+		data.table = {
+			...item
+		};
+		if (cars.length > 0) {
+			websocketUtil.send(JSON.stringify(params));
+		} else {
+			initCart();
+		}
+		return;
+	}
+	if (item.status == 'unbind') {
+		return uni.$utils.showToast('该台桌未绑定，清先去桌台管理里绑定码牌');
+	}
+	if (item.status != 'idle') {
+		return uni.$utils.showToast('该台桌已在使用中');
+	}
+	data.table = item;
+	if (cars.length > 0) {
+		websocketUtil.send(JSON.stringify(params));
+	}
+	// initCart()
+}
+
+/**
+ * 菜品操作
+ * @param {Object} foodsindex
+ * @param {Object} index
+ * @param {Object} isAdd
+ * @param {Object} searchGoodsIndex
+ * @param {Object} showCurrentInput
+ */
+async function goodsUpdate(foodsindex, index, isAdd, searchGoodsIndex, showCurrentInput) {
+	// showCurrentInput 称重才会传的参数
+	// if (!data.table.id) {
+	// 	return uni.$utils.showToast('请先选择桌台', 0.5).then(res => {
+	// 		chooseTable()
+	// 	})
+	// }
+
+	if (!data.isGoodsAdd) {
+		return;
+	}
+	let $goods = data.tabbar[index].foods[foodsindex];
+	if ($goods.type !== 'sku') {
+		//单规格
+		let goodsInCarIndex = cars.findIndex((carsGoods) => {
+			return carsGoods.sku_id == $goods.skuList[0].id && carsGoods.product_id == $goods.id;
+		});
+		let product_id = $goods.id;
+		let product_type = $goods.type;
+		let sku_id = $goods.skuList[0].id;
+		let suitNum = $goods.skuList[0].suitNum || 1;
+		if (goodsInCarIndex !== -1) {
+			//更新
+			let cartItem = cars[goodsInCarIndex];
+			let number = isAdd ? cartItem.number + 1 : +cartItem.number - 1;
+			if (!isAdd) {
+				if (number === 0 || number < suitNum) {
+					//移除
+					setSearchGoods(searchGoodsIndex, 0);
+					delCart(cartItem.id);
+				}
+			}
+
+			// 不影响之前的代码  称重number单独处理
+			if ($goods.type == 'weight' && showCurrentInput) {
+				number = Number(showCurrentInput);
+			}
+
+			editCart(
+				{
 					id: cartItem.id,
 					suitNum: cartItem.suitNum || 1,
 					number: number,
@@ -676,595 +708,615 @@
 					product_type: product_type,
 					sku_id: sku_id,
 					is_temporary: cartItem.is_temporary
-				},'edit')
-				data.isGoodsAdd = false;
-				setSearchGoods(searchGoodsIndex, number)
-			} else {
-				// 不影响之前的代码  称重suit单独处理
-				if ($goods.type == 'weight' && showCurrentInput) {
-					suitNum = showCurrentInput
-					if( $goods.skuList[0].suitNum &&  showCurrentInput < $goods.skuList[0].suitNum){
-						uni.$utils.showToast(`最小起售数量为${$goods.skuList[0].suitNum}份`)
-						return;
-					}
+				},
+				'edit'
+			);
+			data.isGoodsAdd = false;
+			setSearchGoods(searchGoodsIndex, number);
+		} else {
+			// 不影响之前的代码  称重suit单独处理
+			if ($goods.type == 'weight' && showCurrentInput) {
+				suitNum = showCurrentInput;
+				if ($goods.skuList[0].suitNum && showCurrentInput < $goods.skuList[0].suitNum) {
+					uni.$utils.showToast(`最小起售数量为${$goods.skuList[0].suitNum}份`);
+					return;
 				}
-				// 套餐和单规格
-				if ($goods.groupType != 1) {
-					//增加
-					editCart({
+			}
+			// 套餐和单规格
+			if ($goods.groupType != 1) {
+				//增加
+				editCart(
+					{
 						number: suitNum,
 						product_id: product_id,
 						product_type: product_type,
 						sku_id: sku_id,
-						is_temporary: 0, 	 //是否是临时菜
-					},'add')
-					data.isGoodsAdd = false;
-				}
+						is_temporary: 0 //是否是临时菜
+					},
+					'add'
+				);
+				data.isGoodsAdd = false;
 			}
-			return
 		}
-	
+		return;
 	}
-	
-	/**
-	 * socket通知购物车商品数量修改处理
-	 */
-	function cartControls (cartItem,type) {
-		if( !data.table.tableCode ){
-			data.table.tableCode = cartItem.table_code
+}
+
+/**
+ * socket通知购物车商品数量修改处理
+ */
+function cartControls(cartItem, type) {
+	if (!data.table.tableCode) {
+		data.table.tableCode = cartItem.table_code;
+	}
+	data.isGoodsAdd = true;
+	let cartIndex = 0;
+	let product_id = cartItem.product_id;
+	let sku_id = cartItem.sku_id;
+	let $goods;
+	cars.map((item, index) => {
+		if (item.id == cartItem.id) {
+			cartIndex = index;
+			product_id = item.product_id;
+			sku_id = item.sku_id;
 		}
-		data.isGoodsAdd = true;
-		let cartIndex = 0;
-		let product_id = cartItem.product_id
-		let sku_id = cartItem.sku_id
-		let $goods;
-		cars.map((item,index)=>{
-			if(item.id == cartItem.id) {
-				cartIndex = index;
-				product_id = item.product_id
-				sku_id = item.sku_id
+	});
+	data.tabbar.map((tabbarItem) => {
+		if (tabbarItem.foods.find((v) => v.id == product_id)) {
+			$goods = product_id < 0 ? {} : tabbarItem.foods.find((v) => v.id == product_id);
+		}
+	});
+
+	if (type == 'del') {
+		cars.splice(cartIndex, 1);
+		if ($goods) $goods.chooseNumber = 0;
+		return;
+	}
+	if (type == 'add') {
+		cars.push(cartItem);
+		if ($goods) $goods.chooseNumber = cartItem.number;
+	}
+	if (type == 'edit') {
+		cars[cartIndex].number = cartItem.number;
+		if ($goods) {
+			$goods.chooseNumber = cartItem.number;
+		}
+	}
+}
+
+/**
+ * 购物车商品数量改变处理
+ * @param {Object} e
+ */
+async function carsNumberChange(e) {
+	if (!data.isGoodsAdd) {
+		return;
+	}
+	let $sku;
+	let $goods;
+	let params = {
+		number: e.num,
+		id: e.goods.id,
+		product_id: e.goods.product_id,
+		sku_id: e.goods.sku_id,
+		is_temporary: e.goods.is_temporary
+	};
+	if (e.goods.is_temporary != 1) {
+		data.tabbar.map((tabbarItem) => {
+			if (tabbarItem.foods.find((v) => v.id == e.goods.product_id)) {
+				$goods = !e.goods.product_id ? undefined : tabbarItem.foods.find((v) => v.id == e.goods.product_id);
 			}
-		})
-		data.tabbar.map(tabbarItem=>{
-			if(tabbarItem.foods.find(v => v.id == product_id)){
-				$goods = product_id < 0 ? {} : tabbarItem.foods.find(v => v.id == product_id)
-			}
-		})
-		
-		if( type == 'del' ) {
-			cars.splice(cartIndex, 1)
-			if($goods)$goods.chooseNumber = 0;
+		});
+		$sku = !e.goods.product_id ? { suitNum: 1 } : $goods.skuList.find((v) => v.id == e.goods.sku_id);
+		params.suitNum = $sku.suitNum || 1;
+		if (e.num === 0 || e.num < $sku.suitNum) {
+			//移除
+			delCart(e.goods.id);
 			return;
 		}
-		if( type == 'add' ){
-			cars.push(cartItem)
-			if($goods)$goods.chooseNumber = cartItem.number
-		}
-		if( type == 'edit' ){
-			cars[cartIndex].number = cartItem.number
-			if ($goods) {
-				$goods.chooseNumber = cartItem.number
-			}
+	} else {
+		if (e.num === 0) {
+			//移除
+			delCart(e.goods.id);
+			return;
 		}
+		params.product_name = e.goods.name;
+		params.sku_name = e.goods.sku_name;
 	}
-	
-	/**
-	 * 购物车商品数量改变处理
-	 * @param {Object} e
-	 */
-	async function carsNumberChange(e) {
-		if( !data.isGoodsAdd ){ return; }
-		let $sku;
-		let $goods;
-		let params = {
-			number: e.num,
-			id: e.goods.id,
-			product_id: e.goods.product_id,
-			sku_id: e.goods.sku_id,
-			is_temporary: e.goods.is_temporary
-		}
-		if( e.goods.is_temporary != 1){
-			data.tabbar.map(tabbarItem=>{
-				if(tabbarItem.foods.find(v => v.id == e.goods.product_id)){
-					$goods = !e.goods.product_id ? undefined : tabbarItem.foods.find(v => v.id == e.goods.product_id)
-				}
-			})
-			$sku = !e.goods.product_id ? { suitNum: 1 } : $goods.skuList.find(v => v.id == e.goods.sku_id)
-			params.suitNum = $sku.suitNum || 1
-			if (e.num === 0 || e.num < $sku.suitNum) {
-				//移除
-				delCart(e.goods.id)
-				return
-			}
-		} else {
-			if (e.num === 0) {
-				//移除
-				delCart(e.goods.id)
-				return
-			}
-			params.product_name = e.goods.name
-			params.sku_name = e.goods.sku_name
-		}
-		
-		editCart(params,'edit')
-		data.isGoodsAdd = false;
-	}
-	
-	/**
-	 * 添加套餐
-	 * @param {Object} d
-	 * @param {Object} item
-	 */
-	async function taocanConfirm(d, item) {
-		editCart({
+
+	editCart(params, 'edit');
+	data.isGoodsAdd = false;
+}
+
+/**
+ * 添加套餐
+ * @param {Object} d
+ * @param {Object} item
+ */
+async function taocanConfirm(d, item) {
+	editCart(
+		{
 			number: item.skuList[0].suitNum,
 			product_id: item.id,
 			product_type: item.type,
 			sku_id: item.skuList[0].id,
 			pro_group_info: JSON.stringify(d),
-			is_temporary: 0, 	 //是否是临时菜
-		},'add')
-		data.isGoodsAdd = false;
+			is_temporary: 0 //是否是临时菜
+		},
+		'add'
+	);
+	data.isGoodsAdd = false;
+}
+
+const instance = getCurrentInstance();
+let selGoods = ref({});
+
+/**
+ * 打开规格弹窗
+ * @param {Object} foodsindex
+ * @param {Object} index
+ */
+function chooseGuige(foodsindex, index) {
+	const $goods = data.tabbar[index].foods[foodsindex];
+	selGoods.value = $goods;
+	if ($goods.groupType == 1) {
+		data.goodsData = $goods;
+		taocanModelRef.value.open();
+	} else {
+		guigeModelData.title = $goods.name;
+		const skuMap = returnSelGoodsSkuMap($goods.skuList);
+		// 多规格,和套餐规格区分.groupType=1 套餐多规格
+		const selectSpecInfo = returnSelGoodsSkuList($goods.selectSpecInfo);
+		setSkugoodsDefaultInit($goods, selectSpecInfo, skuMap, $goods.skuList);
+		chooseGuigeModel.value.open();
 	}
-	
-	const instance = getCurrentInstance();
-	let selGoods = ref({});
-	
-	/**
-	 * 打开规格弹窗
-	 * @param {Object} foodsindex
-	 * @param {Object} index
-	 */
-	function chooseGuige(foodsindex, index) {
-		const $goods = data.tabbar[index].foods[foodsindex]
-		selGoods.value = $goods
-		if ($goods.groupType == 1) {
-			data.goodsData = $goods
-			taocanModelRef.value.open()
-		} else {
-			guigeModelData.title = $goods.name
-			const skuMap = returnSelGoodsSkuMap($goods.skuList)
-			// 多规格,和套餐规格区分.groupType=1 套餐多规格
-			const selectSpecInfo = returnSelGoodsSkuList($goods.selectSpecInfo)
-			setSkugoodsDefaultInit($goods, selectSpecInfo, skuMap, $goods.skuList)
-			chooseGuigeModel.value.open()
-		}
+}
+
+//返回当前选中商品skuMap
+function returnSelGoodsSkuMap(specList) {
+	const skuMap = {};
+	for (let i in specList) {
+		skuMap[specList[i].specInfo] = specList[i];
 	}
-	
-	//返回当前选中商品skuMap
-	function returnSelGoodsSkuMap(specList) {
-		const skuMap = {}
-		for (let i in specList) {
-			skuMap[specList[i].specInfo] = specList[i];
-		}
-		return skuMap
-	}
-	/**
-	 * 多规格选择
-	 * @param {Object} skuList
-	 */
-	function returnSelGoodsSkuList(selectSpecInfo) {
-		let specInfo = []
-		for (var key in selectSpecInfo) {
-			specInfo.push({
-				name: key,
-				value: selectSpecInfo[key]
-			})
-		}
-		let result = specInfo.map((v, index) => {
-			return {
-				...v,
-				valueArr: v.value,
-				sel: "",
-				values: v.value.map((name) => {
-					return {
-						name: name,
-						disabled: false
-					};
-				}),
-			};
+	return skuMap;
+}
+/**
+ * 多规格选择
+ * @param {Object} skuList
+ */
+function returnSelGoodsSkuList(selectSpecInfo) {
+	let specInfo = [];
+	for (var key in selectSpecInfo) {
+		specInfo.push({
+			name: key,
+			value: selectSpecInfo[key]
 		});
-		return result
 	}
-	
-	/**
-	 * 多规格选择确认
-	 * @param {Object} sku
-	 * @param {Object} num
-	 */
-	async function guigeConfirm(sku, suitNum) {
-		if( !data.isGoodsAdd ){ return; }
-		let goods = guigeModelData.chooseGoods.item
-		let sku_id = sku.id
-		let product_id = goods.id
-		let product_type = goods.type
-		let res = findGoodsInCar(goods, sku_id)
-		if (res) {
-			//更新
-			let { index } = res
-			let carGoods = cars[index]
-			let cartId = carGoods.id
-			let newNumber = carGoods.number * 1 + suitNum
-		
-			editCart({
+	let result = specInfo.map((v, index) => {
+		return {
+			...v,
+			valueArr: v.value,
+			sel: '',
+			values: v.value.map((name) => {
+				return {
+					name: name,
+					disabled: false
+				};
+			})
+		};
+	});
+	return result;
+}
+
+/**
+ * 多规格选择确认
+ * @param {Object} sku
+ * @param {Object} num
+ */
+async function guigeConfirm(sku, suitNum) {
+	if (!data.isGoodsAdd) {
+		return;
+	}
+	let goods = guigeModelData.chooseGoods.item;
+	let sku_id = sku.id;
+	let product_id = goods.id;
+	let product_type = goods.type;
+	let res = findGoodsInCar(goods, sku_id);
+	if (res) {
+		//更新
+		let { index } = res;
+		let carGoods = cars[index];
+		let cartId = carGoods.id;
+		let newNumber = carGoods.number * 1 + suitNum;
+
+		editCart(
+			{
 				id: cartId,
 				number: newNumber,
 				suitNum: carGoods.suitNum || 1,
 				product_id: product_id,
 				sku_id: sku_id,
-				is_temporary: carGoods.is_temporary, 	 //是否是临时菜
-			},'edit')
-			data.isGoodsAdd = false;
-		} else {
-			//添加
-			editCart({
+				is_temporary: carGoods.is_temporary //是否是临时菜
+			},
+			'edit'
+		);
+		data.isGoodsAdd = false;
+	} else {
+		//添加
+		editCart(
+			{
 				number: suitNum,
 				product_id: product_id,
 				product_type: product_type,
 				sku_id: sku_id,
-				is_temporary: 0, 	 //是否是临时菜
-			},'add')
-			data.isGoodsAdd = false;
+				is_temporary: 0 //是否是临时菜
+			},
+			'add'
+		);
+		data.isGoodsAdd = false;
+	}
+}
+
+/**
+ * 找到该规格商品在购物车中是否存在并返回index值以及对应的数据
+ * @param {Object} $goods
+ * @param {Object} skuId
+ */
+function findGoodsInCar($goods, sku_id) {
+	const product_id = $goods.id;
+	const goodsInCarIndex = cars.findIndex((carsGoods) => {
+		return carsGoods.sku_id == sku_id && carsGoods.product_id == product_id;
+	});
+	const carGoods = cars[goodsInCarIndex];
+	return carGoods
+		? {
+				index: goodsInCarIndex,
+				carGoods
+		  }
+		: false;
+}
+
+/**
+ * 多规格商品弹窗时，找到默认可以下单的规格商品
+ */
+function findGoods(selectSpecInfo = [], goodsListMap = {}, skuList) {
+	let skuMapNumber = selectSpecInfo.reduce((prve, cur) => {
+		for (let i in cur.valueArr) {
+			prve[cur.valueArr[i]] = i;
+		}
+		return prve;
+	}, {});
+	let canBudyGoods = skuList.filter((v) => util.isCanBuy(v, guigeModelData.chooseGoods.item));
+	return canBudyGoods[0];
+}
+
+/**
+ * 设置商品默认选中,规格禁止以及选中
+ * @param {Object} goods
+ * @param {Object} selectSpecInfo
+ * @param {Object} skuMap
+ * @param {Object} skuList
+ */
+function setSkugoodsDefaultInit(goods, selectSpecInfo, skuMap, skuList) {
+	guigeModelData.chooseGoods.item = goods;
+	guigeModelData.chooseGoods.skus = selectSpecInfo;
+	guigeModelData.chooseGoods.skuMap = skuMap;
+	const skuGoods = findGoods(selectSpecInfo, skuMap, skuList);
+	if (skuGoods) {
+		skuGoods.specInfo.split(',').map((v, index) => {
+			guigeModelData.chooseGoods.skus[index].sel = v;
+		});
+	}
+	setTagDisabled();
+}
+
+//更新选中规格
+function updateSkuSel(skusIndex, skdName) {
+	const skuList = guigeModelData.chooseGoods.skus;
+	const skuMap = guigeModelData.chooseGoods.skuMap;
+	guigeModelData.chooseGoods.skus[skusIndex].sel = skdName;
+	const specInfo = guigeModelData.chooseGoods.skus
+		.reduce((prve, cur) => {
+			prve.push(cur.sel);
+			return prve;
+		}, [])
+		.join();
+	setTagDisabled();
+}
+
+/**
+ * 设置规格按钮的禁止状态
+ */
+function setTagDisabled() {
+	const skuList = guigeModelData.chooseGoods.skus;
+	const skuMap = guigeModelData.chooseGoods.skuMap;
+	const selArr = skuList.reduce((prve, cur) => {
+		if (cur.sel) {
+			prve.push(cur.sel);
+		} else {
+		}
+		return prve;
+	}, []);
+
+	let selArrAllGroup = util.generateCombinations(selArr, selArr.length - 1);
+	const matchArr = [];
+	for (let key in skuMap) {
+		let goods = skuMap[key];
+		let keyArr = key.split(',');
+		for (let spe of selArrAllGroup) {
+			if (util.arrayContainsAll(keyArr, spe)) {
+				matchArr.push(goods);
+				break;
+			}
 		}
 	}
-	
-	/**
-	 * 找到该规格商品在购物车中是否存在并返回index值以及对应的数据
-	 * @param {Object} $goods
-	 * @param {Object} skuId
-	 */
-	function findGoodsInCar($goods, sku_id) {
-		const product_id = $goods.id
-		const goodsInCarIndex = cars.findIndex((carsGoods) => {
-			return carsGoods.sku_id == sku_id && carsGoods.product_id == product_id;
-		});
-		const carGoods = cars[goodsInCarIndex]
-		return carGoods ? {
-			index: goodsInCarIndex,
-			carGoods
-		} : false
-	}
-	
-	/**
-	 * 多规格商品弹窗时，找到默认可以下单的规格商品
-	 */
-	function findGoods(selectSpecInfo = [], goodsListMap = {}, skuList) {
-		let skuMapNumber = selectSpecInfo.reduce((prve, cur) => {
-			for (let i in cur.valueArr) {
-				prve[cur.valueArr[i]] = i;
+	//全部规格都已下架
+	if (!matchArr.length) {
+		for (let k in skuList) {
+			for (let i in skuList[k].values) {
+				skuList[k].values[i].disabled = true;
 			}
-			return prve;
-		}, {});
-		let canBudyGoods = skuList.filter((v) => util.isCanBuy(v, guigeModelData.chooseGoods.item))
-		return canBudyGoods[0];
+		}
+		return;
 	}
-	
-	/**
-	 * 设置商品默认选中,规格禁止以及选中
-	 * @param {Object} goods
-	 * @param {Object} selectSpecInfo
-	 * @param {Object} skuMap
-	 * @param {Object} skuList
-	 */
-	function setSkugoodsDefaultInit(goods, selectSpecInfo, skuMap, skuList) {
-		guigeModelData.chooseGoods.item = goods
-		guigeModelData.chooseGoods.skus = selectSpecInfo
-		guigeModelData.chooseGoods.skuMap = skuMap
-		const skuGoods = findGoods(selectSpecInfo, skuMap, skuList);
-		if (skuGoods) {
-			
-			skuGoods.specInfo.split(",").map((v, index) => {
-				guigeModelData.chooseGoods.skus[index].sel = v;
+	const includeSkuMap = matchArr.reduce((prve, cur) => {
+		const speArr = cur.specInfo.split(',');
+		for (let i of speArr) {
+			if (!prve.hasOwnProperty('i')) {
+				prve[i] = matchArr
+					.filter((v) => v.specInfo.match(i))
+					.every((v) => {
+						return !util.isCanBuy(v, guigeModelData.chooseGoods.item);
+					});
+			}
+		}
+		return prve;
+	}, {});
+	for (let i in includeSkuMap) {
+		for (let k in skuList) {
+			const index = skuList[k].valueArr.findIndex((val) => val === i);
+			if (index !== -1) {
+				skuList[k].values[index].disabled = includeSkuMap[i];
+			}
+		}
+	}
+}
+
+/**
+ * 扫桌台码
+ */
+function scanCode() {
+	uni.scanCode({
+		onlyFromCamera: true,
+		success: async function (res) {
+			console.log('条码类型：' + res.scanType);
+			console.log('条码内容：' + res.result);
+			if (res.result.includes('codeplate?code=')) {
+				const par = returnUrlPar(res.result);
+				const tableCode = par.code;
+				let resData = await getShopTableDetail({ tableCode: tableCode });
+				onChooseTable(resData);
+			} else {
+				uni.showToast({
+					icon: 'error',
+					title: '请扫描正确的桌台码'
+				});
+			}
+		}
+	});
+}
+
+function returnUrlPar(str) {
+	let arr = str.split('?')[1].split('&'); //先通过？分解得到？后面的所需字符串，再将其通过&分解开存放在数组里
+	let obj = {};
+	for (let i of arr) {
+		obj[i.split('=')[0]] = i.split('=')[1]; //对数组每项用=分解开，=前为对象属性名，=后为属性值
+	}
+	return obj;
+}
+
+/**
+ * 商品数据处理
+ * @param {Object} category
+ * @param {Object} goods
+ * @param {Object} cars
+ */
+function setTabBar(category, goods, cars) {
+	const goodsCategoryMap = goods.reduce((prve, cur) => {
+		if (!prve.hasOwnProperty(cur.categoryId)) {
+			prve[cur.categoryId] = [];
+		}
+		prve[cur.categoryId].push(cur);
+		return prve;
+	}, {});
+	const chooseGoodsNumberMap = cars.reduce((prve, cur) => {
+		if (!prve.hasOwnProperty(cur.productId)) {
+			prve[cur.productId] = 0;
+		}
+		prve[cur.productId] += cur.number;
+		return prve;
+	}, {});
+	let tabbar = category.map((v) => {
+		const foods = goodsCategoryMap[v.id] || [];
+		return {
+			...v,
+			foods: foods.map((fgoods, index) => {
+				return {
+					...fgoods,
+					chooseNumber: chooseGoodsNumberMap[fgoods.id],
+					price: fgoods.lowPrice
+				};
+			})
+		};
+	});
+	tabbar = tabbar.filter((v) => {
+		return v.foods.length;
+	});
+	data.tabbar = tabbar;
+	nextTick(() => {
+		getMenuItemTop();
+	});
+	storageManage.cacheGoods(data.tabbar);
+}
+
+let searchValue = ref('');
+let isSearch = ref(false);
+let searchResult = ref([]);
+
+/**
+ * 搜索
+ */
+function search() {
+	if (searchValue.value === '') {
+		isSearch.value = false;
+		return;
+	}
+	isSearch.value = true;
+	searchResult.value = returnSearchGoods();
+}
+
+function returnSearchGoods() {
+	const newval = searchValue.value;
+	let arr = [];
+	let goods = [];
+	for (let i in data.tabbar) {
+		const goodsArr = data.tabbar[i].foods || [];
+		for (let k in goodsArr) {
+			goods.push({
+				...goodsArr[k],
+				index: i,
+				goodsIndex: k
 			});
 		}
-		setTagDisabled();
 	}
-	
-	//更新选中规格
-	function updateSkuSel(skusIndex, skdName) {
-		const skuList = guigeModelData.chooseGoods.skus
-		const skuMap = guigeModelData.chooseGoods.skuMap
-		guigeModelData.chooseGoods.skus[skusIndex].sel = skdName
-		const specInfo = guigeModelData.chooseGoods.skus.reduce((prve, cur) => {
-			prve.push(cur.sel)
-			return prve
-		}, []).join()
-		setTagDisabled();
-		
-	}
-	
-	/**
-	 * 设置规格按钮的禁止状态
-	 */
-	function setTagDisabled() {
-		const skuList = guigeModelData.chooseGoods.skus
-		const skuMap = guigeModelData.chooseGoods.skuMap
-		const selArr = skuList.reduce((prve, cur) => {
-			if (cur.sel) {
-				prve.push(cur.sel);
-			} else {}
-			return prve;
-		}, []);
-	
-		let selArrAllGroup = util.generateCombinations(selArr, selArr.length - 1);
-		const matchArr = [];
-		for (let key in skuMap) {
-			let goods = skuMap[key];
-			let keyArr = key.split(",");
-			for (let spe of selArrAllGroup) {
-				if (util.arrayContainsAll(keyArr, spe)) {
-					matchArr.push(goods);
-					break;
-				}
-			}
-		}
-		//全部规格都已下架
-		if (!matchArr.length) {
-			for (let k in skuList) {
-				for (let i in skuList[k].values) {
-					skuList[k].values[i].disabled = true
-				}
-			}
-			return;
-		}
-		const includeSkuMap = matchArr.reduce((prve, cur) => {
-			const speArr = cur.specInfo.split(",");
-			for (let i of speArr) {
-				if (!prve.hasOwnProperty("i")) {
-					prve[i] = matchArr
-						.filter((v) => v.specInfo.match(i))
-						.every((v) => {
-							return !util.isCanBuy(v, guigeModelData.chooseGoods.item)
-						});
-				}
-			}
-			return prve;
-		}, {});
-		for (let i in includeSkuMap) {
-			for (let k in skuList) {
-				const index = skuList[k].valueArr.findIndex((val) => val === i);
-				if (index !== -1) {
-					skuList[k].values[index].disabled = includeSkuMap[i]
-				}
-			}
-		}
+	if (newval == '') {
+		arr = goods;
+	} else {
+		arr = goods.filter((v) => v.name.includes(newval.trim()));
 	}
+	return arr;
+}
 
+function clearSearch() {
+	isSearch.value = false;
+}
 
-	
+function chooseUser() {
+	go.to('PAGES_CHOOSE_USER');
+}
 
+/**
+ * 前往临时菜
+ */
+function toLinshi() {
+	go.to('PAGES_CHOOSE_ADD_TEMP_CUISINE', {
+		tableCode: data.table.tableCode
+	});
+}
 
-	/**
-	 * 扫桌台码
-	 */
-	function scanCode() {
-		uni.scanCode({
-			onlyFromCamera: true,
-			 success: async function(res) {
-				console.log('条码类型：' + res.scanType);
-				console.log('条码内容：' + res.result);
-				if (res.result.includes('codeplate?code=')) {
-					const par = returnUrlPar(res.result)
-					const tableCode = par.code
-					let resData = await getShopTableDetail({tableCode:tableCode})
-					onChooseTable(resData)
-				} else {
-					uni.showToast({
-						icon: 'error',
-						title: '请扫描正确的桌台码'
-					})
-				}
-			}
-		});
-	}
-	
-	function returnUrlPar(str) {
-		let arr = str.split("?")[1].split("&"); //先通过？分解得到？后面的所需字符串，再将其通过&分解开存放在数组里
-		let obj = {};
-		for (let i of arr) {
-			obj[i.split("=")[0]] = i.split("=")[1]; //对数组每项用=分解开，=前为对象属性名，=后为属性值
-		}
-		return obj
-	}
+/**
+ * 称重
+ */
+const refweighitem = ref(null);
+const tapweigh = (foodsindex, index) => {
+	const goods = data.tabbar[index].foods[foodsindex];
+	refweighitem.value.open(foodsindex, index, goods);
+};
 
-	/**
-	 * 商品数据处理
-	 * @param {Object} category
-	 * @param {Object} goods
-	 * @param {Object} cars
-	 */
-	function setTabBar(category, goods, cars) {
-		const goodsCategoryMap = goods.reduce((prve, cur) => {
-			if (!prve.hasOwnProperty(cur.categoryId)) {
-				prve[cur.categoryId] = []
-			}
-			prve[cur.categoryId].push(cur)
-			return prve
-		}, {})
-		const chooseGoodsNumberMap = cars.reduce((prve, cur) => {
-			if (!prve.hasOwnProperty(cur.productId)) {
-				prve[cur.productId] = 0
-			}
-			prve[cur.productId] += cur.number
-			return prve
-		}, {})
-		let tabbar = category.map(v => {
-			const foods = goodsCategoryMap[v.id] || []
-			return {
-				...v,
-				foods: foods.map((fgoods, index) => {
-					return {
-						...fgoods,
-						chooseNumber: chooseGoodsNumberMap[fgoods.id],
-						price: fgoods.lowPrice,
-					}
-				})
-			}
-		})
-		tabbar = tabbar.filter(v => {
-			return v.foods.length
-		})
-		data.tabbar = tabbar
-		nextTick(() => {
-			getMenuItemTop()
-		})
-		storageManage.cacheGoods(data.tabbar)
-	}
+/**
+ * 搜索商品添加减少
+ * @param {Object} goodsItem
+ * @param {Object} goodsIndex
+ * @param {Object} isAdd
+ */
+function searchGoodsUpdate(goodsItem, goodsIndex, isAdd) {
+	goodsUpdate(goodsItem.goodsIndex, goodsItem.index, isAdd, goodsIndex);
+}
 
-	let searchValue = ref('')
-	let isSearch = ref(false)
-	let searchResult = ref([])
-	
-	/**
-	 * 搜索
-	 */
-	function search() {
-		if (searchValue.value === '') {
-			isSearch.value = false
-			return
-		}
-		isSearch.value = true
-		searchResult.value = returnSearchGoods()
-	}
-	
-	function returnSearchGoods() {
-		const newval = searchValue.value
-		let arr = []
-		let goods = []
-		for (let i in data.tabbar) {
-			const goodsArr = data.tabbar[i].foods || []
-			for (let k in goodsArr) {
-				goods.push({
-					...goodsArr[k],
-					index: i,
-					goodsIndex: k
-				})
-			}
-		}
-		if (newval == "") {
-			arr = goods;
-		} else {
-			arr = goods.filter((v) =>
-				v.name.includes(newval.trim())
-			);
-		}
-		return arr
+function setSearchGoods(index, chooseNumber) {
+	if (index !== undefined) {
+		searchResult.value[index].chooseNumber = chooseNumber;
 	}
+}
 
-	function clearSearch() {
-		isSearch.value = false
+let isTabClickOver = true;
+/**
+ * 点击左边的栏目切换
+ * @param {Object} index
+ */
+async function swichMenu(index) {
+	if (data.arr.length == 0) {
+		await getMenuItemTop();
 	}
-
-	function chooseUser() {
-		go.to('PAGES_CHOOSE_USER')
-	}
-	
-	/**
-	 * 前往临时菜
-	 */
-	function toLinshi() {
-		go.to('PAGES_CHOOSE_ADD_TEMP_CUISINE', {
-			tableCode: data.table.tableCode,
-		
-		})
-	}
-	
-	/**
-	 * 称重
-	 */
-	const refweighitem = ref(null)
-	const tapweigh = (foodsindex, index) => {
-		const goods = data.tabbar[index].foods[foodsindex]
-		refweighitem.value.open(foodsindex, index, goods)
-	}
-
-
-	/**
-	 * 搜索商品添加减少
-	 * @param {Object} goodsItem
-	 * @param {Object} goodsIndex
-	 * @param {Object} isAdd
-	 */
-	function searchGoodsUpdate(goodsItem, goodsIndex, isAdd) {
-		goodsUpdate(goodsItem.goodsIndex, goodsItem.index, isAdd, goodsIndex)
-	}
-	
-	function setSearchGoods(index, chooseNumber) {
-		if (index !== undefined) {
-			searchResult.value[index].chooseNumber = chooseNumber
-		}
-	}
-	
-	let isTabClickOver = true
-	/**
-	 * 点击左边的栏目切换
-	 * @param {Object} index
-	 */
-	async function swichMenu(index) {
-		if (data.arr.length == 0) {
-			await getMenuItemTop();
-		}
-		if (index == data.current) return;
-		isTabClickOver = false;
-		data.scrollRightTop = data.oldScrollTop;
-		nextTick(function() {
-			data.scrollRightTop = data.arr[index] + data.topZhanwei;
-			data.current = index;
-			leftMenuStatus(index);
-		})
-	}
-	
-	/**
-	 * 获取一个目标元素的高度
-	 * @param {Object} elClass
-	 * @param {Object} dataVal
-	 */
-	function getElRect(elClass, dataVal) {
-		return new Promise((resolve, reject) => {
-			const query = uni.createSelectorQuery().in(instance.proxy);
-			query.select('.' + elClass).fields({
-				size: true
-			}, res => {
-				// 如果节点尚未生成，res值为null，循环调用执行
-				if (!res) {
-					setTimeout(() => {
-						getElRect(elClass);
-					}, 10);
-					return;
-				}
-				if (dataVal) {
-					data[dataVal] = res.height;
-				}
-				resolve(res);
-			}).exec();
-		})
-	}
-
-	/**
-	 * 设置左边菜单的滚动状态
-	 * @param {Object} index
-	 */
-	async function leftMenuStatus(index) {
-		if (!isTabClickOver) {
-			return
-		}
+	if (index == data.current) return;
+	isTabClickOver = false;
+	data.scrollRightTop = data.oldScrollTop;
+	nextTick(function () {
+		data.scrollRightTop = data.arr[index] + data.topZhanwei;
 		data.current = index;
-		// 如果为0，意味着尚未初始化
-		if (data.menuHeight == 0 || data.menuItemHeight == 0) {
-			await getElRect('menu-scroll-view', 'menuHeight');
-			await getElRect('u-tab-item', 'menuItemHeight');
-		}
-		// 将菜单活动item垂直居中
-		data.scrollTop = index * data.menuItemHeight + data.menuItemHeight / 2 - data.menuHeight / 2;
-	}
+		leftMenuStatus(index);
+	});
+}
 
-	/**
-	 * 获取右边菜单每个item到顶部的距离
-	 */
-	function getMenuItemTop() {
-		new Promise(resolve => {
-			let selectorQuery = uni.createSelectorQuery();
-			selectorQuery.selectAll('.class-item').boundingClientRect((rects) => {
+/**
+ * 获取一个目标元素的高度
+ * @param {Object} elClass
+ * @param {Object} dataVal
+ */
+function getElRect(elClass, dataVal) {
+	return new Promise((resolve, reject) => {
+		const query = uni.createSelectorQuery().in(instance.proxy);
+		query
+			.select('.' + elClass)
+			.fields(
+				{
+					size: true
+				},
+				(res) => {
+					// 如果节点尚未生成，res值为null，循环调用执行
+					if (!res) {
+						setTimeout(() => {
+							getElRect(elClass);
+						}, 10);
+						return;
+					}
+					if (dataVal) {
+						data[dataVal] = res.height;
+					}
+					resolve(res);
+				}
+			)
+			.exec();
+	});
+}
+
+/**
+ * 设置左边菜单的滚动状态
+ * @param {Object} index
+ */
+async function leftMenuStatus(index) {
+	if (!isTabClickOver) {
+		return;
+	}
+	data.current = index;
+	// 如果为0，意味着尚未初始化
+	if (data.menuHeight == 0 || data.menuItemHeight == 0) {
+		await getElRect('menu-scroll-view', 'menuHeight');
+		await getElRect('u-tab-item', 'menuItemHeight');
+	}
+	// 将菜单活动item垂直居中
+	data.scrollTop = index * data.menuItemHeight + data.menuItemHeight / 2 - data.menuHeight / 2;
+}
+
+/**
+ * 获取右边菜单每个item到顶部的距离
+ */
+function getMenuItemTop() {
+	new Promise((resolve) => {
+		let selectorQuery = uni.createSelectorQuery();
+		selectorQuery
+			.selectAll('.class-item')
+			.boundingClientRect((rects) => {
 				// 如果节点尚未生成，rects值为[](因为用selectAll，所以返回的是数组)，循环调用执行
 				if (!rects.length) {
 					setTimeout(() => {
@@ -1272,264 +1324,283 @@
 					}, 10);
 					return;
 				}
-				let arr = []
+				let arr = [];
 				rects.forEach((rect) => {
 					// 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
 					arr.push(rect.top - rects[0].top);
-				})
-				data.arr = arr
+				});
+				data.arr = arr;
 				resolve();
-			}).exec()
-		})
-	}
+			})
+			.exec();
+	});
+}
 
-	/**
-	 * 右边菜单滚动
-	 * @param {Object} e
-	 */
-	async function rightScroll(e) {
-		data.oldScrollTop = e.detail.scrollTop;
-		if (data.arr.length == 0) {
-			await getMenuItemTop();
-		}
-		if (data.timer) return;
-		if (!data.menuHeight) {
-			await getElRect('menu-scroll-view', 'menuHeight');
-		}
-		if (e.detail.scrollTop == 0) {
-			isTabClickOver = true
-			// return swichMenu(0)
-		}
-		setTimeout(() => { // 节流
-			data.timer = null;
-			// scrollHeight为右边菜单垂直中点位置
-			let scrollHeight = e.detail.scrollTop + data.menuHeight / 2 + data.topZhanwei / 2;
-			for (let i = 0; i < data.arr.length; i++) {
-				let height1 = data.arr[i];
-				let height2 = data.arr[i + 1];
-				// 如果不存在height2，意味着数据循环已经到了最后一个，设置左边菜单为最后一项即可
-				if (!height2 || scrollHeight >= height1 && scrollHeight < height2) {
-					if (isTabClickOver) {
-						leftMenuStatus(i);
-					} else {
-						isTabClickOver = true
-					}
-					return;
+/**
+ * 右边菜单滚动
+ * @param {Object} e
+ */
+async function rightScroll(e) {
+	data.oldScrollTop = e.detail.scrollTop;
+	if (data.arr.length == 0) {
+		await getMenuItemTop();
+	}
+	if (data.timer) return;
+	if (!data.menuHeight) {
+		await getElRect('menu-scroll-view', 'menuHeight');
+	}
+	if (e.detail.scrollTop == 0) {
+		isTabClickOver = true;
+		// return swichMenu(0)
+	}
+	setTimeout(() => {
+		// 节流
+		data.timer = null;
+		// scrollHeight为右边菜单垂直中点位置
+		let scrollHeight = e.detail.scrollTop + data.menuHeight / 2 + data.topZhanwei / 2;
+		for (let i = 0; i < data.arr.length; i++) {
+			let height1 = data.arr[i];
+			let height2 = data.arr[i + 1];
+			// 如果不存在height2，意味着数据循环已经到了最后一个，设置左边菜单为最后一项即可
+			if (!height2 || (scrollHeight >= height1 && scrollHeight < height2)) {
+				if (isTabClickOver) {
+					leftMenuStatus(i);
+				} else {
+					isTabClickOver = true;
 				}
+				return;
 			}
-		}, 100)
-	}
-	
-	/**
-	 * 台桌切换
-	 */
-	async function onSelTable() {
-		setTabBar($category, $originGoods, cars)
-	}
+		}
+	}, 100);
+}
 
-	function watchUpdate() {
-		uni.$off('update:createOrderIndex')
-		uni.$off('add:cashCai')
-		uni.$on('update:createOrderIndex', () => {
-			cars.length = 0
-			init()
-		})
-		
-		// 添加临时菜到购物车
-		uni.$on('add:cashCai', async (data) => {
-			console.log('add:cashCai',data);
-			$originGoods.push(data)
-			data.isGoodsAdd = false;
-		})
-		
-	}
-	
-	
+/**
+ * 台桌切换
+ */
+async function onSelTable() {
+	setTabBar($category, $originGoods, cars);
+}
+
+function watchUpdate() {
+	uni.$off('update:createOrderIndex');
+	uni.$off('add:cashCai');
+	uni.$on('update:createOrderIndex', () => {
+		cars.length = 0;
+		init();
+	});
+
+	// 添加临时菜到购物车
+	uni.$on('add:cashCai', async (data) => {
+		console.log('add:cashCai', data);
+		$originGoods.push(data);
+		data.isGoodsAdd = false;
+	});
+}
 </script>
 
 <style lang="scss" scoped>
-	.choose-user {
-		background: #F9F9F9;
-		padding: 22rpx 28rpx;
-	}
+.choose-user {
+	background: #f9f9f9;
+	padding: 22rpx 28rpx;
+}
 
-	.search {
-		padding-right: 28rpx;
-	}
+.search {
+	padding-right: 28rpx;
+}
 
-	.icon-saoma {
-		margin-left: 20rpx;
-		width: 34rpx;
-		height: 32rpx;
-	}
+.icon-saoma {
+	margin-left: 20rpx;
+	width: 34rpx;
+	height: 32rpx;
+}
 
-	$u-tips-color: $my-main-color;
-	$u-primary: $my-main-color;
-	$u-main-color: $my-main-color;
+$u-tips-color: $my-main-color;
+$u-primary: $my-main-color;
+$u-main-color: $my-main-color;
 
-	.u-wrap {
-		height: calc(100vh);
-		/* #ifdef H5 */
-		height: calc(100vh - var(--window-top));
-		/* #endif */
-		display: flex;
-		flex-direction: column;
-	}
+.u-wrap {
+	height: calc(100vh);
+	/* #ifdef H5 */
+	height: calc(100vh - var(--window-top));
+	/* #endif */
+	display: flex;
+	flex-direction: column;
+}
 
-	.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;
-		}
 	}
+}
 
-	.u-menu-wrap {
-		flex: 1;
-		display: flex;
-		overflow: hidden;
-	}
+.u-menu-wrap {
+	flex: 1;
+	display: flex;
+	overflow: hidden;
+}
 
-	.u-search-inner {
-		// background-color: rgb(234, 234, 234);
-		background-color: #fff;
-		border-radius: 100rpx;
-		display: flex;
-		align-items: center;
-		padding: 10rpx 16rpx;
-	}
+.u-search-inner {
+	// background-color: rgb(234, 234, 234);
+	background-color: #fff;
+	border-radius: 100rpx;
+	display: flex;
+	align-items: center;
+	padding: 10rpx 16rpx;
+}
 
-	.u-search-text {
-		font-size: 26rpx;
-		color: $u-tips-color;
-		margin-left: 10rpx;
-	}
+.u-search-text {
+	font-size: 26rpx;
+	color: $u-tips-color;
+	margin-left: 10rpx;
+}
 
-	.u-tab-view {
-		width: 178rpx;
-		height: 100%;
-	}
+.u-tab-view {
+	width: 178rpx;
+	height: 100%;
+}
 
-	.u-tab-item {
-		height: 110rpx;
-		background: #f6f6f6;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 26rpx;
-		color: #444;
-		font-weight: 400;
-		line-height: 1;
-		box-sizing: border-box;
-		padding-left: 12rpx;
-	}
+.u-tab-item {
+	height: 110rpx;
+	background: #f6f6f6;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 26rpx;
+	color: #444;
+	font-weight: 400;
+	line-height: 1;
+	box-sizing: border-box;
+	padding-left: 12rpx;
+}
 
-	.u-tab-item-active {
-		position: relative;
+.u-tab-item-active {
+	position: relative;
+	color: $my-main-color;
+	font-size: 30rpx;
+	font-weight: 600;
+	background: #fff;
+}
+
+.u-tab-item-active::before {
+	content: '';
+	position: absolute;
+	border-left: 4px solid $my-main-color;
+	left: 0;
+	top: 0;
+	bottom: 0;
+}
+
+.u-tab-view {
+	height: 100%;
+	background-color: #f6f6f6;
+}
+
+.addCai {
+	width: 250rpx;
+	height: 272rpx;
+	border-radius: 8rpx 8rpx 8rpx 8rpx;
+	box-sizing: border-box;
+	border: 4rpx solid #90bdf6;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+.lingshi {
+	width: 250rpx;
+	height: 136px;
+	background: #ffffff;
+	border-radius: 8rpx 8rpx 8rpx 8rpx;
+	border: 4rpx solid #90bdf6;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+::v-deep .uni-searchbar {
+	padding-top: 12px !important;
+	padding-bottom: 16px !important;
+}
+
+.right-box {
+	width: 572rpx;
+	// background-color: rgb(250, 250, 250);
+	background-color: rgb(255, 255, 255);
+}
+
+.page-view {
+	// padding: 24rpx 28rpx 24rpx 24rpx;
+}
+
+.class-item {
+	margin-bottom: 30rpx;
+	background-color: #fff;
+	border-radius: 8rpx;
+}
+
+.class-item:last-child {
+	min-height: 50vh;
+}
+
+.item-title {
+	font-size: 26rpx;
+	font-weight: bold;
+
+	&.active {
 		color: $my-main-color;
-		font-size: 30rpx;
-		font-weight: 600;
-		background: #fff;
 	}
+}
 
-	.u-tab-item-active::before {
-		content: "";
+.item-menu-name {
+	font-weight: normal;
+	font-size: 24rpx;
+	color: $u-main-color;
+}
+
+.item-container {
+	display: flex;
+	flex-wrap: wrap;
+	margin-top: 24rpx;
+}
+
+.thumb-box {
+	margin-right: 24rpx;
+	margin-bottom: 24rpx;
+}
+
+.item-menu-image {
+	width: 120rpx;
+	height: 120rpx;
+}
+
+.history-button {
+	padding: 4upx 20upx;
+	background-color: $uni-primary;
+	position: fixed;
+	bottom: 60%;
+	right: 30upx;
+	color: #fff;
+	border-radius: 8upx;
+	.num {
+		padding: 0 6px;
+		border-radius: 50px;
+		background-color: #eb4f4f;
+		color: #fff;
 		position: absolute;
-		border-left: 4px solid $my-main-color;
-		left: 0;
-		top: 0;
-		bottom: 0;
-	}
-
-	.u-tab-view {
-		height: 100%;
-		background-color: #f6f6f6;
-	}
-
-	.addCai {
-		width: 250rpx;
-		height: 272rpx;
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		box-sizing: border-box;
-		border: 4rpx solid #90BDF6;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.lingshi {
-		width: 250rpx;
-		height: 136px;
-		background: #FFFFFF;
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		border: 4rpx solid #90BDF6;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-
-	::v-deep .uni-searchbar {
-		padding-top: 12px !important;
-		padding-bottom: 16px !important;
-	}
-
-	.right-box {
-		width: 572rpx;
-		// background-color: rgb(250, 250, 250);
-		background-color: rgb(255, 255, 255);
-	}
-
-	.page-view {
-		// padding: 24rpx 28rpx 24rpx 24rpx;
-	}
-
-	.class-item {
-		margin-bottom: 30rpx;
-		background-color: #fff;
-		border-radius: 8rpx;
-	}
-
-	.class-item:last-child {
-		min-height: 50vh;
-	}
-
-	.item-title {
-		font-size: 26rpx;
-		font-weight: bold;
-
-		&.active {
-			color: $my-main-color;
-		}
-	}
-
-	.item-menu-name {
-		font-weight: normal;
+		top: -8px;
+		right: -8px;
 		font-size: 24rpx;
-		color: $u-main-color;
 	}
-
-	.item-container {
-		display: flex;
-		flex-wrap: wrap;
-		margin-top: 24rpx;
-	}
-
-	.thumb-box {
-		margin-right: 24rpx;
-		margin-bottom: 24rpx;
-	}
-
-	.item-menu-image {
-		width: 120rpx;
-		height: 120rpx;
-	}
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/vite.config.js b/vite.config.js
index 1c5e612..25e7b05 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -8,7 +8,8 @@ export default defineConfig({
 	server: {
 		proxy: {
 			'/api': {
-				target: 'https://tapi.cashier.sxczgkj.cn/api', // 目标服务器地址
+				target: 'https://cashier.sxczgkj.com', // 目标服务器地址
+				// target: 'http://192.168.1.31/\', // 目标服务器地址
 				changeOrigin: true,                   // 是否更改请求源
 				rewrite: path => path.replace(/^\/api/, '')
 			}