marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

yangjie #30

Merged
yangqiang merged 2 commits from yangjie into master 2024-10-29 17:46:22 +08:00
Conversation 0 Commits 2 Files Changed 2 +9 -3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 137923bc82 - Show all commits

2
src/page/Meeting/NoticeWindow/index.tsx
View File

@ -22,7 +22,7 @@ const NoticeWindow: React.FC = () => {
message: '', message: '',
description: <div> description: <div>
<span style={{ fontSize: '16px' }}>{noticeItem.uname}申请发言</span> <span style={{ fontSize: '16px' }}>{noticeItem.uname}申请发言</span>
<div style={{ display: 'flex', justifyContent: 'flex-end' }}> <div style={{ display: 'flex', justifyContent: 'flex-end' }} className='drag'>
<Button <Button
type="primary" type="primary"
className='m-ant-btn' className='m-ant-btn'

10
src/page/Meeting/index.tsx
View File

@ -238,7 +238,13 @@ const Meeting: React.FC = () => {
case 'shareScreenWindowClose': case 'shareScreenWindowClose':
setCurrentSeconds(shareScreenWindowClose) setCurrentSeconds(shareScreenWindowClose)
await stopScreenCapture() 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; break;
case 'shareScreenWindowfooterListsTitle': case 'shareScreenWindowfooterListsTitle':
switch (shareScreenWindowfooterListsTitle) { switch (shareScreenWindowfooterListsTitle) {
@ -693,7 +699,7 @@ const Meeting: React.FC = () => {
message: '', message: '',
description: <div> description: <div>
<span style={{ fontSize: '16px' }}>{item.uname}申请发言</span> <span style={{ fontSize: '16px' }}>{item.uname}申请发言</span>
<div style={{ display: 'flex', justifyContent: 'flex-end' }}> <div style={{ display: 'flex', justifyContent: 'flex-end' }} className='drag'>
<Button <Button
type="primary" type="primary"
className='m-ant-btn' className='m-ant-btn'