去除部分调试打印,优化环境变量控制,修复再来一单只有一个商品时自动弹出图片预览问题,
This commit is contained in:
@@ -475,6 +475,9 @@
|
||||
}
|
||||
|
||||
const showDiscount = computed(() => {
|
||||
if(!props.listinfo.id||props.listinfo.status!='done'){
|
||||
return false
|
||||
}
|
||||
const keys = ['productCouponDiscountAmount', 'otherCouponDiscountAmount',
|
||||
'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount', 'vipDiscountAmount'
|
||||
]
|
||||
@@ -715,9 +718,15 @@
|
||||
const newUserDiscount = ref(0);
|
||||
const back_favorablelist = toRaw(favorablelist.value);
|
||||
async function getConsumeDiscount() {
|
||||
const consumeDiscountRes = await consumeDiscount({
|
||||
shopId: uni.cache.get("shopId"),
|
||||
});
|
||||
let consumeDiscountRes =null
|
||||
if(cartStore.consumeDiscount&&cartStore.newUserDiscount){
|
||||
consumeDiscountRes=cartStore.consumeDiscount
|
||||
}else{
|
||||
consumeDiscountRes = await consumeDiscount({
|
||||
shopId: uni.cache.get("shopId"),
|
||||
});
|
||||
}
|
||||
|
||||
if (!consumeDiscountRes) {
|
||||
favorablelist.value = back_favorablelist.filter(
|
||||
(v) => v.name != "新客立减"
|
||||
|
||||
Reference in New Issue
Block a user