diff --git a/src/App.tsx b/src/App.tsx index 13672b1..ec94919 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,5 +1,5 @@ -import { useEffect, useState } from "react"; +import { useEffect, useState, useRef } from "react"; import '@/utils/styles/App.scss' import { Route, Routes, useNavigate, Navigate } from 'react-router-dom'; import Home from '@/page/Home/index' @@ -11,9 +11,11 @@ import NotFound from '@/page/NotFound/index' import { storage } from '@/utils' import { Spin } from "antd"; import { onSignalr, offSignalr } from "@/utils/package/signalr"; +import JoinMeetingModal from "./components/JoinMeetingModal"; const App: React.FC = () => { const navigate = useNavigate(); + const joinMeetingModalRef = useRef(); const [_windowSize, setWindowSize] = useState({ width: window.innerWidth, height: window.innerHeight, @@ -66,6 +68,7 @@ const App: React.FC = () => { body: item.roomName, name: item.InviterName, }) + joinMeetingModalRef.current.changeModal(item) break; } }) @@ -106,6 +109,7 @@ const App: React.FC = () => { } /> + ) } diff --git a/src/assets/icon37.png b/src/assets/icon37.png new file mode 100644 index 0000000..cd1cfc5 Binary files /dev/null and b/src/assets/icon37.png differ diff --git a/src/assets/icon38.png b/src/assets/icon38.png new file mode 100644 index 0000000..e2548c7 Binary files /dev/null and b/src/assets/icon38.png differ diff --git a/src/components/InvitingPersonnelModal/index.tsx b/src/components/InvitingPersonnelModal/index.tsx index 51487ec..2637c54 100644 --- a/src/components/InvitingPersonnelModal/index.tsx +++ b/src/components/InvitingPersonnelModal/index.tsx @@ -165,6 +165,7 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => {