From fcefaea35983670691e653dc824f55d718328367 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Mon, 12 Aug 2024 16:01:05 +0800
Subject: [PATCH] =?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/index.module.scss |  5 +-
 src/page/Meeting/index.tsx         | 88 +++++++-----------------------
 2 files changed, 24 insertions(+), 69 deletions(-)

diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss
index 425f249..efcacb2 100644
--- a/src/page/Meeting/index.module.scss
+++ b/src/page/Meeting/index.module.scss
@@ -283,9 +283,12 @@
           bottom: 16px;
           z-index: 2;
           cursor: pointer;
+          display: flex;
+          justify-content: center;
+          align-items: center;
           background-color: rgba(0, 0, 0, 0.5);
-          padding: 5px;
           box-sizing: border-box;
+          padding: 0px 5px;
         }
 
         .meetingContentSwiperCardShare {
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 02895c4..ecb60b8 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -4,7 +4,7 @@ import Operation from '@/components/Operation';
 import SpeakerModeModal from '@/components/SpeakerModeModal';
 import InvitingPersonnelModal from '@/components/InvitingPersonnelModal';
 import { Button, Input, Popover, Modal, Checkbox, message, Popconfirm } from "antd";
-import { SearchOutlined, SmallDashOutlined } from '@ant-design/icons';
+import { SearchOutlined, EllipsisOutlined } from '@ant-design/icons';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { thumbImageBufferToBase64 } from '@/utils/package/base64'
 import { storage } from '@/utils';
@@ -788,11 +788,11 @@ const Meeting: React.FC = () => {
     })
   }
   // 设置全员观看
-  const setAllUserLook = (): void => {
+  const setAllUserLook = (item: any): void => {
     if (isShare) {
-      allUserLook(String(isShare) === currentLookUserAccount.screenShareId ? currentLookUserAccount.screenShareId : currentLookUserAccount.uid)
+      allUserLook(String(isShare) === item.screenShareId ? item.screenShareId : item.uid)
     } else {
-      allUserLook(currentLookUserAccount.uid)
+      allUserLook(item.uid)
     }
   }
   return (
@@ -873,6 +873,22 @@ const Meeting: React.FC = () => {
                     {String(isShare) === item.screenShareId ? <div className={styles.meetingContentSwiperCardShare}>
                       屏幕分享中
                     </div> : null}
+                    <Popover placement="top" title={''} content={
+                      <div>
+                        <Button
+                          type="primary"
+                          className='m-ant-btn'
+                          onClick={() => setAllUserLook(item)}
+                        >全员看Ta</Button>
+                      </div>
+                    }>
+                      <div className={styles.meetingContentOperation}>
+                        <EllipsisOutlined style={{
+                          color: '#fff',
+                          fontSize: '20px'
+                        }} />
+                      </div>
+                    </Popover>
                   </div>
                 }
                 )}
@@ -893,22 +909,6 @@ const Meeting: React.FC = () => {
                       </div>}
                     </div>
                     {meetingContentUser(currentLookUserAccount)}
-                    <Popover placement="top" title={''} content={
-                      <div>
-                        <Button
-                          type="primary"
-                          className='m-ant-btn'
-                          onClick={() => setAllUserLook()}
-                        >全员看Ta</Button>
-                      </div>
-                    }>
-                      <div className={styles.meetingContentOperation}>
-                        <SmallDashOutlined style={{
-                          color: '#fff',
-                          fontSize: '30px'
-                        }} />
-                      </div>
-                    </Popover>
                     {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
                   </div> : null}
                 {currentLookUserStatus === 2 && currentLookUserAccount ?
@@ -919,22 +919,6 @@ const Meeting: React.FC = () => {
                       </div>
                     </div>
                     {meetingContentUser(currentLookUserAccount)}
-                    <Popover placement="top" title={''} content={
-                      <div>
-                        <Button
-                          type="primary"
-                          className='m-ant-btn'
-                          onClick={() => setAllUserLook()}
-                        >全员看Ta</Button>
-                      </div>
-                    }>
-                      <div className={styles.meetingContentOperation}>
-                        <SmallDashOutlined style={{
-                          color: '#fff',
-                          fontSize: '30px'
-                        }} />
-                      </div>
-                    </Popover>
                     {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
                   </div> : null}
                 {currentLookUserStatus === 3 && currentLookUserAccount ?
@@ -945,22 +929,6 @@ const Meeting: React.FC = () => {
                       </div>
                     </div>
                     {meetingContentUser(currentLookUserAccount)}
-                    <Popover placement="top" title={''} content={
-                      <div>
-                        <Button
-                          type="primary"
-                          className='m-ant-btn'
-                          onClick={() => setAllUserLook()}
-                        >全员看Ta</Button>
-                      </div>
-                    }>
-                      <div className={styles.meetingContentOperation}>
-                        <SmallDashOutlined style={{
-                          color: '#fff',
-                          fontSize: '30px'
-                        }} />
-                      </div>
-                    </Popover>
                     {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
                   </div> : null}
                 {currentLookUserStatus === 4 && currentLookUserAccount ?
@@ -971,22 +939,6 @@ const Meeting: React.FC = () => {
                       </div>
                     </div>
                     {meetingContentUser(currentLookUserAccount)}
-                    <Popover placement="top" title={''} content={
-                      <div>
-                        <Button
-                          type="primary"
-                          className='m-ant-btn'
-                          onClick={() => setAllUserLook()}
-                        >全员看Ta</Button>
-                      </div>
-                    }>
-                      <div className={styles.meetingContentOperation}>
-                        <SmallDashOutlined style={{
-                          color: '#fff',
-                          fontSize: '30px'
-                        }} />
-                      </div>
-                    </Popover>
                     {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
                   </div> : null}
               </div>