From 117e5a78098a869364666d6ef846190d589f8876 Mon Sep 17 00:00:00 2001
From: w-R <953969641@qq.com>
Date: Sat, 7 May 2022 15:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=9B=B4=E6=94=B9?=
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 | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart
index 4965a9f3..6a159a94 100644
--- a/lib/settlement/settlement.dart
+++ b/lib/settlement/settlement.dart
@@ -153,7 +153,7 @@ class _Settlement extends State<Settlement> {
         minOrderInfo = baseData.data;
       });
     }else{
-      SmartDialog.showToast(baseData.msg, alignment: Alignment.center);
+      SmartDialog.showToast(baseData?.msg, alignment: Alignment.center);
     }
   }
 
@@ -614,14 +614,14 @@ class _Settlement extends State<Settlement> {
     );
     if (pro != null) {
       this.promotion = pro;
-      promotions = promotion.name;
+      promotions = promotion?.name ?? "";
       coupons = "";
       queryOrderInfo(
-        address != null ? address.id : null,
+        address?.id,
         selectedBtn,
         null,
         0,
-        promotion != null ? promotion.id : null,
+        promotion?.id,
       );
     }
   }
diff --git a/lib/view_widget/tips_dialog.dart b/lib/view_widget/tips_dialog.dart
index 069a4003..0ac62ada 100644
--- a/lib/view_widget/tips_dialog.dart
+++ b/lib/view_widget/tips_dialog.dart
@@ -38,7 +38,7 @@ class _Tips extends State<Tips> {
                 child: Text(
                   widget.text ?? S.of(context).querenyaoshanchudangqianpinglunma,
                   style: TextStyle(
-                    fontSize: 17.sp,
+                    fontSize: 15.sp,
                     fontWeight: MyFontWeight.medium,
                     color: Color(0xFF353535),
                   ),
@@ -65,7 +65,7 @@ class _Tips extends State<Tips> {
                           child: Text(
                             S.of(context).quxiao,
                             style: TextStyle(
-                              fontSize: 17.sp,
+                              fontSize: 16.sp,
                               fontWeight: MyFontWeight.medium,
                               color: Color(0xFF353535),
                             ),
@@ -91,7 +91,7 @@ class _Tips extends State<Tips> {
                           child: Text(
                             S.of(context).queren,
                             style: TextStyle(
-                              fontSize: 17.sp,
+                              fontSize: 16.sp,
                               fontWeight: MyFontWeight.medium,
                               color: Color(0xFF32A060),
                             ),