From ed716654b33c1002df1e8eefcd111eef5b33b770 Mon Sep 17 00:00:00 2001 From: MingNian <1281442923@qq.com> Date: Wed, 3 Jun 2026 14:30:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=92=8C=E5=85=A5=E5=8F=A3=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - profile 路由从 ProfileDetailPage 改为 ProfilePage - profileEdit 路由改为 ProfileDetailPage - 新增 devices 路由(DeviceManagementPage) - 设置页隐私协议/关于按钮接线 staticText - 设置页用药提醒跳转 medications - 个人中心健康档案修正为 healthArchive,新增设备管理入口 --- health_app/lib/core/app_router.dart | 7 +++++-- health_app/lib/pages/profile/profile_page.dart | 3 ++- health_app/lib/pages/settings/settings_pages.dart | 12 ++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/health_app/lib/core/app_router.dart b/health_app/lib/core/app_router.dart index f8c4f80..9ac36aa 100644 --- a/health_app/lib/core/app_router.dart +++ b/health_app/lib/core/app_router.dart @@ -10,6 +10,7 @@ import '../pages/report/ai_analysis_page.dart'; import '../pages/consultation/consultation_pages.dart'; import '../pages/settings/settings_pages.dart'; import '../pages/settings/notification_prefs_page.dart'; +import '../pages/profile/profile_page.dart'; import '../pages/profile/profile_detail_page.dart'; import '../pages/diet/diet_capture_page.dart'; import '../pages/remaining_pages.dart'; @@ -49,9 +50,11 @@ Widget buildPage(RouteInfo route) { case 'dietCapture': return const DietCapturePage(); case 'profile': - return const ProfileDetailPage(); + return const ProfilePage(); case 'profileEdit': - return const EditProfilePage(); + return const ProfileDetailPage(); + case 'devices': + return const DeviceManagementPage(); case 'healthArchive': return const HealthArchivePage(); case 'followups': diff --git a/health_app/lib/pages/profile/profile_page.dart b/health_app/lib/pages/profile/profile_page.dart index 789c392..fb022bb 100644 --- a/health_app/lib/pages/profile/profile_page.dart +++ b/health_app/lib/pages/profile/profile_page.dart @@ -34,7 +34,8 @@ class ProfilePage extends ConsumerWidget { ]), ])), const SizedBox(height: 12), - _MenuItem(icon: Icons.folder_shared, title: '健康档案', onTap: () => pushRoute(ref, 'profile')), + _MenuItem(icon: Icons.folder_shared, title: '健康档案', onTap: () => pushRoute(ref, 'healthArchive')), + _MenuItem(icon: Icons.devices, title: '设备管理', onTap: () => pushRoute(ref, 'devices')), _MenuItem(icon: Icons.favorite_border, title: '就诊收藏', trailing: '3'), _MenuItem(icon: Icons.devices, title: '设备管理'), _MenuItem(icon: Icons.people_outline, title: '家人关怀'), diff --git a/health_app/lib/pages/settings/settings_pages.dart b/health_app/lib/pages/settings/settings_pages.dart index 5e2cb0d..be9ff37 100644 --- a/health_app/lib/pages/settings/settings_pages.dart +++ b/health_app/lib/pages/settings/settings_pages.dart @@ -13,12 +13,12 @@ class SettingsPage extends ConsumerWidget { Container(width: double.infinity, padding: const EdgeInsets.all(24), decoration: const BoxDecoration(color: Colors.white, borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24))), child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [Text('9:41', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.grey[800])), Row(children: [Icon(Icons.wifi, size: 18, color: Colors.grey[700]), const SizedBox(width: 4), Icon(Icons.battery_full, size: 18, color: Colors.grey[700])]),])), const SizedBox(height: 12), _SetItem(icon: Icons.notifications_outlined, title: '消息通知', onTap: () => pushRoute(ref, 'notificationPrefs')), - _SetItem(icon: Icons.medication_outlined, title: '用药提醒', subtitle: 'mmHg / mmol/L'), - _SetItem(icon: Icons.data_usage_outlined, title: '数据导出'), - _SetItem(icon: Icons.text_fields_outlined, title: '字体大小', trailingText: 'v1.0.0'), - _SetItem(icon: Icons.cleaning_services_outlined, title: '清除缓存', subtitle: '73.2 MB'), - _SetItem(icon: Icons.info_outline, title: '关于健康管家'), - _SetItem(icon: Icons.shield_outlined, title: '隐私协议'), + _SetItem(icon: Icons.medication_outlined, title: '用药提醒', subtitle: 'mmHg / mmol/L', onTap: () => pushRoute(ref, 'medications')), + _SetItem(icon: Icons.data_usage_outlined, title: '数据导出', onTap: () {}), + _SetItem(icon: Icons.text_fields_outlined, title: '字体大小', trailingText: 'v1.0.0', onTap: () {}), + _SetItem(icon: Icons.cleaning_services_outlined, title: '清除缓存', subtitle: '73.2 MB', onTap: () {}), + _SetItem(icon: Icons.info_outline, title: '关于健康管家', onTap: () => pushRoute(ref, 'staticText', params: {'type': 'about'})), + _SetItem(icon: Icons.shield_outlined, title: '隐私协议', onTap: () => pushRoute(ref, 'staticText', params: {'type': 'privacy'})), const SizedBox(height: 30), GestureDetector( onTap: () async {