From e07f2ad2d1b0940efa56f2466a861fedc0246463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AD=B1=E9=87=8E?= <hanxiufeng@xiaoye.lan>
Date: Sat, 7 Feb 2026 23:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8C=89=E9=92=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=B8=8E=E9=94=AE=E7=9B=98=E5=BC=B9=E5=87=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomPopup/CustomPopup.tsx    | 33 +++++++++++++++++--
 src/components/CustomPopup/index.module.scss  | 10 +++---
 src/components/TextareaTag/TextareaTag.tsx    |  1 +
 .../SelectStadium/StadiumDetail.tsx           | 19 +++++++----
 4 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/src/components/CustomPopup/CustomPopup.tsx b/src/components/CustomPopup/CustomPopup.tsx
index 2841d24..002c658 100644
--- a/src/components/CustomPopup/CustomPopup.tsx
+++ b/src/components/CustomPopup/CustomPopup.tsx
@@ -1,7 +1,8 @@
-import React, { useRef, useState } from 'react'
+import React, { useRef, useState, useEffect } from 'react'
 import type { CSSProperties, ReactNode } from 'react'
 import { View, Text } from '@tarojs/components'
 import { Button } from '@nutui/nutui-react-taro'
+import { useKeyboardHeight } from '@/store/keyboardStore'
 import styles from './index.module.scss'
 
 export interface CustomPopupProps {
@@ -46,6 +47,24 @@ const CustomPopup: React.FC<CustomPopupProps> = ({
   const [isDragging, setIsDragging] = useState(false)
   const touchStartY = useRef(0)
 
+  // 使用全局键盘状态
+  const { keyboardHeight, isKeyboardVisible, addListener, initializeKeyboardListener } = useKeyboardHeight()
+
+  // 使用全局键盘状态监听
+  useEffect(() => {
+    // 初始化全局键盘监听器
+    initializeKeyboardListener()
+    
+    // 添加本地监听器
+    const removeListener = addListener((height, visible) => {
+      console.log('CustomPopup 收到键盘变化:', height, visible)
+    })
+
+    return () => {
+      removeListener()
+    }
+  }, [initializeKeyboardListener, addListener])
+
   if (!visible) {
     return null
   }
@@ -99,6 +118,13 @@ const CustomPopup: React.FC<CustomPopupProps> = ({
     onClose()
   }
 
+  // 阻止弹窗内的触摸事件冒泡
+  const handleTouchMoveInPopup = (e: any) => {
+    if (!isKeyboardVisible) {
+      e.stopPropagation()
+    }
+  }
+
 
   return (
     <View
@@ -106,11 +132,12 @@ const CustomPopup: React.FC<CustomPopupProps> = ({
       style={{ zIndex: zIndex ?? undefined, alignItems: overlayAlignItems }}
       onClick={handleOverlayClick}
     >
-        <View className={styles['custom-popup-move']} catchMove></View>
+      <View className={styles['custom-popup-move']} onTouchMove={handleTouchMoveInPopup} catchMove></View>
       <View
         className={`${styles['custom-popup']} ${className ? className : ''}`}
         style={{
           ...style,
+          paddingBottom: isKeyboardVisible ? `${keyboardHeight}px` : undefined,
         }}
         onClick={(e) => {
           e.stopPropagation()
@@ -152,7 +179,7 @@ const CustomPopup: React.FC<CustomPopupProps> = ({
 
         <View className={styles['custom-popup__body']}>{children}</View>
 
-        {!hideFooter && (
+        {!hideFooter && !isKeyboardVisible && (
           <View className={styles['custom-popup__footer']}>
             <Button
               className={`${styles['custom-popup__btn']} ${styles['custom-popup__btn-cancel']}`}
diff --git a/src/components/CustomPopup/index.module.scss b/src/components/CustomPopup/index.module.scss
index 67981fa..8aa1f88 100644
--- a/src/components/CustomPopup/index.module.scss
+++ b/src/components/CustomPopup/index.module.scss
@@ -7,7 +7,7 @@
   right: 0;
   bottom: 0;
   background: rgba(0, 0, 0, 0.5);
-  z-index: 9999;
+  z-index: 999;
   display: flex;
   align-items: flex-end;
   justify-content: center;
@@ -18,20 +18,20 @@
   left: 0;
   right: 0;
   bottom: 0;
-  z-index: 9998;
+  z-index: 998;
 }
 .custom-popup {
   position: relative;
-  z-index: 9999;
+  z-index: 999;
   width: 100%;
   padding: 0;
   box-sizing: border-box;
-  max-height: 80vh;
   display: flex;
   flex-direction: column;
   background-color: theme.$page-background-color;
   border-radius: 20px 20px 0 0;
   overflow: hidden;
+  transition: padding-bottom 0.3s ease;
   .custom-popup__drag-handle-container {
     position: relative;
     height: 0;
@@ -109,6 +109,8 @@
 
   .custom-popup__body {
     flex: 1 1 auto;
+    max-height: 80vh;
+    overflow-y: auto;
   }
 
   .custom-popup__footer {
diff --git a/src/components/TextareaTag/TextareaTag.tsx b/src/components/TextareaTag/TextareaTag.tsx
index e2b475d..f73c9a6 100644
--- a/src/components/TextareaTag/TextareaTag.tsx
+++ b/src/components/TextareaTag/TextareaTag.tsx
@@ -79,6 +79,7 @@ const TextareaTag: React.FC<TextareaTagProps> = ({
             autoHeight={true}
             onFocus={onFocus}
             onBlur={onBlur}
+            adjustPosition={false}
           />
           <View className={`char-count${isOverflow ? ' char-count--error' : ''}`}>
             {value.description.length}/{maxLength}
diff --git a/src/publish_pages/publishBall/components/SelectStadium/StadiumDetail.tsx b/src/publish_pages/publishBall/components/SelectStadium/StadiumDetail.tsx
index c54efc0..f57af93 100644
--- a/src/publish_pages/publishBall/components/SelectStadium/StadiumDetail.tsx
+++ b/src/publish_pages/publishBall/components/SelectStadium/StadiumDetail.tsx
@@ -70,7 +70,7 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
   stadium,
   onAnyInput
 }, ref) => {
-  const [openPicker, setOpenPicker] = useState(false);
+  const [openPicker, setOpenPicker] = useState(false);  //为了解决上传图片时按钮样式问题
   const [scrollTop, setScrollTop] = useState(0);
   const { getDictionaryValue } = useDictionaryActions()
   const court_type = getDictionaryValue('court_type') || []
@@ -194,7 +194,7 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
    const changeTextarea = (value: boolean) => {
     if (value) {
       // 先滚动到底部
-      setScrollTop(scrollTop ? scrollTop + 15 : 9999);
+      setScrollTop(140);
       // 使用 setTimeout 确保滚动后再更新 openPicker 
     }
    }
@@ -206,18 +206,25 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
      }
    }, [isKeyboardVisible])
 
-   const changePicker = (value) => {
+   const changePicker = (value:boolean) => {
     setOpenPicker(value);
    }
 
   console.log(stadium,'stadiumstadium');
+  
+  // 计算滚动区域的最大高度
+  const scrollMaxHeight = isKeyboardVisible 
+    ? `calc(100vh - ${keyboardHeight+40}px)` 
+    : '60vh'
+  
   return (
     <View className='stadium-detail'>
       <ScrollView 
         className='stadium-detail-scroll'  
         refresherBackground="#FAFAFA"  
-        scrollY
+        scrollY={!openPicker}
         scrollTop={scrollTop}
+        style={{ maxHeight: scrollMaxHeight }}
       >
         {/* 已选球场 */}
       <View
@@ -262,11 +269,11 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
                 <TextareaTag
                   value={formData[item.prop]}
                   onChange={(value) => {
-                    changeTextarea(true)
+                    //changeTextarea(true)
                     updateFormData(item.prop, value)
                   }}
                   // onBlur={() => changeTextarea(false)}
-                  //onFocus={() => changeTextarea(true)}
+                  onFocus={() => changeTextarea(true)}
                   placeholder='有其他场地信息可备注'
                   options={(item.options || []).map((o) => ({ label: o, value: o }))}
                 />