From 7c182023a5c8369c7cc68fade57558437e0029bf Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 28 Apr 2025 11:29:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                      |   16 +-
 common/api/request.js                        |    6 +-
 common/api/shop/index.js                     |    8 +
 common/color.js                              |    3 +
 common/css/{common.css => common.scss}       |    9 +
 common/js/carts-websocket.js                 |  360 +++++
 common/js/carts.js                           |    0
 common/js/websocket.js                       |   13 +-
 framework/0-conf.js                          |    6 +-
 framework/8-cache.js                         |    2 +-
 main.js                                      |    1 +
 package.json                                 |    2 +-
 pages.json                                   |   22 +
 pages/order/components/order-item.vue        |  474 +++++++
 pages/order/components/orderInfo - 副本.vue  | 1163 ++++++++++++++++
 pages/order/components/orderInfo.vue         | 1208 ++++++++++++++++
 pages/order/components/popup-choose-coup.vue |    8 +
 pages/order/confirm-order.vue                | 1310 ++++++++++++++++++
 pages/order/coupon.vue                       |   54 +-
 pages/order/histpry-order/histpry-order.vue  |   22 +
 pages/product/components/confirmorder.vue    |    1 +
 pages/product/components/shoppingCartes.vue  |   62 +-
 pages/product/index.vue                      |  130 +-
 pages/test/test.vue                          |   65 +
 static/history.png                           |  Bin 0 -> 3131 bytes
 static/icon/add-goods.png                    |  Bin 0 -> 1289 bytes
 static/icon/coup.png                         |  Bin 0 -> 619 bytes
 static/icon/goods.png                        |  Bin 0 -> 918 bytes
 static/icon/points.png                       |  Bin 0 -> 964 bytes
 static/pack-white.png                        |  Bin 0 -> 693 bytes
 stores/carts.js                              |  452 ++++++
 stores/order.js                              |  249 ++--
 stores/pay.js                                |    2 +
 stores/shop.js                               |    0
 stores/user.js                               |   68 +-
 uni.scss                                     |    2 +
 utils/quan_util.js                           |  264 ++++
 utils/uniapp.js                              |   16 +
 vite.config.js                               |    2 +-
 39 files changed, 5725 insertions(+), 275 deletions(-)
 create mode 100644 common/color.js
 rename common/css/{common.css => common.scss} (78%)
 create mode 100644 common/js/carts-websocket.js
 create mode 100644 common/js/carts.js
 create mode 100644 pages/order/components/order-item.vue
 create mode 100644 pages/order/components/orderInfo - 副本.vue
 create mode 100644 pages/order/components/orderInfo.vue
 create mode 100644 pages/order/components/popup-choose-coup.vue
 create mode 100644 pages/order/confirm-order.vue
 create mode 100644 pages/order/histpry-order/histpry-order.vue
 create mode 100644 pages/test/test.vue
 create mode 100644 static/history.png
 create mode 100644 static/icon/add-goods.png
 create mode 100644 static/icon/coup.png
 create mode 100644 static/icon/goods.png
 create mode 100644 static/icon/points.png
 create mode 100644 static/pack-white.png
 create mode 100644 stores/carts.js
 create mode 100644 stores/shop.js
 create mode 100644 utils/quan_util.js
 create mode 100644 utils/uniapp.js

diff --git a/App.vue b/App.vue
index dcb3298..fdda864 100644
--- a/App.vue
+++ b/App.vue
@@ -1,4 +1,7 @@
 <script setup>
+	import {
+		useCartsStore
+	} from '@/stores/carts.js';
 	import {
 		useNavbarStore
 	} from '@/stores/navbarStore';
@@ -16,6 +19,12 @@
 	import {
 		Storelogin
 	} from '@/stores/user.js';
+	
+	import {
+		useCartStore
+	} from '@/stores/order.js';
+	// websocket
+
 	const {
 		proxy
 	} = getCurrentInstance()
@@ -26,7 +35,9 @@
 		await nextTick()
 		const store = useNavbarStore();
 		await store.initNavbarHeight();
-
+		getApp().globalData.websocket=null;
+		const cartsStore=useCartsStore()
+		cartsStore.isloading=false;
 	});
 	onShow(async () => {
 		try {
@@ -75,6 +86,7 @@
 		// console.log(error)
 		// }
 		// #endif
+		
 	})
 	// 	onHide: function() {}
 	// }
@@ -84,5 +96,5 @@
 	/*每个页面公共css */
 	@import "@/uni_modules/uview-plus/index.scss";
 	@import '@/common/css/flex.css';
-	@import "@/common/css/common.css";
+	@import "@/common/css/common.scss";
 </style>
\ No newline at end of file
diff --git a/common/api/request.js b/common/api/request.js
index 003fdeb..d17feb8 100644
--- a/common/api/request.js
+++ b/common/api/request.js
@@ -4,6 +4,10 @@ export default (params) => {
 	let data = params.data || {};
 	let type = params.type || 1;
 	let toast = params.toast || true;
+	let token=uni.cache.get('token') || '';
+	// #ifdef H5
+	token="b152112b96e24feb8aa47062136c043b"
+	// #endif
 	let header = {
 		version: uni.conf.version,
 		type: uni.getSystemInfoSync().platform,
@@ -19,7 +23,7 @@ export default (params) => {
 		// #ifdef MP-ALIPAY
 		platformType: 'ALI',
 		// #endif
-		token: uni.cache.get('token') || '',
+		token,
 		id: uni.cache.get('userInfo').id || '',
 		shopId: uni.cache.get('shopId') || '',
 		userId: uni.cache.get('userInfo').id || '',
diff --git a/common/api/shop/index.js b/common/api/shop/index.js
index 61f3575..a94d867 100644
--- a/common/api/shop/index.js
+++ b/common/api/shop/index.js
@@ -4,6 +4,14 @@ const urlAccount = '/account'
 const urlProduct = '/product'
 const urlOrder = '/order'
 
+//桌码获取详细台桌信息
+export const getTableInfo = (data) => {
+	return request({
+		url: urlAccount + '/user/shopInfo/tableInfo',
+		method: 'get',
+		data: data
+	})
+}
 //商品列表
 export const APIgeocodelocation = (data) => {
 	return request({
diff --git a/common/color.js b/common/color.js
new file mode 100644
index 0000000..cc7c8d3
--- /dev/null
+++ b/common/color.js
@@ -0,0 +1,3 @@
+export default {
+	main:'#E8AD7B'
+}
\ No newline at end of file
diff --git a/common/css/common.css b/common/css/common.scss
similarity index 78%
rename from common/css/common.css
rename to common/css/common.scss
index 1a785a2..301ee95 100644
--- a/common/css/common.css
+++ b/common/css/common.scss
@@ -43,4 +43,13 @@ page,
 
 	image {
 		display: block;
+	}
+	.absolute{
+		position: absolute;
+	}
+	.color-main{
+		color:$my-main-color;
+	}
+	.bg-main{
+		background-color: $my-main-color;
 	}
\ No newline at end of file
diff --git a/common/js/carts-websocket.js b/common/js/carts-websocket.js
new file mode 100644
index 0000000..91fb8e5
--- /dev/null
+++ b/common/js/carts-websocket.js
@@ -0,0 +1,360 @@
+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.js b/common/js/carts.js
new file mode 100644
index 0000000..e69de29
diff --git a/common/js/websocket.js b/common/js/websocket.js
index a4138e0..c0d5fcb 100644
--- a/common/js/websocket.js
+++ b/common/js/websocket.js
@@ -13,7 +13,8 @@ const useWebSocket = (options = {}) => {
 			initMessage,
 			initMessageRetryCount = 3, // 新增：初始化消息发送重试次数
 			initMessageRetryInterval = 2000, // 新增：初始化消息重试间隔
-			maxReconnectDuration = Infinity
+			maxReconnectDuration = Infinity,
+			onMessage
 	} = options;
 
 	const autoReconnect = ref(true); //是否自动重新连接
@@ -56,7 +57,7 @@ const useWebSocket = (options = {}) => {
 	};
 
 	// 连接 WebSocket
-	const connect = () => {
+	const connect = (connectMsg) => {
 		if (!isNetworkConnected.value) {
 			uni.showToast({
 				title: '网络未连接...',
@@ -71,7 +72,6 @@ const useWebSocket = (options = {}) => {
 
 		// 关闭现有连接并清理资源
 		closeExistingConnection();
-
 		socketTask.value = uni.connectSocket({
 			url: uni.conf.baseUrlwws,
 			success: (res) => {
@@ -90,10 +90,13 @@ const useWebSocket = (options = {}) => {
 		if (socketTask.value) {
 			socketTask.value.onOpen(() => {
 				// 初始化 初始购物车
-				sendMessage(initMessage)
+				sendMessage(connectMsg?connectMsg:initMessage)
 			});
 			socketTask.value.onMessage((res) => {
 				receivedMessages.value = JSON.parse(res.data)
+				if(onMessage){
+					onMessage(receivedMessages.value)
+				}
 				// receivedMessages.value.push(list);
 				if (receivedMessages.value == 'ok' || receivedMessages.value.operate_type == 'init') {
 					console.log('初始化正常，心跳响应正常');
@@ -341,7 +344,7 @@ const useWebSocket = (options = {}) => {
 		sendMessage,
 		closeSocket,
 		receivedMessages,
-		closeExistingConnection,
+		closeExistingConnection,connect,
 		onShowconnect,
 		initNetworkListener
 	};
diff --git a/framework/0-conf.js b/framework/0-conf.js
index 2c4a371..48b02f2 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -1,5 +1,5 @@
 // const debug = process.env.NODE_ENV == 'development' ? true : false;
-const debug = false
+const debug = true
 // #ifdef H5
 const proxyApi = "/api"
 // #endif
@@ -13,8 +13,8 @@ const proxyApiwws = 'ws://192.168.1.31:2348' // 调试地址
 // #endif
 
 // #ifdef H5
-const baseUrl = debug ? proxyApi : "https://tapi.cashier.sxczgkj.cn"
-const baseUrlwws = 'wss://sockets.sxczgkj.com/wss'
+const baseUrl = debug ? proxyApi : "http://192.168.1.31"
+const baseUrlwws = 'ws://192.168.1.31:2348'
 // #endif
 
 // #ifdef APP || MP-WEIXIN || MP-ALIPAY
diff --git a/framework/8-cache.js b/framework/8-cache.js
index ffb7c77..b8b8f41 100644
--- a/framework/8-cache.js
+++ b/framework/8-cache.js
@@ -10,7 +10,7 @@ function get(key) {
 		if (!res) {
 			return ''
 		}
-
+		
 		
 
 		if (res.expiretime && res.expiretime < Date.now()) {
diff --git a/main.js b/main.js
index 9cd3b12..cd79518 100644
--- a/main.js
+++ b/main.js
@@ -21,6 +21,7 @@ import {
 	createUnistorage
 } from './uni_modules/pinia-plugin-unistorage';
 
+
 export function createApp() {
 	// 创建 SSR 应用实例
 	const app = createSSRApp(App);
diff --git a/package.json b/package.json
index 52b8f6c..0c4b779 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,6 @@
     "dayjs": "^1.11.13",
     "jsbarcode": "^3.11.6",
     "pinia": "^2.3.1",
-    "pinia-plugin-persistedstate": "^4.2.0"
+    "pinia-plugin-unistorage": "^0.1.2"
   }
 }
diff --git a/pages.json b/pages.json
index bf4d013..f21abd6 100644
--- a/pages.json
+++ b/pages.json
@@ -161,6 +161,28 @@
 			"style": {
 				"navigationBarTitleText": "叫号"
 			}
+		},
+		{
+			"path" : "pages/test/test",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/order/histpry-order/histpry-order",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/order/confirm-order",
+			"style" : 
+			{
+				"navigationBarTitleText" : "确认订单",
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"uniIdRouter": {},
diff --git a/pages/order/components/order-item.vue b/pages/order/components/order-item.vue
new file mode 100644
index 0000000..7537e83
--- /dev/null
+++ b/pages/order/components/order-item.vue
@@ -0,0 +1,474 @@
+<template>
+	<view class="card_item">
+		<!-- <view class="head">
+			<view class="head_left">
+				<text class="placeNum">当前购物车</text>
+			</view>
+		</view> -->
+		<!-- 订单详情 -->
+		<view class="shop-info">
+			<view class="item" v-for="item in nowCarts" :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">
+						<text v-if="changeFreeenable">{{item.price}}</text>
+						<text v-else>
+							￥{{useVipPrice?(item.memberPrice|| item.price):item.price}}
+						</text>
+					</view>
+					<view class="num">x{{item.num}}</view>
+				</view>
+			</view>
+		</view>
+
+		<!--<view class="status" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">未付款</view>
+		 <view class="totalAmount">
+			<view class="label">小计￥</view>
+			<view class="price"> {{item.totalAmount}} </view>
+		</view> -->
+
+		<!-- <view class="semicircle_icon" v-if="index > 0">
+			<view class="semicircle_left_icon"></view>
+			<view class="semicircle_right_icon"></view>
+		</view> -->
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive,
+		defineProps,
+		computed,
+		defineEmits,
+		watch,
+		watchEffect,
+		defineExpose,
+		onMounted
+	} from 'vue'
+	const props = defineProps({
+		changeFreeenable: {
+			type: Boolean,
+			default: false
+		},
+		useVipPrice: {
+			type: Boolean,
+			default: false
+		},
+		nowCarts: {
+			type: Array,
+			default: () => {
+				return []
+			}
+		}
+	})
+	onMounted(() => {
+		console.log('props.nowCarts');
+		console.log(props.nowCarts);
+	})
+</script>
+
+<style lang="scss" scoped>
+	.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 {
+			padding-top: 28rpx;
+		
+			.item:nth-child(1) {
+				margin-top: 0;
+			}
+
+			.item {
+				margin-bottom: 32rpx;
+				display: flex;
+				&:last-child{
+						margin-bottom: 0;
+				}
+				.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;
+
+
+
+	}
+
+
+
+	.fixedview {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+
+		.flex-between {
+			width: 100%;
+			padding: 36rpx 54rpx 102rpx 54rpx;
+			background: #FFFFFF;
+
+			.fixedview_one {
+				display: flex;
+				align-items: flex-end;
+
+				.fixedview_oneone {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #666666;
+				}
+
+				.fixedview_onetow {
+					font-weight: bold;
+					font-size: 32rpx;
+					color: #333333;
+
+					text {
+						font-size: 24rpx;
+					}
+				}
+			}
+
+			.fixedview_tow {
+				width: 140rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				text-align: center;
+				background: #E3AD7F;
+				border-radius: 12rpx 12rpx 12rpx 12rpx;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/components/orderInfo - 副本.vue b/pages/order/components/orderInfo - 副本.vue
new file mode 100644
index 0000000..5ae2503
--- /dev/null
+++ b/pages/order/components/orderInfo - 副本.vue	
@@ -0,0 +1,1163 @@
+<template>
+	<view>
+		<view class="card_box">
+			<view class="card_head_box">
+				<view class="card_head_item" v-for="(item,index) in 8" :key="index"></view>
+			</view>
+
+			<!-- 先付款 -->
+			<view class="tabBox" v-if="listinfo.status == 'unpaid'||!listinfo.id">
+				<view class="tab">
+					<view v-for="(item,index) in tebtypeList" :key="index"
+						:class="is_type==index?'tab_item'+(is_type+1)+' tab_item  active ':'tab_item'"
+						@click="tabClick(item,index)">
+						<view></view>
+						<image class="icon" :src="is_type==index?item.url_active:item.url" mode="aspectFill" />
+						<text class="title" :class="{active:is_type==index}">{{item.title}}</text>
+					</view>
+				</view>
+				<view class="table" v-if=" is_type == 0 ">
+					<view class="table_left">
+						<image class="icon"
+							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png"
+							mode="aspectFill" />
+						<text class="title">桌台</text>
+					</view>
+					<view class="value" v-if="listinfo.tableName"> {{ listinfo.tableName || '' }} </view>
+				</view>
+				<!-- 	<view class="pack" v-else>
+					<view class="top">
+						<text class="title">{{ shopInfo.shopName }}</text>
+						<text class="address">{{ shopInfo.address }}</text>
+					</view>
+					<view class="list">
+						<view class="item">
+							<view class="lable">取餐时间</view>
+							<view class="text">立即取餐</view>
+						</view>
+						<view class="item">
+							<view class="lable">预留电话</view>
+							<view class="getPhone text"><u-input class="inputVal" v-model="order.phone"
+									input-align="right" placeholder="请输入预留电话以便联系您"></u-input><text
+									class="getBtn">获取手机号</text></view>
+						</view>
+					</view>
+				</view> -->
+			</view>
+			
+			<view class="card">
+				<orderItemVue :useVipPrice="useVipPrice" v-if="nowCarts.length" :nowCarts="nowCarts"></orderItemVue>
+				<!-- 订单头部 -->
+				<view class="card_item" v-for="(value, key) in listinfo.detailMap" :key="key">
+					<view class="head">
+						<view class="head_left">
+							<!-- key==0  当前购物车 -->
+							<text class="placeNum" v-if="key!=0">第{{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">
+									<text v-if="changeFreeenable">{{item.price}}</text>
+									<text v-else>
+										￥{{useVipPrice?(item.memberPrice|| item.price):item.price}}
+									</text>
+								</view>
+								<view class="num">x{{item.num}}</view>
+							</view>
+						</view>
+					</view>
+
+					<!--<view class="status" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">未付款</view>
+					 <view class="totalAmount">
+						<view class="label">小计￥</view>
+						<view class="price"> {{item.totalAmount}} </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 class="cell-item" v-if="is_type != 0">
+					<view class="label">打包费</view>
+					<view class="val">
+						<view></view>
+						<view style="font-size: 28rpx;">￥</view>
+						<view>{{packfee }}</view>
+					</view>
+				</view>
+
+
+				<!-- isTableFee == 0是不免除 -->
+				<view class="cell-item"
+					v-if="ordershopUserInfo.isTableFee == 0 && is_type == 0 && listinfo.Seatcharge != 0">
+					<view class="label">餐位费</view>
+					<view class="val">
+						<view>X{{listinfo.Seatcharge}}</view>
+						<view style="font-size: 28rpx;">￥</view>
+						<view>{{listinfo.Seatcharge}}</view>
+					</view>
+				</view>
+
+				<!-- <view class="cell-item" v-else>
+					<view class="label">免餐位费</view>
+					<view class="val">
+						<view></view>
+						<view style="font-size: 28rpx;">￥</view>
+						<view>{{listinfo.Seatcharge}}</view>
+					</view>
+				</view> -->
+
+				<!-- 支付之前 -->
+				<block v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'||!listinfo.id">
+					<view v-for="(item,indexe) in favorablelist" :key="indexe">
+						<view class="favorable" :class="{column:item.type=='product'}" @click="goUrl(item)">
+							<view class="favorable_left">
+								<text class="name"> {{ item.name }} </text>
+							</view>
+
+							<!-- 商品卷 -->
+							<view class="favorable_right" :class="{column:item.value}" v-if="item.type=='product'">
+								<view :class="{column:item.value}">
+									<view class="favorable_right_text" v-if="item.value.uniqueIds">
+										<text>{{item.value.uniqueIds}}张</text>
+										<text>￥-{{item.value.Productroll}}</text>
+									</view>
+								</view>
+								<up-icon name="arrow-right" color="#575B66" size="16"
+									style="margin-top: 5rpx;"></up-icon>
+							</view>
+
+							<!-- 优惠卷 -->
+							<view class="favorable_right" v-if="item.type=='coupon'">
+								<text class="favorable_right_text">{{item.value.name}}</text>
+								<up-icon name="arrow-right" color="#575B66" size="16"
+									v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'"></up-icon>
+							</view>
+
+							<!-- 积分 -->
+							<view class="favorable_right" v-if="item.type=='points'">
+								<text class="favorable_right_text" style="color: #666;margin-right: 16rpx;"
+									v-if="calcUsablePointsData.integral">
+									使用 {{ calcUsablePointsData.integral}}
+									积分抵扣￥{{props.listinfo.pointsDiscountAmount}}
+								</text>
+								<up-icon v-else name="arrow-right" color="#575B66" size="16"></up-icon>
+							</view>
+
+						</view>
+					</view>
+				</block>
+				<block v-else>
+					<view class="cell-item column" v-if="listinfo.discountInfo">
+						<view class="label">优惠折扣</view>
+						<view class="val column">
+							<view class="productCoupon" v-for="(item,index) in listinfo.discountInfo" :key="index">
+								<view class="name">{{item.name}}</view>
+								<!-- <view class="num">{{item.amount}}</view> -->
+								<view class="amount" style="margin-left: 10rpx;">{{item.amount}}元</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<view class="total-wrap" v-if="listinfo.status == 'unpaid'||!listinfo.id">
+					<view>总计￥</view>
+					<view class="price"> {{listinfo.totalCost}} </view>
+				</view>
+				
+				<view class="total-wrap" v-else>
+					<view>实付￥</view>
+					<view class="price"> {{listinfo.payAmount}} </view>
+				</view>
+
+
+			</view>
+		</view>
+		<view class="orderInfo">
+			<view class="row" @click="copyHandle(listinfo.orderNo)">
+				<text class="t">订单编号：</text>
+				<text class="info"
+					style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">{{listinfo.orderNo}}(点击复制)</text>
+			</view>
+			<view class="row">
+				<text class="t">下单时间：</text>
+				<text class="info">{{$u.timeFormat(listinfo.updateTime, 'yyyy-mm-dd hh:MM:ss')}}</text>
+			</view>
+			<view class="row" v-if="listinfo.tableName">
+				<text class="t">下单台桌：</text>
+				<text class="info">{{listinfo.tableName}}</text>
+			</view>
+			<view class="row" v-if="orderVIP.shopName">
+				<text class="t">下单门店：</text>
+				<text class="info">{{orderVIP.shopName}}</text>
+			</view>
+			<view class="row" v-if="listinfo.dineMod">
+				<text class="t">用餐模式：</text>
+				<text class="info" v-if="listinfo.dineMod == 'dine-in'">堂食</text>
+				<text class="info" v-if="listinfo.dineMod == 'take-out'">外带</text>
+				<text class="info" v-if="listinfo.dineMod == 'take-away'">外卖</text>
+			</view>
+			<view class="row" v-if="listinfo.remark">
+				<text class="t">备注：</text>
+				<text class="info">{{ listinfo.remark || ""}}</text>
+			</view>
+			<view class="row" v-if="listinfo.seatNum">
+				<text class="t">就餐人数：</text>
+				<text class="info">{{ listinfo.seatNum || ""}}</text>
+			</view>
+			<view class="row" v-if="listinfo.refundType">
+				<text class="t">退款方式：</text>
+				<text class="info">{{ listinfo.refundType == 'cash'?'手动退款':'原路退回'}}</text>
+			</view>
+		</view>
+		<IntegralInput :visible="calcUsablePointsData.showModal" :minValue="calcUsablePointsData.minIntegral"
+			:maxValue="calcUsablePointsData.maxIntegral" :instructions="calcUsablePointsData.instructionText"
+			@confirm="handleConfirm" @close="calcUsablePointsData.showModal = false"
+			@IntegralInputclose="IntegralInputclose" />
+	</view>
+
+</template>
+
+<script setup>
+	import {
+		useCartsStore
+	} from '@/stores/carts.js';
+	const cartStore = useCartsStore()
+	import orderItemVue from './order-item.vue';
+	import {
+		ref,
+		reactive,
+		defineProps,
+		computed,
+		defineEmits,
+		watch,
+		watchEffect,
+		defineExpose,
+		
+	} from 'vue'
+
+	import IntegralInput from './IntegralInput.vue';
+	import {
+		APImemberPointsmyPoints,
+		APImemberPointscalcUsablePoints,
+		APImemberPointscalcDeductionAmount
+	} from '@/common/api/shop/index.js'
+
+	// 定义自定义事件
+	const emits = defineEmits(['customevent', 'istype', 'learcoupons']);
+
+	// teb  切换送餐和打包
+	const tebtypeList = reactive([{
+			title: "送餐到桌",
+			show: false,
+			type: "table",
+			val: "dine-in",
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1.png",
+			url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1_active.png"
+		},
+		{
+			title: "打包外带",
+			show: false,
+			type: "takeself",
+			val: "take-out",
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2.png",
+			url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2_active.png"
+		},
+	])
+
+	const favorablelist = reactive([{
+			name: "商品券",
+			type: "product",
+			value: [],
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"
+		}, {
+			name: "优惠券",
+			type: "coupon",
+			value: "",
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"
+		},
+		// { name: "团购优惠", type: "group",value: "", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/groupOffer.png"},
+		{
+			name: "积分抵扣",
+			type: "points",
+			value: "",
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/points.png"
+		}
+	])
+
+
+	const props = defineProps({
+		useVipPrice:{
+			type: Boolean,default:false
+		},
+		packfee:{
+			type:[Number,String],
+			default:0
+		},
+		freeCheck: {
+			type: Boolean
+		},
+		shifu:{
+			type:[String,Number],
+			defalut:0
+		},
+		listinfo: {
+			type: Object,
+			default: {
+				combinedArray: {},
+				Productroll: 0,
+				coupondiscountAmount: 0,
+				couponInfoList: '',
+				pointsDiscountAmount: 0,
+				packFeess: 0,
+				totalPrices: 0,
+				Seatcharge: 0,
+				payAmount:0
+			}
+
+		},
+		orderVIP: {
+			type: Object
+		},
+		ordershopUserInfo: {
+			type: Object,
+			default: {
+				isTableFee: 0
+			}
+		},
+		changeFreeenable: {
+			type: Boolean,
+			default: false
+		},
+		nowCarts:{
+			type:Array,
+			default:()=>{
+				return []
+			}
+		}
+	})
+
+	const is_type = ref(0)
+	// 监听送餐/打包切换
+	const tabClick = (item, index) => {
+		is_type.value = index
+		emits("istype", is_type.value)
+		// this.getchoseEatModel('tabClick', index, item);
+	}
+
+	// 操作优惠卷
+	const dataprocessing = (data) => {
+		if (data.typeOrder == 1) {
+			favorablelist[1].value = data.item
+		} else {
+			favorablelist[0].value = data
+		}
+
+	}
+
+	// 清空
+	const bwcclear = () => {
+		IntegralInputclose()
+		// 清空优惠卷
+		favorablelist[1].value = ''
+		favorablelist[0].value = ''
+	}
+
+	// 跳转
+	const goUrl = (item) => {
+		console.log(props.listinfo.totalPrices, props.listinfo.Productroll)
+		if (props.changeFreeenable) {
+			uni.showToast({
+				title: '不可与其他优惠共享!',
+				icon: 'none'
+			})
+			return false;
+		}
+		switch (item.type) {
+			case 'coupon':
+				// 清空积分
+				IntegralInputclose()
+				favorablelist[1].value = ''
+				emits('learcoupons', 'coupon')
+				console.log('payAmount',props.listinfo.totalPrices,props.listinfo
+						.Productroll);
+				uni.pro.navigateTo('/pages/order/coupon', {
+					type: "confirm_order_coupon",
+					shopId: uni.cache.get('orderVIP').shopId,
+					shopUserId: props.orderVIP.id,
+					payAmount: (parseFloat(props.listinfo.totalPrices) - parseFloat(props.listinfo
+						.Productroll)).toFixed(2),
+					shoppingCart: JSON.stringify([ ...props.nowCarts,...props.listinfo.combinedArray]),
+				})
+				break;
+			case 'product':
+				// 清空积分
+				IntegralInputclose()
+				console.log('props.listinfo.combinedArray',props.listinfo.combinedArray);
+				// 清空优惠卷
+				favorablelist[1].value = ''
+				favorablelist[0].value = ''
+				emits('learcoupons', 'product')
+				uni.pro.navigateTo('/pages/order/coupon', {
+					type: "confirm_order_product",
+					shopId: uni.cache.get('orderVIP').shopId,
+					shopUserId: props.orderVIP.id,
+					payAmount: props.listinfo.totalPrices,
+					shoppingCart: JSON.stringify([...props.nowCarts,...props.listinfo.combinedArray]),
+				})
+				break;
+			case 'points':
+				IntegralInputclose()
+				if (calcUsablePointsData.usable == 0) {
+					uni.showToast({
+						title: calcUsablePointsData.unusableReason,
+						icon: 'none'
+					})
+					return false;
+				}
+				console.log('calcUsablePointsData:', calcUsablePointsData)
+				calcUsablePointsData.showModal = true
+				break;
+		}
+	}
+
+	// 积分
+	const calcUsablePointsData = reactive({
+		minIntegral: 1, //最小
+		maxIntegral: '', //最多积分
+		instructionText: '',
+		unusableReason: '',
+		showModal: false,
+		integral: ''
+	})
+	
+	
+	const handleConfirm = async (integral) => {
+		calcUsablePointsData.integral = integral
+		props.listinfo.pointsDiscountAmount = await APImemberPointscalcDeductionAmount({
+			points: integral,
+			shopUserId: props.orderVIP.id,
+			orderAmount: props.listinfo.totalCost
+		})
+		emits('clickPointsamount', {
+			pointsDiscountAmount: props.listinfo.pointsDiscountAmount,
+			pointsNum: calcUsablePointsData.integral
+		});
+	};
+
+	// * 获取积分相关信息
+	const getCalcUsablePoints = async (data) => {
+		Object.assign(calcUsablePointsData, data);
+		try {
+			calcUsablePointsData.minIntegral = data.minDeductionPoints
+			calcUsablePointsData.maxIntegral = data.maxUsablePoints
+			calcUsablePointsData.instructionText =
+				`请输入 ${ data.minDeductionPoints} - ${data.maxUsablePoints} 之间的积分`
+		} catch (error) {
+			//TODO handle the exception
+		}
+
+	}
+
+	// 积分取消清空
+	const IntegralInputclose = async () => {
+		calcUsablePointsData.integral = null
+		props.listinfo.pointsDiscountAmount = 0
+		calcUsablePointsData.showModal = false
+	}
+
+	// * 复制订单号
+	const copyHandle = (e) => {
+		uni.setClipboardData({
+			data: e,
+			success() {
+				uni.showToast({
+					title: '复制成功',
+					icon: 'none'
+				});
+			}
+		});
+	}
+
+
+	// 将方法暴露给父组件
+	defineExpose({
+		dataprocessing,
+		getCalcUsablePoints,
+		bwcclear,IntegralInputclose
+	});
+</script>
+
+<style lang="scss" scoped>
+	.card_box {
+		background-color: #fff;
+		// box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
+		position: relative;
+		width: 100%;
+		height: 100%;
+		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
+		border-radius: 18rpx;
+		padding-bottom: 32rpx;
+
+		.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;
+						}
+					}
+				}
+
+			}
+		}
+
+
+		.card_head_box {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			position: absolute;
+			top: -22.5rpx;
+			padding: 0 44rpx;
+
+			.card_head_item {
+				width: 45rpx;
+				height: 45rpx;
+				background-color: #f9f9f9;
+				border-radius: 50%;
+				// box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
+			}
+
+		}
+
+		.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 {
+					padding-top: 28rpx;
+					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;
+
+
+
+			}
+
+
+		}
+	}
+
+	.orderInfo {
+		background: #FFFFFF;
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+		margin-top: 32rpx;
+		padding: 32rpx 34rpx;
+
+		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
+		.row {
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 32rpx;
+
+			.t {
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #333333;
+				flex-shrink: 0;
+			}
+
+			.info {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #666666;
+			}
+		}
+
+		.row:last-child {
+			margin-bottom: none;
+		}
+
+	}
+
+
+	.fixedview {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+
+		.flex-between {
+			width: 100%;
+			padding: 36rpx 54rpx 102rpx 54rpx;
+			background: #FFFFFF;
+
+			.fixedview_one {
+				display: flex;
+				align-items: flex-end;
+
+				.fixedview_oneone {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #666666;
+				}
+
+				.fixedview_onetow {
+					font-weight: bold;
+					font-size: 32rpx;
+					color: #333333;
+
+					text {
+						font-size: 24rpx;
+					}
+				}
+			}
+
+			.fixedview_tow {
+				width: 140rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				text-align: center;
+				background: #E3AD7F;
+				border-radius: 12rpx 12rpx 12rpx 12rpx;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue
new file mode 100644
index 0000000..d7ca518
--- /dev/null
+++ b/pages/order/components/orderInfo.vue
@@ -0,0 +1,1208 @@
+<template>
+	<view>
+		<view class="card_box">
+			<!-- <view class="card_head_box">
+				<view class="card_head_item" v-for="(item,index) in 8" :key="index"></view>
+			</view> -->
+
+			<!-- 先付款 -->
+			<view class="tabBox" v-if="listinfo.status == 'unpaid'||!listinfo.id">
+				<view class="tab">
+					<view v-for="(item,index) in tebtypeList" :key="index"
+						:class="is_type==index?'tab_item'+(is_type+1)+' tab_item  active ':'tab_item'"
+						@click="tabClick(item,index)">
+						<view></view>
+						<image class="icon" :src="is_type==index?item.url_active:item.url" mode="aspectFill" />
+						<text class="title" :class="{active:is_type==index}">{{item.title}}</text>
+					</view>
+				</view>
+				<view class="table" v-if=" is_type == 0 ">
+					<view class="table_left">
+						<image class="icon"
+							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png"
+							mode="aspectFill" />
+						<text class="title">桌台</text>
+					</view>
+					<view class="value" v-if="listinfo.tableName"> {{ listinfo.tableName || '' }} </view>
+				</view>
+				<!-- 	<view class="pack" v-else>
+					<view class="top">
+						<text class="title">{{ shopInfo.shopName }}</text>
+						<text class="address">{{ shopInfo.address }}</text>
+					</view>
+					<view class="list">
+						<view class="item">
+							<view class="lable">取餐时间</view>
+							<view class="text">立即取餐</view>
+						</view>
+						<view class="item">
+							<view class="lable">预留电话</view>
+							<view class="getPhone text"><u-input class="inputVal" v-model="order.phone"
+									input-align="right" placeholder="请输入预留电话以便联系您"></u-input><text
+									class="getBtn">获取手机号</text></view>
+						</view>
+					</view>
+				</view> -->
+			</view>
+
+			<view class="card">
+				<orderItemVue :useVipPrice="useVipPrice" v-if="nowCarts.length" :nowCarts="nowCarts"></orderItemVue>
+				<!-- 订单头部 -->
+				<view class="card_item" v-for="(value, key) in listinfo.detailMap" :key="key">
+					<!-- <view class="head">
+						<view class="head_left">
+							<text class="placeNum" v-if="key!=0">第{{key}}次下单</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">
+									<text v-if="isBwc">{{item.price}}</text>
+									<text v-else>
+										￥{{useVipPrice?(item.memberPrice|| item.price):item.price}}
+									</text>
+								</view>
+								<view class="num">x{{item.num}}</view>
+							</view>
+						</view>
+
+
+
+					</view>
+
+
+					<!--<view class="status" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">未付款</view>
+					 <view class="totalAmount">
+						<view class="label">小计￥</view>
+						<view class="price"> {{item.totalAmount}} </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 class="total-wrap" v-if="listinfo.status == 'unpaid'||!listinfo.id">
+					<view>总计￥</view>
+					<view class="price"> {{listinfo.totalCost||''}} </view>
+				</view>
+
+				<view class="total-wrap" v-else>
+					<view>实付￥</view>
+					<view class="price"> {{listinfo.payAmount||''}} </view>
+				</view>
+
+				<view class="cell-item" v-if="is_type != 0">
+					<view class="label">打包费</view>
+					<view class="val">
+						<view></view>
+						<view style="font-size: 28rpx;">￥</view>
+						<view>{{packfee }}</view>
+					</view>
+				</view>
+
+
+				<!-- isTableFee == 0是不免除 -->
+				<view class="cell-item"
+					v-if="ordershopUserInfo.isTableFee == 0 && is_type == 0 && listinfo.Seatcharge != 0">
+					<view class="label">餐位费</view>
+					<view class="val">
+						<view>X{{listinfo.Seatcharge}}</view>
+						<view style="font-size: 28rpx;">￥</view>
+						<view>{{listinfo.Seatcharge}}</view>
+					</view>
+				</view>
+
+				<!-- <view class="cell-item" v-else>
+					<view class="label">免餐位费</view>
+					<view class="val">
+						<view></view>
+						<view style="font-size: 28rpx;">￥</view>
+						<view>{{listinfo.Seatcharge}}</view>
+					</view>
+				</view> -->
+
+				<!-- 支付之前 -->
+				<block v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'||!listinfo.id">
+					<view class="u-m-t-40 u-p-l-20 u-p-r-20">
+						<view class="favorable" v-for="(item,indexe) in favorablelist" :key="indexe"
+							:class="{column:item.type=='product'}" @click="goUrl(item)">
+							<view class="favorable_left">
+								<view class="u-flex" style="width: 44rpx;">
+									<u-image bgColor="#fff" :width="item.width||'44rpx'" :height="item.height||'44rpx'"
+										v-if="item.icon" :src="item.icon" mode=""></u-image>
+								</view>
+								<text class="name u-m-l-16"> {{ item.name }} </text>
+							</view>
+
+							<!-- 商品卷 -->
+							<view class="favorable_right" :class="{column:item.value}" v-if="item.type=='product'">
+								<view :class="{column:item.value}">
+									<view class="favorable_right_text" v-if="item.value.uniqueIds">
+										<text>{{item.value.uniqueIds}}张</text>
+										<text>￥-{{item.value.Productroll}}</text>
+									</view>
+								</view>
+								<up-icon name="arrow-right" color="#575B66" size="16"
+									style="margin-top: 5rpx;"></up-icon>
+							</view>
+
+							<!-- 优惠卷 -->
+							<view class="favorable_right" v-if="item.type=='coupon'">
+								<text class="favorable_right_text">{{item.value.name}}</text>
+								<up-icon name="arrow-right" color="#575B66" size="16"
+									v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'||!listinfo.id"></up-icon>
+
+							</view>
+
+							<!-- 积分 -->
+							<view class="favorable_right" v-if="item.type=='points'">
+								<text class="favorable_right_text" style="color: #666;margin-right: 16rpx;"
+									v-if="calcUsablePointsData.integral">
+									使用 {{ calcUsablePointsData.integral}}
+									积分抵扣￥{{props.listinfo.pointsDiscountAmount}}
+								</text>
+								<up-icon v-else name="arrow-right" color="#575B66" size="16"></up-icon>
+							</view>
+
+						</view>
+					</view>
+				</block>
+				<block v-else>
+					<view class="cell-item column" v-if="listinfo.discountInfo">
+						<view class="label">优惠折扣</view>
+						<view class="val column">
+							<view class="productCoupon" v-for="(item,index) in listinfo.discountInfo" :key="index">
+								<view class="name">{{item.name}}</view>
+								<!-- <view class="num">{{item.amount}}</view> -->
+								<view class="amount" style="margin-left: 10rpx;">{{item.amount}}元</view>
+							</view>
+						</view>
+					</view>
+				</block>
+
+
+			</view>
+		</view>
+		<view class="orderInfo">
+			<view class="row" @click="copyHandle(listinfo.orderNo)">
+				<text class="t">订单编号：</text>
+				<text class="info"
+					style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">{{listinfo.orderNo}}(点击复制)</text>
+			</view>
+			<view class="row">
+				<text class="t">下单时间：</text>
+				<text class="info">{{$u.timeFormat(listinfo.updateTime, 'yyyy-mm-dd hh:MM:ss')}}</text>
+			</view>
+			<view class="row" v-if="listinfo.tableName">
+				<text class="t">下单台桌：</text>
+				<text class="info">{{listinfo.tableName}}</text>
+			</view>
+			<view class="row" v-if="orderVIP.shopName">
+				<text class="t">下单门店：</text>
+				<text class="info">{{orderVIP.shopName}}</text>
+			</view>
+			<view class="row" v-if="listinfo.dineMod">
+				<text class="t">用餐模式：</text>
+				<text class="info" v-if="listinfo.dineMod == 'dine-in'">堂食</text>
+				<text class="info" v-if="listinfo.dineMod == 'take-out'">外带</text>
+				<text class="info" v-if="listinfo.dineMod == 'take-away'">外卖</text>
+			</view>
+			<view class="row" v-if="listinfo.id&& listinfo.satus!='unpaid'">
+				<text class="t">备注：</text>
+				<text class="info u-line-5">{{ listinfo.remark || ""}}</text>
+			</view>
+			<view class="row" v-if="listinfo.seatNum">
+				<text class="t">就餐人数：</text>
+				<text class="info">{{ listinfo.seatNum || ""}}</text>
+			</view>
+			<view class="row" v-if="listinfo.refundType">
+				<text class="t">退款方式：</text>
+				<text class="info">{{ listinfo.refundType == 'cash'?'手动退款':'原路退回'}}</text>
+			</view>
+		</view>
+
+		<view class="orderInfo">
+			<view class="">
+				<view class="t">
+					订单备注：
+				</view>
+				<view class="u-m-t-18 ">
+					<up-textarea border="none" placeholder="请填写口味、偏好等要求" :type="'textarea'" v-model="listinfo.remark"
+						:clearable="true" />
+				</view>
+			</view>
+		</view>
+
+
+
+		<IntegralInput :visible="calcUsablePointsData.showModal" :minValue="calcUsablePointsData.minIntegral"
+			:maxValue="calcUsablePointsData.maxIntegral" :instructions="calcUsablePointsData.instructionText"
+			@confirm="handleConfirm" @close="calcUsablePointsData.showModal = false"
+			@IntegralInputclose="IntegralInputclose" />
+	</view>
+
+</template>
+
+<script setup>
+	import {
+		useCartsStore
+	} from '@/stores/carts.js';
+	const cartStore = useCartsStore()
+	import orderItemVue from './order-item.vue';
+	import {
+		ref,
+		reactive,
+		defineProps,
+		computed,
+		defineEmits,
+		watch,
+		watchEffect,
+		defineExpose,
+
+	} from 'vue'
+
+	import IntegralInput from './IntegralInput.vue';
+	import {
+		APImemberPointsmyPoints,
+		APImemberPointscalcUsablePoints,
+		APImemberPointscalcDeductionAmount
+	} from '@/common/api/shop/index.js'
+	import goodsIcon from '@/static/icon/goods.png'
+	import coupIcon from '@/static/icon/coup.png'
+	import pointsIcon from '@/static/icon/points.png'
+	// 定义自定义事件
+	const emits = defineEmits(['customevent', 'istype', 'learcoupons']);
+
+	// teb  切换送餐和打包
+	const tebtypeList = reactive([{
+			title: "送餐到桌",
+			show: false,
+			type: "table",
+			val: "dine-in",
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1.png",
+			url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1_active.png"
+		},
+		{
+			title: "打包外带",
+			show: false,
+			type: "takeself",
+			val: "take-out",
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2.png",
+			url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2_active.png"
+		},
+	])
+
+	const favorablelist = reactive([{
+			name: "商品券",
+			type: "product",
+			value: [],
+			icon: goodsIcon,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"
+		}, {
+			name: "优惠券",
+			type: "coupon",
+			width: '40rpx',
+			height: '34rpx',
+			value: "",
+			icon: coupIcon,
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"
+		},
+		// { name: "团购优惠", type: "group",value: "", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/groupOffer.png"},
+		{
+			icon: pointsIcon,
+			name: "积分抵扣",
+			type: "points",
+			value: "",
+			url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/points.png"
+		}
+	])
+
+
+	const props = defineProps({
+		useVipPrice: {
+			type: Boolean,
+			default: false
+		},
+		packfee: {
+			type: [Number, String],
+			default: 0
+		},
+		freeCheck: {
+			type: Boolean
+		},
+		shifu: {
+			type: [String, Number],
+			defalut: 0
+		},
+		listinfo: {
+			type: Object,
+			default: {
+				combinedArray: {},
+				Productroll: 0,
+				coupondiscountAmount: 0,
+				couponInfoList: '',
+				pointsDiscountAmount: 0,
+				packFeess: 0,
+				totalPrices: 0,
+				Seatcharge: 0,
+				payAmount: 0,
+				remark: ''
+			}
+
+		},
+		orderVIP: {
+			type: Object
+		},
+		ordershopUserInfo: {
+			type: Object,
+			default: {
+				isTableFee: 0
+			}
+		},
+		isBwc: {
+			type: Boolean,
+			default: false
+		},
+		nowCarts: {
+			type: Array,
+			default: () => {
+				return []
+			}
+		}
+	})
+
+	const is_type = ref(0)
+	// 监听送餐/打包切换
+	const tabClick = (item, index) => {
+		is_type.value = index
+		emits("istype", is_type.value)
+		// this.getchoseEatModel('tabClick', index, item);
+	}
+
+	// 操作优惠卷
+	const dataprocessing = (data) => {
+		if (data.typeOrder == 1) {
+			favorablelist[1].value = data.item
+		} else {
+			favorablelist[0].value = data
+		}
+
+	}
+
+	// 清空
+	const bwcclear = () => {
+		IntegralInputclose()
+		// 清空优惠卷
+		favorablelist[1].value = ''
+		favorablelist[0].value = ''
+	}
+
+	// 跳转
+	const goUrl = (item) => {
+		console.log(props.listinfo.totalPrices, props.listinfo.Productroll)
+		if (props.isBwc) {
+			uni.showToast({
+				title: '不可与其他优惠共享!',
+				icon: 'none'
+			})
+			return false;
+		}
+		switch (item.type) {
+			case 'coupon':
+				// 清空积分
+				IntegralInputclose()
+				favorablelist[1].value = ''
+				emits('learcoupons', 'coupon')
+				console.log('payAmount', props.listinfo.totalPrices, props.listinfo
+					.Productroll);
+				uni.pro.navigateTo('/pages/order/coupon', {
+					type: "confirm_order_coupon",
+					shopId: uni.cache.get('orderVIP').shopId,
+					shopUserId: props.orderVIP.id,
+					payAmount: (parseFloat(props.listinfo.totalPrices) - parseFloat(props.listinfo
+						.Productroll)).toFixed(2),
+					shoppingCart: JSON.stringify([...props.nowCarts, ...props.listinfo.combinedArray]),
+				})
+				break;
+			case 'product':
+				// 清空积分
+				IntegralInputclose()
+				console.log('props.listinfo.combinedArray', props.listinfo.combinedArray);
+				// 清空优惠卷
+				favorablelist[1].value = ''
+				favorablelist[0].value = ''
+				emits('learcoupons', 'product')
+				uni.pro.navigateTo('/pages/order/coupon', {
+					type: "confirm_order_product",
+					shopId: uni.cache.get('orderVIP').shopId,
+					shopUserId: props.orderVIP.id,
+					payAmount: props.listinfo.totalPrices,
+					shoppingCart: JSON.stringify([...props.nowCarts, ...props.listinfo.combinedArray]),
+				})
+				break;
+			case 'points':
+				IntegralInputclose()
+				if (calcUsablePointsData.usable == 0) {
+					uni.showToast({
+						title: calcUsablePointsData.unusableReason,
+						icon: 'none'
+					})
+					return false;
+				}
+				console.log('calcUsablePointsData:', calcUsablePointsData)
+				calcUsablePointsData.showModal = true
+				break;
+		}
+	}
+
+	// 积分
+	const calcUsablePointsData = reactive({
+		minIntegral: 1, //最小
+		maxIntegral: '', //最多积分
+		instructionText: '',
+		unusableReason: '',
+		showModal: false,
+		integral: ''
+	})
+
+
+	const handleConfirm = async (integral) => {
+		calcUsablePointsData.integral = integral
+		props.listinfo.pointsDiscountAmount = await APImemberPointscalcDeductionAmount({
+			points: integral,
+			shopUserId: props.orderVIP.id,
+			orderAmount: props.listinfo.totalCost
+		})
+		emits('clickPointsamount', {
+			pointsDiscountAmount: props.listinfo.pointsDiscountAmount,
+			pointsNum: calcUsablePointsData.integral
+		});
+	};
+
+	// * 获取积分相关信息
+	const getCalcUsablePoints = async (data) => {
+		Object.assign(calcUsablePointsData, data);
+		try {
+			calcUsablePointsData.minIntegral = data.minDeductionPoints
+			calcUsablePointsData.maxIntegral = data.maxUsablePoints
+			calcUsablePointsData.instructionText =
+				`请输入 ${ data.minDeductionPoints} - ${data.maxUsablePoints} 之间的积分`
+		} catch (error) {
+			//TODO handle the exception
+		}
+
+	}
+
+	// 积分取消清空
+	const IntegralInputclose = async () => {
+		calcUsablePointsData.integral = null
+		props.listinfo.pointsDiscountAmount = 0
+		calcUsablePointsData.showModal = false
+	}
+
+	// * 复制订单号
+	const copyHandle = (e) => {
+		uni.setClipboardData({
+			data: e,
+			success() {
+				uni.showToast({
+					title: '复制成功',
+					icon: 'none'
+				});
+			}
+		});
+	}
+
+
+	// 将方法暴露给父组件
+	defineExpose({
+		dataprocessing,
+		getCalcUsablePoints,
+		bwcclear,
+		IntegralInputclose
+	});
+</script>
+
+<style lang="scss" scoped>
+	::v-deep .orderInfo .u-textarea{
+		background: #FAFAFA;
+		border-radius: 10rpx 10rpx 10rpx 10rpx;
+	}
+	::v-deep .u-textarea__field{
+		background: #FAFAFA;
+		border-radius: 10rpx 10rpx 10rpx 10rpx;
+	}
+	.t{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #333333;
+		flex-shrink: 0;
+	}
+	.card_box {
+		background-color: #fff;
+		// box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
+		position: relative;
+		width: 100%;
+		height: 100%;
+		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
+		border-radius: 18rpx;
+		padding-bottom: 32rpx;
+
+		.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: 0 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;
+				margin: 0 30rpx;
+				box-sizing: border-box;
+				height: 90rpx;
+				background-color: $uni-bg-color;
+				border-bottom: 1rpx solid #E5E5E5;
+
+				.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;
+						}
+					}
+				}
+
+			}
+		}
+
+
+		.card_head_box {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			position: absolute;
+			top: -22.5rpx;
+			padding: 0 44rpx;
+
+			.card_head_item {
+				width: 45rpx;
+				height: 45rpx;
+				background-color: #f9f9f9;
+				border-radius: 50%;
+				// box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
+			}
+
+		}
+
+		.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 {
+					padding-top: 28rpx;
+
+					.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;
+				height: 60rpx;
+				box-sizing: border-box;
+				// 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 {
+				display: flex;
+				margin: 0 30rpx;
+				justify-content: flex-end;
+				align-items: flex-end;
+				padding: 0 0 30rpx 34rpx;
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #333333;
+				border-bottom: 2rpx dashed #e5e5e5;
+
+				.price {
+					font-weight: bold;
+					font-size: 36rpx;
+				}
+			}
+
+
+
+			.order_footer {
+				display: flex;
+				flex-direction: column;
+				padding: 34rpx;
+				position: relative;
+
+
+
+			}
+
+
+		}
+	}
+
+	.orderInfo {
+		background: #FFFFFF;
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+		margin-top: 32rpx;
+		padding: 32rpx 34rpx;
+
+		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
+		.row {
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 32rpx;
+
+			.t {
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #333333;
+				flex-shrink: 0;
+			}
+
+			.info {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #666666;
+			}
+		}
+
+		.row:last-child {
+			margin-bottom: none;
+		}
+
+	}
+
+
+	.fixedview {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+
+		.flex-between {
+			width: 100%;
+			padding: 36rpx 54rpx 102rpx 54rpx;
+			background: #FFFFFF;
+
+			.fixedview_one {
+				display: flex;
+				align-items: flex-end;
+
+				.fixedview_oneone {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #666666;
+				}
+
+				.fixedview_onetow {
+					font-weight: bold;
+					font-size: 32rpx;
+					color: #333333;
+
+					text {
+						font-size: 24rpx;
+					}
+				}
+			}
+
+			.fixedview_tow {
+				width: 140rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				text-align: center;
+				background: #E3AD7F;
+				border-radius: 12rpx 12rpx 12rpx 12rpx;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/components/popup-choose-coup.vue b/pages/order/components/popup-choose-coup.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/pages/order/components/popup-choose-coup.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
new file mode 100644
index 0000000..9c608a4
--- /dev/null
+++ b/pages/order/confirm-order.vue
@@ -0,0 +1,1310 @@
+<template>
+	<view class="container">
+		<up-navbar :title="navTitle" @leftClick="back" placeholder></up-navbar>
+		<view class="headStatus">
+			<view class="status">
+
+				<up-icon v-if="listinfo.status =='done'||listinfo.status =='unpaid'||!listinfo.id"
+					name="checkmark-circle-fill" color="#03C061" size="23"></up-icon>
+				<view class="statusName" v-if="listinfo.status == 'unpaid'||!listinfo.id">待支付</view>
+				<view class="statusName" v-if="listinfo.status=='done'">已完成</view>
+				<view class="statusName" v-if="listinfo.status=='refund'">退单</view>
+				<view class="statusName" v-if="listinfo.status=='part-refund'">部分退单</view>
+				<view class="statusName" v-if="listinfo.status=='cancelled'">取消订单</view>
+			</view>
+			<view class="time" v-if="listinfo.createTime">下单时间：{{ listinfo.createTime }}</view>
+			<view class="time" v-if="listinfo.paidTime && (listinfo.status!='cancelled' ||listinfo.status!='unpaid')">
+				付款时间：{{listinfo.paidTime}}
+			</view>
+		</view>
+
+		<view class="wxQrcode" v-if="shopQrcode">
+			<view class="left">
+				<text class="title">扫码加好友，优惠多多</text>
+				<text>优惠活动多</text>
+				<text>充值有好礼</text>
+				<text>会员享低价</text>
+				<text>长按保存，微信内扫一扫加好友</text>
+			</view>
+			<!-- #ifdef MP-WEIXIN -->
+			<u-image width="152" height="152" radius="16" :src="shopQrcode"></u-image>
+			<!-- #endif -->
+			<!-- #ifdef MP-ALIPAY -->
+			<image style="height: 150rpx;width: 150rpx;" :src="shopQrcode" @longpress="saveImage(shopQrcode)"
+				mode="aspectFill"></image>
+			<!-- #endif -->
+		</view>
+
+
+		<!-- 详情 -->
+		<orderInfo :useVipPrice="cartStore.useVipPrice" :packfee="packfee" :shifu="shifu" :nowCarts="cartStore.carts"
+			ref="orderInfoAfterRef" :freeCheck="freeCheck" :listinfo="listinfo" :orderVIP="orderVIP"
+			:ordershopUserInfo='ordershopUserInfo' @istype="istype" @clickPointsamount='clickPointsamount'
+			@learcoupons="learcoupons" :isBwc='isBwc'>
+		</orderInfo>
+		<!-- 霸王餐 -->
+		<rechargeFree :freeDineConfig="orderVIP.freeDineConfig" :payAmount="listinfo.totalPrices"
+			v-if="(listinfo.status == 'unpaid'||!listinfo.id) && orderVIP.freeDineConfig.enable"
+			@changeFree="changeFree">
+		</rechargeFree>
+		<!-- 支付方式 -->
+		<paymentMethodes ref="paymentMethodref" :orderVIP="orderVIP" @groupChange="groupChange"
+			:changeFreeenable="isBwc" v-if="listinfo.status == 'unpaid'||!listinfo.id">
+		</paymentMethodes>
+		<view class="fixedview">
+			<view class="flex-between" v-if="listinfo.status == 'unpaid'||!listinfo.id">
+				<view class="fixedview_one flex-start">
+					<view class="fixedview_oneone"> 实付金额： </view>
+					<view class="fixedview_onetow">
+						<text>¥</text>{{listinfo.totalCost}}
+					</view>
+				</view>
+				<view class="flex-colum-end u-flex u-flex-y-center">
+
+					<view class="u-m-r-30 u-flex u-flex-y-center">
+						<template v-if="ordershopUserInfo.registerType=='before'">
+							<up-button shape="circle" @click="toJiacai" plain :custom-style="customStyle">
+								<view class="u-flex u-flex-y-center">
+									<image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png"
+										mode=""></image>
+									<text class="u-font-32 color-main u-m-l-16">加菜</text>
+								</view>
+							</up-button>
+						</template>
+						<template v-else>
+							<up-button v-if="!cartStore.isEmpty" shape="circle" @click="onlyCreateOrder" plain
+								:custom-style="customStyle">
+								<view class="u-flex u-flex-y-center">
+									<!-- <image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png" mode=""></image> -->
+									<text class="u-font-32 color-main ">仅下单</text>
+								</view>
+							</up-button>
+							<up-button v-else shape="circle" @click="toJiacai" plain :custom-style="customStyle">
+								<view class="u-flex u-flex-y-center">
+									<image style="width: 40rpx;height: 40rpx;" src="@/static/icon/add-goods.png"
+										mode=""></image>
+									<text class="u-font-32 color-main u-m-l-16">加菜</text>
+								</view>
+							</up-button>
+						</template>
+					</view>
+					<view class="fixedview_tow" @tap="$u.debounce(istoricalorders,1000)">
+						{{paymentmethod.paymentBtnText}}
+					</view>
+					<!-- <view class="fixedview_tows" @tap="$u.debounce(APIputuserorderclick,1000)">
+						取消订单
+					</view> -->
+				</view>
+			</view>
+		</view>
+		<view style="width: 100%;height: 200rpx;color: #fff; color: #fff;">
+		</view>
+		<payPassword ref="payPasswordref" :isShow="ispws" @inputComplete="accountPayevent" @close="ispws = false" />
+	</view>
+</template>
+<script setup>
+	import {
+		back
+	} from '@/utils/uniapp.js'
+	const customStyle = {
+		'width': '180rpx',
+		'height': '70rpx',
+		'background': 'FFFFFF',
+		'border-radius': '106rpx',
+		'border': '2rpx solid #E8AD7B'
+	}
+	import {
+		ref,
+		reactive,
+		computed,
+		onMounted,
+		onUnmounted,
+		watchEffect,
+		nextTick,
+		watch
+	} from 'vue';
+	import {
+		getTableInfo
+	} from '@/common/api/shop/index.js'
+	import {
+		APIgetOrderById,
+		APIputuserorder,
+		APIhistoryOrder
+	} from '@/common/api/order/index.js'
+	import {
+		APIshopUserInfo
+	} from '@/common/api/member.js'
+	import {
+		APImemberPointsmyPoints,
+		APImemberPointscalcUsablePoints
+	} from '@/common/api/shop/index.js'
+	import {
+		useCartsStore
+	} from '@/stores/carts.js';
+	import useWebSocket from '@/common/js/carts-websocket.js';
+	const cartStore = useCartsStore()
+	let cartsSocket = null
+	watch(() => cartStore.goodsIsloading, (newValue) => {
+		console.log('cartStore.goodsIsloading', cartStore.goodsIsloading);
+		if (!newValue) {
+			cartsSocket = useWebSocket(socketInitOptions);
+			cartsSocket.connect();
+		}
+	})
+	if (cartStore.goodsIsloading) {
+		cartStore.goodsInit()
+	} else {
+		cartsSocket = useWebSocket(socketInitOptions);
+		cartsSocket.connect();
+	}
+
+
+	const noPayStatus = {
+		cancelled: "订单已取消",
+		done: "订单已关闭",
+	};
+	async function onMessage(Message) {
+		console.log('onMessage');
+		cartStore.onMessage(Message, cartsSocket)
+		listinfo.totalPrices = historyTotalPrices * 1 + cartStore.totalPrice * 1
+		if (Message.operate_type == "init") {
+			youhuiReset()
+		}
+		if (Message.operate_type == "cleanup") {
+			youhuiReset()
+			if (listinfo.id) {
+				let res = await APIgetOrderById({
+					orderId: listinfo.id
+				})
+				if (noPayStatus[res.status]) {
+					uni.showToast({
+						title: noPayStatus[res.status],
+						icon: 'none'
+					})
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1000);
+					return;
+				}
+				console.log(res);
+			}
+		}
+		if (Message.operate_type == "del") {
+			youhuiReset()
+		}
+		if (Message.operate_type == "edit") {
+			youhuiReset()
+		}
+		if (Message.operate_type == 'clearOrder') {
+			youhuiReset()
+		}
+		if (Message.type == 'product' && Message.data_type == 'product_update' && Message
+			.operate_type == 'product_update') {
+			youhuiReset()
+		}
+	}
+
+
+	function youhuiReset() {
+		listinfo.pointsDiscountAmount = 0;
+		listinfo.pointsNum = 0;
+		listinfo.pointsDiscountAmount = 0
+		listinfo.Productroll = 0
+		uniqueIds.value = []
+		orderInfoAfterRef.value.IntegralInputclose();
+	}
+	const socketInitOptions = {
+		initMessage: {
+			type: 'shopping',
+			operate_type: 'init',
+			table_code: uni.cache.get('tableCode'),
+			shop_id: uni.cache.get('shopId'),
+		},
+		onMessage
+	}
+
+	// 结账管理
+	import {
+		Memberpay
+	} from '@/stores/pay.js';
+
+	const storeMemberpay = Memberpay();
+
+
+
+	import {
+		productStore
+	} from '@/stores/user.js';
+	const storeuser = productStore();
+
+	import payPassword from '@/components/payPassword.vue'
+	import orderInfo from './components/orderInfo.vue'
+	// import orderInfoBefore from '../components/orderInfoBefore.vue'
+	import rechargeFree from './components/rechargeFree.vue'
+	import paymentMethodes from '@/components/paymentMethod.vue'; //支付方式
+	import {
+		onShow,
+		onBackPress
+	} from '@dcloudio/uni-app';
+	import {
+		onHide
+	} from '@dcloudio/uni-app';
+	// 输入支付密码
+	const ispws = ref(false)
+
+
+	// 会员信息
+	const orderVIP = ref(uni.cache.get('orderVIP'))
+	// 商品订单关联的店铺信息
+	const ordershopUserInfo = ref(uni.cache.get('shopInfo'))
+
+
+	cartStore.updateData('orderVIP', orderVIP.value)
+	cartStore.updateData('shopInfo', ordershopUserInfo.value)
+	// 是否显示商家二维码信息
+	const shopQrcode = ref(ordershopUserInfo.shopInfo || false)
+
+	// 霸王餐
+	const isBwc = ref(false)
+	// 订单详情
+	const listinfo = reactive({
+		combinedArray: [],
+		Productroll: 0,
+		coupondiscountAmount: 0,
+		pointsDiscountAmount: 0,
+		packFeess: 0,
+		totalPrices: 0,
+		Seatcharge: 0,
+		pointsNum: 0,
+		id: null
+	})
+
+
+
+	//判断是否是打包商品
+	const is_type = ref(0)
+	//打包商品切换
+	const istype = (newValue) => {
+		is_type.value = newValue;
+	};
+	//积分
+
+	const freeCheck = ref(false)
+	let backtimer = null
+	let historyTotalPrices = 0;
+	// * 获取订单详情接口
+	const orderorderInfo = async () => {
+		let res = listinfo.id ? await APIgetOrderById({
+			orderId: listinfo.id
+		}) : await APIhistoryOrder({
+			tableCode: options.tableCode
+		})
+		if (options.tableCode) {
+			let tableRes = await getTableInfo({
+				tableCode: options.tableCode
+			})
+			console.log(tableRes);
+			listinfo.tableName = tableRes.name;
+		}
+		console.log(res);
+		getOrderInfoAfterCalcInit(res)
+	}
+
+	//拿到订单数据后续初始化处理
+	function getOrderInfoAfterCalcInit(res) {
+		if (res && res.id) {
+			Object.assign(listinfo, res);
+			// 历史订单
+			if (listinfo.detailMap) {
+				let combinedArray = [];
+				for (const key in listinfo.detailMap) {
+					if (listinfo.detailMap.hasOwnProperty(key)) {
+						let subArray = listinfo.detailMap[key];
+						combinedArray = [...combinedArray, ...subArray]
+					}
+				}
+				listinfo.combinedArray = combinedArray
+				listinfo.packFeess = cartStore.getTotalPackFee(listinfo.combinedArray)
+				// 计算购物车商品费用
+				historyTotalPrices = cartStore.getTotalTotalPrices(listinfo
+					.combinedArray, isBwc.value) * 1
+
+				listinfo.totalPrices = historyTotalPrices + cartStore.totalPrice * 1
+				// 餐位费listinfo.seatNum
+				listinfo.Seatcharge = cartStore.getTotalSeatcharge(listinfo.seatNum)
+			}
+			if (listinfo.discountInfo) {
+				const discountObj = JSON.parse(listinfo.discountInfo);
+				const tempArray = [];
+				for (const [key, value] of Object.entries(discountObj)) {
+					tempArray.push({
+						name: key,
+						amount: value
+					});
+				}
+				listinfo.discountInfo = tempArray;
+			}
+			// 回填先质控
+			listinfo.pointsDiscountAmount = 0
+			// console.log(listinfo)
+
+		} else {
+			listinfo.totalPrices = cartStore.totalPrice * 1
+		}
+
+		// uni.showToast({
+		// 	title:'订单已取消或已付款',
+		// 	icon:'none'
+		// })
+		// backtimer=setTimeout(()=>{
+		// 	const arr=getCurrentPages()
+		// 	if(arr.length<=1){
+		// 		toJiacai()
+		// 	}else{
+		// 		uni.navigateBack({delta:1})
+		// 	}
+		// },1000)
+	}
+
+
+	// 监听价格算法
+	watchEffect(async () => {
+		if (listinfo.combinedArray.length > 0 || cartStore.carts.length > 0) {
+			// 打包费packFeess  计算购物车商品费用totalPrices  餐位费Seatcharge
+			// try {
+			let historyOrderPackFee = is_type.value != 0 ? listinfo.packFeess : 0;
+			let nowCartPackFee = is_type.value != 0 ? cartStore.totalPackFee * 1 : 0;
+			let seatFee = is_type.value == 0 ? listinfo.Seatcharge : 0;
+			let sum = cartStore.totalPackFee * 1 + historyOrderPackFee + listinfo.totalPrices + seatFee;
+			listinfo.originAmount = Math.round(sum * 100) / 100;
+
+			// 打包费packFeess  计算购物车商品费用totalPrices  餐位费Seatcharge  商品卷Productroll 优惠卷coupondiscountAmount 积分listinfo.pointsDiscountAmount
+			console.log('listinfo');
+			console.log(listinfo);
+			let sums = nowCartPackFee + historyOrderPackFee + listinfo.totalPrices + seatFee - (listinfo
+				.Productroll || 0) - (listinfo.coupondiscountAmount || 0) - (listinfo
+				.pointsDiscountAmount || 0);
+			console.log('listinfo', listinfo);
+			listinfo.totalCost = Math.round(sums * 100) / 100;
+
+			// 总价格
+			// console.log(listinfo.combinedArray, listinfo.packFeess, listinfo.totalPrices, listinfo
+			// 	.Seatcharge, listinfo.Productroll, listinfo.coupondiscountAmount, sums) // 霸王餐
+			// console.log(orderVIP.value.freeDineConfig.enable, changeFreeenable.value)
+			if (orderVIP.value.freeDineConfig.enable && isBwc.value) {
+				listinfo.totalCost = (parseFloat(listinfo.totalCost) * parseFloat(orderVIP.value
+					.freeDineConfig.rechargeTimes)).toFixed(2)
+			}
+			// 积分
+			if (listinfo.totalCost && (listinfo.status == 'unpaid' || !listinfo.id) && orderVIP.value.id) {
+				uni.$u.debounce(memberPointscalcUsablePoints, 500)
+			}
+			// } catch (error) {
+			// 	//TODO handle the exception
+			// }
+		}
+	});
+
+
+
+	const changeFree = (e) => {
+		isBwc.value = e
+
+		orderInfoAfterRef.value.bwcclear()
+		uniqueIds.value = [] // 筛选出商品卷的id
+		listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
+		listinfo.pointsNum = 0 // 商品卷总价价格
+		// 商品价格
+		listinfo.totalPrices = cartStore.getTotalTotalPrices(listinfo.combinedArray, isBwc.value)
+		// 支付方式切换
+		// #ifdef MP-WEIXIN
+		paymentMethodref.value.groupChanges(2)
+		// #endif
+		// #ifdef MP-ALIPAY
+		paymentMethodref.value.groupChanges(3)
+		// #endif
+
+
+	}
+
+	const saveImage = (url) => {
+		uni.saveImage({
+			url: url,
+			success: () => {
+				uni.showToast({
+					title: "保存成功",
+					icon: 'none'
+				})
+			},
+		});
+	}
+
+	//
+	const paymentMethodref = ref(null)
+
+	// 支付方式切换
+	const paymentmethod = reactive({
+		radiovalue: 2,
+		paymentBtnText: "微信支付",
+		payType: 'wechatPay'
+	})
+
+	const groupChange = async (e) => {
+		paymentmethod.radiovalue = e.type;
+		paymentmethod.paymentBtnText = e.name;
+		paymentmethod.payType = e.payType;
+	}
+
+	// * 去充值
+	const goRecharge = () => {
+		uni.pro.navigateTo('/pages/member/index', {
+			shopId: listinfo.shopId
+		})
+	}
+
+	// 操作下单时候
+	const orderInfoAfterRef = ref(null)
+
+	// 商品卷的id储存
+	const uniqueIds = ref([])
+
+	// 这是优惠卷传的值
+	const handleReturnData = async (data) => {
+		// 这是优惠卷
+		if (data.typeOrder == 1) {
+			if (data.item) {
+				// 优惠卷减去的金额
+				listinfo.coupondiscountAmount = data.item.discountAmount
+				uniqueIds.value.push(data.item.id)
+				orderInfoAfterRef.value.dataprocessing(data)
+			}
+		} else {
+			// 筛选出商品卷的id
+			// 商品卷总价价格
+			// uniqueIds.value = [...uniqueIds.value, ...new Set(data.map(item => item.id))]
+			uniqueIds.value = [...uniqueIds.value, ...data.map(item => item.id)]
+			console.log(uniqueIds.value);
+			listinfo.Productroll = cartStore.getTotalProductroll(data).value
+			// TODO handle the exception
+			let res = {
+				Productroll: listinfo.Productroll,
+				uniqueIds: uniqueIds.value.length
+			}
+			orderInfoAfterRef.value.dataprocessing(res)
+
+		}
+
+	};
+
+	const learcoupons = (data) => {
+		if (data == 'product') {
+			uniqueIds.value = [] // 筛选出商品卷的id
+			listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
+			listinfo.Productroll = 0 // 商品卷总价价格
+			listinfo.pointsNum = 0 // 积分总价格
+		} else {
+			// 每次点击优惠卷删除优惠卷里的id 
+			if (listinfo.coupondiscountAmount != 0) {
+				uniqueIds.value.pop()
+			}
+			listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额
+		}
+	}
+
+	// 删除订单
+	const APIputuserorderclick = async () => {
+		await APIputuserorder(listinfo.id)
+		uni.showToast({
+			title: '删除成功',
+			icon: 'none'
+		})
+		uni.pro.switchTab('order/index')
+	}
+	async function onlyCreateOrder() {
+		await createOrder()
+		orderorderInfo()
+	}
+	// 生成订单
+	const createOrder = async () => {
+		const res = await storeMemberpay.actionscreateOrder({
+			dineMode: is_type.value == 0 ? 'dine-in' : 'take-out', //堂食 dine-in 外带 take-out 外卖 take-away
+			seatNum: uni.cache.get('dinersNum') ? uni.cache.get('dinersNum') : '', //用餐人数
+			// packFee: packFee.value, //打包费
+			packFee: packfee.value, //打包费
+			originAmount: shifu.value, //订单原金额（包含打包费） 不含折扣价格 不含餐位费
+			remark: '', //备注
+			placeNum: listinfo.id ? (listinfo.placeNum * 1 + 1) : 1, //当前订单下单次数
+			waitCall: '', //是否等叫 0 否 1 等叫
+			orderId: listinfo.id || '',
+			userId: uni.cache.get('userInfo').id || '' //
+		})
+		// 清空购物车
+		if (res) {
+			Object.assign(listinfo, res)
+			getOrderInfoAfterCalcInit(res)
+			cartsSocket.sendMessage({
+				type: 'shopping',
+				table_code: uni.cache.get('tableCode'),
+				shop_id: uni.cache.get('shopId'),
+				operate_type: 'cleanup',
+			})
+			return res
+		} else {
+			uni.showToast({
+				title: '生成订单失败'
+			})
+		}
+
+	}
+
+
+	const istoricalorders = async () => {
+
+		// 购物车有数据
+		if (!cartStore.isEmpty) {
+			await createOrder()
+			goToPay()
+		}
+
+		// 先调用历史订单
+		let APIhistoryOrderres = await APIhistoryOrder({
+			tableCode: listinfo.tableCode
+		})
+		// 判断是否有历史订单
+		if (APIhistoryOrderres.detailMap) {
+			let combinedArray = [];
+			for (const key in APIhistoryOrderres.detailMap) {
+				if (APIhistoryOrderres.detailMap.hasOwnProperty(key)) {
+					let subArray = APIhistoryOrderres.detailMap[key];
+					combinedArray = [...combinedArray, ...subArray]
+				}
+			}
+			// 判断支付之前是是否还有新加订单
+			if (listinfo.combinedArray.length === combinedArray.length) {
+				goToPay()
+			} else {
+				uni.showToast({
+					title: '你的订单已更新！',
+					icon: 'none'
+				})
+				orderorderInfo()
+			}
+		} else {
+			uni.showToast({
+				title: '你的小伙伴已提交订单~',
+				icon: 'none'
+			})
+			setTimeout(() => {
+				orderorderInfo()
+			}, 1000)
+		}
+	}
+
+	// * 去支付
+	const goToPay = async () => {
+		// 余额支付
+		if (paymentmethod.payType == 'accountPay') {
+			if (orderVIP.value.isVip == 0) {
+				uni.showModal({
+					title: '提示',
+					content: '您还不是会员,是否去注册会员？',
+					success: (res) => {
+						if (res.confirm) {
+							uni.pro.navigateTo('user/member/index', {
+								shopId: orderVIP.value.shopId,
+								type: 'detail'
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				})
+			} else if (orderVIP.value.payPwd == '') {
+				uni.showModal({
+					title: '提示',
+					content: '您还未设置支付密码，是否去设置？',
+					success: (res) => {
+						if (res.confirm) {
+							uni.pro.navigateTo('user/member/setPassword', {
+								shopId: orderVIP.value.shopId,
+								type: 'detail'
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				})
+				// } else if (orderVIP.value.amount == 0) {
+				// 	uni.showToast({
+				// 		title: '您的余额不足',
+				// 		icon: 'none'
+				// 	})
+				// } else {
+			} else {
+				ispws.value = true
+			}
+			return false
+		}
+		if (orderVIP.value.freeDineConfig.enable && isBwc.value) {
+			await storeMemberpay.actionspayltPayVip({
+				shopId: orderVIP.value.shopId,
+				shopUserId: orderVIP.value.id,
+				orderId: listinfo.id,
+				userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
+				amount: listinfo.totalCost, // 最终订单金额
+				returnUrl: '', //跳转地址
+				buyerRemark: '',
+				seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数
+			})
+			orderorderInfo()
+			return false;
+		} else {
+			console.log(' ordershopUserInfo.value', ordershopUserInfo.value);
+			let checkOrderPay = {
+				orderId: listinfo.id,
+				vipPrice: cartStore.useVipPrice ? 1 : 0, //是否使用会员价0否1是
+				userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
+				seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数
+				originAmount: listinfo.originAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格
+				discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数)   写死1
+				discountAmount: 0, //手动优惠金额  写死0
+				productCouponDiscountAmount: listinfo.Productroll, //商品优惠券抵扣金额
+				fullCouponDiscountAmount: listinfo.coupondiscountAmount, //满减优惠券抵扣金额
+				couponList: uniqueIds.value, //用户使用的卡券
+				orderAmount: listinfo.totalCost, // 最终订单金额
+				roundAmount: 0, //抹零金额 减免多少钱
+				pointsDiscountAmount: listinfo.pointsDiscountAmount, //积分抵扣金额(tb_points_basic_setting表)
+				pointsNum: listinfo.pointsNum, //(扣除各类折扣 enable_deduction后使用)
+				remark: '', //用户备注
+			}
+			console.log('topay checkOrderPay', checkOrderPay);
+			try {
+				await storeMemberpay.actionsltPayOrder({
+					checkOrderPay,
+					payType: paymentmethod.payType,
+					buyerRemark: '',
+					returnUrl: ''
+				})
+			} catch (error) {
+				//TODO handle the exception
+			}
+		}
+		orderorderInfo()
+	}
+
+	//002-获取订单可用积分及抵扣金额（支付页面使用）
+	const memberPointscalcUsablePoints = async () => {
+		let res = await APImemberPointscalcUsablePoints({
+			shopUserId: orderVIP.value.id,
+			orderAmount: listinfo.totalCost,
+		})
+		orderInfoAfterRef.value.getCalcUsablePoints(res)
+	}
+	// 
+	const clickPointsamount = (Pointsamount) => {
+		listinfo.pointsDiscountAmount = Pointsamount.pointsDiscountAmount
+		listinfo.pointsNum = Pointsamount.pointsNum
+	}
+
+	const payPasswordref = ref(null)
+	// 余额支付
+	const accountPayevent = async (pwd) => {
+		ispws.value = false;
+		let checkOrderPay = {
+			userId: uni.cache.get('userInfo').id,
+			orderId: listinfo.id,
+			vipPrice: cartStore.useVipPrice ? 1 : 0, //是否使用会员价0否1是
+			userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
+			seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数
+			originAmount: listinfo.originAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格
+			discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数)   写死1
+			discountAmount: 0, //手动优惠金额  写死0
+			productCouponDiscountAmount: listinfo.Productroll, //商品优惠券抵扣金额
+			fullCouponDiscountAmount: listinfo.coupondiscountAmount, //满减优惠券抵扣金额
+			couponList: uniqueIds.value, //用户使用的卡券
+			orderAmount: listinfo.totalCost, // 最中订单金额
+			roundAmount: 0, //抹零金额 减免多少钱
+			pointsDiscountAmount: listinfo.pointsDiscountAmount, //积分抵扣金额(tb_points_basic_setting表)
+			pointsNum: listinfo.pointsNum, //(扣除各类折扣 enable_deduction后使用)
+			remark: '', //用户备注
+		}
+		try {
+			await storeMemberpay.balancePayOrder({
+				checkOrderPay,
+				payType: paymentmethod.payType,
+				pwd: pwd,
+				shopUserId: orderVIP.value.id,
+				buyerRemark: '',
+				returnUrl: ''
+			})
+		} catch (error) {
+			//TODO handle the exception
+		}
+		orderorderInfo()
+	}
+
+	onUnmounted(() => {
+		uni.$off('returnData', handleReturnData);
+		clearTimeout(backtimer)
+		if (cartsSocket) {
+			cartsSocket.closeExistingConnection()
+		}
+	});
+	onHide(() => {
+		if (cartsSocket) {
+			cartsSocket.closeExistingConnection()
+		}
+	})
+
+	onShow(() => {
+		if (cartsSocket) {
+			cartsSocket.connect()
+		}
+		try {
+			// 更新数据
+			if (orderVIP.value) {
+				console.log(uni.cache.get('orderVIP'))
+				orderVIP.value = uni.cache.get('orderVIP')
+				paymentMethodref.value.orderVIPfun(uni.cache.get('orderVIP'))
+				if (listinfo.id) {
+					orderorderInfo()
+				}
+			}
+		} catch (error) {
+			//TODO handle the exception
+		}
+	});
+	let options = {}
+	// 监听页面返回事件
+	onMounted(async () => {
+		// 获取当前页面栈
+		const pages = getCurrentPages();
+		// 获取当前页面实例
+		const currentPage = pages[pages.length - 1];
+		// 获取页面参数
+		options = currentPage.options;
+		listinfo.id = options.orderId;
+		if (options.shopId) {
+			// 每次进来全局更新shopId
+			uni.cache.set('shopId', options.shopId, 30)
+			uni.$on('returnData', handleReturnData);
+		}
+		// * 获取会员信息
+		await storeuser.actionsproductqueryProduct()
+		await nextTick()
+		orderVIP.value = uni.cache.get('orderVIP')
+		// 积分信息
+
+		orderorderInfo()
+	})
+	// 跳转到加菜页面
+	function toJiacai() {
+		back()
+		return
+		uni.navigateTo({
+			url: '/pages/product/index'
+		})
+	}
+	//打包费
+	const packfee = computed(() => {
+		const historyOrderPackfee = listinfo.packFeess ? listinfo.packFeess * 1 : 0;
+		const nowCartsPackFee = is_type.value ? cartStore.totalPackFee * 1 : 0;
+		const total = historyOrderPackfee + nowCartsPackFee
+		return total
+	})
+	//不计算各种折扣前的实付金额
+	const shifu = computed(() => {
+		const payAmount = listinfo.payAmount ? listinfo.payAmount * 1 : 0
+		return payAmount + cartStore.totalPrice * 1 + packfee.value * 1
+	})
+	//减去各种折扣后的金额
+	const lastPayMoney = computed(() => {
+		return shifu.value * 1
+	})
+
+
+	const payStatus = {
+		'unpaid': '待支付',
+		'done': '已完成',
+		'refund': '已退款',
+		'part-refund': '部分退款',
+		'cancelled': '已取消'
+	}
+	const navTitle = computed(() => {
+		if (cartStore.isEmpty && listinfo.id) {
+			return payStatus[listinfo.status] || '待确认'
+		} else {
+			return '待确认'
+		}
+	})
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F7F7F7;
+	}
+
+	.container {
+		padding: 32rpx 28rpx 32rpx 28rpx;
+	}
+
+	.headStatus {
+		display: flex;
+		flex-direction: column;
+		margin-bottom: 32rpx;
+		align-items: center;
+
+		.status {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-weight: bold;
+			font-size: 36rpx;
+			color: #333333;
+
+			.statusName {
+				margin-left: 16rpx;
+			}
+		}
+
+		.time {
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #999999;
+			margin-top: 18rpx;
+		}
+	}
+
+	.wxQrcode {
+		background: #FFFFFF;
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+		padding: 32rpx 24rpx;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #999999;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 32rpx;
+
+		.left {
+			display: flex;
+			flex-direction: column;
+		}
+
+		.title {
+			font-weight: bold;
+			font-size: 28rpx;
+			color: #333333;
+			margin-bottom: 16rpx;
+		}
+	}
+
+	.card_box {
+		background-color: #fff;
+		// box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
+		position: relative;
+		width: 100%;
+		height: 100%;
+		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87, 86, 86, 0.35);
+		border-radius: 18rpx;
+
+		.card_head_box {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			position: absolute;
+			top: -22.5rpx;
+			padding: 0 44rpx;
+
+			.card_head_item {
+				width: 45rpx;
+				height: 45rpx;
+				background-color: #f9f9f9;
+				border-radius: 50%;
+				box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
+			}
+
+		}
+	}
+
+	.card {
+		// background-color: #fff;
+		border-radius: 20upx;
+		margin-bottom: 28upx;
+		position: relative;
+
+		.head {
+			display: flex;
+			justify-content: space-between;
+			padding: 50rpx 0 32rpx 0;
+			border-bottom: 2rpx dashed #E3E3E3;
+
+			.head_left {
+				.shopName {
+					font-weight: bold;
+					font-size: 32rpx;
+					color: #333333;
+				}
+
+				.tableName {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333333;
+				}
+			}
+
+			.status {
+				text {
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #333333;
+				}
+			}
+		}
+
+		.number-wrap {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin-top: 32rpx;
+
+			.t {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+			}
+
+			.number {
+				font-weight: bold;
+				font-size: 56rpx;
+				color: #333333;
+			}
+		}
+
+
+		.price {
+			.i {
+				font-size: 20upx;
+			}
+
+			.num {
+				font-size: 38upx;
+			}
+		}
+
+		.shop-box {
+			padding: 36rpx 34rpx 30rpx 34rpx;
+			border-bottom: 2rpx dashed #E3E3E3;
+
+			.shop-head {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.shop-head-left {
+					display: flex;
+					align-items: center;
+
+					.tag-wrap {
+						width: 80rpx;
+						height: 48rpx;
+						background: #FFFFFF;
+						border-radius: 10rpx 10rpx 10rpx 10rpx;
+						border: 2rpx solid #E3AD7F;
+						margin-right: 18rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+
+						.tag {
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #E3AD7F;
+						}
+					}
+
+					.title {
+						font-weight: bold;
+						font-size: 28rpx;
+						color: #333333;
+					}
+
+				}
+			}
+
+			.shop-info {
+				margin-top: 32rpx;
+
+				.item:nth-child(1) {
+					margin-top: 0;
+				}
+
+				.item {
+					padding: 32rpx 0 !important;
+					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;
+						}
+					}
+				}
+			}
+
+			.total-wrap {
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				font-weight: 500;
+				font-size: 28rpx;
+
+				.price {
+					font-weight: bold;
+					font-size: 32rpx;
+				}
+			}
+		}
+
+
+
+		.order_footer {
+			display: flex;
+			flex-direction: column;
+			padding: 34rpx;
+			position: relative;
+
+			.order_footer_icon {
+				width: 100%;
+				position: absolute;
+				top: -22.5rpx;
+				left: 0;
+				display: flex;
+				justify-content: space-between;
+
+				.order_footer_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);
+
+				}
+
+				.order_footer_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);
+
+				}
+			}
+
+			.title {
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #333333;
+			}
+
+			.order-info {
+				.row {
+					display: flex;
+					justify-content: space-between;
+					padding-top: 32upx;
+
+					.t {
+						font-weight: normal;
+						font-size: 28rpx;
+						color: #333333;
+					}
+
+					.info {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #666666;
+					}
+				}
+			}
+		}
+
+
+	}
+
+	.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;
+				}
+			}
+		}
+
+	}
+
+	.fixedview {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+
+		// height: 80rpx;
+		.flex-between {
+			width: 100%;
+			padding: 36rpx 36rpx 70rpx 36rpx;
+			background: #FFFFFF;
+
+			.fixedview_one {
+				display: flex;
+				align-items: flex-end;
+
+				.fixedview_oneone {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #666666;
+				}
+
+				.fixedview_onetow {
+					font-weight: bold;
+					font-size: 32rpx;
+					color: #333333;
+
+					text {
+						font-size: 24rpx;
+					}
+				}
+			}
+
+			.flex-colum-end {
+				.fixedview_tow {
+					background: #E3AD7F;
+					border-radius: 36rpx;
+					font-weight: 400;
+					font-size: 32rpx;
+					color: #FFFFFF;
+					padding: 14rpx 44rpx;
+				}
+
+				.fixedview_tows {
+					margin-top: 10rpx;
+					background: #c3c3c3;
+					border-radius: 36rpx;
+					font-weight: 400;
+					font-size: 32rpx;
+					color: #FFFFFF;
+					padding: 14rpx 44rpx;
+				}
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/coupon.vue b/pages/order/coupon.vue
index 84cb40a..5433e31 100644
--- a/pages/order/coupon.vue
+++ b/pages/order/coupon.vue
@@ -164,12 +164,26 @@
 		if (!item.show) {
 			return false;
 		}
-		// 查找选中的数组里面 统计指定 id 的重复次数 
-		const count = Selectedlist.value.filter(item => item.id === item.id).length;
+		if (item.Selected) {
+			Selectedlist.value = Selectedlist.value.filter(i => i.id !== item.id)
+			fromInfo.list[index].Selected = false
+			return
+		}
 
-		// 查找选中的数组里面 统计指定 id 的重复次数
-		const foundObject = mergedArray.value.find(i => i.productId === item.proId)
-		if (foundObject.num <= count) {
+		const canSelMaxNum = Orderinfo.shoppingCart.filter((v) => v.productId == item.proId).reduce((prve,
+		cur) => {
+			return prve + cur.num * 1
+		}, 0)
+		if (canSelMaxNum <= 0) {
+			uni.showToast({
+				title: '不可多余商品!',
+				icon: 'none'
+			})
+			return
+		}
+		// 查找选中的数组里面 统计指定 id 的重复次数 
+		const count = Selectedlist.value.filter(v => v.couponId == item.couponId).length;
+		if (count >= canSelMaxNum) {
 			uni.showToast({
 				title: '不可多余商品!',
 				icon: 'none'
@@ -190,18 +204,14 @@
 		// 	return false;
 		// }
 
-		if (item.Selected) {
-			Selectedlist.value = Selectedlist.value.filter(i => i.id !== item.id)
-		} else {
-			// 筛查出最低价格
-			await productmethod()
-			const matchedItem = lowestPrices.value.find(cartItem => cartItem.productId == item.proId);
-			Selectedlist.value.push({
-				...item,
-				price: matchedItem.price,
-				memberPrice: matchedItem.memberPrice
-			})
-		}
+		// 筛查出最低价格
+		await productmethod()
+		const matchedItem = lowestPrices.value.find(cartItem => cartItem.productId == item.proId);
+		Selectedlist.value.push({
+			...item,
+			price: matchedItem.price,
+			memberPrice: matchedItem.memberPrice
+		})
 		fromInfo.list[index].Selected = !item.Selected
 	}
 
@@ -272,13 +282,14 @@
 			shopUserId: Orderinfo.shopUserId,
 		})
 
-		if (Orderinfo.typeOrder == 2 && res.length>0) {
+		if (Orderinfo.typeOrder == 2 && res.length > 0) {
 			res.forEach((item) => {
 				item.Selected = false
 			})
 			res = res.map(item => {
-				const matchedItem = Orderinfo.shoppingCart.find(cartItem => cartItem.productId == item
-					.proId);
+				const matchedItem = Orderinfo.shoppingCart.find(cartItem => {
+					return cartItem.productId == item.proId
+				});
 				const hasMatch = Boolean(matchedItem);
 				return {
 					...item,
@@ -336,7 +347,10 @@
 
 			Orderinfo.shopUserId = options.shopUserId
 			Orderinfo.payAmount = options.payAmount
+			console.log('coupon mounted');
 			console.log(Orderinfo.payAmount)
+			console.log(options);
+			console.log(JSON.parse(decodeURIComponent(options.shoppingCart)));
 			Orderinfo.shoppingCart = JSON.parse(decodeURIComponent(options.shoppingCart))
 		}
 		getCouponList()
diff --git a/pages/order/histpry-order/histpry-order.vue b/pages/order/histpry-order/histpry-order.vue
new file mode 100644
index 0000000..57f26e2
--- /dev/null
+++ b/pages/order/histpry-order/histpry-order.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		历史订单
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/product/components/confirmorder.vue b/pages/product/components/confirmorder.vue
index 16ce7b0..5e4923e 100644
--- a/pages/product/components/confirmorder.vue
+++ b/pages/product/components/confirmorder.vue
@@ -1,6 +1,7 @@
 <template>
 	<view>
 		<up-popup :show="confirmordershow" :round="20" :safeAreaInsetBottom="false" :zIndex="105"
+		close-on-click-overlay
 			:overlayStyle="{ zIndex: 98 }" @close="close">
 			<!-- 头部内容 -->
 			<view class="container">
diff --git a/pages/product/components/shoppingCartes.vue b/pages/product/components/shoppingCartes.vue
index e91ec0e..04c9986 100644
--- a/pages/product/components/shoppingCartes.vue
+++ b/pages/product/components/shoppingCartes.vue
@@ -19,7 +19,7 @@
 								</view>
 								<view class="flex-between" @click="cartclear">
 									<up-icon name="trash" color="#999" size="20"></up-icon>
-									<text class="t">清空购物车</text>
+									<text class="clear-btn">清空购物车</text>
 								</view>
 
 							</view>
@@ -65,7 +65,7 @@
 
 											<view class="operation-wrap">
 												<view class="btn">
-													<up-icon name="minus-circle-fill" size="25"></up-icon>
+													<up-icon color="#E8AD7B" name="minus-circle" size="25"></up-icon>
 													<view class="btnClick" @click="cartListadd(item,'-')"></view>
 												</view>
 												<text class="num">{{ ifcartNumber(item) }}</text>
@@ -73,7 +73,7 @@
 													<!-- <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="#E9AB7A"
+													<up-icon name="plus-circle-fill" color="#E8AD7B"
 														size="25"></up-icon>
 													<view class="btnClick" @click="cartListadd(item,'+')"></view>
 												</view>
@@ -83,56 +83,7 @@
 								</view>
 							</view>
 						</view>
-						<!-- 历史订单 -->
-						<view class="card" v-if="orderinfo.detailMap">
-							<!-- 订单头部 -->
-							<view class="cardcalorders flex-between">
-								<!-- ··· 历史订单 ··· -->
-								<text>待支付订单</text>
-								<view class="flex-start">
-									<up-icon name="trash" color="#999" size="20"></up-icon>
-									<text style="color:' #999;'" @click="clickcancelOrder('all')">清空历史订单</text>
-								</view>
-							</view>
-							<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>
-										<view class="placeTime flex-start">
-											<up-icon name="trash" color="#999"></up-icon>
-											<text class="t" @click="clickcancelOrder('Single',key)">清空</text>
-										</view>
-									</view>
-								</view>
-								<!-- 订单详情 -->
-								<view class="shop-info">
-									<view class="item" v-for="item in value" :key="item.id">
-										<view class="cover">
-											<up-image width="80" radius="10" height="80" :src="item.productImg"
-												v-if="item.productId!=-999"></up-image>
-											<up-image width="80" radius="10" height="80"
-												: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>
 				</scroll-view>
 			</view>
@@ -289,6 +240,11 @@
 </script>
 
 <style lang="scss">
+	.clear-btn{
+		color: #333;
+		font-size: 24rpx;
+		font-weight: 500;
+	}
 	.cart-list-wrap {
 		.cart-header {
 			display: flex;
diff --git a/pages/product/index.vue b/pages/product/index.vue
index bca1ef0..8781662 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -8,8 +8,13 @@
 				mode="aspectFill">
 			</image>
 			<view class="panelone flex-start">
-				<view>
-					{{ shopInfo.shopName }}
+				<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>
@@ -31,7 +36,8 @@
 			<view class="panelfour" v-if="shopProductList.hots && shopProductList.hots.length > 0">
 				本店招牌菜
 			</view>
-			<view class="panelfive">
+			<view class="panelfive ">
+
 				<scroll-view :scroll-x="true" :scroll-with-animation="false">
 					<view class="panelfive_list">
 						<view class="panelfiveitem" @click="clickspecifications(item,index,index,'热销')"
@@ -142,7 +148,7 @@
 		</view>
 
 		<!-- 滚动区域 -->
-		<view class="scroll-panel" id="scroll-panel" :class="{ 'grayscale':!isBusinessTime }">
+		<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"
@@ -257,6 +263,8 @@
 					</view>
 				</view>
 			</view>
+
+
 		</view>
 
 		<confirmorder ref="confirmorderref" :cartLists_count="cartLists_count" :cartList="matchedProducts"
@@ -288,7 +296,7 @@
 					<text class="num">{{totalPrices}}</text>
 				</view>
 				<view class="btn" @tap="$u.debounce(orderdetail, 500)">
-					<text class="t">去结算</text>
+					<text class="t">结算</text>
 				</view>
 			</view>
 		</view>
@@ -406,7 +414,10 @@
 				</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>
@@ -1123,7 +1134,6 @@
 			shop_id: uni.cache.get('shopId')
 		}
 	}
-
 	const {
 		isConnected,
 		sendMessage,
@@ -1140,8 +1150,6 @@
 	// 提交订单显示
 	const confirmordershow = ref(false)
 
-	// 购物车数组
-	const cartList = ref([])
 
 	// 更新商品数量的方法
 	const updateProductQuantities = () => {
@@ -1195,6 +1203,7 @@
 		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;
@@ -1208,14 +1217,14 @@
 
 				// 初始化
 				if (Message.operate_type == "init") {
-					cartList.value = Message.data
+					cartStore.carts = Message.data
 					uni.hideLoading();
 					isLoading.value = false;
 				}
 
 				// 清空购物车
 				if (Message.operate_type == 'cleanup') {
-					cartList.value = []
+					cartStore.carts = []
 					setTimeout(() => {
 						Historicalorders()
 					}, 400)
@@ -1225,18 +1234,18 @@
 				// 删除除购物车
 				if (Message.operate_type == 'del' && Message.status == 1) {
 					// 优化：使用可选链操作符避免报错
-					cartList.value = cartList.value.filter(item => item.id !== Message.data?.id);
-					// cartList.value = cartList.value.filter(item => item.id != Message.data.id);
+					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 = cartList.value.findIndex((objB) => objB.id == objA.id);
+						const index = cartStore.carts.findIndex((objB) => objB.id == objA.id);
 						if (index !== -1) {
-							cartList.value[index] = objA;
+							cartStore.carts[index] = objA;
 						} else {
-							cartList.value.push(objA);
+							cartStore.carts.push(objA);
 						}
 					});
 				}
@@ -1295,7 +1304,7 @@
 
 	// 更新购物车数据shopProductList.hots
 	const matchedProducts = computed(() => {
-		if (cartList.value.length > 0) {
+		if (cartStore.carts.length > 0) {
 			let Specialstop = null
 
 			try {
@@ -1308,7 +1317,7 @@
 				Specialstop = shopProductList.productInfo
 				//TODO handle the exception
 			}
-			return cartList.value.flatMap((cartItem) => {
+			return cartStore.carts.flatMap((cartItem) => {
 				for (const group of Specialstop) {
 					for (const product of group.productList) {
 						if (product.id == cartItem.product_id) {
@@ -1365,6 +1374,12 @@
 
 	// 结账
 	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) {}
@@ -1374,16 +1389,18 @@
 
 	// 历史订单
 	const Historicalorders = async (W) => {
-		let res = await APIhistoryOrder({
-			tableCode: uni.cache.get('tableCode'),
-		})
-		orderinfo.value = {
-			id: res.id,
-			detailMap: res.detailMap,
-			placeNum: res.placeNum
-		}
+
 		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
+			}
 		}
 	}
 
@@ -1449,7 +1466,7 @@
 				}
 			}, 0);
 		}
-		cart = parseFloat(cartone) + parseFloat(cart)
+		cart = parseFloat(cart)
 		// 向上取整并保留两位小数
 		return parseFloat(cart.toFixed(2));
 	});
@@ -1467,7 +1484,7 @@
 			return sum + num;
 		}, 0);
 
-		const totalCount = orderInfoCount + matchedProductsCount;
+		const totalCount = matchedProductsCount;
 		return parseFloat(totalCount.toFixed(2));
 	});
 
@@ -1499,7 +1516,7 @@
 	// 计算处理后的购物车列表 	// 用于筛选后的购物车数组
 	const cartListFilter = computed(() => {
 		// 使用 reduce 方法对 cartList 进行处理
-		const grouped = cartList.value.reduce((acc, item) => {
+		const grouped = cartStore.carts.reduce((acc, item) => {
 			const productId = item.product_id;
 			const num = parseFloat(item.number);
 
@@ -1554,6 +1571,7 @@
 
 	// 列表请求
 	const productqueryProduct = async () => {
+		cartStore.goodsIsloading = false;
 		try {
 			shopProductList.hots = await productminiApphotsquery()
 			shopProductList.productInfo = await APIgroupquery()
@@ -1574,12 +1592,15 @@
 					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()
@@ -1623,13 +1644,34 @@
 		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>
@@ -1893,6 +1935,8 @@
 	}
 
 	.scroll-panel {
+		position: relative;
+
 		.list-box {
 			display: flex;
 			flex-direction: row;
@@ -2538,14 +2582,36 @@
 					height: 64rpx;
 					line-height: 64rpx;
 					text-align: center;
-					background: #E7AE7B;
+					background: #FEFAF7;
 					border-radius: 36rpx 36rpx 36rpx 36rpx;
-					border: 2rpx solid #E8AD7B;
+					border: 2rpx solid $my-main-color;
 					font-weight: bold;
 					font-size: 28rpx;
-					color: #FFFFFF;
+					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/test/test.vue b/pages/test/test.vue
new file mode 100644
index 0000000..6e89ea4
--- /dev/null
+++ b/pages/test/test.vue
@@ -0,0 +1,65 @@
+<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"
+	})
+	function resetForm(){
+		form.tableCode=""
+	}
+	onLoad((opt)=>{
+		console.log(opt);
+		options.value=opt
+	})
+	function toCreate(){
+		uni.navigateTo({
+			url:'/pages/index/index'
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.gap-20{
+		gap: 20rpx;
+	}
+
+</style>
diff --git a/static/history.png b/static/history.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8ecd2df3eb1335e45905e74dfdffd5e7934a5fd
GIT binary patch
literal 3131
zcmV-B48-$^P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px=^+`lQR9Hu?n0as<<(bBRU-z7vLvu;8E?b8!3){ix7Pc`+3OL}f#7<R65dw)F
z;wn;=TAbag-L0Z(<E`4-Kllf;90s#NIJMbq*afo`;5C~>5{a=57@J^x$d(YgZ;j?Y
zy8GL7&y0K~K-JD4npXEW{XPA>@B6&Z+k!9ond^Kakd)5tLa;+10#e9;K&%0Qgwq0|
z5(X3@x?P6jzk|DWMZe4z;)^aG{nuxA7z&RHXh(n$SN_yIQMyy<pm<J*?mr&=WA#J3
zyT8a@p9^TH^Qm?r)t>_GSMDh+RM&#QL~8yiT(}A}-9mgmus;iE@Mq6-DnjfuH?S5e
zMF0{~*&Oc=jB;jloY6#*oWntxU8S)yLPNkuOQ4);pBF_b0F*#p*RiSUzPj)2{>h(W
z>xO{LJV{9VArS4tLLse(F0qo+bbj|qADzce5KW~Bg(KJ;b{sAzo?r;4+ew+Ku&F9c
zM|};dq973*ADLuhZKZj)ZjWyJ=8f{}IzR<5j;>OonhPWn-7rX|(-yX&*?E3>>;sPW
z_2G57$jn8t84|;$vi56tVF*bslcCJ#rO8*utrcO;k58hw+-zUoRE(%R?a}NV*MhnZ
z(C~{-cOjJaViH(iCYay!_Axj;%UCo<VrG`1=saWb7)Ep+G>v3Bg~#dQD|c)qR9DN1
zce-%f?D)$A*aUdIW&GXNuTtmtBCIf4&(>Y{(C&^a!*>;+;m&6|p^!7?YLl7SM2cVc
ze#(i7X;QjIDwSkrbPPu}&*bbZK0{+7l_a0d5^y+Jb$dItD_8RR%fG}|UXE(BQB%K|
zhNeco)l|=lU;tf$)25a{Jz4kA5BFSG9#%DB>$(!{@N|?{PM>EmnIvK4$?F=4M1uLL
zY4o`$K985|+%)6KIO&{*Q&rh~dk6LF*YWYm_n4ZTK+|<vR(*v<)iwCsE*fou6`>$E
zRfHFcP?55uBnt}+4R`MEQiRejt)!7?noj4h-{p93Kj|_XHjjryGC?kzg`7q%I*V88
z*cCeivr|mO5~!+;yV^Qfe9H!oc6Ct^43j0#(7*tJKp20ypHL*iolBRnt*HTrO*OYd
zNZDQU;18|PS%5}6pWPu*4q1?kfPR1KA_rc7lQ=rgiU@|wPBa?DAr$O3K_os-eb9%)
z=3saxPVd+h>AcRWwHvA2u$JDBPBSwy!ji@&Dw>-RLb3A940(my$=__+K-lNC<Up99
z48vl{0yO;Mv)ziKv>^&YBc;Kiw|~!n{PrEB!-=!Lnpif?<meDp^^3XLnc>!D^@RLh
zv|N_)$r&yVj59NrV9r%V#g@$sUigGWJV|VHgqr#WmaJWiAq~phZlspw!JC?C3<gTi
zZ+`dGeD~pYG1u7{NRypgV5gWw1EUlC^Ur=oGM7PARWLR^iJ~a1sSWV0^-Eb)RfQ&X
zoK9htc>l!_=Er6^H#*B)RU=eYGTYxzEEy*jkK+$VSlrk|Hj}2(SH@qpZ6fIP6a?MM
z6L9C0pcwAlzf%#ytgg$gK!BFlc>L#Y(l>CCscZsi7$_J#vULNx;^OG}ekPJBwryO&
zwvKhoPt9`VHzzsXH;lvS!RGYhYi&jGc+k=rW`+hyPK-mDi^q1{!}29{h1Md?22fCP
z0lUP=i~C;_ir9V?AjQgS28Snj;uo)Q?z2AZNVczAPR8!x{Kyz{x{je~JlL_Cuie{$
z%xfI&I>AdvPT&cJhy;A-nqb?;n|b+g50|Fq@c4Y(wth9=zGVZ|kqA<l`dwhi+z;eI
zVdald+APkBf>r2Q0^Mv8ADrgtR}K?#DXdtz43A9H7<QuP^IV8&tX$E=ruD7ZR2#j0
zqx75`VB3ZkD#8&alLmcbGo(j``1kG)SriQM*Y|CwzIu_xh!vDVS3(xbtw)S>K66T-
zu2}$7YSx8vL~0r@9Qt409UA0Ex2~enon<DLWMnFeOvE^yvy-yB2nGEpZWj-2T*iDf
zNlk4v)lCg#y<wi%_X75rB;UU44uYW&n7ysQNYNLVp)+Mzo))8>`>jhBPLrV$AOmD3
zP3qFeoEsnKje#llbgU)j5X4k32VOmlSIe;?;-R*=o@Fh~L>)f*K6sz^hoU_8506o<
zY6Po8JoPUxaof@wTFc8w5=2*>1%|Hpm<(B4k99s*JSusZ0yr~?Gh-uscH}?FyWG5!
zcXI!o8&NAOiRX3x_K5>D`y8xkX=de`WmHx!Vp6j)+k2L$U+ZGuKmC-(6|K1Jd4BQI
z%Y1!9GZ9rIF{_exh88SI3DW|g(HEaPEfiK?TV)uM?DPZ!J+Cu2K0(=<+vpcA?poi7
z>TobSIm-FrNj{yOXUAVGr*3&G@AVE5s;H#K1)e~Kr8mb0$EgjK)1b`bayg05+Q`T<
zWXZghs4_z)`ACd)?(as3Hq(+WEGnp@6|(6+9A#!=n7Y<2NU3t<%qe8ZN768GC|MdX
z*j!sdX!Q!Ts#@OouQ!-?_^FHp(KAWDx@9f?hDI>b=+QXy{Yf;#^1usWGZVX*R6Sy>
z^ZA#A!uPLYsK}$4)JAL`ZSXuf-9b)z$Pd0px=f%p)*<aqX8K2P$5X8QdI!FhHzOP_
zq63#ub7}luC&C{>1S06DB>ShxCA7kW3ouH(tC-*z@}QXf`GK8=q_bd!FQdL}2PBGa
zKsLwR*-NDQ-baR<P#GpRHAk?efk<;Rfrb|BZZ}$do`H9NM@>sJZl@i^<zs$aN7K!s
zDOiqDo44v};o+^)-(|IqoSK`n68UOVzEA@uQ;L-6qhm~-=prk!xL3C_e(oY96NIZH
zENWSXBT|7a943{?U{_Vk^GMB2I&H)1lO>%i-ubFZGd+@91g+8<KlpsN5Tfl*0<zS!
zz*O?&ai;suk`I<)_}th%ZUT#|DPPinGZ;iDD!Eh&Bc4J{>1ZMVs;#Jkmj{x93Kc5a
z1Yt<oQ~kihg~{fRiQO(#rR(z8a=rI2NW4Tb&Dz=1%nbICwS%KJLU=_B{>CNPT`u%&
zp3KY~dNhmO83wzn$jmkOEVQwb0%BlvRDY*vKP*rOpSP;*a)^tgPqE?(=Y{E8P;y!3
z`Ytf`$te_}<E#qeYpBNV^^(cta63bI{I%e4Vm0zBXSJdRUnz=)G<vEZ*lqdv1=uD_
zQc=1J1yDG>Fr5~3-eM@3O7qr<V`$N7RvRf~Hi^^g!V@aTx453b%9WfPpC>kxWK%<n
zH3FIDtPrA7Qz)AJ;(eu%7CYBr9X<HmJ`j&uOqA%fEJ6{GVbImv&;B=G<?e`|j-|CI
zs)466K)9t9f75boULSA0^)_z|O|W~*R+i*7iy=$rihvfhu#iVj);w?nlV756)C?W6
z&AQ1#%1Ns$M`KA|_`_K;BEw&%CRoy3gVR@rCsKib>2e$uRY+au(&4vxXW2UZHanZA
z=Wwd#pm@2Jme`k)p6c&DTpYPB=hKzp#FT-QlI<3V)g{knf=Q<{{OZD|45bqohQ>WD
zb!@IIN0LGHy7AOCp!mztMkYCW<|6&8)*+-p<9v*pl4)xelf}>#)AA#CUTy!}LD5`n
z*;*y{n#q)5NM@2LULPJ|cs_y6uAryV)Gdmzv!RZPWy?V|`?G;IIYn<zH;2QE2yNbM
z*{Xa#M{_bwtEo*ztBRz@t=o5ep;7uux-K1fYTwDZ=%XLT;v}>@sdyZ_>ErTw(zz__
z%02vG^Cncc2V-`U6UX1<f282pz!3NU<j2@;rv6wH1))rq<;fJmy!K?>_a9jp46h2$
z)iQPMrNaL|{`)=cnVh!Qkb0Y;>EvQ@%DrWrIdzIvO-p$E-mR7l#6Ld6<2@ge{>GiW
z`|4ZVa`)YAXus8()vSb;vd73~_wL?y-=BR?bi=nFH-dKmBRkveh`l10YqOU*kh;N^
zrh4vcUW|$$dEo;8cI*_1Z`{M=@F=-dj16~eMYTJ7bRqWc?zs2==Y`d^;P&j@6UZfV
zJE|%x+wZOlHLMB;1H$cEt&faw=*VwB`t0_$sK@6YNJpo;Yg$`h+tu;SFZD|A{{Zgj
VB$+|kekA|^002ovPDHLkV1l9%DDeOQ

literal 0
HcmV?d00001

diff --git a/static/icon/add-goods.png b/static/icon/add-goods.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6ee88fa975e0d6b91e563fb39d667ea13ceaad0
GIT binary patch
literal 1289
zcmV+k1@`)hP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00001b5ch_0Itp)
z=>Px(!%0LzRA@u(S;0~oSrk3@(WH`@4cQoQrC%`Q3r4>n60B_1FBsjWgetH~%<O_+
z5L_qN<O?KUAb*fvqz24JR*@0=-Kp2o__}GNy8(x!?4{iI-Z}5yd+vQ#!Y}gCFTw+l
zL>A4Hj~)r*kqfi9AtkbRw$jSvk7{AoMzxunM>=NVJtTJhfCNxo%2)QH0-a<(7b2Ht
zIrXpXUyeKcN+h4J=E~hk;G+CK7b0!*?Fz}nR|SMY2R&g_pUUeE0)24)CX%a}T-k~O
zbdv4di3q_jmvTof1*B6iC~_-5B@rF;BaumQ1<a?idvZk3dM0<+R9G%fi<iut`YA&T
zfW_bg67+{F#|uxSZ5G!^au$SFV62Ug2yOuMg+;P4EA^UMwFcl{5onvisSx4pHDR=v
z__!yYG^VL7v57bYm`meso<Lm?EHEqx>Oyjg2`OS^#}Kwia82ULNgOXlCi2xRr=Fo-
z3Ti(<)CBYANg<=eK-flBf;Wipr>ZTQo1C1A+LJ{h(l*O0B>QLj!RqFv#Bt9ss&PZ3
zUEkj(P|3S5YClABFYKP7iF`Nrvn<7#9u_R=U>XAceEO$e*i8_Xltd4Hvsfh8!-QHW
zA^{{UAvou@9)3V7{C>yviVczK!DxlORkhEc2I*c8MP?!qe>f4S@k1CpesBu>Z@B)8
znbvdxh*L9E_uRAlRU&M;p1Bgqm-k)BL?Ui~<aDi!lgwsiTlauV08;D*sZksv?*8ph
zh1!q|p_zVNSsy3w_Y%3N@0S=<b`}#g)2|Ob8>x_!l1w*ARpQ$$Pl!dMXG9CBAb`p<
z*W5p2c3+utFP(o^4YD0eWDru$o5E=`guR~0{XKj`d_OI0F;i7}VHV0Y?xr27X5)My
z0NpE*Tn!4bu|zKFg%1okVZ`7aUDpSmICl<Ll{sPObdr&)`-BBb%>?k?2@Ih2B463@
zF9{^#@rEy?Jju^!T_uw1QB)}|$<Arv%oUNKr*bfnkHs<xRs{;Iwc$=He&?x?aEl8v
z%)0i+;u;B7vg|ycGx@{Y+#P&@L^P$c()r5jP(^Ml@ZjBTug)`^g2-uJ8OfCqBHzq%
z){y<%_y_jV`N~iw+>OS?X_%XhVso2|C<z+}OK*-^9<TT!WrRqlUQn|rC$aRwfu1)k
z9>yD;deH=ULo$C}-aOh+m=qc3GK?EbkB9&ww~GOE)A`DC_XdXq1L{eXTaIEo45bif
zju5%{R6J)=uRL!7{ATWFg{|b6o6DQ;8c_hnwVjGcr(R%nuw*`7-aHx^dBz15XI*R}
z{t2O9;^Ke_yGG@p;J&G~@F0lPUH`^+lS!toki4S=AW(k)Pa?X=gdy**C7vA7i71Jc
zf=<}BQ$!Sfs1OE?Ya@j96h^BjZ#<z)VAaN}XRyVf6VI07rZ!f!bRto3OlwO5wHLY3
z{%IyTGA+0$>t{~Hd6~&;r|>-JCxqpWRrPaYd*ngEhd8W#TBs3YD@;o?S`f|s5<vQ#
zDa4U;GLe)5VT~o4l;GiixTNGS{<)V|wY2VbPS9q#t*4>&5Q(bgvqTkjuY2o=Hil7S
z%!U03)bfv{CXRy^mW>bCBaub()T2ih%_IK-CJMe$w;4*000000NkvXXu0mjf71CSo

literal 0
HcmV?d00001

diff --git a/static/icon/coup.png b/static/icon/coup.png
new file mode 100644
index 0000000000000000000000000000000000000000..558815adde14d5a86e4fc8d6aa4f626aacdb81e3
GIT binary patch
literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq001Ze001Hg1^@s6EoGYv00001b5ch_0Itp)
z=>Px%B}qg<R9Hvtm|bq#Koo`V1@X=j(jB-ngT$j*L7Nq{T|vkS0xKX{LA!%y2cd6B
z%sAdb*+DDuh|O(|<3Tn^Nc`HBJWpUTp3i6Io^uUT%?Eovt@URj`cwyA5&0EG(GRe2
z7>3>Da`}^p!aBee7~(Wd2dtEuF!PXz79#RQM1Ly=?K1Nn5#2EJn6=iw@uk&jeVotd
zam8@i^2V4@L|z~k00kGFbDQ&62T0G=03N#=je^H2SMcSmHvWq<_=kwPA~K4iXng9E
zpJV=;^?iA>zV{?iN)4HLlHYjI>2wCO*=%u+g$}*PcB*AYjhiT?zB2Oz3>%436{Iod
zRYU?9w20gzk2mHV1VOjmZu?B0I_Cz5Dsam0l~NDPJc2;T;5d%6T`Z+X4vFYP9uBOv
z(^D2bWUi0gG)+HvxE(-T&{{td(H%42TWj(8;=^YzGf%CxrJdW!-~2p&M-@5ezFnN|
zy*U_)2nzMdIfu?_Gim|2Pm~=%tu@p`RgbN;IJ6fZh4yNvI7@*2e*b2*TA>fSYJa$|
zI5&VrlVs*+YwhjDr7J98j2Vdtytw4U86YGkqDgL&B_FyLWUeB14@QmGk8x(y1%m`j
zC2(GZt*{`Z3A&lASwK-FN%9!San&zPh+f|xH18xwAK|9uKU%tcVx!<W74$Z9)&6ha
z1N3^mV7*?y!k4)iF?IX%2<;bdMa-!?bGG?tUXvub{Rck`K^f(!Uhn__002ovPDHLk
FV1jiX7TW*-

literal 0
HcmV?d00001

diff --git a/static/icon/goods.png b/static/icon/goods.png
new file mode 100644
index 0000000000000000000000000000000000000000..de64f46181f6b6ecf18996e63d1062fb756eb757
GIT binary patch
literal 918
zcmV;H18Mw;P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px&P)S5VR9Hvtm|t?*Fc8LfMf^?<kPh6yL1u=xCMRfV`yO%vk`vUNpv?)I9w3FD
z03Mk^ns9?K%>kPCU~eiHcMMp60Gkdo@snpPOFymjX}=Z1fjxL&yzmNK_KG=2xYcUa
z=JR=%i2Q<~W}fHu#^dqKrC%pt&iQ))_yzz~mrl2A)0R>WZ2!6fKL9`t0B!(agosbJ
zj$OYKQ3n7n0N^Q#qWW|?HTG=<UPQN#h$A7yxhu#f?KtPdKY=&{0Be-3z(Ej%MD$rj
zS4w%c35aW3&iPjW=py2^5JJ6cA1g5Dybl0s4_jyN3b@*?(P(rKQEB9-lv0hgJ#Y{N
z_v&O|jGay<lj*ilrvH53uT?4)rIVSIvc5I2@B7tCrSe+|LP~jD25j0V=Uk0bjiTt-
zBs}Am2!h~@h=yefE(K0k5)sdZ5F=f1Y`|AU^rcL}Wg_e(JR@)_I2ZNqx?M8DyOmO2
zZX4l5aJFUI6;}P<Y&QKkj_+;4vqhLxXHrV*@wY2<M&Mu)o)#n{xTz50R0s5U7xodz
zj{$oTgF(F=E~VCoepvNl=m1cc5N0PIdfIHsIZrHr=?FCer-Cyc=8r$ZArPsw`uD-a
zYb4H#BJu$f53(>#I5_zjwsn)|oZl*6!5F)oOeX4m?a=~nk}iMUg&jn=SOU)ug*c)Z
zZr*$fjczOm0_&+{0!|FcCW2GTe>4Z5SQ1sh7-sV$n67RUU4&h>p$XV2^Xw|N?EfyA
zH5WKNVi3_NxFTUQ2_zAo=Xv$KDkK*;^}sIfsc7glS?PqQ15VRqPY4kf4Q1-jCOjRm
za|KZJWHPHel2Wdn**f4<aH_^~s%DD<&v@fpOS=ZF%K7K#XSMN5_rQh(k_0SIcx%A>
zC^~JcVJb@3fcH^!Isj|EabAQ=FFI|&rlK@2!lf6THegdxx&-W!8f}9W^<7t#E&=be
z=(J5tSCp;-TkV}~prXF(?Clb8YM}Q~blN7SD@s>^|C@(codD-tU0tc0&80iN+&!F>
zH$>Nru~M$4Y|)M5_$?wPrfYEp`_CSj5{Iqd(!V3(np?~@KWhIl#@>~D<F1{sDq@M~
sd)}2*>GusqFT*Qv(Ggwk@8BZ*0=@R=JUH10>i_@%07*qoM6N<$g308cQUCw|

literal 0
HcmV?d00001

diff --git a/static/icon/points.png b/static/icon/points.png
new file mode 100644
index 0000000000000000000000000000000000000000..d579e844c17a56505b6d896d5c3f3094b75877c2
GIT binary patch
literal 964
zcmV;#13UbQP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px&en~_@R9HvtnO{;GK@i5jo+VYjg*>LpDBJ+pwaPc~1d-wZ>Io7~z;J@#2{g}<
z;0;3Fta8!K382KPJchg)b~+jUm<1M?C0UFqe6@S#H(&R5&oqQ5_D4^Q7i-|SBldqN
z>^M%Inacn&0Fp7O<}vfh_4V~xl=Y_+&gF7tB9c)S`9oXJ_x*j(^SUPMi~;9zxg#Pv
z)s93|>GgV5(}hen3)&3#(osz5y<FEd5@`(Bw(U;<@<dc}UAGz)BC7o`_4J-y-}lod
z;!Faw-qiQ~7beb80mJMa$GKtVj1VGwb#>(}S~C>5*=(+?dIX}n@49Yd4ZKK!sQ-^u
zVaIXa>3oX{HLN<G>$;^$-`Ie6c6KsKsheeBwGT5Nhc$`VfOQGdC2v{aS#>rx;AKG<
z`K^J23hnOhrta_W=ca{aS)NG)7_A$t!lSM<C(P~PMW($d6=DYtTvleX_`YB8Ja1up
z4K5I?!ltT4v9oQv4&Y#T`B@m5N54zx!(}p=r0Herp8$>$ku`7>wU)76D?CfJPF?0%
z@oOO{$;_z-J4P3vFA!+FD#*vbz~9#7kpPz&_zgMZR0OnH(D6L*SW}`?tCRsX`5NvL
z&}AZBbCVdTJvRGLpwf0xhCYI018&u2DxtVF6tfFOCy4~kUKZq3bGWO^jPmi8h!02h
zJwfSoK~BvoVgtTCmj^_wyBHXByj7G7Cp?{xvI^!m+9x3>9d@|bfLnE$Oep>q__#bG
zdd~u00%&WPuXUN~^>bV8fhi9jJP>p){}7a2sls~W+jDsq2(xk7RiMgtQHD-}VpCYt
z-POu1lj<;e60PuNv62ouVQiD1&Ig%?U_FM?SzLh<jbF7k55itQ?93@9>VnZG;4>?D
zARK@OIZT4Gn*}*_RSli30Vp(^%?slgh8PBc8K`a*D^pMWNw>RN`ILbpW8lE_vdhe+
zsI%K3fd1&7DZY6~2||Mvo%j|S!H-GXSqi$M90or+qm<Aa+P1CB&qF<AW}~_72v!Jj
zF&dcY`U=JMkUSnVk3qv2YZ^L#EkXNXC2d$irsEl$-9}9dBGMC{?8r|y5X*-&s22U^
z(o3KkR?bH2&7D%}m%zrxMx>t%E-x=bpE-SSg*-DdmWAi6kR+k!!uU=E&lk9u2WkWy
mRozwCuWSzdw+{2<fPVs`cMnUm+Atvi0000<MNUMnLSTYHsJ*`c

literal 0
HcmV?d00001

diff --git a/static/pack-white.png b/static/pack-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f9ef5f78897314f5706ba7975370248a24b8489
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq001KZ001Ef1^@s6QxOtU00001b5ch_0Itp)
z=>Px%Z%IT!R9HvFmyJ;rK@f%eWuO^I1V{vW5kLqK0TKZcfe--_0U7~k1VRL81d_pX
z-_{J(JJWOL?QJ<-b#*^=GxKe~{u`JxlAq1&gPHwsKkK{9|K^wN`uWhzegpVaE<^$I
z)y&oa^gbHNQvm`v+x67w|C{zJVeZZB4#2kp<^;gWLNFiA><fUSZJv2Bvnv2=2cyN8
z09Gv+l5fmRuWT=a3@;7Oyc<0I0N`L7%+Ep3v%w3G4yL&{$tZ6M*dH!1eP03iRUS%`
z04A#FKc!61<pw01FiHR8^Z*l2kW_#kM;;|vofE-?#H}Yu*=NH;Dhnq@^1YeeM{<y?
z6xapk&k)!LWgL){Jhx_cQ^=&f&s7eh6ed|E$^>SM9HCoN%*X>exU?q#*Nq^qN=ON#
zO>d)=BUxqHK55>P_cef%%fl2-ZvF0y;hr#IA@wjSYNt_g8zc<fIv0qf&N?qM&BHXy
z{-&&%1JsI74>P7`BTZE^4j1fCDvHkl-uj36SC~bcWy->;TzHsfTx<&NIWi@fs$6)O
zun?t%8~f87pj0ky{Dk0PnzbZ#<x1l@5Uv4NN_d#CU%16#OPC83WvGW~mi(5+b3xL6
zRZ@7Euwy&VEZq{SB0GW6T#{zsXdqg;3Rk^wgh>@qGG)`GcbCA%sqcSO;S3{61#o2Y
zl4fE}a!T=wePX3ps|<ZrC&Oq+QcUzP4Q*psWEcgLie3-X&_3QqGK|tp<6{rgZDhPO
zW*Bws%N`_(!91R37-f=zvxg~Ojx_8e-F<pVlpp>Yz=dFXdc`ZT5)6B26P$S^nCdpz
b32yxtldy~^g1D+S00000NkvXXu0mjf#q=uH

literal 0
HcmV?d00001

diff --git a/stores/carts.js b/stores/carts.js
new file mode 100644
index 0000000..9e4015d
--- /dev/null
+++ b/stores/carts.js
@@ -0,0 +1,452 @@
+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/order.js b/stores/order.js
index 59a2beb..a6132ab 100644
--- a/stores/order.js
+++ b/stores/order.js
@@ -2,130 +2,159 @@ import {
 	defineStore
 } from 'pinia';
 import {
+	ref,
 	computed,
+	reactive,
 	watchEffect
 } from 'vue';
-import {
-	ref
-} from 'vue';
 
-export const useCartStore = 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 //一个餐位费多钱
+export const useCartStore = 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 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));
+		//商品数据Map
+		const goodsMap = reactive({})
+
+		function setGoodsMap(product_id, data) {
+			goodsMap[product_id] = data;
 		}
-		// 再除以 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, changeFreeenable = true) => computed(() => {
-		if (!matchedProducts || !Array.isArray(matchedProducts)) {
-			return 0;
-		}
-		// console.log(uni.cache.get('orderVIP').isVip, uni.cache.get('ordershopUserInfo').isMemberPrice,
-		// 	111)
-		// 购物车总数价格
-		let cart = matchedProducts.reduce((total, item) => {
-			// 是否启用会员价 0否1是
-			if (uni.cache.get('orderVIP').isVip == 1 && uni.cache.get('ordershopUserInfo')
-				.isMemberPrice == 1 && changeFreeenable) {
-				// memberPrice会员价
-				return total + (parseFloat(item.memberPrice || item.price) * parseFloat(item
-					.num - item
-					.returnNum));
+
+		//购物车数据
+		const carts = ref([])
+		//购物车是否为空
+		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 {
-				// salePrice销售价
-				return total + (parseFloat(item.price) * parseFloat(item.num - item.returnNum));
+				rounded = Math.floor(parseFloat(temp));
 			}
-		}, 0);
-		
-		cart = cart.toFixed(2)
-		console.log(parseFloat(cart))
-		// 向上取整并保留两位小数
-		// let result = roundUpToTwoDecimals(cart, 'upward')
-		return parseFloat(cart);
-	});
+			// 再除以 100 得到保留两位小数的结果
+			return rounded / 100;
+		};
 
-	// 计算商品卷所选择的总价格
-	const getTotalProductroll = (matchedProducts) => computed(() => {
-		if (!matchedProducts || !Array.isArray(matchedProducts)) {
-			return 0;
-		}
-		// 购物车总数价格
-		let cart = matchedProducts.reduce((total, item) => {
-			// 是否启用会员价 0否1是
-			if (uni.cache.get('orderVIP').isVip == 1 && uni.cache.get('ordershopUserInfo')
-				.isMemberPrice == 1) {
-				// memberPrice会员价
-				return total + parseFloat(item.memberPrice || item.price)
-			} else {
-				// salePrice销售价
-				return total + parseFloat(item.price)
+		// 精确计算函数
+		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, changeFreeenable = true) => computed(() => {
+			if (!matchedProducts || !Array.isArray(matchedProducts)) {
+				return 0;
 			}
-		}, 0);
-		// 向上取整并保留两位小数
-		let result = roundUpToTwoDecimals(cart, 'upward')
-		return result;
-	});
+			// console.log(uni.cache.get('orderVIP').isVip, uni.cache.get('ordershopUserInfo').isMemberPrice,
+			// 	111)
+			// 购物车总数价格
+			let cart = matchedProducts.reduce((total, item) => {
+				// 是否启用会员价 0否1是
+				if (uni.cache.get('orderVIP').isVip == 1 && uni.cache.get('ordershopUserInfo')
+					.isMemberPrice == 1 && changeFreeenable) {
+					// 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);
 
-	// 桌位置
-	const getTotalSeatcharge = (seatNum) => computed(() => {
-		// 是否免除桌位费 0 否 1 是
-		let cart = 0
+			cart = cart.toFixed(2)
+			console.log(parseFloat(cart))
+			// 向上取整并保留两位小数
+			// let result = roundUpToTwoDecimals(cart, 'upward')
+			return parseFloat(cart);
+		});
 
-		if (uni.cache.get('ordershopUserInfo').isTableFee == 0 && seatNum) {
-			cart = parseFloat(seatNum) * parseFloat(uni.cache.get('ordershopUserInfo').tableFee)
+		// 计算商品卷所选择的总价格
+		const getTotalProductroll = (matchedProducts) => computed(() => {
+			if (!matchedProducts || !Array.isArray(matchedProducts)) {
+				return 0;
+			}
+			// 购物车总数价格
+			let cart = matchedProducts.reduce((total, item) => {
+				// 是否启用会员价 0否1是
+				if (uni.cache.get('orderVIP').isVip == 1 && uni.cache.get('ordershopUserInfo')
+					.isMemberPrice == 1) {
+					// 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')
+			console.log(result)
+			return result;
+			// return Math.floor(total * 100) / 100;
+		});
+
+		//获取热门商品
+		async function getHotProduct() {
 
-			// 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')
-		console.log(result)
-		return result;
-		// return Math.floor(total * 100) / 100;
-	});
+		//获取分组商品
+		async function getGroupProduct() {
 
-	return {
-		getTotalPackFee,
-		getTotalSeatcharge,
-		getTotalTotalPrices,
-		getTotalProductroll
-	};
-});
\ No newline at end of file
+		}
+		return {
+			getTotalPackFee,
+			getTotalSeatcharge,
+			getTotalTotalPrices,
+			getTotalProductroll,
+			carts,
+			isEmpty,
+			setGoodsMap
+		};
+	}, {
+		unistorage: true, // 开启后对 state 的数据读写都将持久化
+	},
+);
\ No newline at end of file
diff --git a/stores/pay.js b/stores/pay.js
index b7503da..7c75ce7 100644
--- a/stores/pay.js
+++ b/stores/pay.js
@@ -241,6 +241,8 @@ export const Memberpay = defineStore('memberpay', {
 					placeNum: data.placeNum, //当前订单下单次数
 					waitCall: data.waitCall //是否等叫 0 否 1 等叫
 				})
+				console.log('actionscreateOrder res:');
+				console.log(res);
 				if (res) {
 					resolve(res)
 				} else {
diff --git a/stores/shop.js b/stores/shop.js
new file mode 100644
index 0000000..e69de29
diff --git a/stores/user.js b/stores/user.js
index dbf137d..651562e 100644
--- a/stores/user.js
+++ b/stores/user.js
@@ -9,16 +9,21 @@ import {
 	APIuser
 } from '@/common/api/api.js'
 import {
-	APIproductqueryShop,
+	APIproductqueryShop,APIusershopInfodetail,
 	APIshopUserInfo
 } from '@/common/api/member.js'
 export const Storelogin = defineStore('login', {
 	state: () => ({
 		token: '',
 		miniAppOpenId: '',
-		userInfo: ''
+		userInfo: '',
+		shopInfo:{}
 	}),
 	actions: {
+		async getShopInfo(shopId){
+			const shopRes=await	APIusershopInfodetail({shopId})
+			console.log(shopRes);
+		},
 		actionslogin() {
 			return new Promise(async (resolve, reject) => {
 				// #ifdef MP-WEIXIN
@@ -98,21 +103,26 @@ export const productStore = defineStore('product', {
 		scanCodeactions(q) {
 			return new Promise(async (resolve, reject) => {
 				if (q) {
+					console.log(q)
+					let tableCode =""
 					// #ifdef MP-WEIXIN
-					let tableCode = this.getQueryString(decodeURIComponent(q), 'code')
+					 tableCode = this.getQueryString(decodeURIComponent(q), 'code')
 					// #endif
 					// #ifdef MP-ALIPAY
-					let tableCode = q
+					 tableCode = q
 					// #endif
-
+					// #ifdef H5
+					tableCode= q.tableCode
+					// #endif
+					console.log(tableCode);
 					// 储存卓玛
 					uni.cache.set('tableCode', tableCode)
 					if (tableCode) {
-						let data = await this.actionsproductqueryShop()
+						console.log(uni.cache.get('tableCode'));
+						let data = await this.actionsproductqueryShop(tableCode)
 						// -4请求登录
-						const store = Storelogin()
 						if (data.code == '500') {
-							if (await store.actionslogin()) {
+							if (await this.actionslogin()) {
 								// 成功 接着在调用
 								await this.actionsproductqueryShop()
 							}
@@ -166,51 +176,17 @@ export const productStore = defineStore('product', {
 					});
 					// #endif
 				}
-				// #ifdef H5
-				if (uni.cache.get('tableCode')) {
-					let data = await this.actionsproductqueryShop()
-					// -4请求登录
-					const store = Storelogin()
-					if (data.code == '-4') {
-						if (await store.actionslogin()) {
-							// 成功 接着在调用
-							await this.actionsproductqueryShop()
-						}
-					}
-					// idle-空闲 using-使用中 subscribe预定，closed--关台， opening 开台中，cleaning 台桌清理中
-					if (uni.cache.get('shopTable').status == 'cleaning' || uni.cache.get(
-							'shopTable').status == 'cleaning') {
-						uni.showToast({
-							title: '此台桌暂不可用...',
-							icon: 'none'
-						})
-						return false;
-					}
-
-					if (uni.cache.get('shopInfo').isTableFee == 0) {
-						uni.navigateTo({
-							url: '/pages/product/choosetable'
-						});
-					} else {
-						uni.reLaunch({
-							url: '/pages/product/index'
-						});
-						// uni.pro.navigateTo('product/index', {
-						// 	tableCode: uni.cache.get('tableCode'),
-						// })
-					}
-
-				}
-				// #endif
+				
 			})
 		},
 
 		// /通过桌码获取当前店铺信息
-		actionsproductqueryShop() {
+		actionsproductqueryShop(tableCode) {
 			return new Promise(async (resolve, reject) => {
 				// try {
+			
 				let res = await APIproductqueryShop({
-					tableCode: uni.cache.get('tableCode'),
+					tableCode: tableCode?tableCode:uni.cache.get('tableCode'),
 				})
 				res.shopInfo.isVip = res.vip ? '1' : '0'
 				res.shopTable.shopExtendMap = res.shopExtendMap
diff --git a/uni.scss b/uni.scss
index 0735599..4c32c35 100644
--- a/uni.scss
+++ b/uni.scss
@@ -73,3 +73,5 @@ $uni-color-subtitle: #555555; // 二级标题颜色
 $uni-font-size-subtitle:26px;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:15px;
+
+$my-main-color:#E8AD7B;
\ No newline at end of file
diff --git a/utils/quan_util.js b/utils/quan_util.js
new file mode 100644
index 0000000..4aca99f
--- /dev/null
+++ b/utils/quan_util.js
@@ -0,0 +1,264 @@
+export function isTui(item) {
+  return item.status == "return" || item.status == "refund" || item.status == "refunding";
+}
+//是否使用会员价
+export function isUseVipPrice(vipUser, goods) {
+  return vipUser.id && vipUser.isVip;
+}
+
+//计算商品券优惠价格
+export function returnProductCouponPrice(coup, goodsArr, vipUser) {
+  const item = goodsArr.find((v) => v.productId == coup.proId);
+  if (!item) {
+    return 0;
+  }
+  const discountSaleAmount = item.discountSaleAmount * 1;
+  if (discountSaleAmount > 0) {
+    return discountSaleAmount * coup.num;
+  }
+  const memberPrice = item.memberPrice ? item.memberPrice : item.price;
+  const price = item ? (isUseVipPrice(vipUser, item) ? memberPrice : item.price) : 0;
+  return price * coup.num;
+}
+//返回新的商品列表，过滤掉退菜的，退单的商品
+export function returnNewGoodsList(arr) {
+  let goodsMap = {};
+  return arr.filter((v) => !isTui(v));
+}
+//根据当前购物车商品以及数量,已选券对应商品数量，判断该商品券是否可用
+export function returnCoupCanUse(goodsArr = [], coup, selCoupArr = []) {
+  // if(!coup.use){
+  // 	return false
+  // }
+  const findGoods = goodsArr.filter((v) => v.productId == coup.proId);
+  if (!findGoods.length) {
+    return false;
+  }
+  const findGoodsTotalNumber = findGoods.reduce((prve, cur) => {
+    const num = cur.num - cur.refundNum - cur.returnNum;
+    return prve + (num <= 0 ? 0 : num);
+  }, 0);
+  const selCoupNumber = selCoupArr
+    .filter((v) => v.proId == coup.proId)
+    .reduce((prve, cur) => {
+      return prve + cur.num * 1;
+    }, 0);
+  if (selCoupNumber >= findGoodsTotalNumber) {
+    return false;
+  }
+  return findGoodsTotalNumber < selCoupNumber ? false : true;
+}
+//查找购物车商品根据购物车商品数据返回商品券信息（抵扣价格以及是否满足可用需求）
+export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
+  const newGoodsArr = returnNewGoodsList(goodsArr);
+  const item = newGoodsArr.find((v) => v.productId == coup.proId);
+  if (!item) {
+    return {
+      ...coup,
+      discountAmount: 0,
+      use: false,
+    };
+  }
+  const discountSaleAmount = item.discountSaleAmount * 1;
+  const memberPrice = item.memberPrice ? item.memberPrice : item.price;
+  let price = item ? (isUseVipPrice(vipUser, item) ? memberPrice : item.price) : 0;
+  price = discountSaleAmount > 0 ? discountSaleAmount : price;
+  const discountAmount = (price * coup.num).toFixed(2);
+  // const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
+  // const canUse=discountAmount>0
+  const canUse = coup.use;
+  return {
+    ...coup,
+    discountAmount: discountAmount,
+    use: canUse,
+  };
+}
+/**
+ * 根据购物车商品计算商品券抵扣价格以及是否满足可用需求
+ * 1.商品券对应商品数量大于购物车对应商品数量不可用
+ * 2.未在购物车找到相关商品不可用
+ * @param {*} coupArr
+ * @param {*} goodsArr
+ * @param {*} vipUser
+ * @returns
+ */
+export function returnProductAllCoup(coupArr, goodsArr, vipUser) {
+  return coupArr.map((v) => {
+    return returnProductCoupon(v, goodsArr, vipUser);
+  });
+}
+//返回商品实际支付价格
+export function returnProductPayPrice(goods, vipUser) {
+  const discountSaleAmount = goods.discountSaleAmount * 1;
+  const memberPrice = goods.memberPrice ? goods.memberPrice : goods.price;
+  const price = isUseVipPrice(vipUser, goods) ? memberPrice : goods.price;
+  if (discountSaleAmount) {
+    return discountSaleAmount;
+  }
+  return price;
+}
+//返回商品券抵扣的商品价格
+export function returnProductCoupAllPrice(productPriceArr, startIndex, num = 1, isVip = true) {
+  num = num || 1;
+  return productPriceArr.slice(startIndex, startIndex + num).reduce((prve, cur) => {
+    let curPrice = 0;
+    if (typeof cur === "object") {
+      if (cur.discountSaleAmount * 1 > 0) {
+        curPrice = cur.discountSaleAmount * 1;
+      } else {
+        curPrice = isVip ? cur.memberPrice * 1 : cur.price;
+      }
+    } else {
+      curPrice = cur * 1;
+    }
+
+    return prve + curPrice;
+  }, 0);
+}
+
+//返回商品券可抵扣的商品数量
+export function returnProductCanUseNum(productPriceArr, startIndex, num) {
+  let n = 0;
+  for (let i = 0; i < num; i++) {
+    if (productPriceArr[startIndex * 1 + i]) {
+      n += 1;
+    } else {
+      break;
+    }
+  }
+  return n;
+}
+
+//返回同类商品券在同类商品价格数组里的开始位置
+export function returnProCoupStartIndex(coupArr, index) {
+  return coupArr.slice(0, index).reduce((prve, cur) => {
+    return prve + cur.num * 1;
+  }, 0);
+}
+//返回商品数量从0到n每一个对应的价格对照表
+export function returnGoodsPayPriceMap(goodsArr) {
+  return goodsArr.reduce((prve, cur) => {
+    if (!prve.hasOwnProperty(cur.productId)) {
+      prve[cur.productId] = [];
+    }
+    const n = cur.num - cur.returnNum;
+    const arr = new Array(n <= 0 ? 0 : n).fill(cur).map((v) => {
+      return {
+        memberPrice: v.memberPrice ? v.memberPrice : v.price,
+        price: v.price,
+        discountSaleAmount: v.discountSaleAmount * 1,
+      };
+    });
+    prve[cur.productId].push(...arr);
+    return prve;
+  }, {});
+}
+//计算商品券总优惠价格
+export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
+  if (coupArr.length == 0) {
+    return 0;
+  }
+  //商品分组
+  const goodsMap = {};
+  //商品数量从0到n每一个对应的价格
+  const goodsPayPriceMap = {};
+  //商品券分组
+  let coupMap = {};
+  for (let i in coupArr) {
+    const coup = coupArr[i];
+    if (coupMap.hasOwnProperty(coup.proId)) {
+      coupMap[coup.proId].push(coup);
+    } else {
+      coupMap[coup.proId] = [coup];
+    }
+  }
+  let total = 0;
+  for (let key in coupMap) {
+    const arr = coupMap[key];
+    for (let i in arr) {
+      const coup = arr[i];
+      if (!goodsMap.hasOwnProperty(coup.proId)) {
+        goodsMap[coup.proId] = goodsArr
+          .filter((v) => v.productId == coup.proId)
+          .map((v) => {
+            return {
+              ...v,
+              payPrice: returnProductPayPrice(v, vipUser),
+            };
+          })
+          .sort((a, b) => {
+            const aPrice = a.payPrice;
+            const bPrice = b.payPrice;
+            return aPrice - bPrice;
+          });
+        goodsPayPriceMap[coup.proId] = goodsMap[coup.proId].reduce((prve, cur) => {
+          const arr = new Array(cur.num).fill(cur.payPrice);
+          prve.push(...arr);
+          return prve;
+        }, []);
+      }
+      const proCoupStartIndex = returnProCoupStartIndex(arr, i);
+      const coupNum = Math.min(goodsPayPriceMap[coup.proId].length, coup.num);
+      total += returnProductCoupAllPrice(goodsPayPriceMap[coup.proId], proCoupStartIndex, coupNum);
+    }
+  }
+
+  return total.toFixed(2);
+}
+//计算满减券总优惠价格
+export function returnFullReductionCouponAllPrice(coupArr) {
+  if (coupArr.length == 0) {
+    return 0;
+  }
+  return coupArr
+    .filter((v) => v.type == 1)
+    .reduce((a, b) => {
+      const price = b.discountAmount;
+      return a + price;
+    }, 0)
+    .toFixed(2);
+}
+//计算优惠券总价格
+export function returnCouponAllPrice(coupArr, goodsArr, vipUser) {
+  const poductAllprice = returnProductCouponAllPrice(coupArr, goodsArr, vipUser);
+  const pointAllPrice = returnFullReductionCouponAllPrice(coupArr);
+  return (poductAllprice * 1 + pointAllPrice * 1).toFixed(2);
+}
+
+//返回当前满减券列表可用状态
+export function returnCanUseFullReductionCoupon(coupArr, payPrice, selCoup) {
+  return coupArr
+    .map((v) => {
+      if (v.id == selCoup.id) {
+        return { ...v, use: true };
+      }
+      const isfullAmount = payPrice * 1 >= v.fullAmount * 1;
+      if (payPrice <= 0) {
+        return {
+          ...v,
+          use: false,
+        };
+      }
+      return {
+        ...v,
+        use: v.use && isfullAmount,
+      };
+    })
+    .filter((v) => v.use);
+}
+
+//根据商品数量还有商品券数量返回优惠券可以使用的数量数组
+export function returnCanUseNumProductCoup(coupArr) {
+  let productCoup = coupArr.filter((v) => v.type == 2);
+  //商品券分组
+  let coupMap = {};
+  for (let i in productCoup) {
+    const coup = productCoup[i];
+    if (coupMap.hasOwnProperty(coup.proId)) {
+      coupMap[coup.proId].push(coup);
+    } else {
+      coupMap[coup.proId] = [coup];
+    }
+  }
+  return arr;
+}
diff --git a/utils/uniapp.js b/utils/uniapp.js
new file mode 100644
index 0000000..4803be2
--- /dev/null
+++ b/utils/uniapp.js
@@ -0,0 +1,16 @@
+export const  back=()=>{
+	console.log('back');
+	try {
+		const arr= getCurrentPages()
+		if(arr.length>=2){
+			return uni.navigateBack()
+		}else{
+			uni.reLaunch({
+				url:'/pages/index/index'
+			})
+		}
+	} catch (error) {
+		console.error('页面返回出错',error)
+		//TODO handle the exception
+	}
+}
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
index c04048e..cf024ff 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -9,7 +9,7 @@ export default defineConfig({
 		hmr: true,
 		proxy: {
 			'/api': {
-				target: 'https://tapi.cashier.sxczgkj.cn',
+				target: 'http://192.168.1.31',
 				changeOrigin: true,
 				rewrite: path => path.replace(/^\/api/, ''),
 				secure: false