From df6f1a54d658c536fc8d511542c76937d792a03b Mon Sep 17 00:00:00 2001
From: wangxiaogang <1433729587@qq.com>
Date: Tue, 9 Jun 2026 09:10:36 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20Numpad=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20fixed=20prop=20=E2=80=94=20=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=86=85=E5=B5=8C=20/=20=E9=A1=B5=E9=9D=A2=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E4=B8=A4=E7=A7=8D=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/Numpad/Numpad.vue | 21 ++++++++++++++++-----
 client/src/pages/recurring/index.vue    | 13 ++-----------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/client/src/components/Numpad/Numpad.vue b/client/src/components/Numpad/Numpad.vue
index 1b820ab..9503ef5 100644
--- a/client/src/components/Numpad/Numpad.vue
+++ b/client/src/components/Numpad/Numpad.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="numpad">
+  <view class="numpad" :class="{ 'numpad-fixed': fixed }">
     <view class="key" v-for="key in keys" :key="key" @tap="onKeyTap(key)">
       <text class="key-text">{{ key }}</text>
     </view>
@@ -24,9 +24,12 @@ const props = withDefaults(defineProps<{
   modelValue?: string
   /** 最大金额（元） */
   max?: number
+  /** 是否固定在底部（弹窗中使用时设为 false） */
+  fixed?: boolean
 }>(), {
   modelValue: '',
-  max: 9999999.99
+  max: 9999999.99,
+  fixed: true
 })
 
 const emit = defineEmits<{
@@ -96,9 +99,17 @@ function onConfirm() {
   display: grid;
   grid-template-columns: repeat(4, 1fr);
   gap: $space-sm;
-  padding: 0 $space-xl;
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
+  padding: $space-sm $space-xl;
+
+  &.numpad-fixed {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: $surface;
+    padding-bottom: env(safe-area-inset-bottom);
+    z-index: 100;
+  }
 }
 
 .key {
diff --git a/client/src/pages/recurring/index.vue b/client/src/pages/recurring/index.vue
index 7a11467..656390f 100644
--- a/client/src/pages/recurring/index.vue
+++ b/client/src/pages/recurring/index.vue
@@ -135,10 +135,8 @@
             </picker>
           </view>
 
-          <!-- 数字键盘 -->
-          <view class="form-numpad-wrap">
-            <Numpad v-model="amountStr" />
-          </view>
+          <!-- 数字键盘（内嵌模式，不固定在底部） -->
+          <Numpad v-model="amountStr" :fixed="false" />
         </scroll-view>
         <view class="modal-footer" @tap="handleSubmit">
           <text class="submit-text">{{ editingId ? '保存修改' : '添加' }}</text>
@@ -501,11 +499,4 @@ function goBack() { uni.navigateBack() }
   &:active { opacity: 0.8; }
 }
 
-/* Numpad 内嵌在表单中 */
-.form-numpad-wrap {
-  margin-top: $space-sm;
-  background: $bg;
-  border-radius: $radius-lg;
-  overflow: hidden;
-}
 </style>