From 6e2875c6d805ba60f20eb99c5a63d93c581f301d Mon Sep 17 00:00:00 2001 From: wyf <494641114@qq.com> Date: Fri, 27 Jun 2025 11:01:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/util/MyUtils.dart | 2 +- .../mh_page/user/page/mht_login_page.dart | 60 ++++++++++++------- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/lib/common/util/MyUtils.dart b/lib/common/util/MyUtils.dart index 9cb224e..c73cf20 100644 --- a/lib/common/util/MyUtils.dart +++ b/lib/common/util/MyUtils.dart @@ -382,7 +382,7 @@ var returnIconButtom = IconButton( var returnIconButtomNew = ClickableContainer( backgroundColor: Colors.transparent, highlightColor: Colors.transparent, - padding: EdgeInsets.only(right: 0), + padding: EdgeInsets.fromLTRB(20.rpx, 20.rpx, 20.rpx, 20.rpx), onTap: () => Get.back(), child: Container( // height: 42.rpx, diff --git a/lib/pages/mh_page/user/page/mht_login_page.dart b/lib/pages/mh_page/user/page/mht_login_page.dart index 66a4dbf..c38c2b5 100644 --- a/lib/pages/mh_page/user/page/mht_login_page.dart +++ b/lib/pages/mh_page/user/page/mht_login_page.dart @@ -144,7 +144,7 @@ class MHTLoginPage extends GetView { ), child: Scaffold( backgroundColor: Colors.transparent, - resizeToAvoidBottomInset: true, + resizeToAvoidBottomInset: false, appBar: AppBar( backgroundColor: Colors.transparent, automaticallyImplyLeading: false, @@ -165,7 +165,7 @@ class MHTLoginPage extends GetView { // ), // ), Positioned( - left: 20.rpx, + left: 0.rpx, child: returnIconButtomNew, ), ], @@ -174,8 +174,6 @@ class MHTLoginPage extends GetView { actions: [], centerTitle: false, ), - - // key: scaffoldKey, body: PopScope( canPop: false, onPopInvokedWithResult: (disposition, result) async { @@ -200,15 +198,18 @@ class MHTLoginPage extends GetView { mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisSize: MainAxisSize.max, children: [ + SizedBox( + height: 50.rpx, + ), Expanded( - child: Align( - alignment: AlignmentDirectional(0, 0), + child: Container( + decoration: BoxDecoration(), child: Container( + width: bodysize!.maxWidth, decoration: BoxDecoration(), - child: Container( - width: bodysize!.maxWidth, - decoration: BoxDecoration(), + child: SingleChildScrollView( child: Column( + mainAxisAlignment: MainAxisAlignment.start, mainAxisSize: MainAxisSize.max, children: [ Obx(() { @@ -1683,27 +1684,44 @@ class MHTLoginPage extends GetView { InkWell( onTap: () { Get.toNamed( - "/findPasswordPage"); + "/registerPage"); }, - child: Text( - '找回密码'.tr, - style: TextStyle( - fontFamily: 'Readex Pro', - color: stringToColor( - "#84F5FF"), - fontSize: AppFontsize - .small_text_size, - letterSpacing: 0, + child: Text.rich( + TextSpan( + children: [ + TextSpan( + text: "还没有账号? ".tr, + style: TextStyle( + color: Colors + .white, // 设置"还没有账号?"为白色 + fontFamily: + 'Readex Pro', + fontSize: AppFontsize + .small_text_size, + ), + ), + TextSpan( + text: '前往注册'.tr, + style: TextStyle( + color: stringToColor( + "#84F5FF"), // 保持"前往注册"为指定颜色 + fontFamily: + 'Readex Pro', + fontSize: AppFontsize + .small_text_size, + ), + ), + ], ), ), ), InkWell( onTap: () { Get.toNamed( - "/registerPage"); + "/findPasswordPage"); }, child: Text( - '注册'.tr, + '找回密码 '.tr, style: TextStyle( fontFamily: 'Readex Pro', color: stringToColor(