From 5cb47e9b3e2a6e22c74ca270bc53a640ad77e4f4 Mon Sep 17 00:00:00 2001
From: flying-hero <462087392@qq.com>
Date: Sat, 4 Apr 2026 21:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E5=8A=9F=E8=83=BD=EF=BC=9A?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=8E=86=E5=8F=B2=E4=BC=9A=E8=AE=AE=E6=97=B6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8A=A0=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

变更:
- 进入会议室页面时自动调用 join API
- 当前登录用户会自动加入会议坐席
- 如果已加入则忽略错误
---
 frontend/package-lock.json | 14 +++++++-------
 frontend/src/App.js        | 13 +++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 6085132b..0653af52 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -5306,9 +5306,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001784",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001784.tgz",
-      "integrity": "sha512-WU346nBTklUV9YfUl60fqRbU5ZqyXlqvo1SgigE1OAXK5bFL8LL9q1K7aap3N739l4BvNqnkm3YrGHiY9sfUQw==",
+      "version": "1.0.30001785",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001785.tgz",
+      "integrity": "sha512-blhOL/WNR+Km1RI/LCVAvA73xplXA7ZbjzI4YkMK9pa6T/P3F2GxjNpEkyw5repTw9IvkyrjyHpwjnhZ5FOvYQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -16000,9 +16000,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz",
+      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
       "license": "Apache-2.0",
       "peer": true,
       "bin": {
@@ -16010,7 +16010,7 @@
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.17"
       }
     },
     "node_modules/unbox-primitive": {
diff --git a/frontend/src/App.js b/frontend/src/App.js
index 157ade95..d4c56ee0 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -242,6 +242,7 @@ function MeetingRoom() {
     fetchMeeting();
     fetchParticipants();
     fetchMessages();
+    joinMeeting(); // 自动加入会议
     const interval = setInterval(fetchMessages, 1000);
     return () => clearInterval(interval);
   }, [id]);
@@ -267,6 +268,18 @@ function MeetingRoom() {
     } catch (error) { console.error(error); }
   };
 
+  const joinMeeting = async () => {
+    try {
+      // 尝试加入会议（如果还没加入）
+      await axios.post(`${API_BASE}/meetings/${id}/join/`, {
+        invite_code: meeting?.invite_code
+      });
+    } catch (error) {
+      // 可能已经加入了，忽略错误
+      console.log('加入会议:', error?.response?.data?.error || '已加入');
+    }
+  };
+
   const sendMessage = async (e) => {
     e.preventDefault();
     if (!content.trim()) return;