From f31bd3d4516ccb83219489a8c2c2c36a61724a65 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, 7 Sep 2021 17:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B5=E9=9D=A2=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/index-nav/index-nav.vue            | 28 +++++-----
 components/lf-indexFind/lf-indexFind.vue      |  7 ++-
 .../lf-indexShopMatrix/lf-indexShopMatrix.vue |  4 +-
 .../lf-multiColumnAd/lf-multiColumnAd.vue     |  6 +--
 components/lf-nav/lf-nav.vue                  |  2 -
 components/lf-seckill/lf-seckill.vue          |  2 +-
 .../lf-shopGoodsCard/lf-shopGoodsCard.vue     |  6 +--
 .../lf-waterfall-shopdetails/lf-waterfall.vue |  2 +-
 pages/index/category/category.vue             | 22 +++++---
 pages/index/category/testdata.js              |  6 +--
 pages/index/index/index.vue                   | 12 +++--
 pages/order/confirm/confirm.vue               |  2 +-
 pages/shop/goodsdetail.vue                    | 13 +++--
 pages/user/member/service.vue                 |  2 +-
 pages/user/my/center.vue                      | 52 +++++++++++++++----
 pages/user/my/setting.vue                     | 18 +++----
 16 files changed, 115 insertions(+), 69 deletions(-)

diff --git a/components/index-nav/index-nav.vue b/components/index-nav/index-nav.vue
index c88b95b..0c1e101 100644
--- a/components/index-nav/index-nav.vue
+++ b/components/index-nav/index-nav.vue
@@ -22,55 +22,55 @@ export default {
   data() {
     return {
 		list: [{
-			link: '/pages/store/groups/groups',
+			link: '/pages/index/category/category?current=0&type=0',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '面部护肤'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '/pages/index/category/category?current=0&type=3',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '国际精品'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '/pages/point/shoppingMall/shoppingMall',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '积分商城'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '/pages/index/category/category?current=0&type=4',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '服装内衣'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '/pages/index/category/category?current=0&type=6',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '数码家电'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '黄金珠宝'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '/pages/user/member/service',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '会员服务'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '/pages/index/eventRegistration/eventRegistration',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '活动报名'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '餐饮配套'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '领券中心'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '/pages/user/my/chatonline',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '在线客服'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '/pages/index/category/category?current=0&type=7',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '鞋履箱包'
 		},{
-			link: '/pages/store/groups/groups',
+			link: '/pages/index/category/category?current=0&type=8',
 			image: 'https://cdn.guojiang.club/storage/uploads/images/2020_06_05/rNCqCVUgi5GFYntpqmevHEaO1NYt5PZ2tgjEXRMU.png',
 			name: '滋补保健'
 		}],
@@ -95,7 +95,7 @@ export default {
     methods: {
       _jumpImg(e) {
         var src = e.currentTarget.dataset.src;
-        if (!src || src == 'uto_miniprogram') return;
+        if (!src || src == 'uto_miniprogram') return this.$msg('敬请期待');
         wx.navigateTo({
           url: src
         });
diff --git a/components/lf-indexFind/lf-indexFind.vue b/components/lf-indexFind/lf-indexFind.vue
index 1b0e0ee..f1bebd9 100644
--- a/components/lf-indexFind/lf-indexFind.vue
+++ b/components/lf-indexFind/lf-indexFind.vue
@@ -1,9 +1,12 @@
 <template>
 	<view class="centent">
-		<view class="title">精选发现好物</view>
+		<view class="title" @click="$url('/pages/discover/discover')">精选发现好物</view>
 		<scroll-view class="find-scroll" :scroll-x="true">
 			<view class="find-content">
-				<view class="find-item" :class="{'max-item': index == 0}" v-for="(item, index) in 5" :key="index">
+				<view class="find-item" 
+					:class="{'max-item': index == 0}" 
+					@click="$url('/pages/discover/discoverdetails')"
+					v-for="(item, index) in 5" :key="index">
 					<image class="img" src="https://picsum.photos/200/300"></image>
 					<view class="lf-line-2 info">南边开，风儿吹，北边放，花儿开，西边来，春归去，东边来，北边跑</view>
 				</view>
diff --git a/components/lf-indexShopMatrix/lf-indexShopMatrix.vue b/components/lf-indexShopMatrix/lf-indexShopMatrix.vue
index da9d822..dbcfbed 100644
--- a/components/lf-indexShopMatrix/lf-indexShopMatrix.vue
+++ b/components/lf-indexShopMatrix/lf-indexShopMatrix.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="content">
-		<view class="title">大牌不停推</view>
+		<view class="title" @click="$url('/pages/index/category/category')">大牌不停推</view>
 		<view class="flex-box">
-			<view class="item" v-for="(item, index) in 16" :key="index">
+			<view class="item" v-for="(item, index) in 16" :key="index" @click="$url('/pages/shop/shopdetail')">
 				<image class="bg-img" src="https://picsum.photos/200/300"></image>
 				<view class="shop">
 					<image src="../../static/recommend-r.png"></image>
diff --git a/components/lf-multiColumnAd/lf-multiColumnAd.vue b/components/lf-multiColumnAd/lf-multiColumnAd.vue
index 46b2386..dad5f56 100644
--- a/components/lf-multiColumnAd/lf-multiColumnAd.vue
+++ b/components/lf-multiColumnAd/lf-multiColumnAd.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="content">
-		<view class="left">
+		<view class="left" @click="$msg('敬请期待')">
 			<image class="left-img"></image>
 		</view>
 		<view class="right">
-			<view class="right-img">
+			<view class="right-img" @click="$msg('敬请期待')">
 				<image></image>
 			</view>
-			<view class="right-img">
+			<view class="right-img" @click="$msg('敬请期待')">
 				<image></image>
 			</view>
 		</view>
diff --git a/components/lf-nav/lf-nav.vue b/components/lf-nav/lf-nav.vue
index eecd0ed..74c07d2 100644
--- a/components/lf-nav/lf-nav.vue
+++ b/components/lf-nav/lf-nav.vue
@@ -95,7 +95,6 @@
 				}
 			},
 			$back(){
-				// #ifdef H5
 				let pages = getCurrentPages();
 				if(pages.length <= 1){
 					uni.redirectTo({
@@ -103,7 +102,6 @@
 					})
 					return;
 				}
-				// #endif
 				uni.navigateBack();
 			},
 			// 监听回到首页
diff --git a/components/lf-seckill/lf-seckill.vue b/components/lf-seckill/lf-seckill.vue
index 5969a55..000526c 100644
--- a/components/lf-seckill/lf-seckill.vue
+++ b/components/lf-seckill/lf-seckill.vue
@@ -6,7 +6,7 @@
 			<view class="desc">低价不等人，快来秒杀啦～</view>
 			<scroll-view class="scroll-view" :scroll-x="true">
 				<view class="lf-flex">
-					<view class="goods-item" v-for="(item, index) in 4" :key="index">
+					<view class="goods-item" v-for="(item, index) in 4" :key="index" @click="$url('/pages/shop/goodsdetail')">
 						<image class="goods-img"></image>
 						<view class="lf-line-1 goods-title">日本sk-ll小灯跑</view>
 						<view class="goods-price">
diff --git a/components/lf-shopGoodsCard/lf-shopGoodsCard.vue b/components/lf-shopGoodsCard/lf-shopGoodsCard.vue
index 0ac1163..163662e 100644
--- a/components/lf-shopGoodsCard/lf-shopGoodsCard.vue
+++ b/components/lf-shopGoodsCard/lf-shopGoodsCard.vue
@@ -1,18 +1,18 @@
 <template>
 	<view class="content">
-		<view class="shop">
+		<view class="shop" @click="$url('/pages/shop/specialList')">
 			<image class="img" src="https://picsum.photos/seed/picsum/200/300" mode="aspectFill"></image>
 		</view>
 		<scroll-view class="scroll-view" :scroll-x="true">
 			<view class="scroll-content">
-				<view class="goods-item" v-for="(item, index) in 5" :key="index">
+				<view class="goods-item" v-for="(item, index) in 5" :key="index" @click="$url('/pages/shop/goodsdetail')">
 					<image class="goods-img"></image>
 					<view class="goods-info">
 						<view class="lf-line-1">猪大肠卖咯 5毛钱一斤咯</view>
 						<view>￥0.5</view>
 					</view>
 				</view>
-				<view class="goods-item">
+				<view class="goods-item" @click="$url('/pages/shop/specialList')">
 					<view class="more-box">
 						<text>查看更多</text>
 						<text class="lf-iconfont icon--2 lf-text-vertical"></text>
diff --git a/components/lf-waterfall-shopdetails/lf-waterfall.vue b/components/lf-waterfall-shopdetails/lf-waterfall.vue
index 9613b67..afe6314 100644
--- a/components/lf-waterfall-shopdetails/lf-waterfall.vue
+++ b/components/lf-waterfall-shopdetails/lf-waterfall.vue
@@ -121,7 +121,7 @@
 		},
 		methods: {
 			onClick(id){
-				this.$url('/pages/goodsDetail/index?goods_id='+id);
+				this.$url('/pages/shop/goodsdetail?goods_id='+id);
 				this.$emit('click');
 			},
 			goAd(type,url){
diff --git a/pages/index/category/category.vue b/pages/index/category/category.vue
index 690d255..987f221 100644
--- a/pages/index/category/category.vue
+++ b/pages/index/category/category.vue
@@ -49,7 +49,10 @@
 			</view>
 			<!-- 内容 -->
 			<scroll-view class="brand-scroll" :scroll-into-view="scrollAnchorId" :scroll-y="true" :style="{height: otherHeight}">
-				<view class="lf-flex brand-item" :id="'anchor-'+ index" v-for="(item, index) in point_list" :key="index">
+				<view class="lf-flex brand-item" 
+					:id="'anchor-'+ index" 
+					@click="$url('/pages/shop/shopdetail')"
+					v-for="(item, index) in point_list" :key="index">
 					<image class="img" src="https://picsum.photos/200"></image>
 					<view class="info">
 						<view class="lf-font-36 lf-font-bold lf-color-black">luckin coffee 瑞幸咖啡 {{ item }}</view>
@@ -112,10 +115,15 @@
 			lfNav,
 			lfTabbar
 		},
-		onLoad() {
+		onLoad(options) {
 			// https://ext.dcloud.net.cn/plugin?id=5031
-			let info = uni.getSystemInfoSync();
+			if(this.$isRight(options)){
+				this.current = options.current || 1;
+				this.left_selectIndex = options.type || 0;
+				this.right_selectIndex = options.type || 0;
+			}
 			
+			let info = uni.getSystemInfoSync();
 			let self = this;
 			self.scrollH = info.screenHeight;
 			self.subItemW = parseInt((info.screenWidth * (2 / 3) - 15 * 2 - 24) / 3);
@@ -151,10 +159,7 @@
 			},
 			// 右边点击
 			rightTap: function() {
-				uni.showModal({
-					title: '点击了',
-					showCancel: false
-				});
+				this.$msg('敬请期待')
 			},
 			rightScroll: function(e) {
 				let scrollH = e.detail.scrollTop + 30;
@@ -380,6 +385,8 @@
 				background-color: #FFFFFF;
 				display: flex;
 				flex-wrap: wrap;
+				position: relative;
+				z-index: 1;
 				.filter-item{
 					width: 215rpx;
 					height: 65rpx;
@@ -437,6 +444,7 @@
 		background-color: rgba(0,0,0,0.3);
 		border-radius: 30rpx 0rpx 0rpx 30rpx;
 		padding: 14rpx 0rpx;
+		z-index: 2;
 		.point-item{
 			font-size: 24rpx;
 			color: #FFFFFF;
diff --git a/pages/index/category/testdata.js b/pages/index/category/testdata.js
index a46f780..60232ae 100644
--- a/pages/index/category/testdata.js
+++ b/pages/index/category/testdata.js
@@ -175,7 +175,7 @@ export default [{
 		]
 	},
 	{
-		name: '服装内衣',
+		name: '数码家电',
 		subArr: [{
 				img: 'https://picsum.photos/200',
 				name: '悲剧2'
@@ -187,7 +187,7 @@ export default [{
 		]
 	},
 	{
-		name: '服装内衣',
+		name: '鞋履箱包',
 		subArr: [{
 				img: 'https://picsum.photos/200',
 				name: '悲剧2'
@@ -199,7 +199,7 @@ export default [{
 		]
 	},
 	{
-		name: '滴滴滴等',
+		name: '滋补保健',
 		subArr: [{
 				img: 'https://picsum.photos/200',
 				name: '悲剧2'
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index 01e5d65..3ce200c 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -1,15 +1,15 @@
 <template>
     <block v-if="microData && microData.micro_page && microData.micro_page.meta">
 		<lf-nav title="主页" :spreadOut="false" :bgColor="nav_bg_color" :diy="true">
-			<view class="lf-nav-capsule">
+			<view class="lf-nav-capsule" @click="$url('/pages/user/member/code')">
 				<text class="lf-iconfont icon-nv"></text>
 				<text class="lf-m-l-4">会员</text>
 			</view>
-			<view class="lf-nav-capsule">
+			<view class="lf-nav-capsule" @click="$msg('敬请期待')">
 				<text class="lf-iconfont icon-nv"></text>
 				<text class="lf-m-l-4">停车</text>
 			</view>
-			<view class="lf-nav-capsule lf-bg-search">
+			<view class="lf-nav-capsule lf-bg-search" @click="$msg('敬请期待')">
 				<text class="lf-iconfont icon-nv"></text>
 				<text class="lf-m-l-4">搜索</text>
 			</view>
@@ -109,7 +109,7 @@
 					</view>
 					<!-- TODO 店铺商品展示模块 -->
 					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
-						<view class="lf-module-title">好物种草间</view>
+						<view class="lf-module-title" @click="$url('/pages/shop/goodsSpecial')">好物种草间</view>
 						<lf-shop-goods-card v-for="(d_item,d_index) in 2" :key="d_index"></lf-shop-goods-card>
 					</view>
 					 <!--图片魔方-->
@@ -127,7 +127,9 @@
 					<!-- TODO 为你推荐模块 -->
 					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
 						<view class="lf-module-title">为你推荐</view>
-						<lf-waterfall :list="recommend_list"></lf-waterfall>
+						<view style="padding: 0 11px;">
+							<lf-waterfall :list="recommend_list"></lf-waterfall>
+						</view>
 					</view>
 		        </view>
 		    </block>
diff --git a/pages/order/confirm/confirm.vue b/pages/order/confirm/confirm.vue
index 3e31c7a..ef82662 100644
--- a/pages/order/confirm/confirm.vue
+++ b/pages/order/confirm/confirm.vue
@@ -9,7 +9,7 @@
 			</view>
 		</view>
 		<view class="card address" v-if="mode == 1">
-			<view>
+			<view @click="$url('/pages/address/list/list')">
 				<text class="lf-font-28 lf-color-primary lf-m-r-10">更换收获地址</text>
 				<text class="lf-iconfont icon-xiangyou lf-font-24 lf-color-777"></text>
 			</view>
diff --git a/pages/shop/goodsdetail.vue b/pages/shop/goodsdetail.vue
index 997a8b2..0bfa627 100644
--- a/pages/shop/goodsdetail.vue
+++ b/pages/shop/goodsdetail.vue
@@ -57,7 +57,7 @@
 					</view>
 				</view>
 				<view class="bg-white">
-					<view class="cu-bar padding-lr">
+					<view class="cu-bar padding-lr" @click="shoot(2)">
 						<view class="lf-flex">
 							<text class="lf-color-777 lf-font-28">已选</text>
 							<text class="lf-color-222 lf-font-26 lf-m-l-30">已选500ml x1</text>
@@ -71,7 +71,7 @@
 				<view>
 					<view class="user-top">
 						<view class="lf-row-between lf-w-100">
-							<view class="lf-flex">
+							<view class="lf-flex" @click="$url('/pages/shop/shopdetail')">
 								<view class="tag-father">
 									<image src="https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png" mode="aspectFill" class="head-img"></image>
 								</view>
@@ -81,20 +81,23 @@
 								</view>
 							</view>
 							<view>
-								<button class="head-btn"><u-icon name="chat" class="lf-m-r-10"></u-icon>客服</button>
+								<button class="head-btn" @click="$url('/pages/user/my/chatonline')">
+									<u-icon name="chat" class="lf-m-r-10"></u-icon>
+									<text>客服</text>
+								</button>
 							</view>
 						</view>
 					</view>
 					<scroll-view class="scroll-view" :scroll-x="true">
 						<view class="scroll-content">
-							<view class="goods-item" v-for="(item, index) in 5" :key="index">
+							<view class="goods-item" v-for="(item, index) in 5" :key="index" @click="$url('/pages/shop/goodsdetail')">
 								<image class="goods-img"></image>
 								<view class="goods-info">
 									<view class="lf-line-1">猪大肠卖咯 5毛钱一斤咯</view>
 									<view>￥0.5</view>
 								</view>
 							</view>
-							<view class="goods-item">
+							<view class="goods-item" @click="$url('/pages/shop/shopdetail')">
 								<view class="more-box">
 									<text>查看更多</text>
 									<text class="lf-iconfont icon--2 lf-text-vertical"></text>
diff --git a/pages/user/member/service.vue b/pages/user/member/service.vue
index bcf3550..4db93d8 100644
--- a/pages/user/member/service.vue
+++ b/pages/user/member/service.vue
@@ -14,7 +14,7 @@
 			</view>
 			<view style="height: 120rpx;"></view>
 			<view class="fixed">
-				<view class="btn1" hover-class="lf-opacity">在线客服</view>
+				<view class="btn1" hover-class="lf-opacity" @click="$url('/pages/user/my/chatonline')">在线客服</view>
 				<view class="btn2" hover-class="lf-opacity">拨打客服电话</view>
 			</view>
 		</view>
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index 564ab3b..3610ffa 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -4,7 +4,7 @@
 		<view class="center-top">
 			<view class="ocupy"></view>
 			<view class="lf-flex lf-p-32 lf-row-between">
-				<view class="lf-row-between">
+				<view class="lf-row-between" @click="$url('/pages/user/my/setting')">
 					<view>
 						<image src="https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png" mode="aspectFill" class="center-img"></image>
 					</view>
@@ -13,27 +13,27 @@
 						<view class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-white"></view>
 					</view>
 				</view>
-				<view class="lf-row-center lf-flex-column">
+				<view class="lf-row-center lf-flex-column" @click="$url('/pages/user/member/code')">
 					<view class="lf-iconfont icon-shoucang lf-color-white"></view>
 					<view class="lf-font-24 lf-color-white">支付码</view>
 				</view>
 			</view>
 			<view class="lf-flex lf-row-between center-tag">
-				<view class="lf-row-center lf-flex-column">
+				<view class="lf-row-center lf-flex-column" @click="$url('/pages/point/detail/detail')">
 					<view class="lf-font-36 lf-color-white">0</view>
 					<view class="lf-font-24 lf-color-white">积分</view>
 				</view>
-				<view class="lf-row-center lf-flex-column">
+				<view class="lf-row-center lf-flex-column" @click="$msg('敬请期待')">
 					<view class="lf-font-36 lf-color-white">0.00</view>
 					<view class="lf-font-24 lf-color-white">余额</view>
 				</view>
-				<view class="lf-row-center lf-flex-column">
+				<view class="lf-row-center lf-flex-column" @click="$url('/pages/coupon/index/index')">
 					<view class="lf-font-36 lf-color-white">0</view>
 					<view class="lf-font-24 lf-color-white">优惠券</view>
 				</view>
 			</view>
 			<view class="center-card">
-				<view class="lf-p-30 lf-row-between lf-w-100">
+				<view class="lf-p-30 lf-row-between lf-w-100" @click="$msg('敬请期待')">
 					<view class="lf-flex-column">
 						<view class="lf-font-48 lf-font-bold" style="color: #15716E;">
 							VIP 预备会员
@@ -51,7 +51,7 @@
 			<view class="order-card">
 				<view class="lf-row-between">
 					<view class="lf-color-black lf-font-32 lf-font-bold">
-						商家订单
+						商城订单
 					</view>
 					<view class="lf-flex">
 						<view class="lf-font-24 lf-color-777">全部订单</view><text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-777"></text>
@@ -75,9 +75,12 @@
 					<view></view>
 				</view>
 				<view class="order-tag lf-flex-wrap">
-					<view class="order-children" v-for="i of 5">
-						<view class="function-tag"></view>
-						<view class="lf-color-black lf-font-28 lf-m-t-20">会员服务</view>
+					<view class="order-children" 
+						v-for="(item, index) in my_service_list" :key="index"
+						@click="$url(item.path)">
+						<!-- <view class="function-tag"></view> -->
+						<view class="lf-iconfont" :class="item.icon"></view>
+						<view class="lf-color-black lf-font-28 lf-m-t-20" style="white-space: nowrap">{{ item.name }}</view>
 					</view>
 				</view>
 			</view>
@@ -92,6 +95,35 @@
 		components: {
 			lfTabbar
 		},
+		data(){
+			return {
+				my_service_list: [{
+					name: '会员服务',
+					icon: 'icon-huiyuan',
+					path: '/pages/user/member/service'
+				},{
+					name: '在线客服',
+					icon: 'icon-huiyuan',
+					path: '/pages/user/my/chatonline'
+				},{
+					name: '我的收藏',
+					icon: 'icon-huiyuan',
+					path: '/pages/user/my/collect'
+				},{
+					name: '地址管理',
+					icon: 'icon-huiyuan',
+					path: '/pages/address/list/list'
+				},{
+					name: '活动报名',
+					icon: 'icon-huiyuan',
+					path: '/pages/user/my/myEventRegistrationList'
+				},{
+					name: '积分商城订单',
+					icon: 'icon-huiyuan',
+					path: ''
+				}]
+			}
+		}
 	}
 </script>
 
diff --git a/pages/user/my/setting.vue b/pages/user/my/setting.vue
index 4e3d4b8..fae7616 100644
--- a/pages/user/my/setting.vue
+++ b/pages/user/my/setting.vue
@@ -2,7 +2,7 @@
 	<view>
 		<lf-nav :spreadOut="true" :showIcon="true" title="设置"></lf-nav>
 		<view class="lf-p-l-32 lf-p-r-32">
-			<view class="set-tag lf-border-bottom">
+			<view class="set-tag lf-border-bottom" @click="$url('/pages/user/my/editname')">
 				<view class="lf-font-28 lf-color-black">
 					昵称
 				</view>
@@ -12,7 +12,7 @@
 			</view>
 		</view>
 		<view class="lf-p-l-32 lf-p-r-32">
-			<view class="set-tag lf-border-bottom">
+			<view class="set-tag lf-border-bottom" @click="$msg('敬请期待')">
 				<view class="lf-font-28 lf-color-black">
 					头像
 				</view>
@@ -25,7 +25,7 @@
 			</view>
 		</view>
 		<view class="lf-p-l-32 lf-p-r-32">
-			<view class="set-tag lf-border-bottom">
+			<view class="set-tag lf-border-bottom" @click="$url('/pages/user/my/vipinfo')">
 				<view class="lf-font-28 lf-color-black">
 					会员资料
 				</view>
@@ -35,7 +35,7 @@
 			</view>
 		</view>
 		<view class="lf-p-l-32 lf-p-r-32">
-			<view class="set-tag">
+			<view class="set-tag" @click="$url('/pages/address/list/list')">
 				<view class="lf-font-28 lf-color-black">
 					地址管理
 				</view>
@@ -46,7 +46,7 @@
 		</view>
 		<self-line/> 
 		<view class="lf-p-l-32 lf-p-r-32">
-			<view class="set-tag lf-border-bottom">
+			<view class="set-tag lf-border-bottom" @click="$url('/pages/user/my/verificationPhone')">
 				<view class="lf-font-28 lf-color-black">
 					修改手机号
 				</view>
@@ -56,9 +56,9 @@
 			</view>
 		</view>
 		<view class="lf-p-l-32 lf-p-r-32">
-			<view class="set-tag">
+			<view class="set-tag" @click="$url('/pages/user/my/setPassword')">
 				<view class="lf-font-28 lf-color-black">
-					支付密码设着
+					支付密码设置
 				</view>
 				<view class="lf-flex">
 					<text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-777"></text>
@@ -67,7 +67,7 @@
 		</view>
 		<self-line/> 
 		<view class="lf-p-l-32 lf-p-r-32">
-			<view class="set-tag lf-border-bottom">
+			<view class="set-tag lf-border-bottom" @click="$url('/pages/user/agreement/agreement')">
 				<view class="lf-font-28 lf-color-black">
 					关于我们
 				</view>
@@ -77,7 +77,7 @@
 			</view>
 		</view>
 		<view class="lf-p-l-32 lf-p-r-32">
-			<view class="set-tag">
+			<view class="set-tag" @click="$msg('敬请期待')">
 				<view class="lf-font-28 lf-color-black">
 					客服电话
 				</view>