下单详情

common/api/order/index.js

@@ -27,11 +27,20 @@ export const APIputuserorder = (data) => {
 	})
 }
 
-//订单列表
-export const orderhistoryOrder = (data) => {
+//历史订单(多次下单使用)
+export const APIhistoryOrder = (data) => {
 	return request({
 		url: url + '/user/order/historyOrder',
 		method: 'get',
 		data: data
 	})
+}
+
+//订单详情
+export const APIgetOrderById = (data) => {
+	return request({
+		url: url + '/user/order/getOrderById',
+		method: 'get',
+		data: data
+	})
 }

common/js/websocket.js

@@ -86,10 +86,10 @@ const useWebSocket = (options = {}) => {
 				sendMessage(initMessage)
 			});
 			socketTask.value.onMessage((res) => {
-				// console.log(res, 'receivedMessages.value')
 				let list = JSON.parse(res.data)
+				console.log(list, 'receivedMessages.value')
 				receivedMessages.value.push(list);
-				if (list.type == 'p') {
+				if (res.msg == 'ok') {
 					console.log('心跳响应正常');
 					// 心跳正常，重置重连尝试次数
 					reconnectAttempts.value = 0;
@@ -135,7 +135,7 @@ const useWebSocket = (options = {}) => {
 			if (isConnected.value) {
 				socketTask.value.send({
 					data: JSON.stringify({
-						type: 'pong'
+						type: 'ping_interval'
 					}),
 					success: () => {
 						console.log('心跳消息发送成功');
@@ -148,7 +148,7 @@ const useWebSocket = (options = {}) => {
 						}, heartbeatInterval * 1.2);
 
 						socketTask.value.onMessage((res) => {
-							if (res.data === 'ping') {
+							if (res.msg == 'ok') {
 								clearTimeout(pongTimer);
 							}
 						});