czg_team/cashier_wx
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复确认订单页面收起按钮消失问题，修复套餐商品添加第二次失效问题

Browse Source
This commit is contained in:
YeMingfei666
2025-12-29 13:48:37 +08:00
parent 0944635c69
commit 5fcbba0cb4
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/order/components/orderInfo.vue
View File

@@ -44,7 +44,7 @@
:shopInfo="cartStore.shopInfo" :shopUserInfo="cartStore.shopUserInfo" :shopInfo="cartStore.shopInfo" :shopUserInfo="cartStore.shopUserInfo"
:limitDiscount="cartStore.limitTimeDiscount"></orderItemVue> :limitDiscount="cartStore.limitTimeDiscount"></orderItemVue>
<view class="u-flex u-row-center u-m-t-16 u-font-28" v-if="cartStore.allGoods>4"> <view class="u-flex u-row-center u-m-t-16 u-font-28" v-if="cartStore.allGoods.length>4">
<view class="u-flex u-col-baseline" @click="showAllGoods=!showAllGoods"> <view class="u-flex u-col-baseline" @click="showAllGoods=!showAllGoods">
<text>{{showAllGoods?'收起':'展开'}}</text> <text>{{showAllGoods?'收起':'展开'}}</text>
<view class="guodu u-m-l-10 u-m-t-2" :class="{rotate:!showAllGoods}"> <view class="guodu u-m-l-10 u-m-t-2" :class="{rotate:!showAllGoods}">

18
pages/product/components/goods-modal.vue
View File

@@ -48,7 +48,8 @@
<view v-for="(setmenu, setmenuindex) in goods.groupSnap" :key="setmenuindex"> <view v-for="(setmenu, setmenuindex) in goods.groupSnap" :key="setmenuindex">
<view class="shop_sku_box_name" v-if="goods.groupType!=0">{{ setmenu.title }} <view class="shop_sku_box_name" v-if="goods.groupType!=0">{{ setmenu.title }}
{{ setmenu.count }} {{ setmenu.count }}
选{{ setmenu.number }}</view> 选{{ setmenu.number }}
</view>
<view class="shop_sku_box_name" v-else>{{ setmenu.title }} {{ setmenu.count }}件商品</view> <view class="shop_sku_box_name" v-else>{{ setmenu.title }} {{ setmenu.count }}件商品</view>
<view class="flex-start"> <view class="flex-start">
<view class="shop_sku_box_item" v-for="(option, goodsid) in setmenu.goods" <view class="shop_sku_box_item" v-for="(option, goodsid) in setmenu.goods"
@@ -219,7 +220,7 @@
<text v-if="goods.suitNum > 1">「{{ goods.suitNum }}{{ goods.unitName }}起点」</text> <text v-if="goods.suitNum > 1">「{{ goods.suitNum }}{{ goods.unitName }}起点」</text>
</view> </view>
<view v-if="goods.type == 'package'&&goods.groupType==1"> <view v-if="goods.type == 'package'&&goods.groupType==1">
</view> </view>
<view class="operation-wrap" v-else-if="stockNumberIsFull(goods)"> <view class="operation-wrap" v-else-if="stockNumberIsFull(goods)">
<view class="btn"> <view class="btn">
@@ -477,9 +478,9 @@
const visible = defineModel({ const visible = defineModel({
default: false, default: false,
}); });
function stockNumberIsFull(item) { function stockNumberIsFull(item) {
@@ -617,13 +618,18 @@
if (goods.type != 'package' && shopCartNumber.value <= 0) { if (goods.type != 'package' && shopCartNumber.value <= 0) {
return; return;
} }
if (goods.type == 'package' && goods.groupType!=0 && !allConditionsSatisfied.value) { if (goods.type == 'package' && goods.groupType != 0 && !allConditionsSatisfied.value) {
return return
} }
if ((goods.type == 'package' && allConditionsSatisfied.value) || (goods.type == if ((goods.type == 'package' && allConditionsSatisfied.value) || (goods.type ==
'sku' && canSubmit.value)) { '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 suitNum = 1;
let sku_id = '' let sku_id = ''
// 是否是套餐 有就传 // 是否是套餐 有就传