diff --git a/src/components/JoinSetting/index.tsx b/src/components/JoinSetting/index.tsx index 3b902ec..18065db 100644 --- a/src/components/JoinSetting/index.tsx +++ b/src/components/JoinSetting/index.tsx @@ -222,6 +222,7 @@ const JoinSetting = forwardRef((_props: any, ref: any) => { }) } else { message.error('房间号不存在!') + storage.setItem('loading', false) } }) }} diff --git a/src/components/SingIn/index.tsx b/src/components/SingIn/index.tsx index 58d64e9..5ea64b1 100644 --- a/src/components/SingIn/index.tsx +++ b/src/components/SingIn/index.tsx @@ -9,6 +9,7 @@ const SingIn = forwardRef((props: any, ref: any) => { getRoomSingnIn() }, getModal: () => { + setIsMessage(true) return new Promise((resolve, reject) => { setSingInModal(bool => { resolve(bool) @@ -18,12 +19,20 @@ const SingIn = forwardRef((props: any, ref: any) => { }, })) const [singInModal, setSingInModal] = useState(false); + const [isMessage, setIsMessage] = useState(false); const [singInList, setSingInList] = useState([]); const getRoomSingnIn = async (): Promise => { await GetRoomSingnIn().then(res => { if (res.code === 200) { if (res.data.length) { setSingInModal(true) + } else { + setIsMessage(bool => { + if (!bool) { + message.error('暂未绑定签到人,请联系管理员添加后签到!') + } + return false + }) } setSingInList(res.data.map((item: any) => { return { diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx index e2a3462..2c3caeb 100644 --- a/src/page/Home/Index/index.tsx +++ b/src/page/Home/Index/index.tsx @@ -475,7 +475,7 @@ const Index: React.FC = () => { if (!createRoomFrom.roomNum) { return message.error('请输入房间号!') } - if (!createRoomFrom.year) { + if (createRoomFrom.year === "") { return message.error('请输入届!') } if (isCreateRoom) { diff --git a/src/utils/request/request.ts b/src/utils/request/request.ts index 490b9e6..40cd03f 100644 --- a/src/utils/request/request.ts +++ b/src/utils/request/request.ts @@ -82,7 +82,17 @@ class Request { break; } } else { - message.error(err.message) + switch (err.code) { + case "ECONNABORTED": + message.error('网络连接超时,请检查网络状态') + break; + case "ERR_NETWORK": + message.error('网络已断开,请检查网络状态') + break; + default: + message.error(err.message) + break; + } } } )