From eb839dcbce8abcb0e818fd6deb06f018fe9a0616 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Thu, 18 Apr 2024 16:58:44 +0800
Subject: [PATCH] 1

---
 pages/order_addcart/order_addcart.vue | 75 ++++++++++++++++++++++++---
 pages/store/home/index.vue            |  1 -
 2 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index f1abdf0..a6d50c9 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -75,6 +75,19 @@
 										{{goods.productAttr.sku}}
 										<text class="iconfont icon-xiala1"></text>
 									</view>
+
+									<!-- 标签 -->
+									<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>
+									</view>
+
+									<!-- 规格产地 -->
+									<!-- <view class="shop-detail" v-if="goods.product && goods.product.store_info">
+										{{goods.product.store_info}}
+									</view> -->
+
 									<view v-if="goods.product.once_max_count>0 && goods.product.once_min_count>0"
 										class="buy_limit">
 										<text
@@ -82,7 +95,6 @@
 											v-if="goods.product.once_max_count>0">最多{{goods.product.once_max_count}}件</text>
 									</view>
 
-
 									<view class='money acea-row row-middle'>
 										<view>
 											<text class="money-price">￥{{goods.productAttr.price}}</text>
@@ -231,7 +243,9 @@
 	import {
 		toLogin
 	} from '@/libs/login.js';
-import { Toast } from '../../libs/uniApi';
+	import {
+		Toast
+	} from '../../libs/uniApi';
 	const app = getApp();
 	export default {
 		props: {
@@ -504,12 +518,12 @@ import { Toast } from '../../libs/uniApi';
 					// //打开属性
 					// that.DefaultSelect(goods)
 					cartProductAttr(id).then(res => {
-            if(res.data.attr.length==0)return Toast('此商品为单规格商品');
-            const sku = {}
-            res.data.attrValue.forEach((itemn) => {
-              if(this.tabsCurr==2) itemn.price = itemn.wholesale_price; //把价格设置为批发价
-            	sku[itemn.sku] = itemn;
-            })
+						if (res.data.attr.length == 0) return Toast('此商品为单规格商品');
+						const sku = {}
+						res.data.attrValue.forEach((itemn) => {
+							if (this.tabsCurr == 2) itemn.price = itemn.wholesale_price; //把价格设置为批发价
+							sku[itemn.sku] = itemn;
+						})
 						goods.attr = res.data.attr;
 						goods.attrValue = res.data.attrValue
 						that.attrValue = goods.productAttr.sku
@@ -1231,6 +1245,51 @@ import { Toast } from '../../libs/uniApi';
 		color: #282828;
 	}
 
+	.tag {
+		margin-bottom: 10rpx;
+		display: flex;
+		flex-wrap: wrap;
+
+		.tag-item {
+			padding: 2rpx 6rpx;
+			border-radius: 6rpx;
+			border: 1rpx solid #40AE36;
+			font-size: 18rpx;
+			margin-right: 7rpx;
+			color: #40AE36;
+		}
+	}
+
+	.shop-detail {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		font-size: 22rpx;
+		line-height: 28rpx;
+		color: #999999;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		-webkit-line-clamp: 3;
+		white-space: pre-wrap;
+		margin-top: 4rpx;
+
+		.brand {
+			&::after {
+				content: "";
+				display: inline-block;
+				width: 0rpx;
+				height: 12rpx;
+				margin: 0 8rpx;
+				border: 1rpx solid #A1A1A1;
+				border-radius: 1rpx;
+				background-color: #A1A1A1;
+				opacity: .5;
+			}
+		}
+	}
+
 	.shoppingCart .list .item .picTxt .buy_limit {
 		margin-top: 10rpx;
 		color: #E93323;
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index f2e3553..98fa23f 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -1794,7 +1794,6 @@
 					display: flex;
 					align-items: center;
 					width: 100%;
-					// margin-bottom: 28rpx;
 					font-size: 22rpx;
 					line-height: 28rpx;
 					color: #999999;