diff --git a/lib/main.dart b/lib/main.dart index 273457e..1c347a3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -666,6 +666,8 @@ class MyApp extends StatelessWidget { Get.lazyPut(() => MessageSettingController()), Get.lazyPut(() => CommonMessageSettingController()), Get.lazyPut(() => AuthBindTelController()), + Get.lazyPut(() => MHTLoginController()), + Get.lazyPut(() => MHTRegisterController()), ])); } diff --git a/lib/pages/main_bottom/main_page_bottom_change.dart b/lib/pages/main_bottom/main_page_bottom_change.dart index 2e64a74..0eb2b2f 100644 --- a/lib/pages/main_bottom/main_page_bottom_change.dart +++ b/lib/pages/main_bottom/main_page_bottom_change.dart @@ -155,14 +155,14 @@ class MainPageBottomChange extends GetView { ), child: Scaffold( backgroundColor: Colors.transparent, - // body: arr[controller.model.currentIndex], - body: IndexedStack( - // ✅ 改成 IndexedStack - index: controller.model.currentIndex, - children: arr - .map((page) => SizedBox.expand(child: page)) - .toList(), - ), + body: arr[controller.model.currentIndex], + // body: IndexedStack( + // // ✅ 改成 IndexedStack + // index: controller.model.currentIndex??3, + // children: arr + // .map((page) => SizedBox.expand(child: page)) + // .toList(), + // ), floatingActionButtonAnimator: FloatingActionButtonAnimator.noAnimation, floatingActionButtonLocation: diff --git a/lib/pages/mh_page/user/controller/mht_login_controller.dart b/lib/pages/mh_page/user/controller/mht_login_controller.dart index f8fda45..50269c7 100644 --- a/lib/pages/mh_page/user/controller/mht_login_controller.dart +++ b/lib/pages/mh_page/user/controller/mht_login_controller.dart @@ -310,7 +310,7 @@ class MHTLoginController extends GetControllerEx { String serviceApi = ServiceConstant.delete_account; String queryUrl = "${serviceAddress}${serviceName}${serviceApi}"; int code = 0; - requestWithLog( + await requestWithLog( logTitle: "注销账号", method: MyHttpMethod.delete, queryUrl: queryUrl, diff --git a/lib/pages/user/setting_page.dart b/lib/pages/user/setting_page.dart index 0c2a607..3f7b7c8 100644 --- a/lib/pages/user/setting_page.dart +++ b/lib/pages/user/setting_page.dart @@ -114,68 +114,69 @@ class _SettingPageState extends State { child: Column( mainAxisSize: MainAxisSize.max, children: [ - ClickableContainer( - backgroundColor: Colors.transparent, // 容器背景色 - highlightColor: themeController - .currentColor.sc21, // 点击时的背景色 - padding: EdgeInsetsDirectional.fromSTEB( - 40.rpx, 0.rpx, 40.rpx, 0.rpx), - onTap: () { - TopSlideNotification.show(context, - text: "待开发功能".tr); - }, - child: Container( - child: Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.rpx, 30.rpx, 0.rpx, 30.rpx), - child: Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Row( - mainAxisSize: MainAxisSize.max, - children: [ - Text( - '设置页.主题模式'.tr, - style: TextStyle( - fontFamily: 'Inter', - color: themeController - .currentColor.sc3, - fontSize: AppConstants() - .title_text_fontSize, - letterSpacing: 0.0, - ), - ), - ].divide(SizedBox(width: 22.rpx)), - ), - Row( - mainAxisSize: MainAxisSize.max, - children: [ - Text( - '深色'.tr, - style: TextStyle( - fontFamily: 'Inter', - color: Color(0xFFD9E3EB), - fontSize: 26.rpx, - letterSpacing: 0.0, - ), - ), - SvgPicture.asset( - 'assets/img/icon/arrow_right.svg', - width: 8.rpx, - height: 15 - .rpx, // 如果 SVG 中没有固定颜色,可以这样设置 - color: themeController - .currentColor.sc3, - ), - ].divide(SizedBox(width: 28.rpx)), - ), - ], - ), - ), - ), - ), + // ClickableContainer( + // backgroundColor: Colors.transparent, // 容器背景色 + // highlightColor: themeController + // .currentColor.sc21, // 点击时的背景色 + // padding: EdgeInsetsDirectional.fromSTEB( + // 40.rpx, 0.rpx, 40.rpx, 0.rpx), + // onTap: () { + // TopSlideNotification.show(context, + // text: "待开发功能".tr); + // }, + // child: Container( + // child: Padding( + // padding: EdgeInsetsDirectional.fromSTEB( + // 0.rpx, 30.rpx, 0.rpx, 30.rpx), + // child: Row( + // mainAxisSize: MainAxisSize.max, + // mainAxisAlignment: + // MainAxisAlignment.spaceBetween, + // children: [ + // Row( + // mainAxisSize: MainAxisSize.max, + // children: [ + // Text( + // '设置页.主题模式'.tr, + // style: TextStyle( + // fontFamily: 'Inter', + // color: themeController + // .currentColor.sc3, + // fontSize: AppConstants() + // .title_text_fontSize, + // letterSpacing: 0.0, + // ), + // ), + // ].divide(SizedBox(width: 22.rpx)), + // ), + // Row( + // mainAxisSize: MainAxisSize.max, + // children: [ + // Text( + // '深色'.tr, + // style: TextStyle( + // fontFamily: 'Inter', + // color: Color(0xFFD9E3EB), + // fontSize: 26.rpx, + // letterSpacing: 0.0, + // ), + // ), + // SvgPicture.asset( + // 'assets/img/icon/arrow_right.svg', + // width: 8.rpx, + // height: 15 + // .rpx, // 如果 SVG 中没有固定颜色,可以这样设置 + // color: themeController + // .currentColor.sc3, + // ), + // ].divide(SizedBox(width: 28.rpx)), + // ), + // ], + // ), + // ), + // ), + // ), + ClickableContainer( backgroundColor: Colors.transparent, // 容器背景色 highlightColor: themeController