diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue index 7344add..678e437 100644 --- a/pages/order/components/orderInfo.vue +++ b/pages/order/components/orderInfo.vue @@ -44,7 +44,7 @@ :shopInfo="cartStore.shopInfo" :shopUserInfo="cartStore.shopUserInfo" :limitDiscount="cartStore.limitTimeDiscount"> - + {{showAllGoods?'收起':'展开'}} diff --git a/pages/product/components/goods-modal.vue b/pages/product/components/goods-modal.vue index dcdf4cb..56b9d2f 100644 --- a/pages/product/components/goods-modal.vue +++ b/pages/product/components/goods-modal.vue @@ -48,7 +48,8 @@ {{ setmenu.title }} {{ setmenu.count }} - 选{{ setmenu.number }} + 选{{ setmenu.number }} + {{ setmenu.title }} {{ setmenu.count }}件商品 「{{ goods.suitNum }}{{ goods.unitName }}起点」 - + @@ -477,9 +478,9 @@ const visible = defineModel({ default: false, }); - - + + function stockNumberIsFull(item) { @@ -617,13 +618,18 @@ if (goods.type != 'package' && shopCartNumber.value <= 0) { return; } - if (goods.type == 'package' && goods.groupType!=0 && !allConditionsSatisfied.value) { + if (goods.type == 'package' && goods.groupType != 0 && !allConditionsSatisfied.value) { return } if ((goods.type == 'package' && allConditionsSatisfied.value) || (goods.type == 'sku' && canSubmit.value)) { - let res = cartStore.carts.find(cart => cart.product_id == goods.id && cart.sku_id == selSku.value.id) + let res = null; + if (goods.type == 'package') { + res = null + } else { + res = cartStore.carts.find(cart => cart.product_id == goods.id && cart.sku_id == selSku.value.id) + } let suitNum = 1; let sku_id = '' // 是否是套餐 有就传