diff --git a/config.js b/config.js
index 76bbd47..2968860 100644
--- a/config.js
+++ b/config.js
@@ -3,11 +3,11 @@ export const appConfig = {
 	//appId:"wx3dc65ce9b588727a",//孕育咨询
 	//baseUrl: 'http://yunyubang.localhost.com',
 	
-	 baseUrl:'https://yunyubang.ali251.langye.net',// 'https://yunyubang2021.langye.net', //孕育邦
-	// baseUrl: 'https://yybtest.ali251.langye.net',
+	 // baseUrl:'https://yunyubang.ali251.langye.net',// 'https://yunyubang2021.langye.net', //孕育邦
+	baseUrl: 'https://yybtest.ali251.langye.net',
 	
-	 newBaseUrl: 'https://yunyubang.ali251.langye.net',
-	// newBaseUrl: 'http://yybtest.ali251.langye.net',
+	 // newBaseUrl: 'https://yunyubang.ali251.langye.net',
+	newBaseUrl: 'http://yybtest.ali251.langye.net',
 	
 	//baseUrl:'https://yybtest2021.langye.net',//孕育咨询
 	openidInfoKey: 'openid_info_yunyubang'
diff --git a/packages/packageBuy/pages/shopDetail/shopDetail.vue b/packages/packageBuy/pages/shopDetail/shopDetail.vue
index 95c95f3..5714566 100644
--- a/packages/packageBuy/pages/shopDetail/shopDetail.vue
+++ b/packages/packageBuy/pages/shopDetail/shopDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view :class="showPop?'noscroll content':'content'">
 		<view class="detailTop">
-			<image class="banner" mode="scaleToFill" :src="info.poster"></image>
+			<image class="banner" :src="info.poster"></image>
 		</view>
 		<view class="toptitle">
 			<view class="h3">{{info.name}}</view>
@@ -46,12 +46,12 @@
 				<view class="infos">
 					<view class="name">{{info.merchant.username}}</view>
 					<view class="date-txt" v-if="false">周一至周日 09:00-18:00</view>
-					<view class="txt" v-if="false">{{info.merchant.address}}</view>
-					<view class="add_r" @click="">
+					<view class="add_r starts" @click="">
 						<text class="iconfont icon-dianhua"></text>
 						<text @click="calltel">电话：<text style="color:#bf617c">{{tel}}</text>
 						</text>
-					</view>
+					</view>
+					<view class="txt">{{info.merchant.address}}</view>
 				</view>
 			</view>
 		</view>
@@ -1390,7 +1390,9 @@
 				margin-left: 24rpx;
 				display: inline-block;
 				vertical-align: top;
-
+				view{
+					margin-bottom:10rpx
+				}
 				.name {
 					font-size: 32rpx;
 					font-weight: 500;
@@ -1404,12 +1406,13 @@
 					line-height: 20rpx;
 
 					.iconfont {
-						color: #FF578A;
-						font-size: 20rpx;
+						color: #333;
+						font-size: 22rpx;
 						display: inline-block;
 						margin-right: 7rpx;
 						height: 100%;
-						line-height: 20rpx;
+						line-height: 20rpx;
+						vertical-align: middle;
 					}
 				}
 
diff --git a/packages/packageBuy/pages/shopList/shopList.vue b/packages/packageBuy/pages/shopList/shopList.vue
index d73236d..2c9c451 100644
--- a/packages/packageBuy/pages/shopList/shopList.vue
+++ b/packages/packageBuy/pages/shopList/shopList.vue
@@ -32,7 +32,7 @@
 					<block v-for="(item,index) in dataList">
 						<view class="intro_column" @tap="gotoDetail" :data-id="item.id">
 							<view class="imgOuter">
-								<image mode="aspectFill" :src="item.poster"></image>
+								<image :src="item.poster"></image>
 								<view class="i_intro">{{item.product_type.name}}</view>
 							</view>
 							<view class="columnInfo">
diff --git a/packages/packageCarecenter/pages/careCenter/careCenter.vue b/packages/packageCarecenter/pages/careCenter/careCenter.vue
index 7a558a8..1045f06 100644
--- a/packages/packageCarecenter/pages/careCenter/careCenter.vue
+++ b/packages/packageCarecenter/pages/careCenter/careCenter.vue
@@ -383,8 +383,14 @@
 			distanceComputed() {
 				return function(dis) {
 					if (dis) {
-						if (dis.indexOf('km') !== -1) {
-							return Number(dis.split('km')[0]).toFixed(1) + 'km'
+						if (dis.indexOf('km') !== -1) {
+							let dism = dis.split('km')[0]*1000
+							if(dism<1000){
+								return Number(dism).toFixed(1) + 'm'
+							}else{
+								return Number(dis.split('km')[0]).toFixed(1) + 'km'
+							}
+							
 						}
 						if (dis.indexOf('m') !== -1) {
 							return Number(dis.split('m')[0]).toFixed(1) + 'm'
@@ -404,7 +410,6 @@
 
 				this.init()
 			})
-
 			this.getStrategy();
 			this.getParameter("area");
 		},
diff --git a/packages/packageCarecenter/pages/commonService/commonCenter.vue b/packages/packageCarecenter/pages/commonService/commonCenter.vue
index 4bbe28a..3b71b22 100644
--- a/packages/packageCarecenter/pages/commonService/commonCenter.vue
+++ b/packages/packageCarecenter/pages/commonService/commonCenter.vue
@@ -389,7 +389,12 @@
 				return function(dis) {
 					if (dis) {
 						if (dis.indexOf('km') !== -1) {
-							return Number(dis.split('km')[0]).toFixed(1) + 'km'
+							let dism = dis.split('km')[0]*1000
+							if(dism<1000){
+								return Number(dism).toFixed(1) + 'm'
+							}else{
+								return Number(dis.split('km')[0]).toFixed(1) + 'km'
+							}
 						}
 						if (dis.indexOf('m') !== -1) {
 							return Number(dis.split('m')[0]).toFixed(1) + 'm'
diff --git a/pages.json b/pages.json
index 198f044..6ab3cfd 100644
--- a/pages.json
+++ b/pages.json
@@ -13,11 +13,11 @@
 		},
 		{
 			"path": "pages/active/active",
-			"style": {
-				"navigationBarTitleText": "孕育邦",
-				"navigationBarBackgroundColor": "#FF578A",
-				"navigationBarTextStyle": "white"
-
+			"style": {
+				"navigationBarTitleText": "活动列表",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarTextStyle": "black",
+				"navigationStyle": "custom"
 			}
 		},
 		{
diff --git a/pages/active/active copy.vue b/pages/active/active copy.vue
new file mode 100644
index 0000000..1061ad6
--- /dev/null
+++ b/pages/active/active copy.vue	
@@ -0,0 +1,475 @@
+<template>
+	<view class="content">
+		<view class="activeTop">
+			<view class="searchBox">
+				<view class="searchCol">
+					<view class="iconfont icon-search1"></view>
+					<input type="text" placeholder="请输入">
+				</view>
+				<view class="iconfont icon-w_location-"></view>
+			</view>
+			<view class="album_swiper">
+				<swiper :autoplay="autoplay" :interval="interval" :duration="duration" :indicator-dots="true" indicator-active-color="rgba(255,255,255,0.5)" indicator-color="rgba(255,255,255,1)">
+					<swiper-item v-for="item in ads" :key="item.id">
+						<image :src="item.pic"></image>
+					</swiper-item>
+				</swiper>
+			</view>			
+		</view>
+		<view class="menuBox">
+			<block v-for="item in indexNav" :key="item.id">
+				<view class="menuCol" @click="toAction(item)" data-id="-1">
+					<image :src="item.icon"></image>
+					<view>{{item.name}}</view>
+				</view>
+			</block>
+		</view>
+		<!--为您精选活动-->
+		<view class="introBox">
+			<view class="normal_tit">为您精选</view>
+			<view class="intro_row">
+				<view class="row_col" v-for="item in activityList.slice(0,2)" :key="item.id" @tap="gotoDetail(item.id)">
+					<view class="imgOuter">
+						<image mode="aspectFill" :src="item.active_playbill"></image>
+						<view class="date">{{item.end_at}}</view>
+					</view>
+					<view class="title">{{item.active_name}}</view>
+					<view class="subTit">{{item.address}}</view>
+					<view class="price">
+						<text class="font_red">{{ Number(item.money) > 0 ? `￥${item.money}` : '免费' }}</text>
+						{{`${item.total+item.start_member_sum}人参与`}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="termBox">
+			<view class="termOuter">
+				<view class="termCol cur">综合排序<text class="iconfont icon-arrowbottom"></text></view>
+				<view class="termCol">距离最近<text class="iconfont icon-arrowbottom"></text></view>
+				<view class="termCol">优质商户<text class="iconfont icon-arrowbottom"></text></view>
+				<view class="termCol">筛选<text class="iconfont icon-filter"></text></view>
+			</view>
+		</view>
+		<!--为您推荐福利&&服务-->
+		<view class="introBox hasMenu">
+			<view class="normal_tit padding_20">为您推荐</view>
+			<view class="intro_column" v-for="item in activityList" :key="item.id" @tap="gotoDetail(item.id)">
+				<view class="imgOuter"><image mode="aspectFill" :src="item.active_playbill"></image><view class="i_intro">推荐</view></view>
+				<view class="columnInfo">
+					<view class="title">{{item.active_name}}</view>
+					<view class="tags">
+						<text v-for="(sub, subIdx) in item.active_tag" :key="subIdx">{{sub}}</text>
+					</view>
+					<view class="subInfo">{{item.start_date}}～{{item.end_date}}</view>
+					<view class="subInfo">{{item.address}}</view>
+					<view class="price">
+						<text class="font_red" v-if="Number(item.money) > 0">￥{{item.money}}</text>
+						<text class="free" v-else>免费</text>
+						<view class="shareMoney" v-if="Number(item.money) > 0">
+							<text>分享金</text>{{ Number(item.money) }}元
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>		
+	</view>
+</template>
+
+<script>
+	import {weixin, login} from '../../utils/weixin.js';
+	export default {
+		data() {
+			return {
+				indicatorDots: true,
+				autoplay: true,
+				interval: 4000,
+				activityList: [],
+				activitySelect:{
+				    page:1,
+					page_size:5,
+					myself:0
+				},
+				indexNav: [],
+				serviceList: [],
+				ads: [],
+				page: 1,
+			}
+		},
+		onLoad() {
+			// login()
+		},
+		onShow() {
+			this.getAdS()
+			this.getActivityList()
+			this.getNav()
+			// this.getServiceList()
+		},
+		onReachBottom() {
+			this.getActivityList()
+		},
+		methods: {
+			toAction: function(item) {
+				console.log(item)
+				if (item.link) {
+					uni.redirectTo({
+						url: item.link
+					})
+				} else {
+					uni.showToast({
+						icon: "none",
+						title: "建设中"
+					})
+				}
+			},
+			async getNav(code) {
+				await weixin.request({
+					newUrl: true,
+					api: '/api/member/applet-menu-first/index',
+					data: {
+						page: 1,
+						page_size: 8,
+						sort_name: "sort_number",
+						sort_type: "asc"
+					},
+					utilSuccess: (res) => {
+						this.indexNav = res.data;
+					}
+				})
+			},
+			getActivityList() {
+				weixin.request({
+					api:"/api/member/active-list",
+					data:this.activitySelect,
+					utilSuccess:res => {
+						if(res.data.length > 0){
+							this.activitySelect.page ++
+						}else{
+							uni.showToast({
+								icon:'none',
+								title:"没有更多了"
+							})
+						}
+						if(this.activitySelect.page === 1){
+							this.activityList = res.data
+						}else{
+							this.activityList.push(...res.data)
+						}
+						console.log(res);
+						
+					},
+					utilFail:err => {
+						console.log(err);
+					}
+				})
+			},
+			getServiceList() {
+				// weixin.request({
+				// 	api:"/api/member/active-list",
+				// 	data:{
+						
+				// 	},
+				// 	utilSuccess:res => {
+				// 		console.log(res);
+				// 	},
+				// 	utilFail:err => {
+				// 		console.log(err);
+				// 	}
+				// })
+			},
+			getAdS() {
+				this.ads = []
+				weixin.request({
+					newUrl: true,
+					api: '/api/member/other/advertisement',
+					data: {
+						origin_system: 1
+					},
+					utilSuccess: (res) => {
+						res.map(item => {
+							if (item.type === 0) {
+								this.ads.push({
+									id: item.id,
+									pic: item.pic,
+									action: item.action
+								})
+							}
+						})
+					},
+					utilFail: (err) => {
+						console.log(err, 'err');
+					}
+				})
+			},
+			gotoDetail(id) {
+				uni.navigateTo({
+					url: `/pages/active/detail?id=${id}`
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #F6F6F6;
+	}
+	
+</style>
+<style lang="scss" scoped>	
+
+	.activeTop{
+		width:100%;
+		height:342rpx;
+		background: linear-gradient(180deg, #FF578A 0%, rgba(255, 87, 138, 0) 100%);		
+	}
+	.searchBox{
+		padding:20rpx 30rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.searchCol{
+		width: 600rpx;
+		height:72rpx;
+		background-color: #fff;
+		border-radius:36rpx;
+		position: relative;
+		line-height:72rpx;
+		padding:0 30rpx;
+		box-sizing: border-box;
+	}
+	.searchCol .iconfont{
+		color:#999;
+		font-size:25rpx;
+	}
+	.searchCol input{
+		position: absolute;
+		width:100%;
+		height:100%;
+		top:0;
+		left:0;
+		background: translate;
+		padding:0 70rpx;
+		box-sizing: border-box;
+		font-size:24rpx;
+	}
+	.icon-w_location-{
+		font-size:50rpx;
+		color:#fff;
+	}
+	.album_swiper{
+		width:690rpx;
+		height:220rpx;
+		border-radius:20rpx;
+		margin: 0 auto;
+		swiper{
+			height:calc(690rpx/3.13);
+			border-radius:20rpx;
+			image{
+				height:100%;
+				border-radius:20rpx;
+			}
+		}		
+	}	
+	.menuBox{
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-evenly;
+		align-items: center;
+		width:690rpx;
+		margin:0 auto 10rpx auto;
+		box-sizing: border-box;
+		.menuCol{
+			width:25%;
+			text-align: center;
+			font-size:24rpx;
+			color:#333;
+			margin-top:34rpx;
+			image{
+				display: block;
+				width:94rpx;
+				height:94rpx;
+				margin: 0 auto 10rpx auto;
+			}
+		}
+	}
+	.introBox{
+		width:710rpx;
+		margin:20rpx auto 0 auto;
+		border-radius: 16rpx;
+		background: #fff;
+		padding:0 35rpx;
+		box-sizing: border-box;
+	}
+	.intro_row{
+		display: flex;
+		justify-content: space-between;
+		width:100%;
+	}
+	.row_col{
+		width:310rpx;
+		border-radius: 8rpx;
+		padding-bottom:20rpx;
+		.imgOuter{
+			width:310rpx;
+			height:230rpx;
+			position: relative;
+			image{
+				width:310rpx;
+				height:230rpx;
+				border-radius:8rpx 8rpx 0 0;
+			}	
+			.date{
+				background-color: rgba(0,0,0,0.3);
+				font-size:20rpx;
+				color:#fff;
+				line-height:32rrpx;
+				padding:0 8rpx;
+				border-radius: 5rpx;
+				position: absolute;
+				left: 20rpx;
+				bottom:20rpx;
+				font-weight:500;
+			}
+		}
+		.title{
+			width:100%;
+			font-size:28rpx;
+			color:#333;
+			font-weight:500;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			padding-top:20rpx;
+		}
+		.subTit{
+			width:100%;
+			font-size:22rpx;
+			color:#333;
+			font-weight:400;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			padding-top:10rpx;
+		}	
+		.price{
+			margin-top:20rpx;
+			font-size:22rpx;
+			color:#999;
+			text{
+				font-size:32rpx;
+				font-weight:400;
+				padding-right:15rpx;
+			}
+		}
+	}
+	.introBox .intro_column:last-child{border-bottom:none;}
+	.intro_column{
+		display: flex;
+		justify-content: flex-start;
+		padding:20rpx 0;
+		border-bottom:2rpx solid #EAEAEA;
+		.imgOuter{
+			width: 260rpx;
+			height:210rpx;
+			position: relative;
+			image{width:260rpx;height:210rpx;border-radius:5rpx;}
+			.i_intro{position: absolute;top:0;left:0;width: 68rpx;height: 32rpx;background: #FF578A;border-radius: 5rpx 0px 18rpx 5rpx;font-size: 22rpx;font-weight: 400;color: #FFFFFF;line-height: 32rpx;text-align: center;}	
+		}
+		.columnInfo{
+			width:360rpx;
+			margin-left:22rpx;
+			.title{
+				width:100%;
+				font-size:30rpx;
+				font-weight:bold;
+				color:#333;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;				
+			}
+			.tags text{
+				height: 28rpx;
+				background: rgba(255,177,62,0.1);
+				border-radius: 4rpx;
+				line-height:28rpx;
+				font-size:20rpx;
+				padding: 0 10rpx;
+				margin-right:10rpx;
+				color:#FF753E;
+			}
+			.subInfo{
+				width:100%;
+				font-size:24rpx;
+				color:#999;
+				font-weight:400;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				padding-top:5rpx;	
+				.font_red{margin-left:10rpx;}
+			}
+			.price{
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				align-content: center;
+				margin-top:8rpx;
+				text{margin-right:10rpx;}
+				.shareMoney{
+					height: 28rpx;
+					border:2rpx solid #FF578A;
+					border-radius: 4rpx;
+					line-height:28rpx;
+					font-size:20rpx;
+					margin-right:10rpx;
+					padding-right:10rpx;
+					color:#FF578A;
+					display: flex;
+					flex-direction: flex-start;
+					text{background: #FF578A;color:#fff;padding: 0 10rpx;}
+				}
+				.free{
+					height: 28rpx;
+					background: #FF753E;
+					border-radius: 4rpx;
+					line-height:28rpx;
+					font-size:20rpx;
+					padding: 0 10rpx;
+					margin-right:10rpx;
+					color:#fff;					
+				}
+			}
+			
+		}		
+	}
+	.termBox{
+		width: 750rpx;
+		height: 200rpx;
+		background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(255, 255, 255, 0.8) 70%, rgba(255, 255, 255, 0) 100%);
+		border-radius: 40rpx 40rpx 0px 0px;
+		margin-top:20rpx;
+		.termOuter{
+			display: flex;
+			align-items: center;
+			align-content: center;
+			justify-content: flex-start;
+			.termCol{
+				width:27%;
+				text-align:center;
+				font-size: 28rpx;
+				font-weight: 400;
+				color: #333333;	
+				padding-top:36rpx;
+				.iconfont{font-size: 24rpx;color: #666666;line-height:28rpx;margin-left:8rpx;}
+				
+			}
+			.termCol.cur{
+				color:#FF578A;
+				.iconfont{color: #FF578A;}
+			}
+			.termCol:last-child{width:19%;}
+			
+		}
+	}
+	.hasMenu{margin-top:-100rpx;}
+</style>
diff --git a/pages/active/active.vue b/pages/active/active.vue
index 1061ad6..8512752 100644
--- a/pages/active/active.vue
+++ b/pages/active/active.vue
@@ -1,475 +1,527 @@
 <template>
 	<view class="content">
-		<view class="activeTop">
-			<view class="searchBox">
-				<view class="searchCol">
-					<view class="iconfont icon-search1"></view>
-					<input type="text" placeholder="请输入">
-				</view>
-				<view class="iconfont icon-w_location-"></view>
-			</view>
-			<view class="album_swiper">
-				<swiper :autoplay="autoplay" :interval="interval" :duration="duration" :indicator-dots="true" indicator-active-color="rgba(255,255,255,0.5)" indicator-color="rgba(255,255,255,1)">
-					<swiper-item v-for="item in ads" :key="item.id">
-						<image :src="item.pic"></image>
-					</swiper-item>
-				</swiper>
-			</view>			
-		</view>
-		<view class="menuBox">
-			<block v-for="item in indexNav" :key="item.id">
-				<view class="menuCol" @click="toAction(item)" data-id="-1">
-					<image :src="item.icon"></image>
-					<view>{{item.name}}</view>
-				</view>
-			</block>
-		</view>
-		<!--为您精选活动-->
-		<view class="introBox">
-			<view class="normal_tit">为您精选</view>
-			<view class="intro_row">
-				<view class="row_col" v-for="item in activityList.slice(0,2)" :key="item.id" @tap="gotoDetail(item.id)">
-					<view class="imgOuter">
-						<image mode="aspectFill" :src="item.active_playbill"></image>
-						<view class="date">{{item.end_at}}</view>
-					</view>
-					<view class="title">{{item.active_name}}</view>
-					<view class="subTit">{{item.address}}</view>
-					<view class="price">
-						<text class="font_red">{{ Number(item.money) > 0 ? `￥${item.money}` : '免费' }}</text>
-						{{`${item.total+item.start_member_sum}人参与`}}
+		<!--nav bar-->
+		<view class="navbar">
+			<view class="navbar-fixed">
+				<!-- statusHeight 状态栏的高度  蓝色区块-->
+				<view class="statusHeight" :style="{ height: statusBarHeight + 'px' }"></view>
+				<!-- navcontent tabbar导航栏高度 绿色区块-->
+				<view class="navcontent" :style="{ height: navBarHeight + 'px' }">
+					<view class="iconfont icon-arrow-left-bold" @click="toback"></view>
+					<view class="input-view">
+						<input confirm-type="search" v-model="keyword" class="nav-bar-input" type="text"
+							placeholder="输入搜索关键词" @confirm="confirm">
 					</view>
 				</view>
 			</view>
-		</view>
-		<view class="termBox">
-			<view class="termOuter">
-				<view class="termCol cur">综合排序<text class="iconfont icon-arrowbottom"></text></view>
-				<view class="termCol">距离最近<text class="iconfont icon-arrowbottom"></text></view>
-				<view class="termCol">优质商户<text class="iconfont icon-arrowbottom"></text></view>
-				<view class="termCol">筛选<text class="iconfont icon-filter"></text></view>
+			<!-- 占位盒子 它的高度=状态栏高度+导航栏高度-->
+			<view class="placeholder" :style="{ height: navBarHeight + statusBarHeight + 'px', background: 'red' }">
 			</view>
-		</view>
-		<!--为您推荐福利&&服务-->
-		<view class="introBox hasMenu">
-			<view class="normal_tit padding_20">为您推荐</view>
-			<view class="intro_column" v-for="item in activityList" :key="item.id" @tap="gotoDetail(item.id)">
-				<view class="imgOuter"><image mode="aspectFill" :src="item.active_playbill"></image><view class="i_intro">推荐</view></view>
-				<view class="columnInfo">
-					<view class="title">{{item.active_name}}</view>
-					<view class="tags">
-						<text v-for="(sub, subIdx) in item.active_tag" :key="subIdx">{{sub}}</text>
-					</view>
-					<view class="subInfo">{{item.start_date}}～{{item.end_date}}</view>
-					<view class="subInfo">{{item.address}}</view>
-					<view class="price">
-						<text class="font_red" v-if="Number(item.money) > 0">￥{{item.money}}</text>
-						<text class="free" v-else>免费</text>
-						<view class="shareMoney" v-if="Number(item.money) > 0">
-							<text>分享金</text>{{ Number(item.money) }}元
+			<view class="termBox">
+				<!-- 	<view class="termOuter">
+					<view class="termCol cur">综合排序<text class="iconfont icon-arrowbottom"></text></view>
+					<view class="termCol">距离最近<text class="iconfont icon-arrowbottom"></text></view>
+					<view class="termCol">优质商户<text class="iconfont icon-arrowbottom"></text></view>
+					<view class="termCol">筛选<text class="iconfont icon-filter"></text></view>
+				</view> -->
+			</view>
+			<view class="shopContent">
+				<!--为您推荐-->
+				<u-empty v-if="dataList.length==0" marginTop="250"></u-empty>
+				<view class="introBox hasMenu" v-if="dataList.length>0">
+					<block v-for="(item,index) in dataList">
+						<view class="intro_column" @tap="gotoDetail" :data-id="item.id">
+							<view class="imgOuter">
+								<image :src="item.active_playbill"></image>
+								<!-- <view class="i_intro">{{item.product_type.name}}</view> -->
+							</view>
+							<view class="columnInfo">
+								<view class="title">{{item.active_name}}</view>
+								<view class="discuss">
+									<view class="starBox">
+										<image mode="heightFix" src="../../static/icon_detail_star_pre@2x.png">
+										</image>
+										<image mode="heightFix" src="../../static/icon_detail_star_pre@2x.png">
+										</image>
+										<image mode="heightFix" src="../../static/icon_detail_star_pre@2x.png">
+										</image>
+										<image mode="heightFix" src="../../static/icon_detail_star_pre@2x.png">
+										</image>
+										<image mode="heightFix" src="../../static/icon_detail_star_pre@2x.png">
+										</image>
+									</view>
+								</view>
+								<view class="subInfo">{{item.address}}</view>
+								<view class="menu">{{item.start_date}}  {{item.end_date}}</view>
+							</view>
 						</view>
-					</view>
+					</block>
 				</view>
 			</view>
-		</view>		
+		</view>
+		<!--nav end-->
 	</view>
 </template>
 
 <script>
-	import {weixin, login} from '../../utils/weixin.js';
+	import {
+		weixin
+	} from '@/utils/weixin.js';
 	export default {
 		data() {
 			return {
-				indicatorDots: true,
-				autoplay: true,
-				interval: 4000,
-				activityList: [],
-				activitySelect:{
-				    page:1,
-					page_size:5,
-					myself:0
-				},
-				indexNav: [],
-				serviceList: [],
-				ads: [],
-				page: 1,
+				statusBarHeight: 20, //状态栏的高度系统默认20px 
+				menuBarHeight: 32, //微信胶囊的高度
+				navBarHeight: 44, //uniapp 默认的高度是44（这里默认高度也就是H5导航栏的高度） 根据公式计算的高度不是固定值44
+				keyword: "",
+				dataList: [],
+				currentPage: 1,
+				product_type_id: 0,
+				isLoading: false
+
 			}
 		},
-		onLoad() {
-			// login()
+		onShareAppMessage() {
+			var url = 'packages/packageBuy/pages/shopList/shopList';
+			console.log(url)
+			return {
+				title: "福利集合",
+				path: url
+			}
 		},
-		onShow() {
-			this.getAdS()
-			this.getActivityList()
-			this.getNav()
-			// this.getServiceList()
+		onShareTimeline() {
+			var url = 'packages/packageBuy/pages/shopList/shopList';
+			return {
+				title: "福利集合",
+				path: url,
+			}
 		},
-		onReachBottom() {
-			this.getActivityList()
+		onReachBottom: function(e) {
+			if (!this.isLoading) {
+				console.log("onReachBottom", this.currentPage + 1)
+				this.loadPage(this.currentPage + 1);
+			}
 		},
-		methods: {
-			toAction: function(item) {
-				console.log(item)
-				if (item.link) {
-					uni.redirectTo({
-						url: item.link
-					})
-				} else {
-					uni.showToast({
-						icon: "none",
-						title: "建设中"
-					})
-				}
-			},
-			async getNav(code) {
-				await weixin.request({
-					newUrl: true,
-					api: '/api/member/applet-menu-first/index',
-					data: {
-						page: 1,
-						page_size: 8,
-						sort_name: "sort_number",
-						sort_type: "asc"
-					},
-					utilSuccess: (res) => {
-						this.indexNav = res.data;
-					}
-				})
-			},
-			getActivityList() {
-				weixin.request({
-					api:"/api/member/active-list",
-					data:this.activitySelect,
-					utilSuccess:res => {
-						if(res.data.length > 0){
-							this.activitySelect.page ++
-						}else{
-							uni.showToast({
-								icon:'none',
-								title:"没有更多了"
-							})
-						}
-						if(this.activitySelect.page === 1){
-							this.activityList = res.data
-						}else{
-							this.activityList.push(...res.data)
-						}
-						console.log(res);
-						
-					},
-					utilFail:err => {
-						console.log(err);
-					}
-				})
-			},
-			getServiceList() {
-				// weixin.request({
-				// 	api:"/api/member/active-list",
-				// 	data:{
-						
-				// 	},
-				// 	utilSuccess:res => {
-				// 		console.log(res);
-				// 	},
-				// 	utilFail:err => {
-				// 		console.log(err);
-				// 	}
-				// })
+		onPullDownRefresh: function(e) {
+			console.log("onPullDownRefresh", this.currentPage + 1)
+			if (!this.isLoading) {
+				this.loadPage(this.currentPage + 1);
+			}
+		},
+		onLoad(options) {
+			//获取系统信息 具体信息请转至 https://uniapp.dcloud.io/api/system/info
+			let res = uni.getSystemInfoSync();
+
+			console.log('状态栏的高度', res.statusBarHeight);
+			this.statusBarHeight = res.statusBarHeight;
+
+			// #ifdef MP-WEIXIN
+			//获取胶囊位置信息
+			let menuBottonInfo = uni.getMenuButtonBoundingClientRect();
+			//微信胶囊的高度
+			this.menuBarHeight = menuBottonInfo.height;
+			// 胶囊底部 - 状态栏 + 胶囊顶部 - 状态栏 = 导航栏的高度（胶囊距离顶部的距离+胶囊距离底部距离+胶囊自身的高度）
+			this.navBarHeight = menuBottonInfo.bottom - res.statusBarHeight + (menuBottonInfo.top - res.statusBarHeight);
+			// #endif
+
+			if (options.promotion_id) {
+				uni.setStorageSync("base_promotion_id", options.promotion_id)
+			}
+			if (options.product_type_id) {
+				this.product_type_id = options.product_type_id
+			}
+			if (options.keyword) {
+				this.keyword = options.keyword;
+			}
+
+			this.loadPage(1);
+		},
+		onShow() {},
+		methods: {
+			toback: function() {
+				let route = getCurrentPages();
+				console.log(route)
+				if (route.length > 1) {
+					uni.navigateBack({
+						delta: 1
+					})
+				} else {
+					uni.switchTab({
+						url: "/pages/home/home"
+					})
+				}
 			},
-			getAdS() {
-				this.ads = []
-				weixin.request({
-					newUrl: true,
-					api: '/api/member/other/advertisement',
-					data: {
-						origin_system: 1
-					},
-					utilSuccess: (res) => {
-						res.map(item => {
-							if (item.type === 0) {
-								this.ads.push({
-									id: item.id,
-									pic: item.pic,
-									action: item.action
-								})
-							}
-						})
-					},
-					utilFail: (err) => {
-						console.log(err, 'err');
-					}
-				})
+			confirm: function() {
+				this.loadPage(1);
 			},
-			gotoDetail(id) {
+			gotoDetail: function(e) {
+				var id = e.currentTarget.dataset.id
 				uni.navigateTo({
-					url: `/pages/active/detail?id=${id}`
+					url: "/pages/active/detail?id=" + id
 				})
+			},
+			loadPage: function(page) {
+				uni.hideKeyboard()
+				var that = this;
+				that.isLoading = true;
+				weixin.request({
+					bindThis: that,
+					api: '/api/member/active-list',
+					customLoading: false,
+					data: {
+						page: page,
+						page_size: 6,
+						keyword: that.keyword,
+					},
+					utilSuccess: function(r) {
+						var res = r.data;
+
+						that.isLoading = false;
+						var hasNoMore = r.total < 6 && page > 1;
+						console.log("hasNoMore", hasNoMore)
+						if (hasNoMore || res.length == 0 && page > 1) {
+
+							uni.stopPullDownRefresh(); // 服务器总条数 < 每页条数, 会将第一页的条数重新返回
+							// 已加载到最后一页
+							uni.showToast({
+								title: '已加载到最后一页',
+								icon: 'none'
+							});
+							return;
+						}
+						var dataList = that.dataList;
+
+						for (var m of res) {
+							if (m.created_at.indexOf('T') > 0)
+								m.created_at = m.created_at.split("T")[0] + " " + m.created_at.split("T")[
+									1].split(".")[0];
+
+
+							m.poster = (weixin.isNull(m.poster) ? "../../static/rishang.png" : m
+								.poster_url)
+						}
+
+						if (page == 1) {
+							dataList = res;
+						} else {
+							dataList.push(...res);
+						}
+
+						that.currentPage = page;
+						that.dataList = dataList;
+					},
+					utilFail: function(res) {
+
+						if (page == 1) {
+
+							that.currentPage = page;
+							that.orders = [];
+						}
+
+						util.alert(res);
+					}
+				});
 			}
 		}
 	}
 </script>
 <style>
 	page {
-		background-color: #F6F6F6;
+		display: flex
 	}
-	
 </style>
-<style lang="scss" scoped>	
-
-	.activeTop{
-		width:100%;
-		height:342rpx;
-		background: linear-gradient(180deg, #FF578A 0%, rgba(255, 87, 138, 0) 100%);		
-	}
-	.searchBox{
-		padding:20rpx 30rpx;
+<style lang="scss" scoped>
+	.navbar {
 		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-	.searchCol{
-		width: 600rpx;
-		height:72rpx;
-		background-color: #fff;
-		border-radius:36rpx;
-		position: relative;
-		line-height:72rpx;
-		padding:0 30rpx;
-		box-sizing: border-box;
-	}
-	.searchCol .iconfont{
-		color:#999;
-		font-size:25rpx;
-	}
-	.searchCol input{
-		position: absolute;
-		width:100%;
-		height:100%;
-		top:0;
-		left:0;
-		background: translate;
-		padding:0 70rpx;
-		box-sizing: border-box;
-		font-size:24rpx;
-	}
-	.icon-w_location-{
-		font-size:50rpx;
-		color:#fff;
-	}
-	.album_swiper{
-		width:690rpx;
-		height:220rpx;
-		border-radius:20rpx;
-		margin: 0 auto;
-		swiper{
-			height:calc(690rpx/3.13);
-			border-radius:20rpx;
-			image{
-				height:100%;
-				border-radius:20rpx;
+		flex-direction: column;
+		flex: 1;
+		overflow: hidden;
+
+		.navbar-fixed {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 99;
+			width: 100%;
+			background-color: #fff;
+
+			.statusHeight {
+				background-color: #fff;
 			}
-		}		
-	}	
-	.menuBox{
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-evenly;
-		align-items: center;
-		width:690rpx;
-		margin:0 auto 10rpx auto;
-		box-sizing: border-box;
-		.menuCol{
-			width:25%;
-			text-align: center;
-			font-size:24rpx;
-			color:#333;
-			margin-top:34rpx;
-			image{
-				display: block;
-				width:94rpx;
-				height:94rpx;
-				margin: 0 auto 10rpx auto;
+
+			.navcontent {
+				background-color: #fff;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				align-content: center;
+
+				.iconfont {
+					margin: 0 20rpx;
+					font-size: 40rpx;
+					color: #333;
+				}
 			}
 		}
+
+		.shopContent {
+			box-sizing: border-box;
+			height: 100%;
+			flex: 1;
+			overflow: hidden;
+		}
+
+		.scroll-y-item {
+			height: 100%;
+		}
 	}
-	.introBox{
-		width:710rpx;
-		margin:20rpx auto 0 auto;
+
+	.input-view {
+		line-height: 64rpx;
+		width: 450rpx;
+		height: 64rpx;
+		background: #EEEEEE;
+		border-radius: 32rpx;
+		font-size: 28rpx;
+		color: #333;
+		box-sizing: border-box;
+		position: relative;
+
+		.nav-bar-input {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			top: 0;
+			left: 0;
+			padding: 0 30rpx;
+			box-sizing: border-box;
+		}
+	}
+
+	.introBox {
+		width: 710rpx;
+		margin: 20rpx auto 0 auto;
 		border-radius: 16rpx;
 		background: #fff;
-		padding:0 35rpx;
+		padding: 0 24rpx;
 		box-sizing: border-box;
 	}
-	.intro_row{
-		display: flex;
-		justify-content: space-between;
-		width:100%;
+
+	.introBox .intro_column:last-child {
+		border-bottom: none;
 	}
-	.row_col{
-		width:310rpx;
-		border-radius: 8rpx;
-		padding-bottom:20rpx;
-		.imgOuter{
-			width:310rpx;
-			height:230rpx;
+
+	.intro_column {
+		display: flex;
+		justify-content: flex-start;
+		padding: 20rpx 0;
+		border-bottom: 2rpx solid #EAEAEA;
+
+		.imgOuter {
+			width: 260rpx;
+			height: 210rpx;
 			position: relative;
-			image{
-				width:310rpx;
-				height:230rpx;
-				border-radius:8rpx 8rpx 0 0;
-			}	
-			.date{
-				background-color: rgba(0,0,0,0.3);
-				font-size:20rpx;
-				color:#fff;
-				line-height:32rrpx;
-				padding:0 8rpx;
+
+			image {
+				width: 260rpx;
+				height: 210rpx;
 				border-radius: 5rpx;
+			}
+
+			.i_intro {
 				position: absolute;
-				left: 20rpx;
-				bottom:20rpx;
-				font-weight:500;
+				top: 0;
+				left: 0;
+				//width: 68rpx;
+				padding: 0rpx 10rpx;
+				height: 32rpx;
+				background: #FF578A;
+				border-radius: 5rpx 0px 18rpx 5rpx;
+				font-size: 22rpx;
+				font-weight: 400;
+				color: #FFFFFF;
+				line-height: 32rpx;
+				text-align: center;
 			}
 		}
-		.title{
-			width:100%;
-			font-size:28rpx;
-			color:#333;
-			font-weight:500;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			padding-top:20rpx;
-		}
-		.subTit{
-			width:100%;
-			font-size:22rpx;
-			color:#333;
-			font-weight:400;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			padding-top:10rpx;
-		}	
-		.price{
-			margin-top:20rpx;
-			font-size:22rpx;
-			color:#999;
-			text{
-				font-size:32rpx;
-				font-weight:400;
-				padding-right:15rpx;
+
+		.columnInfo {
+			width: 360rpx;
+			margin-left: 22rpx;
+
+			.discuss {
+				margin: 13rpx 0 !important;
 			}
-		}
-	}
-	.introBox .intro_column:last-child{border-bottom:none;}
-	.intro_column{
-		display: flex;
-		justify-content: flex-start;
-		padding:20rpx 0;
-		border-bottom:2rpx solid #EAEAEA;
-		.imgOuter{
-			width: 260rpx;
-			height:210rpx;
-			position: relative;
-			image{width:260rpx;height:210rpx;border-radius:5rpx;}
-			.i_intro{position: absolute;top:0;left:0;width: 68rpx;height: 32rpx;background: #FF578A;border-radius: 5rpx 0px 18rpx 5rpx;font-size: 22rpx;font-weight: 400;color: #FFFFFF;line-height: 32rpx;text-align: center;}	
-		}
-		.columnInfo{
-			width:360rpx;
-			margin-left:22rpx;
-			.title{
-				width:100%;
-				font-size:30rpx;
-				font-weight:bold;
-				color:#333;
+
+			.menu {
+				font-size: 24rpx;
+				color: #333;
+				margin-top: 10rpx;
+
+				.hui {
+					margin-right: 8rpx;
+					display: inline-block;
+					width: 30rpx;
+					height: 30rpx;
+					background: #FF753E;
+					border-radius: 2rpx;
+					font-size: 22rpx;
+					color: #FFFFFF;
+					text-align: center;
+					line-height: 30rpx;
+				}
+			}
+
+			.title {
+				width: 100%;
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #333;
 				overflow: hidden;
 				white-space: nowrap;
-				text-overflow: ellipsis;				
+				text-overflow: ellipsis;
 			}
-			.tags text{
+
+			.tags text {
 				height: 28rpx;
-				background: rgba(255,177,62,0.1);
+				background: rgba(255, 177, 62, 0.1);
 				border-radius: 4rpx;
-				line-height:28rpx;
-				font-size:20rpx;
+				line-height: 28rpx;
+				font-size: 20rpx;
 				padding: 0 10rpx;
-				margin-right:10rpx;
-				color:#FF753E;
+				margin-right: 10rpx;
+				color: #FF753E;
 			}
-			.subInfo{
-				width:100%;
-				font-size:24rpx;
-				color:#999;
-				font-weight:400;
+
+			.subInfo {
+				width: 100%;
+				font-size: 24rpx;
+				color: #999;
+				font-weight: 400;
 				overflow: hidden;
 				white-space: nowrap;
 				text-overflow: ellipsis;
-				padding-top:5rpx;	
-				.font_red{margin-left:10rpx;}
+				padding-top: 5rpx;
+
+				.font_red {
+					margin-left: 10rpx;
+				}
 			}
-			.price{
+
+			.price {
 				display: flex;
 				justify-content: flex-start;
 				align-items: center;
 				align-content: center;
-				margin-top:8rpx;
-				text{margin-right:10rpx;}
-				.shareMoney{
+				margin-top: 8rpx;
+
+				text {
+					margin-right: 10rpx;
+				}
+
+				.shareMoney {
 					height: 28rpx;
-					border:2rpx solid #FF578A;
+					border: 2rpx solid #FF578A;
 					border-radius: 4rpx;
-					line-height:28rpx;
-					font-size:20rpx;
-					margin-right:10rpx;
-					padding-right:10rpx;
-					color:#FF578A;
+					line-height: 28rpx;
+					font-size: 20rpx;
+					margin-right: 10rpx;
+					padding-right: 10rpx;
+					color: #FF578A;
 					display: flex;
 					flex-direction: flex-start;
-					text{background: #FF578A;color:#fff;padding: 0 10rpx;}
+
+					text {
+						background: #FF578A;
+						color: #fff;
+						padding: 0 10rpx;
+					}
 				}
-				.free{
+
+				.free {
 					height: 28rpx;
 					background: #FF753E;
 					border-radius: 4rpx;
-					line-height:28rpx;
-					font-size:20rpx;
+					line-height: 28rpx;
+					font-size: 20rpx;
 					padding: 0 10rpx;
-					margin-right:10rpx;
-					color:#fff;					
+					margin-right: 10rpx;
+					color: #fff;
 				}
 			}
-			
-		}		
+
+		}
 	}
-	.termBox{
+
+	.termBox {
 		width: 750rpx;
-		height: 200rpx;
-		background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(255, 255, 255, 0.8) 70%, rgba(255, 255, 255, 0) 100%);
-		border-radius: 40rpx 40rpx 0px 0px;
-		margin-top:20rpx;
-		.termOuter{
+		// height: 100rpx;
+		background: #fff;
+
+		.termOuter {
 			display: flex;
 			align-items: center;
 			align-content: center;
 			justify-content: flex-start;
-			.termCol{
-				width:27%;
-				text-align:center;
+
+			.termCol {
+				width: 27%;
+				text-align: center;
 				font-size: 28rpx;
 				font-weight: 400;
-				color: #333333;	
-				padding-top:36rpx;
-				.iconfont{font-size: 24rpx;color: #666666;line-height:28rpx;margin-left:8rpx;}
-				
+				color: #333333;
+				padding-top: 36rpx;
+
+				.iconfont {
+					font-size: 24rpx;
+					color: #666666;
+					line-height: 28rpx;
+					margin-left: 8rpx;
+				}
+
 			}
-			.termCol.cur{
-				color:#FF578A;
-				.iconfont{color: #FF578A;}
+
+			.termCol.cur {
+				color: #FF578A;
+
+				.iconfont {
+					color: #FF578A;
+				}
 			}
-			.termCol:last-child{width:19%;}
-			
+
+			.termCol:last-child {
+				width: 19%;
+			}
+
 		}
 	}
-	.hasMenu{margin-top:-100rpx;}
-</style>
+
+	.discuss {
+		display: flex;
+		justify-content: flex-start;
+		margin: 25rpx 0;
+		position: relative;
+		align-items: center;
+		align-content: center;
+
+		.dis_l {
+			font-size: 28rpx;
+			color: #333;
+			font-weight: 500;
+			padding-top: 5rpx;
+			margin-right: 32rpx;
+		}
+
+		.starBox {
+			display: flex;
+			justify-content: flex-start;
+
+			image {
+				display: block;
+				width: 26rpx;
+				height: 26rpx;
+				margin-right: 8rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/active/detail.vue b/pages/active/detail.vue
index e0df07e..8ee7365 100644
--- a/pages/active/detail.vue
+++ b/pages/active/detail.vue
@@ -106,7 +106,7 @@
 					<u-col span="4">
 						<view>
 							<image mode="heightFix" src="../../static/icon_xingming@2x.png"></image>
-							参与人数:
+							活动人数:
 						</view>
 					</u-col>
 					<u-col span="8" v-if="info.member_sum">