yangjie #43

Merged
yangqiang merged 4 commits from yangjie into master 2024-12-12 14:23:48 +08:00
4 changed files with 22 additions and 2 deletions

View File

@ -222,6 +222,7 @@ const JoinSetting = forwardRef((_props: any, ref: any) => {
}) })
} else { } else {
message.error('房间号不存在!') message.error('房间号不存在!')
storage.setItem('loading', false)
} }
}) })
}} }}

View File

@ -9,6 +9,7 @@ const SingIn = forwardRef((props: any, ref: any) => {
getRoomSingnIn() getRoomSingnIn()
}, },
getModal: () => { getModal: () => {
setIsMessage(true)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
setSingInModal(bool => { setSingInModal(bool => {
resolve(bool) resolve(bool)
@ -18,12 +19,20 @@ const SingIn = forwardRef((props: any, ref: any) => {
}, },
})) }))
const [singInModal, setSingInModal] = useState(false); const [singInModal, setSingInModal] = useState(false);
const [isMessage, setIsMessage] = useState(false);
const [singInList, setSingInList] = useState([]); const [singInList, setSingInList] = useState([]);
const getRoomSingnIn = async (): Promise<void> => { const getRoomSingnIn = async (): Promise<void> => {
await GetRoomSingnIn().then(res => { await GetRoomSingnIn().then(res => {
if (res.code === 200) { if (res.code === 200) {
if (res.data.length) { if (res.data.length) {
setSingInModal(true) setSingInModal(true)
} else {
setIsMessage(bool => {
if (!bool) {
message.error('暂未绑定签到人,请联系管理员添加后签到!')
}
return false
})
} }
setSingInList(res.data.map((item: any) => { setSingInList(res.data.map((item: any) => {
return { return {

View File

@ -475,7 +475,7 @@ const Index: React.FC = () => {
if (!createRoomFrom.roomNum) { if (!createRoomFrom.roomNum) {
return message.error('请输入房间号!') return message.error('请输入房间号!')
} }
if (!createRoomFrom.year) { if (createRoomFrom.year === "") {
return message.error('请输入届!') return message.error('请输入届!')
} }
if (isCreateRoom) { if (isCreateRoom) {

View File

@ -82,7 +82,17 @@ class Request {
break; break;
} }
} else { } 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;
}
} }
} }
) )