From be1e4413a7a74204b7e52833552acaa85ba425af Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Fri, 19 Apr 2024 10:16:21 +0800
Subject: [PATCH] 1

---
 pages/order_addcart/order_addcart.vue | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index a6d50c9..e0a8907 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -20,11 +20,6 @@
 				</view>
 
 				<view class="func" style="padding-top: 0;">
-					<!-- 分段器 -->
-					<!-- <view class="subsection">
-        		<u-subsection :list="['综合云市场','商户购物车']" activeColor="#40AE36" :current="subsecCurr"
-        			mode="subsection" @change="subsecChange"></u-subsection>
-        	</view> -->
 					<view class='nav acea-row row-between-wrapper'>
 						<view>购物数量：<text class='num t-color'>{{cartTotalCount}}</text></view>
 						<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"
@@ -49,12 +44,9 @@
 								<navigator
 									:url="hide_mer_status == 0 ? `/pages/store/home/index?id=${item.mer_id}&sale_type=${tabsCurr}` : '#'"
 									class="info">
-									<!-- <text class="iconfont icon-shangjiadingdan"></text> -->
 									<view class="name">{{item.mer_name}}</view>
 									<text class="iconfont icon-xiangyou" style="font-weight: bold;"></text>
 								</navigator>
-								<!-- <view class="coupon-btn" style="width: auto;padding: 0 10rpx;">{{item.cloud_warehouse}}
-								</view> -->
 							</view>
 							<navigator v-for="goods in item.list" :key="goods.cart_id"
 								:url='`/pages/goods_details/index?id=${goods.product.product_id}&sale_type=${tabsCurr}`'
@@ -78,9 +70,9 @@
 
 									<!-- 标签 -->
 									<view class="tag"
-										v-if="goods.product && goods.product.mer_label_name && goods.product.mer_label_name.length > 0">
-										<view class="tag-item" v-for="(ii,indx) in goods.product.mer_label_name">{{ii}}
-										</view>
+										v-if="goods && goods.product && goods.product.mer_label_name && goods.product.mer_label_name.length > 0">
+										<view class="tag-item" v-for="(ii,indx) in goods.product.mer_label_name"
+											:key="index">{{ii}}</view>
 									</view>
 
 									<!-- 规格产地 -->
@@ -1246,7 +1238,7 @@
 	}
 
 	.tag {
-		margin-bottom: 10rpx;
+		margin: 10rpx 0;
 		display: flex;
 		flex-wrap: wrap;