From d94cf09c99a7a39150317c477ea127e21bffd875 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 23 Dec 2023 18:30:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/nongKe/cloud_entrepot/indexh.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pages/nongKe/cloud_entrepot/indexh.vue b/pages/nongKe/cloud_entrepot/indexh.vue
index c110a8e..a55a894 100644
--- a/pages/nongKe/cloud_entrepot/indexh.vue
+++ b/pages/nongKe/cloud_entrepot/indexh.vue
@@ -99,7 +99,9 @@
               <view v-if="item.product" v-for="(item, index) in goodsList" class="short_item" @click="clickProduct(item)">
                 <image class="image" :src="item.product.image"></image>
                 <view class="short_item_right">
-                  <view class="r_name">{{item.product.store_name}}</view>
+                  <view class="r_name">
+                    <text v-if="item.mer_labels_name" class="mer-labels">{{item.mer_labels_name}}</text>{{item.product.store_name}}
+                  </view>
                   <view class="r_type">
                     <view v-if="item.product.store_info">{{item.product.store_info}}</view>
                     <view v-else-if="getSkuName(item)">{{getSkuName(item)}}</view>
@@ -1154,6 +1156,14 @@
                 -webkit-box-orient: vertical; /* 设置为垂直方向布局 */
                 overflow: hidden; /* 隐藏超出部分 */
                 -webkit-line-clamp: 2; /* 限制显示两行文本 */
+                .mer-labels{
+                  background-color: #f84221;
+                  color: #fff;
+                  font-size: 16rpx;
+                  padding: 2rpx 6rpx;
+                  border-radius: 5rpx;
+                  margin-right: 8rpx;
+                }
               }
 
               .r_type {