From e4439e5d0a2cba9983f013bd044fe4e22c7b7077 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 11 Feb 2026 16:35:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-app/src/hooks/useGlobalWS.js | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/uniapps/work-app/src/hooks/useGlobalWS.js b/uniapps/work-app/src/hooks/useGlobalWS.js
index f0fd2f6..b8595a3 100644
--- a/uniapps/work-app/src/hooks/useGlobalWS.js
+++ b/uniapps/work-app/src/hooks/useGlobalWS.js
@@ -8,7 +8,7 @@
const callStatus = ref(null)
// 设置默认用户ID为3
- const defaultUserId = '3';
+ const defaultUserId = '8';
// WebSocket基础URL
const WS_BASE = 'wss://wrj.shuixiongit.com/ws/chat?userId=';
@@ -77,10 +77,7 @@
// 初始化WebSocket连接
function initWS() {
try {
- if (callStatus.value === 'accept') {
- console.log('📞 通话中，跳过WebSocket初始化');
- return;
- }
+
websocketService.setOnMessageCallback(messageHandler);
// 获取当前用户ID，优先使用store中的用户信息
--
Gitblit v1.9.3