|
@@ -318,12 +318,12 @@
|
|
|
|
|
|
/*只减去刷头的钱*/
|
|
|
if(couponIsNewPeople == 1){ //标识为新人卷
|
|
|
- if(couponType == 20000){
|
|
|
+ if(couponType == 20000){ //刷头抵扣卷
|
|
|
var brushCouponPrice = 0; //刷头优惠总金额
|
|
|
var otherPrice = 0;//其他商品总金额
|
|
|
var couponPrice = $(".my-picker input[name=radio]:checked").attr("val"); //优惠券金额
|
|
|
mui.each(orderItem,function(index){
|
|
|
- if(this.productType == 101){ //刷头类
|
|
|
+ if(this.productType == 101 && this.cartProductId != 310 ){ //刷头类
|
|
|
var brPrice = this.productPrice; //优惠券金额
|
|
|
if(brushCouponPrice == 0 || brushCouponPrice < brPrice){
|
|
|
brushCouponPrice = brPrice;
|
|
@@ -333,16 +333,17 @@
|
|
|
brushCouponPrice = accDiv(brushCouponPrice,100);
|
|
|
price = accSub($(".count_price").text(),brushCouponPrice); //刷头减去优惠券
|
|
|
$(".btn-youhuiquan span").text("-¥" + brushCouponPrice); //减去优惠金额赋值
|
|
|
- }else if(couponType == 40000){
|
|
|
+ }else if(couponType == 40000){ //新人卷 60元优惠券
|
|
|
var brushPrice = 0; //刷头总金额
|
|
|
var otherPrice = 0;//其他商品总金额
|
|
|
var couponPrice = $(".my-picker input[name=radio]:checked").attr("val"); //优惠券金额
|
|
|
mui.each(orderItem,function(index){
|
|
|
- if(this.productType == 101){
|
|
|
+ if(this.productType == 101 && this.cartProductId != 310 ){
|
|
|
brushPrice = accAdd(brushPrice,this.productPrice*this.cartNum);
|
|
|
}else{
|
|
|
otherPrice = accAdd(otherPrice,this.productPrice*this.cartNum);
|
|
|
}
|
|
|
+
|
|
|
});
|
|
|
brushPrice = accDiv(brushPrice,100);
|
|
|
otherPrice = accDiv(otherPrice,100);
|