From 11ad0e524a10ffd4cfe45c8ee7aefb068b833867 Mon Sep 17 00:00:00 2001
From: wurong <953969641@qq.com>
Date: Thu, 3 Aug 2023 18:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=A6=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E9=BE=99=E9=AA=A8=E6=9E=B6=E4=BE=9D=E8=B5=96=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94=E6=95=88=E6=9E=9C=EF=BC=9B=20=E7=AE=A1=E7=90=86app?=
 =?UTF-8?q?=EF=BC=9A=E7=94=B3=E8=AF=B7=E9=80=80=E6=AC=BE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E8=B7=B3=E8=BD=AC=EF=BC=9B=20=E6=9C=88?=
 =?UTF-8?q?=E4=BB=BD=E9=80=89=E6=8B=A9=EF=BC=8C=E6=96=B0=E5=A2=9E=EF=BC=9A?=
 =?UTF-8?q?allowViewNavigation:=20false=EF=BC=8C=E5=8D=B3=E5=8F=AF?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=AF=BC=E8=88=AA=E8=A7=86=E5=9B=BE=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=EF=BC=8C=E5=AE=9E=E7=8E=B0=E9=80=89=E6=8B=A9=E6=9F=90?=
 =?UTF-8?q?=E4=B8=AA=E6=9C=88=E4=BB=BD=EF=BC=9B=20=E8=AE=A2=E5=8D=95-?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=94=AE=E7=9B=98=E5=BC=B9=E5=87=BA=E4=B8=8D?=
 =?UTF-8?q?=E9=A1=B6=E8=B5=B7=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../date_select/monthly_report_page.dart             |  1 +
 lib/business_system/order/business_order_page.dart   |  1 +
 lib/business_system/order/request_refund.dart        | 12 ++++++++++--
 pubspec.lock                                         |  7 +++++++
 pubspec.yaml                                         |  2 ++
 5 files changed, 21 insertions(+), 2 deletions(-)

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<MonthlyReportPage>{
                 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<BusinessOrderPage>
                 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<RequestRefund> {
   FocusNode _focusNode = FocusNode();
   bool isKeyBoardShow = false;
   int modifyAmountState = 0;
+  int refundState = 0;
 
   @override
   void initState() {
@@ -198,7 +199,11 @@ class _RequestRefund extends State<RequestRefund> {
               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<RequestRefund> {
                           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