Merge pull request 'yangjie' (#43) from yangjie into master

Reviewed-on: #43

src/components/JoinSetting/index.tsx

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

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<void> => {
     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 {

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) {

src/utils/request/request.ts

@@ -82,7 +82,17 @@ class Request {
               break;
           }
         } else {
+          switch (err.code) {
+            case "ECONNABORTED":
+              message.error('网络连接超时，请检查网络状态')
+              break;
+            case "ERR_NETWORK":
+              message.error('网络已断开，请检查网络状态')
+              break;
+            default:
               message.error(err.message)
+              break;
+          }
         }
       }
     )