修改使用优惠券逻辑
This commit is contained in:
@@ -227,7 +227,7 @@
|
||||
import editDiscount from '@/components/my-components/edit-discount.vue'
|
||||
import editAccountPoints from './components/edit-accountPoints.vue'
|
||||
import {
|
||||
returnGoodsPayPriceMap,returnProCoupStartIndex ,returnProductCoupAllPrice
|
||||
returnGoodsPayPriceMap,returnProCoupStartIndex ,returnProductCoupAllPrice,returnProductCanUseNum
|
||||
} from '../quan_util.js'
|
||||
//商品数量从0到n每一个对应的价格
|
||||
let $goodsPayPriceMap={}
|
||||
@@ -396,7 +396,7 @@
|
||||
uni.$on('choose-quan', (arr) => {
|
||||
console.log(arr);
|
||||
const manjianCoup = arr.filter(v => v.type == 1&&v.num>=1)
|
||||
let productCoup = arr.filter(v => v.type == 2&&v.num>=1)
|
||||
let productCoup = arr.filter(v => v.type == 2)
|
||||
console.log(productCoup);
|
||||
//商品券分组
|
||||
let coupMap={}
|
||||
@@ -408,16 +408,20 @@
|
||||
coupMap[coup.proId]=[coup]
|
||||
}
|
||||
}
|
||||
console.log(coupMap);
|
||||
for(let key in coupMap){
|
||||
const arr=coupMap[key]
|
||||
for(let i in arr){
|
||||
const coup=arr[i]
|
||||
const proCoupStartIndex=returnProCoupStartIndex(arr,i)
|
||||
const num=Math.min($goodsPayPriceMap[coup.proId].length,coup.num)
|
||||
console.log(proCoupStartIndex);
|
||||
const coupUseNum=returnProductCanUseNum($goodsPayPriceMap[coup.proId],proCoupStartIndex,coup.num)
|
||||
const num=Math.min($goodsPayPriceMap[coup.proId].length,coupUseNum)
|
||||
coup.num=num
|
||||
coup.discountAmount=returnProductCoupAllPrice($goodsPayPriceMap[coup.proId],proCoupStartIndex,num).toFixed(2)
|
||||
}
|
||||
}
|
||||
productCoup=productCoup.filter(v=>v.num>=1)
|
||||
console.log(productCoup);
|
||||
pays.quan = [...manjianCoup, ...productCoup]
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user