diff --git a/src/assets/icon43.png b/src/assets/icon43.png new file mode 100644 index 0000000..0d4e11e Binary files /dev/null and b/src/assets/icon43.png differ diff --git a/src/assets/icon44.png b/src/assets/icon44.png new file mode 100644 index 0000000..e28e6fc Binary files /dev/null and b/src/assets/icon44.png differ diff --git a/src/components/InvitingPersonnelModal/index.tsx b/src/components/InvitingPersonnelModal/index.tsx index fd5dbff..095bdde 100644 --- a/src/components/InvitingPersonnelModal/index.tsx +++ b/src/components/InvitingPersonnelModal/index.tsx @@ -65,6 +65,7 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => { }) ]).then(res => { if (res[0].code === 200 && res[1].code === 200) { + res[1].data.items.splice(res[1].data.items.findIndex((item: any) => item.uid === user.uid), 1) setList({ ...list, total: res[1].data.total, diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss index aaba83b..a3cdaf5 100644 --- a/src/page/Meeting/index.module.scss +++ b/src/page/Meeting/index.module.scss @@ -236,7 +236,7 @@ .meetingContentSwiperCard { height: 160px; - width: calc(100% / 4); + width: calc(100% / 6); border-radius: 10px; overflow: hidden; position: relative; @@ -541,6 +541,7 @@ margin-right: 30px; cursor: pointer; position: relative; + &:last-child { margin: 0; } @@ -639,10 +640,20 @@ height: 30px; line-height: 30px; border-radius: 5px; - color: #EEEEEE; - text-align: center; margin-bottom: 8px; cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + + >span { + color: #EEEEEE; + } + + >img { + height: 16px; + margin-right: 10px; + } &:last-child { margin: 0; diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 4c67739..8b8fee2 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -110,7 +110,7 @@ const Meeting: React.FC = () => { let [currentSeconds, setCurrentSeconds] = useState(0) const [currentEffective, setCurrentEffective] = useState(0) const [isComputerAudio, setIsComputerAudio] = useState(true) - const [isFluencyPriority, setIsFluencyPriority] = useState(true) + const [isFluencyPriority, setIsFluencyPriority] = useState(false) const [open, setOpen] = useState(false) const [modeOpen, setModeOpen] = useState(false) const [meetingMode, setMeetingMode] = useState('') @@ -127,7 +127,11 @@ const Meeting: React.FC = () => { let time = null as any; setUser(userInfo) setTimeout(() => { - window.electron.setViewStatus('maximize') + window.electron.getIsMaximized().then((res: boolean) => { + if (!res) { + window.electron.setViewStatus('maximize') + } + }) }, 1000) setMeetingMode('StandardMode'); agora.init(true) @@ -699,7 +703,7 @@ const Meeting: React.FC = () => { case 'StandardMode': return '标准模式' case 'SpeakerMode': - return '演讲者模式' + return '演讲模式' case 'SingleScreenMode': return '单画面模式' case 'DualScreenMode': @@ -723,7 +727,9 @@ const Meeting: React.FC = () => { } return ( <> -