diff --git a/pages.json b/pages.json
index 208ef7e..0641114 100644
--- a/pages.json
+++ b/pages.json
@@ -45,19 +45,18 @@
 				"path" : "pages/messageDetail/messageDetail",
 				"style" :                                                                                    
 				{
-						"navigationBarTitleText": "网信信息详情",
-						"enablePullDownRefresh": false
+					"navigationBarTitleText": "网信信息详情",
+					"enablePullDownRefresh": false
 				}	
+			},
+			{
+				"path" : "pages/search/search",
+				"style" :                                                                                    
+				{
+					"navigationBarTitleText": "网信信息搜索",
+					"enablePullDownRefresh": false
+				}
 			}
-        ,{
-            "path" : "pages/search/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

diff --git a/pages.json b/pages.json
index 208ef7e..0641114 100644
--- a/pages.json
+++ b/pages.json
@@ -45,19 +45,18 @@
 				"path" : "pages/messageDetail/messageDetail",
 				"style" :                                                                                    
 				{
-						"navigationBarTitleText": "网信信息详情",
-						"enablePullDownRefresh": false
+					"navigationBarTitleText": "网信信息详情",
+					"enablePullDownRefresh": false
 				}	
+			},
+			{
+				"path" : "pages/search/search",
+				"style" :                                                                                    
+				{
+					"navigationBarTitleText": "网信信息搜索",
+					"enablePullDownRefresh": false
+				}
 			}
-        ,{
-            "path" : "pages/search/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/messageDetail/messageDetail.vue b/pages/messageDetail/messageDetail.vue
index 4b5285e..584e844 100644
--- a/pages/messageDetail/messageDetail.vue
+++ b/pages/messageDetail/messageDetail.vue
@@ -40,8 +40,8 @@
 		//分享好友
 		onShareAppMessage() {
 			return {
-				title: ' ',
-				// imageUrl: '../../static/share.png',
+				title: this.title,
+				imageUrl: this.content[0].img,
 				path: "/pages/messageDetail/messageDetail",
 			};
 		},
@@ -59,10 +59,11 @@
 
 <style lang="scss" scoped>
 	.message-detail {
-		height: 100%;
-		padding: 40rpx;
-		padding-bottom: 100rpx;
+		min-height: 100%;
+		padding: 40rpx 40rpx 60rpx 40rpx;
 		background-color: #fff;
+		box-sizing: border-box;
+		overflow: auto;
 		// 标题
 		.title {
 			font-size: 38rpx;
@@ -93,6 +94,7 @@
 				font-weight: 32rpx;
 				line-height: 58rpx;
 				text-indent: 64rpx; //缩进
+				text-align: justify; //文字两端对齐
 			}
 		}
 	}

diff --git a/pages.json b/pages.json
index 208ef7e..0641114 100644
--- a/pages.json
+++ b/pages.json
@@ -45,19 +45,18 @@
 				"path" : "pages/messageDetail/messageDetail",
 				"style" :                                                                                    
 				{
-						"navigationBarTitleText": "网信信息详情",
-						"enablePullDownRefresh": false
+					"navigationBarTitleText": "网信信息详情",
+					"enablePullDownRefresh": false
 				}	
+			},
+			{
+				"path" : "pages/search/search",
+				"style" :                                                                                    
+				{
+					"navigationBarTitleText": "网信信息搜索",
+					"enablePullDownRefresh": false
+				}
 			}
-        ,{
-            "path" : "pages/search/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/messageDetail/messageDetail.vue b/pages/messageDetail/messageDetail.vue
index 4b5285e..584e844 100644
--- a/pages/messageDetail/messageDetail.vue
+++ b/pages/messageDetail/messageDetail.vue
@@ -40,8 +40,8 @@
 		//分享好友
 		onShareAppMessage() {
 			return {
-				title: ' ',
-				// imageUrl: '../../static/share.png',
+				title: this.title,
+				imageUrl: this.content[0].img,
 				path: "/pages/messageDetail/messageDetail",
 			};
 		},
@@ -59,10 +59,11 @@
 
 <style lang="scss" scoped>
 	.message-detail {
-		height: 100%;
-		padding: 40rpx;
-		padding-bottom: 100rpx;
+		min-height: 100%;
+		padding: 40rpx 40rpx 60rpx 40rpx;
 		background-color: #fff;
+		box-sizing: border-box;
+		overflow: auto;
 		// 标题
 		.title {
 			font-size: 38rpx;
@@ -93,6 +94,7 @@
 				font-weight: 32rpx;
 				line-height: 58rpx;
 				text-indent: 64rpx; //缩进
+				text-align: justify; //文字两端对齐
 			}
 		}
 	}
diff --git a/pages/search/search.vue b/pages/search/search.vue
index 8183fd0..6f7158f 100644
--- a/pages/search/search.vue
+++ b/pages/search/search.vue
@@ -1,22 +1,154 @@
 <template>
-	<view>
+	<view class="search">
+		<view class="search-area">
+			<u-search
+				placeholder="请输入关键字" 
+				v-model="keyword"
+				bgColor="#fff"
+				height="40"
+				:actionStyle="{
+					fontSize: '16px',
+					color: '#000',
+					fontWeight: '600'
+				}"
+				clearabled
+				@custom="search"
+				@search="search"
+			></u-search>
+		</view>
 		
+		<view class="event-area">
+			<EventList :list="eventList"/>
+		</view>
+		
+		<!-- 加载更多 -->
+		<u-loadmore :status="status" />
+		
+		<!-- 返回顶部 -->
+		<u-back-top 
+			:scroll-top="scrollTop" 
+			icon="arrow-up" 
+			duration="200"
+		></u-back-top>
 	</view>
 </template>
 
 <script>
+	import EventList from '@/components/index/eventList.vue';
 	export default {
+		name: 'Search',
+		components: {
+			EventList
+		},
 		data() {
 			return {
-				
+				eventList: [], //事件数据
+				keyword: '新疆', //搜索关键字
+				scrollTop: 0,
+				status: 'nomore', //上滑加载状态 loading加载中，nomore没有更多了
 			}
 		},
-		methods: {
+		mounted() {
+			//先用新疆调一下接口
+			this.search();
+		},
+		// 监听滚动条位置
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			//用this.keywords刷新
+			console.log('refresh');
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上滑加载
+		onReachBottom() {
 			
+		},
+		methods: {
+			//点击搜索
+			search() {
+				console.log('搜索');
+				//调接口
+				this.eventList = [
+					{
+						title: '工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},
+					{
+						title: '工作动态工作动态工作动态工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},
+					{
+						title: '工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},{
+						title: '工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},{
+						title: '工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},{
+						title: '工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},{
+						title: '工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},{
+						title: '工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},{
+						title: '工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},{
+						title: '工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},{
+						title: '工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},{
+						title: '工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},{
+						title: '工作动态工作动态工作动态',
+						time: '2121-12-12 12:02:20',
+						img: '../../static/share.png'
+					},
+				]
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style lang="scss">
+	.search {
+		width: 100%;
+		padding: 110rpx 0 80rpx 0;
+		box-sizing: border-box;
+		.search-area {
+			position: fixed;
+			box-sizing: border-box;
+			top: 0;
+			left: 0;
+			padding: 20rpx 20rpx;
+			width: 100%;
+			height: 130rpx;
+			background-color: #efeff4;
+		}
+	}
 </style>