|
|
@@ -611,17 +611,12 @@
|
|
|
console.log(productIdList)
|
|
|
const isHasDepositlds = productIdList.filter(item =>this.depositIds.includes(item))
|
|
|
const isHasRechargeIds = productIdList.filter(item =>this.rechargeIds.includes(item))
|
|
|
+ const isGoods= productIdList.every(item =>{ [...this.depositIds,...this.rechargeIds].includes(item)})
|
|
|
console.log(isHasDepositlds)
|
|
|
console.log(isHasRechargeIds)
|
|
|
- if(isHasDepositlds.length == 1){
|
|
|
- productIdList.forEach(item =>{
|
|
|
- productID += item +','
|
|
|
- })
|
|
|
- }else{
|
|
|
- this.$util.modal('提示','缴纳定金商品或余额充值商品请单独下单!','确定','',false,() =>{})
|
|
|
- return
|
|
|
- }
|
|
|
- if(isHasRechargeIds.length == 1){
|
|
|
+ console.log(isGoods)
|
|
|
+
|
|
|
+ if(isHasDepositlds.length === 1 || isHasRechargeIds.length === 1 && isGoods){
|
|
|
productIdList.forEach(item =>{
|
|
|
productID += item +','
|
|
|
})
|
|
|
@@ -629,8 +624,6 @@
|
|
|
this.$util.modal('提示','缴纳定金商品或余额充值商品请单独下单!','确定','',false,() =>{})
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
let cartPramsData={
|
|
|
clubId:this.clubId,
|
|
|
allPrice:this.allPrice,
|
