Browse Source

优惠显示更改;

new_revision_app
fmk 2 years ago
parent
commit
51b4654cd2
  1. 2
      lib/login/new_login_page.dart
  2. 4
      lib/settlement/settlement.dart
  3. 9
      lib/settlement/settlement_view/activity_coupon_remarks.dart

2
lib/login/new_login_page.dart

@ -352,7 +352,7 @@ class _NewLoginPage extends State<NewLoginPage> {
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,

4
lib/settlement/settlement.dart

@ -1014,7 +1014,7 @@ class _Settlement extends State<Settlement> {
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<Settlement> {
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
useVipPriceSelect == true ? "VIP": "MEMBER_RANK",
(useVipPriceSelect == true) ? "VIP": "MEMBER_RANK",
// useVipPriceSelect,
// useVipPriceSelect == true ? false :useBenefitSelect,
count1,

9
lib/settlement/settlement_view/activity_coupon_remarks.dart

@ -152,6 +152,15 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
: 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;

Loading…
Cancel
Save