From 0400da6b868f053613c1da799ead7a8ae85f6c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Fri, 10 Sep 2021 15:26:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=9A=E4=B8=AA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2UI=EF=BC=8C=E4=B8=8E=E6=96=B0=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=9B=BE=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/lf-nav/lf-nav.vue                  |  25 +-
 .../lf-waterfall-pointgoods/lf-waterfall.vue  | 223 ++++++++++++++++++
 pages/coupon/index/index.vue                  |  12 +-
 pages/discover/discover.vue                   |   3 +-
 pages/discover/discoverdetails.vue            |   5 +-
 pages/order/index/onlineorder.vue             |  17 +-
 pages/order/newdetail/newdetail.vue           |  33 ++-
 pages/point/detail/detail.vue                 |   2 +-
 pages/point/exchangeRecord/exchangeRecord.vue |   2 +-
 pages/point/shoppingMall/shoppingMall.vue     |  12 +-
 pages/shop/specialList.vue                    |   4 +-
 pages/user/agreement/agreement.vue            |   6 +-
 pages/user/my/center.vue                      |  44 +++-
 pages/user/my/collect.vue                     |   9 +-
 pages/user/my/setting.vue                     |  21 +-
 pages/user/my/vipinfo.vue                     |   3 +-
 16 files changed, 362 insertions(+), 59 deletions(-)
 create mode 100644 components/lf-waterfall-pointgoods/lf-waterfall.vue

diff --git a/components/lf-nav/lf-nav.vue b/components/lf-nav/lf-nav.vue
index 74c07d2..313bf85 100644
--- a/components/lf-nav/lf-nav.vue
+++ b/components/lf-nav/lf-nav.vue
@@ -13,7 +13,14 @@
 					<text class="lf-iconfont icon-sousuo font-40size" @click="clickHome"></text>
 				  </view>
 				  <view class="title-box" :style="{'margin': headHeight - 36 + 'px auto 0'}">
-					<input class="search" placeholder="搜你想要的" confirm-type="search" v-model="value" @confirm="onSearch" v-if="search" />
+					<!-- <input class="search" placeholder="搜你想要的" confirm-type="search" v-model="value" @confirm="onSearch" v-if="search" /> -->
+					<view class="search" v-if="search">
+						<u-search placeholder="搜你想要的" bg-color="#F4F8F8" 
+							:height="50" :show-action="false" 
+							:disabled="true" 
+							@click="searchClick">
+						</u-search>
+					</view>
 					<text class="font-30size" :style="{color: titleColor}" v-else>{{ title }}</text>
 				  </view>
 			 </block>
@@ -113,12 +120,15 @@
 			// 搜索
 			onSearch(event){
 				this.$emit('search', event.detail.value);
+			},
+			searchClick(){
+				this.$url('/pages/shop/search');
 			}
 		}
 	}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .font-40size{
 	font-size: 40rpx;
 }
@@ -169,15 +179,16 @@
 	text-overflow: ellipsis;
 }
 .search{
-	width: 280rpx;
+	width: 228rpx;
 	height: 50rpx;
-	background-color: #f0f0f0;
-	color: #9a9a9a;
-	border-radius: 30rpx;
 	margin: 0 auto;
 	text-align: left;
+	font-size: 24rpx;
+	/* background-color: #f0f0f0;
+	color: #9a9a9a;
+	border-radius: 30rpx;
 	box-sizing: border-box;
-	padding: 0 20rpx;
+	padding: 0 20rpx; */
 }
 
 .diy-head{
diff --git a/components/lf-waterfall-pointgoods/lf-waterfall.vue b/components/lf-waterfall-pointgoods/lf-waterfall.vue
new file mode 100644
index 0000000..b54ecbd
--- /dev/null
+++ b/components/lf-waterfall-pointgoods/lf-waterfall.vue
@@ -0,0 +1,223 @@
+<template>
+	<view>
+		<u-waterfall v-model="dataList" ref="uWaterfall" v-for="itemFather of listlength" :key="itemFather" v-if="itemFather == tabindex">
+			<template v-slot:left="{leftList}">
+				<view class="list-warter" v-for="(item, index) in leftList" :key="index">
+					<view v-if="!item.is_ad"  @click="onClick(item.id)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :height="!ifsale?333:0" :img-mode="ifsale?'aspectFill':''" :image="item.picture" :index="index">
+							<view class="list-label" v-if="ifsale">已售{{item.sale}}</view>
+						</u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.title}}
+							</view>
+							<view>
+								<text class="lf-font-36 lf-color-primary lf-font-bold">8493</text>
+								<text class="lf-font-24 lf-color-777 lf-m-l-10">个兑换</text>
+							</view>
+						</view>
+					</view>
+					<view v-else @click="goAd(item.type,item.url)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.picture" :index="index"></u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.title}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</template>
+			<template v-slot:right="{rightList}">
+				<view class="list-warter" v-for="(item, index) in rightList" :key="index">
+					<view v-if="!item.is_ad"  @click="onClick(item.id)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :height="!ifsale?333:0" :img-mode="ifsale?'aspectFill':''" :image="item.picture" :index="index">
+							<view class="list-label" v-if="ifsale">已售{{item.sale}}</view>
+						</u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.title}}
+							</view>
+							<view>
+								<text class="lf-font-36 lf-color-primary lf-font-bold">8493</text>
+								<text class="lf-font-24 lf-color-777 lf-m-l-10">个兑换</text>
+							</view>
+						</view>
+					</view>
+					<view v-else @click="goAd(item.type,item.url)">
+						<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.picture" :index="index"></u-lazy-load>
+						<view class="lf-p-20">
+							<view class="list-title">
+								{{item.title}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</template>
+		</u-waterfall>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			list: {
+				type: Array,
+				default: []
+			},
+			tabindex: {
+				type: Number,
+				default: 0
+			},
+			listlength: {
+				type: Number,
+				default: 1
+			},
+			ifsale: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data(){
+			return {
+				// dataList: []
+			}
+		},
+		computed: {
+			dataList: {
+				get() {
+					console.log('组件当前数据====',this.list)
+					console.log(this.ifsale)
+					return this.list; 
+				},
+				set(newValue) {  console.log('newvalue',newValue) }
+			},
+		},
+		// watch: {
+		// 	list(newValue,oldValue) {
+		// 		console.log('值变了',newValue)
+		// 		console.log('旧值',this.$refs)
+		// 		// this.$forceUpdate();
+				
+				
+		// 		this.dataList = newValue
+				
+		// 		console.log('当前值',this.dataList)
+		// 		return newValue
+		// 	}
+		// },
+		onShow(){
+			
+		},
+		deactivated() {
+			
+		},
+		onLoad() {
+			
+		},
+		destroyed() {
+			
+		},
+		methods: {
+			onClick(id){
+				this.$url('/pages/shop/goodsdetail?goods_id='+id);
+				this.$emit('click');
+			},
+			goAd(type,url){
+				if(url) {
+					if(type == 0) {
+						this.$url(url);
+					}else {
+						this.$url('/pages/index/urlWeb?url='+url);
+					}
+				}
+			},
+			clear() {
+				console.log('组件名',this.$refs)
+				this.$refs.uWaterfall[0].clear();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped="scoped">
+	// ====
+	.list-warter {
+		border-radius: 20rpx;
+		margin: 10px 5px;
+		margin-top: 0px;
+		background-color: #ffffff;
+		// padding: 8px;
+		position: relative;
+		overflow: hidden;
+		box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1);
+	}
+	
+	.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;
+		display: flex;
+		align-items: center;
+	}
+	// ====
+</style>
diff --git a/pages/coupon/index/index.vue b/pages/coupon/index/index.vue
index 48df1f8..231f6d4 100644
--- a/pages/coupon/index/index.vue
+++ b/pages/coupon/index/index.vue
@@ -5,7 +5,7 @@
 			<u-tabs :list="tab_list" active-color="#15716E" inactive-color='#777777' :is-scroll="true" :current="current" @change="tabChange"></u-tabs>
 		</view>
 		<view class="coupon-wrap">
-			<view class="coupon-card lf-m-b-30" v-for="i of 3">
+			<view class="coupon-card lf-m-b-30" :class="{'invalid-bg': i == 2}" v-for="i of 3">
 				<view class="coupon-circle-top">
 					<view class="coupon-circle1"></view>
 				</view>
@@ -14,7 +14,10 @@
 				</view>
 				<view class="coupon-radius">
 					<view class="coupon-left">
-						<view class="lf-font-24 lf-color-white">￥<text class="lf-font-36 lf-color-white lf-font-bold">200</text></view>
+						<view class="lf-font-36 lf-color-white" style="line-height: 1;">
+							<text>￥</text>
+							<text class="lf-font-70 lf-font-bold">200</text>
+						</view>
 						<view class="coupon-tag">
 							待使用
 						</view>
@@ -94,7 +97,7 @@
 		margin-left: 84rpx;
 	}
 	.coupon-left {
-		margin-left: 40rpx;
+		margin-left: 20rpx;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
@@ -132,6 +135,9 @@
 		background: #15716E;
 		border-radius: 20rpx;
 	}
+	.invalid-bg{
+		background-color: #999999;
+	}
 	.coupon-radius {
 		width: 664rpx;
 		display: flex;
diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue
index 98cb544..766e2ee 100644
--- a/pages/discover/discover.vue
+++ b/pages/discover/discover.vue
@@ -59,8 +59,7 @@
 				tab_list: [
 					{name: '最新',id: 1},
 					{name: '最热',id: 2},
-					{name: '已关注',id: 3},
-					{name: '消息',id: 4}
+					{name: '已关注',id: 3}
 				],
 				current: 0,
 			}
diff --git a/pages/discover/discoverdetails.vue b/pages/discover/discoverdetails.vue
index e5ed563..0a79e67 100644
--- a/pages/discover/discoverdetails.vue
+++ b/pages/discover/discoverdetails.vue
@@ -8,7 +8,10 @@
 					<view class="head-tag">V</view>
 				</view>
 				<view class="lf-flex-column lf-m-l-20">
-					<view class="lf-font-32 lf-color-black lf-font-bold">最新FUEJFEI</view>
+					<view>
+						<text class="lf-font-32 lf-color-black lf-font-bold lf-m-r-15">最新FUEJFEI</text>
+						<text class="lf-iconfont icon-xiangyou lf-color-777 lf-text-vertical" style="font-size: 18rpx;"></text>
+					</view>
 					<view class="lf-font-24 lf-color-777 lf-m-t-15">08-28 18:39</view>
 				</view>
 			</view>
diff --git a/pages/order/index/onlineorder.vue b/pages/order/index/onlineorder.vue
index 29e6846..02b5763 100644
--- a/pages/order/index/onlineorder.vue
+++ b/pages/order/index/onlineorder.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<lf-nav :spreadOut="true" :showIcon="true" bgColor="white" title="在线商城订单" @changeHeight="e => nav_height = e"></lf-nav>
-		<view class="lf-row-between lf-bg-white">
+		<view class="lf-row-between lf-bg-white" style="padding: 0 32rpx;">
 			<view class="online-tab" :class="online_tab==0?'online-active':''" @click="online_tab = 0">线上订单</view>
 			<view class="online-tab" :class="online_tab==1?'online-active':''" @click="online_tab = 1">线下订单</view>
 		</view>
@@ -10,14 +10,15 @@
 				<u-tabs :list="tab_list" active-color="#15716E" inactive-color='#777777' :is-scroll="true" :current="current" @change="tabChange"></u-tabs>
 			</view>
 			<view class="lf-p-30 lf-flex lf-w-100 lf-bg-white lf-m-b-30">
-				<u-icon name="search" class="search-icon"></u-icon>
-				<input class="rom-search" type="text" placeholder="请输入商品名称" />
+				<!-- <u-icon name="search" class="search-icon"></u-icon>
+				<input class="rom-search" type="text" placeholder="请输入商品名称" /> -->
+				<u-search placeholder="请输入商品名称" bg-color="#F4F8F8" :show-action="false" style="width: 100%;"></u-search>
 			</view>
 			<swiper :style="{height: autoHeight, width: '750rpx'}" :current="current" @change="swiperChange">
 				<swiper-item v-for="(tabItem, tabIndex) in tab_list" :key="tabIndex">
 					<scroll-view :style="{height: autoHeight}" class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
 						
-						<view v-for="(item2,index2) of tabItem.list" :key="index2" class="online-card">
+						<view v-for="(item2,index2) of tabItem.list" :key="index2" class="online-card" @click="$url('/pages/order/newdetail/newdetail')">
 							<view class="lf-font-24 lf-color-777">
 								订单编号783974398749328
 							</view>
@@ -58,9 +59,9 @@
 			</swiper>
 		</view>
 		<view v-else>
-			<view class="special_tab">
+			<!-- <view class="special_tab">
 				<u-tabs :list="tab_list" active-color="#15716E" inactive-color='#777777' :is-scroll="true" :current="current" @change="tabChange"></u-tabs>
-			</view>
+			</view> -->
 			<swiper :style="{height: autoHeightTwo, width: '750rpx', background: '#fff'}" :current="current" @change="swiperChange">
 				<swiper-item v-for="(tabItem, tabIndex) in tab_list" :key="tabIndex">
 					<scroll-view :style="{height: autoHeightTwo}" class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
@@ -189,7 +190,7 @@
 					},
 					{
 						id: 3,
-						name: '拼团中',
+						name: '秒杀单',
 						list: [
 							{
 								id: 10,
@@ -324,7 +325,7 @@
 				return `calc(${this.scrollH}px - ${this.nav_height}px - 86rpx - 120rpx - 120rpx)`;
 			},
 			autoHeightTwo(){
-				return `calc(${this.scrollH}px - ${this.nav_height}px - 86rpx - 90rpx)`;
+				return `calc(${this.scrollH}px - ${this.nav_height}px - 90rpx)`;
 			}
 		},
 		onLoad(){
diff --git a/pages/order/newdetail/newdetail.vue b/pages/order/newdetail/newdetail.vue
index 0a1989d..76638a7 100644
--- a/pages/order/newdetail/newdetail.vue
+++ b/pages/order/newdetail/newdetail.vue
@@ -1,6 +1,15 @@
 <template>
 	<view>
 		<lf-nav title="订单详情" :showIcon="true"></lf-nav>
+		<view class="card" v-if="type == 'default'">
+			<view class="lf-font-28">
+				<text class="lf-color-222 lf-font-bold">王小二</text>
+				<text class="lf-color-777 lf-m-l-20">18284385380</text>
+			</view>
+			<view class="lf-font-28 lf-color-333 lf-m-t-20">
+				<text>广西壮族自治区-南宁市-青秀区-民族大道民族大道民族大道民族大道民族大道民族大道15号</text>
+			</view>
+		</view>
 		<view class="card goods">
 			<view>
 				<text class="lf-iconfont icon-Group- lf-font-30"></text>
@@ -18,12 +27,14 @@
 					</view>
 				</view>
 			</view>
-			<view class="order-num">
-				<text>商品订单号</text>
-				<text>7863465293852482642934</text>
+		</view>
+		<view class="card" v-if="type == 'point'">
+			<view class="lf-row-between lf-font-28">
+				<text class="lf-color-777">积分数量</text>
+				<text class="lf-color-222">385</text>
 			</view>
 		</view>
-		<view class="card">
+		<view class="card" v-if="type == 'default'">
 			<view class="lf-row-between lf-font-28">
 				<text class="lf-color-777">订单总价</text>
 				<text class="lf-color-222">¥385</text>
@@ -35,6 +46,10 @@
 		</view>
 		<view class="card">
 			<view class="lf-row-between lf-font-28">
+				<text class="lf-color-777">商品订单编号</text>
+				<text class="lf-color-222">75894375395739345</text>
+			</view>
+			<view class="lf-row-between lf-font-28 lf-m-t-30">
 				<text class="lf-color-777">订单编号</text>
 				<text class="lf-color-222">75894375395739345</text>
 			</view>
@@ -42,6 +57,10 @@
 				<text class="lf-color-777">创建时间</text>
 				<text class="lf-color-222">2021-09-07 10:21:38</text>
 			</view>
+			<view class="lf-row-between lf-font-28 lf-m-t-30" v-if="type == 'point'">
+				<text class="lf-color-777">兑换状态</text>
+				<text class="lf-color-222">兑换成功</text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -50,11 +69,11 @@
 	export default {
 		data(){
 			return {
-				
+				type: 'default' // point积分订单详情, default默认普通商品订单详情
 			}
 		},
-		onLoad(){
-			
+		onLoad(options){
+			this.type = options.type || this.type;
 		},
 		methods: {
 			
diff --git a/pages/point/detail/detail.vue b/pages/point/detail/detail.vue
index 7cee881..beefdc9 100644
--- a/pages/point/detail/detail.vue
+++ b/pages/point/detail/detail.vue
@@ -10,7 +10,7 @@
 				</view>
 				<view class="point">78326478</view>
 				<view class="head-menu">
-					<view>兑换礼品 ></view>
+					<view @click="$url('/pages/point/shoppingMall/shoppingMall')">兑换礼品 ></view>
 					<view @click="$url('/pages/point/rule/rule')">积分规则 ></view>
 				</view>
 			</view>
diff --git a/pages/point/exchangeRecord/exchangeRecord.vue b/pages/point/exchangeRecord/exchangeRecord.vue
index 64662bb..7359bdb 100644
--- a/pages/point/exchangeRecord/exchangeRecord.vue
+++ b/pages/point/exchangeRecord/exchangeRecord.vue
@@ -5,7 +5,7 @@
 			<u-search placeholder="搜你想要的" v-model="value" @custom="customClick"></u-search>
 		</view>
 		<view class="content">
-			<view class="card" v-for="(item, index) in 2" :key="index">
+			<view class="card" v-for="(item, index) in 2" :key="index" @click="$url('/pages/order/newdetail/newdetail?type=point')">
 				<view>
 					<text class="lf-iconfont icon-Group- lf-font-30"></text>
 					<text class="shop-name">精品超市</text>
diff --git a/pages/point/shoppingMall/shoppingMall.vue b/pages/point/shoppingMall/shoppingMall.vue
index cbf3a4a..d49f988 100644
--- a/pages/point/shoppingMall/shoppingMall.vue
+++ b/pages/point/shoppingMall/shoppingMall.vue
@@ -42,7 +42,7 @@
 				</view>
 			</view>
 			<view class="goods">
-				<lf-waterfall :list="goods_list"></lf-waterfall>
+				<lf-waterfall :list="goods_list" goodsType="point"></lf-waterfall>
 			</view>
 		</view>
 		<u-back-top :scrollTop="pageScrollTop"></u-back-top>
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-	import lfWaterfall from '@/components/lf-waterfall-shopdetails/lf-waterfall.vue';
+	import lfWaterfall from '@/components/lf-waterfall-pointgoods/lf-waterfall.vue';
 	export default {
 		components: {
 			lfWaterfall
@@ -96,7 +96,7 @@
 						price: "2412.00",
 						product_id: 1008,
 						sale: 0,
-						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+						title: "AIMER MEN爱慕先生爱慕先生"
 					},
 					{
 						id: 10,
@@ -106,7 +106,7 @@
 						price: "2412.00",
 						product_id: 1008,
 						sale: 0,
-						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+						title: "AIMER MEN爱慕先生爱慕先生"
 					},
 					{
 						id: 10,
@@ -116,7 +116,7 @@
 						price: "2412.00",
 						product_id: 1008,
 						sale: 0,
-						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+						title: "AIMER MEN爱慕先生爱慕先生"
 					},
 					{
 						id: 10,
@@ -126,7 +126,7 @@
 						price: "2412.00",
 						product_id: 1008,
 						sale: 0,
-						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
+						title: "AIMER MEN爱慕先生爱慕先生"
 					}
 				]
 			}
diff --git a/pages/shop/specialList.vue b/pages/shop/specialList.vue
index 27a39ff..41fefc7 100644
--- a/pages/shop/specialList.vue
+++ b/pages/shop/specialList.vue
@@ -4,7 +4,7 @@
 		<view class="cover">
 			<image class="img" src="https://picsum.photos/200"></image>
 		</view>
-		<view>
+		<view style="padding-top: 20rpx;">
 			<u-tabs :list="tab_list" active-color="#15716E" inactive-color='#777777' :is-scroll="true" :current="current" @change="tabChange"></u-tabs>
 		</view>
 		<view class="goods-list">
@@ -99,7 +99,7 @@
 <style lang="scss" scoped="scoped">
 	.cover{
 		width: 750rpx;
-		height: 245rpx;
+		height: 300rpx;
 		.img{
 			width: 100%;
 			height: 100%;
diff --git a/pages/user/agreement/agreement.vue b/pages/user/agreement/agreement.vue
index 0121196..f49039e 100644
--- a/pages/user/agreement/agreement.vue
+++ b/pages/user/agreement/agreement.vue
@@ -3,17 +3,17 @@
 		<image src="https://picsum.photos/seed/picsum/200/300" class="logo"></image>
 		<view class="item" @tap="chageAgreement('privite')">
 			<view class="txt">隐私协议</view>
-			<view class="rigth lf-iconfont icon--1"></view>
+			<view class="rigth lf-iconfont icon-xiangyou lf-font-24"></view>
 		</view>
 		<view class="item" @tap="chageAgreement('serve')">
 			<view class="txt">服务协议</view>
-			<view class="rigth lf-iconfont icon--1"></view>
+			<view class="rigth lf-iconfont icon-xiangyou lf-font-24"></view>
 		</view>
 		<view class="item" @click="dial">
 			<view class="txt">客服电话</view>
 			<view class="rigth">
 				<text class="lf-m-r-14">0351-8378888</text>
-				<text class="lf-iconfont icon--1"></text>
+				<text class="lf-iconfont icon-xiangyou lf-font-24"></text>
 			</view>
 		</view>
 		<view class="mask" v-if="showAgreement"></view>
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index fa47a59..f420e73 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -2,6 +2,8 @@
 	<view>
 		<lf-nav :spreadOut="false" :showIcon="false" titleColor="white" bgColor="transparent!important" title="会员中心"></lf-nav>
 		<view class="center-top">
+			<view class="bg-left"></view>
+			<view class="bg-right"></view>
 			<view class="ocupy"></view>
 			<view class="lf-flex lf-p-32 lf-row-between">
 				<view class="lf-row-between" @click="$url('/pages/user/my/setting')">
@@ -25,7 +27,7 @@
 				</view>
 				<view class="lf-row-center lf-flex-column" @click="$url('/pages/recharge/balance/balance')">
 					<view class="lf-font-36 lf-color-white">0.00</view>
-					<view class="lf-font-24 lf-color-white">余额</view>
+					<view class="lf-font-24 lf-color-white">余额(元)</view>
 				</view>
 				<view class="lf-row-center lf-flex-column" @click="$url('/pages/coupon/index/index')">
 					<view class="lf-font-36 lf-color-white">0</view>
@@ -35,8 +37,9 @@
 			<view class="center-card">
 				<view class="lf-p-30 lf-row-between lf-w-100" @click="$url('/pages/user/member/quanyi')">
 					<view class="lf-flex-column">
-						<view class="lf-font-48 lf-font-bold" style="color: #15716E;">
-							VIP 预备会员
+						<view class="lf-font-bold" style="color: #15716E;">
+							<text class="lf-font-48">VIP</text>
+							<text class="lf-font-30 lf-m-l-10">预备会员</text>
 						</view>
 						<view class="lf-font-28" style="color: #15716E;">卡号: 638329</view>
 					</view>
@@ -59,7 +62,8 @@
 				</view>
 				<view class="order-tag lf-flex-wrap">
 					<view class="order-children" v-for="i of 4" @click="$url('/pages/order/index/onlineorder')">
-						<view class="function-tag"></view>
+						<!-- <view class="function-tag"></view> -->
+						<view class="lf-iconfont icon-huiyuan"></view>
 						<view class="lf-color-black lf-font-28 lf-m-t-20">待付款</view>
 					</view>
 				</view>
@@ -75,7 +79,7 @@
 					<view></view>
 				</view>
 				<view class="order-tag lf-flex-wrap">
-					<view class="order-children" 
+					<view class="order-children my-service" 
 						v-for="(item, index) in my_service_list" :key="index"
 						@click="$url(item.path)">
 						<!-- <view class="function-tag"></view> -->
@@ -143,6 +147,18 @@
 			margin-top: 50rpx;
 		}
 	}
+	.my-service{
+		width: 190rpx;
+		&:nth-child(3n){
+			margin-right: 0;
+		}
+		&:nth-child(4n) {
+			margin-right: 27rpx;
+		}
+		&:nth-child(n+4){
+			margin-top: 50rpx;
+		}
+	}
 	.function-tag {
 		width: 50rpx;
 		height: 50rpx;
@@ -212,6 +228,24 @@
 		width: 750rpx;
 		height: 512rpx;
 		background: linear-gradient(90deg, #22A2A0 0%, #187B7A 100%);
+		.bg-left{
+			position: absolute;
+			width: 196rpx;
+			height: 196rpx;
+			border-radius: 50%;
+			background-color: rgba(255,255,255,0.04);
+			left: -92rpx;
+			bottom: 60rpx;
+		}
+		.bg-right{
+			position: absolute;
+			width: 520rpx;
+			height: 520rpx;
+			border-radius: 50%;
+			background-color: rgba(255,255,255,0.04);
+			right: -168rpx;
+			top: -122rpx;
+		}
 	}
 	.center-img {
 		width: 100rpx;
diff --git a/pages/user/my/collect.vue b/pages/user/my/collect.vue
index 9dd7e91..00564c0 100644
--- a/pages/user/my/collect.vue
+++ b/pages/user/my/collect.vue
@@ -1,15 +1,15 @@
 <template>
 	<view>
-		<lf-nav :spreadOut="true" :showIcon="true" title="收藏"></lf-nav>
+		<lf-nav :spreadOut="true" :showIcon="true" bgColor="#fff" title="收藏"></lf-nav>
 		<view v-if="title_tab.length">
 			<u-tabs :list="title_tab" active-color="#15716E" inactive-color='#777777' :is-scroll="true" :current="title_current" @change="titletabChange"></u-tabs>
 		</view>
 		
 		<view v-if="title_current==0">
-			<view class="lf-p-30 lf-flex" v-for="i of 4">
+			<view class="lf-p-30 lf-flex" v-for="i of 8">
 				<image class="collect-img" src="https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png" mode="aspectFill"></image>
-				<view class="lf-flex-column lf-m-l-20" style="min-height: 160rpx;justify-content: space-between;">
-					<view class="lf-font-36 lf-color-black lf-line-1" style="width: 500rpx;">luckin coffee 瑞幸瑞幸咖啡瑞幸咖啡瑞幸咖啡瑞幸咖啡咖啡</view>
+				<view class="lf-flex-column lf-m-l-20" style="width: 480rpx;min-height: 160rpx;justify-content: space-between;">
+					<view class="lf-font-36 lf-color-black lf-line-1">luckin coffee 瑞幸瑞幸咖啡瑞幸咖啡瑞幸咖啡瑞幸咖啡咖啡</view>
 					<view class="lf-font-24 lf-color-777">餐饮·美食｜18件在售</view>
 					<view class="lf-font-24 lf-color-777"><u-icon name="map" class="lf-m-r-10"></u-icon>L2</view>
 				</view>
@@ -24,6 +24,7 @@
 				<lf-nocontent v-else></lf-nocontent>
 			</view>
 		</view>
+		<u-back-top :scrollTop="pageScrollTop"></u-back-top>
 	</view>
 </template>
 
diff --git a/pages/user/my/setting.vue b/pages/user/my/setting.vue
index b371245..fc7ae0e 100644
--- a/pages/user/my/setting.vue
+++ b/pages/user/my/setting.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<lf-nav :spreadOut="true" :showIcon="true" title="设置"></lf-nav>
-		<view class="lf-p-l-32 lf-p-r-32">
+		<view class="lf-p-l-32 lf-p-r-32 lf-bg-white">
 			<view class="set-tag lf-border-bottom" @click="$url('/pages/user/my/editname')">
 				<view class="lf-font-28 lf-color-black">
 					昵称
@@ -11,7 +11,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="lf-p-l-32 lf-p-r-32">
+		<view class="lf-p-l-32 lf-p-r-32 lf-bg-white">
 			<view class="set-tag lf-border-bottom" @click="$msg('敬请期待')">
 				<view class="lf-font-28 lf-color-black">
 					头像
@@ -24,7 +24,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="lf-p-l-32 lf-p-r-32">
+		<view class="lf-p-l-32 lf-p-r-32 lf-bg-white">
 			<view class="set-tag lf-border-bottom" @click="$url('/pages/user/my/vipinfo')">
 				<view class="lf-font-28 lf-color-black">
 					会员资料
@@ -34,7 +34,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="lf-p-l-32 lf-p-r-32">
+		<view class="lf-p-l-32 lf-p-r-32 lf-bg-white">
 			<view class="set-tag" @click="$url('/pages/address/list/list')">
 				<view class="lf-font-28 lf-color-black">
 					地址管理
@@ -45,7 +45,7 @@
 			</view>
 		</view>
 		<self-line/> 
-		<view class="lf-p-l-32 lf-p-r-32">
+		<view class="lf-p-l-32 lf-p-r-32 lf-bg-white">
 			<view class="set-tag lf-border-bottom" @click="$url('/pages/user/my/verificationPhone')">
 				<view class="lf-font-28 lf-color-black">
 					修改手机号
@@ -55,7 +55,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="lf-p-l-32 lf-p-r-32">
+		<view class="lf-p-l-32 lf-p-r-32 lf-bg-white">
 			<view class="set-tag" @click="$url('/pages/user/my/setPassword')">
 				<view class="lf-font-28 lf-color-black">
 					支付密码设置
@@ -66,7 +66,7 @@
 			</view>
 		</view>
 		<self-line/> 
-		<view class="lf-p-l-32 lf-p-r-32">
+		<view class="lf-p-l-32 lf-p-r-32 lf-bg-white">
 			<view class="set-tag lf-border-bottom" @click="$url('/pages/user/agreement/agreement')">
 				<view class="lf-font-28 lf-color-black">
 					关于我们
@@ -76,7 +76,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="lf-p-l-32 lf-p-r-32">
+		<view class="lf-p-l-32 lf-p-r-32 lf-bg-white">
 			<view class="set-tag" @click="$msg('敬请期待')">
 				<view class="lf-font-28 lf-color-black">
 					客服电话
@@ -104,6 +104,11 @@
 	}
 </script>
 
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
 <style scoped lang="scss">
 	.set-btn {
 		width: 550rpx;
diff --git a/pages/user/my/vipinfo.vue b/pages/user/my/vipinfo.vue
index ac28119..f9f6b95 100644
--- a/pages/user/my/vipinfo.vue
+++ b/pages/user/my/vipinfo.vue
@@ -99,7 +99,7 @@
 			温馨提示：身份证号出生日期不支持线上修改，如需修改请前往服务台办理。
 		</view>
 		
-		<button class="set-btn">退出账号</button>
+		<button class="set-btn" hover-class="lf-opacity">保存</button>
 	</view>
 	
 </template>
@@ -136,6 +136,7 @@
 		margin: 40rpx auto;
 		font-size: 32rpx;
 		color: white;
+		line-height: 100rpx;
 	}
 	.edit-input {
 		text-align: right;