弹窗更改

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,
       );
     }
   }

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),
                             ),