From c9608030d4f960ab6a5919716109148b0419cf50 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Mon, 27 May 2024 16:54:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=95=86=E5=93=81=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E7=80=91=E5=B8=83=E6=B5=81=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/newPeople.vue | 16 ++++++++--------
 pages/cart/index.vue         | 28 +++++++++++++++-------------
 pages/index/index.vue        | 28 +++++++++++++++-------------
 pages/user/index.vue         | 25 +++++++++++++------------
 4 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/pages/activity/newPeople.vue b/pages/activity/newPeople.vue
index 0e82e46..295717d 100644
--- a/pages/activity/newPeople.vue
+++ b/pages/activity/newPeople.vue
@@ -28,9 +28,9 @@
 					:is-scroll="true" font-size="30" v-model="current" @change="onChosed"></u-tabs>
 			</view>
 			<view scroll-x class="b">
-				<u-waterfall v-model="goodList" ref="uWaterfall1">
-					<template v-slot:left="{leftList}">
-						<view class="item" v-for="(item, index) in leftList" :key="index"
+				<!-- <u-waterfall v-model="goodList" ref="uWaterfall1"> -->
+					<!-- <template v-slot:left="{leftList}"> -->
+						<view class="item" v-for="(item, index) in goodList" :key="index"
 							@click="goDetail(item.goods_id)">
 							<image :src="item.goods_image" mode="widthFix"></image>
 							<view class="title">
@@ -43,8 +43,8 @@
 								<view class="o">￥{{item.line_price_min?Number(item.line_price_min):'0.00'}}</view>
 							</view>
 						</view>
-					</template>
-					<template v-slot:right="{rightList}">
+					<!-- </template> -->
+					<!-- <template v-slot:right="{rightList}">
 						<view class="item" v-for="(item, index) in rightList" :key="index"
 							@click="goDetail(item.goods_id)">
 							<image :src="item.goods_image" mode="widthFix"></image>
@@ -58,8 +58,8 @@
 								<view class="o">￥{{item.line_price_min?Number(item.line_price_min):'0.00'}}</view>
 							</view>
 						</view>
-					</template>
-				</u-waterfall>
+					</template> -->
+				<!-- </u-waterfall> -->
 				<u-empty text="暂无数据显示哦～" v-if="goodList.length==0" mode="list"></u-empty>
 			</view>
 		</view>
@@ -146,7 +146,7 @@
 				let app = this;
 				app.current = index;
 				app.goodList  = []
-				app.$refs.uWaterfall1.clear();
+				// app.$refs.uWaterfall1.clear();
 				app.getListgoodData(index != 0 ? app.menuList[index].category_id : '')
 			},
 			openPage() {
diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index 7c162ff..e1bb4ea 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -68,9 +68,9 @@
 			</image>
 		</view>
 		<view class="goodsRecommend">
-			<u-waterfall v-model="goodsRecommend" ref="uWaterfall1">
-				<template v-slot:left="{leftList}">
-					<view class="goodsItem" v-for="(item,index) in leftList" @click="onTargetGoods(item.goods_id)"
+			<!-- <u-waterfall v-model="goodsRecommend" ref="uWaterfall1"> -->
+				<!-- <template v-slot:left="{leftList}"> -->
+					<view class="goodsItem" v-for="(item,index) in goodsRecommend" @click="onTargetGoods(item.goods_id)"
 						:key="index">
 						<view class="pic">
 							<image :src="item.goods_image" mode="aspectFill"></image>
@@ -117,8 +117,8 @@
 							</view>
 						</view> -->
 						</view>
-				</template>
-				<template v-slot:right="{rightList}">
+				<!-- </template> -->
+				<!-- <template v-slot:right="{rightList}">
 					<view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList"
 						@click="onTargetGoods(item.goods_id)" :key="index">
 						<view class="pic">
@@ -130,7 +130,6 @@
 								<text class="name">{{item.goods_name}}</text>
 							</view>
 						</view>
-						<!-- 商品价格 -->
 						<view class="shenBox">
 							<view class="detail-price oneline-hide">
 								<text class="goods-price f-30 col-m"><text
@@ -141,12 +140,12 @@
 							</view>
 							<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode=""></image>
 						</view>
-						<!-- <view class="goodsInfo1" v-if="item.cmmdty_model">
+						<view class="goodsInfo1" 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}}
@@ -164,10 +163,10 @@
 								<text v-if="item.delivery_time==5">30天内发货</text>
 								<text v-if="item.delivery_time==6">45天内发货</text>
 							</view>
-						</view> -->
+						</view>
 					</view>
-				</template>
-			</u-waterfall>
+				</template> -->
+			<!-- </u-waterfall> -->
 			<u-empty text="暂无数据显示哦～" v-if="goodsRecommend.length==0" mode="list"></u-empty>
 		</view>
 
@@ -479,6 +478,9 @@
 	.goodsRecommend {
 		overflow: hidden;
 		margin: 10rpx 22rpx 20rpx 22rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
 
 		.goodsItem {
 			width: 348rpx;
@@ -487,7 +489,7 @@
 			background-color: #ffffff;
 			padding: 20rpx;
 			box-sizing: border-box;
-			margin: 0rpx 14rpx 20rpx 0;
+			margin: 0rpx 0 20rpx 0;
 
 			.pic {
 				width: 100%;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2796523..15b88a7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -238,9 +238,9 @@
 					</view>
 				</view>
 				<view class="goodsRecommend">
-					<u-waterfall v-model="goodsRecommend" ref="uWaterfall1">
-						<template v-slot:left="{leftList}">
-							<view class="goodsItem" v-for="(item,index) in leftList" @click="goDetails(item)"
+					<!-- <u-waterfall v-model="goodsRecommend" ref="uWaterfall1"> -->
+						<!-- <template v-slot:left="{leftList}"> -->
+							<view class="goodsItem" v-for="(item,index) in goodsRecommend" @click="goDetails(item)"
 								:key="index">
 								<view class="pic">
 									<image :src="item.goods_image" mode="aspectFill"></image>
@@ -288,8 +288,8 @@
 									</view>
 								</view> -->
 							</view>
-						</template>
-						<template v-slot:right="{rightList}">
+						<!-- </template> -->
+						<!-- <template v-slot:right="{rightList}">
 							<view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList"
 								@click="goDetails(item)" :key="index">
 								<view class="pic">
@@ -301,7 +301,6 @@
 										<text class="name">{{item.goods_name}}</text>
 									</view>
 								</view>
-								<!-- 商品价格 -->
 								<view class="shenBox">
 									<view class="detail-price oneline-hide">
 										<text class="goods-price f-30 col-m"><text
@@ -313,12 +312,12 @@
 									<image :src="$picUrl+'/static/detail/redShen.png'" v-if="item.is_check==1" mode="">
 									</image>
 								</view>
-								<!-- <view class="goodsInfo1" v-if="item.cmmdty_model">
+								<view class="goodsInfo1" 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}}
@@ -336,10 +335,10 @@
 										<text v-if="item.delivery_time==5">30天内发货</text>
 										<text v-if="item.delivery_time==6">45天内发货</text>
 									</view>
-								</view> -->
+								</view>
 							</view>
-						</template>
-					</u-waterfall>
+						</template> -->
+					<!-- </u-waterfall> -->
 					<u-empty text="暂无数据显示哦～" v-if="goodsRecommend.length==0" mode="list"></u-empty>
 				</view>
 			</view>
@@ -1890,6 +1889,9 @@
 			.goodsRecommend {
 				overflow: hidden;
 				margin-top: 20rpx;
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
 
 				.goodsItem {
 					width: 345rpx;
@@ -1898,7 +1900,7 @@
 					background-color: #ffffff;
 					padding: 20rpx;
 					box-sizing: border-box;
-					margin: 0rpx 14rpx 20rpx 0;
+					margin: 0rpx 0 20rpx 0;
 
 					.pic {
 						width: 100%;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 36dfe78..ca47f53 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -517,9 +517,9 @@
 					:src="$picUrl+'/static/user/right.png'"></image>
 			</view>
 			<view class="goodsRecommend" v-if="isLogin == false || userInfo.user_type != 40">
-				<u-waterfall v-model="suggestGoodsList" ref="uWaterfall1">
-					<template v-slot:left="{leftList}">
-						<view class="goodsItem" v-for="(item,index) in leftList" @click="goodsDetail(item)"
+				<!-- <u-waterfall v-model="suggestGoodsList" ref="uWaterfall1"> -->
+					<!-- <template v-slot:left="{leftList}"> -->
+						<view class="goodsItem" v-for="(item,index) in suggestGoodsList" @click="goodsDetail(item)"
 							:key="index">
 							<view class="pic">
 								<image :src="item.goods_image" mode="aspectFill"></image>
@@ -562,8 +562,8 @@
 								</view> -->
 							</view>
 						</view>
-					</template>
-					<template v-slot:right="{rightList}">
+					<!-- </template> -->
+					<!-- <template v-slot:right="{rightList}">
 						<view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList"
 							@click="goodsDetail(item)" :key="index">
 							<view class="pic">
@@ -581,12 +581,12 @@
 									<text
 										style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
 								</view>
-								<!-- <view class="goodsInfo1" v-if="item.cmmdty_model">
+								<view class="goodsInfo1" 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}}
@@ -604,12 +604,12 @@
 										<text v-if="item.delivery_time==5">30天内发货</text>
 										<text v-if="item.delivery_time==6">45天内发货</text>
 									</view>
-								</view> -->
+								</view>
 							</view>
 
 						</view>
-					</template>
-				</u-waterfall>
+					</template> -->
+				<!-- </u-waterfall> -->
 			</view>
 		</view>
 
@@ -1289,7 +1289,8 @@
 			background-color: #ffffff;
 			padding: 20rpx;
 			box-sizing: border-box;
-			margin: 0rpx 14rpx 20rpx 0;
+			// margin: 0rpx 14rpx 20rpx 0;
+			margin: 0 0 20rpx 0;
 
 			.pic {
 				width: 100%;