From 72d5d3dc2078df02017744f792df2742a0e38a29 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 23 Sep 2024 15:45:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Fix=EF=BC=9A=E3=80=90=E5=85=B6=E4=BB=96-?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E3=80=91=20=20=20=20=20https://www.tapd.cn/6?= =?UTF-8?q?9273997/bugtrace/bugs/view/1169273997001002903?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../register/starLock_register_xhj_page.dart | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/lib/login/register/starLock_register_xhj_page.dart b/lib/login/register/starLock_register_xhj_page.dart index 6fc7fbbd..811fe1bd 100755 --- a/lib/login/register/starLock_register_xhj_page.dart +++ b/lib/login/register/starLock_register_xhj_page.dart @@ -194,31 +194,27 @@ class _StarLockRegisterPageState extends State { ]), ), Obx(() => GestureDetector( - onTap: - (state.canSendCode.value && state.canResend.value) - ? () async { - // Navigator.pushNamed(context, Routers.safetyVerificationPage, arguments: {"countryCode":"+86", "account":state.phoneOrEmailStr.value}); - if (state.pwd.value != state.surePwd.value) { - logic.showToast('密码不一致哦'.tr); - return; - } - final result = await Get.toNamed( - Routers.safetyVerificationPage, - arguments: { - 'countryCode': state.countryCode, - 'account': state.phoneOrEmailStr.value - }); - state.xWidth.value = - (result as Map)['xWidth']; - logic.sendValidationCode(); - } - : null, + onTap: (state.canSendCode.value && state.canResend.value) + ? () async { + // Navigator.pushNamed(context, Routers.safetyVerificationPage, arguments: {"countryCode":"+86", "account":state.phoneOrEmailStr.value}); + final result = await Get.toNamed( + Routers.safetyVerificationPage, + arguments: { + 'countryCode': state.countryCode, + 'account': state.phoneOrEmailStr.value + }); + state.xWidth.value = + (result as Map)['xWidth']; + logic.sendValidationCode(); + } + : null, child: Container( padding: EdgeInsets.all(10.h), decoration: BoxDecoration( - color: (state.canSendCode.value && state.canResend.value) - ? AppColors.mainColor - : AppColors.btnDisableColor, + color: + (state.canSendCode.value && state.canResend.value) + ? AppColors.mainColor + : AppColors.btnDisableColor, borderRadius: BorderRadius.circular(5)), child: Center( child: Text(state.btnText.value, From 70431731d31b21fee5bf8c441616686bf85e00db Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 23 Sep 2024 20:20:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=E3=80=90=E6=88=91=E7=9A=84?= =?UTF-8?q?=E9=A1=B5-=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1-=E5=AE=9E?= =?UTF-8?q?=E5=90=8D=E8=AE=A4=E8=AF=81=20=E9=A6=96=E6=AC=A1=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E5=90=8E=E7=82=B9=E5=B7=A6=E4=B8=8A=E7=AE=AD=E5=A4=B4?= =?UTF-8?q?=E9=80=80=E4=B8=8D=E5=88=B0APP,=E5=9C=A8=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E6=98=AF=E7=A9=BA=E7=9A=84=E5=92=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=88=90=E5=8A=9F=E7=95=8C=E9=9D=A2=E6=9D=A5?= =?UTF-8?q?=E5=9B=9E=E5=88=87=E6=8D=A2=EF=BC=88=E9=A6=96=E6=AC=A1=E4=B9=B0?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E5=8A=9F=E8=83=BD=E4=B8=80=E6=A0=B7=EF=BC=89?= =?UTF-8?q?=E3=80=91=20=20=20=20=20https://www.tapd.cn/69273997/bugtrace/b?= =?UTF-8?q?ugs/view/1169273997001002869?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advancedFeaturesWeb_page.dart | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_page.dart b/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_page.dart index 7caee3a9..239707e2 100755 --- a/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_page.dart +++ b/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_page.dart @@ -16,7 +16,6 @@ class AdvancedFeaturesWebPage extends StatefulWidget { } class _AdvancedFeaturesWebPageState extends State { - @override Widget build(BuildContext context) { return GetBuilder( @@ -32,7 +31,25 @@ class _AdvancedFeaturesWebPageState extends State { barTitle: logic.state.webBuyTitle.value, haveBack: true, backgroundColor: AppColors.mainColor, - backAction: () => logic.canGoBack(false), + haveOtherLeftWidget: true, + leadingWidth: 160.w, + leftWidget: Row( + mainAxisSize: MainAxisSize.min, + children: [ + IconButton( + padding: const EdgeInsets.symmetric(horizontal: 0), + icon: const Icon(Icons.arrow_back_ios, + color: Colors.white), + onPressed: () => logic.canGoBack(false), + ), + IconButton( + padding: const EdgeInsets.symmetric(horizontal: 0), + icon: const Icon(Icons.close, color: Colors.white), + onPressed: Get.back, + ), + ], + ), + // backAction: () => logic.canGoBack(false), ), body: Obx(() => Column( children: [ From adf630b9ae9b46f0dbc7b0d1f5eba6d8331bc4af Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 23 Sep 2024 20:23:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=E3=80=90=E6=88=91=E7=9A=84?= =?UTF-8?q?=E9=A1=B5-=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1-=E5=AE=9E?= =?UTF-8?q?=E5=90=8D=E8=AE=A4=E8=AF=81=20=E9=A6=96=E6=AC=A1=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E5=90=8E=E7=82=B9=E5=B7=A6=E4=B8=8A=E7=AE=AD=E5=A4=B4?= =?UTF-8?q?=E9=80=80=E4=B8=8D=E5=88=B0APP,=E5=9C=A8=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E6=98=AF=E7=A9=BA=E7=9A=84=E5=92=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=88=90=E5=8A=9F=E7=95=8C=E9=9D=A2=E6=9D=A5?= =?UTF-8?q?=E5=9B=9E=E5=88=87=E6=8D=A2=EF=BC=88=E9=A6=96=E6=AC=A1=E4=B9=B0?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E5=8A=9F=E8=83=BD=E4=B8=80=E6=A0=B7=EF=BC=89?= =?UTF-8?q?=E3=80=91=20=20=20=20=20https://www.tapd.cn/69273997/bugtrace/b?= =?UTF-8?q?ugs/view/1169273997001002869?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tools/titleAppBar.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/tools/titleAppBar.dart b/lib/tools/titleAppBar.dart index 57c8265f..c6f3e263 100755 --- a/lib/tools/titleAppBar.dart +++ b/lib/tools/titleAppBar.dart @@ -17,6 +17,7 @@ class TitleAppBar extends AppBar { final bool? haveOtherLeftWidget; final Widget? leftWidget; List? actionsList; + final double? leadingWidth; TitleAppBar( {Key? key, @@ -30,6 +31,7 @@ class TitleAppBar extends AppBar { this.haveBack, this.backAction, this.haveOtherLeftWidget = false, + this.leadingWidth, this.leftWidget}) : super(key: key); @@ -42,6 +44,7 @@ class _TitleAppBarState extends State { Widget build(BuildContext context) { return AppBar( elevation: 0, + leadingWidth: widget.leadingWidth, leading: widget.haveOtherLeftWidget! ? widget.leftWidget : (widget.haveBack ?? false