From f185fd1756c8aa995ab0b6ac2c7fd3b5dec4bffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AD=90=E8=B4=A4?= <wzx1398745498@gmail.com>
Date: Mon, 24 Nov 2025 15:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=84=A6=E7=82=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/mine/user_info_page.dart | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/pages/mine/user_info_page.dart b/lib/pages/mine/user_info_page.dart
index cbb7903..ae65153 100644
--- a/lib/pages/mine/user_info_page.dart
+++ b/lib/pages/mine/user_info_page.dart
@@ -2,6 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:dating_touchme_app/generated/assets.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:dating_touchme_app/controller/mine/user_info_controller.dart';
@@ -73,10 +74,10 @@ class UserInfoPage extends StatelessWidget {
   }
 
   // 显示学历选择弹框
-  void _showEducationPicker(UserInfoController controller) {
+  Future _showEducationPicker(UserInfoController controller) async {
     final List<String> educationOptions = ['大专以下', '大专', '本科', '硕士及以上'];
     
-    showModalBottomSheet(
+    await showModalBottomSheet(
       context: Get.context!,
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.only(
@@ -163,7 +164,7 @@ class UserInfoPage extends StatelessWidget {
   }
 
   // 显示日期选择器
-  void _showDatePicker(UserInfoController controller) {
+  Future _showDatePicker(UserInfoController controller) async {
     // 计算最小和最大日期
     final now = DateTime.now();
     final maxDate = DateTime(now.year - 18); // 最小18岁
@@ -192,7 +193,7 @@ class UserInfoPage extends StatelessWidget {
     // 临时存储选择的日期
     DateTime? selectedDate = initialDate;
     
-    showCupertinoModalPopup(
+    await showCupertinoModalPopup(
       context: Get.context!,
       builder: (BuildContext context) {
         return Container(
@@ -249,6 +250,7 @@ class UserInfoPage extends StatelessWidget {
     );
   }
 
+  final FocusNode _blankFocusNode = FocusNode();
   @override
   Widget build(BuildContext context) {
     return GetX<UserInfoController>(
@@ -455,9 +457,10 @@ class UserInfoPage extends StatelessWidget {
                       ),
                       const SizedBox(height: 10),
                       GestureDetector(
-                        onTap: () {
+                        onTap: () async {
+                          FocusScope.of(context).requestFocus(_blankFocusNode);
                           // 显示Cupertino日期选择器
-                          _showDatePicker(controller);
+                          await _showDatePicker(controller);
                         },
                         child: Container(
                           padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
@@ -499,9 +502,10 @@ class UserInfoPage extends StatelessWidget {
                       ),
                       const SizedBox(height: 10),
                       GestureDetector(
-                        onTap: () {
+                        onTap: () async {
+                          FocusScope.of(context).requestFocus(_blankFocusNode);
                           // 显示学历选择弹框
-                          _showEducationPicker(controller);
+                          await _showEducationPicker(controller);
                         },
                         child: Container(
                           padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),