1

pages/index/index.vue

@@ -330,13 +330,11 @@
 										￥{{(item.deliveryFee + item.deliveryFeeMarketplace).toFixed(2)}}
 									</view>
 									<view class="shangjia">
-										<text
+										<text class="shop-name">{{item.shopName != null ? item.shopName : ''}}</text>
-											style="font-weight: 700;">{{item.shopName != null ? item.shopName : ''}}</text>
+										<view v-if="item.deliveryType == 1" class="shop-detail-tag">
-										<view v-if="item.deliveryType == 1"
-											style="width: 32rpx;height: 30rpx;font-weight: 700;font-size: 20rpx;color: #fff;text-align: center;background: #00BFFF;border-radius: 10rpx;margin: 20rpx 0 0 10rpx;line-height: 30rpx;">
 											详
 										</view>
-										<view v-else style="font-weight: 700;padding-left: 30rpx;">
+										<view v-else class="shop-count">
 											共{{item.allCount ? item.allCount : 0}}件
 										</view>
 									</view>
@@ -4111,11 +4109,46 @@
 
 	.shangjia {
 		width: 100%;
-		height: 70rpx;
 		margin: 0 auto;
-		line-height: 70rpx;
+		min-height: 70rpx;
-		padding-left: 28rpx;
+		padding: 12rpx 118rpx 8rpx 28rpx;
+		box-sizing: border-box;
 		display: flex;
+		align-items: flex-start;
+	}
+
+	.shop-name {
+		flex: 1;
+		min-width: 0;
+		font-weight: 700;
+		line-height: 38rpx;
+		word-break: break-all;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.shop-detail-tag {
+		flex-shrink: 0;
+		width: 32rpx;
+		height: 30rpx;
+		margin: 4rpx 0 0 10rpx;
+		border-radius: 10rpx;
+		background: #00BFFF;
+		color: #fff;
+		font-size: 20rpx;
+		font-weight: 700;
+		line-height: 30rpx;
+		text-align: center;
+	}
+
+	.shop-count {
+		flex-shrink: 0;
+		padding-left: 30rpx;
+		font-weight: 700;
+		line-height: 38rpx;
 	}
 
 	.maotou {