Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app

lib/settlement/settlement.dart

@@ -781,6 +781,7 @@ class _Settlement extends State<Settlement> {
                               ),
 
                               ///优惠券/备注/会员优惠金额
+                              if(settleOrderInfo != null || minOrderInfo != null)
                               ActivityCouponRemarks(
                                 couponCart,
                                 activityCart,

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