Merge branch 'ymf' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into gyq
This commit is contained in:
@@ -18,7 +18,6 @@ export function returnGoodsPrice(goods, user, shopInfo) {
|
|||||||
if (goods.discount_sale_amount * 1 > 0) {
|
if (goods.discount_sale_amount * 1 > 0) {
|
||||||
return goods.discount_sale_amount;
|
return goods.discount_sale_amount;
|
||||||
}
|
}
|
||||||
console.log('returnGoodsPrice:shopInfo',shopInfo);
|
|
||||||
if(shopInfo&&!shopInfo.isMemberPrice){
|
if(shopInfo&&!shopInfo.isMemberPrice){
|
||||||
return goods.salePrice;
|
return goods.salePrice;
|
||||||
}
|
}
|
||||||
@@ -453,7 +452,9 @@ function returnSecoendDiscount(canDikouGoodsArr, coupon, user,shopInfo) {
|
|||||||
discountGoods = canUseGoods1.slice(0, 1);
|
discountGoods = canUseGoods1.slice(0, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const discountPrice = returnGoodsPrice(discountGoods, user,shopInfo);
|
console.log('returnSecoendDiscount:discountGoods',discountGoods);
|
||||||
|
const discountPrice = returnGoodsPrice(discountGoods[0], user,shopInfo);
|
||||||
|
console.log('returnSecoendDiscount:discountPrice',discountPrice);
|
||||||
const hasDiscountGoodsArr = [discountGoods];
|
const hasDiscountGoodsArr = [discountGoods];
|
||||||
//返回半价价格
|
//返回半价价格
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user