diff --git a/cloudfunctions-aliyun/search/index.js b/cloudfunctions-aliyun/search/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..e2bbb03e4642d2d60817ae50297e2abd9ea2ec03
--- /dev/null
+++ b/cloudfunctions-aliyun/search/index.js
@@ -0,0 +1,20 @@
+//我在做这个文件，我的群昵称是King,QQ:36568008  
+'use strict';
+const db = uniCloud.database()
+exports.main = async (event, context) => {
+	const collection = db.collection('member')
+	if (event.searchKey != '') {
+		const dbCmd = db.command;
+		const res = await collection.where(dbCmd.or({
+			name: new RegExp(event.searchKey)
+		}, {
+			address: new RegExp(event.searchKey)
+		})).orderBy("regtime", "desc").skip((event.page - 1) * event.pageSize).limit(event.pageSize).get();
+		return res
+	} else {
+		const res = await collection.orderBy("regtime", "desc").skip((event.page - 1) * event.pageSize).limit(event.pageSize)
+			.get();
+		return res
+	}
+
+};
diff --git a/pages/tabbar/search.vue b/pages/tabbar/search.vue
index dbdc793955b830d928ba63e9b8428003dab7c39d..c3bb22777ba671b55f014e8572ee887006442c3e 100644
--- a/pages/tabbar/search.vue
+++ b/pages/tabbar/search.vue
@@ -1,17 +1,17 @@
+	//我在做这个文件，我的群昵称是King,QQ:36568008  
 <template>
-	<!--King上传于2020年1月30日12：40，QQ:36568008-->
-	<view>
+	<view class="fixed">
 		<view class="search uni-flex bg-white" style="align-items: center;">
-			<input type="text" class="flex-sub" style="padding: 0 20upx;" v-model="searchKey" placeholder="请输入人名,状态等关键词"
-			 confirm-type="search" />
-			<text class="uni-bg-green" style="padding: 15upx 30upx;">搜索</text>
+			<uni-search-bar @confirm="search" v-model="searchKey"  style="flex:1" />
 		</view>
 		<view class="flex-sub" style="position: relative;">
-			<scroll-view scroll-y="true" style="position: absolute;width: 100%;height: 100%;" @scrolltolower="next">
-				<view class="uni-list-cell" v-for="(item,index) in list" :key="index">
-					
+			<scroll-view scroll-y="true" style="position: absolute;width: 100%;height: 100%;padding-top: 20upx;" @scrolltolower="next">
+				<uni-list>
+					<uni-list-item v-for="(item,index) in list" :key="index"  @click="openDetail(item._id)" :title="item.name" :note="item.address"></uni-list-item>
+				</uni-list>
+				<view class="uni-flex" style="justify-content: center;padding: 10upx;">
+					{{contentText[loadingType]}}
 				</view>
-				<uni-load-more :loadingType="loadingType" :contentText="contentText"></uni-load-more>
 			</scroll-view>
 		</view>
 	</view>
@@ -19,30 +19,30 @@
 
 <script>
 	var _this;
-	import uniLoadMore from '../../components/uni-load-more/uni-load-more.vue'
 	export default {
 		data() {
 			return {
+				searchKey:'',
 				list: [],
 				page: 1,
 				loadingType: 0,
-				contentText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				}
+				contentText: ["上拉显示更多", "正在加载...","没有更多数据了"]
+				
 			}
 		},
-		components: {
-			uniLoadMore
-		},
-		onLoad(){
-			_this=this;
+		onLoad() {
+			_this = this;
 		},
-		onShow(){
+		onShow() {
 			this.load();
 		},
 		methods: {
+			input:function(res) {
+				this.searchKey = res.value
+			},
+			search:function(){
+				_this.reload();
+			},
 			next() {
 				this.page = this.page + 1;
 				if (this.loadingType !== 0) {
@@ -52,36 +52,32 @@
 				this.load();
 			},
 			load: function() {
+				uni.showLoading();
 				uniCloud.callFunction({
-				  name: 'member-list'
+					name: 'search',
+					data:{page:this.page,searchKey:this.searchKey.value,pageSize:10}
 				}).then((res) => {
-				  uni.hideLoading()
-				  uni.showModal({
-				    content: `查询成功，获取数据列表为：${JSON.stringify(res.result.data)}`,
-				    showCancel: false
-				  })
-				  console.log(res)
+					uni.hideLoading();
+					if (res.result.data.length == 0) {
+						this.loadingType = 2;
+						return;
+					} else {
+						_this.list = _this.list.concat(res.result.data);
+						this.loadingType = 0;
+					}
 				}).catch((err) => {
-				  uni.hideLoading()
-				  uni.showModal({
-				    content: `查询失败，错误信息为：${err.message}`,
-				    showCancel: false
-				  })
-				  console.error(err)
+					uni.hideLoading()
+					uni.showModal({
+						content: `查询失败，错误信息为：${err.message}`,
+						showCancel: false
+					})
+				})
+				
+			},
+			openDetail:function(id){
+				uni.navigateTo({
+					url:'../member-detail/member-detail?id='+id
 				})
-				// this.tool.post('/Message/GetList', {
-				// 	page: this.page
-				// }).then(res => {
-				// 	if (res.data.code == 0) {
-				// 		if (res.data.data.length == 0) {
-				// 			this.loadingType = 2;
-				// 			return;
-				// 		} else {
-				// 			_this.list = _this.list.concat(res.data.data);
-				// 		}
-				// 		this.loadingType = 0;
-				// 	} else {}
-				// });
 			},
 			reload: function() {
 				_this.page = 1;
@@ -106,6 +102,7 @@
 		height: 100%;
 		display: flex;
 		justify-content: space-between;
+		flex-direction: column;
 	}
 
 	.flex-sub {