diff --git a/lib/login/new_login_page.dart b/lib/login/new_login_page.dart index 44c5e289..49073834 100644 --- a/lib/login/new_login_page.dart +++ b/lib/login/new_login_page.dart @@ -352,7 +352,7 @@ class _NewLoginPage extends State { width: double.infinity, padding: EdgeInsets.only( left: 16.w, - top: 60.h + MediaQuery.of(context).padding.top, + top: 45.h + MediaQuery.of(context).padding.top, right: 12.w), child: Column( mainAxisAlignment: MainAxisAlignment.start, diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart index c9abee85..01098a8e 100644 --- a/lib/settlement/settlement.dart +++ b/lib/settlement/settlement.dart @@ -1014,7 +1014,7 @@ class _Settlement extends State { productSkuId ?? "", actProductId ?? "", actProductSkuId ?? "", - (settleOrderInfo.isRaise || payChannel == 5 || isVips == false) ?"NONE" : ((useVipPriceSelect == false) ? "MEMBER_RANK" : (isVips == false &&vipLevelName == "黄金会员")?"MEMBER_RANK":"AUTO"), + (settleOrderInfo.isRaise || payChannel == 5) ?"NONE" : ((useVipPriceSelect == false && couponListBean?.id!="" && ((promotion?.id ?? productId )!= "")) ? "MEMBER_RANK" : (isVips == false &&vipLevelName == "黄金会员")?"MEMBER_RANK":"AUTO"), // (settleOrderInfo.isRaise || payChannel == 5 || ((payChannel == 4 && settleOrderInfo.usePlateMoney == false))) ? false :useVipPriceSelect, // (settleOrderInfo.isRaise || payChannel == 5 || ((payChannel == 4 && settleOrderInfo.usePlateMoney == false)) || useVipPriceSelect == true) ? false :useBenefitSelect, count1, @@ -1037,7 +1037,7 @@ class _Settlement extends State { productSkuId ?? "", actProductId ?? "", actProductSkuId ?? "", - useVipPriceSelect == true ? "VIP": "MEMBER_RANK", + (useVipPriceSelect == true) ? "VIP": "MEMBER_RANK", // useVipPriceSelect, // useVipPriceSelect == true ? false :useBenefitSelect, count1, diff --git a/lib/settlement/settlement_view/activity_coupon_remarks.dart b/lib/settlement/settlement_view/activity_coupon_remarks.dart index de21695e..709c5f59 100644 --- a/lib/settlement/settlement_view/activity_coupon_remarks.dart +++ b/lib/settlement/settlement_view/activity_coupon_remarks.dart @@ -152,6 +152,15 @@ class _ActivityCouponRemarks extends State { : GestureDetector( onTap: () { setState(() { + if(widget.settleOrderInfo.usePlateMoney == false || widget.payChannell == 5){ + SmartDialog.show( + widget: SettlementTips( + () { + }, + text: widget.payChannell == 5 ? "该支付余额为特殊活动充值, 不可参与任何活动" :"该用户平台余额为特殊活动充值, 不可参与任何活动", + )); + return; + } if ((widget?.settleOrderInfo?.memberVO?.isVip ?? false)) { vipSelect = !vipSelect;