lhl 4 лет назад
Родитель
Сommit
86e4713677

+ 3 - 3
src/App.vue

@@ -24,9 +24,9 @@ export default {
 	PageBottom
   },
   created() {
-  	if(this.isMobile()) {
-		window.location.href = 'http://jz.red.igxys.com/index/#/'
-	}
+ //  	if(this.isMobile()) {
+	// 	window.location.href = 'http://jz.red.igxys.com/index/#/'
+	// }
   },
   methods: {
 	  isMobile() {

BIN
src/assets/img/search.png


+ 1 - 1
src/views/Law.vue

@@ -78,7 +78,7 @@ export default {
 					obj.uid = item.id
 					obj.ps = item.synopsis
 					that.navList.push(obj)
-					console.log(that.navList,'55555')
+					// console.log(that.navList,'55555')
 				})
 				that.navList = that.navList.sort(this.compare('ps'))
 				this.navClick(that.navList[0].uid)

+ 173 - 118
src/views/LoveList.vue

@@ -1,15 +1,19 @@
 <template>
 	<div class="love-list">
+		<div class="search">
+			<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getLiveList(keyword)" />
+			<img src="../assets/img/search.png" class="hand" @click="getLiveList(keyword)">
+		</div>
 		<div class="list-title flex">
 			<div style="width: 350px">捐献时间</div>
-			<div  style="width: 500px">捐献者</div>
-			<div  style="width: 350px">捐献金额</div>
+			<div style="width: 500px">捐献者</div>
+			<div style="width: 350px">捐献金额</div>
 			<!-- <div  style="width: 356px">捐献意向</div>
 			<div  style="width: 133px">备注</div> -->
 		</div>
 		<div class="list-item flex" v-for="(item, index) in tableData" :key="index">
-			<div class="clamp"  style="width: 350px">{{item.release_time}}</div>
-			<div class="clamp"  style="width: 500px">{{item.title}}</div>
+			<div class="clamp" style="width: 350px">{{item.release_time}}</div>
+			<div class="clamp" style="width: 500px">{{item.title}}</div>
 			<div class="clamp" style="width: 350px">{{item.synopsis}}</div>
 			<!-- <div class="clamp" style="width: 356px">{{item.intention}}</div>
 			<div class="clamp" style="width: 133px">{{item.mask}}</div> -->
@@ -17,134 +21,185 @@
 		<div class="table-empty" v-if="tableData.length == 0">
 			暂无更多捐赠数据
 		</div>
-		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="limit"></el-pagination>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页"
+			@current-change="currentChange" :page-size="limit"></el-pagination>
 	</div>
 </template>
 
 <script>
-	import { loveList,getList } from '../request/api.js'
-export default {
-	data() {
-		return {
-			tableData: [],
-			total: 0,
-			page:1,
-			limit: 14
-		};
-	},
-	created() {
-		this.getLiveList()
-	},
-	methods: {
-		compare(attribute) {
-			return function(obj1, obj2) {
-				
-				// var val1 = obj1[attribute].replace(/./g,'');
-				let val1 = obj1[attribute].split('.').join('')*1
-				// console.log(obj1[attribute])
-				console.log(val1)
-				// console.log(valarr)
-				var val2 = obj2[attribute].split('.').join('')*1;
-				if (val1 < val2) {
-					return 1;
-				} else if (val1 > val2) {
-					return -1;
-				} else {
-					return 0;
-				}
-			}
+	import {
+		loveList,
+		getList
+	} from '../request/api.js'
+	export default {
+		data() {
+			return {
+				tableData: [],
+				total: 0,
+				page: 1,
+				limit: 14,
+				keyword: ''
+			};
 		},
-		//分页页码改变触发事件
-		currentChange(e) {
-			this.page = e
+		created() {
 			this.getLiveList()
 		},
-		getLiveList() {
-			let obj = this
-			let data = {
-				page: obj.page,
-				limit: obj.limit
+		methods: {
+			compare(attribute) {
+				return function(obj1, obj2) {
+
+					// var val1 = obj1[attribute].replace(/./g,'');
+					let val1 = obj1[attribute].split('.').join('') * 1
+					// console.log(obj1[attribute])
+					// console.log(val1)
+					// console.log(valarr)
+					var val2 = obj2[attribute].split('.').join('') * 1;
+					if (val1 < val2) {
+						return 1;
+					} else if (val1 > val2) {
+						return -1;
+					} else {
+						return 0;
+					}
+				}
+			},
+			//分页页码改变触发事件
+			currentChange(e) {
+				this.page = e
+				this.getLiveList()
+			},
+			getLiveList(keyword) {
+				let obj = this
+				if(keyword) {
+					obj.page = 1
+				}
+				let data = {
+					page: obj.page,
+					limit: obj.limit,
+					name: obj.keyword
+				}
+				getList(data, 62).then(({
+					data
+				}) => {
+					// console.log(data)
+					this.total = data.count
+					this.tableData = data.list.sort(this.compare('release_time'))
+					// console.log(this.tableData)
+				})
 			}
-			getList(data,62).then( ({data}) => {
-				console.log(data)
-				this.total = data.count
-				this.tableData = data.list.sort(this.compare('release_time'))
-				// console.log(this.tableData)
-			})
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped="">
-.love-list {
-	height: 870px;
-	position: relative;
-}
-/deep/ .el-table thead th {
-	font-size: 18px;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #d82020;
-}
-/deep/ .el-table tr td {
-	font-size: 16px;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #101010;
-	padding: 11px 0;
-	line-height: 1;
-}
-/deep/ .el-pagination {
-	position: absolute;
-	display: inline-block;
-	bottom: 75px;
-	right: 0;
-	padding-right: 0;
-}
-.list-title {
-	// display: flex;
-	text-align: center;
-	border: 2px solid #F2F2F2;
-	line-height: 36px;
-	font-size: 18px;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #D82020;
-	// border-top: none;
-	div {
-		border-right: 2px solid #F2F2F2;
-		&:last-of-type {
-			border-right: none;
+	.love-list {
+		height: 870px;
+		position: relative;
+	}
+
+	/deep/ .el-table thead th {
+		font-size: 18px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #d82020;
+	}
+
+	/deep/ .el-table tr td {
+		font-size: 16px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #101010;
+		padding: 11px 0;
+		line-height: 1;
+	}
+
+	/deep/ .el-pagination {
+		position: absolute;
+		display: inline-block;
+		bottom: 75px;
+		right: 0;
+		padding-right: 0;
+	}
+
+	.list-title {
+		// display: flex;
+		text-align: center;
+		border: 2px solid #F2F2F2;
+		line-height: 36px;
+		font-size: 18px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #D82020;
+
+		// border-top: none;
+		div {
+			border-right: 2px solid #F2F2F2;
+
+			&:last-of-type {
+				border-right: none;
+			}
+		}
+
+	}
+
+	.list-item {
+		text-align: center;
+		border: 2px solid #F2F2F2;
+		font-size: 16px;
+		line-height: 36px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #101010;
+		border-top: none;
+
+		div {
+			border-right: 2px solid #F2F2F2;
+
+			&:last-of-type {
+				border-right: none;
+
+			}
 		}
 	}
-	
-}
-.list-item {
-	text-align: center;
-	border: 2px solid #F2F2F2;
-	font-size: 16px;
-	line-height: 36px;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #101010;
-	border-top: none;
-	div {
-		border-right: 2px solid #F2F2F2;
-		&:last-of-type {
-			border-right: none;
-			
+
+	.table-empty {
+		// width: 100%;
+		text-align: center;
+		border: 2px solid #F2F2F2;
+		font-size: 16px;
+		line-height: 36px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		border-top: none;
+	}
+
+	.search {
+		margin-left: 879px;
+		padding-left: 13px;
+		padding-right: 13px;
+		width: 295px;
+		height: 33px;
+		line-height: 33px;
+		background: #FFFFFF;
+		border: 1px solid #CCCCCC;
+		border-radius: 10px;
+		margin-bottom: 10px;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		input {
+			width: 235px;
+			font-size: 16px;
+			font-family: PingFang SC;
+			font-weight: bold;
+			outline: none;
+			border: none;
+		}
+
+		img {
+			width: 20px;
+			height: 20px;
 		}
 	}
-}
-.table-empty {
-	// width: 100%;
-	text-align: center;
-	border: 2px solid #F2F2F2;
-	font-size: 16px;
-	line-height: 36px;
-	font-family: PingFang SC;
-	font-weight: bold;
-	border-top: none;
-}
 </style>

+ 57 - 7
src/views/directories/List.vue

@@ -1,9 +1,16 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
 		<div class="empty" v-if="newList.length == 0">
 			暂无数据
 		</div>
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/directories/detail?id='+ item.id)">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id"
+			@click="navTo('/directories/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -31,7 +38,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: ''
 			};
 		},
 		filters: {
@@ -53,12 +61,16 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
-				},60).then(res => {
+					limit: obj.limit,
+					name: obj.keyword
+				}, 60).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					// var newArrayData=res.data.list.sort(compare('Id'))
 					obj.total = res.data.count
@@ -88,9 +100,9 @@
 		height: 400px;
 		line-height: 400px;
 	}
-	.new-list {
 
-		// padding: 0px 72px 0 40px;
+	.new-list {
+		position: relative;
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -133,4 +145,42 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+
+		.search {
+
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 55 - 4
src/views/help/List.vue

@@ -1,5 +1,11 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search" >
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
 		<div class="empty" v-if="newList.length == 0">
 			暂无数据
 		</div>
@@ -22,7 +28,8 @@ export default {
 			newList: [],
 			total: 0,
 			page: 1,
-			limit: 15
+			limit: 15,
+			keyword: '',
 		};
 	},
 	filters: {
@@ -44,11 +51,15 @@ export default {
 			this.page = e
 			this.getList()
 		},
-		getList() {
+		getList(keyword) {
 			let obj = this
+			if(keyword != '') {
+				obj.page = 1
+			}
 			getHelpList({
 				page: obj.page,
-				limit: obj.limit
+				limit: obj.limit,
+				name: obj.keyword
 			}).then(res => {
 				obj.newList = res.data.list.sort(this.compare('id'))
 				obj.total = res.data.count
@@ -66,7 +77,7 @@ export default {
 					return 0;
 				}
 			}
-		}
+		},
 	}
 };
 </script>
@@ -80,6 +91,7 @@ export default {
 	}
 .new-list {
 	// padding: 0px 72px 0 40px;
+	position: relative;
 	.new-item {
 		display: flex;
 		justify-content: space-between;
@@ -117,4 +129,43 @@ export default {
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		// justify-content: flex-end;
+		height: 33px;
+		// width: 100%;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+		.search {
+			
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+		
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
+	
 </style>

+ 61 - 5
src/views/knowledge/bloodDonation/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
 		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/knowledge/bloodDonation/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
@@ -22,7 +31,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: '',
 			};
 		},
 		filters: {
@@ -44,11 +54,15 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
+					limit: obj.limit,
+					name: obj.keyword
 				},50).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					obj.total = res.data.count
@@ -73,8 +87,13 @@
 
 <style lang="scss" scoped>
 	.new-list {
-
-		// padding: 0px 72px 0 40px;
+		position: relative;
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -117,4 +136,41 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 61 - 5
src/views/knowledge/cells/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
 		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/knowledge/cells/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
@@ -22,7 +31,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: '',
 			};
 		},
 		filters: {
@@ -44,11 +54,15 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
+					limit: obj.limit,
+					name: obj.keyword
 				},49).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					obj.total = res.data.count
@@ -73,8 +87,13 @@
 
 <style lang="scss" scoped>
 	.new-list {
-
-		// padding: 0px 72px 0 40px;
+		position: relative;
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -117,4 +136,41 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 65 - 6
src/views/knowledge/development/List.vue

@@ -1,6 +1,16 @@
 <template>
 	<div class="new-list">
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/knowledge/development/detail?id='+ item.id)">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
+		<div class="new-item  hand" v-for="item in newList" :key="item.id"
+			@click="navTo('/knowledge/development/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -22,7 +32,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: '',
 			};
 		},
 		filters: {
@@ -44,12 +55,16 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
-				},63).then(res => {
+					limit: obj.limit,
+					name: obj.keyword
+				}, 63).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					obj.total = res.data.count
 				})
@@ -73,8 +88,15 @@
 
 <style lang="scss" scoped>
 	.new-list {
+		position: relative;
+
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
 
-		// padding: 0px 72px 0 40px;
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -117,4 +139,41 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 66 - 6
src/views/knowledge/rescue/List.vue

@@ -1,6 +1,16 @@
 <template>
 	<div class="new-list">
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/knowledge/rescue/detail?id='+ item.id)">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
+		<div class="new-item  hand" v-for="item in newList" :key="item.id"
+			@click="navTo('/knowledge/rescue/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -22,7 +32,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: '',
 			};
 		},
 		filters: {
@@ -44,12 +55,16 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
-				},48).then(res => {
+					limit: obj.limit,
+					name: obj.keyword
+				}, 48).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					obj.total = res.data.count
 				})
@@ -74,7 +89,15 @@
 <style lang="scss" scoped>
 	.new-list {
 
-		// padding: 0px 72px 0 40px;
+		position: relative;
+
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
+
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -117,4 +140,41 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 62 - 4
src/views/newContent/hhs/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
 		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newContent/hhs/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
@@ -22,7 +31,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: ''
 			};
 		},
 		filters: {
@@ -44,11 +54,15 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
+					limit: obj.limit,
+					name: obj.keyword
 				},55).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					obj.total = res.data.count
@@ -74,7 +88,14 @@
 <style lang="scss" scoped>
 	.new-list {
 
-		// padding: 0px 72px 0 40px;
+		position: relative;
+		
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -117,4 +138,41 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 62 - 4
src/views/newContent/jls/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
 		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newContent/jls/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
@@ -22,7 +31,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: ''
 			};
 		},
 		filters: {
@@ -44,11 +54,15 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
+					limit: obj.limit,
+					name: obj.keyword
 				},59).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					obj.total = res.data.count
@@ -74,7 +88,14 @@
 <style lang="scss" scoped>
 	.new-list {
 
-		// padding: 0px 72px 0 40px;
+		position: relative;
+		
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -117,4 +138,41 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 62 - 4
src/views/newContent/jlx/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
 		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newContent/jlx/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
@@ -22,7 +31,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: ''
 			};
 		},
 		filters: {
@@ -44,11 +54,15 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
+					limit: obj.limit,
+					name: obj.keyword
 				},53).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					obj.total = res.data.count
@@ -74,7 +88,14 @@
 <style lang="scss" scoped>
 	.new-list {
 
-		// padding: 0px 72px 0 40px;
+		position: relative;
+		
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -117,4 +138,41 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 62 - 4
src/views/newContent/jzq/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
 		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newContent/jzq/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
@@ -22,7 +31,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: ''
 			};
 		},
 		filters: {
@@ -44,11 +54,15 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
+					limit: obj.limit,
+					name: obj.keyword
 				},56).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					obj.total = res.data.count
@@ -74,7 +88,14 @@
 <style lang="scss" scoped>
 	.new-list {
 
-		// padding: 0px 72px 0 40px;
+		position: relative;
+		
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -117,4 +138,41 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 62 - 4
src/views/newContent/ssq/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
 		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newContent/ssq/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
@@ -22,7 +31,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: ''
 			};
 		},
 		filters: {
@@ -44,11 +54,15 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
+					limit: obj.limit,
+					name: obj.keyword
 				},57).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					obj.total = res.data.count
@@ -74,7 +88,14 @@
 <style lang="scss" scoped>
 	.new-list {
 
-		// padding: 0px 72px 0 40px;
+		position: relative;
+		
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -117,4 +138,41 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 62 - 4
src/views/newContent/sss/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
 		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newContent/sss/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
@@ -22,7 +31,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: ''
 			};
 		},
 		filters: {
@@ -44,11 +54,15 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
+					limit: obj.limit,
+					name: obj.keyword
 				},54).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					obj.total = res.data.count
@@ -74,7 +88,14 @@
 <style lang="scss" scoped>
 	.new-list {
 
-		// padding: 0px 72px 0 40px;
+		position: relative;
+		
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -117,4 +138,41 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 62 - 4
src/views/newContent/szs/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
 		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newContent/szs/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
@@ -22,7 +31,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: ''
 			};
 		},
 		filters: {
@@ -44,11 +54,15 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
+					limit: obj.limit,
+					name: obj.keyword
 				},58).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					obj.total = res.data.count
@@ -74,7 +88,14 @@
 <style lang="scss" scoped>
 	.new-list {
 
-		// padding: 0px 72px 0 40px;
+		position: relative;
+		
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -117,4 +138,41 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 63 - 4
src/views/news/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
 		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
@@ -27,7 +36,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: ''
 			};
 		},
 		filters: {
@@ -49,11 +59,15 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if(keyword != '') {
+					obj.page = 1
+				}
 				newsList({
 					page: obj.page,
-					limit: obj.limit
+					limit: obj.limit,
+					name: obj.keyword
 				}).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					// var newArrayData=res.data.list.sort(compare('Id'))
@@ -79,8 +93,15 @@
 
 <style lang="scss" scoped>
 	.new-list {
+		position: relative;
+
+		.empty {
+			text-align: center;
+			color: #999;
+			height: 400px;
+			line-height: 400px;
+		}
 
-		// padding: 0px 72px 0 40px;
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -123,4 +144,42 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+
+		.search {
+
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 57 - 7
src/views/organs/List.vue

@@ -1,9 +1,16 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
 		<div class="empty" v-if="newList.length == 0">
 			暂无数据
 		</div>
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/organs/detail?id='+ item.id)">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id"
+			@click="navTo('/organs/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -31,7 +38,8 @@
 				newList: [],
 				total: 0,
 				page: 1,
-				limit: 15
+				limit: 15,
+				keyword: ''
 			};
 		},
 		filters: {
@@ -53,12 +61,16 @@
 				this.page = e
 				this.getList()
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if (keyword) {
+					obj.page = 1
+				}
 				getList({
 					page: obj.page,
-					limit: obj.limit
-				},61).then(res => {
+					limit: obj.limit,
+					name: obj.keyword
+				}, 61).then(res => {
 					obj.newList = res.data.list.sort(this.compare('id'))
 					// var newArrayData=res.data.list.sort(compare('Id'))
 					obj.total = res.data.count
@@ -88,9 +100,9 @@
 		height: 400px;
 		line-height: 400px;
 	}
-	.new-list {
 
-		// padding: 0px 72px 0 40px;
+	.new-list {
+		position: relative;
 		.new-item {
 			display: flex;
 			justify-content: space-between;
@@ -133,4 +145,42 @@
 		margin-top: 50px;
 		text-align: center;
 	}
+
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+
+		.search {
+
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>

+ 63 - 3
src/views/popularScience/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="tipList.length == 0">
+			暂无数据
+		</div>
 		<div class="wrapper">
 			<div class="tip"  v-for="item in tipList" :key="item.id" @click="tipClick(item.id)">
 				<img :src="item.image_input[0]" />
@@ -24,7 +33,8 @@
 				alllist: [],
 				total: 0,
 				page: 1,
-				limit: 7
+				limit: 7,
+				keyword: ''
 			}
 		},
 		created() {
@@ -50,11 +60,15 @@
 					obj.tipList = data.list
 				})
 			},
-			getList() {
+			getList(keyword) {
 				let obj = this
+				if(keyword) {
+					obj.page = 1
+				}
 				let data = {
 					page: this.page,
-					limit: this.limit
+					limit: this.limit,
+					name: this.keyword
 				}
 				splist(data).then(({data}) => {
 					obj.tipList = data.list
@@ -65,6 +79,15 @@
 </script>
 
 <style lang="scss" scoped>
+	.list {
+		position: relative;
+	}
+	.empty {
+		text-align: center;
+		color: #999;
+		height: 400px;
+		line-height: 400px;
+	}
 	.tip{
 		width: 815px;
 		height: 127px;
@@ -112,5 +135,42 @@
 	/deep/ .el-pagination {
 		margin-top: 50px;
 		text-align: center;
+	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
 	}
 </style>

+ 66 - 5
src/views/publicity/List.vue

@@ -1,5 +1,14 @@
 <template>
 	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
 		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/publicity/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
@@ -19,7 +28,8 @@ export default {
 			newList: [],
 			total: 0,
 			page: 1,
-			limit: 15
+			limit: 15,
+			keyword: ''
 		};
 	},
 	filters: {
@@ -39,14 +49,21 @@ export default {
 		},
 		currentChange(e) {
 			this.page = e
+			// console.log(this.page)
 			this.getList()
 		},
-		getList() {
+		getList(keyword) {
+			// console.log(keyword)
 			let obj = this
+			if (keyword) {
+				obj.page = 1
+			}
+			// console.log(obj.page)
 			openList({
 				page: obj.page,
-				limit: obj.limit
-			}).then(res => {
+				limit: obj.limit,
+				name: obj.keyword,
+				}).then(res => {
 				obj.newList = res.data.list.sort(this.compare('id'))
 				obj.total = res.data.count
 			})
@@ -70,7 +87,14 @@ export default {
 
 <style lang="scss" scoped>
 .new-list {
-	// padding: 0px 72px 0 40px;
+	position: relative;
+	.empty {
+		text-align: center;
+		color: #999;
+		height: 400px;
+		line-height: 400px;
+	}
+	
 	.new-item {
 		display: flex;
 		justify-content: space-between;
@@ -108,4 +132,41 @@ export default {
 		margin-top: 50px;
 		text-align: center;
 	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
 </style>