From dabeb8dfef3a02934caa8b18adc13e0cb5da04ca Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Fri, 18 Oct 2024 10:57:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=81=E8=AE=B8=E5=8F=91?=
 =?UTF-8?q?=E8=A8=80=E5=9B=BE=E6=A0=87=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/UserListWindow/index.tsx | 42 +++++++++++------------
 src/page/Meeting/index.tsx                | 40 ++++++++++-----------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/page/Meeting/UserListWindow/index.tsx b/src/page/Meeting/UserListWindow/index.tsx
index 4168865..6f29e5f 100644
--- a/src/page/Meeting/UserListWindow/index.tsx
+++ b/src/page/Meeting/UserListWindow/index.tsx
@@ -96,27 +96,6 @@ const UserListWindow: React.FC = () => {
                   </span>
                 </div>
                 <div>
-                  {item.uid !== user.uid && !role.ID.includes(item.roleId) ? <div onClick={() => {
-                    if (item.isRoomManager) {
-                      channel.postMessage({
-                        type: 'userListWindowDeleteRoomManager',
-                        userListWindowDeleteRoomManager: {
-                          uid: item.uid
-                        }
-                      });
-                    } else {
-                      channel.postMessage({
-                        type: 'userListWindowPostRoomManager',
-                        userListWindowPostRoomManager: {
-                          uid: item.uid
-                        }
-                      });
-                    }
-                  }}>
-                    {!item.isRoomManager ?
-                      <img src={ImageUrl.icon50} alt="" title='允许发言' /> :
-                      <img src={ImageUrl.icon51} alt="" title='取消发言' />}
-                  </div> : null}
                   {role.ID.includes(item.roleId) || item.isRoomManager ? <div>
                     <img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" onClick={() => {
                       channel.postMessage({
@@ -184,6 +163,27 @@ const UserListWindow: React.FC = () => {
                       }} />
                     </Popover>
                   </div> : null}
+                  {item.uid !== user.uid && !role.ID.includes(item.roleId) ? <div onClick={() => {
+                    if (item.isRoomManager) {
+                      channel.postMessage({
+                        type: 'userListWindowDeleteRoomManager',
+                        userListWindowDeleteRoomManager: {
+                          uid: item.uid
+                        }
+                      });
+                    } else {
+                      channel.postMessage({
+                        type: 'userListWindowPostRoomManager',
+                        userListWindowPostRoomManager: {
+                          uid: item.uid
+                        }
+                      });
+                    }
+                  }}>
+                    {!item.isRoomManager ?
+                      <img src={ImageUrl.icon50} alt="" title='允许发言' /> :
+                      <img src={ImageUrl.icon51} alt="" title='取消发言' />}
+                  </div> : null}
                 </div>
               </div> : null
             )
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 931172a..db829da 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -2265,26 +2265,6 @@ const Meeting: React.FC = () => {
                                 </span>
                               </div>
                               <div>
-                                {item.uid !== user.uid && !role.ID.includes(item.roleId) ? <div onClick={() => {
-                                  if (item.isRoomManager) {
-                                    DeleteRoomManager({
-                                      roomId: state.roomId,
-                                      roomNum: state.channelId,
-                                      userId: item.uid
-                                    })
-                                  } else {
-                                    postRoomManager({
-                                      roomId: state.roomId,
-                                      roomNum: state.channelId,
-                                      userId: item.uid
-                                    })
-                                  }
-                                }}>
-                                  {!item.isRoomManager ?
-                                    <img src={ImageUrl.icon50} alt="" title='允许发言' /> :
-                                    <img src={ImageUrl.icon51} alt="" title='取消发言' />
-                                  }
-                                </div> : null}
                                 {role.ID.includes(item.roleId) || item.isRoomManager ? <div>
                                   <img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" onClick={() => {
                                     postOpenMicr(!item.enableMicr, item.uid)
@@ -2320,6 +2300,26 @@ const Meeting: React.FC = () => {
                                     <EllipsisOutlined style={{ color: '#fff', fontSize: '20px' }} />
                                   </Popover>
                                 </div> : null}
+                                {item.uid !== user.uid && !role.ID.includes(item.roleId) ? <div onClick={() => {
+                                  if (item.isRoomManager) {
+                                    DeleteRoomManager({
+                                      roomId: state.roomId,
+                                      roomNum: state.channelId,
+                                      userId: item.uid
+                                    })
+                                  } else {
+                                    postRoomManager({
+                                      roomId: state.roomId,
+                                      roomNum: state.channelId,
+                                      userId: item.uid
+                                    })
+                                  }
+                                }}>
+                                  {!item.isRoomManager ?
+                                    <img src={ImageUrl.icon50} alt="" title='允许发言' /> :
+                                    <img src={ImageUrl.icon51} alt="" title='取消发言' />
+                                  }
+                                </div> : null}
                               </div>
                             </div> : null
                           )