sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop

Browse Source
This commit is contained in:
魏少阳 2024-09-24 16:05:23 +08:00
commit 146944f334
3 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/login/register/starLock_register_xhj_page.dart
View File

@ -194,31 +194,27 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
]),
),
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: <String, Object>{
'countryCode': state.countryCode,
'account': state.phoneOrEmailStr.value
});
state.xWidth.value =
(result as Map<String, dynamic>)['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: <String, Object>{
'countryCode': state.countryCode,
'account': state.phoneOrEmailStr.value
});
state.xWidth.value =
(result as Map<String, dynamic>)['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,

21
lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_page.dart
View File

@ -16,7 +16,6 @@ class AdvancedFeaturesWebPage extends StatefulWidget {
}
class _AdvancedFeaturesWebPageState extends State<AdvancedFeaturesWebPage> {
@override
Widget build(BuildContext context) {
return GetBuilder<AdvancedFeaturesWebLogic>(
@ -32,7 +31,25 @@ class _AdvancedFeaturesWebPageState extends State<AdvancedFeaturesWebPage> {
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: <Widget>[

3
lib/tools/titleAppBar.dart
View File

@ -17,6 +17,7 @@ class TitleAppBar extends AppBar {
final bool? haveOtherLeftWidget;
final Widget? leftWidget;
List<Widget>? 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<TitleAppBar> {
Widget build(BuildContext context) {
return AppBar(
elevation: 0,
leadingWidth: widget.leadingWidth,
leading: widget.haveOtherLeftWidget!
? widget.leftWidget
: (widget.haveBack ?? false