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

---
 lib/retrofit/min_api.dart                  |  2 +-
 lib/retrofit/retrofit_api.dart             |  2 +-
 lib/settlement/settlement.dart             | 10 +++++-----
 lib/settlement/settlement_view/coupon.dart |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart
index f8e85a64..5b8d9f8f 100644
--- a/lib/retrofit/min_api.dart
+++ b/lib/retrofit/min_api.dart
@@ -32,7 +32,7 @@ part 'min_api.g.dart';
 
 // const base_url = "http://192.168.10.37:8766/app/";
 
-const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";///本地
+const localBaseUrl = "http://192.168.10.78:8765/app/";///本地
 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上
 
 
diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart
index 1f7b8706..1b7fc4bc 100644
--- a/lib/retrofit/retrofit_api.dart
+++ b/lib/retrofit/retrofit_api.dart
@@ -68,7 +68,7 @@ part 'retrofit_api.g.dart';
 
 // const base_url = "http://192.168.10.132:8766/app/";///詹云久
 
-const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地
+const localBaseUrl = "http://192.168.10.78:8766/app/";///本地
 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上
 
 @RestApi(baseUrl: localBaseUrl)
diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart
index 6bd2185e..4965a9f3 100644
--- a/lib/settlement/settlement.dart
+++ b/lib/settlement/settlement.dart
@@ -588,18 +588,18 @@ class _Settlement extends State<Settlement> {
             couponBean: couponListBean);
       },
     );
-    if (couponBean != null) {
+    // if (couponBean != null) {
       this.couponListBean = couponBean;
-      coupons = couponListBean.promotionName;
+      coupons = couponListBean?.promotionName ?? "";
       promotions = "";
       queryOrderInfo(
-        address != null ? address.id : null,
+        address?.id,
         selectedBtn,
-        couponListBean != null ? couponListBean.id : null,
+        couponListBean?.id,
         0,
         null,
       );
-    }
+    // }
   }
 
   ///活动弹窗
diff --git a/lib/settlement/settlement_view/coupon.dart b/lib/settlement/settlement_view/coupon.dart
index f8998f46..c920d3e3 100644
--- a/lib/settlement/settlement_view/coupon.dart
+++ b/lib/settlement/settlement_view/coupon.dart
@@ -167,7 +167,7 @@ class _CouponWidget extends State<CouponWidget> {
                                 margin: EdgeInsets.only(right: 23.w),
                                 child: GestureDetector(
                                   onTap: () {
-                                    Navigator.of(context).pop(widget.couponList);
+                                    Navigator.of(context).pop(widget.selected ? null : widget.couponList);
                                   },
                                   child: Image.asset(
                                     widget.selected