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, 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: [ 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