From 13ad5a0de4f206728acddc58305737937bbc1904 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 29 Apr 2025 10:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |    6 -
 common/js/carts-websocket.js                  |  360 ---
 common/js/carts-websocket.ts                  |  244 ++
 common/js/{carts.js => carts.ts}              |    0
 pages/order/components/orderInfo.vue          |    4 -
 pages/order/confirm-order.vue                 |    4 +-
 .../components/confirmorder - 副本.vue        | 1406 +++++++++
 pages/product/components/shoppingCartes.vue   |  114 +-
 pages/product/index - 副本.vue                | 2631 +++++++++++++++++
 pages/product/index.vue                       |  703 +----
 pages/test/test.vue                           |   68 +-
 stores/carts.js                               |  452 ---
 stores/carts.ts                               |  821 +++++
 stores/user.js                                |   10 +-
 utils/product.js                              |   47 +
 15 files changed, 5345 insertions(+), 1525 deletions(-)
 delete mode 100644 common/js/carts-websocket.js
 create mode 100644 common/js/carts-websocket.ts
 rename common/js/{carts.js => carts.ts} (100%)
 create mode 100644 pages/product/components/confirmorder - 副本.vue
 create mode 100644 pages/product/index - 副本.vue
 delete mode 100644 stores/carts.js
 create mode 100644 stores/carts.ts
 create mode 100644 utils/product.js

diff --git a/App.vue b/App.vue
index fdda864..e824611 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,4 @@
 <script setup>
-	import {
-		useCartsStore
-	} from '@/stores/carts.js';
 	import {
 		useNavbarStore
 	} from '@/stores/navbarStore';
@@ -35,9 +32,6 @@
 		await nextTick()
 		const store = useNavbarStore();
 		await store.initNavbarHeight();
-		getApp().globalData.websocket=null;
-		const cartsStore=useCartsStore()
-		cartsStore.isloading=false;
 	});
 	onShow(async () => {
 		try {
diff --git a/common/js/carts-websocket.js b/common/js/carts-websocket.js
deleted file mode 100644
index 91fb8e5..0000000
--- a/common/js/carts-websocket.js
+++ /dev/null
@@ -1,360 +0,0 @@
-import {
-	ref,
-	onMounted,
-	onBeforeUnmount
-} from 'vue';
-
-const useWebSocket = (options = {}) => {
-	const {
-		heartbeatInterval = 10000, //心跳是10秒一次
-			reconnectInterval = 3000, //重新连接间隔时间的一个参数
-			maxReconnectAttempts = 3, //最大重连接次数
-			initialReconnectInterval = 3000, // 初始重连间隔
-			initMessage,
-			initMessageRetryCount = 3, // 新增：初始化消息发送重试次数
-			initMessageRetryInterval = 2000, // 新增：初始化消息重试间隔
-			maxReconnectDuration = Infinity,
-			onMessage
-	} = options;
-	const autoReconnect = ref(true); //是否自动重新连接
-	const socketTask = ref(null);
-	const isConnected = ref(false); //表示是否已连接上。
-	const heartbeatTimer = ref(null); //心跳定时器
-	const reconnectTimer = ref(null); //重连定时器
-	const reconnectAttempts = ref(0); //重连的尝试次数
-	const isNetworkConnected = ref(true); //监听当前网络连接状态
-	const isManuallyClosed = ref(false); //是否是被手动关闭的
-	const receivedMessages = ref(); //储从 WebSocket 服务器接收到的消息
-	const initMessageSendAttempts = ref(0); //初始化连接多少次
-	const reconnectStartTime = ref(0); //新增：记录重连开始时间
-	const isPongReceived = ref(false)
-	const allowReconnect = ref(true); // 新增：控制是否允许重连
-	// 关闭现有连接并清理资源
-	const closeExistingConnection = () => {
-		if (socketTask.value) {
-			// 关闭 WebSocket 连接
-			socketTask.value.close({
-				success: () => {
-					console.log('WebSocket 连接已关闭');
-				},
-				fail: (err) => {
-					console.error('关闭 WebSocket 连接失败:', err);
-				}
-			});
-
-			// 清除心跳定时器
-			clearInterval(heartbeatTimer.value);
-			heartbeatTimer.value = null;
-
-			// 清除重连定时器
-			clearTimeout(reconnectTimer.value);
-			reconnectTimer.value = null;
-
-			// 标记连接已断开
-			isConnected.value = false;
-		}
-	};
-	const websocketsendMessage = (data) => {
-		uni.$u.debounce(sendMessage(data), 500)
-	}
-	// 连接 WebSocket
-	const connect = (connectMsg) => {
-		if (!isNetworkConnected.value) {
-			uni.showToast({
-				title: '网络未连接...',
-				icon: 'none'
-			})
-			setTimeout(() => {
-				uni.pro.switchTab('index/index')
-			}, 1000)
-			console.log('网络未连接，暂不尝试连接 WebSocket');
-			return;
-		}
-
-		// 关闭现有连接并清理资源
-		closeExistingConnection();
-		socketTask.value = uni.connectSocket({
-			url: uni.conf.baseUrlwws,
-			success: (res) => {
-				isConnected.value = true;
-				// 监听初始化成功在开启心跳
-				startHeartbeat();
-			},
-			fail: () => {
-				console.error('WebSocket 连接失败，尝试重连');
-				if (autoReconnect.value && allowReconnect.value) {
-					handleReconnect();
-				}
-			}
-		});
-
-		if (socketTask.value) {
-			socketTask.value.onOpen(() => {
-				// 初始化 初始购物车
-				sendMessage(connectMsg ? connectMsg : initMessage)
-			});
-			socketTask.value.onMessage((res) => {
-				receivedMessages.value = JSON.parse(res.data)
-				websocketsendMessage({
-					type: 'receipt',
-					msg_id: receivedMessages.value.msg_id
-				})
-				if (onMessage) {
-					onMessage(receivedMessages.value)
-				}
-				// receivedMessages.value.push(list);
-				if (receivedMessages.value == 'ok' || receivedMessages.value.operate_type == 'init') {
-					console.log('初始化正常，心跳响应正常');
-					// 清除重连定时器
-					clearTimeout(reconnectTimer.value);
-					allowReconnect.value = false
-					reconnectTimer.value = null;
-				}
-
-			});
-
-			socketTask.value.onClose((res) => {
-				console.log(res, 'WebSocket 连接已关闭，尝试重连');
-				isConnected.value = false;
-				clearInterval(heartbeatTimer.value); // 停止心跳定时器
-				clearTimeout(reconnectTimer.value); // 清除重连定时器
-				if (res.code == '1006' && !allowReconnect.value) {
-					uni.showToast({
-						title: '网络异常，请重新扫码',
-						icon: 'none'
-					});
-					autoReconnect.value = false;
-					setTimeout(() => {
-						uni.pro.switchTab('index/index');
-					}, 1000)
-					return false;
-				}
-				if (autoReconnect.value && !isManuallyClosed.value) {
-					handleReconnect();
-				}
-			});
-
-			socketTask.value.onError((err) => {
-				console.error('WebSocket 连接发生错误:', err);
-				isConnected.value = false;
-				clearInterval(heartbeatTimer.value);
-				if (autoReconnect.value && !isManuallyClosed.value) {
-					handleReconnect();
-				}
-			});
-		} else {
-			console.error('socketTask 未正确初始化');
-		}
-	};
-
-	// 启动心跳机制
-	const startHeartbeat = () => {
-		if (!isNetworkConnected.value) {
-			console.log('网络未连接，暂停心跳');
-			uni.showToast({
-				title: '网络未连接...',
-				icon: 'none'
-			});
-			setTimeout(() => {
-				uni.pro.switchTab('index/index');
-			}, 1000);
-			return;
-		}
-		heartbeatTimer.value = setInterval(() => {
-			if (isConnected.value) {
-				console.log('发送心跳消息');
-				isPongReceived.value = false; // 每次发送心跳消息前重置标记
-				socketTask.value.send({
-					data: JSON.stringify({
-						type: 'ping_interval',
-						set: 'shopping'
-					}),
-					success: () => {
-						console.log('心跳消息发送成功');
-						const pongTimer = setTimeout(() => {
-							if (!isPongReceived.value) {
-								console.error('心跳超时，未收到响应，尝试重连');
-								clearInterval(heartbeatTimer.value);
-								if (autoReconnect.value && reconnectAttempts.value <
-									maxReconnectAttempts && allowReconnect.value) {
-									handleReconnect();
-								} else {
-									console.error('重连次数达到上限，停止重连和心跳');
-									clearInterval(heartbeatTimer.value);
-									autoReconnect.value = false;
-									uni.pro.switchTab('index/index');
-								}
-							}
-						}, heartbeatInterval * 1.2);
-
-						const handlePong = (res) => {
-							try {
-								let data = JSON.parse(res.data);
-								if (data.operate_type == "init" || (data.msg === 'ok' &&
-										data.msg_id ==
-										'ping_interval')) {
-									isPongReceived.value = true;
-									console.log('收到心跳响应，清除超时定时器');
-									clearTimeout(pongTimer);
-								}
-							} catch (error) {
-								console.error('解析心跳响应数据时出错:', error);
-							}
-						};
-						socketTask.value.onMessage(handlePong);
-					},
-					fail: () => {
-						console.error('心跳消息发送失败，尝试重连');
-						clearInterval(heartbeatTimer.value);
-						if (autoReconnect.value && reconnectAttempts.value <
-							maxReconnectAttempts && allowReconnect.value) {
-							handleReconnect();
-						} else {
-							console.error('重连次数达到上限，停止重连和心跳');
-							clearInterval(heartbeatTimer.value);
-							autoReconnect.value = false;
-							uni.pro.switchTab('index/index');
-						}
-					}
-				});
-			}
-		}, heartbeatInterval);
-	};
-
-
-	// 手动关闭连接
-	const closeSocket = () => {
-		isManuallyClosed.value = true;
-		closeExistingConnection();
-	};
-
-	// 发送消息
-	const sendMessage = async (data) => {
-		if (isConnected.value) {
-			await socketTask.value.send({
-				data: JSON.stringify(data),
-				success: () => {
-					// console.log('消息发送成功');
-				},
-				fail: () => {
-					// console.error('消息发送失败');
-				}
-			});
-		} else {
-			console.error('WebSocket 未连接，无法发送消息');
-		}
-	};
-
-	// 处理重连逻辑
-	const handleReconnect = () => {
-		if (!isNetworkConnected.value) {
-			console.log('网络未连接，暂停重连');
-			return;
-		}
-		if (isManuallyClosed.value) {
-			console.log('手动关闭连接，不进行重连');
-			return;
-		}
-
-		if (!allowReconnect.value) {
-			console.log('重连功能已关闭，不进行重连');
-			return;
-		}
-
-		if (reconnectAttempts.value < maxReconnectAttempts) {
-			reconnectAttempts.value++;
-			const reconnectInterval = initialReconnectInterval * Math.pow(2, reconnectAttempts.value - 1);
-			const randomizedInterval = reconnectInterval + Math.floor(Math.random() * 1000);
-			uni.showLoading({
-				title: `正在努力连接..`,
-				mask: true
-			})
-			console.log(`尝试第 ${reconnectAttempts.value} 次重连，重连间隔: ${randomizedInterval}ms...`);
-
-			reconnectTimer.value = setTimeout(() => {
-				connect();
-			}, randomizedInterval);
-		} else {
-			console.error('重连次数达到上限，停止重连');
-			uni.showToast({
-				title: '重连次数达到上限，停止重连',
-				icon: 'none'
-			});
-			clearInterval(heartbeatTimer.value);
-			autoReconnect.value = false;
-			setTimeout(() => {
-				uni.hideLoading();
-				uni.pro.switchTab('index/index');
-			}, 1000)
-		}
-	};
-
-
-	// / 网络状态监听
-	const initNetworkListener = () => {
-		uni.getSystemInfo({
-			success: (res) => {
-				if (res.platform !== 'devtools') {
-					uni.onNetworkStatusChange((statusRes) => {
-						isNetworkConnected.value = statusRes.isConnected;
-						if (statusRes.isConnected && !isManuallyClosed.value) {
-							console.log('网络已连接，尝试重新连接 WebSocket');
-							if (!isConnected.value && autoReconnect.value) {
-								connect();
-							}
-						} else if (!statusRes.isConnected) {
-							console.log('网络已断开，暂停 WebSocket 操作');
-							clearInterval(heartbeatTimer.value);
-							clearTimeout(reconnectTimer.value);
-							if (socketTask.value) {
-								socketTask.value.close();
-								isConnected.value = false;
-							}
-						}
-					});
-				}
-			},
-			fail: (err) => {
-				console.error('获取系统信息失败:', err);
-			}
-		});
-
-		uni.getNetworkType({
-			success: (res) => {
-				isNetworkConnected.value = res.networkType !== 'none';
-				if (!isNetworkConnected.value) {
-					console.log('初始网络未连接，暂不尝试连接 WebSocket');
-				}
-			}
-		});
-	};
-
-	// 页面显示，尝试连接 WebSocket
-	const onShowconnect = () => {
-		if (autoReconnect.value) {
-			uni.showLoading({
-				title: `尝试再次连接`,
-				mask: true
-			})
-			connect();
-		}
-	}
-
-	onBeforeUnmount(() => {
-		closeSocket();
-	});
-
-	return {
-		isConnected,
-		sendMessage,
-		closeSocket,
-		receivedMessages,
-		closeExistingConnection,
-		connect,
-		onShowconnect,
-		initNetworkListener,
-		connect
-	};
-};
-
-export default useWebSocket;
\ No newline at end of file
diff --git a/common/js/carts-websocket.ts b/common/js/carts-websocket.ts
new file mode 100644
index 0000000..9bb2229
--- /dev/null
+++ b/common/js/carts-websocket.ts
@@ -0,0 +1,244 @@
+import { error } from "../../uni_modules/uview-plus";
+
+// import qs from "qs";
+const qs = {
+	stringify: (obj) => {
+		 const str= Object.keys(obj).reduce((prve, key) => {
+			return prve + `${key}=${obj[key]}&`
+		}, '?')
+		
+		return str.substring(0,str.length-1)
+	}
+}
+function ElMessage() {
+
+}
+function ElMessageBox() {
+
+}
+
+const user = {
+	userInfo: {
+		shopId: ''
+	}
+}
+
+export interface ApifoxModel {
+	account : string;
+	operate_type : string;
+	shop_id : string;
+	table_code ?: string;
+	type : string;
+	[property : string] : string | number | undefined; // 限制额外属性类型
+}
+
+export type msgType = 'add' | 'reduce' | 'remove' | 'edit' | 'init' | 'cleanup' | 'del' | 'rottable' | 'batch' | 'disconnect' | 'clearOrder';
+
+class WebSocketManager {
+	private client : WebSocket | null = null;
+	private connected : boolean = false;
+	private shop_id = user.userInfo.shopId ? String(user.userInfo.shopId) : '';
+	private autoConnect : boolean = true;
+	private initParams : ApifoxModel = {
+		type: 'shopping',
+		account: this.shop_id || '', // 提供默认值
+		operate_type: 'init',
+		table_code: '',
+		shop_id: this.shop_id || '', // 提供默认值
+	};
+	private onMessage : (message : any) => void = () => { };
+	private messageHandlers : Map<string, ((message : string) => void)[]> = new Map();
+	private type : string = 'shopping';
+	private reconnectAttempts = 0;
+	private maxReconnectAttempts = Infinity; // 自定义最大重试次数
+	private reconnectDelay = 5000; // 重试延迟（单位：毫秒）
+	private timer : any | null = null;
+	private reconnectTimer : any | null = null
+	
+	 connectSocketSuccsss(){
+		 if(!this.client){
+			 return 
+		 }
+		this.client.onOpen(() => {
+			this.connected = true;
+			console.log("WebSocket 连接已建立");
+			console.log(this.initParams);
+			this.sendMessage(this.initParams);
+			this.clearTimer();
+			this.timer = setInterval(() => {
+				this.sendMessage({ type: "ping_interval", set: 'shopping' }, false);
+			}, 1000 * 10);
+		}) 
+		
+		this.client.onClose(() => {
+			this.clearTimer();
+			this.connected = false;
+			console.log("WebSocket 连接已断开");
+			if (this.autoConnect) {
+				this.reconnect(); // 自动重连
+			}
+		})
+		
+		this.client.onError((error : Event) => {
+			this.clearTimer();
+			console.error("WebSocket 发生错误:", error);
+			this.reconnect(); // 自动重连
+		})
+		
+		this.client.onMessage((event : MessageEvent) => {
+			try {
+				const message = JSON.parse(event.data);
+				if (message && message.msg_id) {
+					this.onMessageHandler({ msg_id: message.msg_id });
+				}
+				this.onMessage(message);
+			} catch (e) {
+				console.error("消息解析失败:", e);
+			}
+		})
+	}
+	
+	// 初始化 WebSocket 客户端
+	setupWebSocket() {
+		// #ifdef H5
+		const endpoint = "http://192.168.1.31:2348/"
+		// #endif
+		
+		// #ifdef MP-WEIXIN
+		const endpoint = "ws://192.168.1.31:2348/"
+		// #endif
+		
+		if (!endpoint) {
+			console.warn("WebSocket 已被禁用，请在配置文件中配置 VITE_APP_WS_ENDPOINT");
+			return;
+		}
+
+		if (this.client && this.connected) {
+			console.log("客户端已存在并且连接正常");
+			return this.client;
+		}
+
+		const url = qs.stringify(this.initParams);
+		// this.client =   new WebSocket(endpoint + '?' + url);
+		
+		
+		
+		this.client = uni.connectSocket({
+			url: endpoint +  url,
+			success: (res) => {
+				console.log('连接成功');
+			},
+			fail: (err) => {
+				console.error(error(err))
+				console.error('WebSocket 连接失败，尝试重连');
+			}
+		});
+		this.connectSocketSuccsss()
+		console.log('this.client');
+		console.log(this.client);
+	}
+
+	// 消息回执
+	public onMessageHandler(data : any) {
+		if (this.client && this.connected) {
+			this.client.send({data:JSON.stringify({ ...data, type: 'receipt' })});
+		}
+	}
+
+	// 订阅主题
+	public subscribeToTopic(initParams : ApifoxModel, onMessage : (message : any) => void) {
+		console.log(`正在订阅主题: `, initParams);
+		this.initParams = { ...this.initParams, ...initParams };
+		this.disconnect();
+		this.setupWebSocket();
+		this.onMessage = onMessage;
+		this.autoConnect = true
+	}
+
+	public sendMessage(message : any, isSendInitParams : boolean = true) {
+		if (!this.client || !this.connected) {
+			// ElMessage.error('发送失败,已重新连接，请重新操作');
+			this.reconnect();
+			return;
+		}
+		if (message.operate_type == 'disconnect') {
+			this.disconnect();
+			return
+		}
+		const msg = JSON.stringify(isSendInitParams ? { ...this.initParams, ...message } : message);
+		
+		try {
+			this.client?.send({data:msg});
+		} catch (error) {
+			console.error("发送消息失败:", error);
+			// ElMessage.error('发送失败,已重新连接，请重新操作');
+			this.reconnect();
+		}
+	}
+
+	public canSendMessage() {
+		return this.client && this.connected;
+	}
+
+	// 断开 WebSocket 连接
+	public disconnect() {
+		if (this.client && this.connected) {
+			console.log("断开 WebSocket 连接");
+			this.clearTimer();
+			try {
+				if(this.client){
+					this.client.closeSocket();
+				}
+			} catch (error) {
+				//TODO handle the exception
+				console.error('关闭WebSocket连接失败')
+			}
+			
+			this.client = null;
+			this.connected = false;
+			this.autoConnect = false;
+		}
+	}
+	// 自动重连机制
+	private reconnect() {
+		if (!this.autoConnect) {
+			return;
+		}
+		if (this.reconnectAttempts < this.maxReconnectAttempts) {
+			this.reconnectAttempts++;
+			console.log(`尝试第 ${this.reconnectAttempts} 次重连...`);
+			this.reconnectTimer = setTimeout(() => {
+				this.setupWebSocket();
+			}, this.reconnectDelay);
+		} else {
+			clearTimeout(this.reconnectTimer);
+			console.error("达到最大重连次数，停止重连");
+			ElMessageBox.confirm('达到最大重连次数' + this.maxReconnectAttempts + '次，已停止重连,是否立即重连？', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+
+				callback: (action : string) => {
+					console.log(action);
+					if (action == 'confirm') {
+						this.setupWebSocket();
+						this.reconnectAttempts = 0;
+					}
+				}
+			});
+		}
+	}
+
+	// 清除定时器
+	private clearTimer() {
+		if (this.timer) {
+			clearInterval(this.timer);
+			this.timer = null;
+		}
+		if (this.reconnectTimer) {
+			clearInterval(this.reconnectTimer);
+			this.reconnectTimer = null;
+		}
+	}
+}
+
+export default new WebSocketManager();
\ No newline at end of file
diff --git a/common/js/carts.js b/common/js/carts.ts
similarity index 100%
rename from common/js/carts.js
rename to common/js/carts.ts
diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue
index d7ca518..9b998a6 100644
--- a/pages/order/components/orderInfo.vue
+++ b/pages/order/components/orderInfo.vue
@@ -260,10 +260,6 @@
 </template>
 
 <script setup>
-	import {
-		useCartsStore
-	} from '@/stores/carts.js';
-	const cartStore = useCartsStore()
 	import orderItemVue from './order-item.vue';
 	import {
 		ref,
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 9c608a4..a9b6a38 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -140,8 +140,8 @@
 	} from '@/common/api/shop/index.js'
 	import {
 		useCartsStore
-	} from '@/stores/carts.js';
-	import useWebSocket from '@/common/js/carts-websocket.js';
+	} from '@/stores/carts';
+	import useWebSocket from '@/common/js/carts-websocket';
 	const cartStore = useCartsStore()
 	let cartsSocket = null
 	watch(() => cartStore.goodsIsloading, (newValue) => {
diff --git a/pages/product/components/confirmorder - 副本.vue b/pages/product/components/confirmorder - 副本.vue
new file mode 100644
index 0000000..5e4923e
--- /dev/null
+++ b/pages/product/components/confirmorder - 副本.vue	
@@ -0,0 +1,1406 @@
+<template>
+	<view>
+		<up-popup :show="confirmordershow" :round="20" :safeAreaInsetBottom="false" :zIndex="105"
+		close-on-click-overlay
+			:overlayStyle="{ zIndex: 98 }" @close="close">
+			<!-- 头部内容 -->
+			<view class="container">
+				<scroll-view scroll-y class="scroll-view">
+					<view class="head">
+						<view class="head_bg"></view>
+						<view class="tips">
+							<image class="informIcon"
+								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/informIcon.png"
+								mode="aspectFill" />
+							<text class="informText">温馨提示：请适量点餐，避免浪费</text>
+						</view>
+					</view>
+
+					<view class="card" v-if="orderinfo.detailMap">
+						<!-- 订单头部 -->
+						<view class="card_item" v-for="(value, key) in orderinfo.detailMap" :key="key">
+							<view class="head">
+								<view class="head_left">
+									<text class="placeNum">第{{key}}次下单</text>
+									<!-- <text class="placeTime">{{item.placeTime}}</text> -->
+								</view>
+							</view>
+							<!-- 订单详情 -->
+							<view class="shop-info">
+								<view class="item" v-for="item in value" :key="item.id">
+									<view class="cover">
+										<up-image width="76" height="76" radius="16" :src="item.productImg"
+											v-if="item.productId!=-999"></up-image>
+										<up-image width="76" height="76" radius="16"
+											:src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
+											mode="heightFix" v-else></up-image>
+									</view>
+									<view class="info">
+										<text class="productName">{{item.productName}}</text>
+										<text class="productSkuName"
+											v-if="item.skuName">{{item.skuName}}</text>
+									</view>
+
+									<view class="price">
+										<view class="priceAmount">
+											￥{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(item.memberPrice||item.price):item.price}}
+										</view>
+										<view class="num">x{{item.num}}</view>
+									</view>
+								</view>
+							</view>
+							<view class="semicircle_icon" v-if="index > 0">
+								<view class="semicircle_left_icon"></view>
+								<view class="semicircle_right_icon"></view>
+							</view>
+						</view>
+					</view>
+
+					<!-- 订单内容区域 -->
+					<view class="content_box">
+						<view class="content">
+							<view class="title"> {{ shopInfo.name }} </view>
+							<view class="list_item" v-for="(item,index) in cartList" :key="item.id">
+								<view class="left">
+									<image class="img" :src="item.coverImg" mode="aspectFill" />
+									<view class="center">
+										<text class="center_title"> {{item.name}} </text>
+										<text class="type" v-if="item.skuList && item.type == 'sku'">
+											<text v-for="i in item.skuList" :key="i.id">
+												{{item.cartListinfo.sku_id == i.id ? i.name :""}}
+											</text>
+										</text>
+
+										<text class="type" v-if="item.type == 'package'">
+											<text v-for="(a,b) in dataprocessing(item.cartListinfo)" :key="b">
+												<text v-for="i in a.goods" :key="i.proId" style="margin-left: 4rpx;">
+													{{i.proName }}
+												</text>
+											</text>
+										</text>
+
+										<text class="num"> X{{ ifcartNumber(item) }}</text>
+									</view>
+								</view>
+								<text class="price">
+									￥{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(item.memberPrice||item.salePrice):item.salePrice}}
+								</text>
+							</view>
+						</view>
+					</view>
+
+					<!-- 订单备注 -->
+					<view class="remark">
+						<view class="remark_bg">
+							<view class="remark_title">订单备注</view>
+							<u-textarea class="remark_value" placeholder="请填写口味、偏好等要求" :type="'textarea'"
+								v-model="remark" :clearable="true" />
+						</view>
+					</view>
+
+					<view style="width: 100%;height: 200rpx;"> </view>
+					<view class="bottom">
+						<view class="bottom_left">
+							<text style="margin-bottom: 5rpx;">实付金额</text>
+							<text class="totalAmount">￥{{ totalPrices }} </text>
+						</view>
+						<block>
+							<view class="paymentBtnText" @tap="$u.debounce(orderdetail, 500)"> 提交订单 </view>
+						</block>
+					</view>
+				</scroll-view>
+			</view>
+		</up-popup>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive,
+		defineProps,
+		computed,
+		defineEmits,
+		watch,
+		watchEffect
+	} from 'vue'
+
+	import paymentMethod from '@/components/paymentMethod.vue'; //支付方式
+
+	// 结账管理
+	import {
+		Memberpay
+	} from '@/stores/pay.js';
+
+	const storeMemberpay = Memberpay();
+
+	const props = defineProps({
+		cartList: {
+			type: Array,
+			default: []
+		},
+		cartLists_count: {
+			type: Number,
+			default: 0
+		},
+		confirmordershow: {
+			type: Boolean
+		},
+		orderinfo: {
+			type: Object,
+			default: {
+				detailMap: {}
+			}
+		},
+	});
+
+	const remark = ref('')
+
+	// 定义自定义事件
+	const emits = defineEmits(['customevent', 'close']);
+
+	const close = () => {
+		emits("close", false)
+	}
+
+	import {
+		useCartStore
+	} from '@/stores/order.js';
+
+	const cartStore = useCartStore()
+
+	const shopInfo = uni.cache.get('shopInfo')
+
+	const shopTable = uni.cache.get('shopTable')
+
+	const tableCode = uni.cache.get('tableCode')
+
+	// 开始计算费用
+
+	// 打包费
+	// const packFee = computed(() => cartStore.getTotalPackFee(props.cartList).value);
+
+	// 计算购物车商品费用
+	// const totalPrices = computed(() => cartStore.getTotalTotalPrices(props.cartList));
+
+	// 计算购物车商品费用
+	const totalPrices = computed(() => {
+		let combinedArray = [];
+		for (const key in props.orderinfo.detailMap) {
+			if (props.orderinfo.detailMap.hasOwnProperty(key)) {
+				let subArray = props.orderinfo.detailMap[key];
+				combinedArray = [...combinedArray, ...subArray]
+			}
+		}
+		// 购物车总数价格
+		let cartone = combinedArray.reduce((total, item) => {
+			// 是否启用会员价 0否1是
+			if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
+				// memberPrice会员价
+				return total + (parseFloat(item.memberPrice || item.price) * parseFloat(item.num - item
+					.returnNum));
+			} else {
+				// salePrice销售价
+				return total + (parseFloat(item.price || 0) * parseFloat(item.num - item.returnNum));
+			}
+		}, 0);
+		// 购物车总数价格
+		let cart = props.cartList.reduce((total, item) => {
+			// 是否启用会员价 0否1是
+			if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
+				// memberPrice会员价
+				return total + parseFloat(item.memberPrice || item.salePrice) * parseFloat(item
+					.cartNumber);
+			} else {
+				// salePrice销售价
+				return total + parseFloat(item.salePrice || 0) * parseFloat(item.cartNumber);
+			}
+		}, 0);
+		cart = cartone + cart
+		// 向上取整并保留两位小数
+		return parseFloat(cart.toFixed(2));
+	});
+
+	// 餐位费
+	const getTotalSeatcharge = computed(() => {
+		// 是否免除桌位费 0 否 1 是
+		let tableFeeTotals = 0
+
+		if (isTableFee == 0 && dinersNum) {
+			tableFeeTotals = parseFloat(dinersNum) * parseFloat(tableFee)
+		}
+		return parseFloat(cart.toFixed(2));
+	});
+
+	//总价格
+	const totalCost = ref(0);
+
+
+	watchEffect(() => {
+		// if (props.cartList.length > 0) {
+		// 	// 打包费  计算购物车商品费用  餐位费
+		// 	const sum = (is_type.value != 0 ? packFee.value : 0) + totalPrices.value + (is_type.value == 0 ?
+		// 		Seatcharge.value : 0);
+		// 	totalCost.value = Math.round(sum * 100) / 100;
+		// }
+	});
+
+	// 监听送餐/打包切换
+	const tabClick = (item, index) => {
+		is_type.value = index
+		// this.getchoseEatModel('tabClick', index, item);
+	}
+
+	// 支付方式切换
+	const paymentmethod = reactive({
+		radiovalue: 1,
+		paymentBtnText: "余额支付",
+		payType: ''
+	})
+	const groupChange = (e) => {
+		paymentmethod.radiovalue = e.type;
+		paymentmethod.paymentBtnText = e.name;
+		paymentmethod.payType = e.payType;
+	}
+
+	// 提交订单
+	const orderdetail = async () => {
+		if (props.cartList.length > 0) {
+			let res = await storeMemberpay.actionscreateOrder({
+				dineMode: 'dine-in', //堂食 dine-in 外带 take-out 外卖 take-away
+				seatNum: uni.cache.get('dinersNum') ? uni.cache.get('dinersNum') : '', //用餐人数
+				// packFee: packFee.value, //打包费
+				packFee: 0, //打包费
+				originAmount: totalPrices.value, //订单原金额（包含打包费） 不含折扣价格 不含餐位费
+				remark: remark.value, //备注
+				placeNum: props.orderinfo.placeNum + 1, //当前订单下单次数
+				waitCall: '', //是否等叫 0 否 1 等叫
+				orderId: props.orderinfo.id,
+				userId: uni.cache.get('userInfo').id || '' //
+			})
+			// 清空购物车
+			emits('customevent', {
+				type: 'shopping',
+				table_code: uni.cache.get('tableCode'),
+				shop_id: uni.cache.get('shopId'),
+				operate_type: 'cleanup',
+			})
+			uni.reLaunch({
+				url: '/pages/order/detail?orderId=' + res.id + '&shopId=' + uni.cache.get('shopId')
+			})
+		} else {
+			uni.reLaunch({
+				url: '/pages/order/detail?orderId=' + props.orderinfo.id + '&shopId=' + uni.cache.get(
+					'shopId')
+			})
+		}
+
+	}
+
+	const dataprocessing = computed(() => {
+		return (item) => {
+			let res = null
+			try {
+				res = JSON.parse(item.pro_group_info)
+			} catch (error) {
+				//TODO handle the exception
+			}
+			return res
+		};
+	})
+
+	const thisdata = reactive({
+		opacitys: false,
+		toplist: {
+			name: '确认订单'
+		},
+		eatModel: [],
+		isPointsChecked: false,
+		calcUsablePointsData: null,
+		order: {
+			phone: "",
+		},
+		userCouponInfos: [],
+		selectCouponData: [],
+		freeDingConfig: null,
+		cartLists: [],
+		freeCheck: false,
+		freeDisabled: false,
+		totalPrice: 0, // 小计金额
+		totalAmount: 20, // 支付金额
+		remark: "", // 备注
+		radiovalue: 1, // 支付方式
+		ispws: false, // 输入支付密码 
+		payPasswordShow: false,
+		listinfoid: null,
+		isSocket: false,
+		socketTicket: null,
+		orderAMeal: true,
+		shopId: null,
+		shopInfo: {},
+		isShow: false,
+	})
+
+	// 定义 ifcartNumber 计算属性方法
+	const ifcartNumber = computed(() => {
+		return (item) => {
+			// 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
+			if (!item || typeof item.cartNumber !== 'string') {
+				return 0;
+			}
+			let numValue = parseFloat(item.cartNumber);
+			if (isNaN(numValue)) {
+				// 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
+				return 0;
+			}
+			// type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+			if (item.type === 'weight') {
+				// 如果类型是称重重量，将值保留两位小数
+				return parseFloat(numValue.toFixed(2));
+			} else {
+				// 如果类型是整数，将值转换为整数
+				return Math.round(numValue);
+			}
+			// 如果类型不匹配，返回原始值
+			return item.cartNumber;
+		};
+	})
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		border-radius: 30rpx 30rpx 0 0;
+		max-height: 80vh;
+		overflow: auto;
+
+		.scroll-view {
+			max-height: 80vh;
+			margin-bottom: 190rpx;
+
+			.card {
+				// background-color: #fff;
+				border-radius: 20upx;
+				margin-bottom: 28upx;
+				position: relative;
+
+				.card_item {
+					display: flex;
+					flex-direction: column;
+					position: relative;
+					padding: 0 34rpx;
+
+					.head {
+						display: flex;
+						justify-content: space-between;
+						// padding: 32rpx 0;
+
+						.head_left {
+							display: flex;
+							align-items: center;
+
+							.placeNum {
+								font-weight: bold;
+								font-size: 32rpx;
+								color: #333333;
+								margin-right: 32rpx;
+								flex-shrink: 0;
+							}
+
+							.placeTime {
+								font-weight: 400;
+								font-size: 32rpx;
+								color: #666666;
+								flex-shrink: 0;
+							}
+						}
+
+					}
+
+					.shop-info {
+						border-bottom: 2rpx dashed #e5e5e5;
+
+						.item:nth-child(1) {
+							margin-top: 0;
+						}
+
+						.item {
+							margin-bottom: 32rpx;
+							display: flex;
+
+							.cover {}
+
+							.info {
+								flex: 1;
+								display: flex;
+								flex-direction: column;
+								padding-left: 16upx;
+
+								.productName {
+									font-weight: bold;
+									font-size: 28rpx;
+									color: #333333;
+									margin-top: 20rpx;
+								}
+
+								.productSkuName {
+									font-weight: 400;
+									font-size: 24rpx;
+									color: #999999;
+									display: -webkit-box;
+									-webkit-box-orient: vertical;
+									-webkit-line-clamp: 3;
+									overflow: hidden;
+									text-overflow: ellipsis;
+								}
+
+								.n {
+									font-size: 24upx;
+									color: #999;
+								}
+							}
+
+							.price {
+								display: flex;
+								flex-direction: column;
+								align-items: flex-end;
+								padding-left: 68rpx;
+
+								.priceAmount {
+									font-weight: 500;
+									font-size: 28rpx;
+									color: #333333;
+									margin-top: 26rpx;
+								}
+
+								.num {
+									font-weight: 400;
+									font-size: 24rpx;
+									color: #999999;
+									margin-top: 22rpx;
+								}
+							}
+						}
+					}
+
+					.status {
+						align-self: flex-end;
+						width: 92rpx;
+						height: 40rpx;
+						line-height: 40rpx;
+						text-align: center;
+						background: #999999;
+						border-radius: 10rpx 10rpx 10rpx 10rpx;
+						font-weight: 400;
+						font-size: 22rpx;
+						color: #FFFFFF;
+						margin-top: 32rpx;
+					}
+
+					.totalAmount {
+						width: 100%;
+						display: flex;
+						justify-content: flex-end;
+						align-items: flex-end;
+						padding: 32rpx 0;
+						border-bottom: 2rpx dashed #e5e5e5;
+
+						.label {
+							font-weight: bold;
+							font-size: 28rpx;
+							color: #333333;
+						}
+
+						.price {
+							font-weight: bold;
+							font-size: 36rpx;
+							color: #333333;
+						}
+					}
+
+					.semicircle_icon {
+						width: 100%;
+						position: absolute;
+						top: -22.5rpx;
+						left: 0;
+						display: flex;
+						justify-content: space-between;
+
+						.semicircle_left_icon {
+							width: 45rpx;
+							height: 45rpx;
+							margin-left: -22.5rpx;
+							background-color: #f9f9f9;
+							border-radius: 50%;
+							// box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
+
+						}
+
+						.semicircle_right_icon {
+							width: 45rpx;
+							height: 45rpx;
+							margin-right: -22.5rpx;
+							background-color: #f9f9f9;
+							border-radius: 50%;
+							// box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
+
+						}
+					}
+				}
+
+				.cell-item {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					padding: 32rpx 34rpx 0 34rpx;
+
+					.label {
+						font-weight: bold;
+						font-size: 32rpx;
+						color: #333333;
+						padding-bottom: 32rpx;
+					}
+
+					.val {
+						display: flex;
+						align-items: flex-end;
+						padding-bottom: 32rpx;
+						border-bottom: 2rpx dashed #e5e5e5;
+
+						view:nth-child(1) {
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #999999;
+							margin-right: 42rpx;
+						}
+
+						view:nth-child(2) {
+							display: flex;
+							align-items: flex-end;
+							font-weight: bold;
+							font-size: 36rpx;
+							color: #333333;
+						}
+					}
+
+					.val.column {
+						display: flex;
+						flex-direction: column;
+
+						.productCoupon {
+							display: flex;
+							align-items: flex-end;
+							margin: 0 0 10rpx 0;
+
+							.name {
+								font-weight: 400;
+								font-size: 26rpx;
+								color: #999;
+								margin: 0;
+							}
+
+							.num {
+								font-weight: 400;
+								font-size: 26rpx;
+								color: #999;
+								margin: 0 30rpx;
+								line-height: 20rpx;
+							}
+
+							.amount {
+								font-weight: bold;
+								font-size: 26rpx;
+								color: #333;
+							}
+						}
+					}
+				}
+
+				.favorable {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					padding: 0 30rpx;
+					box-sizing: border-box;
+					padding-bottom: 26rpx;
+					padding-top: 26rpx;
+					border-bottom: 2rpx solid #E5E5E5;
+
+					.favorable_left {
+						display: flex;
+						align-items: center;
+
+						.icon {
+							width: 40rpx;
+							height: 40rpx;
+							margin-right: 16rpx;
+						}
+
+						.name {
+							font-size: 28rpx;
+							font-weight: 400rpx;
+							color: #333;
+						}
+					}
+
+					.favorable_right {
+						display: flex;
+						align-items: center;
+
+						.favorable_right_text {
+							font-size: 24rpx;
+							color: #999;
+							font-weight: 400rpx;
+						}
+
+					}
+
+					.favorable_right {
+						.column {
+							display: flex;
+							flex-direction: column;
+							align-items: flex-end;
+
+							.favorable_right_text {
+								margin-bottom: 10rpx;
+
+								text:nth-child(1) {
+									font-size: 26rpx;
+									color: #999;
+								}
+
+								text:nth-child(2) {
+									font-size: 26rpx;
+									color: #999;
+									margin: 0 30rpx;
+								}
+
+								text:nth-child(3) {
+									font-size: 26rpx;
+									color: #333;
+
+								}
+							}
+						}
+					}
+
+					.favorable_right.column {
+						align-items: flex-start;
+					}
+				}
+
+				.favorable.column {
+					align-items: flex-start;
+				}
+
+				.cell-item.column {
+					align-items: flex-start;
+				}
+
+				.total-wrap {
+					width: 100%;
+					display: flex;
+					justify-content: flex-end;
+					align-items: flex-end;
+					padding: 0 34rpx;
+					font-weight: bold;
+					font-size: 28rpx;
+					color: #333333;
+					margin-top: 64rpx;
+
+					.price {
+						font-weight: bold;
+						font-size: 36rpx;
+					}
+				}
+
+
+
+				.order_footer {
+					display: flex;
+					flex-direction: column;
+					padding: 34rpx;
+					position: relative;
+
+
+
+				}
+
+
+			}
+
+			.head {
+				width: 100%;
+				padding: $uni-spacing-row-base;
+				box-sizing: border-box;
+				position: relative;
+
+				.head_bg {
+					height: 456rpx;
+					// background: linear-gradient(180deg, #E8AD7B 0%, #F5F5F5 100%);
+					position: absolute;
+					left: 0;
+					right: 0;
+					top: 0;
+					margin: auto;
+				}
+
+				.tips {
+					width: 100%;
+					height: 64rpx;
+					line-height: 64rpx;
+					background: #FFF8E8;
+					border-radius: 8rpx 8rpx 8rpx 8rpx;
+					padding: 0 16rpx;
+					box-sizing: border-box;
+					position: relative;
+					z-index: 1;
+					display: flex;
+					align-items: center;
+
+					.informIcon {
+						width: 26.79rpx;
+						height: 24.06rpx;
+						margin-right: 8rpx;
+					}
+
+					.informText {
+						font-size: $uni-font-size-base;
+						color: #FF803D;
+						font-weight: 400;
+					}
+				}
+
+				.tabBox {
+					width: 100%;
+					margin-top: 52rpx;
+					position: relative;
+					z-index: 1;
+
+					.tab {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						border-radius: 22rpx 22rpx 0 0;
+						background-color: $uni-bg-color;
+
+						.tab_item {
+							width: 50%;
+							height: 90rpx;
+							line-height: 90rpx;
+							display: flex;
+							align-items: center;
+							padding-left: 30rpx;
+							box-sizing: border-box;
+							background-color: #FEFBF8;
+							border-radius: 22rpx 22rpx 0 0;
+							position: relative;
+
+							.title {
+								font-weight: 500;
+								font-size: 28rpx;
+								color: #999999;
+								position: relative;
+								z-index: 1;
+							}
+
+							.title.active {
+								color: #E8AD7B;
+							}
+
+							.icon {
+								width: 48rpx;
+								height: 48rpx;
+								margin-right: 16rpx;
+								position: relative;
+								z-index: 1;
+							}
+						}
+
+						.tab_item.active {
+							background-color: #fff;
+						}
+
+						// .tab_item.active:after {
+						//  content: "";
+						//          position: absolute;
+						//          top: 0;
+						//          left: -4px;
+						//          width: 40px;
+						//          height: 26px;
+						//          background: orange;
+						// }
+						.tab_item.active:before {
+							content: "";
+							position: absolute;
+							top: -20rpx;
+							left: 0;
+							right: 0;
+							bottom: 0;
+							border-radius: 2px;
+							background: #fff;
+							transform: skewX(0deg);
+						}
+
+						.tab_item1.active:before {
+							border-radius: 22rpx 40rpx 0 0;
+						}
+
+						.tab_item2.active:before {
+							border-radius: 40rpx 22rpx 0 0;
+						}
+					}
+
+					.table {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						padding: 0 30rpx;
+						box-sizing: border-box;
+						height: 90rpx;
+						background-color: $uni-bg-color;
+						border-radius: 0 0 22rpx 22rpx;
+
+						.table_left {
+							display: flex;
+							align-items: center;
+
+							.icon {
+								width: 32.86rpx;
+								height: 39.07rpx;
+								margin-right: 24rpx;
+							}
+
+							.title {
+								display: flex;
+								align-items: center;
+								color: #E8AD7B;
+							}
+						}
+
+						.value {
+							font-weight: 500;
+							font-size: 32rpx;
+							color: #333333;
+						}
+					}
+
+					.pack {
+						display: flex;
+						flex-direction: column;
+						padding: 30rpx;
+						box-sizing: border-box;
+						background-color: $uni-bg-color;
+						border-radius: 0 0 22rpx 22rpx;
+
+						.top {
+							display: flex;
+							flex-direction: column;
+							margin-top: 8rpx;
+
+							.title {
+								font-size: 28rpx;
+								color: #333;
+								font-weight: bold;
+								margin-bottom: 16rpx;
+							}
+
+							.address {
+								font-size: 24rpx;
+								font-weight: 400;
+								color: #999;
+							}
+						}
+
+						.list {
+							display: flex;
+							flex-direction: column;
+
+							.item {
+								height: 70rpx;
+								display: flex;
+								align-items: center;
+								justify-content: space-between;
+								font-size: 28rpx;
+
+								.lable {
+									color: #666;
+									font-weight: 500;
+								}
+
+								.getPhone {
+									display: flex;
+									align-items: center;
+
+									.u-input {
+										width: 340rpx;
+										border: none;
+
+										input {
+											font-size: 24rpx;
+											color: #333;
+
+										}
+
+										.input-placeholder {
+											font-size: 24rpx;
+										}
+									}
+								}
+
+								.text,
+								.getBtn {
+									color: #E8AD7B;
+								}
+
+								.getBtn {
+									border-radius: 12rpx;
+									border: 2rpx solid #E8AD7B;
+									padding: 8rpx 20rpx;
+									box-sizing: border-box;
+								}
+							}
+						}
+
+					}
+				}
+
+				.addDish {
+					width: 176rpx;
+					height: 56rpx;
+					line-height: 56rpx;
+					text-align: center;
+					background: #FFF8E8;
+					border-radius: 28rpx 28rpx 28rpx 28rpx;
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #333333;
+					position: relative;
+					z-index: 1;
+				}
+
+				.tabBox_t {
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #333333;
+					padding: 32rpx 24rpx;
+					background-color: #fff;
+					border-radius: 18rpx;
+					display: flex;
+					flex-direction: column;
+					position: relative;
+					z-index: 1;
+					margin-top: 32rpx;
+				}
+
+				.shopName {
+					margin-bottom: 16rpx;
+				}
+
+				.tableName {
+					display: flex;
+
+					.name {
+						margin-right: 16rpx;
+					}
+
+					.num {
+						border-left: 2rpx solid #d6d6d6;
+						padding-left: 16rpx;
+					}
+				}
+
+
+
+			}
+
+			.content_box {
+				padding: 0 20rpx;
+				box-sizing: border-box;
+				margin-top: 10rpx;
+				position: relative;
+				z-index: 1;
+
+				.content {
+					background-color: $uni-bg-color;
+					border-radius: 22rpx;
+					display: flex;
+					flex-direction: column;
+					padding: 30rpx 0;
+					box-sizing: border-box;
+
+					.title {
+						font-size: 28rpx;
+						color: #666;
+						margin-bottom: 32rpx;
+						padding: 0 30rpx;
+						box-sizing: border-box;
+					}
+
+					.list_item {
+						display: flex;
+						align-items: center;
+						margin-bottom: 32rpx;
+						padding: 0 30rpx;
+						box-sizing: border-box;
+
+						.left {
+							width: 100%;
+							display: flex;
+							align-items: flex-start;
+
+							.img {
+								width: 142rpx;
+								height: 142rpx;
+								margin-right: 34rpx;
+								flex-shrink: 0;
+								border-radius: 20rpx;
+							}
+
+							.center {
+								width: 100%;
+								display: flex;
+								flex-direction: column;
+								align-items: flex-start;
+
+								.center_title {
+									font-size: 32rpx;
+									font-weight: 500;
+									color: #333;
+								}
+
+								.type {
+									margin: 12rpx 0 10rpx 0;
+								}
+
+								.type,
+								.num {
+									font-size: 24rpx;
+									color: #999;
+								}
+
+							}
+						}
+
+						.num {
+							font-size: 24rpx;
+							color: #999;
+						}
+
+						.price {
+							font-size: 32rpx;
+							color: #333;
+							font-weight: 500;
+						}
+					}
+
+					.cell_item {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						margin-bottom: 32rpx;
+						padding: 0 30rpx;
+
+						.lable {
+							font-weight: 500;
+							font-size: 28rpx;
+							color: #333333;
+						}
+
+						.value {
+							display: flex;
+							align-items: flex-end;
+
+							view:nth-child(1) {
+								font-weight: 400;
+								font-size: 24rpx;
+								color: #999999;
+								margin-right: 16rpx;
+							}
+
+							view:nth-child(2) {
+								font-weight: bold;
+								font-size: 28rpx;
+								color: #333333;
+							}
+						}
+					}
+
+					.favorable {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						padding: 0 30rpx;
+						box-sizing: border-box;
+						padding-bottom: 26rpx;
+						padding-top: 26rpx;
+						border-bottom: 2rpx solid #E5E5E5;
+
+						.favorable_left {
+							display: flex;
+							align-items: center;
+
+							.icon {
+								width: 40rpx;
+								height: 40rpx;
+								margin-right: 16rpx;
+							}
+
+							.name {
+								font-size: 28rpx;
+								font-weight: 400rpx;
+								color: #333;
+							}
+						}
+
+						.favorable_right {
+							display: flex;
+							align-items: center;
+
+							.favorable_right_text {
+								font-size: 24rpx;
+								color: #999;
+								font-weight: 400rpx;
+							}
+
+						}
+
+						.favorable_right {
+							>.column {
+								display: flex;
+								flex-direction: column;
+								align-items: flex-end;
+
+								.favorable_right_text {
+									margin-bottom: 10rpx;
+
+									text:nth-child(1) {
+										font-size: 26rpx;
+										color: #999;
+									}
+
+									text:nth-child(2) {
+										font-size: 26rpx;
+										color: #999;
+										margin: 0 30rpx;
+									}
+
+									text:nth-child(3) {
+										font-size: 26rpx;
+										color: #333;
+
+									}
+								}
+							}
+						}
+
+						.favorable_right.column {
+							align-items: flex-start;
+						}
+					}
+
+					.favorable.column {
+						align-items: flex-start;
+					}
+
+					.cell-item {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						padding: 32rpx 34rpx 32rpx 34rpx;
+
+						.label {
+							font-weight: bold;
+							font-size: 32rpx;
+							color: #333333;
+						}
+
+						.val {
+							display: flex;
+							align-items: flex-end;
+
+							view:nth-child(1) {
+								font-weight: 400;
+								font-size: 24rpx;
+								color: #999999;
+								margin-right: 42rpx;
+							}
+
+							view:nth-child(2) {
+								display: flex;
+								align-items: flex-end;
+								font-weight: bold;
+								font-size: 36rpx;
+								color: #333333;
+							}
+						}
+
+					}
+
+					.totalPrice {
+						padding: 32rpx 30rpx;
+						box-sizing: border-box;
+						// border-top: 2rpx solid #E5E5E5;
+						display: flex;
+						justify-content: flex-end;
+						align-items: flex-end;
+						font-size: 32rpx;
+						color: #333;
+						font-weight: bold;
+
+						.totalPriceNum {
+							font-size: 40rpx;
+						}
+					}
+				}
+			}
+
+			// 备注
+			.remark {
+				padding: 0 20rpx;
+				margin-top: 32rpx;
+
+				.remark_bg {
+					background-color: $uni-bg-color;
+					border-radius: 22rpx;
+					padding: 32rpx 30rpx;
+					box-sizing: border-box;
+
+					.remark_title {
+						font-size: 32rpx;
+						color: #333;
+						font-weight: 500;
+						margin-bottom: 16rpx;
+					}
+
+					.u-textarea {
+						height: 148rpx;
+						background-color: #f5f5f5;
+						border-radius: 10rpx;
+						padding: 32rpx 22rpx !important;
+						box-sizing: border-box;
+
+						textarea {
+							font-size: 24rpx;
+						}
+					}
+
+				}
+			}
+
+
+
+
+
+			.bottom {
+				width: 100%;
+				background: #FFFFFF;
+				box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1);
+				position: fixed;
+				bottom: 0;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 32rpx 50rpx 82rpx 50rpx;
+				box-sizing: border-box;
+				z-index: 9;
+
+				.bottom_left {
+					display: flex;
+					font-size: 28rpx;
+					font-weight: 500;
+					color: #333;
+					align-items: flex-end;
+
+					.totalAmount {
+						font-size: 40rpx;
+						font-weight: bold;
+						margin-top: 5rpx;
+					}
+				}
+
+				.paymentBtnText {
+					background: #E8AD7B;
+					border-radius: 36rpx;
+					font-weight: 400;
+					font-size: 32rpx;
+					color: #FFFFFF;
+					padding: 14rpx 44rpx;
+				}
+			}
+
+			.page-total {
+				position: inherit;
+			}
+
+			.pay-info-wrap {
+				padding: 0;
+				box-sizing: border-box;
+
+				.info-wrap {
+					padding: 64rpx 30rpx 30rpx 30rpx;
+					box-sizing: border-box;
+
+					.title {
+						align-self: center;
+						font-size: 32rpx;
+						color: #333;
+						font-weight: bold;
+					}
+				}
+
+				.info-content {
+					.pay-title {
+						display: flex;
+						align-items: flex-end;
+						justify-content: center;
+						font-weight: bold;
+						width: 100%;
+						font-size: 48rpx;
+						color: #333;
+						margin-top: 48rpx;
+
+						text {
+							font-size: 60rpx;
+							color: #333;
+						}
+					}
+
+					.pay-password {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						margin-top: 64rpx;
+
+						.list {
+							width: 88rpx;
+							height: 88rpx;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							border: 2rpx solid #999;
+							border-radius: 8rpx;
+
+							text {
+								font-size: 32rpx;
+							}
+						}
+
+					}
+
+					.hint {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 100%;
+						height: 100rpx;
+
+						text {
+							font-size: 28rpx;
+							color: #ccc;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/product/components/shoppingCartes.vue b/pages/product/components/shoppingCartes.vue
index 04c9986..6115b13 100644
--- a/pages/product/components/shoppingCartes.vue
+++ b/pages/product/components/shoppingCartes.vue
@@ -3,13 +3,6 @@
 		<up-popup :show="showCart" :round="20" :safeAreaInsetBottom="false" :zIndex="98" :overlayStyle="{ zIndex: 98 }"
 			@close="close">
 			<view class="cart-list-wrap">
-				<!-- 	<view class="cart-header flex-between">
-					<view class="num">已点 {{ cartLists_count }} 份</view>
-					<view class="clear" @click="cartclear">
-						<up-icon name="trash" color="#999"></up-icon>
-						<text class="t">清空</text>
-					</view>
-				</view> -->
 				<scroll-view scroll-y class="scroll-view">
 					<view class="list-wrap">
 						<view v-if="cartList.length>0">
@@ -29,15 +22,15 @@
 										<up-image :src="item.coverImg" width="80" radius="10" height="80"></up-image>
 									</view>
 									<view class="info">
-										<view class="name"> {{item.cartListinfo.is_temporary == 1?'临时菜' :item.name }}
+										<view class="name"> {{item.is_temporary == 1?'临时菜' :item.name }}
 										</view>
 										<view class="select-sku-wrap" v-if="item.type == 'sku'">
-											<text v-for="i in item.skuList" :key="i.id">
-												{{item.cartListinfo.sku_id == i.id? i.name:"" }}
+											<text >
+												{{item.skuData.name||''}}
 											</text>
 										</view>
 										<view class="select-sku-wrap" v-if="item.type == 'package'">
-											<view v-for="(a,b) in dataprocessing(item.cartListinfo)" :key="b">
+											<view v-for="(a,b) in dataprocessing(item)" :key="b">
 												<!-- <view>{{a.title}}</view> -->
 												<text v-for="i in a.goods" :key="i.proId" style="margin-left: 4rpx;">
 													{{i.proName }}
@@ -47,15 +40,14 @@
 										<view class="price-wrap" style="padding-top: 0;">
 											<view class="price">
 												<text class="i">￥</text>
-												<!-- 会员价与价格 -->
-												<text class="price" v-if="item.type == 'sku'">
-													<text v-for="i in item.skuList" :key="i.id">
-														<!--  -->
-														{{item.cartListinfo.sku_id == i.id?(shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(i.memberPrice || i.salePrice):i.salePrice):''}}
+												<!-- 会员价 -->
+												<text class="price" v-if="shopInfo.isVip ==1 && shopInfo.isMemberPrice==1">
+													<text >
+														{{item.memberPrice || item.salePrice}}
 													</text>
 												</text>
 												<text class="price" v-else>
-													{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(item.memberPrice || item.salePrice):item.salePrice}}
+													{{item.salePrice}}
 												</text>
 												<!-- <text class="originalprice"
 													v-if="item.originPrice">¥{{item.originPrice}}</text>
@@ -66,16 +58,16 @@
 											<view class="operation-wrap">
 												<view class="btn">
 													<up-icon color="#E8AD7B" name="minus-circle" size="25"></up-icon>
-													<view class="btnClick" @click="cartListadd(item,'-')"></view>
+													<view class="btnClick" @click="changeNumber(-1,item)"></view>
 												</view>
-												<text class="num">{{ ifcartNumber(item) }}</text>
+												<text class="num">{{ item.number*1 }}</text>
 												<view class="btn" v-if="item.type !='package'">
 													<!-- <up-icon name="plus-circle-fill"
 														:color="{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1? '#CECECE' : '#E9AB7A'"
 														size="25"></up-icon> -->
 													<up-icon name="plus-circle-fill" color="#E8AD7B"
 														size="25"></up-icon>
-													<view class="btnClick" @click="cartListadd(item,'+')"></view>
+													<view class="btnClick" @click="changeNumber(1,item)"></view>
 												</view>
 											</view>
 										</view>
@@ -104,7 +96,7 @@
 	} from '@/stores/user.js';
 
 	// 定义自定义事件
-	const emits = defineEmits(['customevent', 'close', 'clickcancelOrder']);
+	const emits = defineEmits(['changeNumber', 'close', 'clearCarts']);
 
 	const props = defineProps({
 		cartList: {
@@ -127,54 +119,16 @@
 	});
 	const shopInfo = uni.cache.get('shopInfo')
 
-	// 定义 ifcartNumber 计算属性方法
-	const ifcartNumber = computed(() => {
-		return (item) => {
-			// 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
-			if (!item || typeof item.cartNumber !== 'string') {
-				return 0;
-			}
-			let numValue = parseFloat(item.cartNumber);
-			if (isNaN(numValue)) {
-				// 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
-				return 0;
-			}
-			// type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-			if (item.type === 'weight') {
-				// 如果类型是称重重量，将值保留两位小数
-				return parseFloat(numValue.toFixed(2));
-			} else {
-				// 如果类型是整数，将值转换为整数
-				return Math.round(numValue);
-			}
-			// 如果类型不匹配，返回原始值
-			return item.cartNumber;
-		};
-	})
+
 
 	const close = () => {
 		emits("close", false)
 	}
-	// 购物车加减
-	const cartListadd = async (item, i) => {
-		// 是否起售 如果小于或者大于都是1
-		const cartNumberFloat = parseFloat(item.cartNumber);
-		const suitNum = item.suitNum >= cartNumberFloat && i == '-' ? item.cartNumber : 1;
+	function changeNumber(step,item){
+		  emits("changeNumber", step, item);
 
-		emits('customevent', {
-			id: item.cartListId ? item.cartListId : '',
-			type: 'shopping',
-			table_code: uni.cache.get('tableCode'),
-			shop_id: uni.cache.get('shopId'),
-			operate_type: calculateValue(item.cartNumber, i, suitNum) == 'del' ? 'del' : item.cartListId &&
-				item.cartNumber > 0 ? 'edit' : 'add',
-			product_id: item.id,
-			sku_id: item.skuId,
-			number: await calculateValue(item.cartNumber, i, suitNum),
-			is_print: 1,
-			suitNum: item.suitNum,
-		})
 	}
+	
 
 	const dataprocessing = computed(() => {
 		return (item) => {
@@ -188,18 +142,6 @@
 		};
 	})
 
-	const clickcancelOrder = (i, key) => {
-		emits('clickcancelOrder', {
-			i,
-			key
-		})
-		emits('customevent', {
-			type: 'shopping',
-			table_code: uni.cache.get('tableCode'),
-			shop_id: uni.cache.get('shopId'),
-			operate_type: 'clearOrder',
-		})
-	}
 
 	const calculateValue = (cartNumber, i, step = 1) => {
 		if (i == '+') {
@@ -212,30 +154,10 @@
 		}
 	}
 
-	// 菜品备注修改
-	const productBlur = (item) => {
-		let params = {
-			"skuId": item.skuId,
-			"num": item.number, //数量
-			"type": item.type,
-			"isVip": item.isVip,
-			"productId": item.productId, //商品id
-			"note": item.note,
-			"shopId": this.shopId,
-			"userId": uni.cache.get('userInfo').id,
-			"tableId": this.tableCode,
-		}
-		this.$emit("addCart", params)
-	}
 
 	// 清空购物车
 	const cartclear = () => {
-		emits('customevent', {
-			type: 'shopping',
-			table_code: uni.cache.get('tableCode'),
-			shop_id: uni.cache.get('shopId'),
-			operate_type: 'cleanup',
-		})
+		emits('clearCarts')
 	}
 </script>
 
diff --git a/pages/product/index - 副本.vue b/pages/product/index - 副本.vue
new file mode 100644
index 0000000..369daa9
--- /dev/null
+++ b/pages/product/index - 副本.vue	
@@ -0,0 +1,2631 @@
+<template>
+	<view>
+		<Nav />
+		<!-- 顶部面板 -->
+		<view class="top--panel" :class="{ 'grayscale':!isBusinessTime }">
+			<image class="panelimgbackground"
+				:src="shopExtend?shopExtend.value:'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png'"
+				mode="aspectFill">
+			</image>
+			<view class="panelone flex-start">
+				<view class="u-flex u-flex-y-center">
+					<text>
+						{{ shopInfo.shopName }}
+					</text>
+					<view class="u-flex u-flex-y-center u-m-t-4">
+						<up-icon name="arrow-right" color="#999999" size="14"></up-icon>
+					</view>
+				</view>
+				<!-- <up-icon name="arrow-right" color="#999999" size="14"></up-icon> -->
+			</view>
+			<view class="paneltow" v-if="distance">
+				距离您{{ distance }}
+			</view>
+			<view class="panelthere flex-between">
+				<view class="paneltheretext">
+					营业时间：{{ (shopInfo.businessStartDay || '--') +' 至 '+ (shopInfo.businessEndDay || '--')}}
+					{{endTimeref.startTime}} -
+					{{endTimeref.endTime < '05'?` 凌晨${endTimeref.endTime}`:endTimeref.endTime}}
+				</view>
+				<view class="flex-start" @click="callChildMethod">
+					<view style="margin-right: 14rpx;">查看</view>
+					<up-icon name="arrow-down" color="#999999" size="14"></up-icon>
+				</view>
+			</view>
+			<!-- 本店招牌菜 -->
+			<view class="panelfour" v-if="shopProductList.hots && shopProductList.hots.length > 0">
+				本店招牌菜
+			</view>
+			<view class="panelfive ">
+
+				<scroll-view :scroll-x="true" :scroll-with-animation="false">
+					<view class="panelfive_list">
+						<view class="panelfiveitem" @click="clickspecifications(item,index,index,'热销')"
+							v-for="(item,index) in shopProductList.hots" :key="index">
+							<image class="panelfiveitemimage" :src="item.coverImg" mode="aspectFill"></image>
+							<view class="vifgoodsImg flex-center"
+								v-if="item.isSale == 0 || (item.isSaleTime == 0 && !item.isSaleTimeshow) || item.isSoldStock == 1 || (item.isStock == 1 && item.stockNumber <= 0)">
+								<image v-if="item.isSale == 0" src="@/static/ztt/icon_goods_yxj.svg"
+									style="width:200rpx; height: 100%;" mode=""></image>
+								<image v-else-if="(item.isSaleTime == 0 && !item.isSaleTimeshow)"
+									src="@/static/ztt/icon_goods_wks.svg" style="width:200rpx; height: 100%;" mode="">
+								</image>
+								<image v-else-if="item.isSoldStock == 1" src="@/static/ztt/icon_goods_sq.svg"
+									style="width:200rpx; height: 100%;" mode=""></image>
+								<image v-else-if="item.isStock == 1 && item.stockNumber <= 0"
+									src="@/static/ztt/icon_goods_kcbz.svg" style="width:200rpx; height: 100%;" mode="">
+								</image>
+							</view>
+							<view class="panelfiveitemone">
+								{{ item.name }}
+							</view>
+							<view class="panelfiveitemtow">
+								本店回头客第{{index+1}}名
+							</view>
+							<view class="panelfiveitemthere flex-between">
+								<text>招牌</text>
+								<view class="describe" v-if="item.suitNum>1 && item.type!= 'sku'"
+									style="font-size: 20rpx;margin-top: 10rpx;">
+									「{{item.suitNum}}{{item.unitName}}起点」
+								</view>
+							</view>
+
+							<!-- <view class="panelfiveitemfour">
+								{{item.shortTitle?item.shortTitle:''}}
+							</view>
+							<view class="panelfiveitemfive">
+								月售{{item.stockNumber}}
+							</view> -->
+							<view v-if="item.isSoldStock == 1 || (item.isSaleTime == 0 && !item.isSaleTimeshow)"
+								class="flex-between" style="margin-top: 32rpx;margin-bottom: 48rpx;">
+								<view class="panelfiveitemsex flex-between">
+									<view class="panelfiveitemsex_oen">
+										<text class="tips"
+											:class="shopInfo.isVip == 0 || shopInfo.isMemberPrice==0?'lineThrough':''">¥</text>
+										<!-- 会员价与价格 -->
+										<text class="price">
+											{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(item.memberPrice||item.salePrice):item.salePrice}}
+										</text>
+										<!-- 单位 -->
+										<text class="unit" v-if="item.unitName">/{{item.unitName}}</text>
+									</view>
+								</view>
+								<view class="panelfiveitemNum">
+									<view class="sku-wrap flex-center" style="background-color: #CECECE;">
+										<text class="t" v-if="(item.isSaleTime == 0 && !item.isSaleTimeshow)">未开售</text>
+										<text class="t" v-if="item.isSoldStock == 1">已售罄</text>
+									</view>
+								</view>
+							</view>
+
+							<view v-else class="flex-between"
+								style="margin-top: 32rpx;margin-bottom: 48rpx; flex-wrap: inherit">
+								<view class="panelfiveitemsex flex-between">
+									<view class="panelfiveitemsex_oen">
+										<text class="tips"
+											:class="shopInfo.isVip ==0 || shopInfo.isMemberPrice==0?'lineThrough':''">¥</text>
+										<!-- 会员价与价格 -->
+										<text class="price">
+											{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(item.memberPrice|| item.salePrice):item.salePrice}}
+										</text>
+										<text class="unit" v-if="item.unitName">/{{item.unitName}}</text>
+										<!-- <text v-if="item.suitNum>1 && item.type!= 'sku'"
+											style="font-size: 16rpx;">「{{item.suitNum}}{{item.unitName}}起点」</text> -->
+									</view>
+								</view>
+								<!-- single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券 -->
+								<view class="panelfiveitemNum">
+									<!-- v-if="item.type == 'single'|| item.type == 'weight' || item.type == 'coupon' || (item.type == 'package' && item.groupType=='0')" -->
+									<view class="sku-wrap flex-center"
+										v-if="item.type == 'sku' || (item.type == 'package' && item.groupType == '1')"
+										@click.stop="clickspecifications(item,index,index1)">
+										<text class="t" v-if="item.groupType == '1'">选择套餐</text>
+										<text class="t" v-else>选规格</text>
+										<text class="dot num"
+											v-if="item.cartNumber >0">{{ ifcartNumber(item) <99?ifcartNumber(item):'99+'}}</text>
+									</view>
+									<view class="Controls" v-else>
+										<view class="btn" v-if="item.cartNumber != '0'">
+											<up-icon name="minus-circle-fill" color="#E9AB7A" size="25"></up-icon>
+											<view class="btnClick"
+												@tap.stop="$u.throttle(() => singleclick(item, '-'), 500)">
+											</view>
+										</view>
+										<text class="num"> {{ ifcartNumber(item)  }} </text>
+										<view class="btn">
+											<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
+											<view class="btnClick"
+												@tap.stop="$u.throttle(() => singleclick(item, '+'), 500)">
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+
+		<!-- 滚动区域 -->
+		<view class="scroll-panel " id="scroll-panel" :class="{ 'grayscale':!isBusinessTime }">
+			<view class="list-box">
+				<view class="left" :style="{top: `${store.height}px`}">
+					<scroll-view :scroll-into-view="leftIntoView" :scroll-with-animation="false" :scroll-y="true"
+						:style="{height:`${store.screenHeight - store.height}px`}" style="padding-bottom: 200rpx;">
+						<view class="item" v-for="(item,index) in shopProductList.productInfo" :key="index"
+							:class="{ 'active':index==leftIndex }" :id="'left-'+index" :data-index="index"
+							@click="leftTap(index)"><text>{{item.name}}</text></view>
+					</scroll-view>
+				</view>
+				<view class="main">
+					<view>
+						<view class="item main-item" v-for="(item,index) in shopProductList.productInfo" :key="index"
+							:id="'item-'+index">
+							<view class="title">
+								<view>{{item.name}}</view>
+							</view>
+							<view class="goods" @click="clickspecifications(item1,index,index1)"
+								v-for="(item1,index1) in item.productList" :key="index1">
+								<image class="goodsImg" v-if="item1.coverImg!=null" :lazy-load="true"
+									@load="imageLoaded(item1,index,index1)"
+									:src="`${item1.coverImg}${!item1.imgLoad?'?x-oss-process=image/resize,m_lfit,w_150,h_150':''}`"
+									mode="aspectFill"></image>
+								<image class="goodsImg"
+									src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/1.gif" mode="" v-else
+									:lazy-load="true">
+								</image>
+								<view class="vifgoodsImg"
+									v-if="item1.isSale == 0 || (item1.isSaleTime == 0 && !item1.isSaleTimeshow) || item1.isSoldStock == 1 || (item1.isStock == 1 && item1.stockNumber <= 0)">
+									<image v-if="item1.isSale == 0" src="@/static/ztt/icon_goods_yxj.svg"
+										style="width:200rpx; height: 100%;" mode=""></image>
+									<image v-else-if="(item1.isSaleTime == 0 && !item1.isSaleTimeshow)"
+										src="@/static/ztt/icon_goods_wks.svg" style="width:200rpx; height: 100%;"
+										mode=""></image>
+									<image v-else-if="item1.isSoldStock == 1" src="@/static/ztt/icon_goods_sq.svg"
+										style="width:200rpx; height: 100%;" mode=""></image>
+									<image v-else-if="item1.isStock == 1 && item1.stockNumber <= 0"
+										src="@/static/ztt/icon_goods_kcbz.svg" style="width:200rpx; height: 100%;"
+										mode=""></image>
+								</view>
+								<view v-if="index=='0'" class="topSort" :class="'c'+(index1+1)">TOP{{index1+1}}</view>
+								<view class="goods_right" style="overflow: hidden;">
+									<view class="name">{{ item1.name }}</view>
+									<!-- <view class="lookBack" v-if="index=='0'">本店销量第{{index1+1}}名</view>-->
+									<view class="lookBack" v-if="specifications.item.isHot == 1">热销</view>
+									<view class="describe"> {{item1.shortTitle?item1.shortTitle:''}} </view>
+
+									<view class="describe" v-if="item1.suitNum>1 && item1.type!= 'sku'"
+										style="font-size: 20rpx;">
+										「{{item1.suitNum}}{{item1.unitName}}起点」
+									</view>
+									<view
+										v-if="item1.isSoldStock == 1 || (item1.isSaleTime == 0 && !item1.isSaleTimeshow)"
+										class="flex-between">
+										<view class="money">
+											<view>￥</view>
+											<text class="money_num" style="margin-right: 10rpx;">
+												{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1 ?(item1.memberPrice||item1.salePrice):item1.salePrice}}
+											</text>
+											<text v-if="item1.unitName">/{{item1.unitName}}</text>
+										</view>
+										<view class="flex-end">
+											<view class="sku-wrap flex-center" style="background-color: #CECECE;">
+												<text class="t"
+													v-if="(item1.isSaleTime == 0 && !item1.isSaleTimeshow)">未开售</text>
+												<text class="t" v-else-if="item1.isSoldStock == 1">已售罄</text>
+											</view>
+										</view>
+									</view>
+									<view v-else class="flex-between" style="flex-wrap: inherit;">
+										<view class="money">
+											<view>￥</view>
+											<text class="money_num">
+												{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(item1.memberPrice||item1.salePrice):item1.salePrice}}
+											</text>
+											<text class="money_num" v-if="item1.unitName">/{{item1.unitName}}</text>
+											<!-- <text v-if="item1.suitNum>1 && item1.type!= 'sku'"
+												style="font-size: 14rpx;">
+												「{{item1.suitNum}}{{item1.unitName}}起点」
+											</text> -->
+										</view>
+										<view class="flex-end"
+											v-if="item1.type == 'sku' || (item1.type == 'package' && item1.groupType == '1')">
+											<view class="sku-wrap flex-center"
+												@click.stop="clickspecifications(item1,index,index1)">
+												<text class="t" v-if="item1.groupType == '1'">选择套餐</text>
+												<text class="t" v-else>选规格</text>
+												<text class="dot num"
+													v-if="item1.cartNumber >0">{{ ifcartNumber(item1) <99?ifcartNumber(item1):'99+'}}</text>
+											</view>
+										</view>
+										<view class="Controls" v-else>
+											<view class="btn" v-if="item1.cartNumber != '0'">
+												<up-icon name="minus-circle-fill" color="#E9AB7A" size="25"></up-icon>
+												<view class="btnClick"
+													@tap.stop="$u.throttle(() => singleclick(item1, '-'), 500)">
+												</view>
+											</view>
+
+											<text class="num"> {{ ifcartNumber(item1) }} </text>
+											<view class="btn">
+												<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
+												<view class="btnClick"
+													@tap.stop="$u.throttle(() => singleclick(item1, '+'), 500)">
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="fill-last" :style="{ 'height':fillHeight + 'px' }"></view>
+					</view>
+				</view>
+			</view>
+
+
+		</view>
+
+		<confirmorder ref="confirmorderref" :cartLists_count="cartLists_count" :cartList="matchedProducts"
+			:totalPrices='totalPrices' :confirmordershow="confirmordershow"
+			@close="confirmordershow = !confirmordershow" @customevent='websocketsendMessage' :orderinfo="orderinfo">
+		</confirmorder>
+
+		<!-- 店铺详情 -->
+		<shopindex ref="showShopInfoRef"></shopindex>
+		<!-- 购物车 -->
+		<shoppingCartes :cartLists_count="cartLists_count" :cartList="matchedProducts" :showCart="showCart"
+			@customevent='websocketsendMessage' @close="showCart = !showCart" :orderinfo="orderinfo"
+			@clickcancelOrder='clickcancelOrder' v-if="cartLists_count > 0">
+		</shoppingCartes>
+
+		<!-- 显示购物车栏 -->
+		<view class="cart-wrap" v-if="cartLists_count > 0 && !confirmordershow && isBusinessTime">
+			<view class="cart-content">
+				<view class="left">
+					<view class="iconBox">
+						<image class="icon"
+							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/shopIcon.png"
+							mode="aspectFill" @click="Historicalorders(true)">
+						</image>
+						<text class="u-badge"> {{cartLists_count<99?cartLists_count:'99+'}} </text>
+					</view>
+
+					<text class="i">￥</text>
+					<text class="num">{{totalPrices}}</text>
+				</view>
+				<view class="btn" @tap="$u.debounce(orderdetail, 500)">
+					<text class="t">结算</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 规格 -->
+		<up-popup :show="showShopsku" :round="20" mode="bottom" @close="showShopsku = false,pagemetashow = false">
+			<view class="shop_sku">
+				<scroll-view scroll-y style="max-height:60vh;width: 100%;">
+					<view class="positionabsolute">
+						<up-icon name="close-circle" @click="showShopsku = false;pagemetashow=false" color="#000"
+							size="25"></up-icon>
+					</view>
+					<up-swiper :list="specifications.item.images" height="250"></up-swiper>
+					<view class="shop_sku_name"> {{specifications.item.name}} </view>
+					<view class="shop_sku_description">
+						{{specifications.item.shortTitle?specifications.item.shortTitle:''}}
+					</view>
+					<view v-if="specifications.item.type != 'package'">
+						<view class="shop_sku_box" v-for="(specOptions,specType) in specifications.item.selectSpecInfo"
+							:key="specType">
+							<view class="shop_sku_box_name">
+								{{specType }}
+							</view>
+							<view class="flex-start">
+								<view class="shop_sku_box_item" v-for="option in specOptions" :key="option"
+									@click="selectSpec(specType, option)"
+									:class="{ shop_sku_box_item_selected: selectedSpecs[specType] === option }">
+									{{option}}
+									<view class="shop_sku_box_item_tip"
+										v-if="specifications.item.result&& specifications.item.result.isSoldStock== 1 && selectedSpecs[specType] === option">
+										<view>售罄</view>
+									</view>
+									<view class="shop_sku_box_item_tip"
+										v-if="specifications.item.result == 'kong' && canSubmit == false && selectedSpecs[specType] === option">
+										<view>已下架</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 套餐 -->
+					<view v-else>
+						<view class="shop_sku_box">
+							<view v-for="(setmenu, setmenuindex) in specifications.item.groupSnap" :key='setmenuindex'>
+								<view class="shop_sku_box_name">
+									{{setmenu.title}} {{setmenu.count }} 选{{setmenu.number }}
+								</view>
+								<view class="flex-start">
+									<view class="shop_sku_box_item" v-for="(option, goodsid) in setmenu.goods"
+										:key="goodsid" @click="goodsidClick(setmenuindex, option, goodsid)"
+										:class="{ shop_sku_box_item_selected:  isOptionSelected(setmenuindex, option)}"
+										:disabled="isMaxSelected(setmenuindex) &&!isOptionSelected(setmenuindex, option)">
+										{{option.proName}}
+										<text v-if="option.unitName">/{{option.unitName}}</text>
+										<view class="shop_sku_box_item_tip" v-if="specifications.item.isSoldStock == 1">
+											<view>售罄</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="shop_bottom">
+					<view class="flex-between">
+
+						<view class="price" v-if="specifications.item.type != 'package' && specifications.item.result">
+							<text class="i">￥</text>
+							<text
+								class="num">{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1? (specifications.item.result.memberPrice||specifications.item.result.salePrice):specifications.item.result.salePrice}}</text>
+							<text class="i" v-if="specifications.item.unitName">/{{specifications.item.unitName}}</text>
+							<text v-if="specifications.item.result.suitNum>1">
+								「{{specifications.item.result.suitNum}}{{specifications.item.result.unitName}}起点」
+							</text>
+						</view>
+						<view class="price" v-else>
+							<text class="i">￥</text>
+							<text class="num">
+								{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1? (specifications.item.memberPrice||specifications.item.salePrice):specifications.item.salePrice}}
+							</text>
+							<text class="i" v-if="specifications.item.unitName">
+								/{{specifications.item.unitName}}
+							</text>
+							<text v-if="specifications.item.suitNum>1">
+								「{{specifications.item.suitNum}}{{specifications.item.unitName}}起点」
+							</text>
+						</view>
+
+						<view class="operation-wrap" v-if="specifications.item.type != 'package'">
+							<view class="btn">
+								<up-icon name="minus-circle-fill" color="#E9AB7A" size="25"
+									v-if="shopCartNumber>0"></up-icon>
+								<view class="btnClick" @click="shopCart('-')">
+								</view>
+							</view>
+							<text class="num">{{ shopCartNumber }}</text>
+							<view class="btn">
+								<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
+								<view class="btnClick" @click="shopCart('+')">
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="shop_skuselect flex-start" v-if="selectedSpecsStr">
+						<view class="shop_skuselectname">{{selectedSpecsStr }}</view>
+					</view>
+					<view v-if="specifications.item.type == 'package'" class="addShopping"
+						:class="shopCartNumber>0&&allConditionsSatisfied?'active':''" @click="submitSelection()">
+						{{skuBtnText}}
+					</view>
+					<view v-else class="addShopping" :class="shopCartNumber>0&&canSubmit?'active':''"
+						@click="submitSelection()">
+						{{skuBtnText}}
+					</view>
+				</view>
+			</view>
+		</up-popup>
+		<view class="history_order" @click="toHistory" v-if="shopInfo&&shopInfo.registerType == 'after'&&orderinfo.id">
+			<image class="img" src="@/static/history.png" mode=""></image>
+			<text>已下单菜品</text>
+		</view>
+		<Loading :isLoading="isLoading" />
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive,
+		onMounted,
+		watchEffect,
+		getCurrentInstance,
+		computed,
+		watch
+	} from "vue";
+
+	import {
+		onLoad,
+		onReady,
+		onShow,
+		onHide,
+		onPageScroll
+	} from '@dcloudio/uni-app'
+
+	//导航栏
+	import Nav from '@/components/CustomNavbar.vue';
+	import shopindex from './components/shopindex.vue'
+	import shoppingCartes from './components/shoppingCartes.vue'
+	import confirmorder from './components/confirmorder.vue'
+	import Loading from '@/components/Loading.vue';
+	import dayjs from 'dayjs';
+	import isBetween from 'dayjs/plugin/isBetween'
+	dayjs.extend(isBetween)
+
+	// 获取全局属性
+	const {
+		proxy
+	} = getCurrentInstance();
+
+	//接口引入
+	import {
+		productminiApphotsquery,
+		APIgroupquery,
+		APIminiAppinfo,
+		APIminiAppskuinfo
+	} from "@/common/api/product/product.js";
+
+	import {
+		APIhistoryOrder,
+		APIcancelOrder,
+		APIrmPlaceOrder
+	} from "@/common/api/order/index.js";
+
+	// websocket
+	import useWebSocket from '@/common/js/websocket.js';
+
+	// pinia管理
+	import {
+		useNavbarStore
+	} from '@/stores/navbarStore';
+
+	// 结账管理
+	import {
+		Memberpay
+	} from '@/stores/pay.js';
+
+	const storeMemberpay = Memberpay();
+	const store = useNavbarStore();
+
+	import {
+		productStore
+	} from '@/stores/user.js';
+
+	const userStore = productStore();
+
+	// 金额管理
+	import {
+		useCartStore
+	} from '@/stores/order.js';
+	const cartStore = useCartStore()
+
+	// 动态更新导航栏配置
+	store.updateNavbarConfig({
+		showBack: true, //左边返回键
+		rightText: '', //右边文字
+		showSearch: false, //true是标题其他事文字
+		title: '',
+		isTransparent: false,
+		hasPlaceholder: false //是否要占位符
+	});
+
+	const shopInfo = uni.cache.get('shopInfo')
+	const shopTable = uni.cache.get('shopTable')
+	const distance = uni.cache.get('distance') //距离
+
+
+	//店铺详情
+	const showShopInfoRef = ref(null)
+
+	// 初始加载中
+	const isLoading = ref(true);
+
+	//调用shop组件
+	const callChildMethod = () => {
+		if (showShopInfoRef.value) {
+			showShopInfoRef.value.childMethod();
+		}
+	}
+
+	try {
+		const shopExtend = uni.cache.get('shopTable').shopExtendMap.shopinfo_bg
+	} catch (error) {}
+
+	// 计算高度
+	const navScroll = ref(null)
+
+	// 获取商品数据
+	const shopProductList = reactive({
+		hots: [],
+		productInfo: [],
+	})
+
+	// * 图片加载
+	const imageLoaded = (item, index, index1) => {
+		// shopProductList.productInfo[index].products[index1]['imgLoad'] = true;
+	}
+
+	// 计算左侧位置
+	const leftIndex = ref(0)
+
+	//距离顶部的高度
+	const scrollTopSiz = ref(0)
+
+	//元素最低端的距离
+	const lastbottom = ref('')
+
+	//储存元素的下标
+	const topArr = ref([])
+
+	// 填充高度，用于最后一项低于滚动区域时使用
+	const fillHeight = ref(200)
+
+	//距离顶部的高度
+	const scrollTopSize = ref(0)
+
+	//左侧导航点击 
+	const leftTap = (index) => {
+		uni.pageScrollTo({
+			scrollTop: topArr.value[index] - store.height,
+			duration: 0
+		});
+		leftIndex.value = index
+	}
+
+	/* 计算左侧滚动位置定位 */
+	const leftIntoView = computed(() => {
+		return `left-${leftIndex.value? leftIndex.value:0}`
+	})
+
+	/* 获取元素顶部信息 */
+	const getElementTop = () => {
+		new Promise((resolve, reject) => {
+			let view = uni.createSelectorQuery().selectAll('.main-item');
+			view.boundingClientRect(async data => {
+				resolve(data);
+			}).exec();
+			proxy.$uGetRect('.scroll-panel').then(res => {
+				scrollTopSize.value = res.top; //元素距离顶部的距离  
+			})
+		}).then((res) => {
+			try {
+				topArr.value = res.map((item) => {
+					return item.top; /* 减去滚动容器距离顶部的距离 加导航栏高度*/
+				});
+
+				// 获取最后一个元素最低端的盒子到顶点的距离
+				for (let i = 0; i <= (topArr.value.length - 1); i++) {
+					if ((store.screenHeight - 200) >= (topArr.value[topArr.value.length - 1] - topArr.value[
+							i])) {
+						// 获取距离最后一个index
+						lastbottom.value = i;
+						break;
+					}
+				}
+				/* 获取最后一项的高度，设置填充高度。判断和填充时做了 +-20 的操作，是为了滚动时更好的定位 */
+				let last = res[res.length - 1].height;
+				if (last - 20 < store.screenHeight) {
+					fillHeight.value = 200;
+				}
+			} catch (error) {
+				//TODO handle the exception
+			}
+		});
+	}
+
+	// 定时器
+	const mainThrottle = ref(null)
+
+	/* 主区域滚动监听 */
+	const mainScroll = (e) => {
+		// 节流方法
+		clearTimeout(mainThrottle.value);
+		mainThrottle.value = setTimeout(() => {
+			scrollFn();
+		}, 10);
+		let scrollFn = () => {
+			let top = e.scrollTop;
+			let index = 0;
+			// 判断左边是否可以滑动
+
+			for (let i = (topArr.value.length - 1); i >= 0; i--) {
+				/* 在部分安卓设备上，因手机逻辑分辨率与rpx单位计算不是整数，滚动距离与有误差，增加2px来完善该问题 */
+				if ((top + 2) >= topArr.value[i] - store.height) {
+					index = i;
+					break;
+				}
+			}
+			/* 查找当前滚动距离 */
+			if (index >= lastbottom.value) { //
+				leftIndex.value = index > leftIndex.value ? index : leftIndex.value
+				// this.leftIndex = this.leftIndex
+			} else {
+				leftIndex.value = (index < 0 ? 0 : index);
+			}
+		}
+	}
+
+	//动态导航栏滑动距离
+	onPageScroll((res) => {
+		uni.$u.debounce(store.scrollTop = res.scrollTop, 500)
+		uni.$u.debounce(navScroll.value = res.scrollTop, 500)
+		uni.$u.debounce(mainScroll(res), 500)
+	});
+
+	// 点击详情
+	const showShopsku = ref(false)
+
+	// 规格信息
+	const specifications = reactive({
+		item: {},
+		index: '',
+		inedxs: '',
+		type: '',
+		product_id: '',
+		sku_id: '',
+		groupSnap: {},
+		item: {
+			groupSnap: [],
+			result: {
+				isSoldStock: 0
+			}
+		},
+
+	})
+	// 用于判断接口数据是否加载完成
+	const isDataLoaded = ref(false);
+
+	// 存储用户当前选择的规格，初始为空对象
+	const selectedSpecs = ref({});
+
+	// 能否提交的状态
+	const canSubmit = ref(false);
+
+	//字形判断
+	const skuBtnText = ref('添加到购物车')
+
+	// 计算属性，判断是否所有规格类型都有选中项
+	const allSpecsSelected = computed(() => {
+		// 获取所有规格类型的键
+		const specKeys = Object.keys(specifications.item.selectSpecInfo);
+		// skuBtnText.value = selectedSpecsStr.value ? `您还没选择${specKeys[1]}哦` : ``
+		// 检查每个规格类型是否都在 selectedSpecs 中有对应的选中值
+		return specKeys.every(key => selectedSpecs.value[key]);
+	});
+
+	// 处理规格选择的方法
+	const selectSpec = async (specType, option) => {
+		// 规格清零
+		shopCartNumber.value = 0
+
+		// 更新 selectedSpecs 对象，将当前规格类型的选中值设置为用户点击的选项
+		const newSelectedSpecs = {};
+		const specKeys = Object.keys(specifications.item.selectSpecInfo);
+		for (const key of specKeys) {
+			if (key === specType) {
+				newSelectedSpecs[key] = option;
+			} else {
+				newSelectedSpecs[key] = selectedSpecs.value[key];
+			}
+		}
+		selectedSpecs.value = newSelectedSpecs;
+		if (allSpecsSelected.value) {
+			// try {
+			let result = await APIminiAppskuinfo({
+				specInfo: selectedSpecsStr.value,
+				id: specifications.item.id
+			});
+			// skuList
+			if (result != true) {
+				specifications.sku_id = result.id
+				specifications.product_id = result.productId
+				// 添加多规格分组
+				specifications.item.result = result
+				if (result.isSoldStock == 0) {
+					canSubmit.value = true;
+				} else {
+					canSubmit.value = false;
+				}
+			} else {
+				specifications.item.result = 'kong'
+				canSubmit.value = false;
+			}
+
+		} else {
+			canSubmit.value = false;
+		}
+	};
+
+	// 监听 specifications 的变化
+	watch(
+		() => specifications.item.groupSnap,
+		(newGroupSnap) => {
+			if (Array.isArray(newGroupSnap)) {
+				selectedOptions.value = newGroupSnap.map(() => []);
+			}
+		}
+	);
+
+	// 存储选中的选项，二维数组
+	const selectedOptions = ref(
+		specifications.item.groupSnap.map(() => [])
+	);
+
+	// / 选择规格的方法
+	const goodsidClick = (setmenuindex, option, goodsid) => {
+		if (!selectedOptions.value[setmenuindex]) {
+			// 如果 selectedOptions.value[setmenuindex] 不存在，初始化一个空数组
+			selectedOptions.value[setmenuindex] = [];
+		}
+		if (isOptionSelected(setmenuindex, option)) {
+			// 如果已经选中，取消选中
+			selectedOptions.value[setmenuindex] = selectedOptions.value[setmenuindex].filter(item => item.proId !==
+				option.proId);
+		} else if (!isMaxSelected(setmenuindex)) {
+			// 如果未达到最大选择数量，添加到选中列表
+			selectedOptions.value[setmenuindex].push(option);
+		}
+	};
+
+	// 判断选项是否已选中
+	const isOptionSelected = (setmenuindex, option) => {
+		// 确保 selectedOptions.value[setmenuindex] 存在
+		if (selectedOptions.value[setmenuindex]) {
+			return selectedOptions.value[setmenuindex].some(item => item.proId === option.proId);
+		}
+		return false;
+	};
+
+	// 判断是否达到最大选择数量
+	const isMaxSelected = (setmenuindex) => {
+		// 确保 selectedOptions.value[setmenuindex] 存在
+		if (selectedOptions.value[setmenuindex]) {
+			return selectedOptions.value[setmenuindex].length >= specifications.item.groupSnap[setmenuindex]
+				.number;
+		}
+		return false;
+	};
+
+	// 计算所有选中条件是否都符合
+	const allConditionsSatisfied = computed(() => {
+		// 检查 specifications.item.groupSnap 是否存在
+		if (!specifications.item?.groupSnap) {
+			return false;
+		}
+		return specifications.item.groupSnap.every((optionGroup, index) => {
+			// 获取当前索引对应的已选选项，如果不存在则默认为空数组
+			const selected = selectedOptions.value[index] || [];
+			// 检查是否达到最大选择数量
+			const hasEnoughSelection = selected.length === optionGroup.number;
+			return hasEnoughSelection;
+		});
+	});
+
+	// 提交选择，套餐选中最后处理的数据
+	const selectedGroupSnap = ref([]);
+
+	// 计算属性，将 selectedSpecs 转换为字符串形式
+	const selectedSpecsStr = computed(() => {
+		const values = Object.values(selectedSpecs.value);
+		return values.join('，');
+	});
+
+	//添加购物车数量
+	const shopCartNumber = ref(0)
+
+	// 多规格 套餐添加数量
+	const shopCart = async (i) => {
+		if (i == '-' && shopCartNumber.value >= 0) {
+			shopCartNumber.value = 0
+			return false;
+		}
+		let res = await shoppingcart()
+		if (i == '-') {
+			if (!res && shopCartNumber.value == specifications.item.suitNum) {
+				uni.showToast({
+					title: `起点${specifications.item.suitNum}个`,
+					icon: 'none'
+				})
+				return false;
+			} else {
+				shopCartNumber.value--;
+			}
+		} else {
+			if (!res && shopCartNumber.value < 1) {
+				console.log(res, specifications)
+				if (specifications.type == 'sku') {
+					shopCartNumber.value = parseFloat(specifications.item.result.suitNum);
+				} else {
+					shopCartNumber.value = parseFloat(specifications.item.suitNum);
+				}
+			} else {
+				shopCartNumber.value++;
+			}
+		}
+	}
+
+	// 套餐比较两个对象是否相等
+	function isObjectEqual(obj1, obj2) {
+		if (typeof obj1 !== 'object' || obj1 === null || typeof obj2 !== 'object' || obj2 === null) {
+			return obj1 === obj2;
+		}
+		const keys1 = Object.keys(obj1);
+		const keys2 = Object.keys(obj2);
+		if (keys1.length !== keys2.length) {
+			return false;
+		}
+		for (const key of keys1) {
+			if (Array.isArray(obj1[key]) && Array.isArray(obj2[key])) {
+				if (!isArrayEqual(obj1[key], obj2[key])) {
+					return false;
+				}
+			} else if (!isObjectEqual(obj1[key], obj2[key])) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	// 比较两个数组是否相等（忽略顺序）
+	function isArrayEqual(arr1, arr2) {
+		if (arr1.length !== arr2.length) {
+			return false;
+		}
+		const usedIndices = new Array(arr2.length).fill(false);
+		for (const item1 of arr1) {
+			let found = false;
+			for (let i = 0; i < arr2.length; i++) {
+				if (!usedIndices[i] && isObjectEqual(item1, arr2[i])) {
+					usedIndices[i] = true;
+					found = true;
+					break;
+				}
+			}
+			if (!found) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	// 根据购物车的数据匹配选中的商品查找是否有匹配的数组
+	const matchingProduct = async (data) => {
+		return matchedProducts.value.find((product, index) => {
+			if (specifications.type == 'package') {
+				// 套餐
+				let result = false;
+				try {
+					if (product.type == "package") {
+						let res = JSON.parse(product.cartListinfo.pro_group_info);
+						result = isArrayEqual(res, selectedGroupSnap.value);
+					}
+				} catch (error) {
+					//TODO handle the exception
+				}
+				// 直接返回布尔值
+				return result;
+			} else if (specifications.item.type == 'sku') {
+				// 多规格
+				return product.cartListinfo.sku_id == data.id && product.cartListinfo.product_id == data
+					.productId
+			} else {
+				// 其他
+				return product.skuId == data.skuId && product.id == data.id
+			}
+		});
+	}
+
+	// 判断多规格和套餐  商品是否在购物车有数据
+	const shoppingcart = async () => {
+		let res = null
+		if (specifications.item.type == "package") {
+			if (!allConditionsSatisfied.value) {
+				return false
+			}
+			// 是否是套餐package
+			selectedGroupSnap.value = specifications.item.groupSnap.map((setmenu, index) => {
+				return {
+					...setmenu,
+					goods: selectedOptions.value[index]
+				};
+			});
+			res = await matchingProduct(selectedGroupSnap.value)
+		} else {
+			if (!canSubmit.value) {
+				return false
+			}
+			res = await matchingProduct(specifications.item.result)
+		}
+		return res;
+	}
+
+
+	// 提交选择并执行下一步操作的方法
+	const submitSelection = async () => {
+		if (!isProductAvailable(specifications.productListitem.days, specifications.productListitem.startTime,
+				specifications.productListitem.endTime)) {
+			uni.showToast({
+				title: '不在可售时间内'
+			})
+			return false;
+		}
+		// 判断购物车是否有该选中商品
+		// 数量不能少于0
+		if (shopCartNumber.value <= 0) {
+			return;
+		}
+		if ((specifications.item.type == 'package' && allConditionsSatisfied.value) || (specifications.item.type ==
+				'sku' && canSubmit.value)) {
+			let res = await shoppingcart()
+
+			// 是否是套餐 有就传
+			if (specifications.item.type == "package") {
+				// 需求更改:所所有商品套餐都是add,没有修改
+				res = null
+			} else {
+				selectedGroupSnap.value = []
+			}
+
+			websocketsendMessage({
+				id: res ? res.cartListId : '',
+				type: 'shopping',
+				suitNum: specifications.productListitem.suitNum,
+				table_code: uni.cache.get('tableCode'),
+				shop_id: uni.cache.get('shopId'),
+				operate_type: res ? 'edit' : 'add',
+				product_id: specifications.product_id,
+				sku_id: specifications.sku_id,
+				number: res ? await calculateValue(res.cartNumber, '+', shopCartNumber.value) :
+					shopCartNumber
+					.value,
+				pro_group_info: selectedGroupSnap.value,
+				goods_type: specifications.item.type == "package" ? 'package' : '',
+				is_print: 1,
+				product_type: specifications.item.type
+			})
+			// 清空套餐选中
+			selectedGroupSnap.value = []
+			showShopsku.value = false
+		} else {
+			return;
+		}
+	}
+
+	//获取多规格数据  
+	const clickspecifications = async (item, index, indexs, type) => {
+		console.log(item)
+		// 商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+		if (item.isSoldStock == 1 || (item.isSaleTime == 0 && !item.isSaleTimeshow) || item.type == 'single' ||
+			item
+			.type == 'weight' || (
+				item.type == 'package' && item.groupType == '0')) {
+			return false;
+		}
+		// 数量清零
+		shopCartNumber.value = 0
+		// 初始化 
+		let data = {
+			item: item,
+			productListitem: item,
+			type: '',
+			product_id: '',
+			sku_id: ''
+		}
+		Object.assign(specifications, data);
+		// 初始化 多规格选中
+		selectedSpecs.value = {}
+		canSubmit.value = false
+		// skuBtnText.value = '请选择规格'
+		// single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券 
+		let res = await APIminiAppinfo(item.id)
+		specifications.item = res
+		if (specifications.item.type == "package") {
+			selectedOptions.value = []
+			specifications.product_id = res.id
+			specifications.sku_id = item.skuId
+			shopCartNumber.value = 1
+		}
+		// 购物车是否有商品
+		specifications.type = res.type
+		specifications.item.selectSpecInfo = Object.fromEntries(
+			Object.entries(specifications.item.selectSpecInfo).filter(([_, value]) => value.length > 0)
+		);
+		// 给默认数量
+		specifications.item.amountcartNumber = 0
+		showShopsku.value = true
+	}
+	// 判断商品是否在可售时间内
+	const isProductAvailable = async (sellDaysStr, startTimeStr, endTimeStr) => {
+		// 将后端返回的字符串转换为数组
+		const sellDays = sellDaysStr.split(',');
+		const now = dayjs();
+		const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+		const currentDay = days[now.day()];
+
+		// console.log('当前日期:', currentDay);
+		// console.log('可售日期列表:', sellDays);
+
+		// 检查当前周几是否在可售周几列表中 
+		if (!sellDays.includes(currentDay)) {
+			// console.log('当前日期不在可售日期列表中');
+			return false;
+		}
+
+		const startTime = dayjs(`${now.format('YYYY-MM-DD')} ${startTimeStr}`);
+		let endTime = dayjs(`${now.format('YYYY-MM-DD')} ${endTimeStr}`);
+
+		// 处理跨天情况
+		if (endTime.isBefore(startTime)) {
+			endTime = endTime.add(1, 'day');
+		}
+
+		// console.log('当前时间:', now.format('YYYY-MM-DD HH:mm:ss'));
+		// console.log('开始时间:', startTime.format('YYYY-MM-DD HH:mm:ss'));
+		// console.log('结束时间:', endTime.format('YYYY-MM-DD HH:mm:ss'));
+
+		const isInRange = now.isBetween(startTime, endTime, null, '[)');
+		// console.log('当前时间是否在可售时间范围内:', isInRange);
+
+		return isInRange;
+	}
+
+	// 单规格
+	const singleclick = async (item, i) => {
+		if (!isProductAvailable(item.days, item.startTime, item.endTime)) {
+			uni.showToast({
+				title: '不在可售时间内'
+			})
+			return false;
+		}
+		// 判断购物车是否有该选中商品
+		let res = null
+		try {
+			res = matchedProducts.value.find((product, index) => {
+				return product.skuId == item.skuId && product.id == item.id
+			});
+		} catch (error) {
+			//TODO handle the exception
+		}
+
+		// 保存这次点击的
+		specifications.productListitem = item
+
+		// 是否起售 如果小于或者大于都是1
+		let suitNum = 1;
+		const cartNumberFloat = parseFloat(item.cartNumber);
+		if (!res && item.suitNum > cartNumberFloat) {
+			suitNum = item.suitNum;
+		} else if (item.suitNum >= cartNumberFloat && i === '-') {
+			suitNum = item.cartNumber;
+		}
+		websocketsendMessage({
+			id: res ? item.cartListId : '',
+			type: 'shopping',
+			suitNum: item.suitNum,
+			table_code: uni.cache.get('tableCode'),
+			shop_id: uni.cache.get('shopId'),
+			operate_type: await calculateValue(item.cartNumber, i, suitNum) == 'del' ? 'del' : res ?
+				'edit' : 'add',
+			product_id: item.id,
+			sku_id: item.skuId,
+			number: await calculateValue(item.cartNumber, i, suitNum),
+			is_print: 1,
+			product_type: item.type
+		})
+	}
+
+
+	const calculateValue = (cartNumber, i, step = 1) => {
+		if (i == '+') {
+			const result = parseFloat(cartNumber) + parseFloat(step);
+			return result.toFixed(2);
+		} else {
+			// 当减到0返回del
+			const result = parseFloat(cartNumber) - parseFloat(step);
+			return result == 0 ? 'del' : result.toFixed(2);
+		}
+	}
+
+	// WebSocket处理  	// 初始化配置
+	const options = {
+		initMessage: {
+			type: 'shopping',
+			operate_type: 'init',
+			table_code: uni.cache.get('tableCode'),
+			shop_id: uni.cache.get('shopId')
+		}
+	}
+	const {
+		isConnected,
+		sendMessage,
+		closeSocket: manualClose,
+		receivedMessages,
+		closeExistingConnection,
+		onShowconnect,
+		initNetworkListener
+	} = useWebSocket(options);
+
+	//购物车显示
+	const showCart = ref(false)
+
+	// 提交订单显示
+	const confirmordershow = ref(false)
+
+
+	// 更新商品数量的方法
+	const updateProductQuantities = () => {
+		// 先将所有商品的 cartNumber 初始化为 0
+		shopProductList.hots.forEach((i) => {
+			i.cartNumber = 0
+		})
+		// 遍历商品列表二维数组
+		shopProductList.productInfo.forEach((group) => {
+			group.productList.forEach((product) => {
+				product.cartNumber = 0
+			});
+		});
+
+		// 再去更新数组的值
+		cartListFilter.value.forEach((cartItem) => {
+			shopProductList.productInfo.forEach((group) => {
+				group.productList.forEach((product) => {
+					if (product.id == cartItem.product_id && product.skuId == cartItem
+						.sku_id) {
+						product.cartNumber = cartItem.number
+						product.cartListId = cartItem.id
+					}
+				});
+			});
+		});
+		// 遍历购物车数组
+		cartListFilter.value.forEach((cartItem) => {
+			// 遍历商品列表二维数组
+			shopProductList.hots.forEach((group) => {
+				// 商品 id 匹配
+				if (group.id == cartItem.product_id) {
+					// 更新商品的数量
+					group.cartListId = cartItem.id
+					group.cartNumber = cartItem.number
+				}
+			});
+		});
+	}
+
+	//websocket产值
+	const websocketsendMessage = (data) => {
+		uni.$u.debounce(sendMessage(data), 500)
+	}
+
+	// 用于记录已经处理过的消息的 msg_id
+	const processedMessageIds = new Set();
+
+	// 监听接收到的消息变化
+	watchEffect(async () => {
+		if (isDataLoaded.value && receivedMessages.value) {
+			const Message = receivedMessages.value
+			if (Message) {
+				console.log(Message.data);
+				// 心跳返回  过滤
+				if (Message.type == "ping_interval" || Message.msg_id == "ping_interval") {
+					isLoading.value = false;
+					return false
+				}
+				// 检查消息是否已经处理过
+				if (processedMessageIds.has(Message.msg_id)) {
+					return;
+				}
+				processedMessageIds.add(Message.msg_id);
+
+				// 初始化
+				if (Message.operate_type == "init") {
+					cartStore.carts = Message.data
+					uni.hideLoading();
+					isLoading.value = false;
+				}
+
+				// 清空购物车
+				if (Message.operate_type == 'cleanup') {
+					cartStore.carts = []
+					setTimeout(() => {
+						Historicalorders()
+					}, 400)
+					showCart.value = false
+				}
+
+				// 删除除购物车
+				if (Message.operate_type == 'del' && Message.status == 1) {
+					// 优化：使用可选链操作符避免报错
+					cartStore.carts = cartStore.carts.filter(item => item.id !== Message.data?.id);
+					// cartStore.carts = cartStore.carts.filter(item => item.id != Message.data.id);
+				}
+
+				// 添加或者减少购物后返回
+				if (Message.operate_type == 'add' || Message.operate_type == 'edit') {
+					[Message.data].forEach((objA) => {
+						const index = cartStore.carts.findIndex((objB) => objB.id == objA.id);
+						if (index !== -1) {
+							cartStore.carts[index] = objA;
+						} else {
+							cartStore.carts.push(objA);
+						}
+					});
+				}
+
+				// 历史订单
+				if (Message.operate_type == 'clearOrder') {
+					Historicalorders()
+				}
+
+				// 购物车数据更新从新请求
+				if (Message.type == 'product' && Message.data_type == 'product_update' && Message
+					.operate_type == 'product_update') {
+					isDataLoaded.value = false;
+					productqueryProduct()
+				}
+
+				// 提示
+				if (Message.status == 0 && Message.type != 'no_suit_num') {
+					uni.showToast({
+						title: Message.msg,
+						icon: "none"
+					})
+				}
+
+				if (Message.type == 'no_suit_num') {
+					// console.log(specifications)
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '此商品库存不足起售数量！',
+						success: async (data) => {
+							await websocketsendMessage({
+								id: Message.id,
+								type: 'shopping',
+								table_code: uni.cache.get('tableCode'),
+								shop_id: uni.cache.get('shopId'),
+								operate_type: 'del',
+								is_print: 1,
+							})
+						}
+					});
+				}
+
+				//除去p 每次返回都回执消息
+				await websocketsendMessage({
+					type: 'receipt',
+					msg_id: Message.msg_id
+				})
+
+				// 初始化商品数量
+				await updateProductQuantities()
+
+			}
+		}
+	})
+
+	// 更新购物车数据shopProductList.hots
+	const matchedProducts = computed(() => {
+		if (cartStore.carts.length > 0) {
+			let Specialstop = null
+
+			try {
+				Specialstop = [...[{
+					id: "",
+					name: "",
+					productList: shopProductList.hots
+				}], ...shopProductList.productInfo]
+			} catch (error) {
+				Specialstop = shopProductList.productInfo
+				//TODO handle the exception
+			}
+			return cartStore.carts.flatMap((cartItem) => {
+				for (const group of Specialstop) {
+					for (const product of group.productList) {
+						if (product.id == cartItem.product_id) {
+							return {
+								...product,
+								cartListinfo: cartItem,
+								cartListId: cartItem.id, //购物车id
+								cartNumber: cartItem.number //增加一个数量算法
+								// cartNumberToAdd: cartItem.number //增加一个数量算法
+							};
+
+						}
+					}
+				}
+				if (cartItem.is_temporary === 1) {
+					return [{
+						...cartItem,
+						memberPrice: cartItem.discount_sale_amount,
+						salePrice: cartItem.discount_sale_amount,
+						cartListinfo: cartItem,
+						cartListId: cartItem.id, // 购物车id
+						cartNumber: cartItem.number // 增加一个数量算法
+					}];
+				}
+				// 如果没找到匹配的商品，返回 null 或者其他默认值，这里返回 null
+				return null;
+			}).filter(item => item !== null);
+		} else {
+			return []
+		}
+
+	})
+
+	//删除某一个待支付订单
+	const clickcancelOrder = async (data) => {
+		if (data.i == 'all') {
+			await APIcancelOrder({
+				shopId: uni.cache.get('shopId'),
+				orderId: orderinfo.value.id,
+			})
+		} else {
+			await APIrmPlaceOrder({
+				shopId: uni.cache.get('shopId'),
+				orderId: orderinfo.value.id,
+				placeNum: data.key
+			})
+		}
+		Historicalorders()
+	}
+
+	// 储存是否存在多次下单
+	const orderinfo = ref({})
+	const confirmorderref = ref(null)
+
+	// 结账
+	const orderdetail = async () => {
+		uni.navigateTo({
+			url: '/pages/order/confirm-order?tableCode=' + uni.cache.get('tableCode') + '&shopId=' + uni
+				.cache.get(
+					'shopId')
+		})
+		return
+		try {
+			await Historicalorders()
+		} catch (error) {}
+		confirmordershow.value = true
+		showCart.value = false
+	}
+
+	// 历史订单
+	const Historicalorders = async (W) => {
+
+		if (W) {
+			showCart.value = !showCart.value
+		} else {
+			let res = await APIhistoryOrder({
+				tableCode: uni.cache.get('tableCode'),
+			})
+			orderinfo.value = {
+				id: res.id,
+				detailMap: res.detailMap,
+				placeNum: res.placeNum
+			}
+		}
+	}
+
+	// 提取合并 orderinfo.detailMap 数组的逻辑
+	function combineOrderInfoDetailMap(orderinfo) {
+		if (!orderinfo) return [];
+		let combinedArray = [];
+		for (const key in orderinfo.detailMap) {
+			if (orderinfo.detailMap.hasOwnProperty(key)) {
+				let subArray = orderinfo.detailMap[key];
+				combinedArray = [...combinedArray, ...subArray];
+			}
+		}
+		return combinedArray;
+	}
+
+	// 计算购物车商品费用
+	const totalPrices = computed(() => {
+		// 待支付订单
+		let cartone = 0
+		if (orderinfo.value) {
+			let combinedArray = [];
+			for (const key in orderinfo.value.detailMap) {
+				if (orderinfo.value.detailMap.hasOwnProperty(key)) {
+					let subArray = orderinfo.value.detailMap[key];
+					combinedArray = [...combinedArray, ...subArray]
+				}
+			}
+			// 购物车总数价格
+			cartone = combinedArray.reduce((total, item) => {
+				// 是否启用会员价 0否1是
+				if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
+					// memberPrice会员价
+					return total + (parseFloat(item.memberPrice || item.price) * parseFloat(item.num - item
+						.returnNum));
+				} else {
+					// salePrice销售价
+					return total + (parseFloat(item.price || 0) * parseFloat(item.num - item.returnNum));
+				}
+			}, 0);
+		}
+		// 购物车总数价格
+		let cart = 0
+		if (matchedProducts.value.length > 0) {
+			// 购物车总数价格
+			cart = matchedProducts.value.reduce((total, item) => {
+				if (item.type == 'sku') {
+					item.skuList.forEach((i, t) => {
+						if (item.cartListinfo.sku_id == i.id) {
+							item.memberPrice = i.memberPrice
+							item.salePrice = i.salePrice
+						}
+					})
+				}
+				// 是否启用会员价 0否1是
+				if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
+					// memberPrice会员价
+					return total + parseFloat(item.memberPrice || item.salePrice) * parseFloat(item
+						.cartNumber);
+				} else {
+					// salePrice销售价
+					return total + parseFloat(item.salePrice || 0) * parseFloat(item.cartNumber);
+				}
+			}, 0);
+		}
+		cart = parseFloat(cart)
+		// 向上取整并保留两位小数
+		return parseFloat(cart.toFixed(2));
+	});
+
+	// 计算购物车商品总数量
+	const cartLists_count = computed(() => {
+		const combinedOrderInfo = combineOrderInfoDetailMap(orderinfo.value);
+		const orderInfoCount = combinedOrderInfo.reduce((sum, item) => {
+			return sum + parseFloat(item.num);
+		}, 0);
+
+		const matchedProductsCount = matchedProducts.value.reduce((sum, item) => {
+			const num = typeof item.cartNumber === 'string' ? parseFloat(item.cartNumber) : item
+				.cartNumber;
+			return sum + num;
+		}, 0);
+
+		const totalCount = matchedProductsCount;
+		return parseFloat(totalCount.toFixed(2));
+	});
+
+	// 定义 ifcartNumber 计算属性方法 展示数量 
+	const ifcartNumber = computed(() => {
+		return (item) => {
+			// 如果 item 为空或者 cartNumber 不是字符串类型，返回 0
+			if (!item || typeof item.cartNumber !== 'string') {
+				return 0;
+			}
+			let numValue = parseFloat(item.cartNumber);
+			if (isNaN(numValue)) {
+				// 如果转换结果是 NaN，说明 cartNumber 不是有效的数字字符串，返回 0
+				return 0;
+			}
+			// type string  商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+			if (item.type === 'weight') {
+				// 如果类型是称重重量，将值保留两位小数
+				return parseFloat(numValue.toFixed(2));
+			} else {
+				// 如果类型是整数，将值转换为整数
+				return Math.round(numValue);
+			}
+			// 如果类型不匹配，返回原始值
+			return item.cartNumber;
+		};
+	})
+
+	// 计算处理后的购物车列表 	// 用于筛选后的购物车数组
+	const cartListFilter = computed(() => {
+		// 使用 reduce 方法对 cartList 进行处理
+		const grouped = cartStore.carts.reduce((acc, item) => {
+			const productId = item.product_id;
+			const num = parseFloat(item.number);
+
+			if (!acc[productId]) {
+				// 如果 acc 中还没有该 product_id 的记录，创建一个新对象
+				acc[productId] = {
+					...item,
+					number: num
+				};
+			} else {
+				// 如果已经有该 product_id 的记录，将当前对象的 number 值累加到已有记录的 number 属性上
+				acc[productId].number += num;
+			}
+			return acc;
+		}, {});
+		// 将累加结果保留两位小数，并将对象转换为数组
+		return Object.values(grouped).map(item => ({
+			...item,
+			number: item.number.toFixed(2)
+		}));
+	})
+
+	const endTimeref = reactive({
+		startTime: '',
+		endTime: ''
+	})
+
+	// 获取当前时间
+	const getCurrentTime = () => {
+		const now = new Date();
+		const hours = now.getHours().toString().padStart(2, '0');
+		const minutes = now.getMinutes().toString().padStart(2, '0');
+		return `${hours}:${minutes}`;
+	};
+
+	// 计算是否在营业时间内
+	const isBusinessTime = computed(() => {
+		if (!shopInfo.businessTime) {
+			return true;
+		}
+		const currentTime = getCurrentTime();
+		const [startTime, endTime] = shopInfo.businessTime.split('-');
+		endTimeref.startTime = startTime
+		endTimeref.endTime = endTime
+		// 如果开始时间大于结束时间，说明是跨天的营业时间
+		if (startTime > endTime) {
+			return currentTime >= startTime || currentTime <= endTime;
+		}
+		return currentTime >= startTime && currentTime <= endTime;
+	});
+
+
+	// 列表请求
+	const productqueryProduct = async () => {
+		cartStore.goodsIsloading = false;
+		try {
+			shopProductList.hots = await productminiApphotsquery()
+			shopProductList.productInfo = await APIgroupquery()
+		} catch (error) {
+			uni.showToast({
+				title: '网络不稳定，请重新扫码进入',
+				icon: 'none'
+			})
+			setTimeout(() => {
+				uni.pro.switchTab('index/index')
+			}, 1000)
+		}
+		if (shopProductList.productInfo.length > 0 || shopProductList.hots.length > 0) {
+			//TODO handle the exception
+			//第一步：将所有商品的 cartNumber 初始化为 0
+			shopProductList.productInfo.forEach((group) => {
+				group.productList.forEach(async (product) => {
+					product.cartNumber = 0;
+					product.isSaleTimeshow = await isProductAvailable(product.days, product
+						.startTime, product.endTime)
+					cartStore.setGoodsMap(product.id, product)
+				});
+			});
+			shopProductList.hots.forEach(async (i) => {
+				i.cartNumber = 0
+				i.isSaleTimeshow = await isProductAvailable(i.days, i.startTime, i.endTime)
+				cartStore.setGoodsMap(i.id, i)
+			})
+			cartStore.goodsIsloading = true;
+			scrollTopSize.value = 0
+			topArr.value = []
+			// userStore.actionsAPIuser()
+			// 数据可以更新
+			isDataLoaded.value = true;
+			// 历史订单
+			Historicalorders()
+		} else {
+			uni.showToast({
+				title: '暂无列表数据,请重新扫码',
+				icon: "none"
+			});
+			isDataLoaded.value = false;
+			setTimeout(() => {
+				uni.pro.switchTab('index/index')
+			}, 1000)
+			return false;
+		}
+
+
+	}
+
+	onLoad(async (e) => {
+		await proxy.$onLaunched;
+	})
+
+	onShow(async() => {
+		// 监听页面显示和隐藏
+		onShowconnect()
+		let res = await APIhistoryOrder({
+			tableCode: uni.cache.get('tableCode'),
+		})
+		if(res){
+			orderinfo.value = {
+				id: res.id,
+				detailMap: res.detailMap,
+				placeNum: res.placeNum
+			}
+		}else{
+			orderinfo.value = {
+				id:''
+			}
+		}
+	})
+
+	onHide(() => {
+		closeExistingConnection()
+	})
+
+	onMounted(async () => {
+		await proxy.$onLaunched;
+		// 获取当前页面栈
+		const pages = getCurrentPages();
+		// 获取当前页面实例
+		const currentPage = pages[pages.length - 1];
+		// 获取页面参数
+		const options = currentPage.options;
+		let res = await APIhistoryOrder({
+			tableCode: uni.cache.get('tableCode'),
+		})
+
+		await productqueryProduct()
+		if (res && res.id && shopInfo.registerType == "after") {
+			toHistory()
+			return
+		}
+		setTimeout(() => {
+			// 启动网络监听
+			initNetworkListener()
+			getElementTop()
+		}, 500)
+	})
+
+
+	//跳转历史订单
+	function toHistory() {
+		uni.navigateTo({
+			url: '/pages/order/confirm-order?tableCode=' + uni.cache.get('tableCode') + '&shopId=' + uni
+				.cache.get(
+					'shopId')
+		})
+		// uni.navigateTo({
+		// 	url: '/pages/order/confirm-order?orderId=' + orderinfo.id + '&shopId=' + uni.cache.get('shopId')+'&tableCode='+uni.cache.get('tableCode')
+		// })
+	}
+</script>
+
+<style lang="scss" scoped>
+	.grayscale {
+		filter: grayscale(100%);
+		pointer-events: none;
+	}
+
+	.top--panel {
+		// padding: 0 20rpx;
+		background-color: #fff;
+
+		.panelimgbackground {
+			width: 100%;
+			height: 272rpx;
+		}
+
+		.panelone {
+			padding: 20rpx 20rpx 0 20rpx;
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+		}
+
+		.paneltow {
+			padding: 0 20rpx;
+			margin-top: 16rpx;
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #999999;
+		}
+
+		.panelthere {
+			margin-top: 32rpx;
+			margin-bottom: 50rpx;
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #999999;
+			padding: 0 20rpx;
+
+			.paneltheretext {
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+			}
+
+			.flex-start {
+				view {
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #999999;
+				}
+			}
+		}
+
+		.panelfour {
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #333333;
+			padding: 0 20rpx;
+		}
+
+		.panelfive {
+			width: 100%;
+			padding: 0 20rpx;
+
+			.panelfive_list {
+				display: flex;
+			}
+
+			.panelfiveitem {
+				margin-top: 16rpx;
+				width: 340rpx;
+				margin-right: 30rpx;
+				position: relative;
+				flex-shrink: 0;
+
+				.panelfiveitemimage {
+					border-radius: 20rpx 20rpx 0rpx 0rpx;
+					width: 100%;
+					height: 204rpx;
+				}
+
+				.vifgoodsImg {
+					width: 100%;
+					height: 204rpx;
+					position: absolute;
+					top: 0;
+					left: 0;
+					z-index: 9;
+					background-color: rgb(0, 0, 0, 0.5);
+
+					image {
+						padding: 30rpx;
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+
+				.panelfiveitemone {
+					margin-top: 32rpx;
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #333333;
+					overflow: hidden; //超出的文本隐藏
+					text-overflow: ellipsis; //溢出用省略号显示
+					white-space: nowrap; //溢出不换行
+				}
+
+				.panelfiveitemtow {
+					margin-top: 16rpx;
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #FF534B;
+				}
+
+				.panelfiveitemthere {
+					margin-top: 12rpx;
+					// text:nth-child(1) {
+					// 	margin-left: 0;
+					// }
+
+					text {
+						padding: 4rpx 24rpx;
+						background: #F6F6F6;
+						border-radius: 8rpx 8rpx 8rpx 8rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #999999;
+					}
+				}
+
+				.panelfiveitemfour {
+					margin-top: 12rpx;
+					width: 100%;
+					height: 36rpx;
+					line-height: 36rpx;
+					overflow: hidden; //超出的文本隐藏
+					text-overflow: ellipsis; //溢出用省略号显示
+					white-space: nowrap; //溢出不换行
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #999999;
+				}
+
+				.panelfiveitemfive {
+					margin-top: 8rpx;
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #999999;
+				}
+
+				.panelfiveitemsex {
+
+					.panelfiveitemsex_oen {
+						.tips {
+							font-family: Source Han Sans CN, Source Han Sans CN;
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #333333;
+						}
+
+						.price {
+							font-family: Source Han Sans CN, Source Han Sans CN;
+							font-weight: bold;
+							font-size: 36rpx;
+							color: #333333;
+						}
+
+						.originalprice {
+							margin-left: 10rpx;
+							font-family: Source Han Sans CN, Source Han Sans CN;
+							font-weight: 400;
+							font-size: 20rpx;
+							text-decoration: line-through;
+						}
+
+						.unit {
+							font-family: Source Han Sans CN, Source Han Sans CN;
+							font-weight: 400;
+							font-size: 36rpx;
+							color: #333333;
+						}
+
+					}
+				}
+
+				.panelfiveitemNum {
+					// position: absolute;
+					// bottom: 82rpx;
+					// right: 0;
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+
+					.sku-wrap {
+						padding: 10rpx 20rpx;
+						background: #E3AD7F;
+						border-radius: 32rpx;
+						position: relative;
+						align-items: center;
+
+						.t {
+							font-size: 28rpx;
+							color: #fff;
+						}
+
+						.dot {
+							position: absolute;
+							top: -15rpx;
+							right: -10rpx;
+							background-color: #FF4B33;
+							color: #fff;
+							border-radius: 58rpx;
+							padding: 5rpx 14rpx;
+							box-sizing: border-box;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							font-size: 20rpx;
+						}
+					}
+
+					.Controls {
+						display: flex;
+						align-items: center;
+
+						.num {
+							margin: 8rpx 8rpx 0 8rpx;
+						}
+
+						.btn {
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							position: relative;
+
+							.btnClick {
+								width: 100rpx;
+								height: 100rpx;
+								position: absolute;
+								// bottom: 0;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.scroll-panel {
+		position: relative;
+
+		.list-box {
+			display: flex;
+			flex-direction: row;
+			flex-wrap: nowrap;
+			justify-content: flex-start;
+			align-items: flex-start;
+			align-content: flex-start;
+			font-size: 28rpx;
+			position: relative;
+
+			.left {
+				width: 200rpx;
+				background-color: #f6f6f6;
+				line-height: normal;
+				box-sizing: border-box;
+				font-size: 32rpx;
+				position: sticky;
+				top: 0;
+
+				// padding-bottom: 200rpx;
+				.item {
+					padding: 30rpx 30rpx;
+					// height: 92rpx;
+					// line-height: 92rpx;
+					position: relative;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #333333;
+					display: flex;
+					align-items: center;
+					// overflow: hidden;
+					// text-overflow: ellipsis;
+					// white-space: nowrap;
+
+					&+.item {
+						margin-top: 1px;
+
+						&::after {
+							// content: '';
+							// display: block;
+							// height: 0;
+							// border-top: #d6d6d6 solid 1px;
+							// width: 620upx;
+							// position: absolute;
+							// top: -1px;
+							// right: 0;
+							// transform: scaleY(0.5);
+							/* 1px像素 */
+						}
+					}
+
+					&.active {
+						color: #333;
+						background-color: #fff;
+						position: relative;
+
+						&::before {
+							content: '';
+							display: block;
+							position: absolute;
+							top: 0;
+							left: 0;
+							border-left: #7E5C23 solid 4px;
+							height: 100%;
+							width: 0;
+						}
+
+						&::after {
+							content: '';
+							display: block;
+							position: absolute;
+							top: 0;
+							left: -15rpx;
+							bottom: 0;
+							margin: auto;
+							height: 30rpx;
+							width: 30rpx;
+							border-radius: 50%;
+							background-color: #7E5C23;
+						}
+					}
+				}
+
+				.items {
+					height: 90px;
+					position: relative;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #333333;
+				}
+
+				.fill-last {
+					height: 0;
+					width: 100%;
+					background: none;
+				}
+			}
+
+			.main {
+				background-color: #fff;
+				padding-left: 20rpx;
+				width: 0;
+				flex-grow: 1;
+				box-sizing: border-box;
+				position: relative;
+
+
+				.title {
+					line-height: normal;
+					padding: 30rpx 0;
+					font-size: 24rpx;
+					font-weight: bold;
+					color: #666;
+					background-color: #fff;
+					position: sticky;
+					top: 0;
+					z-index: 19;
+				}
+
+				.item {
+					padding-bottom: 16rpx;
+					border-bottom: #eee solid 1px;
+				}
+
+				.goods {
+					display: flex;
+					flex-direction: row;
+					flex-wrap: nowrap;
+					justify-content: flex-start;
+					align-content: center;
+					position: relative;
+
+					&+.goods {
+						margin-top: 16rpx;
+					}
+
+					&>image {
+						width: 120rpx;
+						height: 120rpx;
+						margin-right: 18rpx;
+					}
+
+					.goodsImg {
+						position: relative;
+						width: 200rpx;
+						height: 200rpx;
+						border-radius: 18rpx;
+						flex-shrink: 0;
+					}
+
+					.vifgoodsImg {
+						width: 200rpx;
+						height: 100%;
+						position: absolute;
+						top: 0;
+						left: 0;
+						z-index: 9;
+						background-color: rgb(0, 0, 0, 0.5);
+
+						image {
+							padding: 30rpx;
+							width: 100%;
+							height: 100%;
+						}
+					}
+
+					.topSort {
+						width: 92rpx;
+						height: 38rpx;
+						text-align: center;
+						line-height: 38rpx;
+						position: absolute;
+						top: 0;
+						left: 0;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #FFFFFF;
+						border-radius: 20rpx 0rpx 20rpx 0rpx;
+
+					}
+
+					.topSort.c1 {
+						background: #FC5C2E;
+					}
+
+					.topSort.c2 {
+						background: #EF994E;
+					}
+
+					.topSort.c3 {
+						background: #F4B951;
+					}
+
+					.goods_right {
+						width: 100%;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-around;
+						position: relative;
+						padding-top: 5rpx;
+						padding-right: 20rpx;
+						box-sizing: border-box;
+
+						.name {
+							font-size: 28rpx;
+							color: #333;
+							font-weight: bold;
+							margin-bottom: 8rpx;
+						}
+
+						.describe,
+						.monthlySale,
+						.lookBack {
+							font-weight: 400;
+							font-size: 20rpx;
+							color: #999999;
+							margin-bottom: 8rpx;
+						}
+
+						.describe,
+						.name {
+							width: 270rpx;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+
+
+						.lookBack {
+							color: #FF534B;
+						}
+
+						.money {
+							font-weight: bold;
+							font-size: 24rpx;
+							color: #333;
+							display: flex;
+							align-items: flex-end;
+
+							.money_num {
+								font-size: 28rpx;
+								color: #333;
+								font-weight: bold;
+							}
+						}
+
+						.suit {
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #666666;
+						}
+
+						.sku-wrap {
+							padding: 10rpx 20rpx;
+							background: #E3AD7F;
+							border-radius: 32rpx;
+							// position: absolute;
+							// bottom: 10rpx;
+							// right: 20rpx;
+							align-items: center;
+							position: relative;
+
+							.t {
+								font-size: 24rpx;
+								color: #fff;
+							}
+
+							.dot {
+								position: absolute;
+								top: -15rpx;
+								right: -10rpx;
+								background-color: #FF4B33;
+								color: #fff;
+								border-radius: 58rpx;
+								padding: 5rpx 14rpx;
+								box-sizing: border-box;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								font-size: 20rpx;
+							}
+						}
+
+						.Controls {
+							display: flex;
+							align-items: center;
+							justify-content: flex-end;
+
+							// position: absolute;
+							// bottom: 10rpx;
+							// right: 20rpx;
+							.num {
+								margin: auto 16rpx;
+							}
+
+							.btn {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								position: relative;
+
+								.btnClick {
+									width: 100rpx;
+									height: 100rpx;
+									position: absolute;
+									// bottom: 0;
+								}
+							}
+						}
+					}
+
+
+				}
+			}
+
+		}
+
+		.lineThrough {
+			font-weight: normal;
+			text-decoration: line-through;
+			color: #999 !important;
+			font-size: 24rpx !important;
+		}
+
+		.money_num.lineThrough {}
+	}
+
+
+	.shop_sku {
+		width: 100%;
+		position: relative;
+		border-radius: 20rpx;
+		background: #fff;
+		box-sizing: border-box;
+		padding-bottom: 250rpx;
+
+		.positionabsolute {
+			position: absolute;
+			top: 30rpx;
+			z-index: 999;
+			right: 30rpx;
+		}
+
+
+		.shop_sku_name {
+			padding: 0 28rpx;
+			margin-top: 20rpx;
+			font-weight: bold;
+			font-size: 32upx;
+			margin-bottom: 16rpx;
+		}
+
+		.shop_sku_returned {
+			padding: 0 28rpx;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #FF534B;
+		}
+
+		.shop_sku_description {
+			padding: 0 28rpx;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #999999;
+			margin-top: 16rpx;
+			padding-bottom: 32rpx;
+			box-sizing: border-box;
+			border-bottom: 2rpx solid #F0F0F0;
+		}
+
+		.shop_sku_box:last-child {
+			padding-bottom: 60rpx;
+		}
+
+		.shop_sku_box {
+			padding: 20rpx;
+
+			.shop_sku_box_name {
+				margin-top: 20rpx;
+				font-weight: 500;
+				font-size: 28upx;
+				color: #333;
+			}
+
+			.flex-start {
+				.shop_sku_box_item {
+					margin-top: 16rpx;
+					padding: 12rpx 28rpx;
+					border-radius: 8rpx;
+					font-size: 24upx;
+					margin-right: 56rpx;
+					background: #EFEFEF;
+					border: 2rpx solid #EFEFEF;
+					position: relative;
+					color: #666666;
+
+					.shop_sku_box_item_tip {
+						width: 62rpx;
+						height: 47rpx;
+						text-align: right;
+						position: absolute;
+						top: 0;
+						right: 0;
+						background: linear-gradient(45deg, transparent, transparent 50%, #CECECE 50%, #CECECE 100%);
+
+						view {
+							font-size: 18rpx;
+							color: #666666;
+							transform: rotate(45deg);
+							position: absolute;
+							top: 5rpx;
+							right: 3rpx;
+						}
+					}
+
+
+				}
+
+				.shop_sku_box_item:nth-child(1) {
+					margin-left: 0;
+				}
+
+				.disabled {
+					color: #999;
+					background-color: #F5F5F5;
+					border: 2rpx solid #F5F5F5;
+				}
+
+				.shop_sku_box_item_noselected {
+					color: #666;
+				}
+
+				.shop_sku_box_item_selected {
+					background: #FEFAF7;
+					border-radius: 8rpx;
+					border: 2rpx solid #E8AD7B;
+					color: #E8AD7B;
+				}
+			}
+
+		}
+
+		.shop_skuselect {
+			margin-top: 16rpx;
+			width: 100%;
+			// background: #f7f7f7;
+			color: #999;
+			font-size: 24upx;
+
+			.shop_skuselectname {
+				color: #000;
+				font-size: 26upx;
+			}
+		}
+
+		.shop_bottom {
+			width: 100%;
+			box-sizing: border-box;
+			padding: 30rpx 28rpx;
+			background-color: #fff;
+			box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1);
+			position: fixed;
+			left: 0;
+			bottom: 0;
+
+			.price {
+				display: flex;
+				align-items: flex-end;
+
+				.i {
+					font-size: 28rpx;
+					color: #E8AD7B;
+					position: relative;
+					bottom: 4upx;
+					font-weight: bold;
+				}
+
+				.num {
+					font-size: 42rpx;
+					color: #E8AD7B;
+					position: relative;
+					top: 6upx;
+					padding: 0 4upx;
+				}
+			}
+
+			.operation-wrap {
+				display: flex;
+				align-items: center;
+
+				.num {
+					font-size: 32upx;
+					padding: 0 16upx;
+				}
+
+				.btn {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					position: relative;
+
+					.btnClick {
+						width: 100rpx;
+						height: 100rpx;
+						position: absolute;
+						// bottom: 0;
+					}
+				}
+			}
+
+			.addShopping {
+				width: 100%;
+				height: 96rpx;
+				line-height: 96rpx;
+				text-align: center;
+				background: #ccc;
+				border-radius: 48rpx;
+				font-weight: 400;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				margin-top: 36rpx;
+			}
+
+			.addShopping.active {
+				background: #E8AD7B;
+			}
+		}
+	}
+
+
+	.shop-info-wrap {
+		padding: 0 30rpx 50rpx;
+		box-sizing: border-box;
+
+		.info-wrap {
+			padding: 30rpx 0;
+			box-sizing: border-box;
+
+			.shopName {
+				align-self: center;
+				font-size: 32rpx;
+				color: #333;
+				font-weight: bold;
+			}
+		}
+
+		.info-wrap-title {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #333;
+		}
+
+		.row {
+			.col {
+				margin-bottom: 10rpx;
+			}
+
+			.l,
+			.t {
+				font-size: 24rpx;
+				color: #999;
+			}
+		}
+	}
+
+	.cart-wrap {
+		width: 100%;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+		position: fixed;
+		bottom: 40rpx;
+		left: 0;
+		z-index: 99;
+
+		.cart-content {
+			display: flex;
+			align-items: center;
+			height: 128rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 20rpx 2rpx rgba(0, 0, 0, 0.15);
+			border-radius: 58rpx;
+			padding: 0 36rpx;
+			box-sizing: border-box;
+
+			.left {
+				flex: 1;
+				display: flex;
+				align-items: center;
+				position: relative;
+
+				.iconBox {
+					position: relative;
+				}
+
+				.icon {
+					width: 76rpx;
+					height: 88rpx;
+					margin-left: 22rpx;
+				}
+
+				.u-badge {
+					position: absolute;
+					top: -30rpx;
+					right: -30rpx;
+					background-color: #FF4B33;
+					color: #fff;
+					border-radius: 58rpx;
+					padding: 5rpx 14rpx;
+					box-sizing: border-box;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 20rpx;
+				}
+
+				.i,
+				.num {
+					color: #333;
+				}
+
+				.i {
+					font-size: 20upx;
+					position: relative;
+					top: 4upx;
+					margin-left: 64rpx;
+				}
+
+				.num {
+					font-size: 42upx;
+					font-weight: bold;
+				}
+			}
+
+			.btn {
+				height: 100%;
+				width: 40%;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+
+				.t {
+					width: 160rpx;
+					height: 64rpx;
+					line-height: 64rpx;
+					text-align: center;
+					background: #FEFAF7;
+					border-radius: 36rpx 36rpx 36rpx 36rpx;
+					border: 2rpx solid $my-main-color;
+					font-weight: bold;
+					font-size: 28rpx;
+					color: $my-main-color;
+				}
+			}
+		}
+	}
+
+	.history_order {
+		background-color: #fff;
+		padding: 12rpx 16rpx;
+		font-size: 24rpx;
+		color: #333;
+		display: flex;
+		align-items: center;
+		box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
+		position: fixed;
+		top: 50%;
+		right: 0;
+		transform: translateY(-50%);
+		border-radius: 100px 0 0 100px;
+		z-index: 20;
+
+		.img {
+			width: 36rpx;
+			margin-right: 8rpx;
+			height: 36rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 369daa9..9a605c7 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -33,7 +33,7 @@
 				</view>
 			</view>
 			<!-- 本店招牌菜 -->
-			<view class="panelfour" v-if="shopProductList.hots && shopProductList.hots.length > 0">
+			<view class="panelfour" v-if="carts.hotgoods && carts.hotgoods.length > 0">
 				本店招牌菜
 			</view>
 			<view class="panelfive ">
@@ -41,7 +41,7 @@
 				<scroll-view :scroll-x="true" :scroll-with-animation="false">
 					<view class="panelfive_list">
 						<view class="panelfiveitem" @click="clickspecifications(item,index,index,'热销')"
-							v-for="(item,index) in shopProductList.hots" :key="index">
+							v-for="(item,index) in carts.hotgoods" :key="index">
 							<image class="panelfiveitemimage" :src="item.coverImg" mode="aspectFill"></image>
 							<view class="vifgoodsImg flex-center"
 								v-if="item.isSale == 0 || (item.isSaleTime == 0 && !item.isSaleTimeshow) || item.isSoldStock == 1 || (item.isStock == 1 && item.stockNumber <= 0)">
@@ -84,7 +84,7 @@
 											:class="shopInfo.isVip == 0 || shopInfo.isMemberPrice==0?'lineThrough':''">¥</text>
 										<!-- 会员价与价格 -->
 										<text class="price">
-											{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(item.memberPrice||item.salePrice):item.salePrice}}
+											{{carts.useVipPrice?(item.memberPrice||item.salePrice):item.salePrice}}
 										</text>
 										<!-- 单位 -->
 										<text class="unit" v-if="item.unitName">/{{item.unitName}}</text>
@@ -106,7 +106,7 @@
 											:class="shopInfo.isVip ==0 || shopInfo.isMemberPrice==0?'lineThrough':''">¥</text>
 										<!-- 会员价与价格 -->
 										<text class="price">
-											{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(item.memberPrice|| item.salePrice):item.salePrice}}
+											{{carts.useVipPrice?(item.memberPrice|| item.salePrice):item.salePrice}}
 										</text>
 										<text class="unit" v-if="item.unitName">/{{item.unitName}}</text>
 										<!-- <text v-if="item.suitNum>1 && item.type!= 'sku'"
@@ -153,14 +153,14 @@
 				<view class="left" :style="{top: `${store.height}px`}">
 					<scroll-view :scroll-into-view="leftIntoView" :scroll-with-animation="false" :scroll-y="true"
 						:style="{height:`${store.screenHeight - store.height}px`}" style="padding-bottom: 200rpx;">
-						<view class="item" v-for="(item,index) in shopProductList.productInfo" :key="index"
+						<view class="item" v-for="(item,index) in carts.groupGoods" :key="index"
 							:class="{ 'active':index==leftIndex }" :id="'left-'+index" :data-index="index"
 							@click="leftTap(index)"><text>{{item.name}}</text></view>
 					</scroll-view>
 				</view>
 				<view class="main">
 					<view>
-						<view class="item main-item" v-for="(item,index) in shopProductList.productInfo" :key="index"
+						<view class="item main-item" v-for="(item,index) in carts.groupGoods" :key="index"
 							:id="'item-'+index">
 							<view class="title">
 								<view>{{item.name}}</view>
@@ -175,19 +175,25 @@
 									src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/1.gif" mode="" v-else
 									:lazy-load="true">
 								</image>
-								<view class="vifgoodsImg"
-									v-if="item1.isSale == 0 || (item1.isSaleTime == 0 && !item1.isSaleTimeshow) || item1.isSoldStock == 1 || (item1.isStock == 1 && item1.stockNumber <= 0)">
-									<image v-if="item1.isSale == 0" src="@/static/ztt/icon_goods_yxj.svg"
-										style="width:200rpx; height: 100%;" mode=""></image>
-									<image v-else-if="(item1.isSaleTime == 0 && !item1.isSaleTimeshow)"
-										src="@/static/ztt/icon_goods_wks.svg" style="width:200rpx; height: 100%;"
-										mode=""></image>
-									<image v-else-if="item1.isSoldStock == 1" src="@/static/ztt/icon_goods_sq.svg"
-										style="width:200rpx; height: 100%;" mode=""></image>
-									<image v-else-if="item1.isStock == 1 && item1.stockNumber <= 0"
-										src="@/static/ztt/icon_goods_kcbz.svg" style="width:200rpx; height: 100%;"
-										mode=""></image>
-								</view>
+								<block>
+									<view class="vifgoodsImg" v-if="item1.isSale == 0">
+										<image src="@/static/ztt/icon_goods_yxj.svg" style="width:200rpx; height: 100%;"
+											mode=""></image>
+									</view>
+									<view class="vifgoodsImg"
+										v-else-if="item1.isSaleTime == 0 && !item1.isSaleTimeshow">
+										<image src="@/static/ztt/icon_goods_wks.svg" style="width:200rpx; height: 100%;"
+											mode=""></image>
+									</view>
+									<view class="vifgoodsImg" v-else-if="item1.isSoldStock == 1">
+										<image src="@/static/ztt/icon_goods_sq.svg" style="width:200rpx; height: 100%;"
+											mode=""></image>
+									</view>
+									<view class="vifgoodsImg" v-else-if="item1.isStock == 1 && item1.stockNumber <= 0">
+										<image src="@/static/ztt/icon_goods_kcbz.svg"
+											style="width:200rpx; height: 100%;" mode=""></image>
+									</view>
+								</block>
 								<view v-if="index=='0'" class="topSort" :class="'c'+(index1+1)">TOP{{index1+1}}</view>
 								<view class="goods_right" style="overflow: hidden;">
 									<view class="name">{{ item1.name }}</view>
@@ -205,8 +211,11 @@
 										<view class="money">
 											<view>￥</view>
 											<text class="money_num" style="margin-right: 10rpx;">
-												{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1 ?(item1.memberPrice||item1.salePrice):item1.salePrice}}
+												{{carts.useVipPrice?(item1.memberPrice||item1.salePrice):item1.salePrice}}
 											</text>
+											<!-- <text class="money_num" style="margin-right: 10rpx;">
+												{{carts.useVipPrice ?(item1.memberPrice||item1.salePrice):item1.salePrice}}
+											</text> -->
 											<text v-if="item1.unitName">/{{item1.unitName}}</text>
 										</view>
 										<view class="flex-end">
@@ -221,7 +230,7 @@
 										<view class="money">
 											<view>￥</view>
 											<text class="money_num">
-												{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?(item1.memberPrice||item1.salePrice):item1.salePrice}}
+												{{carts.useVipPrice?(item1.memberPrice||item1.salePrice):item1.salePrice}}
 											</text>
 											<text class="money_num" v-if="item1.unitName">/{{item1.unitName}}</text>
 											<!-- <text v-if="item1.suitNum>1 && item1.type!= 'sku'"
@@ -267,21 +276,17 @@
 
 		</view>
 
-		<confirmorder ref="confirmorderref" :cartLists_count="cartLists_count" :cartList="matchedProducts"
-			:totalPrices='totalPrices' :confirmordershow="confirmordershow"
-			@close="confirmordershow = !confirmordershow" @customevent='websocketsendMessage' :orderinfo="orderinfo">
-		</confirmorder>
 
 		<!-- 店铺详情 -->
 		<shopindex ref="showShopInfoRef"></shopindex>
 		<!-- 购物车 -->
-		<shoppingCartes :cartLists_count="cartLists_count" :cartList="matchedProducts" :showCart="showCart"
-			@customevent='websocketsendMessage' @close="showCart = !showCart" :orderinfo="orderinfo"
-			@clickcancelOrder='clickcancelOrder' v-if="cartLists_count > 0">
+		<shoppingCartes :cartLists_count="carts.totalNumber" :cartList="carts.list" :showCart="showCart"
+			@clearCarts="clearCarts" @changeNumber="cartsChangeNumber" @close="showCart = !showCart"
+			:orderinfo="orderinfo"  v-if="!carts.isEmpty">
 		</shoppingCartes>
 
 		<!-- 显示购物车栏 -->
-		<view class="cart-wrap" v-if="cartLists_count > 0 && !confirmordershow && isBusinessTime">
+		<view class="cart-wrap" v-if="!carts.isEmpty   && isBusinessTime">
 			<view class="cart-content">
 				<view class="left">
 					<view class="iconBox">
@@ -289,11 +294,11 @@
 							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/shopIcon.png"
 							mode="aspectFill" @click="Historicalorders(true)">
 						</image>
-						<text class="u-badge"> {{cartLists_count<99?cartLists_count:'99+'}} </text>
+						<text class="u-badge"> {{carts.totalNumber <99?carts.totalNumber:'99+'}} </text>
 					</view>
 
 					<text class="i">￥</text>
-					<text class="num">{{totalPrices}}</text>
+					<text class="num">{{carts.payMoney}}</text>
 				</view>
 				<view class="btn" @tap="$u.debounce(orderdetail, 500)">
 					<text class="t">结算</text>
@@ -366,7 +371,7 @@
 						<view class="price" v-if="specifications.item.type != 'package' && specifications.item.result">
 							<text class="i">￥</text>
 							<text
-								class="num">{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1? (specifications.item.result.memberPrice||specifications.item.result.salePrice):specifications.item.result.salePrice}}</text>
+								class="num">{{carts.useVipPrice? (specifications.item.result.memberPrice||specifications.item.result.salePrice):specifications.item.result.salePrice}}</text>
 							<text class="i" v-if="specifications.item.unitName">/{{specifications.item.unitName}}</text>
 							<text v-if="specifications.item.result.suitNum>1">
 								「{{specifications.item.result.suitNum}}{{specifications.item.result.unitName}}起点」
@@ -375,7 +380,7 @@
 						<view class="price" v-else>
 							<text class="i">￥</text>
 							<text class="num">
-								{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1? (specifications.item.memberPrice||specifications.item.salePrice):specifications.item.salePrice}}
+								{{carts.useVipPrice? (specifications.item.memberPrice||specifications.item.salePrice):specifications.item.salePrice}}
 							</text>
 							<text class="i" v-if="specifications.item.unitName">
 								/{{specifications.item.unitName}}
@@ -418,11 +423,36 @@
 			<image class="img" src="@/static/history.png" mode=""></image>
 			<text>已下单菜品</text>
 		</view>
-		<Loading :isLoading="isLoading" />
+		<Loading :isLoading="!carts.isLinkFinshed" />
 	</view>
 </template>
 
 <script setup>
+	import {productStore} from '@/stores/user'
+	import {
+		useCartsStore
+	} from '@/stores/carts'
+	//购物车
+	const carts = useCartsStore();
+	function cartsChangeNumber(step, item) {
+		carts.changeNumber(step * 1, item);
+	}
+
+	function clearCarts() {
+		carts.clear();
+	}
+	
+	//用户信息
+	const userStore=productStore()
+	// 获取用户信息
+	userStore.actionsAPIuser(res=>{
+		console.log('userStore.actionsAPIuser');
+		console.log(res);
+		carts.changeUser(user)
+	})
+	
+	
+	
 	import {
 		ref,
 		reactive,
@@ -445,7 +475,7 @@
 	import Nav from '@/components/CustomNavbar.vue';
 	import shopindex from './components/shopindex.vue'
 	import shoppingCartes from './components/shoppingCartes.vue'
-	import confirmorder from './components/confirmorder.vue'
+	// import confirmorder from './components/confirmorder.vue'
 	import Loading from '@/components/Loading.vue';
 	import dayjs from 'dayjs';
 	import isBetween from 'dayjs/plugin/isBetween'
@@ -486,11 +516,6 @@
 	const storeMemberpay = Memberpay();
 	const store = useNavbarStore();
 
-	import {
-		productStore
-	} from '@/stores/user.js';
-
-	const userStore = productStore();
 
 	// 金额管理
 	import {
@@ -516,8 +541,7 @@
 	//店铺详情
 	const showShopInfoRef = ref(null)
 
-	// 初始加载中
-	const isLoading = ref(true);
+
 
 	//调用shop组件
 	const callChildMethod = () => {
@@ -541,7 +565,7 @@
 
 	// * 图片加载
 	const imageLoaded = (item, index, index1) => {
-		// shopProductList.productInfo[index].products[index1]['imgLoad'] = true;
+		// carts.groupGoods[index].products[index1]['imgLoad'] = true;
 	}
 
 	// 计算左侧位置
@@ -812,132 +836,6 @@
 	//添加购物车数量
 	const shopCartNumber = ref(0)
 
-	// 多规格 套餐添加数量
-	const shopCart = async (i) => {
-		if (i == '-' && shopCartNumber.value >= 0) {
-			shopCartNumber.value = 0
-			return false;
-		}
-		let res = await shoppingcart()
-		if (i == '-') {
-			if (!res && shopCartNumber.value == specifications.item.suitNum) {
-				uni.showToast({
-					title: `起点${specifications.item.suitNum}个`,
-					icon: 'none'
-				})
-				return false;
-			} else {
-				shopCartNumber.value--;
-			}
-		} else {
-			if (!res && shopCartNumber.value < 1) {
-				console.log(res, specifications)
-				if (specifications.type == 'sku') {
-					shopCartNumber.value = parseFloat(specifications.item.result.suitNum);
-				} else {
-					shopCartNumber.value = parseFloat(specifications.item.suitNum);
-				}
-			} else {
-				shopCartNumber.value++;
-			}
-		}
-	}
-
-	// 套餐比较两个对象是否相等
-	function isObjectEqual(obj1, obj2) {
-		if (typeof obj1 !== 'object' || obj1 === null || typeof obj2 !== 'object' || obj2 === null) {
-			return obj1 === obj2;
-		}
-		const keys1 = Object.keys(obj1);
-		const keys2 = Object.keys(obj2);
-		if (keys1.length !== keys2.length) {
-			return false;
-		}
-		for (const key of keys1) {
-			if (Array.isArray(obj1[key]) && Array.isArray(obj2[key])) {
-				if (!isArrayEqual(obj1[key], obj2[key])) {
-					return false;
-				}
-			} else if (!isObjectEqual(obj1[key], obj2[key])) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	// 比较两个数组是否相等（忽略顺序）
-	function isArrayEqual(arr1, arr2) {
-		if (arr1.length !== arr2.length) {
-			return false;
-		}
-		const usedIndices = new Array(arr2.length).fill(false);
-		for (const item1 of arr1) {
-			let found = false;
-			for (let i = 0; i < arr2.length; i++) {
-				if (!usedIndices[i] && isObjectEqual(item1, arr2[i])) {
-					usedIndices[i] = true;
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	// 根据购物车的数据匹配选中的商品查找是否有匹配的数组
-	const matchingProduct = async (data) => {
-		return matchedProducts.value.find((product, index) => {
-			if (specifications.type == 'package') {
-				// 套餐
-				let result = false;
-				try {
-					if (product.type == "package") {
-						let res = JSON.parse(product.cartListinfo.pro_group_info);
-						result = isArrayEqual(res, selectedGroupSnap.value);
-					}
-				} catch (error) {
-					//TODO handle the exception
-				}
-				// 直接返回布尔值
-				return result;
-			} else if (specifications.item.type == 'sku') {
-				// 多规格
-				return product.cartListinfo.sku_id == data.id && product.cartListinfo.product_id == data
-					.productId
-			} else {
-				// 其他
-				return product.skuId == data.skuId && product.id == data.id
-			}
-		});
-	}
-
-	// 判断多规格和套餐  商品是否在购物车有数据
-	const shoppingcart = async () => {
-		let res = null
-		if (specifications.item.type == "package") {
-			if (!allConditionsSatisfied.value) {
-				return false
-			}
-			// 是否是套餐package
-			selectedGroupSnap.value = specifications.item.groupSnap.map((setmenu, index) => {
-				return {
-					...setmenu,
-					goods: selectedOptions.value[index]
-				};
-			});
-			res = await matchingProduct(selectedGroupSnap.value)
-		} else {
-			if (!canSubmit.value) {
-				return false
-			}
-			res = await matchingProduct(specifications.item.result)
-		}
-		return res;
-	}
-
 
 	// 提交选择并执行下一步操作的方法
 	const submitSelection = async () => {
@@ -965,7 +863,7 @@
 				selectedGroupSnap.value = []
 			}
 
-			websocketsendMessage({
+			carts.add({
 				id: res ? res.cartListId : '',
 				type: 'shopping',
 				suitNum: specifications.productListitem.suitNum,
@@ -982,6 +880,24 @@
 				is_print: 1,
 				product_type: specifications.item.type
 			})
+
+			// websocketsendMessage({
+			// 	id: res ? res.cartListId : '',
+			// 	type: 'shopping',
+			// 	suitNum: specifications.productListitem.suitNum,
+			// 	table_code: uni.cache.get('tableCode'),
+			// 	shop_id: uni.cache.get('shopId'),
+			// 	operate_type: res ? 'edit' : 'add',
+			// 	product_id: specifications.product_id,
+			// 	sku_id: specifications.sku_id,
+			// 	number: res ? await calculateValue(res.cartNumber, '+', shopCartNumber.value) :
+			// 		shopCartNumber
+			// 		.value,
+			// 	pro_group_info: selectedGroupSnap.value,
+			// 	goods_type: specifications.item.type == "package" ? 'package' : '',
+			// 	is_print: 1,
+			// 	product_type: specifications.item.type
+			// })
 			// 清空套餐选中
 			selectedGroupSnap.value = []
 			showShopsku.value = false
@@ -1068,6 +984,18 @@
 		return isInRange;
 	}
 
+
+	function addCarts(item, isWeight = false) {
+		if (isWeight) {
+			carts.add({
+				...item
+			});
+			return;
+		}
+		carts.add({
+			...item
+		});
+	}
 	// 单规格
 	const singleclick = async (item, i) => {
 		if (!isProductAvailable(item.days, item.startTime, item.endTime)) {
@@ -1077,26 +1005,18 @@
 			return false;
 		}
 		// 判断购物车是否有该选中商品
-		let res = null
-		try {
-			res = matchedProducts.value.find((product, index) => {
-				return product.skuId == item.skuId && product.id == item.id
-			});
-		} catch (error) {
-			//TODO handle the exception
-		}
 
 		// 保存这次点击的
 		specifications.productListitem = item
-
-		// 是否起售 如果小于或者大于都是1
-		let suitNum = 1;
-		const cartNumberFloat = parseFloat(item.cartNumber);
-		if (!res && item.suitNum > cartNumberFloat) {
-			suitNum = item.suitNum;
-		} else if (item.suitNum >= cartNumberFloat && i === '-') {
-			suitNum = item.cartNumber;
-		}
+		console.log(item);
+		addCarts({
+			suitNum: item.suitNum || 1,
+			product_id: item.id,
+			sku_id: item.skuList[0].id,
+			number: item.skuList[0].suitNum || 1,
+			product_type: item.type,
+		});
+		return
 		websocketsendMessage({
 			id: res ? item.cartListId : '',
 			type: 'shopping',
@@ -1134,190 +1054,62 @@
 			shop_id: uni.cache.get('shopId')
 		}
 	}
-	const {
-		isConnected,
-		sendMessage,
-		closeSocket: manualClose,
-		receivedMessages,
-		closeExistingConnection,
-		onShowconnect,
-		initNetworkListener
-	} = useWebSocket(options);
+
+	try{
+		carts.init({
+			type: 'shopping',
+			operate_type: 'init',
+			table_code: uni.cache.get('tableCode'),
+			shop_id: uni.cache.get('shopId')
+		}, {});
+	}catch(err){
+		console.error('购物车数据初始化失败')
+	}
+	
+
+
+	function sendMessage() {}
+
+	function closeSocket() {}
+
+	function receivedMessages() {}
+
+	function closeExistingConnection() {}
+
+	function onShowconnect() {}
+
+	function initNetworkListener() {}
+	// const {
+	// 	isConnected,
+	// 	sendMessage,
+	// 	closeSocket: manualClose,
+	// 	receivedMessages,
+	// 	closeExistingConnection,
+	// 	onShowconnect,
+	// 	initNetworkListener
+	// } = useWebSocket(options);
 
 	//购物车显示
 	const showCart = ref(false)
 
-	// 提交订单显示
-	const confirmordershow = ref(false)
 
 
-	// 更新商品数量的方法
-	const updateProductQuantities = () => {
-		// 先将所有商品的 cartNumber 初始化为 0
-		shopProductList.hots.forEach((i) => {
-			i.cartNumber = 0
-		})
-		// 遍历商品列表二维数组
-		shopProductList.productInfo.forEach((group) => {
-			group.productList.forEach((product) => {
-				product.cartNumber = 0
-			});
-		});
-
-		// 再去更新数组的值
-		cartListFilter.value.forEach((cartItem) => {
-			shopProductList.productInfo.forEach((group) => {
-				group.productList.forEach((product) => {
-					if (product.id == cartItem.product_id && product.skuId == cartItem
-						.sku_id) {
-						product.cartNumber = cartItem.number
-						product.cartListId = cartItem.id
-					}
-				});
-			});
-		});
-		// 遍历购物车数组
-		cartListFilter.value.forEach((cartItem) => {
-			// 遍历商品列表二维数组
-			shopProductList.hots.forEach((group) => {
-				// 商品 id 匹配
-				if (group.id == cartItem.product_id) {
-					// 更新商品的数量
-					group.cartListId = cartItem.id
-					group.cartNumber = cartItem.number
-				}
-			});
-		});
-	}
-
-	//websocket产值
-	const websocketsendMessage = (data) => {
-		uni.$u.debounce(sendMessage(data), 500)
-	}
-
-	// 用于记录已经处理过的消息的 msg_id
-	const processedMessageIds = new Set();
-
-	// 监听接收到的消息变化
-	watchEffect(async () => {
-		if (isDataLoaded.value && receivedMessages.value) {
-			const Message = receivedMessages.value
-			if (Message) {
-				console.log(Message.data);
-				// 心跳返回  过滤
-				if (Message.type == "ping_interval" || Message.msg_id == "ping_interval") {
-					isLoading.value = false;
-					return false
-				}
-				// 检查消息是否已经处理过
-				if (processedMessageIds.has(Message.msg_id)) {
-					return;
-				}
-				processedMessageIds.add(Message.msg_id);
-
-				// 初始化
-				if (Message.operate_type == "init") {
-					cartStore.carts = Message.data
-					uni.hideLoading();
-					isLoading.value = false;
-				}
-
-				// 清空购物车
-				if (Message.operate_type == 'cleanup') {
-					cartStore.carts = []
-					setTimeout(() => {
-						Historicalorders()
-					}, 400)
-					showCart.value = false
-				}
-
-				// 删除除购物车
-				if (Message.operate_type == 'del' && Message.status == 1) {
-					// 优化：使用可选链操作符避免报错
-					cartStore.carts = cartStore.carts.filter(item => item.id !== Message.data?.id);
-					// cartStore.carts = cartStore.carts.filter(item => item.id != Message.data.id);
-				}
-
-				// 添加或者减少购物后返回
-				if (Message.operate_type == 'add' || Message.operate_type == 'edit') {
-					[Message.data].forEach((objA) => {
-						const index = cartStore.carts.findIndex((objB) => objB.id == objA.id);
-						if (index !== -1) {
-							cartStore.carts[index] = objA;
-						} else {
-							cartStore.carts.push(objA);
-						}
-					});
-				}
-
-				// 历史订单
-				if (Message.operate_type == 'clearOrder') {
-					Historicalorders()
-				}
-
-				// 购物车数据更新从新请求
-				if (Message.type == 'product' && Message.data_type == 'product_update' && Message
-					.operate_type == 'product_update') {
-					isDataLoaded.value = false;
-					productqueryProduct()
-				}
-
-				// 提示
-				if (Message.status == 0 && Message.type != 'no_suit_num') {
-					uni.showToast({
-						title: Message.msg,
-						icon: "none"
-					})
-				}
-
-				if (Message.type == 'no_suit_num') {
-					// console.log(specifications)
-					uni.showModal({
-						title: '提示',
-						showCancel: false,
-						content: '此商品库存不足起售数量！',
-						success: async (data) => {
-							await websocketsendMessage({
-								id: Message.id,
-								type: 'shopping',
-								table_code: uni.cache.get('tableCode'),
-								shop_id: uni.cache.get('shopId'),
-								operate_type: 'del',
-								is_print: 1,
-							})
-						}
-					});
-				}
-
-				//除去p 每次返回都回执消息
-				await websocketsendMessage({
-					type: 'receipt',
-					msg_id: Message.msg_id
-				})
-
-				// 初始化商品数量
-				await updateProductQuantities()
-
-			}
-		}
-	})
-
-	// 更新购物车数据shopProductList.hots
+	// 更新购物车数据carts.hotgoods
 	const matchedProducts = computed(() => {
-		if (cartStore.carts.length > 0) {
+		if (carts.list.length > 0) {
 			let Specialstop = null
 
 			try {
 				Specialstop = [...[{
 					id: "",
 					name: "",
-					productList: shopProductList.hots
-				}], ...shopProductList.productInfo]
+					productList: carts.hotgoods
+				}], ...carts.groupGoods]
 			} catch (error) {
-				Specialstop = shopProductList.productInfo
+				Specialstop = carts.groupGoods
 				//TODO handle the exception
 			}
-			return cartStore.carts.flatMap((cartItem) => {
+			return carts.list.flatMap((cartItem) => {
 				for (const group of Specialstop) {
 					for (const product of group.productList) {
 						if (product.id == cartItem.product_id) {
@@ -1351,26 +1143,10 @@
 
 	})
 
-	//删除某一个待支付订单
-	const clickcancelOrder = async (data) => {
-		if (data.i == 'all') {
-			await APIcancelOrder({
-				shopId: uni.cache.get('shopId'),
-				orderId: orderinfo.value.id,
-			})
-		} else {
-			await APIrmPlaceOrder({
-				shopId: uni.cache.get('shopId'),
-				orderId: orderinfo.value.id,
-				placeNum: data.key
-			})
-		}
-		Historicalorders()
-	}
 
 	// 储存是否存在多次下单
 	const orderinfo = ref({})
-	const confirmorderref = ref(null)
+	// const confirmorderref = ref(null)
 
 	// 结账
 	const orderdetail = async () => {
@@ -1379,17 +1155,12 @@
 				.cache.get(
 					'shopId')
 		})
-		return
-		try {
-			await Historicalorders()
-		} catch (error) {}
-		confirmordershow.value = true
-		showCart.value = false
 	}
 
 	// 历史订单
 	const Historicalorders = async (W) => {
-
+		console.log('Historicalorders');
+		console.log(W);
 		if (W) {
 			showCart.value = !showCart.value
 		} else {
@@ -1404,89 +1175,6 @@
 		}
 	}
 
-	// 提取合并 orderinfo.detailMap 数组的逻辑
-	function combineOrderInfoDetailMap(orderinfo) {
-		if (!orderinfo) return [];
-		let combinedArray = [];
-		for (const key in orderinfo.detailMap) {
-			if (orderinfo.detailMap.hasOwnProperty(key)) {
-				let subArray = orderinfo.detailMap[key];
-				combinedArray = [...combinedArray, ...subArray];
-			}
-		}
-		return combinedArray;
-	}
-
-	// 计算购物车商品费用
-	const totalPrices = computed(() => {
-		// 待支付订单
-		let cartone = 0
-		if (orderinfo.value) {
-			let combinedArray = [];
-			for (const key in orderinfo.value.detailMap) {
-				if (orderinfo.value.detailMap.hasOwnProperty(key)) {
-					let subArray = orderinfo.value.detailMap[key];
-					combinedArray = [...combinedArray, ...subArray]
-				}
-			}
-			// 购物车总数价格
-			cartone = combinedArray.reduce((total, item) => {
-				// 是否启用会员价 0否1是
-				if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
-					// memberPrice会员价
-					return total + (parseFloat(item.memberPrice || item.price) * parseFloat(item.num - item
-						.returnNum));
-				} else {
-					// salePrice销售价
-					return total + (parseFloat(item.price || 0) * parseFloat(item.num - item.returnNum));
-				}
-			}, 0);
-		}
-		// 购物车总数价格
-		let cart = 0
-		if (matchedProducts.value.length > 0) {
-			// 购物车总数价格
-			cart = matchedProducts.value.reduce((total, item) => {
-				if (item.type == 'sku') {
-					item.skuList.forEach((i, t) => {
-						if (item.cartListinfo.sku_id == i.id) {
-							item.memberPrice = i.memberPrice
-							item.salePrice = i.salePrice
-						}
-					})
-				}
-				// 是否启用会员价 0否1是
-				if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
-					// memberPrice会员价
-					return total + parseFloat(item.memberPrice || item.salePrice) * parseFloat(item
-						.cartNumber);
-				} else {
-					// salePrice销售价
-					return total + parseFloat(item.salePrice || 0) * parseFloat(item.cartNumber);
-				}
-			}, 0);
-		}
-		cart = parseFloat(cart)
-		// 向上取整并保留两位小数
-		return parseFloat(cart.toFixed(2));
-	});
-
-	// 计算购物车商品总数量
-	const cartLists_count = computed(() => {
-		const combinedOrderInfo = combineOrderInfoDetailMap(orderinfo.value);
-		const orderInfoCount = combinedOrderInfo.reduce((sum, item) => {
-			return sum + parseFloat(item.num);
-		}, 0);
-
-		const matchedProductsCount = matchedProducts.value.reduce((sum, item) => {
-			const num = typeof item.cartNumber === 'string' ? parseFloat(item.cartNumber) : item
-				.cartNumber;
-			return sum + num;
-		}, 0);
-
-		const totalCount = matchedProductsCount;
-		return parseFloat(totalCount.toFixed(2));
-	});
 
 	// 定义 ifcartNumber 计算属性方法 展示数量 
 	const ifcartNumber = computed(() => {
@@ -1513,31 +1201,6 @@
 		};
 	})
 
-	// 计算处理后的购物车列表 	// 用于筛选后的购物车数组
-	const cartListFilter = computed(() => {
-		// 使用 reduce 方法对 cartList 进行处理
-		const grouped = cartStore.carts.reduce((acc, item) => {
-			const productId = item.product_id;
-			const num = parseFloat(item.number);
-
-			if (!acc[productId]) {
-				// 如果 acc 中还没有该 product_id 的记录，创建一个新对象
-				acc[productId] = {
-					...item,
-					number: num
-				};
-			} else {
-				// 如果已经有该 product_id 的记录，将当前对象的 number 值累加到已有记录的 number 属性上
-				acc[productId].number += num;
-			}
-			return acc;
-		}, {});
-		// 将累加结果保留两位小数，并将对象转换为数组
-		return Object.values(grouped).map(item => ({
-			...item,
-			number: item.number.toFixed(2)
-		}));
-	})
 
 	const endTimeref = reactive({
 		startTime: '',
@@ -1568,80 +1231,25 @@
 		return currentTime >= startTime && currentTime <= endTime;
 	});
 
-
-	// 列表请求
-	const productqueryProduct = async () => {
-		cartStore.goodsIsloading = false;
-		try {
-			shopProductList.hots = await productminiApphotsquery()
-			shopProductList.productInfo = await APIgroupquery()
-		} catch (error) {
-			uni.showToast({
-				title: '网络不稳定，请重新扫码进入',
-				icon: 'none'
-			})
-			setTimeout(() => {
-				uni.pro.switchTab('index/index')
-			}, 1000)
-		}
-		if (shopProductList.productInfo.length > 0 || shopProductList.hots.length > 0) {
-			//TODO handle the exception
-			//第一步：将所有商品的 cartNumber 初始化为 0
-			shopProductList.productInfo.forEach((group) => {
-				group.productList.forEach(async (product) => {
-					product.cartNumber = 0;
-					product.isSaleTimeshow = await isProductAvailable(product.days, product
-						.startTime, product.endTime)
-					cartStore.setGoodsMap(product.id, product)
-				});
-			});
-			shopProductList.hots.forEach(async (i) => {
-				i.cartNumber = 0
-				i.isSaleTimeshow = await isProductAvailable(i.days, i.startTime, i.endTime)
-				cartStore.setGoodsMap(i.id, i)
-			})
-			cartStore.goodsIsloading = true;
-			scrollTopSize.value = 0
-			topArr.value = []
-			// userStore.actionsAPIuser()
-			// 数据可以更新
-			isDataLoaded.value = true;
-			// 历史订单
-			Historicalorders()
-		} else {
-			uni.showToast({
-				title: '暂无列表数据,请重新扫码',
-				icon: "none"
-			});
-			isDataLoaded.value = false;
-			setTimeout(() => {
-				uni.pro.switchTab('index/index')
-			}, 1000)
-			return false;
-		}
-
-
-	}
-
 	onLoad(async (e) => {
 		await proxy.$onLaunched;
 	})
 
-	onShow(async() => {
+	onShow(async () => {
 		// 监听页面显示和隐藏
 		onShowconnect()
 		let res = await APIhistoryOrder({
 			tableCode: uni.cache.get('tableCode'),
 		})
-		if(res){
+		if (res) {
 			orderinfo.value = {
 				id: res.id,
 				detailMap: res.detailMap,
 				placeNum: res.placeNum
 			}
-		}else{
+		} else {
 			orderinfo.value = {
-				id:''
+				id: ''
 			}
 		}
 	})
@@ -1662,14 +1270,11 @@
 			tableCode: uni.cache.get('tableCode'),
 		})
 
-		await productqueryProduct()
 		if (res && res.id && shopInfo.registerType == "after") {
 			toHistory()
 			return
 		}
 		setTimeout(() => {
-			// 启动网络监听
-			initNetworkListener()
 			getElementTop()
 		}, 500)
 	})
diff --git a/pages/test/test.vue b/pages/test/test.vue
index 6e89ea4..5668ed6 100644
--- a/pages/test/test.vue
+++ b/pages/test/test.vue
@@ -1,65 +1,29 @@
 <template>
 	<view class="u-p-30">
-		<view>
-			<up-button type="warning" @click="popupShow">初始化</up-button>
-		</view>
-		<view class="u-m-t-30">
-			<up-button type="primary" @click="toCreate">去下单</up-button>
-		</view>
-		
-		<up-popup :show="show" mode="bottom" close-on-click-overlay @close="resetForm">
-			<view class="u-p-30">
-				<up-form label-width="80" ref="refForm">
-					<up-form-item label="台桌码">
-							<up-input v-model="form.tableCode" placeholder="请输入台桌码"></up-input>
-					</up-form-item>
-				</up-form>
-				<view class="u-flex gap-20 u-m-t-30">
-					<up-button @click="show=false">取消</up-button>
-					<up-button type="primary" @click="scanCodehandle">确定</up-button>
-				</view>
-			</view>
-			
-		</up-popup>
 	</view>
 </template>
 
 <script setup>
-	import {onLoad} from '@dcloudio/uni-app'
-	import { reactive,ref} from 'vue'
 	import {
-		productStore
-	} from '@/stores/user.js';
-	const store = productStore();
-	const scanCodehandle = async (i) => {
-		await store.scanCodeactions(form)
-	}
-	const show=ref(false);
-	const options=ref({})
-	function popupShow(){
-		show.value=true;
-	}
-	const refForm=ref(null);
-	const form=reactive({
-		tableCode:"40963902920"
+		ref
+	} from 'vue';
+	import {
+		useCartsStore
+	} from '@/stores/carts'
+	const carts = useCartsStore();
+	console.log(carts);
+	const table = ref({
+		tableCode: '40963902920',
 	})
-	function resetForm(){
-		form.tableCode=""
-	}
-	onLoad((opt)=>{
-		console.log(opt);
-		options.value=opt
-	})
-	function toCreate(){
-		uni.navigateTo({
-			url:'/pages/index/index'
-		})
-	}
+	carts.init({
+		table_code: table.value.tableCode,
+		shop_id:"29",
+		account:29
+	}, {});
 </script>
 
 <style lang="scss" scoped>
-	.gap-20{
+	.gap-20 {
 		gap: 20rpx;
 	}
-
-</style>
+</style>
\ No newline at end of file
diff --git a/stores/carts.js b/stores/carts.js
deleted file mode 100644
index 9e4015d..0000000
--- a/stores/carts.js
+++ /dev/null
@@ -1,452 +0,0 @@
-import {
-	defineStore
-} from 'pinia';
-import {
-	ref,
-	computed,
-	reactive,
-	watchEffect
-} from 'vue';
-import {
-	productminiApphotsquery,
-	APIgroupquery,
-} from "@/common/api/product/product.js";
-export const useCartsStore = defineStore('cart',
-	() => {
-		// const dinersNum = uni.cache.get('dinersNum')
-		// const isVip = uni.cache.get('orderVIP').isVip //此用户是否是会员
-		// const isMemberPrice = uni.cache.get('ordershopUserInfo').isMemberPrice //此店是否可以用会员
-		// const isTableFee = uni.cache.get('ordershopUserInfo').isTableFee //此店是否免桌位费
-		// const tableFee = uni.cache.get('ordershopUserInfo').tableFee //一个餐位费多钱
-
-		const goodsIsloading = ref(true);
-
-
-
-		//商品数据Map
-		const goodsMap = reactive({})
-		//获取商品数据
-		async function goodsInit() {
-			goodsIsloading.value=true;
-			//获取招牌菜商品
-			const hotres = await productminiApphotsquery();
-			for (let product of hotres) {
-				setGoodsMap(product.id, product)
-			}
-			//获取分组商品
-			const groupres = await APIgroupquery()
-			for (let group of groupres) {
-				for (let product of group.productList) {
-					setGoodsMap(product.id, product)
-				}
-			}
-			goodsIsloading.value = false
-		}
-
-		function setGoodsMap(product_id, data) {
-			goodsMap[product_id] = data;
-		}
-
-		//websocket回执
-		const websocketsendMessage = (data) => {
-			uni.$u.debounce(sendMessage(data), 500)
-		}
-
-		const isLoading = ref(true);
-
-		function getProductDetails(v) {
-			const goods = goodsMap[v.product_id]
-			if (!goods) {
-				return undefined
-			}
-			let skuData = undefined;
-			skuData = goods?.skuList.find((sku) => sku.id == v.sku_id);
-
-			// if (goods.type == 'package') {
-			//   //套餐商品
-			//   const SnapSku = findInGroupSnapSku(goods.groupSnap, v.sku_id)
-			//   skuData = { ...SnapSku, salePrice: SnapSku ? SnapSku.price : 0 }
-			// } else {
-			//   skuData = goods?.skuList.find((sku: { id: string, salePrice: number }) => sku.id == v.sku_id);
-			// }
-			skuData = goods?.skuList.find((sku) => sku.id == v.sku_id);
-
-			if (skuData) {
-				return {
-					...v,
-					productId: v.product_id,
-					salePrice: skuData ? skuData.salePrice : 0,
-					price: skuData ? skuData.salePrice : 0,
-					memberPrice: skuData ? skuData.memberPrice : 0,
-					coverImg: goods.coverImg,
-					productImg: goods.coverImg,
-					name: goods.name,
-					productName: goods.name,
-					specInfo: skuData.specInfo,
-					packFee: goods.packFee || 0,
-					type: goods.type,
-					skuData,
-					skuName: skuData.name,
-					num: v.number * 1
-				}
-			} else {
-				return undefined
-			}
-		}
-		// 用于记录已经处理过的消息的 msg_id
-		const processedMessageIds = new Set();
-
-		//购物车商品信息补全初始化
-		function cartsGoodsInfoInit(arr) {
-			carts.value = arr.map(v => {
-				return getProductDetails(v)
-			}).filter(v => v)
-		}
-		
-
-		//收到socket消息时对购物车进行处理
-		async function onMessage(Message) {
-			console.log('Message');
-			console.log(Message);
-			if (Message) {
-				// 心跳返回  过滤
-				if (Message.type == "ping_interval" || Message.msg_id == "ping_interval") {
-					isLoading.value = false;
-					return false
-				}
-				// 检查消息是否已经处理过
-				if (processedMessageIds.has(Message.msg_id)) {
-					return;
-				}
-				processedMessageIds.add(Message.msg_id);
-				const msgData = Message.data
-				// 初始化
-				if (Message.operate_type == "init") {
-					console.log('carts init', msgData);
-					cartsGoodsInfoInit(msgData)
-					uni.hideLoading();
-					isLoading.value = false;
-				}
-
-				// 清空购物车
-				if (Message.operate_type == 'cleanup') {
-					carts.value = []
-				}
-
-				// 删除除购物车
-				if (Message.operate_type == 'del' && Message.status == 1) {
-					// 优化：使用可选链操作符避免报错
-					carts.value = carts.value.filter(item => item.id !== msgData?.id);
-					// carts.value = carts.value.filter(item => item.id != Message.data.id);
-				}
-
-				// 添加或者减少购物后返回
-				if (Message.operate_type == 'add' || Message.operate_type == 'edit') {
-					const index = carts.value.findIndex((v => v.id == msgData.id))
-					if (index !== -1) {
-						carts.value[index] = getProductDetails(msgData);
-					} else {
-						carts.value.push(getProductDetails(msgData));
-					}
-				}
-
-				// 历史订单
-				if (Message.operate_type == 'clearOrder') {}
-
-				// 购物车数据更新从新请求
-				if (Message.type == 'product' && Message.data_type == 'product_update' && Message
-					.operate_type == 'product_update') {
-					await goodsInit()
-					await cartsGoodsInfoInit()
-				}
-
-				// 提示
-				if (Message.status == 0 && Message.type != 'no_suit_num') {
-					uni.showToast({
-						title: Message.msg,
-						icon: "none"
-					})
-				}
-
-				if (Message.type == 'no_suit_num') {
-					// console.log(specifications)
-					uni.showModal({
-						title: '提示',
-						showCancel: false,
-						content: '此商品库存不足起售数量！',
-						success: async (data) => {
-
-						}
-					});
-				}
-
-
-
-			}
-		}
-		
-	
-		//购物车数据
-		const carts = ref([])
-
-		//历史订单数据
-		const oldOrder = ref({
-			detailMap: {},
-			originAmount: 0
-		})
-
-
-		// 会员信息
-		const orderVIP = ref(uni.cache.get('orderVIP') || {
-			isVip: false
-		})
-
-		function updateData(key, newval) {
-			if (key === 'orderVIP') {
-				uni.cache.set('orderVIP', newval)
-				return orderVIP.value = newval
-			}
-			if (key === 'shopInfo') {
-				uni.cache.set('shopInfo', newval)
-				return shopInfo.value = newval
-			}
-		}
-
-		// 商品订单会员
-		const shopInfo = ref(uni.cache.get('shopInfo') || {
-			isMemberPrice: 0
-		})
-
-		//是否使用会员价
-		const useVipPrice = computed(() => {
-			const isUse=(orderVIP.value.isVip && shopInfo.value.isMemberPrice)?true:false
-			console.log('useVipPrice',isUse);
-			return isUse
-		})
-		function currentCalcMpneyNumber(item){
-			const n=item.number-(item.returnNum||0)
-			return n<=0?0:n
-		}
-		//历史订单商品价格总和
-		const oldOrderMoney = computed(() => {
-			let total = 0
-			for (let i in oldOrder.value.detailMap) {
-				total += oldOrder.value.detailMap[i].reduce((prve, cur) => {
-					if (cur.isGift) {
-						return prve + 0
-					}
-					const discount_sale_amount = cur.discount_sale_amount * 1 || 0
-					const memberPrice = cur.skuData ? (cur.skuData.memberPrice || cur.skuData
-						.salePrice) : 0
-					const price = (discount_sale_amount || cur.salePrice || 0)
-					const number =currentCalcMpneyNumber(cur) 
-					return prve + (number <= 0 ? 0 : number) * (discount_sale_amount || (useVipPrice
-						.value ? memberPrice : price))
-				}, 0)
-			}
-			return total
-		})
-
-		//当前购物车总价格
-		const totalPrice = computed(() => {
-			const money = carts.value.reduce((prve, cur) => {
-				const memberPrice = cur.memberPrice || cur.salePrice
-				const price = useVipPrice.value ? memberPrice : cur.salePrice;
-				const curMoney = price * currentCalcMpneyNumber(cur) 
-				return prve + curMoney
-			}, 0)
-			return money
-		})
-		// 霸王餐购物车原价，不享受任何优惠
-		const totalOriginPrice = computed(() => {
-			const money = carts.value.reduce((prve, cur) => {
-				const curMoney = cur.salePrice * currentCalcMpneyNumber(cur) 
-				return prve + curMoney
-			}, 0)
-			return money
-		})
-
-		//商品券抵扣金额
-		// const productCouponDiscountAmount = computed(() => {
-		//   let index = -1;
-		//   return quansSelArr.value.reduce((pre, cur) => {
-		//     index++;
-		//     return pre + returnProDiscount(cur, index) * 1;
-		//   }, 0);
-		// });
-	
-
-		//返回打包数量（称重商品打包数量最大为1）
-		function returnCartPackNumber(cur) {
-			const maxReturnNum = cur.number - (cur.returnNum || 0);
-			let pack_number = cur.number;
-			pack_number = (cur.product_type == 'weight' && pack_number > 1) ? 1 : pack_number;
-			pack_number = Math.min(maxReturnNum, pack_number);
-			pack_number = pack_number <= 0 ? 0 : pack_number
-			return pack_number * 1
-		}
-		
-		
-		//当前购物车打包费
-		const totalPackFee = computed(() => {
-			const money = carts.value.reduce((prve, cur) => {
-				const curMoney = (cur.packFee || 0) * currentCalcMpneyNumber(cur) 
-				return prve + curMoney
-			}, 0)
-			return money
-		})
-			
-		//打包费
-		const packFee = computed(() => {
-			const nowPackFee = carts.value.reduce((acc, cur) => {
-				return acc + (cur.packFee || 0) * returnCartPackNumber(cur)
-			}, 0)
-			let oldPackfee = 0;
-			for (let i in oldOrder.value.detailMap) {
-				oldPackfee += oldOrder.value.detailMap[i].reduce((prve, cur) => {
-					return prve + (cur.packFee || 0) * returnCartPackNumber(cur)
-				}, 0)
-			}
-			return nowPackFee + oldPackfee
-		})
-
-		//购物车是否为空
-		const isEmpty = computed(() => {
-			return !carts.value || carts.value.length <= 0
-		})
-		// 计算向上取整
-		const roundUpToTwoDecimals = (num, i) => {
-			// 先将数字乘以 100 并转换为字符串保留足够的小数位
-			let temp = (num * 100).toFixed(10);
-			// 向上取整
-			let rounded = null
-			if (i == 'upward') {
-				rounded = Math.ceil(parseFloat(temp));
-			} else {
-				rounded = Math.floor(parseFloat(temp));
-			}
-			// 再除以 100 得到保留两位小数的结果
-			return rounded / 100;
-		};
-
-		// 精确计算函数
-		const preciseCalculation = (num1, num2) => {
-			// 将数字转换为整数，乘以 100 以保留两位小数
-			const int1 = BigInt(Math.round(num1 * 100));
-			const int2 = BigInt(Math.round(num2 * 100));
-			// 执行乘法运算
-			const result = int1 * int2;
-			// 再除以 10000 以还原为原来的小数
-			return Number(result) / 10000;
-		};
-
-		// 计算购物车商品总价格
-		const getTotalTotalPrices = (matchedProducts, isBwc = true) => {
-			if (!matchedProducts || !Array.isArray(matchedProducts)) {
-				return 0;
-			}
-			// console.log(uni.cache.get('orderVIP').isVip, uni.cache.get('ordershopUserInfo').isMemberPrice,
-			// 	111)
-			// 购物车总数价格
-			console.log('isBwc');
-			console.log(isBwc);
-			let cart = matchedProducts.reduce((total, item) => {
-				if(isBwc===true){
-					return total + (parseFloat(item.price) * parseFloat(item.num - item.returnNum));
-				}
-				// 是否启用会员价 0否1是
-				if (useVipPrice.value) {
-					// memberPrice会员价
-					return total + (parseFloat(item.memberPrice || item.price) * parseFloat(item
-						.num - item
-						.returnNum));
-				} else {
-					// salePrice销售价
-					return total + (parseFloat(item.price) * parseFloat(item.num - item.returnNum));
-				}
-			}, 0);
-
-			cart = cart.toFixed(2)
-			console.log(parseFloat(cart))
-			// 向上取整并保留两位小数
-			// let result = roundUpToTwoDecimals(cart, 'upward')
-			return parseFloat(cart);
-		};
-
-		// 计算商品卷所选择的总价格
-		const getTotalProductroll = (matchedProducts) => computed(() => {
-			if (!matchedProducts || !Array.isArray(matchedProducts)) {
-				return 0;
-			}
-			// 购物车总数价格
-			let cart = matchedProducts.reduce((total, item) => {
-				// 是否启用会员价 0否1是
-				if (useVipPrice.value) {
-					// memberPrice会员价
-					return total + parseFloat(item.memberPrice || item.price)
-				} else {
-					// salePrice销售价
-					return total + parseFloat(item.price)
-				}
-			}, 0);
-			// 向上取整并保留两位小数
-			let result = roundUpToTwoDecimals(cart, 'upward')
-			return result;
-		});
-
-		// 桌位置
-		const getTotalSeatcharge = (seatNum) => computed(() => {
-			// 是否免除桌位费 0 否 1 是
-			let cart = 0
-
-			if (uni.cache.get('ordershopUserInfo').isTableFee == 0 && seatNum) {
-				cart = parseFloat(seatNum) * parseFloat(uni.cache.get('ordershopUserInfo').tableFee)
-
-				// Math.ceil(parseFloat(seatNum) * parseFloat(
-				// uni.cache.get('ordershopUserInfo').tableFee) * 100) / 100;
-			}
-			// 向下取整并保留两位小数
-			let result = roundUpToTwoDecimals(cart, 'downward')
-			return result;
-		});
-
-		// 计算购物车总打包费用（向下取整并保留两位小数）
-		const getTotalPackFee = (cartList) => computed(() => {
-			const total = cartList.reduce((sum, item) => {
-				return sum + (parseFloat(item.packAmount) * (parseFloat(item.packNumber) || (
-					parseFloat(item.num) - parseFloat(item.returnNum))));
-			}, 0);
-			// 向下取整并保留两位小数
-			let result = roundUpToTwoDecimals(total, 'downward')
-			return result;
-			// return Math.floor(total * 100) / 100;
-		});
-
-		//获取热门商品
-		async function getHotProduct() {
-
-		}
-
-		//获取分组商品
-		async function getGroupProduct() {
-
-		}
-
-		return {
-			getTotalPackFee,
-			getTotalSeatcharge,
-			getTotalTotalPrices,
-			getTotalProductroll,
-			carts,
-			isEmpty,
-			setGoodsMap,
-			goodsIsloading,
-			goodsInit,
-			onMessage,
-			totalPrice,
-			totalPackFee,
-			updateData,
-			useVipPrice,totalOriginPrice
-		};
-	}
-);
\ No newline at end of file
diff --git a/stores/carts.ts b/stores/carts.ts
new file mode 100644
index 0000000..e776a06
--- /dev/null
+++ b/stores/carts.ts
@@ -0,0 +1,821 @@
+import { computed, reactive, ref } from "vue";
+import WebSocketManager, { type ApifoxModel, msgType } from "@/common/js/carts-websocket";
+import {
+	productminiApphotsquery,
+	APIgroupquery,
+	APIminiAppinfo,
+	APIminiAppskuinfo
+} from "@/common/api/product/product.js";
+const shopInfo = uni.cache.get('shopInfo') || { isMemberPrice: false }
+export interface CartsState {
+	id : string | number;
+	[property : string] : any;
+}
+import { defineStore } from 'pinia'
+import { isProductAvailable, goodsInitParamsFull } from '@/utils/product.js'
+function ElMessage() {
+
+}
+export const useCartsStore = defineStore("carts", () => {
+	//选择用户
+	const vipUser = ref<{ id ?: string | number, isVip ?: boolean }>(uni.cache.get('orderVIP') || {});
+	function changeUser(user : any) {
+		vipUser.value = user;
+	}
+
+	//就餐类型 dine-in take-out
+	let dinnerType = ref<string>('dine-in');
+
+
+
+	//是否启用会员价
+	const useVipPrice = computed(() => {
+		return (shopInfo.isMemberPrice && vipUser.value.id && vipUser.value.isVip) ? true : false
+	})
+
+	//台桌id
+	// const table_code = useStorage('Instead_table_code', '');
+	const table_code = ref('')
+
+	//购物车是否初始化连接加载完成
+	const isLinkFinshed = ref(false)
+	//当前购物车数据
+	const list = ref<any[]>([]);
+	//历史订单数据
+	// const oldOrder = useStorage<any>("Instead_olold_order", {
+	//   detailMap: [],
+	//   originAmount: 0
+	// });
+	const oldOrder = ref({
+		detailMap: [],
+		originAmount: 0
+	})
+
+	//代客下单页面全部商品缓存，包括招牌菜和分组
+	const goods = ref([])
+	const hotgoods = ref([])
+	const groupGoods = ref([])
+	async function getGoods(query : any) {
+		// 招牌菜
+		const hotsRes = await productminiApphotsquery({
+			...query,
+		});
+		//分组
+		const groupGoodsRes = await APIgroupquery({
+			...query,
+		});
+		hotgoods.value = hotsRes.map(product => {
+			return goodsInitParamsFull(product)
+		})
+		groupGoods.value = groupGoodsRes.map(v => {
+			return {
+				...v,
+				productList: v.productList.map(product => {
+					return goodsInitParamsFull(product)
+				})
+			}
+		})
+		goods.value = [...hotsRes, ...groupGoodsRes.reduce((prve, cur) => {
+			prve.push(...cur.productList)
+			return prve
+		}, [])]
+		setGoodsMap(goods.value)
+	}
+
+	function setGoodsMap(goods : any[]) {
+		for (let item of goods) {
+			goodsMap[item.id] = item;
+		}
+	}
+
+	//赠菜
+	const giftList = ref([])
+	let goodsMap : { [key : string] : any } = reactive({});
+	//当前选中cart
+	let selListIndex = ref(-1);
+
+	//当前选中商品是否是赠菜
+	const isSelGift = ref(false);
+	//当前选中是否是历史订单
+	const isOldOrder = ref(false);
+	//选中历史订单中的第几次下单
+	const selPlaceNum = ref(-1);
+	const defaultCart = {
+		id: '',
+		number: 0,
+	}
+	//购物车是否为空
+	const isEmpty = computed(() => {
+		return list.value.length === 0 && giftList.value.length === 0
+	})
+	//当前购物车选中数据
+	const selCart = computed(() => {
+		if (isOldOrder.value && selPlaceNum.value >= 0) {
+			return oldOrder.value.detailMap[selPlaceNum.value][selListIndex.value]
+		}
+		if (isSelGift.value) {
+			return giftList.value[selListIndex.value] || defaultCart
+		}
+		return list.value[selListIndex.value] || defaultCart
+	})
+	//当前购物车选中对应商品数据
+	const selGoods = computed(() => {
+		return goodsMap[selCart.value.product_id]
+	})
+	//当前选中购物车数据是否是可选套餐商品
+	const isCanSelectGroup = computed(() => {
+		if (!selGoods.value) {
+			return false
+		}
+		return selGoods.value.type == 'package' && selGoods.value.groupType == 1
+	})
+	function returnOneGoodsTotalMoney(cur : any) {
+		const memberPrice = cur.memberPrice || cur.salePrice
+		const total = cur.number * (useVipPrice.value ? memberPrice : cur.salePrice)
+		if (cur.type == 'weight') {
+			return customTruncateToTwoDecimals(total)
+		} else {
+			return total
+		}
+	}
+	//赠菜总价
+	const giftMoney = computed(() => {
+		let oldGiftMoney = 0
+		for (let i in oldOrder.value.detailMap) {
+			oldGiftMoney += oldOrder.value.detailMap[i].filter((v : any) => v.isGift).reduce((prve : number, cur : any) => {
+				const memberPrice = cur.memberPrice || cur.salePrice
+				return prve + cur.number * (useVipPrice.value ? memberPrice : cur.salePrice)
+			}, 0)
+		}
+		const nowTotal = giftList.value.reduce((acc : number, cur : any) => {
+			const memberPrice = cur.memberPrice || cur.salePrice
+			return acc + cur.number * (useVipPrice.value ? memberPrice : cur.salePrice)
+		}, 0)
+		return (nowTotal + oldGiftMoney)
+	})
+	//返回打包数量（称重商品打包数量最大为1）
+	function returnCartPackNumber(cur : any) {
+		const maxReturnNum = cur.number - (cur.returnNum || 0);
+		let pack_number = (dinnerType.value == 'take-out' ? cur.number : cur.pack_number * 1);
+		pack_number = (cur.product_type == 'weight' && pack_number > 1) ? 1 : pack_number;
+		pack_number = Math.min(maxReturnNum, pack_number);
+		pack_number = pack_number <= 0 ? 0 : pack_number
+		return pack_number * 1
+	}
+	//打包数量
+	const packNum = computed(() => {
+		const nowCartNumber = list.value.reduce((acc : number, cur : any) => {
+			return acc + returnCartPackNumber(cur)
+		}, 0)
+		const giftNumber = giftList.value.reduce((acc : number, cur : any) => {
+			return acc + returnCartPackNumber(cur)
+		}, 0)
+		let oldNumber = 0
+		for (let i in oldOrder.value.detailMap) {
+			oldNumber += oldOrder.value.detailMap[i].reduce((prve : number, cur : any) => {
+				return prve + returnCartPackNumber(cur)
+			}, 0)
+		}
+		return nowCartNumber + giftNumber + oldNumber
+	})
+
+	//打包费
+	const packFee = computed(() => {
+		const nowPackFee = list.value.reduce((acc : number, cur : any) => {
+			return acc + (cur.packFee || 0) * returnCartPackNumber(cur)
+		}, 0)
+		const giftPackFee = giftList.value.reduce((acc : number, cur : any) => {
+			return acc + (cur.packFee || 0) * returnCartPackNumber(cur)
+		}, 0)
+		let oldPackfee = 0;
+		for (let i in oldOrder.value.detailMap) {
+			oldPackfee += oldOrder.value.detailMap[i].reduce((prve : number, cur : any) => {
+				return prve + (cur.packFee || 0) * returnCartPackNumber(cur)
+			}, 0)
+		}
+		return nowPackFee + giftPackFee + oldPackfee
+	})
+	//会员优惠
+	const vipDiscount = computed(() => {
+		if (!useVipPrice.value) {
+			return 0
+		}
+		const listTotal = list.value.reduce((acc : number, cur : any) => {
+			const n = (cur.salePrice * 1 - cur.memberPrice * 1) * cur.number
+			return acc + (n <= 0 ? 0 : n)
+		}, 0)
+		const giftTotal = giftList.value.reduce((acc : number, cur : any) => {
+			const n = (cur.salePrice * 1 - cur.memberPrice * 1) * cur.number
+			return acc + (n <= 0 ? 0 : n)
+		}, 0)
+		let oldTotal = 0;
+		for (let i in oldOrder.value.detailMap) {
+			oldTotal += oldOrder.value.detailMap[i].reduce((prve : number, cur : any) => {
+				const n = (cur.salePrice * 1 - cur.memberPrice * 1) * cur.number
+				return prve + (n <= 0 ? 0 : n)
+			}, 0)
+		}
+		return listTotal + giftTotal + oldTotal
+	})
+	//单品改价优惠
+	const singleDiscount = computed(() => {
+		const listTotal = list.value.reduce((acc : number, cur : any) => {
+			if (cur.discount_sale_amount * 1 <= 0) {
+				return acc + 0
+			}
+			const originPrice = useVipPrice.value ? (cur.memberPrice || cur.salePrice) : cur.salePrice
+			const n = (originPrice * 1 - cur.discount_sale_amount * 1) * cur.number
+			return acc + (n <= 0 ? 0 : n)
+		}, 0)
+		return listTotal
+	})
+
+
+	// 优惠
+	const yiyouhui = computed(() => {
+		const youhui = giftMoney.value * 1 + vipDiscount.value * 1 + singleDiscount.value * 1
+		if (youhui > 0) {
+			return '已优惠￥' + youhui.toFixed(2)
+		}
+		return ''
+	})
+
+	//历史订单价格
+	const oldOrderMoney = computed(() => {
+		let total = 0
+		for (let i in oldOrder.value.detailMap) {
+			total += oldOrder.value.detailMap[i].reduce((prve : number, cur : any) => {
+				if (cur.isGift) {
+					return prve + 0
+				}
+				const discount_sale_amount = cur.discount_sale_amount * 1 || 0
+				const memberPrice = cur.skuData ? (cur.skuData.memberPrice || cur.skuData.salePrice) : 0
+				const price = (discount_sale_amount || cur.salePrice || 0)
+				const number = (cur.number - cur.returnNum)
+				return prve + (number <= 0 ? 0 : number) * (discount_sale_amount || (useVipPrice.value ? memberPrice : price))
+			}, 0)
+		}
+		return total
+	})
+
+
+	//支付总价
+	const payMoney = computed(() => {
+		const money = list.value.reduce((acc : number, cur : any) => {
+			const discount_sale_amount = cur.discount_sale_amount * 1 || 0
+			const memberPrice = cur.skuData ? (cur.skuData.memberPrice || cur.skuData.salePrice) : 0
+			const price = (cur.discount_sale_amount * 1 || cur.salePrice || 0)
+			return acc + cur.number * (discount_sale_amount || (useVipPrice.value ? memberPrice : price))
+		}, 0)
+		return (money + packFee.value * 1 + oldOrderMoney.value * 1).toFixed(2)
+	})
+	//只算商品的总价
+	const goodsTotal = computed(() => {
+		const money = list.value.reduce((acc : number, cur : any) => {
+			const discount_sale_amount = cur.discount_sale_amount * 1 || 0
+			const memberPrice = cur.skuData ? (cur.skuData.memberPrice || cur.skuData.salePrice) : 0
+			const price = (cur.discount_sale_amount * 1 || cur.salePrice || 0)
+			return acc + cur.number * (discount_sale_amount || (useVipPrice.value ? memberPrice : price))
+		}, 0)
+		return (money + oldOrderMoney.value * 1).toFixed(2)
+	})
+	//总计数量
+	const totalNumber = computed(() => {
+		const cartNumber = list.value.reduce((acc : number, cur : any) => {
+			return acc + cur.number * 1
+		}, 0)
+		const giftNumber = giftList.value.reduce((acc : number, cur : any) => {
+			return acc + cur.number * 1
+		}, 0)
+		let oldNumber = 0
+
+		for (let i in oldOrder.value.detailMap) {
+			oldNumber += oldOrder.value.detailMap[i].reduce((prve : number, cur : any) => {
+				return prve + cur.number * 1
+			}, 0)
+		}
+		return cartNumber + giftNumber + oldNumber
+	})
+
+
+	function changeNumber(step : number, item : CartsState) {
+		if (item.number * 1 + step <= 0) {
+			del(item);
+			return;
+		}
+		const newNumber = item.number * 1 + step * 1;
+		let pack_number = newNumber < item.pack_number ? (item.pack_number * 1 + step * 1) : item.pack_number * 1;
+		if (dinnerType.value == 'take-out') {
+			pack_number = newNumber
+		}
+		if (item.product_type == 'weight' && item.pack_number * 1 >= 1) {
+			pack_number = 1
+		}
+		update({ ...item, number: newNumber, pack_number });
+	}
+
+	function changeSelCart(cart : CartsState) {
+		console.log(cart)
+		if (!cart.id) {
+			return
+		}
+		if (cart.placeNum) {
+			selPlaceNum.value = cart.placeNum
+			isOldOrder.value = true
+			console.log(oldOrder.value.detailMap[cart.placeNum])
+			selListIndex.value = oldOrder.value.detailMap[cart.placeNum].findIndex((item : CartsState) => {
+				return item.id == cart.id
+			})
+			return
+		}
+		selPlaceNum.value = -1;
+		isOldOrder.value = false;
+
+		if (cart.is_gift) {
+			isSelGift.value = true
+			selListIndex.value = giftList.value.findIndex((item : CartsState) => item.id === cart.id);
+			console.log(selListIndex.value)
+
+		} else {
+			isSelGift.value = false
+			selListIndex.value = list.value.findIndex((item : CartsState) => item.id === cart.id);
+		}
+
+	}
+
+
+	const basic_msg = {
+		number: 1,
+		is_gift: 0,
+		is_temporary: 0,
+		discount_sale_amount: 0,
+		discount_sale_note: "",
+		is_print: 1,
+		pro_group_info: '',
+		is_wait_call: 0,
+		product_name: "",
+		remark: "",
+		sku_id: '',
+		product_type: '',
+		suitNum: 1
+	}
+	//当前购物车直接添加
+	function cartsPush(data : any) {
+		sendMessage('add', {
+			...basic_msg,
+			...data
+		});
+	}
+
+	function add(data : any) {
+		const msg = {
+			...basic_msg,
+			...data
+		}
+		const hasCart = list.value.find((cartItem) => {
+			return cartItem.product_id == msg.product_id && cartItem.sku_id == msg.sku_id;
+		});
+		if (hasCart) {
+			update({ ...hasCart, ...msg, number: hasCart.number * 1 + msg.number * 1 })
+		} else {
+			console.log(msg);
+			sendMessage('add', msg);
+		}
+	}
+
+	// 换桌
+	function changeTable(newVal : string | undefined) {
+		table_code.value = `${newVal}`;
+		$initParams.table_code = newVal
+		concocatSocket()
+	}
+	//转桌
+	function rotTable(newVal : string | number, cart_id = []) {
+		sendMessage('rottable', {
+			new_table_code: newVal,
+			table_code: table_code.value,
+			cart_id
+		});
+	}
+	//清空历史订单
+	function clearHistory() {
+		sendMessage('clearOrder', {});
+	}
+
+
+	function del(data : any) {
+		sendMessage('del', { id: data.id });
+	}
+
+	function update(data : any) {
+		console.log(data);
+		const suitNum = data.skuData ? (data.skuData.suitNum || 1) : 1;
+		if (data.number * 1 < suitNum * 1) {
+			return sendMessage('del', data);
+		}
+		const pack_number = dinnerType.value == 'take-out' ? data.number : data.pack_number
+		sendMessage('edit', { ...data, suitNum, pack_number });
+	}
+	function updateTag(key : string, val : any, cart : CartsState = selCart.value) {
+		const skuData = cart.skuData || { suitNum: 1 }
+		if (cart.number * 1 < skuData.suitNum * 1) {
+			return sendMessage('del', cart);
+		}
+		console.log(key, val)
+		if (key == 'discount_sale_amount' && val * 1 <= 0) {
+			// ElMessage.error('价格不能为0！')
+			return
+		}
+		const msg = { ...cart, [key]: val }
+		if (key == 'number' && dinnerType.value == 'take-out') {
+			msg.pack_number == val
+			msg.suitNum == skuData.suitNum
+		}
+
+		sendMessage('edit', msg);
+	}
+	// 更改全部商品打包状态
+	function changePack(is_pack : number | string) {
+		if (!isEmpty.value) {
+			sendMessage('batch', { is_pack });
+		}
+	}
+
+	function clear() {
+		sendMessage('cleanup', {});
+	}
+	function dataReset() {
+		selListIndex.value = -1;
+		selPlaceNum.value = 1
+		isOldOrder.value = false
+		isSelGift.value = false
+		list.value = [];
+		giftList.value = [];
+		oldOrder.value = {
+			detailMap: [],
+			originAmount: 0
+		}
+		vipUser.value = {}
+	}
+
+	function nowCartsClear() {
+		if (selPlaceNum.value == 1) {
+			selListIndex.value = -1;
+		}
+		list.value = [];
+		giftList.value = [];
+	}
+
+	// 寻找套餐商品sku
+	interface GroupSnap {
+		goods : { [key : string] : any }[];
+	}
+
+	function findInGroupSnapSku(groupSnap : GroupSnap[], sku_id : string | number) {
+		for (let i in groupSnap) {
+			const sku = groupSnap[i].goods.find(v => v.sku_id == sku_id)
+			if (sku) {
+				return sku
+			}
+		}
+	}
+
+	//获取历史订单
+	async function getOldOrder(table_code : string | number) {
+		const res = await orderApi.getHistoryList({ tableCode: table_code })
+		console.log('getOldOrder');
+		console.log(res);
+		if (res) {
+			setOldOrder(res)
+		} else {
+			oldOrder.value = {
+				detailMap: [],
+				originAmount: 0
+			}
+		}
+	}
+
+	function getProductDetails(v : { product_id : string, sku_id : string }) {
+		const goods = goodsMap[v.product_id]
+		if (!goods) {
+			return undefined
+		}
+		let skuData = undefined;
+		skuData = goods?.skuList.find((sku : { id : string, salePrice : number }) => sku.id == v.sku_id);
+
+		// if (goods.type == 'package') {
+		//   //套餐商品
+		//   const SnapSku = findInGroupSnapSku(goods.groupSnap, v.sku_id)
+		//   skuData = { ...SnapSku, salePrice: SnapSku ? SnapSku.price : 0 }
+		// } else {
+		//   skuData = goods?.skuList.find((sku: { id: string, salePrice: number }) => sku.id == v.sku_id);
+		// }
+		skuData = goods?.skuList.find((sku : { id : string, salePrice : number }) => sku.id == v.sku_id);
+
+		if (skuData) {
+			return {
+				salePrice: skuData ? skuData.salePrice : 0,
+				memberPrice: skuData ? skuData.memberPrice : 0,
+				coverImg: goods.coverImg,
+				name: goods.name,
+				specInfo: skuData.specInfo,
+				packFee: goods.packFee || 0,
+				type: goods.type,
+				skuData
+			}
+		} else {
+			return undefined
+		}
+	}
+
+	function returnDetailMap(data : any) {
+		const newData : { [key : string] : any } = {}
+		for (let i in data) {
+			newData[i] = data[i].map((v : any) => {
+				const skuData = getProductDetails({ product_id: v.productId, sku_id: v.skuId })
+				console.log(skuData)
+				console.log(v)
+
+				return {
+					...v,
+					...skuData,
+					skuData: {
+						...skuData,
+						salePrice: v.price,
+						memberPrice: v.memberPrice
+					},
+					placeNum: v.placeNum,
+					number: v.num,
+					id: v.id,
+					salePrice: v.price,
+					memberPrice: v.memberPrice,
+					pack_number: v.packNumber,
+					discount_sale_amount: v.discountSaleAmount * 1 || 0,
+					is_print: v.isPrint,
+					is_wait_call: v.isWaitCall,
+					is_gift: v.isGift,
+					is_temporary: v.isTemporary,
+					discount_sale_note: v.discountSaleNote,
+					product_name: v.productName,
+					sku_name: v.skuName,
+					sku_id: v.skuId,
+					product_type: v.productType,
+					packFee: v.packAmount,
+				}
+			})
+		}
+		console.log('newData', newData)
+		return newData
+	}
+
+	function setOldOrder(data : any) {
+		oldOrder.value = {
+			...data,
+			detailMap: returnDetailMap(data.detailMap)
+		}
+	}
+
+	let $initParams = {} as ApifoxModel
+
+
+	/**
+	 * 
+	 * @param initParams 购物车初始化参数
+	 * @param $goodsMap 商品id对应的map
+	 * @param oldOrder 历史订单数据
+	 */
+
+
+
+	async function init(initParams : ApifoxModel, $oldOrder : any | undefined) {
+		// 商品id对应的数据map
+		await getGoods({})
+
+		if ($oldOrder) {
+			setOldOrder($oldOrder)
+		} else {
+			oldOrder.value = { detailMap: [], originAmount: 0 }
+		}
+
+		// console.log('oldOrder.detailMap', oldOrder.value.detailMap)
+		// const cache_table_code = localStorage.getItem('cache_table_code');
+		// const randomTableCode = cache_table_code ? cache_table_code : ('APC' + (1000 + Math.floor(Math.random() * 9000)))
+		if (initParams) {
+			initParams.table_code = initParams.table_code ? initParams.table_code : ''
+			table_code.value = initParams.table_code
+			$initParams = initParams;
+		}
+		console.log($initParams)
+		// localStorage.setItem('cache_table_code', table_code.value);
+		concocatSocket($initParams)
+	}
+
+	function concocatSocket(initParams = $initParams) {
+		console.log("初始化参数", initParams);
+		WebSocketManager.subscribeToTopic(initParams, (msg) => {
+			console.log("收到消息：", msg);
+			if (msg.hasOwnProperty('status') && msg.status != 1) {
+				if (msg.type === 'no_suit_num' && selListIndex.value != -1) {
+					return uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: `${list.value[selListIndex.value].name}库存不足`,
+						success() {
+							if (res.confirm) {
+								list.value.splice(selListIndex.value, 1)
+							}
+						}
+					})
+
+				}
+				uni.showToast({
+					title: msg.message || msg.msg || '操作失败',
+					icon: 'none'
+				})
+				return
+			}
+			if (msg && msg.data) {
+				if (Array.isArray(msg.data) && msg.data.length && msg.data[0].table_code) {
+					table_code.value = msg.data[0].table_code
+				}
+				if (msg.data.table_code) {
+					table_code.value = table_code.value ? table_code.value : msg.data.table_code
+				}
+				if (msg.table_code) {
+					table_code.value = table_code.value ? table_code.value : msg.table_code
+
+				}
+
+			}
+
+
+			// 初始化
+			if (msg.operate_type === "init") {
+				isLinkFinshed.value = true
+				// 设置单价
+				list.value = msg.data.filter((v : Record<string, any>) => {
+					if (v.is_temporary) {
+						return v
+					}
+					const skuData = getProductDetails({ product_id: v.product_id, sku_id: v.sku_id })
+					if (skuData) {
+						(Object.keys(skuData) as (keyof typeof skuData)[]).forEach((key) => {
+							v[key] = skuData[key];
+						});
+					} else {
+						// del({ id: v.id })
+						return false
+					}
+					return !v.is_gift
+				})
+				giftList.value = msg.data.filter((v : Record<string, any>) => {
+					if (v.is_temporary) {
+						return v && v.is_gift
+					}
+					const skuData = getProductDetails({ product_id: v.product_id, sku_id: v.sku_id })
+					if (skuData) {
+						(Object.keys(skuData) as (keyof typeof skuData)[]).forEach((key) => {
+							v[key] = skuData[key];
+						});
+					} else {
+						del({ id: v.id })
+						return false
+					}
+					return v.is_gift
+				})
+			}
+			//广播
+			if (msg.type === "bc") {
+				msg.operate_type = 'shopping_' + msg.operate_type
+			}
+			if (msg.operate_type === "add") {
+				if (list.value.find(v => v.id == msg.data.id)) {
+					console.error('该商品已存在')
+					// ElMessage.warning(msg.message || '该商品已存在')
+					return
+				}
+				const skuData = getProductDetails({ product_id: msg.data.product_id, sku_id: msg.data.sku_id })
+				if (skuData || msg.data.is_temporary) {
+					const newGoods = { ...skuData, ...msg.data }
+					console.log('新增商品', newGoods)
+					list.value.push(newGoods)
+					console.log('添加成功')
+					// ElMessage.success(msg.message || '添加成功')
+					return
+				}else{
+					console.error('未找到对应商品');
+				}
+
+
+			}
+			if (msg.operate_type === "edit") {
+				const newCart = msg.data
+				const index = list.value.findIndex((item) => item.id === newCart.id)
+				const giftIndex = giftList.value.findIndex((item) => item.id === newCart.id)
+				const cartItem = list.value[index] || { is_gift: false };
+				const giftItem = giftList.value[giftIndex];
+
+				if (giftItem) {
+					//操作赠菜
+					if (!newCart.is_gift) {
+						giftList.value.splice(giftIndex, 1)
+						list.value.push({ ...giftItem, ...newCart })
+						selListIndex.value = -1
+					} else {
+						giftList.value[giftIndex] = { ...giftItem, ...newCart }
+					}
+				}
+				if (cartItem) {
+					//操作非赠菜
+					if (newCart.is_gift) {
+						list.value.splice(index, 1)
+						giftList.value.push({ ...cartItem, ...newCart })
+						selListIndex.value = -1
+					} else {
+						list.value[index] = { ...cartItem, ...newCart }
+					}
+				}
+				// ElMessage.success(msg.message || '修改成功')
+			}
+			if (msg.operate_type === "del") {
+				const cartId = Array.isArray(msg.data) ? msg.data[0].id : msg.data.id
+				const listIndex = list.value.findIndex((item) => item.id == cartId)
+				if (listIndex > -1) {
+					list.value.splice(listIndex, 1)
+				}
+				const giftIndex = giftList.value.findIndex((item) => item.id == cartId)
+				if (giftIndex > -1) {
+					giftList.value.splice(giftIndex, 1)
+				}
+				// ElMessage.success(msg.message || '删除成功')
+				return
+			}
+			if (msg.operate_type === "cleanup") {
+				nowCartsClear()
+				getOldOrder(msg.data.table_code)
+			}
+			if (msg.operate_type === "batch") {
+				concocatSocket({ ...$initParams, table_code: table_code.value })
+			}
+			if (msg.operate_type === "clearOrder") {
+				getOldOrder(msg.data.table_code)
+			}
+			if (msg.operate_type === "product_update") {
+				console.log('商品更新')
+				init($initParams, oldOrder.value)
+			}
+		});
+	}
+
+	function disconnect() {
+		sendMessage('disconnect', undefined)
+	}
+
+	const delArr = ['skuData', 'coverImg', 'specInfo', 'placeNum', 'update_time', 'create_time', 'packFee', 'memberPrice', 'type']
+	function sendMessage(operate_type : msgType, message : any) {
+		const msg = { ...message, operate_type: operate_type, table_code: table_code.value }
+		for (let i in delArr) {
+			delete msg[delArr[i]]
+		}
+		console.log('send msg', msg)
+		WebSocketManager.sendMessage(msg);
+	}
+	return {
+		clearHistory,
+		disconnect,
+		dinnerType,
+		changePack,
+		giftMoney,
+		goodsTotal,
+		isLinkFinshed,
+		setOldOrder,
+		singleDiscount,
+		vipDiscount,
+		dataReset,
+		useVipPrice,
+		changeUser,
+		packNum, packFee,
+		isOldOrder,
+		oldOrder,
+		isCanSelectGroup,
+		goods,
+		selGoods,
+		cartsPush,
+		table_code,
+		updateTag,
+		list,
+		add,
+		del,
+		update,
+		init,
+		changeNumber, isEmpty,
+		selCart, totalNumber,
+		changeSelCart, payMoney,
+		clear, yiyouhui, giftList,
+		changeTable,
+		rotTable,
+		getGoods,
+		setGoodsMap,
+		hotgoods, groupGoods
+	};
+});
\ No newline at end of file
diff --git a/stores/user.js b/stores/user.js
index 651562e..f894a77 100644
--- a/stores/user.js
+++ b/stores/user.js
@@ -214,7 +214,7 @@ export const productStore = defineStore('product', {
 					uni.cache.set('shopUserInfo', res);
 					uni.cache.set('orderVIP', res)
 					uni.cache.set('ordershopUserInfo', res.shopInfo)
-					resolve(true)
+					resolve(res)
 				} catch (e) {
 					reject(false)
 				}
@@ -226,14 +226,16 @@ export const productStore = defineStore('product', {
 		actionsAPIuser() {
 			return new Promise(async (resolve, reject) => {
 				try {
+					let res=null
 					// 获取店铺用户会员信息
 					if (uni.cache.get('shopId')) {
-						this.actionsproductqueryProduct()
+						res = await this.actionsproductqueryProduct()
 					} else {
-						let res = await APIuser()
+						 res = await APIuser()
 						uni.cache.set('userInfo', res);
 					}
-					resolve(true)
+					console.log('actionsAPIuser res',res);
+					resolve(res)
 				} catch (e) {
 					reject(false)
 				}
diff --git a/utils/product.js b/utils/product.js
new file mode 100644
index 0000000..867489c
--- /dev/null
+++ b/utils/product.js
@@ -0,0 +1,47 @@
+import dayjs from 'dayjs';
+import isBetween from 'dayjs/plugin/isBetween'
+dayjs.extend(isBetween)
+// 判断商品是否在可售时间内
+export const isProductAvailable = (sellDaysStr, startTimeStr, endTimeStr) => {
+	// 将后端返回的字符串转换为数组
+	const sellDays = sellDaysStr.split(',');
+	const now = dayjs();
+	const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+	const currentDay = days[now.day()];
+
+	// console.log('当前日期:', currentDay);
+	// console.log('可售日期列表:', sellDays);
+
+	// 检查当前周几是否在可售周几列表中 
+	if (!sellDays.includes(currentDay)) {
+		// console.log('当前日期不在可售日期列表中');
+		return false;
+	}
+
+	const startTime = dayjs(`${now.format('YYYY-MM-DD')} ${startTimeStr}`);
+	let endTime = dayjs(`${now.format('YYYY-MM-DD')} ${endTimeStr}`);
+
+	// 处理跨天情况
+	if (endTime.isBefore(startTime)) {
+		endTime = endTime.add(1, 'day');
+	}
+
+	// console.log('当前时间:', now.format('YYYY-MM-DD HH:mm:ss'));
+	// console.log('开始时间:', startTime.format('YYYY-MM-DD HH:mm:ss'));
+	// console.log('结束时间:', endTime.format('YYYY-MM-DD HH:mm:ss'));
+
+	const isInRange = now.isBetween(startTime, endTime, null, '[)');
+	// console.log('当前时间是否在可售时间范围内:', isInRange);
+
+	return isInRange;
+}
+
+//点单页面商品数据补充格式化，增加购物车选中数量，增加是否在可售时段内
+export function goodsInitParamsFull(product) {
+	return {
+		...product,
+		cartNumber: 0,
+		isSaleTimeshow: isProductAvailable(product.days, product
+			.startTime, product.endTime)
+	}
+}
\ No newline at end of file