diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx index 765597c..349390b 100644 --- a/src/page/Home/Index/index.tsx +++ b/src/page/Home/Index/index.tsx @@ -34,6 +34,7 @@ const Index: React.FC = () => { const stupWizardRef = useRef(); const [user, setUser] = useState({}); const [currentRoomInfo, setCurrentRoomInfo] = useState({}); + const [timeData, setTimeData] = useState([]); const userInfo = JSON.parse(storage.getItem('user') as string) useEffect(() => { setUser(userInfo) @@ -386,15 +387,23 @@ const Index: React.FC = () => { - setTimeSelectModal(false)} centered width={'400px'}> + setTimeSelectModal(false)} centered maskClosable={false} width={'400px'}>
{ + setTimeData(dateString) + }} + /> +
+ + +
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 1d19ec4..9a075bf 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -1207,8 +1207,11 @@ const Meeting: React.FC = () => { // 退出房间 const leaveChannel = async (bool: boolean = true): Promise => { await stopRecorderMedia() - if (bool) { - await getLeave() + try { + if (bool) { + await getLeave() + } + } catch (error) { } await agora.leaveChannel() if (user.isAnonymous) { diff --git a/src/utils/package/signalr.ts b/src/utils/package/signalr.ts index 0f7dd9d..0d0652b 100644 --- a/src/utils/package/signalr.ts +++ b/src/utils/package/signalr.ts @@ -22,15 +22,12 @@ export const startSignalr = async () => { }); } -export const onStart = async (callBack?: Function) => { - if (connection.state !== signalR.HubConnectionState.Connected) { - try { - await connection.start(); - if (callBack) { - callBack() - } - } catch (err) { - setTimeout(onStart, 5000); +export const onStart = async () => { + if (connection) { + if (connection.state !== signalR.HubConnectionState.Connected) { + connection.start(); + } else { + setTimeout(onStart, 3000); } } } diff --git a/src/utils/styles/App.scss b/src/utils/styles/App.scss index f14107f..eeef848 100644 --- a/src/utils/styles/App.scss +++ b/src/utils/styles/App.scss @@ -381,7 +381,11 @@ $pagination-hover-background-color: #5575F2; .ant-message { -webkit-app-region: no-drag; } - +// ant-spin-fullscreen .ant-spin-fullscreen { z-index: 10000; +} + +.ant-picker-dropdown { + -webkit-app-region: no-drag; } \ No newline at end of file