添加设备已绑定提示

src/apis.js

@@ -34,6 +34,11 @@ function request(method, url, data = {}) {
               resolve({});
               return;
             }
+            if (message === "BIND_DEVICE") {
+              resolve({ binded: true });
+              return;
+              
+            }
             if (message === "ERROR_ORDER_UNPAY") {
               uni.showToast({
                 title: "当前有未支付订单",

src/pages/battle-room.vue

@@ -17,6 +17,7 @@ import ScreenHint from "@/components/ScreenHint.vue";
 import RoundEndTip from "@/components/RoundEndTip.vue";
 import TestDistance from "@/components/TestDistance.vue";
 import PlayerScore from "@/components/PlayerScore.vue";
+import Avatar from "@/components/Avatar.vue";
 import {
   getRoomAPI,
   destroyRoomAPI,
@@ -255,6 +256,7 @@ async function refreshRoomData() {
       });
     }
   } else if (result.battleType === 2) {
+    players.value = [];
     const ownerIndex = result.members.findIndex(
       (m) => m.userInfo.id === result.creator
     );
@@ -667,9 +669,13 @@ onHide(() => {
         :redTeam="redTeam"
         :currentShooterId="currentShooterId"
       />
+      <view v-if="battleType === 2" class="user-row">
+        <Avatar :src="user.avatar" :size="35" />
+        <BowPower :power="power" />
+      </view>
       <BowTarget
         :mode="battleType === 1 ? 'team' : 'solo'"
-        :power="start ? power : 0"
+        :power="battleType === 1 ? power : 0"
         :currentRound="scores.length"
         :totalRound="battleType === 1 ? 3 : totalRounds"
         :scores="scores"

src/pages/my-device.vue

@@ -43,9 +43,15 @@ const handleScan = () => {
 
 const confirmBind = async () => {
   if (!justBind.value && addDevice.value.id) {
-    await bindDeviceAPI(addDevice.value);
+    const result = await bindDeviceAPI(addDevice.value);
-    updateDevice(addDevice.value.id, addDevice.value.name);
     confirmBindTip.value = false;
+    if (result.binded) {
+      return uni.showToast({
+        title: "设备已绑定其他账号，请解绑后再绑定",
+        icon: "none",
+      });
+    }
+    updateDevice(addDevice.value.id, addDevice.value.name);
     justBind.value = true;
     uni.showToast({
       title: "绑定成功",
@@ -235,7 +241,7 @@ const backToHome = () => {
 .confirm-bind > view:last-child {
   display: flex;
   justify-content: space-between;
-  margin-top: 20px;
+  margin-top: 10px;
 }
 .confirm-bind > view:last-child > view {
   width: 48%;