Merge branch 'test' into feat-prac

src/components/Container.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted, onBeforeUnmount } from "vue";
+import { ref } from "vue";
 import { onShow } from "@dcloudio/uni-app";
 import AppBackground from "@/components/AppBackground.vue";
 import Header from "@/components/Header.vue";
@@ -7,7 +7,7 @@ import ScreenHint from "@/components/ScreenHint.vue";
 import BackToGame from "@/components/BackToGame.vue";
 import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
 import { capsuleHeight, debounce } from "@/util";
-import AudioManager from "@/audioManager";
+import { returnToBattle } from "@/utils/matchReturn";
 const props = defineProps({
   title: {
     type: String,
@@ -45,6 +45,10 @@ const props = defineProps({
     type: String,
     default: "",
   },
+  titleStyle: {
+    type: [String, Object, Array],
+    default: () => ({}),
+  },
   showBottom: {
     type: Boolean,
     default: true,
@@ -54,9 +58,6 @@ const isIOS = uni.getDeviceInfo().osName === "ios";
 const showHint = ref(false);
 const hintType = ref(0);
 const isLoading = ref(false);
-const audioInitProgress = ref(1);
-const audioProgress = ref(0);
-const audioTimer = ref(null);
 
 const showGlobalHint = (type) => {
   hintType.value = type;
@@ -67,49 +68,21 @@ const hideGlobalHint = () => {
   showHint.value = false;
 };
 
-const restart = () => {
-  uni.restartMiniProgram({
-    path: "/pages/index",
-  });
-};
-
-const checkAudioProgress = async () => {
-  return new Promise((resolve, reject) => {
-    try {
-      audioInitProgress.value = AudioManager.getLoadProgress();
-      if (audioInitProgress.value === 1) return resolve();
-      audioTimer.value = setInterval(() => {
-        audioProgress.value = AudioManager.getLoadProgress();
-        if (audioProgress.value === 1) {
-          setTimeout(() => {
-            audioInitProgress.value = 1;
-          }, 200);
-          clearInterval(audioTimer.value);
-          resolve();
-        }
-      }, 200);
-    } catch (err) {
-      reject(err);
-    }
-  });
-};
-
-const audioFinalProgress = computed(() => {
-  const left = 1 - audioInitProgress.value;
-  return Math.max(0, (audioProgress.value - audioInitProgress.value) / left);
-});
-
-onBeforeUnmount(() => {
-  if (audioTimer.value) clearInterval(audioTimer.value);
-});
-
 onShow(() => {
   uni.$showHint = showGlobalHint;
   uni.$hideHint = hideGlobalHint;
-  uni.$checkAudio = checkAudioProgress;
   showHint.value = false;
 });
 
+const navigateTo = (url) =>
+  new Promise((resolve, reject) => {
+    uni.navigateTo({
+      url,
+      success: resolve,
+      fail: reject,
+    });
+  });
+
 const backToGame = debounce(async () => {
   if (isLoading.value) return; // 防止重复点击
 
@@ -117,16 +90,7 @@ const backToGame = debounce(async () => {
     isLoading.value = true;
     const result = await getBattleAPI();
     if (result && result.matchId) {
-      await checkAudioProgress();
-      if (result.mode <= 3) {
-        uni.navigateTo({
-          url: `/pages/team-battle/index?battleId=${result.matchId}`,
-        });
-      } else {
-        uni.navigateTo({
-          url: `/pages/melee-battle?battleId=${result.matchId}`,
-        });
-      }
+      await returnToBattle(result, navigateTo);
     }
   } catch (error) {
     console.error("获取当前游戏失败:", error);
@@ -160,6 +124,7 @@ const goCalibration = async () => {
       :title="title"
       :onBack="onBack"
       :whiteBackArrow="whiteBackArrow"
+      :titleStyle="titleStyle"
     />
     <BackToGame v-if="showBackToGame" />
     <scroll-view
@@ -224,24 +189,6 @@ const goCalibration = async () => {
         </view>
       </view>
     </ScreenHint>
-    <view v-if="audioInitProgress < 1" class="audio-progress">
-      <image
-        src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png"
-        mode="widthFix"
-      />
-      <view>
-        <view :style="{ width: `${audioFinalProgress * 100}%` }">
-          <!-- <image
-            src="https://static.shelingxingqiu.com/attachment/2025-11-24/degu91a7si77sg9jqv.png"
-            mode="widthFix"
-          /> -->
-        </view>
-      </view>
-      <view>
-        <text>若加载时间过长，请</text>
-        <button hover-class="none" @click="restart">点击这里重启</button>
-      </view>
-    </view>
   </view>
 </template>
 
@@ -283,62 +230,4 @@ const goCalibration = async () => {
   color: #666;
   opacity: 0.6;
 }
-.audio-progress {
-  z-index: 999;
-  width: 100vw;
-  height: 100vh;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background: rgb(0 0 0 / 0.8);
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-.audio-progress > image:nth-child(1) {
-  width: 140rpx;
-  height: 150rpx;
-  margin-bottom: 20rpx;
-}
-.audio-progress > view:nth-child(2) {
-  width: 380rpx;
-  height: 6rpx;
-  background: #595959;
-  border-radius: 4rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: flex-start;
-}
-.audio-progress > view:nth-child(2) > view {
-  background: #ffe431;
-  min-height: 6rpx;
-  border-radius: 4rpx;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  transition: width 0.5s ease;
-}
-.audio-progress > view:nth-child(2) > view > image {
-  width: 46rpx;
-  height: 26rpx;
-}
-.audio-progress > view:nth-child(3) {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.audio-progress > view:nth-child(3) > text {
-  font-size: 22rpx;
-  color: #a2a2a2;
-  text-align: center;
-  line-height: 32rpx;
-}
-.audio-progress > view:nth-child(3) > button {
-  font-size: 22rpx;
-  color: #ffe431;
-  line-height: 32rpx;
-  padding: 20rpx 0;
-}
 </style>