From d20e84f66c95edba379ff6f9206d1b71af998dc4 Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Thu, 7 Aug 2025 18:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=B6=E5=AD=90=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BowTargetEdit.vue | 107 +++++++++++++++++++++----------
 src/pages/point-book-edit.vue    |   2 +
 src/util.js                      |  11 +++-
 3 files changed, 82 insertions(+), 38 deletions(-)

diff --git a/src/components/BowTargetEdit.vue b/src/components/BowTargetEdit.vue
index 099c422..c7f93c8 100644
--- a/src/components/BowTargetEdit.vue
+++ b/src/components/BowTargetEdit.vue
@@ -25,16 +25,23 @@ const rect = ref({});
 const arrow = ref(null);
 const isDragging = ref(false);
 const dragStartPos = ref({ x: 0, y: 0 });
+const capsuleHeight = ref(0);
 
 // 点击靶纸创建新的点
 const onClick = async (e) => {
   if (arrow.value !== null || !props.onChange) return;
   const newArrow = {
-    x: e.detail.x - (rect.value.width * 0.1) / 2,
-    y: e.detail.y - rect.value.top - 10,
+    x: e.detail.x,
+    y: e.detail.y - rect.value.top - capsuleHeight.value,
   };
-  const side = rect.value.width * 0.9;
-  newArrow.ring = calcRing(props.id, newArrow.x, newArrow.y, side, side);
+  const side = rect.value.width;
+  newArrow.ring = calcRing(
+    props.id,
+    newArrow.x - rect.value.width * 0.05,
+    newArrow.y - 10,
+    rect.value.width * 0.9,
+    rect.value.width * 0.9
+  );
   arrow.value = {
     ...newArrow,
     x: newArrow.x / side,
@@ -75,17 +82,17 @@ const onDrag = async (e) => {
   const deltaX = clientX - dragStartPos.value.x;
   const deltaY = clientY - dragStartPos.value.y;
 
-  const side = rect.value.width * 0.9;
+  const side = rect.value.width;
 
   // 更新坐标
   arrow.value.x = Math.max(0, Math.min(side, arrow.value.x * side + deltaX));
   arrow.value.y = Math.max(0, Math.min(side, arrow.value.y * side + deltaY));
   arrow.value.ring = calcRing(
     props.id,
-    arrow.value.x,
-    arrow.value.y,
-    side,
-    side
+    arrow.value.x - rect.value.width * 0.05,
+    arrow.value.y - 10,
+    rect.value.width * 0.9,
+    rect.value.width * 0.9
   );
   arrow.value.x = arrow.value.x / side;
   arrow.value.y = arrow.value.y / side;
@@ -99,21 +106,45 @@ const endDrag = () => {
   isDragging.value = false;
 };
 
+const scale = ref(1);
+const onScale = (e) => {
+  scale.value = e.detail.scale; // 返回 1 ~ 2
+};
+
+const onMove = (e) => {
+  console.log(e);
+};
+
 onMounted(async () => {
-  const result = await getElementRect();
+  const menuBtnInfo = uni.getMenuButtonBoundingClientRect();
+  capsuleHeight.value = menuBtnInfo.top - 9;
+  const result = await getElementRect(".container");
   rect.value = result;
 });
 </script>
 
 <template>
-  <movable-area class="move-container">
-    <view
-      class="container"
-      @click="onClick"
-      @touchmove="onDrag"
-      @touchend="endDrag"
-    >
-      <image :src="src" mode="widthFix" />
+  <view
+    class="container"
+    @click="onClick"
+    @touchmove="onDrag"
+    @touchend="endDrag"
+  >
+    <movable-area class="move-area" scale-area>
+      <movable-view
+        class="move-view"
+        direction="all"
+        scale
+        :scale-min="1"
+        :scale-max="3"
+        :scale-value="scale"
+        :animation="false"
+        @scale="onScale"
+        @change="onMove"
+        :out-of-bounds="true"
+      >
+        <image :src="src" mode="widthFix" />
+      </movable-view>
       <view
         v-for="(arrow, index) in arrows"
         :key="index"
@@ -134,8 +165,8 @@ onMounted(async () => {
         class="arrow-point"
         direction="all"
         :animation="false"
-        :x="rect.width * 0.9 * arrow.x"
-        :y="rect.width * 0.9 * arrow.y"
+        :x="rect.width * arrow.x"
+        :y="rect.width * arrow.y"
       >
         <!-- 箭矢点 -->
         <view class="point"> </view>
@@ -169,25 +200,32 @@ onMounted(async () => {
           </view>
         </view>
       </movable-view>
-    </view>
-  </movable-area>
+    </movable-area>
+  </view>
 </template>
 
 <style scoped>
-.move-container {
-  width: 90vw;
-  height: 90vw;
-  margin: 10px auto;
-}
 .container {
-  width: 100%;
-  position: relative;
-  user-select: none;
+  width: 100vw;
+  height: 100vw;
+  overflow: hidden;
 }
 
-.container > image {
+.move-area {
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+
+.move-view {
+  width: 90vw;
+  height: 90vw;
+  margin: 10px 5vw;
+  position: relative;
+}
+
+.move-view > image {
   width: 100%;
-  display: block;
 }
 
 .arrow-point {
@@ -200,7 +238,6 @@ onMounted(async () => {
   height: 12px;
   border-radius: 50%;
   border: 1px solid #fff;
-  z-index: 1;
   color: #fff;
   font-size: 8px;
   text-align: center;
@@ -218,8 +255,8 @@ onMounted(async () => {
 
 .edit-buttons {
   position: absolute;
-  top: calc(50% - 44px);
-  left: calc(50% - 44px);
+  top: calc(50% - 50px);
+  left: calc(50% - 50px);
   background: #18ff6899;
   width: 88px;
   height: 88px;
diff --git a/src/pages/point-book-edit.vue b/src/pages/point-book-edit.vue
index 2e9bd29..aedda0a 100644
--- a/src/pages/point-book-edit.vue
+++ b/src/pages/point-book-edit.vue
@@ -195,6 +195,7 @@ onMounted(() => {
   display: grid;
   column-gap: 1vw;
   grid-template-columns: repeat(6, 1fr);
+  position: relative;
 }
 .bow-arrows > view,
 .bow-rings > view {
@@ -252,6 +253,7 @@ onMounted(() => {
   justify-content: space-between;
   font-size: 13px;
   margin: 0 15px;
+  position: relative;
 }
 .title-bar > view:first-child {
   display: flex;
diff --git a/src/util.js b/src/util.js
index 2e2b7bc..67b8c9c 100644
--- a/src/util.js
+++ b/src/util.js
@@ -288,11 +288,11 @@ export const isGameEnded = async (battleId) => {
 };
 
 // 获取元素尺寸和位置信息
-export const getElementRect = () => {
+export const getElementRect = (classname) => {
   return new Promise((resolve) => {
     const query = uni.createSelectorQuery();
     query
-      .select(".container")
+      .select(classname)
       .boundingClientRect((rect) => {
         resolve(rect);
       })
@@ -409,7 +409,12 @@ export const calcPinBowTarget = (
     y / targetWidth >= 0.032 &&
     y / targetHeight <= 0.51
   ) {
-    return calcHalfBowTarget(x - targetWidth * 0.26, y - targetHeight * 0.032, side, noX);
+    return calcHalfBowTarget(
+      x - targetWidth * 0.26,
+      y - targetHeight * 0.032,
+      side,
+      noX
+    );
   } else if (x / targetHeight <= 0.48 && y / targetHeight >= 0.482) {
     return calcHalfBowTarget(x, y - targetHeight * 0.482, side, noX);
   } else if (x / targetHeight >= 0.52 && y / targetHeight >= 0.482) {