From da32b3c85fc35762f96096a5f51f52e6a642536e Mon Sep 17 00:00:00 2001
From: wurong <953969641@qq.com>
Date: Sat, 19 Nov 2022 17:28:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8A=A9=E5=86=9C=E6=94=AF=E4=BB=98=E6=97=B6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=B4=BB=E5=8A=A8=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=EF=BC=8Cvip=E4=BB=B7=E6=A0=BC=E9=80=89=E6=8B=A9=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/settlement/settlement.dart                         |  1 +
 .../settlement_view/activity_coupon_remarks.dart       | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart
index c5855001..41a039fc 100644
--- a/lib/settlement/settlement.dart
+++ b/lib/settlement/settlement.dart
@@ -781,6 +781,7 @@ class _Settlement extends State<Settlement> {
                               ),
 
                               ///优惠券/备注/会员优惠金额
+                              if(settleOrderInfo != null || minOrderInfo != null)
                               ActivityCouponRemarks(
                                 couponCart,
                                 activityCart,
diff --git a/lib/settlement/settlement_view/activity_coupon_remarks.dart b/lib/settlement/settlement_view/activity_coupon_remarks.dart
index 9fbe2070..b9767cea 100644
--- a/lib/settlement/settlement_view/activity_coupon_remarks.dart
+++ b/lib/settlement/settlement_view/activity_coupon_remarks.dart
@@ -76,7 +76,7 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
-          // if(widget?.settleOrderInfo?.memberVO?.isVip ?? false)
+          if(!widget?.settleOrderInfo?.isRaise ?? false)
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.center,
@@ -168,7 +168,7 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
                 ],
               ),
             ),
-          if (widget.placeOrder && widget.tableId <= 0)
+          if (widget.placeOrder && widget.tableId <= 0 && !(widget?.settleOrderInfo?.isRaise ?? false))
             InkWell(
               onTap: () {
                 widget.activityCart();
@@ -204,11 +204,11 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
                 ],
               ),
             ),
-          if (widget.placeOrder)
+          if (widget.placeOrder && !(widget?.settleOrderInfo?.isRaise ?? false))
             SizedBox(
               height: 13,
             ),
-          if (widget.placeOrder)
+          if (widget.placeOrder && !(widget?.settleOrderInfo?.isRaise ?? false))
             InkWell(
               onTap: () {
                 widget.couponCart();
@@ -244,7 +244,7 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
                 ],
               ),
             ),
-          if (widget.placeOrder)
+          if (widget.placeOrder && !(widget?.settleOrderInfo?.isRaise ?? false))
             SizedBox(
               height: 13,
             ),