From 47e7801d4a09dff51d4d6b7e2a156d80b438e0db Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Tue, 28 May 2024 20:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E7=80=91=E5=B8=83=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/list.vue | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 5ad9e66..29e69da 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -109,9 +109,9 @@
 					</view>
 				</view>
 				<view v-else>
-					<u-waterfall v-model="list.data" ref="uWaterfall1">
-						<template v-slot:left="{leftList}">
-							<view class="goods-item goods-item1" v-for="(item, index) in leftList" :key="index"
+					<!-- <u-waterfall v-model="list.data" ref="uWaterfall1"> -->
+						<!-- <template v-slot:left="{leftList}"> -->
+							<view class="goods-item goods-item1" v-for="(item, index) in list.data" :key="index"
 								@click="onTargetDetail(item.goods_id)">
 								<!-- 多列显示 -->
 								<view class="">
@@ -165,23 +165,19 @@
 									</view>
 								</view>
 							</view>
-						</template>
-						<template v-slot:right="{rightList}">
+						<!-- </template> -->
+						<!-- <template v-slot:right="{rightList}">
 							<view class="goods-item goods-item1" v-for="(item, index) in rightList" :key="index"
 								@click="onTargetDetail(item.goods_id)">
-								<!-- 多列显示 -->
 								<view class="">
-									<!-- 商品图片 -->
 									<view class="goods-image">
 										<image class="image" mode="aspectFill" :src="item.goods_image"></image>
-										<!-- <u-lazy-load threshold="0" border-radius="10" image-mode="aspectFill" :loading-img="item.goods_image" :image="item.goods_image" :index="index"></u-lazy-load> -->
+										<u-lazy-load threshold="0" border-radius="10" image-mode="aspectFill" :loading-img="item.goods_image" :image="item.goods_image" :index="index"></u-lazy-load>
 									</view>
 									<view class="detail" style="padding-top: 10rpx;">
-										<!-- 商品名称 -->
 										<view class="goods-name">
 											<text>{{ item.goods_name }}</text>
 										</view>
-										<!-- 商品价格 -->
 										<view class="shenBox">
 											<view class="detail-price oneline-hide">
 												<text class="goods-price f-30 col-m"><text
@@ -194,12 +190,12 @@
 												mode="">
 											</image>
 										</view>
-										<!-- 	<view class="goodsInfo" v-if="item.cmmdty_model">
+											<view class="goodsInfo" v-if="item.cmmdty_model">
 											<view class="oneTip">
 												{{item.cmmdty_model}}
 											</view>
-										</view> -->
-										<!-- <view class="goodsSend">
+										</view>
+										<view class="goodsSend">
 											<view class="sendLeft">
 												<view class="left_1">
 													{{item.goods_source}}
@@ -217,12 +213,12 @@
 												<text v-if="item.delivery_time==5">30天内发货</text>
 												<text v-if="item.delivery_time==6">45天内发货</text>
 											</view>
-										</view> -->
+										</view>
 									</view>
 								</view>
 							</view>
-						</template>
-					</u-waterfall>
+						</template> -->
+					<!-- </u-waterfall> -->
 				</view>
 				<view style="margin-top: 250rpx;" v-if=" total == 0">
 					<u-empty text="暂无数据显示哦～" mode="list"></u-empty>
@@ -327,7 +323,7 @@
 			multiChange(e) {
 				this.multiIndex = Number(e.detail.value)
 				// 刷新列表数据
-				this.$refs.uWaterfall1.clear();
+				// this.$refs.uWaterfall1.clear();
 				this.list.data = []
 				this.list = []
 				//this.list = getEmptyPaginateObj()
@@ -348,7 +344,7 @@
 								if (this.options.categoryId) {
 									that.onChage(that.tabbar[0], 1, 0)
 								} else {
-									this.$refs.uWaterfall1.clear();
+									// this.$refs.uWaterfall1.clear();
 									this.list.data = []
 									this.list = []
 									this.mescroll.resetUpScroll()
@@ -390,7 +386,7 @@
 						this.keyName2 = item.name
 					}
 				}
-				this.$refs.uWaterfall1.clear();
+				// this.$refs.uWaterfall1.clear();
 				this.list.data = []
 				this.list = []
 				this.mescroll.resetUpScroll()
@@ -481,7 +477,7 @@
 				if (newSortType != 'city') {
 					const newSortPrice = newSortType === 'price' ? !app.sortPrice : true
 					app.sortPrice = newSortPrice
-					app.$refs.uWaterfall1.clear();
+					// app.$refs.uWaterfall1.clear();
 					app.list.data = []
 					app.list = []
 					app.mescroll.resetUpScroll()
@@ -741,6 +737,11 @@
 
 	// 平铺显示
 	.goods-list.column-2 {
+		>view {
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+		}
 		.goods-item {
 			// width: 50%;
 		}
@@ -753,7 +754,7 @@
 	.goods-item {
 		background: #FFFFFF;
 		box-sizing: border-box;
-		margin: 20rpx 14rpx 0rpx 0;
+		margin: 20rpx 0 0rpx 0;
 		border-radius: 8rpx;