Merge branch 'test' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into test

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}">

pages/order/index.vue

@@ -62,10 +62,12 @@
 						<view class="shop-info">
 							<view class="shop-item">
 								<view class="cover" v-for="(item1,index1) in item.goods" :key="index1">
-									<u-image width="56" height="56" radius="10" :src='item1.productImg'
+									
-										v-if="!item.isTemporary"></u-image>
+									<u-image width="56" height="56" radius="10" :src="item1.productImg"
+										v-if="!item1.isTemporary"></u-image>
+										
 									<u-image width="56" height="56" radius="10"
-										v-else-if="item.isTemporary &&item.productName=='签子'"
+										v-else-if="item1.isTemporary &&item1.productName=='签子'"
 										src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/5/b97054debd83486ab7ad8e20ca6a360a.png"
 									></u-image>
 									<u-image width="112" height="112" radius="20"

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 = ''
 			// 是否是套餐 有就传