diff --git a/src/pages/friend-battle.vue b/src/pages/friend-battle.vue
index f7a17eb..c6f3f34 100644
--- a/src/pages/friend-battle.vue
+++ b/src/pages/friend-battle.vue
@@ -47,6 +47,7 @@ const enterRoom = debounce(async (number) => {
     return;
   }
   loading.value = true;
+  let keepLoading = false;
   try {
     const room = await getRoomAPI(number);
     if (!room.number) {
@@ -65,11 +66,15 @@ const enterRoom = debounce(async (number) => {
         return;
       }
     }
+    keepLoading = true;
     uni.navigateTo({
       url: "/pages/battle-room?roomNumber=" + number,
+      fail: () => {
+        loading.value = false;
+      },
     });
   } finally {
-    loading.value = false;
+    if (!keepLoading) loading.value = false;
   }
 });
 const onCreateRoom = debounce(async () => {
@@ -123,6 +128,7 @@ const goMyRecord = () => {
   });
 };
 onShow(async () => {
+  loading.value = false;
   if (user.value.id) {
     const [result] = await Promise.all([
       getBattleDataAPI(),