diff --git a/lib/business_system/date_select/monthly_report_page.dart b/lib/business_system/date_select/monthly_report_page.dart index 6c026dbb..5a997e1c 100644 --- a/lib/business_system/date_select/monthly_report_page.dart +++ b/lib/business_system/date_select/monthly_report_page.dart @@ -59,6 +59,7 @@ class _MonthlyReportPage extends State{ view: DateRangePickerView.year, controller: _controller, selectionColor: Color(0xFF30415B), + allowViewNavigation: false, ), ) ], diff --git a/lib/business_system/order/business_order_page.dart b/lib/business_system/order/business_order_page.dart index 6c403f0f..5bc4aaa3 100644 --- a/lib/business_system/order/business_order_page.dart +++ b/lib/business_system/order/business_order_page.dart @@ -72,6 +72,7 @@ class _BusinessOrderPage extends State DefaultTabController( length:4, child: Scaffold( + resizeToAvoidBottomInset: false, appBar: MyAppBar( title:"", leading: false, diff --git a/lib/business_system/order/request_refund.dart b/lib/business_system/order/request_refund.dart index 08565a4e..a07ae6f3 100644 --- a/lib/business_system/order/request_refund.dart +++ b/lib/business_system/order/request_refund.dart @@ -23,6 +23,7 @@ class _RequestRefund extends State { FocusNode _focusNode = FocusNode(); bool isKeyBoardShow = false; int modifyAmountState = 0; + int refundState = 0; @override void initState() { @@ -198,7 +199,11 @@ class _RequestRefund extends State { GestureDetector( behavior: HitTestBehavior.opaque, onTap: (){ - showModifyAmountDialog(); + if(refundState == 1){ + Navigator.of(context).pop(); + }else{ + showModifyAmountDialog(); + } }, child: Container( width: double.infinity, @@ -295,7 +300,10 @@ class _RequestRefund extends State { fontWeight: FontWeight.bold, ), onTap: () { - Navigator.of(context).pop(); + setState((){ + refundState = 1; + Navigator.of(context).pop(); + }); }, ), flex: 1, diff --git a/pubspec.lock b/pubspec.lock index 26c34bcf..a0b593dd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -291,6 +291,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "5.0.0+1" + flutter_skeleton: + dependency: "direct main" + description: + name: flutter_skeleton + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.1.0+1" flutter_slidable: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index d307683e..0dad5a8e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -110,6 +110,8 @@ dependencies: shimmer: ^3.0.0 + flutter_skeleton: ^0.1.0+1 + # 时间选择器 flutter_datetime_picker: ^1.5.1