diff --git a/star_lock/lib/mine/about/about_page.dart b/star_lock/lib/mine/about/about_page.dart index 4d1f9a2c..221a6c09 100644 --- a/star_lock/lib/mine/about/about_page.dart +++ b/star_lock/lib/mine/about/about_page.dart @@ -49,10 +49,20 @@ class _AboutPageState extends State { builder: (AboutConsole logic) { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, - appBar: TitleAppBar( + appBar: F.sw( + defaultCall: () => TitleAppBar( barTitle: TranslationLoader.lanKeys!.about!.tr, haveBack: true, - backgroundColor: AppColors.mainColor), + backgroundColor: AppColors.mainColor, + ), + xhjCall: () => TitleAppBar( + barTitle: TranslationLoader.lanKeys!.about!.tr, + haveBack: true, + backgroundColor: Colors.white, + iconColor: AppColors.blackColor, + titleColor: AppColors.blackColor, + ), + ), body: Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ diff --git a/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart b/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart index eaad3dc3..01181525 100644 --- a/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -53,16 +53,44 @@ class _MineSetPageState extends State with WidgetsBindingObserver { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, - appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.moreSet!.tr, - haveBack: true, - backgroundColor: AppColors.mainColor), + appBar: F.sw( + defaultCall: () => TitleAppBar( + barTitle: TranslationLoader.lanKeys!.moreSet!.tr, + haveBack: true, + backgroundColor: AppColors.mainColor, + ), + xhjCall: () => TitleAppBar( + barTitle: TranslationLoader.lanKeys!.moreSet!.tr, + haveBack: true, + backgroundColor: Colors.white, + iconColor: AppColors.blackColor, + titleColor: AppColors.blackColor, + )), body: SingleChildScrollView( - child: getListDataView(), + child: styleHierarchy(), ), ); } + //样式层级 + Widget styleHierarchy() { + Widget view = getListDataView(); + view = F.sw( + defaultCall: () => view, + xhjCall: () => Container( + margin: EdgeInsets.only( + top: 20.h, left: 20.w, right: 20.w, bottom: 40.h), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all(Radius.circular(20.r))), + child: ClipRRect( + borderRadius: BorderRadius.circular(20.r), + child: view, + ), + )); + return view; + } + Widget getListDataView() { return Column( children: [ @@ -283,6 +311,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { SubmitBtn( btnName: TranslationLoader.lanKeys!.logout!.tr, isDelete: true, + padding: EdgeInsets.symmetric(horizontal: 15.w), onClick: () { //退出登录 ShowTipView().showIosTipWithContentDialog("确定要退出吗?".tr, () { diff --git a/star_lock/lib/tools/submitBtn.dart b/star_lock/lib/tools/submitBtn.dart index d126817c..3aac511b 100644 --- a/star_lock/lib/tools/submitBtn.dart +++ b/star_lock/lib/tools/submitBtn.dart @@ -31,6 +31,7 @@ class SubmitBtn extends StatelessWidget { bool? isDelete; bool? isDisabled; + SubmitBtn({ Key? key, required this.btnName, @@ -48,9 +49,10 @@ class SubmitBtn extends StatelessWidget { @override Widget build(BuildContext context) { - return SizedBox( + return Container( width: ScreenUtil().screenWidth - 40.w, height: 60.h, + padding: padding, child: ElevatedButton( style: ElevatedButton.styleFrom( backgroundColor: isDisabled == false