From a78e04a28b12c00ee9d0574842a86467aefc9b27 Mon Sep 17 00:00:00 2001
From: w-R <953969641@qq.com>
Date: Sat, 7 May 2022 17:18:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=9B=B4=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/settlement/settlement.dart   | 8 ++++----
 lib/view_widget/tips_dialog.dart | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart
index 6a159a94..a7a777da 100644
--- a/lib/settlement/settlement.dart
+++ b/lib/settlement/settlement.dart
@@ -597,7 +597,7 @@ class _Settlement extends State<Settlement> {
         selectedBtn,
         couponListBean?.id,
         0,
-        null,
+        promotion?.id,
       );
     // }
   }
@@ -612,17 +612,17 @@ class _Settlement extends State<Settlement> {
         return SettlementActivity(settleOrderInfo, storeInfo);
       },
     );
-    if (pro != null) {
+    // if (pro != null) {
       this.promotion = pro;
       promotions = promotion?.name ?? "";
       coupons = "";
       queryOrderInfo(
         address?.id,
         selectedBtn,
-        null,
+        couponListBean?.id,
         0,
         promotion?.id,
       );
-    }
+    // }
   }
 }
diff --git a/lib/view_widget/tips_dialog.dart b/lib/view_widget/tips_dialog.dart
index 0ac62ada..0c2df306 100644
--- a/lib/view_widget/tips_dialog.dart
+++ b/lib/view_widget/tips_dialog.dart
@@ -23,7 +23,7 @@ class _Tips extends State<Tips> {
       child: Center(
         child: Container(
           width: MediaQuery.of(context).size.width - 80.w,
-          height: 146.h,
+          height: 165.h,
           decoration: BoxDecoration(
             color: Colors.white,
             borderRadius: BorderRadius.circular(8),
@@ -32,7 +32,7 @@ class _Tips extends State<Tips> {
             children: [
               Container(
                 width: double.infinity,
-                height: 90.h,
+                height:109.h,
                 alignment: Alignment.center,
                 padding: EdgeInsets.all(10),
                 child: Text(