From aa8809e03ce1c32c628bcbd681c614c5e8830184 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Thu, 12 Dec 2024 10:13:39 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E5=AD=98=E5=9C=A8loading=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JoinSetting/index.tsx | 1 +
 1 file changed, 1 insertion(+)

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

From 97abad8231a99012569e680432af456e95929b70 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Thu, 12 Dec 2024 10:38:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SingIn/index.tsx |  2 ++
 src/utils/request/request.ts    | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/SingIn/index.tsx b/src/components/SingIn/index.tsx
index 58d64e9..0b64b03 100644
--- a/src/components/SingIn/index.tsx
+++ b/src/components/SingIn/index.tsx
@@ -24,6 +24,8 @@ const SingIn = forwardRef((props: any, ref: any) => {
       if (res.code === 200) {
         if (res.data.length) {
           setSingInModal(true)
+        } else {
+          message.error('暂未绑定签到人，请联系管理员添加后签到！')
         }
         setSingInList(res.data.map((item: any) => {
           return {
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;
+          }
         }
       }
     )

From c8d8db27d7d2292b1501056da8324dc94e319d2f Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Thu, 12 Dec 2024 11:13:38 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SingIn/index.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/SingIn/index.tsx b/src/components/SingIn/index.tsx
index 0b64b03..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,6 +19,7 @@ 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 => {
@@ -25,7 +27,12 @@ const SingIn = forwardRef((props: any, ref: any) => {
         if (res.data.length) {
           setSingInModal(true)
         } else {
-          message.error('暂未绑定签到人，请联系管理员添加后签到！')
+          setIsMessage(bool => {
+            if (!bool) {
+              message.error('暂未绑定签到人，请联系管理员添加后签到！')
+            }
+            return false
+          })
         }
         setSingInList(res.data.map((item: any) => {
           return {

From 41e9742610569bc2fe0acb268ec33bc530561cf5 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Thu, 12 Dec 2024 11:21:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Home/Index/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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