From 137923bc82e9b9b2a1789e49d301fe0827d5e5ce Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 29 Oct 2024 16:05:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/NoticeWindow/index.tsx |  2 +-
 src/page/Meeting/index.tsx              | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/page/Meeting/NoticeWindow/index.tsx b/src/page/Meeting/NoticeWindow/index.tsx
index 61d4c56..d1be2a7 100644
--- a/src/page/Meeting/NoticeWindow/index.tsx
+++ b/src/page/Meeting/NoticeWindow/index.tsx
@@ -22,7 +22,7 @@ const NoticeWindow: React.FC = () => {
             message: '',
             description: <div>
               <span style={{ fontSize: '16px' }}>{noticeItem.uname}申请发言</span>
-              <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
+              <div style={{ display: 'flex', justifyContent: 'flex-end' }} className='drag'>
                 <Button
                   type="primary"
                   className='m-ant-btn'
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 3123ec0..7406a1f 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -238,7 +238,13 @@ const Meeting: React.FC = () => {
         case 'shareScreenWindowClose':
           setCurrentSeconds(shareScreenWindowClose)
           await stopScreenCapture()
-          await allUserLook(userInfo.uid, userInfo.userName)
+          await getUserRoomInfo().then(async (res) => {
+            if (res) {
+              await allUserLook(userInfo.uid, userInfo.userName)
+            } else {
+              await getShowUser()
+            }
+          })
           break;
         case 'shareScreenWindowfooterListsTitle':
           switch (shareScreenWindowfooterListsTitle) {
@@ -693,7 +699,7 @@ const Meeting: React.FC = () => {
                 message: '',
                 description: <div>
                   <span style={{ fontSize: '16px' }}>{item.uname}申请发言</span>
-                  <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
+                  <div style={{ display: 'flex', justifyContent: 'flex-end' }} className='drag'>
                     <Button
                       type="primary"
                       className='m-ant-btn'

From e849e01876a51b0a7437f356e1c62dca1e4a549a Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 29 Oct 2024 16:14:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/index.tsx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 7406a1f..50f2cbb 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -238,13 +238,7 @@ const Meeting: React.FC = () => {
         case 'shareScreenWindowClose':
           setCurrentSeconds(shareScreenWindowClose)
           await stopScreenCapture()
-          await getUserRoomInfo().then(async (res) => {
-            if (res) {
-              await allUserLook(userInfo.uid, userInfo.userName)
-            } else {
-              await getShowUser()
-            }
-          })
+          await allUserLook(userInfo.uid, userInfo.userName)
           break;
         case 'shareScreenWindowfooterListsTitle':
           switch (shareScreenWindowfooterListsTitle) {
@@ -674,7 +668,6 @@ const Meeting: React.FC = () => {
                   }
                   return ''
                 })
-
                 await stopScreenCapture()
               } else {
                 message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`)