From db612f13f2962da8e13b63e2e5b830d354fd1f84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Tue, 6 Jul 2021 16:56:32 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json          |   5 ++
 pages/user/user.vue | 112 +-------------------------------------------
 2 files changed, 6 insertions(+), 111 deletions(-)

diff --git a/pages.json b/pages.json
index 397f1bb..42cdd58 100644
--- a/pages.json
+++ b/pages.json
@@ -112,6 +112,11 @@
 	        "iconPath": "static/tabbar/order.png",
 	        "selectedIconPath": "static/tabbar/order-active.png",
 	        "text": "推荐"
+	    },{
+	        "pagePath": "pages/user/user",
+	        "iconPath": "static/tabbar/my.png",
+	        "selectedIconPath": "static/tabbar/my-active.png",
+	        "text": "我的"
 	    }]
 	}
 }
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 56bd579..c322169 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -77,40 +77,7 @@
 					<view class="rhombus lf-m-r-30"></view>
 				</view>
 			</view>
-			<u-waterfall v-model="list" :ref="'uWaterfall-'+ tabIndex">
-				<template v-slot:left="{leftList}">
-					<view class="list-warter" v-for="(item, index) in leftList" :key="index">
-						<u-lazy-load threshold="-450" :image="item.image" :index="index">
-							<view class="list-label">已售8777</view>
-						</u-lazy-load>
-						<view class="lf-p-20">
-							<view class="list-title">
-								{{item.title}}
-							</view>
-							<view class="list-price">
-								<text>{{item.price}}元</text>
-								<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">¥399.00</text>
-							</view>
-						</view>
-					</view>
-				</template>
-				<template v-slot:right="{rightList}">
-					<view class="list-warter" v-for="(item, index) in rightList" :key="index">
-						<u-lazy-load threshold="-450" :image="item.image" :index="index">
-							<view class="list-label">已售8777</view>
-						</u-lazy-load>
-						<view class="lf-p-20">
-							<view class="list-title">
-								{{item.title}}
-							</view>
-							<view class="list-price">
-								<text>{{item.price}}元</text>
-								<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">¥399.00</text>
-							</view>
-						</view>
-					</view>
-				</template>
-			</u-waterfall>
+			<lf-waterfall :list="list"></lf-waterfall>
 		</view>
 	</view>
 </template>
@@ -247,81 +214,4 @@
 			border-bottom: none;
 		}
 	}
-	//waterfall
-	
-	.list-warter {
-		border-radius: 8px;
-		margin: 10px 5px;
-		margin-top: 0px;
-		background-color: #ffffff;
-		// padding: 8px;
-		position: relative;
-		overflow: hidden;
-	}
-	
-	.u-close {
-		position: absolute;
-		top: 32rpx;
-		right: 32rpx;
-	}
-	
-	.list-image {
-		width: 100%;
-		border-radius: 4px;
-	}
-	
-	.list-title {
-		font-size: 28rpx;
-		font-weight: bold;
-		color: $u-main-color;
-	}
-	
-	.list-label{
-		position: absolute;
-		bottom: 0;
-		right: 0;
-		background-color: rgba(0,0,0,0.5);
-		width: 140rpx;
-		height: 48rpx;
-		border-radius: 20rpx 0rpx 0rpx 0rpx;
-		font-size: 22rpx;
-		color: #FFFFFF;
-		line-height: 48rpx;
-		text-align: center;
-	}
-	
-	.list-tag {
-		display: flex;
-		margin-top: 5px;
-	}
-	
-	.list-tag-owner {
-		background-color: $u-type-error;
-		color: #FFFFFF;
-		display: flex;
-		align-items: center;
-		padding: 4rpx 14rpx;
-		border-radius: 50rpx;
-		font-size: 20rpx;
-		line-height: 1;
-	}
-	
-	.list-tag-text {
-		border: 1px solid $u-type-primary;
-		color: $u-type-primary;
-		margin-left: 10px;
-		border-radius: 50rpx;
-		line-height: 1;
-		padding: 4rpx 14rpx;
-		display: flex;
-		align-items: center;
-		border-radius: 50rpx;
-		font-size: 20rpx;
-	}
-	
-	.list-price {
-		font-size: 30rpx;
-		color: $u-type-error;
-		margin-top: 5px;
-	}
 </style>