From 42a7d4960377516fcd6231b3c21d2ba7a9574c1b Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Wed, 5 Nov 2025 14:27:58 +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/components/BowTarget.vue          |  2 +-
 src/components/BowTargetEdit.vue      | 26 ++++++++++++++++----------
 src/pages/point-book-detail-share.vue |  1 -
 src/pages/point-book-detail.vue       |  1 -
 src/pages/team-battle.vue             |  1 -
 src/websocket.js                      |  2 +-
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue
index 9765676..c712db8 100644
--- a/src/components/BowTarget.vue
+++ b/src/components/BowTarget.vue
@@ -107,7 +107,7 @@ onMounted(() => {
 
 <template>
   <view class="container">
-    <view class="header" v-if="totalRound > 0 || power">
+    <view class="header" v-if="totalRound > 0">
       <text v-if="totalRound > 0" class="round-count">{{
         (currentRound > totalRound ? totalRound : currentRound) +
         "/" +
diff --git a/src/components/BowTargetEdit.vue b/src/components/BowTargetEdit.vue
index 7e4d881..13e0aa9 100644
--- a/src/components/BowTargetEdit.vue
+++ b/src/components/BowTargetEdit.vue
@@ -19,10 +19,6 @@ const props = defineProps({
     type: Function,
     default: null,
   },
-  editMode: {
-    type: Boolean,
-    default: true,
-  },
 });
 
 const rect = ref({});
@@ -31,6 +27,7 @@ const isDragging = ref(false);
 const dragStartPos = ref({ x: 0, y: 0 });
 const capsuleHeight = ref(0);
 const scale = ref(1);
+const scrollTop = ref(0);
 let lastMoveTime = 0;
 
 // 点击靶纸创建新的点
@@ -43,7 +40,14 @@ const onClick = async (e) => {
     return;
   }
   if (props.id === 7 || props.id === 9) {
+    // 放大并通过滚动将点击位置置于视窗中心
     scale.value = 1.5;
+    const viewportH = rect.value.width; // 容器高度等于宽度（100vw）
+    const contentH = scale.value * rect.value.width; // 内容高度
+    const clickYInContainer = e.detail.y - rect.value.top;
+    let target = clickYInContainer * scale.value - viewportH / 2;
+    target = Math.max(0, Math.min(contentH - viewportH, target));
+    scrollTop.value = Math.round(target);
   }
   const newArrow = {
     x: (e.detail.x - 6) * scale.value,
@@ -75,12 +79,14 @@ const confirmAdd = () => {
   }
   arrow.value = null;
   scale.value = 1;
+  scrollTop.value = 0;
 };
 
 // 删除箭矢
 const deleteArrow = () => {
   arrow.value = null;
   scale.value = 1;
+  scrollTop.value = 0;
 };
 
 // 开始拖拽 - 同样修复坐标获取
@@ -156,8 +162,10 @@ onMounted(async () => {
 </script>
 
 <template>
-  <view
-    :style="{ overflowY: editMode ? 'auto' : 'hidden' }"
+  <scroll-view
+    scroll-y
+    scroll-with-animation
+    :scroll-top="scrollTop"
     class="container"
     @tap="onClick"
     @touchmove="onDrag"
@@ -168,9 +176,7 @@ onMounted(async () => {
       :style="{
         width: scale * 100 + 'vw',
         height: scale * 100 + 'vw',
-        transform: `translate(${(100 - scale * 100) / 2}vw,${
-          (100 - scale * 100) / 2
-        }vw) translateY(${scale > 1 ? 16.7 : 0}%)`,
+        transform: `translateX(${(100 - scale * 100) / 2}vw)`,
       }"
     >
       <image :src="src" mode="widthFix" />
@@ -228,7 +234,7 @@ onMounted(async () => {
         </view>
       </movable-view>
     </movable-area>
-  </view>
+  </scroll-view>
 </template>
 
 <style scoped>
diff --git a/src/pages/point-book-detail-share.vue b/src/pages/point-book-detail-share.vue
index 186577e..cf2fa60 100644
--- a/src/pages/point-book-detail-share.vue
+++ b/src/pages/point-book-detail-share.vue
@@ -175,7 +175,6 @@ const targetTypeName = computed(() => {
         :id="targetId"
         :src="targetSrc"
         :arrows="arrows.filter((item) => item.x && item.y)"
-        :editMode="false"
       />
     </view>
     <view :style="{ transform: 'translateY(-60rpx)' }">
diff --git a/src/pages/point-book-detail.vue b/src/pages/point-book-detail.vue
index 10e5590..fcd3c3b 100644
--- a/src/pages/point-book-detail.vue
+++ b/src/pages/point-book-detail.vue
@@ -230,7 +230,6 @@ onShareTimeline(async () => {
           :id="targetId"
           :src="targetSrc"
           :arrows="arrows.filter((item) => item.x && item.y)"
-          :editMode="false"
         />
       </view>
       <view :style="{ transform: 'translateY(-60rpx)' }">
diff --git a/src/pages/team-battle.vue b/src/pages/team-battle.vue
index 7593814..b6d6932 100644
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -29,7 +29,6 @@ const goldenRound = ref(0);
 const currentRedPoint = ref(0);
 const currentBluePoint = ref(0);
 const totalRounds = ref(0);
-const power = ref(0);
 const scores = ref([]);
 const blueScores = ref([]);
 const redTeam = ref([]);
diff --git a/src/websocket.js b/src/websocket.js
index 43fd878..315796e 100644
--- a/src/websocket.js
+++ b/src/websocket.js
@@ -63,7 +63,7 @@ function createWebSocket(token, onMessage) {
       }
       const { battleInfo } = msg;
       uni.setStorageSync("current-battle", battleInfo);
-      console.log("----battleInfo", battleInfo);
+      // console.log("----battleInfo", battleInfo);
       if (battleInfo.config.mode === 1) {
         uni.navigateTo({
           url: `/pages/team-battle?battleId=${battleInfo.id}&gameMode=${battleInfo.config.battleMode}`,