From 7ec435ce456ec19ac0ae46f1c443c2a70440668f Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Thu, 26 Jun 2025 13:41:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis.js                     |  4 ++++
 src/components/BattleHeader.vue |  2 +-
 src/components/Matching.vue     | 10 ++++++----
 src/constants.js                | 13 +++++++++++++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/apis.js b/src/apis.js
index d0eb2fb..849e1ea 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -16,6 +16,10 @@ function request(method, url, data = {}) {
           if (res.data.message.indexOf("登录身份已失效") !== -1) {
             uni.removeStorageSync("token");
           }
+          if (url.indexOf("/user/room") !== -1 && method === "GET") {
+            resolve({});
+            return;
+          }
           uni.showToast({
             title: res.data.message,
             icon: "none",
diff --git a/src/components/BattleHeader.vue b/src/components/BattleHeader.vue
index 7c3d70c..691316a 100644
--- a/src/components/BattleHeader.vue
+++ b/src/components/BattleHeader.vue
@@ -22,7 +22,7 @@ defineProps({
     default: 2,
   },
 });
-const bgColors = ["#364469", "#692735", "#934B4B", "#A98B69", "#8268A2 "];
+const bgColors = ["#364469", "#692735", "#934B4B", "#A98B69", "#8268A2"];
 </script>
 
 <template>
diff --git a/src/components/Matching.vue b/src/components/Matching.vue
index 4d67aae..2bfd978 100644
--- a/src/components/Matching.vue
+++ b/src/components/Matching.vue
@@ -89,10 +89,10 @@ onMounted(() => {
     if (totalTop.value === 100) {
       totalTop.value = 0;
     } else {
-      totalTop.value += 0.5;
+      totalTop.value += 2;
     }
     textStyles.value = getTextStyle(totalTop.value);
-  }, 10);
+  }, 40);
 });
 onUnmounted(() => {
   if (timer.value) clearInterval(timer.value);
@@ -155,7 +155,8 @@ onUnmounted(() => {
   width: 70vw;
   height: 95vw;
   overflow: hidden;
-  position: relative;
+  position: absolute;
+  top: 30.5vw;
 }
 .matching-bg {
   position: absolute;
@@ -165,12 +166,13 @@ onUnmounted(() => {
 }
 .matching > button {
   width: 55%;
-  margin-top: 15vw;
   padding: 18px;
   color: #000;
   background-color: #fed847;
   font-size: 18px;
   border-radius: 30px;
+  position: absolute;
+  top: 142vw;
 }
 .player-names {
   width: 100%;
diff --git a/src/constants.js b/src/constants.js
index 0ec1450..05b3e7d 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -35,3 +35,16 @@ export const roundsName = {
   4: "四",
   5: "五",
 };
+
+export const meleeAvatarColors = [
+  "#364469",
+  "#692735",
+  "#934B4B",
+  "#A98B69",
+  "#8268A2",
+  "#9C538F",
+  "#6870BB",
+  "#4B8593",
+  "#9BA969",
+  "#DCCE6D",
+];