From 5fcbba0cb4f717f5e56acc2c5de28e48fa5f7f80 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 29 Dec 2025 13:48:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A1=AE=E8=AE=A4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=94=B6=E8=B5=B7=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=95=86=E5=93=81=E6=B7=BB=E5=8A=A0=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/orderInfo.vue     |  2 +-
 pages/product/components/goods-modal.vue | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

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"></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">
 						<text>{{showAllGoods?'收起':'展开'}}</text>
 						<view class="guodu u-m-l-10 u-m-t-2" :class="{rotate:!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 @@
 							<view v-for="(setmenu, setmenuindex) in goods.groupSnap" :key="setmenuindex">
 								<view class="shop_sku_box_name" v-if="goods.groupType!=0">{{ setmenu.title }}
 									{{ setmenu.count }}
-									选{{ setmenu.number }}</view>
+									选{{ setmenu.number }}
+								</view>
 								<view class="shop_sku_box_name" v-else>{{ setmenu.title }} {{ setmenu.count }}件商品</view>
 								<view class="flex-start">
 									<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>
 						</view>
 						<view v-if="goods.type == 'package'&&goods.groupType==1">
-							
+
 						</view>
 						<view class="operation-wrap" v-else-if="stockNumberIsFull(goods)">
 							<view class="btn">
@@ -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 = ''
 			// 是否是套餐 有就传