From 4c4f324c56bec35ea9f7af30db657b4bbc7dae2f Mon Sep 17 00:00:00 2001 From: czz <862977248@qq.com> Date: Mon, 4 Aug 2025 18:11:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=20=E6=B3=A8=E9=94=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/mh_page/MhMessageList.dart | 50 ++++---------------------- lib/pages/mh_page/delete_account.dart | 18 ++++++++-- lib/pages/mh_page/new_settingPage.dart | 8 ++--- lib/routers/mh_routers.dart | 2 ++ 4 files changed, 27 insertions(+), 51 deletions(-) diff --git a/lib/pages/mh_page/MhMessageList.dart b/lib/pages/mh_page/MhMessageList.dart index 94b4895..0371846 100644 --- a/lib/pages/mh_page/MhMessageList.dart +++ b/lib/pages/mh_page/MhMessageList.dart @@ -23,12 +23,6 @@ class _MhMessageListWidgetState extends State { MhMessageController messageController = Get.find(); late RxMap messageInfo; - // @override - // void initState() { - // super.initState(); - // messageInfo = Map.from(widget.data).obs; // 复制成 obs - // } - @override Widget build(BuildContext context) { messageInfo = Map.from(widget.data).obs; @@ -109,33 +103,6 @@ class _MhMessageListWidgetState extends State { enableAnimation: true, // 有点击缩放动画 enableGradient: false, // 不用渐变 onTap: () async { - // if (messageInfo['status'] == 1) { - // showConfirmDialog( - // context, Container(), "是否确认接受该设备".tr, - // onConfirm: () async { - // ApiResponse apiResponse = - // await deviceShareController.confirmShare( - // messageInfo['data']['shareCode']); - // if (apiResponse.code == HttpStatusCodes.ok) { - // TopSlideNotification.show( - // context, - // text: apiResponse.msg!, - // textColor: themeController.currentColor.sc2, - // ); - // messageController.getMessageList(); - // messageController.updateAll(); - // } else { - // TopSlideNotification.show( - // context, - // text: apiResponse.msg!, - // textColor: themeController.currentColor.sc9, - // ); - // messageController.getMessageList(); - // messageController.updateAll(); - // } - // }, onCancel: () {}); - // } - await messageController.updateMessageReadStatus( context, messageInfo['type'], mid: messageInfo['_id']); @@ -187,19 +154,18 @@ class _MhMessageListWidgetState extends State { Widget _buildInfoItem(BuildContext context, String label) { return Container( - constraints: BoxConstraints( - minHeight: 60.rpx, - ), + constraints: BoxConstraints(minHeight: 60.rpx, maxHeight: 60.rpx), child: Align( alignment: AlignmentDirectional(-1, 0), child: Text( label.tr, - overflow: TextOverflow.ellipsis, - maxLines: 1, + // overflow: TextOverflow.ellipsis, + maxLines: 2, style: TextStyle( fontFamily: 'Inter', fontSize: 26.rpx, letterSpacing: 0.0, + height: 1, color: themeController.currentColor.sc4, ), ), @@ -209,15 +175,13 @@ class _MhMessageListWidgetState extends State { Widget _buildValueItem(BuildContext context, value) { return Container( - constraints: BoxConstraints( - minHeight: 60.rpx, - ), + constraints: BoxConstraints(minHeight: 60.rpx, maxHeight: 60.rpx), child: Align( alignment: AlignmentDirectional(-1, 0), child: Text( "${value}", - overflow: TextOverflow.ellipsis, - maxLines: 1, + // overflow: TextOverflow.ellipsis, + maxLines: 2, style: TextStyle( fontFamily: 'Inter', fontSize: 26.rpx, diff --git a/lib/pages/mh_page/delete_account.dart b/lib/pages/mh_page/delete_account.dart index e578c2b..1c60bc0 100644 --- a/lib/pages/mh_page/delete_account.dart +++ b/lib/pages/mh_page/delete_account.dart @@ -2,11 +2,17 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; +import 'package:get_storage/get_storage.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/color/appFontsize.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; +import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; +import 'package:vbvs_app/controller/login/login_controller.dart'; +import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; +import 'package:vbvs_app/controller/user_info_controller.dart'; +import 'package:vbvs_app/pages/common/selectDialog.dart'; class DeletedAccountPage extends GetView { BoxConstraints? bodysize; @@ -104,7 +110,7 @@ class DeletedAccountPage extends GetView { color: Color(0XFF84F5FF), ), ), - Text( + Text( "注销智慧眠花糖账号".tr, style: TextStyle( fontSize: 20, // 设置字体大小 @@ -131,7 +137,8 @@ class DeletedAccountPage extends GetView { children: [ TextSpan( text: - "并且当前有绑定以及被分享的智能床、智能床垫等设备的账号不能注销".tr, + "并且当前有绑定以及被分享的智能床、智能床垫等设备的账号不能注销" + .tr, style: TextStyle( fontSize: AppFontsize .normal_text_size, @@ -165,7 +172,8 @@ class DeletedAccountPage extends GetView { height: 6, ), Text( - "你将无法控制你的智能床、智能床垫等设备，以及与其相关的各种操作。".tr, + "你将无法控制你的智能床、智能床垫等设备，以及与其相关的各种操作。" + .tr, style: TextStyle( fontSize: AppFontsize .normal_text_size, // 设置字体大小 @@ -254,6 +262,10 @@ class DeletedAccountPage extends GetView { ), child: FFButtonWidget( onPressed: () async { + TopSlideNotification.show( + context, + text: "待开发功能".tr, + ); // showCustomConfirmDialog(context, "是否确认注销?") // .then((v) async { // if (v != "confirm") { diff --git a/lib/pages/mh_page/new_settingPage.dart b/lib/pages/mh_page/new_settingPage.dart index 5f8c0c5..4345a16 100644 --- a/lib/pages/mh_page/new_settingPage.dart +++ b/lib/pages/mh_page/new_settingPage.dart @@ -494,10 +494,7 @@ class _SettingPageState extends State { borderRadius: AppConstants().button_container_radius, // 圆角半径 onTap: () { - TopSlideNotification.show( - context, - text: "待开发功能".tr, - ); + Get.toNamed("/deleteAccount"); }, colors: [ Colors.transparent, @@ -571,7 +568,8 @@ class _SettingPageState extends State { AppConstants().ent_type == 1 ? 'Copyright © 202-2025 嘉兴太和信息技术有限责任公司 版权所有' .tr - : "Copyright © 202-2025 合肥眠花糖家具有限责任公司 版权所有".tr, + : "Copyright © 202-2025 合肥眠花糖家具有限责任公司 版权所有" + .tr, style: TextStyle( color: themeController.currentColor.sc4, fontFamily: 'Inter', diff --git a/lib/routers/mh_routers.dart b/lib/routers/mh_routers.dart index 1407342..5450971 100644 --- a/lib/routers/mh_routers.dart +++ b/lib/routers/mh_routers.dart @@ -17,6 +17,7 @@ import 'package:vbvs_app/pages/mh_page/applyRepair/apply_repair_success.dart'; import 'package:vbvs_app/pages/mh_page/apply_repair_page.dart'; import 'package:vbvs_app/pages/mh_page/book_info_page.dart'; import 'package:vbvs_app/pages/mh_page/book_success_page.dart'; +import 'package:vbvs_app/pages/mh_page/delete_account.dart'; import 'package:vbvs_app/pages/mh_page/device/mht_bind_device_success.dart'; import 'package:vbvs_app/pages/mh_page/device/mht_bind_device_type.dart'; import 'package:vbvs_app/pages/mh_page/device/mht_blueteeth_device_page.dart'; @@ -126,6 +127,7 @@ var mhroutes = { ), "/mhtWifiAfterPage": (contxt, {arguments}) => MHTWifiAfterPage(deviceInfo: arguments), + "/deleteAccount": (context, {arguments}) => DeletedAccountPage(), }; var mhonGenerateRoute = (RouteSettings settings) { final String? name = settings.name; // 获取路由名称，如 /news 或 /search