diff --git a/lib/pages/sign/sign_in_page.dart b/lib/pages/sign/sign_in_page.dart index 4d88d758..22b304ea 100644 --- a/lib/pages/sign/sign_in_page.dart +++ b/lib/pages/sign/sign_in_page.dart @@ -1,6 +1,8 @@ import 'dart:async'; import 'dart:ui'; +import 'package:aku_community/widget/bee_back_button.dart'; +import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -201,8 +203,10 @@ class _SignInPageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - backgroundColor: Colors.white, + return BeeScaffold( + leading: BeeBackButton(), + title: '', + bgColor: Colors.white, body: GestureDetector( behavior: HitTestBehavior.opaque, onTap: () { @@ -279,7 +283,7 @@ class _SignInPageState extends State { MaterialButton( shape: StadiumBorder(), padding: EdgeInsets.zero, - onPressed: () => Get.to(AgreementPage()), + onPressed: () => Get.to(() => AgreementPage()), child: Text( '《小蜜蜂用户协议》', style: TextStyle( diff --git a/lib/ui/manager/advice/advice_page.dart b/lib/ui/manager/advice/advice_page.dart index 36186fc7..e0d7f489 100644 --- a/lib/ui/manager/advice/advice_page.dart +++ b/lib/ui/manager/advice/advice_page.dart @@ -177,10 +177,12 @@ class _AdvicePageState extends State with TickerProviderStateMixin { ), secondChild: BottomButton( onPressed: () async { - bool needRefresh = await Get.to(NewAdvicePage( - type: widget.type, - initType: _tabController.index, - )); + bool needRefresh = await Get.to( + () => NewAdvicePage( + type: widget.type, + initType: _tabController.index, + ), + ); if (needRefresh == true) { _refreshController.callRefresh(); Get.dialog(CupertinoAlertDialog( diff --git a/lib/widget/picker/bee_image_preview.dart b/lib/widget/picker/bee_image_preview.dart index f573cfa8..b3c1de7e 100644 --- a/lib/widget/picker/bee_image_preview.dart +++ b/lib/widget/picker/bee_image_preview.dart @@ -13,12 +13,16 @@ class BeeImagePreview extends StatefulWidget { return await navigator.push( PageRouteBuilder( opaque: false, + fullscreenDialog: true, pageBuilder: (context, animation, secondAnimation) { return FadeTransition( opacity: animation, child: BeeImagePreview.file(file: file, tag: tag), ); }, + transitionsBuilder: (context, animation, secondaryAnimation, child) { + return child; + }, ), ); } @@ -27,10 +31,14 @@ class BeeImagePreview extends StatefulWidget { navigator.push( PageRouteBuilder( opaque: false, + fullscreenDialog: true, pageBuilder: (context, animation, secondAnimation) { + return BeeImagePreview.path(path: path, tag: tag); + }, + transitionsBuilder: (context, animation, secondaryAnimation, child) { return FadeTransition( opacity: animation, - child: BeeImagePreview.path(path: path, tag: tag), + child: child, ); }, ),