排位赛内容完善

src/pages/battle-result.vue

@@ -31,6 +31,10 @@ onLoad(async (options) => {
     totalPoints.value = result.redTotal;
     ifWin.value = result.winner === 1;
   }
+  if (result.mode === 2) {
+    const mine = result.players.find((p) => p.playerId === user.value.id);
+    if (mine) totalPoints.value = mine.totalScore;
+  }
 });
 function exit() {
   uni.navigateBack();
@@ -151,7 +155,6 @@ onMounted(async () => {});
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  /* z-index: -1; */
 }
 .tag {
   position: absolute;
@@ -253,7 +256,7 @@ onMounted(async () => {});
   margin: 0 20px;
 }
 .players {
-  color: #fff3;
+  color: #fff6;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -284,9 +287,9 @@ onMounted(async () => {});
   width: 100%;
   top: 0;
   left: 0;
-  z-index: -1;
 }
 .player-crown {
+  position: relative;
   width: 27px;
   margin: 0 15px;
 }
@@ -299,8 +302,10 @@ onMounted(async () => {});
   margin: 0 15px;
   color: #fff;
   background-color: #676767;
+  position: relative;
 }
 .player-title {
+  position: relative;
   display: flex;
   flex-direction: column;
   margin-left: 15px;

src/pages/melee-match.vue

@@ -4,7 +4,8 @@ import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BowTarget from "@/components/BowTarget.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
-import PlayersRow from "@/components/PlayersRow.vue";
+import Guide from "@/components/Guide.vue";
+import BattleHeader from "@/components/BattleHeader.vue";
 import Timer from "@/components/Timer.vue";
 import PlayerScore from "@/components/PlayerScore.vue";
 import SButton from "@/components/SButton.vue";
@@ -114,13 +115,17 @@ onUnmounted(() => {
 <template>
   <Container title="大乱斗排位赛" :bgType="1">
     <view class="container">
+      <BattleHeader v-if="!start" :players="players" />
+      <Guide noBg v-if="!start">
+        <view :style="{ display: 'flex', justifyContent: 'space-between' }">
+          <view :style="{ display: 'flex', flexDirection: 'column' }">
+            <text :style="{ color: '#fed847' }">请预先射几箭测试</text>
+            <text>请确保射击距离只有5米</text>
+          </view>
+          <BowPower :power="45" />
+        </view>
+      </Guide>
       <ShootProgress v-if="start" :tips="tips" />
-      <!-- <PlayersRow
-        v-if="start"
-        :currentShooterId="currentShooterId"
-        :blueTeam="blueTeam"
-        :redTeam="redTeam"
-      /> -->
       <BowTarget
         :avatar="user.avatarUrl"
         :power="power"