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 { ), ///优惠券/备注/会员优惠金额 + 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 { 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 { ], ), ), - 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 { ], ), ), - 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 { ], ), ), - if (widget.placeOrder) + if (widget.placeOrder && !(widget?.settleOrderInfo?.isRaise ?? false)) SizedBox( height: 13, ),