Merge branch 'afan_local_1215' of afan/flutter_app_android into develop

lib/presentation/navigation/app_router.dart

         return MaterialPageRoute(builder: (_) => const ServicesScreen());
       
       case RouteConstants.profile:
-        return MaterialPageRoute(
-          builder: (_) => ProtectedRoute(
-            routeName: RouteConstants.profile,
-            child: const ProfileScreen(),
-          ),
-        );
+        return MaterialPageRoute(builder: (_) => const ProfileScreen());
       
       case RouteConstants.profileDetail:
         return MaterialPageRoute(

lib/presentation/navigation/bottom_nav_bar.dart

 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 import '../../core/constants/route_constants.dart';
-import '../../presentation/providers/auth_provider.dart';
 
 class BottomNavBar extends StatefulWidget {
   final int initialIndex;
   }
   
   void _onItemTapped(int index) {
-    final authProvider = Provider.of<AuthProvider>(context, listen: false);
-    
-    // 如果点击"我的"但未登录，跳转到登录页
-    if (index == 3 && !authProvider.isAuthenticated) {
-      Navigator.of(context).pushNamed(RouteConstants.login);
-      return;
-    }
     
     setState(() {
       _selectedIndex = index;
         BottomNavigationBarItem(
           icon: Icon(Icons.newspaper_outlined),
           activeIcon: Icon(Icons.newspaper),
-          label: '资讯',
+          label: '推荐',
         ),
         BottomNavigationBarItem(
           icon: Icon(Icons.work_outline),

lib/presentation/providers/auth_provider.dart

     _error = null;
     notifyListeners();
   }
+
+  void updateUser(User? user) {
+    _user = user;
+    notifyListeners();
+  }
 }

lib/presentation/providers/user_provider.dart

     _error = null;
     notifyListeners();
   }
+
+  void updateUser(User? user) {
+    _user = user;
+    notifyListeners();
+  }
 }

lib/presentation/screens/auth/login_screen.dart

 import 'package:provider/provider.dart';
 import '../../providers/auth_provider.dart';
 import '../../../core/constants/route_constants.dart';
+import '../../providers/user_provider.dart';
 import '../../widgets/common/app_button.dart';
 import '../../widgets/common/app_text_field.dart';
 import '../../widgets/common/loading_indicator.dart';
                           _passwordController.text,
                         );
                         if (authProvider.isAuthenticated) {
+                          // ✅ 同时更新 userProvider
+                          final userProvider = Provider.of<UserProvider>(context, listen: false);
+                          userProvider.updateUser(authProvider.user);
+
                           // widget.onSuccess?.call();
                           Navigator.of(context).pushReplacementNamed(RouteConstants.home);
                           // Navigator.of(context).pushNamedAndRemoveUntil(RouteConstants.home);

lib/presentation/screens/home/home_screen.dart

 import 'package:provider/provider.dart';
 import '../../navigation/bottom_nav_bar.dart';
 import '../../providers/auth_provider.dart';
-import '../../widgets/common/app_button.dart';
 
 class HomeScreen extends StatelessWidget {
   const HomeScreen({super.key});
           if (authProvider.isAuthenticated)
             IconButton(
               icon: const Icon(Icons.notifications_none),
-              onPressed: () {},
+              onPressed: () {
+                // 进入消息中心界面
+                // Navigator.of(context).pushNamed('/login');
+              },
             ),
         ],
       ),
                     children: [
                       Row(
                         children: [
-                          CircleAvatar(
-                            radius: 30,
-                            backgroundColor: Colors.blue[100],
-                            child: Icon(
-                              Icons.person,
-                              size: 30,
-                              color: Colors.blue,
-                            ),
-                          ),
-                          const SizedBox(width: 16),
                           Expanded(
                             child: Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
                                 const SizedBox(height: 4),
                                 Text(
                                   authProvider.isAuthenticated
-                                      ? '欢迎回来！'
+                                      ? '这里会展示一些有趣的东西！'
                                       : '请登录以使用完整功能',
                                   style: TextStyle(
                                     fontSize: 14,
                           ),
                         ],
                       ),
-                      const SizedBox(height: 20),
-                      if (!authProvider.isAuthenticated)
-                        AppButton(
-                          text: '立即登录',
-                          onPressed: () {
-                            Navigator.of(context).pushNamed('/login');
-                          },
-                          backgroundColor: Colors.blue,
-                          height: 45,
-                        ),
+                      const SizedBox(height: 100),
                     ],
                   ),
                 ),
                 children: [
                   _buildFeatureCard(
                     icon: Icons.newspaper,
-                    title: '资讯',
+                    title: '推荐',
                     color: Colors.green,
                     onTap: () {
                       Navigator.of(context).pushNamed('/news');

lib/presentation/screens/news/news_screen.dart

 import 'package:flutter/material.dart';
 import '../../navigation/bottom_nav_bar.dart';
+import '../../widgets/common/app_search_bar.dart';
 
 class NewsScreen extends StatelessWidget {
   const NewsScreen({super.key});
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: const Text('资讯'),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.search),
-            onPressed: () {},
-          ),
-        ],
+        title: const Text('推荐'),
       ),
-      body: ListView.builder(
-        padding: const EdgeInsets.all(16),
-        itemCount: 10,
-        itemBuilder: (context, index) {
-          return _buildNewsCard(index);
-        },
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(20),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            // 使用 StatefulWidget 搜索框
+            SearchBarCustom(
+              hintText: '搜索...',
+              onSearch: (query) {
+                // 处理搜索逻辑
+                // print('搜索: $query');
+              },
+              onChanged: (query) {
+                // 实时搜索
+                // print('输入变化: $query');
+              },
+              onClear: () {
+                // print('清除搜索');
+              },
+            ),
+            const SizedBox(height: 24),
+
+            // 推荐列表
+            ListView.builder(
+              shrinkWrap: true,
+              physics: const NeverScrollableScrollPhysics(),
+              itemCount: 10,
+              itemBuilder: (context, index) {
+                return _buildNewsCard(index);
+              },
+            ),
+          ],
+        ),
       ),
       bottomNavigationBar: const BottomNavBar(initialIndex: 1),
     );
   
   Widget _buildNewsCard(int index) {
     final titles = [
-      'Flutter 3.0 新特性详解',
-      'Dart 语言最新更新',
-      '移动开发趋势分析',
-      '前端框架对比',
-      '用户体验设计原则',
-      '后端架构最佳实践',
-      '数据库性能优化',
-      '云原生技术解析',
-      '人工智能在移动端的应用',
-      '跨平台开发方案比较',
+      '体彩 大乐透 20260001期',
+      '福彩 双色球 20260002期',
+      '福彩 双色球 20260003期',
+      '体彩 大乐透 20260004期',
+      '福彩 双色球 20260005期',
+      '福彩 双色球 20260007期',
+      '体彩 大乐透 20260006期',
+      '福彩 双色球 20260008期',
+      '福彩 双色球 20260009期',
+      '福彩 快乐八 20260010期',
     ];
     
     final subtitles = [
-      '深入了解Flutter最新版本的重要更新和改进',
-      'Dart语言的最新特性和优化方向',
-      '2024年移动开发的重要趋势和技术方向',
-      '主流前端框架的优缺点对比分析',
-      '提升应用用户体验的关键设计原则',
-      '构建高性能后端服务的最佳实践',
-      '数据库查询优化和性能调优技巧',
-      '云原生技术在微服务中的应用',
-      'AI技术在移动应用中的创新应用',
-      '各种跨平台开发方案的对比和选择',
+      '预测号码：4 5 8 6 25 8 9 6',
+      '预测号码：4 5 8 6 25 8 9 6',
+      '预测号码：4 5 8 6 25 8 9 6',
+      '预测号码：4 5 8 6 25 8 9 6',
+      '预测号码：4 5 8 6 25 8 9 6',
+      '预测号码：4 5 8 6 25 8 9 6',
+      '预测号码：4 5 8 6 25 8 9 6',
+      '预测号码：4 5 8 6 25 8 9 6',
+      '预测号码：4 5 8 6 25 8 9 6',
+      '预测号码：4 5 8 6 25 8 9 6',
     ];
     
     final times = [
-      '2小时前',
-      '5小时前',
-      '昨天',
-      '2天前',
-      '3天前',
-      '1周前',
-      '1周前',
-      '2周前',
-      '2周前',
-      '1个月前',
+      '2小时前 ：aaa',
+      '5小时前 ：aaa',
+      '昨天 ：aaa',
+      '2天前 ：aaa',
+      '3天前 ：aaa',
+      '1周前 ：aaa',
+      '1周前 ：aaa',
+      '2周前 ：aaa',
+      '2周前 ：aaa',
+      '1个月前 ：aaa',
     ];
     
     return Card(
         borderRadius: BorderRadius.circular(12),
       ),
       child: InkWell(
-        onTap: () {},
+        onTap: () {
+          print(index);
+        },
         borderRadius: BorderRadius.circular(12),
         child: Padding(
           padding: const EdgeInsets.all(16),
                     ),
                     child: Center(
                       child: Text(
-                        '新闻',
+                        '推号',
                         style: TextStyle(
                           color: Colors.white,
                           fontWeight: FontWeight.bold,
                         Text(
                           titles[index],
                           style: const TextStyle(
-                            fontSize: 16,
+                            fontSize: 18,
                             fontWeight: FontWeight.bold,
                           ),
                           maxLines: 2,
                         Text(
                           subtitles[index],
                           style: TextStyle(
-                            fontSize: 14,
+                            fontSize: 16,
                             color: Colors.grey[600],
                           ),
                           maxLines: 2,
                   ),
                 ],
               ),
-              const SizedBox(height: 12),
+              const SizedBox(height: 4),
               Row(
                 children: [
                   Icon(
                     Icons.schedule,
-                    size: 14,
+                    size: 16,
                     color: Colors.grey[500],
                   ),
                   const SizedBox(width: 4),
                   Text(
                     times[index],
                     style: TextStyle(
-                      fontSize: 12,
+                      fontSize: 14,
                       color: Colors.grey[500],
                     ),
                   ),
                       Icons.bookmark_border,
                       color: Colors.grey[500],
                     ),
-                    onPressed: () {},
+                    onPressed: () {
+                      // 添加书签
+                    },
                     iconSize: 20,
                   ),
                   IconButton(
                       Icons.share,
                       color: Colors.grey[500],
                     ),
-                    onPressed: () {},
+                    onPressed: () {
+                      // 分享
+                    },
                     iconSize: 20,
                   ),
                 ],

lib/presentation/screens/profile/profile_detail_screen.dart

 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../../../data/models/user.dart';
+import '../../providers/auth_provider.dart';
 import '../../providers/user_provider.dart';
 import '../../widgets/common/app_button.dart';
 import '../../widgets/common/app_text_field.dart';
     super.initState();
     final userProvider = Provider.of<UserProvider>(context, listen: false);
     _currentUser = userProvider.user ?? User(id: -1, email: '', username: '', createdAt: DateTime.now());
-    _nameController = TextEditingController(text: _currentUser.username);
+    _nameController = TextEditingController(text: _currentUser.fullName);
     _emailController = TextEditingController(text: _currentUser.email);
     _phoneController = TextEditingController(text: _currentUser.phone ?? '');
   }
                     
                     await userProvider.updateUserProfile(updatedUser);
                     
-                    if (userProvider.error == null) {
+                    if (userProvider.error == null && mounted) {
+                      // ✅ 同时更新 AuthProvider
+                      final authProvider = Provider.of<AuthProvider>(context, listen: false);
+                      authProvider.updateUser(userProvider.user);  // 使用接口返回的完整用户数据
+
                       ScaffoldMessenger.of(context).showSnackBar(
                         const SnackBar(
                           content: Text('个人信息已更新'),
                           duration: Duration(seconds: 2),
                         ),
                       );
+
+                      // ✅ 直接返回 - 数据已同步更新
                       Navigator.of(context).pop();
                     }
                   }

lib/presentation/screens/profile/profile_screen.dart

 import 'package:provider/provider.dart';
 import '../../../core/constants/route_constants.dart';
 import '../../providers/auth_provider.dart';
-import '../../providers/user_provider.dart';
 import '../../navigation/bottom_nav_bar.dart';
+import '../../widgets/common/app_button.dart';
 import 'profile_detail_screen.dart';
-import '../../widgets/custom/protected_widget.dart';
 
 class ProfileScreen extends StatelessWidget {
   const ProfileScreen({super.key});
 }
 
 class _ProfileContentState extends State<_ProfileContent> {
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final userProvider = Provider.of<UserProvider>(context, listen: false);
-      userProvider.loadUserProfile();
-    });
-  }
+  // @override
+  // void initState() {
+  //   super.initState();
+  //   WidgetsBinding.instance.addPostFrameCallback((_) {
+  //     final userProvider = Provider.of<UserProvider>(context, listen: false);
+  //     userProvider.loadUserProfile();
+  //   });
+  // }
 
   @override
   Widget build(BuildContext context) {
     final authProvider = Provider.of<AuthProvider>(context);
-    // final userProvider = Provider.of<UserProvider>(context);
     
     return Scaffold(
       appBar: AppBar(
       body: SingleChildScrollView(
         child: Column(
           children: [
-            // 用户信息卡片
-            Card(
-              margin: const EdgeInsets.all(16),
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(16),
-              ),
-              elevation: 2,
-              child: Padding(
-                padding: const EdgeInsets.all(20),
-                child: Column(
-                  children: [
-                    GestureDetector(
-                      onTap: () {
-                        // 点击头像
-                      },
-                      child: Stack(
+            if (!authProvider.isAuthenticated) ...[
+              // 欢迎区域
+              Card(
+                margin: const EdgeInsets.all(16),
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(16),
+                ),
+                // color: Colors.blue[50],
+                elevation: 2,
+                child: Padding(
+                  padding: const EdgeInsets.all(20),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Row(
                         children: [
                           CircleAvatar(
-                            radius: 50,
+                            radius: 30,
                             backgroundColor: Colors.blue[100],
-                            backgroundImage: authProvider.user?.avatar != null
-                                ? NetworkImage(authProvider.user!.avatar!)
-                                : null,
-                            child: authProvider.user?.avatar == null
-                                ? const Icon(
-                                    Icons.person,
-                                    size: 60,
-                                    color: Colors.blue,
-                                  )
-                                : null,
+                            child: Icon(
+                              Icons.person,
+                              size: 30,
+                              color: Colors.blue,
+                            ),
                           ),
-                          Positioned(
-                            bottom: 0,
-                            right: 0,
-                            child: Container(
-                              padding: const EdgeInsets.all(6),
-                              decoration: BoxDecoration(
-                                color: Colors.blue,
-                                borderRadius: BorderRadius.circular(20),
-                                border: Border.all(
-                                  color: Colors.white,
-                                  width: 2,
+                          const SizedBox(width: 16),
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(
+                                  authProvider.isAuthenticated
+                                      ? '您好，${authProvider.user?.fullName}'
+                                      : '您好，游客',
+                                  style: const TextStyle(
+                                    fontSize: 18,
+                                    fontWeight: FontWeight.bold,
+                                  ),
                                 ),
-                              ),
-                              child: const Icon(
-                                Icons.edit,
-                                size: 16,
-                                color: Colors.white,
-                              ),
+                                const SizedBox(height: 4),
+                                Text(
+                                  authProvider.isAuthenticated
+                                      ? '欢迎回来！'
+                                      : '请登录以使用完整功能',
+                                  style: TextStyle(
+                                    fontSize: 14,
+                                    color: Colors.grey[600],
+                                  ),
+                                ),
+                              ],
                             ),
                           ),
                         ],
                       ),
-                    ),
-                    const SizedBox(height: 16),
-                    Text(
-                      authProvider.user?.fullName ?? '用户',
-                      style: const TextStyle(
-                        fontSize: 22,
-                        fontWeight: FontWeight.bold,
+                      const SizedBox(height: 20),
+                      if (!authProvider.isAuthenticated)
+                        AppButton(
+                          text: '立即登录',
+                          onPressed: () {
+                            Navigator.of(context).pushNamed('/login');
+                          },
+                          backgroundColor: Colors.blue,
+                          height: 45,
+                        ),
+                    ],
+                  ),
+                ),
+              ),
+            ] else ...[
+              // 用户信息卡片
+              Card(
+                margin: const EdgeInsets.all(16),
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(16),
+                ),
+                // color: Colors.blue[50],
+                elevation: 2,
+                child: Padding(
+                  padding: const EdgeInsets.all(20),
+                  child: Column(
+                    children: [
+                      GestureDetector(
+                        onTap: () {
+                          // 点击头像
+                        },
+                        child: Stack(
+                          children: [
+                            CircleAvatar(
+                              radius: 50,
+                              backgroundColor: Colors.blue[100],
+                              backgroundImage: authProvider.user?.avatar != null
+                                  ? NetworkImage(authProvider.user!.avatar!)
+                                  : null,
+                              child: authProvider.user?.avatar == null
+                                  ? const Icon(
+                                      Icons.person,
+                                      size: 60,
+                                      color: Colors.blue,
+                                    )
+                                  : null,
+                            ),
+                            Positioned(
+                              bottom: 0,
+                              right: 0,
+                              child: Container(
+                                padding: const EdgeInsets.all(6),
+                                decoration: BoxDecoration(
+                                  color: Colors.blue,
+                                  borderRadius: BorderRadius.circular(20),
+                                  border: Border.all(
+                                    color: Colors.white,
+                                    width: 2,
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
                       ),
-                    ),
-                    const SizedBox(height: 8),
-                    Text(
-                      authProvider.user?.email ?? '',
-                      style: TextStyle(
-                        fontSize: 14,
-                        color: Colors.grey[600],
+                      const SizedBox(height: 16),
+                      Text(
+                        authProvider.user?.fullName ?? '用户',
+                        style: const TextStyle(
+                          fontSize: 22,
+                          fontWeight: FontWeight.bold,
+                        ),
                       ),
-                    ),
-                    if (authProvider.user?.phone != null)
-                      Padding(
-                        padding: const EdgeInsets.only(top: 4),
-                        child: Text(
-                          authProvider.user!.phone!,
-                          style: TextStyle(
-                            fontSize: 14,
-                            color: Colors.grey[600],
+                      const SizedBox(height: 8),
+                      Text(
+                        authProvider.user?.email ?? '',
+                        style: TextStyle(
+                          fontSize: 14,
+                          color: Colors.grey[600],
+                        ),
+                      ),
+                      if (authProvider.user?.phone != null)
+                        Padding(
+                          padding: const EdgeInsets.only(top: 4),
+                          child: Text(
+                            authProvider.user!.phone!,
+                            style: TextStyle(
+                              fontSize: 14,
+                              color: Colors.grey[600],
+                            ),
                           ),
                         ),
+                      const SizedBox(height: 16),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          _buildStatItem('关注', '0'),
+                          _buildVerticalDivider(),
+                          _buildStatItem('粉丝', '0'),
+                          _buildVerticalDivider(),
+                          _buildStatItem('积分', '0'),
+                        ],
                       ),
-                    const SizedBox(height: 16),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        _buildStatItem('关注', '128'),
-                        _buildVerticalDivider(),
-                        _buildStatItem('粉丝', '256'),
-                        _buildVerticalDivider(),
-                        _buildStatItem('积分', '1024'),
-                      ],
-                    ),
-                  ],
+                    ],
+                  ),
                 ),
               ),
-            ),
-            
+            ],
             // 菜单项
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16),
               child: Column(
                 children: [
-                  _buildMenuCard(
-                    title: '账户设置',
-                    items: [
-                      _buildMenuItem(
-                        icon: Icons.person_outline,
-                        title: '个人信息',
-                        subtitle: '查看和编辑个人信息',
-                        onTap: () {
-                          Navigator.of(context).push(
-                            MaterialPageRoute(
-                              builder: (_) => const ProfileDetailScreen(),
-                            ),
-                          );
-                        },
-                      ),
-                      _buildMenuItem(
-                        icon: Icons.lock_outline,
-                        title: '账号安全',
-                        subtitle: '修改密码和安全设置',
-                        onTap: () {},
-                      ),
-                      _buildMenuItem(
-                        icon: Icons.notifications_none,
-                        title: '消息通知',
-                        subtitle: '管理通知偏好设置',
-                        onTap: () {},
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 16),
-                  _buildMenuCard(
-                    title: '我的内容',
-                    items: [
-                      _buildMenuItem(
-                        icon: Icons.bookmark_border,
-                        title: '我的收藏',
-                        subtitle: '查看收藏的内容',
-                        onTap: () {},
-                      ),
-                      _buildMenuItem(
-                        icon: Icons.history,
-                        title: '浏览历史',
-                        subtitle: '查看最近浏览记录',
-                        onTap: () {},
-                      ),
-                      _buildMenuItem(
-                        icon: Icons.download,
-                        title: '我的下载',
-                        subtitle: '管理下载的文件',
-                        onTap: () {},
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 16),
+                  if (authProvider.isAuthenticated) ... [
+                    _buildMenuCard(
+                      title: '账户设置',
+                      items: [
+                        _buildMenuItem(
+                          icon: Icons.person_outline,
+                          title: '个人信息',
+                          subtitle: '查看和编辑个人信息',
+                          onTap: () {
+                            Navigator.of(context).push(
+                              MaterialPageRoute(
+                                builder: (_) => const ProfileDetailScreen(),
+                              ),
+                            );
+                          },
+                        ),
+                        _buildMenuItem(
+                          icon: Icons.lock_outline,
+                          title: '账号安全',
+                          subtitle: '修改密码和安全设置',
+                          onTap: () {},
+                        ),
+                        _buildMenuItem(
+                          icon: Icons.notifications_none,
+                          title: '消息通知',
+                          subtitle: '管理通知偏好设置',
+                          onTap: () {},
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 16),
+                    _buildMenuCard(
+                      title: '我的内容',
+                      items: [
+                        _buildMenuItem(
+                          icon: Icons.bookmark_border,
+                          title: '我的收藏',
+                          subtitle: '查看收藏的内容',
+                          onTap: () {},
+                        ),
+                        _buildMenuItem(
+                          icon: Icons.history,
+                          title: '浏览历史',
+                          subtitle: '查看最近浏览记录',
+                          onTap: () {},
+                        ),
+                        _buildMenuItem(
+                          icon: Icons.download,
+                          title: '我的下载',
+                          subtitle: '管理下载的文件',
+                          onTap: () {},
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 16),
+                  ],
                   _buildMenuCard(
                     title: '其他',
                     items: [
                         subtitle: '了解应用信息',
                         onTap: () {},
                       ),
-                      _buildMenuItem(
-                        icon: Icons.logout,
-                        title: '退出登录',
-                        subtitle: '安全退出当前账号',
-                        onTap: () async {
-                          // 防止重复点击
-                          if (authProvider.isLoading) return;
+                      if (authProvider.isAuthenticated) ... [
+                        _buildMenuItem(
+                          icon: Icons.logout,
+                          title: '退出登录',
+                          subtitle: '安全退出当前账号',
+                          onTap: () async {
+                            // 防止重复点击
+                            if (authProvider.isLoading) return;
 
-                          final shouldLogout = await showDialog<bool>(
-                            context: context,
-                            builder: (context) {
-                              final isIOS = Theme.of(context).platform == TargetPlatform.iOS;
-                              
-                              if (isIOS) {
-                                // iOS风格：确定在右边，取消在左边
-                                return AlertDialog(
-                                  title: const Text('确认退出'),
-                                  content: const Text('确定要退出登录吗？'),
-                                  actionsAlignment: MainAxisAlignment.spaceBetween,
-                                  actions: [
-                                    TextButton(
-                                      onPressed: () => Navigator.of(context).pop(true),
-                                      child: const Text('确定'),
-                                    ),
-                                    TextButton(
-                                      onPressed: () => Navigator.of(context).pop(false),
-                                      child: const Text('取消'),
-                                    ),
-                                  ],
-                                );
-                              } else {
-                                // Android/Material风格：取消在左边，确定在右边
-                                return AlertDialog(
-                                  title: const Text('确认退出'),
-                                  content: const Text('确定要退出登录吗？'),
-                                  actionsAlignment: MainAxisAlignment.spaceBetween,
-                                  actions: [
-                                    TextButton(
-                                      onPressed: () => Navigator.of(context).pop(false),
-                                      child: const Text('取消'),
-                                    ),
-                                    TextButton(
-                                      onPressed: () => Navigator.of(context).pop(true),
-                                      child: const Text('确定'),
-                                    ),
-                                  ],
-                                );
-                              }
-                            },
-                          );
-                          
-                          if (shouldLogout == true) {
-                            await authProvider.logout();
+                            final shouldLogout = await showDialog<bool>(
+                              context: context,
+                              builder: (context) {
+                                final isIOS = Theme.of(context).platform == TargetPlatform.iOS;
+                                
+                                if (isIOS) {
+                                  // iOS风格：确定在右边，取消在左边
+                                  return AlertDialog(
+                                    title: const Text('确认退出'),
+                                    content: const Text('确定要退出登录吗？'),
+                                    actionsAlignment: MainAxisAlignment.spaceBetween,
+                                    actions: [
+                                      TextButton(
+                                        onPressed: () => Navigator.of(context).pop(true),
+                                        child: const Text('确定'),
+                                      ),
+                                      TextButton(
+                                        onPressed: () => Navigator.of(context).pop(false),
+                                        child: const Text('取消'),
+                                      ),
+                                    ],
+                                  );
+                                } else {
+                                  // Android/Material风格：取消在左边，确定在右边
+                                  return AlertDialog(
+                                    title: const Text('确认退出'),
+                                    content: const Text('确定要退出登录吗？'),
+                                    actionsAlignment: MainAxisAlignment.spaceBetween,
+                                    actions: [
+                                      TextButton(
+                                        onPressed: () => Navigator.of(context).pop(false),
+                                        child: const Text('取消'),
+                                      ),
+                                      TextButton(
+                                        onPressed: () => Navigator.of(context).pop(true),
+                                        child: const Text('确定'),
+                                      ),
+                                    ],
+                                  );
+                                }
+                              },
+                            );
+                            
+                            if (shouldLogout == true) {
+                              await authProvider.logout();
 
-                            // 登出后，确保在组件仍然存在时进行导航
-                            if (mounted) {
-                              // 使用pushReplacementNamed清空导航栈
-                              Navigator.of(context).pushReplacementNamed(RouteConstants.home);
+                              // 登出后，确保在组件仍然存在时进行导航
+                              if (mounted) {
+                                // 使用pushReplacementNamed清空导航栈
+                                Navigator.of(context).pushReplacementNamed(RouteConstants.home);
+                              }
                             }
-                          }
-                        },
-                      ),
+                          },
+                        ),
+                      ],
                     ],
                   ),
                   const SizedBox(height: 20),
-                  
                   // 版本信息
                   Padding(
                     padding: const EdgeInsets.symmetric(vertical: 20),

lib/presentation/screens/services/services_screen.dart

         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            // 搜索框
-            Container(
-              decoration: BoxDecoration(
-                color: Colors.grey[100],
-                borderRadius: BorderRadius.circular(25),
-              ),
-              child: TextField(
-                decoration: InputDecoration(
-                  hintText: '搜索服务...',
-                  border: InputBorder.none,
-                  prefixIcon: const Icon(Icons.search),
-                  contentPadding: const EdgeInsets.symmetric(
-                    vertical: 15,
-                    horizontal: 20,
-                  ),
-                ),
-              ),
-            ),
-            const SizedBox(height: 30),
-            
             // 服务分类
             const Text(
               '服务分类',

lib/presentation/widgets/common/app_search_bar.dart

+// 独立的搜索框组件
+import 'package:flutter/material.dart';
+
+class SearchBarCustom extends StatefulWidget {
+  final ValueChanged<String>? onSearch;
+  final ValueChanged<String>? onChanged;
+  final VoidCallback? onClear;
+  final String hintText;
+  
+  const SearchBarCustom({
+    super.key,
+    this.onSearch,
+    this.onChanged,
+    this.onClear,
+    this.hintText = '搜索...',
+  });
+  
+  @override
+  State<SearchBarCustom> createState() => _SearchBarCustomState();
+}
+
+class _SearchBarCustomState extends State<SearchBarCustom> {
+  final TextEditingController _controller = TextEditingController();
+  final FocusNode _focusNode = FocusNode();
+  
+  @override
+  void dispose() {
+    _controller.dispose();
+    _focusNode.dispose();
+    super.dispose();
+  }
+  
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: Colors.grey[100],
+        borderRadius: BorderRadius.circular(15),
+      ),
+      child: TextField(
+        controller: _controller,
+        focusNode: _focusNode,
+        decoration: InputDecoration(
+          hintText: widget.hintText,
+          border: InputBorder.none,
+          prefixIcon: const Icon(Icons.search),
+          suffixIcon: _controller.text.isNotEmpty
+              ? IconButton(
+                  icon: const Icon(Icons.clear),
+                  onPressed: () {
+                    _controller.clear();
+                    widget.onClear?.call();
+                  },
+                )
+              : null,
+          contentPadding: const EdgeInsets.symmetric(
+            vertical: 15,
+            horizontal: 20,
+          ),
+        ),
+        onChanged: (value) {
+          setState(() {}); // 更新清除按钮显示
+          widget.onChanged?.call(value);
+        },
+        onSubmitted: (value) {
+          widget.onSearch?.call(value);
+          _focusNode.unfocus();
+        },
+      ),
+    );
+  }
+}