diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index eacf3fc..40e76f2 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -1883,6 +1883,7 @@ Page({ th.confirm_quan_befor() } } + return } if (length2 == 1) { console.error('优惠券2'); @@ -1900,6 +1901,7 @@ Page({ } } + return } if (length3 == 1 && th.data.exp_type==0) { console.error('优惠券3'); @@ -1916,6 +1918,7 @@ Page({ th.confirm_quan_befor() } + return } }, diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 81d77c8..2d42d4c 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -2965,6 +2965,7 @@ Page({ th.confirm_quan_befor() } } + return } if (length2 == 1) { console.error('优惠券2'); @@ -2982,6 +2983,7 @@ Page({ } } + return } if (length3 == 1 && th.data.bn_exp_type==0) { console.error('优惠券3'); @@ -2998,6 +3000,7 @@ Page({ th.confirm_quan_befor() } + return } }, diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index b73986c..fac056c 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -7348,10 +7348,11 @@ Page({ //默认选择优惠券 def_coupon_fn_aft() { console.error('进入默认优惠券选择'); + let th = this; let first_entry = th.data.first_entry; console.error(first_entry); - if (first_entry > 0) { + if (first_entry > 0 || (th.data.cartlist && th.data.cartlist.length>1)) { return } first_entry += 1; @@ -7362,7 +7363,10 @@ Page({ let length2 = th.data.def_coupon2 ? th.data.def_coupon2.length : 0 let length3 = th.data.def_coupon3 ? th.data.def_coupon3.length : 0 let length4 = th.data.def_coupon4 ? th.data.def_coupon4.length : 0 - let length = length1 + length2 + length3 + length4 + let length = length1 + length2 + if ((th.data.show_submit && th.data.is_b_now==1 && th.data.bn_exp_type==0) || (th.data.is_b_now==0 && th.data.cartlist && th.data.cartlist.length==1 && th.data.cartlist[0].exp_type==0)) { + length= length + length3 + length4 + } console.error(length); if (length != 1) { return @@ -7385,6 +7389,7 @@ Page({ th.confirm_quan_befor() } } + return } if (length2 == 1) { console.error('优惠券2'); @@ -7401,6 +7406,7 @@ Page({ th.confirm_quan_befor() } } + return } if (length3 == 1) { console.error('优惠券3'); @@ -7419,6 +7425,8 @@ Page({ th.sele_quan_item_by_befor(); th.confirm_quan_befor() } + return + } if (length4 == 1) { console.error('优惠券4'); @@ -7438,6 +7446,7 @@ Page({ th.confirm_quan_befor() }, 500); } + return } }, diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js index 4e24bf0..5af503d 100644 --- a/packageE/pages/cart/cart2_pt/cart2_pt.js +++ b/packageE/pages/cart/cart2_pt/cart2_pt.js @@ -2630,6 +2630,7 @@ Page({ th.confirm_quan_befor() } } + return } if (length2 == 1) { console.error('优惠券2'); @@ -2647,6 +2648,7 @@ Page({ } } + return } if (length3 == 1 && th.data.bn_exp_type == 0) { console.error('优惠券3'); @@ -2663,6 +2665,7 @@ Page({ th.confirm_quan_befor() } + return } }, diff --git a/packageE/pages/cart/cart_wk/cart_wk.js b/packageE/pages/cart/cart_wk/cart_wk.js index e3a9b59..878ca24 100644 --- a/packageE/pages/cart/cart_wk/cart_wk.js +++ b/packageE/pages/cart/cart_wk/cart_wk.js @@ -2145,6 +2145,7 @@ Page({ th.confirm_quan_befor() } } + return } if (length2 == 1) { console.error('优惠券2'); @@ -2162,6 +2163,7 @@ Page({ } } + return } if (length3 == 1 && th.data.exp_type == 0) { console.error('优惠券3'); @@ -2178,6 +2180,7 @@ Page({ th.confirm_quan_befor() } + return } },