8-22

src/App.vue

@@ -5,12 +5,17 @@
 	</div>
 	<div>
 	</div>
-    <top-logo></top-logo>
+    <top-logo></top-logo>
+	
     <nav-bar></nav-bar>
 	<div class="main-wrapper">
 		<router-view />
 	</div>
-	<page-bottom></page-bottom>
+	<page-bottom></page-bottom>
+	<div class="donate">
+		<img src="@/assets/img/donate1.png" alt="" />
+		<!-- <div class="tit">在线捐赠</div> -->
+	</div>
   </div>
 </template>
 <script>
@@ -71,5 +76,20 @@ export default {
 		
 		height: 300px;
 	}
-}
+}
+.donate {
+	width: 200px;
+	height: 200px;
+	position: fixed;
+	right: 5px;
+	bottom: 80px;
+	z-index: 999;
+	
+	img {
+		display: block;
+		width:100%;
+		height: 100%;
+		border-radius: 10px;
+	}
+}
 </style>

src/assets/css/base.css

@@ -33,24 +33,24 @@ html {
 .flex {
 	display: flex;
 }
-.new-detail {
+.new-details {
 	max-width: 100%;
 }
-.new-detail img {
+.new-details img {
 	max-width: 100%;
 }
-.new-detail * {
+.new-details * {
 	max-width: 100%;
 }
-.new-detail table {
+.new-details table {
 	min-width: 100%;
 }
-.new-detail td {
+.new-details td {
 	display:table-cell;
 	vertical-align:middle;
 }
-.new-detail table,th,td {
+/* .new-details table,th,td {
 	border: 1px solid #000;
 	text-align: center;
-}
+} */
 

src/assets/js/artList.js

@@ -0,0 +1,83 @@
+let artList = [
+	{
+		path: '/newsCenter/redNews',
+		tit: '红会新闻',
+		id: 13
+	},
+	{
+		path: '/newsCenter/echeng',
+		tit: '鄂城区',
+		id: 14
+	},
+	{
+		path: '/newsCenter/huarong',
+		tit: '华容区',
+		id: 15
+	},
+	{
+		path: '/newsCenter/liangzihu',
+		tit:'梁子湖区',
+		id: 16
+	},
+	{
+		path: '/open/notice',
+		tit:'公告通知',
+		id: 19
+	},
+	{
+		path: '/open/laws',
+		tit:'政策法规',
+		id: 17
+	},
+	{
+		path: '/open/finance',
+		tit:'财务公开',
+		id: 34
+	},
+	{
+		path: '/newsCenter/work',
+		tit: '红十字志愿服务与青少年',
+		id: 25
+	},
+	{
+		path: '/newsCenter/rescue',
+		tit: '应急救援',
+		id: 26
+	},
+	{
+		path: '/newsCenter/protect',
+		tit: '应急救护',
+		id: 27
+	},
+	{
+		path: '/newsCenter/humanity',
+		tit: '人道救助',
+		id: 28
+	},
+	{
+		path: '/newsCenter/hematopoiesis',
+		tit: '造血干细胞捐献',
+		id: 29
+	},
+	{
+		path: '/newsCenter/body',
+		tit: '遗体和器官捐献',
+		id: 30
+	},
+	{
+		path: '/newsCenter/blood',
+		tit: '无偿献血',
+		id: 31
+	},
+	{
+		path: '/donate/receive',
+		tit: '捐赠接收',
+		id: 36
+	},
+	{
+		path: '/donate/expenditure',
+		tit: '款物支出',
+		id: 37
+	},
+]
+export default artList;

src/components/leftNav/LeftNav.vue

@@ -3,7 +3,7 @@
 		<div class="left-nav" :style="{height: navHeight}">
 			<div class="nav-title"></div>
 			<div class="nav-item" v-for="item in navList" :key="item.id"
-				:class="{'action': currentUrl.indexOf(item.path) !== -1}" @click="navTo(item.path)">
+				:class="{'action': currentUrl.indexOf(item.path) !== -1 || (item.path1 && currentUrl.indexOf(item.path1)!== -1)}" @click="navTo(item.path)">
 				<div class="item-name">
 					{{item.name}}
 				</div>
@@ -13,12 +13,15 @@
 			</div>
 		</div>
 		<div class="right-content">
-			<div class="title moren" v-if="isShow">
-				{{rightTitle}}
-			</div>
-			<div class="title moren" v-else>
-				<span class="hand" @click="back">{{detailTitle[0]}} > </span>{{detailTitle[1]}}
+			<div v-if="currentUrl !== '/donate/lovelist' && currentUrl !== '/donate/wuzhilist' && currentUrl !== '/donate/wuzhioutlist' && currentUrl !== '/donate/loveoutlist'">
+				<div class="title moren" v-if="isShow">
+					{{rightTitle}}
+				</div>
+				<div class="title moren" v-else>
+					<span class="hand" @click="back">{{detailTitle[0]}} > </span>{{detailTitle[1]}}
+				</div>
 			</div>
+			
 			<div class="jg"></div>
 			<div style="padding: 35px 50px 35px 50px;" class="line">
 				<slot></slot>

src/components/pageBottom/PageBottom.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="view-bottom">
 		<div class="bqsy">版权所有：Copyright©2017-2037 　版权所有 鄂州市红十字会</div>
-		<div class="address">地址：湖北省鄂州市鄂城区滨湖南路60号7楼 浙ICP备17054590号-1</div>
+		<div class="address">地址：湖北省鄂州市鄂城区滨湖南路60号7楼 <a href="https://beian.miit.gov.cn/" style="color: #fff;">浙ICP备17054590号-2</a> </div>
 	</div>
 </template>
 

src/components/topLogo/TopLogo.vue

@@ -1,11 +1,57 @@
 <template>
   <div class="top">
-    <div class="logo"><img src="../../assets/img/logo2.png" alt="" /></div>
+    <div class="logo"><img src="../../assets/img/logo3.png" alt="" /></div>
+	<div class="flex">
+		<el-input class="c1" v-model="name" placeholder="请输入关键字搜索" ></el-input>
+		<el-select v-model="value" placeholder="请选择" class="c2">
+		    <el-option
+		      v-for="item in options"
+		      :key="item.value"
+		      :label="item.label"
+		      :value="item.value">
+		    </el-option>
+		  </el-select>
+		<div class="c3 hand" @click="goSearch">
+			<i class="el-icon-search"></i>
+		搜索	
+		</div>
+		
+	</div>
   </div>
 </template>
 
 <script>
-export default {};
+export default {
+	data() {
+		return {
+			name: '',
+			options: [
+				{
+					label: '标题',
+					value: 0
+				},
+				{
+					label: '内容',
+					value: 1
+				}
+			],
+			value: 0
+		}
+	},
+	methods: {
+		goSearch() {
+			let that = this
+			try{
+				const routeUrl = this.$router.resolve({ name: 'search', query: { tit: that.name,type:that.value } });
+				window.open(routeUrl.href, '_blank');
+			}catch(e){
+				console.log(e);
+				//TODO handle the exception
+			}
+			
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -13,7 +59,7 @@ export default {};
   width: 1202px;
   height: 129px;
   display: flex;
-  justify-content: flex-start;
+  justify-content: space-between;
   align-items: center;
   margin: 0 auto;
   .logo {
@@ -25,4 +71,24 @@ export default {};
 	}
   }
 }
+.c1 {
+	width: 200px;
+}
+.c2 {
+	width: 75px !important;
+}
+.c3 {
+		height: 40px;
+		width: 87px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #be0202;
+		color: #fff;
+		border-radius: 5px;
+		margin-left: 5px;
+		.el-icon-search {
+			margin-right: 8px;
+		}
+}
 </style>

src/request/api.js

@@ -71,7 +71,7 @@ export function loveList(data) {
 export function searchLoveList(data) {
 	return request({
 		url: '/api/donate/search',
-		method: 'post',
+		method: 'get',
 		params: data
 	});
 }
@@ -135,4 +135,20 @@ export function getArtList(data,id) {
 		method: 'get',
 		params: data
 	});
+}
+
+export function getArtCate() {
+	return request({
+		url: '/api/article/category/list',
+		method: 'get'
+	});
+}
+
+
+export function getOutList(data) {
+	return request({
+		url: '/api/donate/out',
+		method: 'get',
+		params: data
+	});
 }

src/router.js

@@ -40,6 +40,22 @@ export default new Router({
 			title: '爱心榜'
 		}
 	},
+	{
+		path: '/search',
+		name: 'search',
+		component: () => import('./views/Search.vue'),
+		meta: {
+			title: '鄂州市红十字会'
+		}
+	},
+	{
+		path: '/detail',
+		name: 'detail',
+		component: () => import('./views/Detail.vue'),
+		meta: {
+			title: '鄂州市红十字会'
+		}
+	},
 	{
 		path: '/join',
 		name: 'join',
@@ -647,6 +663,38 @@ export default new Router({
 						}
 					}
 				]
+			},
+			{
+				path: 'lovelist',
+				name: 'lovelist',
+				component: () => import('./views/love/loveList.vue'),
+				meta: {
+					title: '款项捐赠公示'
+				}
+			},
+			{
+				path: 'wuzhilist',
+				name: 'wuzhilist',
+				component: () => import('./views/love/wuzhiList.vue'),
+				meta: {
+					title: '物资捐赠公示'
+				}
+			},
+			{
+				path: 'wuzhioutlist',
+				name: 'wuzhioutlist',
+				component: () => import('./views/love/wuzhiOutList.vue'),
+				meta: {
+					title: '物资使用公示'
+				}
+			},
+			{
+				path: 'loveoutlist',
+				name: 'loveoutlist',
+				component: () => import('./views/love/loveOutList.vue'),
+				meta: {
+					title: '款项使用公示'
+				}
 			}
 		]
 	},

src/views/Detail.vue

@@ -0,0 +1,58 @@
+<template>
+	<div class="new-details">
+		<div id="" v-html="content">
+		</div>
+	</div>
+</template>
+
+<script>
+	import { details } from '../request/api.js'
+	export default {
+		data() {
+			return {
+				content: '',
+				detail: {},
+				idd:0
+			}
+		},
+		created() {
+			console.log('ddddddddddddddd')
+			this.getContent()
+		},
+		methods:{
+			getContent() {
+				let obj = this
+				this.idd = this.$route.query.id
+				console.log(this.idd)
+				obj.getDetail()
+			},
+			getDetail() {
+				let obj = this
+				details({},this.idd).then(res => {
+					console.log(res)
+					obj.content = res.data.content
+					console.log()
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.new-details {
+		height: 870px;
+		position: relative;
+	}
+	/deep/ .edui-faked-video {
+		width: 100%;
+		height: 100%;
+	}
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+</style>

src/views/Donate.vue

@@ -18,6 +18,8 @@ export default {
 			navList: [
 				{ index: 0, name: '捐赠接收', path: '/donate/receive' },
 				{ index: 1, name: '款物支出', path: '/donate/expenditure' },
+				{ index: 1, name: '捐赠款物公示查询', path: '/donate/lovelist',path1:'/donate/wuzhilist' },
+				{ index: 1, name: '款物使用公示查询', path: '/donate/loveoutlist',path1: '/donate/wuzhioutlist'},
 			]
 		};
 	}

src/views/Home.vue

@@ -127,7 +127,7 @@
 				</div>
 			</div>
 			<div class="home-pub">
-				<item-title title="政策法规" :topath="'/newsCenter/laws'"></item-title>
+				<item-title title="政策法规" :topath="'/open/laws'"></item-title>
 				<div class="item-wrapper">
 					<div class="new-item hand" v-for="item in regulationList" :key="item.id" @click="navTo('/newsCenter/laws/detail?id='+ item.id)">
 						<div class="title clamp ">

src/views/Join.vue

@@ -21,7 +21,7 @@
 					{ index: 3, name: '我要登记救护员', path: '/join/rescue' },
 					{ index: 4, name: '我要登记个人会员', path: '/join/member' },
 					{ index: 5, name: '我要登记志愿者', path: '/join/volunteer' },
-					{ index: 6, name: '我要报名普及培训', path: '/join/train' },
+					{ index: 6, name: '我要参加应急救护培训', path: '/join/train' },
 				],
 				rightTitle: '我要登记志愿者',
 			}

src/views/LoveList.vue

@@ -1,217 +1,223 @@
-<template>
-	<div class="love-list">
-		<div class="search">
-			<input type="text" v-model="name" placeholder="请输入捐赠者" class="" @keyup.enter="search()"/>
-			<img src="../assets/img/search.png" class="hand" @click="search()">
-		</div>
-		<!-- <el-table :data="tableData" border style="width: 100%" class="tabb">
-			<el-table-column prop="time" label="捐献时间" width="154" align="center"></el-table-column>
-			<el-table-column prop="donate_er" label="捐献者" width="409" align="center"></el-table-column>
-			<el-table-column prop="money" label="捐献金额" width="140" align="center"></el-table-column>
-			<el-table-column prop="intention" label="捐献意向" width="356" align="center"></el-table-column>
-			<el-table-column prop="mark" label="备注" align="center"></el-table-column>
-		</el-table> -->
-		<div class="list-title flex">
-			<div style="width: 154px">捐献时间</div>
-			<div  style="width: 409px">捐献者</div>
-			<div  style="width: 140px">捐献金额</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: 154px">{{item.time}}</div>
-			<div class="clamp"  style="width: 409px">{{item.donate_er}}</div>
-			<div class="clamp" style="width: 140px">{{item.money}}</div>
-			<div class="clamp" style="width: 356px">{{item.intention}}</div>
-			<div class="clamp" style="width: 133px">{{item.mask}}</div>
-		</div>
-		<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" hide-on-single-page></el-pagination>
-	</div>
-</template>
-
-<script>
-	import { loveList, searchLoveList } from '../request/api.js'
-	import {
-		Message
-	} from 'element-ui'
-export default {
-	data() {
-		return {
-			tableData: [],
-			total: 100,
-			page:1,
-			limit: 14,
-			name: ''
-		};
-	},
-	created() {
-		this.getLiveList()
-	},
-	methods: {
-		//分页页码改变触发事件
-		currentChange(e) {
-			console.log(e);
-			this.page = e
-			this.getLiveList()
-		},
-		getLiveList() {
-			let obj = this
-			let data = {
-				page: obj.page,
-				limit: obj.limit
-			}
-			loveList(data).then( res => {
-				obj.tableData = res.data.list.map(item => {
-					if(item.intention === ''){
-						item.intention = '非定向捐款'
-					}
-					let date = new Date(item.add_time*1000)
-					let Y = date.getFullYear()
-					let M = date.getMonth()+1 < 10 ? '0' + (date.getMonth()+1) : date.getMonth() + 1;
-					let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
-					item.time = Y + '/' + M + '/' + D
-					return item
-				})
-				obj.total = res.data.count
-				console.log(obj.tableData)
-			})
-		},
-		search() {
-			console.log(this.name)
-			let obj = this
-			let data = {
-				page: obj.page,
-				limit: obj.limit,
-				key: obj.name
-			}
-			searchLoveList(data).then( res => {
-				console.log(res,'dddddddddddd')
-				if(res.data.list.length !== 0){
-					Message.success('数据加载完成！')
-				}else {
-					Message('未找到该用户数据。')
-				}
-				obj.tableData = res.data.list.map(item => {
-					if(item.intention === ''){
-						item.intention = '非定向捐款'
-					}
-					let date = new Date(item.add_time*1000)
-					let Y = date.getFullYear()
-					let M = date.getMonth()+1 < 10 ? '0' + (date.getMonth()+1) : date.getMonth() + 1;
-					let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
-					item.time = Y + '/' + M + '/' + D
-					return item
-				})
-				
-			})
-		}
-	}
-};
-</script>
-
+<template>
+	<div class="love-list">
+		<div class="search">
+			<input type="text" v-model="name" placeholder="请输入捐赠者" class="" @keyup.enter="search()"/>
+			<img src="../assets/img/search.png" class="hand" @click="search()">
+		</div>
+		<!-- <el-table :data="tableData" border style="width: 100%" class="tabb">
+			<el-table-column prop="time" label="捐献时间" width="154" align="center"></el-table-column>
+			<el-table-column prop="donate_er" label="捐献者" width="409" align="center"></el-table-column>
+			<el-table-column prop="money" label="捐献金额" width="140" align="center"></el-table-column>
+			<el-table-column prop="intention" label="捐献意向" width="356" align="center"></el-table-column>
+			<el-table-column prop="mark" label="备注" align="center"></el-table-column>
+		</el-table> -->
+		<div class="list-title flex">
+			<div style="width: 154px">捐献时间</div>
+			<div  style="width: 409px">捐献者</div>
+			<div  style="width: 140px">捐献金额</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: 154px">{{item.time}}</div>
+			<div class="clamp"  style="width: 409px">{{item.donate_er}}</div>
+			<div class="clamp" style="width: 140px">{{item.money}}</div>
+			<div class="clamp" style="width: 356px">{{item.intention}}</div>
+			<div class="clamp" style="width: 133px">{{item.mask}}</div>
+		</div>
+		<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" hide-on-single-page></el-pagination>
+	</div>
+</template>
+
+<script>
+	import { loveList, searchLoveList } from '../request/api.js'
+	import {
+		Message
+	} from 'element-ui'
+export default {
+	data() {
+		return {
+			tableData: [],
+			total: 100,
+			page:1,
+			limit: 14,
+			name: ''
+		};
+	},
+	created() {
+		this.getLiveList()
+	},
+	methods: {
+		//分页页码改变触发事件
+		currentChange(e) {
+			console.log(e);
+			this.page = e
+			this.getLiveList()
+		},
+		getLiveList() {
+			let obj = this
+			let data = {
+				page: obj.page,
+				limit: obj.limit
+			}
+			loveList(data).then( res => {
+				obj.tableData = res.data.list.map(item => {
+					if(item.intention === ''){
+						item.intention = '非定向捐款'
+					}
+					let date = new Date(item.add_time*1000)
+					let Y = date.getFullYear()
+					let M = date.getMonth()+1 < 10 ? '0' + (date.getMonth()+1) : date.getMonth() + 1;
+					let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+					item.time = Y + '/' + M + '/' + D
+					return item
+				})
+				obj.total = res.data.count
+				console.log(obj.tableData)
+			})
+		},
+		search() {
+			console.log(this.name)
+			let obj = this
+			let data = {
+				page: obj.page,
+				limit: obj.limit,
+				key: obj.name
+			}
+			searchLoveList(data).then( res => {
+				console.log(res,'dddddddddddd')
+				if(res.data.data.length !== 0){
+					Message.success('数据加载完成！')
+				}else {
+					Message('未找到该用户数据。')
+				}
+				obj.tableData = res.data.data.map(item => {
+					if(item.intention === ''){
+						item.intention = '非定向捐款'
+					}
+					let date = new Date(item.pay_time*1000)
+					let Y = date.getFullYear()
+					let M = date.getMonth()+1 < 10 ? '0' + (date.getMonth()+1) : date.getMonth() + 1;
+					let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+					item.time = Y + '/' + M + '/' + D
+					return item
+				})
+				
+			})
+		}
+	}
+};
+</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;
-}
-.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;
-	}
-}
-.tabb {
-	border-right: 1px solid #000000;
-	border-bottom: 1px solid #000000;
-}
-.list-title {
-	// display: flex;
-	text-align: center;
-	border: 2px solid #ccc;
-	line-height: 36px;
-	font-size: 18px;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #D82020;
-	// border-top: none;
-	div {
-		border-right: 2px solid #ccc;
-		&:last-of-type {
-			border-right: none;
-		}
-	}
-	
-}
-.list-item {
-	text-align: center;
-	border: 2px solid #ccc;
-	font-size: 16px;
-	line-height: 36px;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #101010;
-	border-top: none;
-	div {
-		border-right: 2px solid #ccc;
-		&: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;
-}
-</style>
+	.clamp {
+		overflow: hidden;
+		// text-overflow: ellipsis;
+		white-space: nowrap;
+		display: block;
+	}
+.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;
+}
+.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;
+	}
+}
+.tabb {
+	border-right: 1px solid #000000;
+	border-bottom: 1px solid #000000;
+}
+.list-title {
+	// display: flex;
+	text-align: center;
+	border: 2px solid #ccc;
+	line-height: 36px;
+	font-size: 18px;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #D82020;
+	// border-top: none;
+	div {
+		border-right: 2px solid #ccc;
+		&:last-of-type {
+			border-right: none;
+		}
+	}
+	
+}
+.list-item {
+	text-align: center;
+	border: 2px solid #ccc;
+	font-size: 16px;
+	line-height: 36px;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #101010;
+	border-top: none;
+	div {
+		border-right: 2px solid #ccc;
+		&: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;
+}
+</style>

src/views/Search.vue

@@ -0,0 +1,153 @@
+<template>
+	<div class="love-list">
+		
+		<div class="table-empty" v-if="list.length == 0">
+			暂无更多数据
+		</div>
+		<div class="new-item  hand" v-for="item in list" :key="item.id"
+			@click="navTo(item)">
+			<div class="title clamp">
+				<span class="title-icon"></span>
+				{{ item.title }}
+			</div>
+			<div class="time">{{ item.release_time || item.add_time}}</div>
+		</div>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页"
+			@current-change="currentChange" :page-size="limit" hide-on-single-page></el-pagination>
+	</div>
+</template>
+
+<script>
+	import artList from '../assets/js/artList.js'
+	import {
+		loveList,
+		searchLoveList,
+		getArtList,
+		getArtCate,
+		details
+	} from '../request/api.js'
+	import {
+		Message
+	} from 'element-ui'
+	export default {
+		data() {
+			return {
+				status: 0,
+				key: '',
+				sdata: '',
+				list: [],
+				total: 100,
+				page: 1,
+				limit: 14,
+				name: '',
+				money: '',
+			};
+		},
+		created() {
+			// this.getLiveList()
+			this.key = this.$route.query.tit;
+			this.status = this.$route.query.type
+			this.getArtList()
+			getArtCate().then(res => {
+				console.log(res);
+			})
+		},
+		methods: {
+			currentChange(e) {
+				this.page = e
+				this.getArtList()
+			},
+			getArtList() {
+				let that = this
+				getArtList({
+					title: that.key,
+					way: that.status,
+					page: that.page,
+					limit: that.limit
+				}).then(res => {
+					that.list = res.data.list;
+					that.total = res.data.count;
+					// console.log(that.total,'that.total')
+				})
+			},
+			navTo(item) {
+				let that = this
+				details({},item.id).then(res => {
+					console.log(res);
+					console.log(artList,'artList')
+					let sdata = artList.find(item => item.id == res.data.cid)
+					if(sdata && sdata.path) {
+						let url = sdata.path + '/detail?id=' + item.id
+						console.log(url)
+						that.$router.push(url);
+					}else {
+						that.$router.push('/detail?id=' + item.id)
+					}
+					
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	
+	.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;
+	}
+	.love-list {
+		height: 870px;
+		position: relative;
+	}
+/deep/ .el-pagination {
+		position: absolute;
+		display: inline-block;
+		bottom: 75px;
+		right: 0;
+		padding-right: 0;
+	}
+	
+	
+	.new-item {
+		display: flex;
+		justify-content: space-between;
+		font-size: 18px;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #666666;
+		height: 40px;
+		border-bottom: 1px solid #E5E5E5;
+		line-height: 40px;
+		&:hover {
+			color: red;
+			.title {
+				.title-icon {
+					border-left-color: red;
+				}
+			}
+		}
+		&:last-of-type {
+			border-bottom: none;
+		}
+		.title {
+			width: 500px;
+			.title-icon {
+				display: inline-block;
+				width: 0;
+				height: 0;
+				width: 0;
+				height: 0;
+				border-top: 6px solid transparent;
+				border-left: 8px solid #d2d2d2;
+				border-bottom: 6px solid transparent;
+			}
+		}
+	}
+</style>

src/views/about/ChineseRedCross.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="content" v-html="content"></div>
 	</div>
 </template>

src/views/about/EzhouRedCross.vue

@@ -1,9 +1,9 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="content" v-html="content"></div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -23,12 +23,12 @@
 				})
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style lang="scss" scoped>
 	// .content {
 	// 	width: 100%;
 	// 	// overflow: hidden;
-	// }
-</style>
+	// }
+</style>

src/views/about/RedCrossMovement.vue

@@ -1,9 +1,9 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="content" v-html="content"></div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -23,12 +23,12 @@
 				})
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style lang="scss" scoped>
 	// .content {
 	// 	width: 100%;
 	// 	// overflow: hidden;
-	// }
-</style>
+	// }
+</style>

src/views/donate/expenditure/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>
@@ -38,5 +38,13 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
 </style>

src/views/donate/receive/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>
@@ -38,5 +38,13 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
 </style>

src/views/help/Aid.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="" v-html="content">
 			
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -25,8 +25,8 @@
 				})
 			}
 		}
-	}
-</script>
-
-<style lang="scss" scoped="">
-</style>
+	}
+</script>
+
+<style lang="scss" scoped="">
+</style>

src/views/help/Juvenile.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="" v-html="content">
 			
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -25,8 +25,8 @@
 				})
 			}
 		}
-	}
-</script>
-
-<style lang="scss" scoped="">
-</style>
+	}
+</script>
+
+<style lang="scss" scoped="">
+</style>

src/views/help/Service.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="" v-html="content">
 			
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -25,8 +25,8 @@
 				})
 			}
 		}
-	}
-</script>
-
-<style lang="scss" scoped="">
-</style>
+	}
+</script>
+
+<style lang="scss" scoped="">
+</style>

src/views/join/Contribution.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="" v-html="content">
 			
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -25,8 +25,8 @@
 				})
 			}
 		}
-	}
-</script>
-
-<style lang="scss" scoped="">
-</style>
+	}
+</script>
+
+<style lang="scss" scoped="">
+</style>

src/views/join/Hpc.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="" v-html="content">
 			
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -25,8 +25,8 @@
 				})
 			}
 		}
-	}
-</script>
-
-<style lang="scss" scoped="">
-</style>
+	}
+</script>
+
+<style lang="scss" scoped="">
+</style>

src/views/join/Member.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="" v-html="content">
 			
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -25,12 +25,12 @@
 				})
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style lang="scss" scoped>
 	/deep/ a{
 		cursor:pointer;
-	}
-</style>
-
+	}
+</style>
+

src/views/join/OrganDonation.vue

@@ -1,9 +1,9 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="content" v-html="content"></div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -23,12 +23,12 @@
 				})
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style lang="scss" scoped>
 	// .content {
 	// 	width: 100%;
 	// 	// overflow: hidden;
-	// }
-</style>
+	// }
+</style>

src/views/join/Rescue.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="" v-html="content">
 			
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -25,11 +25,11 @@
 				})
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style lang="scss" scoped>
 	/deep/ a{
 		cursor:pointer;
-	}
-</style>
+	}
+</style>

src/views/join/Train.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="" v-html="content">
 			
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -25,12 +25,12 @@
 				})
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style lang="scss" scoped>
 	/deep/ a{
 		cursor:pointer;
-	}
-</style>
-
+	}
+</style>
+

src/views/join/Volunteer.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="" v-html="content">
 			
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	
@@ -25,11 +25,11 @@
 				})
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style lang="scss" scoped="">
 	/deep/ a{
 		cursor:pointer;
-	}
-</style>
+	}
+</style>

src/views/love/loveList.vue

@@ -0,0 +1,362 @@
+<template>
+	<div class="love-list">
+		<div class="cate">
+			<div class="hand" :class="{'red': currentUrl.indexOf('lovelist') != -1}" @click="gotos('/donate/lovelist')">款项捐赠公示</div>
+			<div  class="hand" :class="{'red': currentUrl.indexOf('wuzhilist') != -1}" @click="gotos('/donate/wuzhilist')">物资捐赠公示</div>
+		</div>
+		<div style="padding-bottom: 15px;">款项到账后，我们将为捐赠者开具公益事业捐赠统一票据，如需请致电027-60229370，提供开票信息，谢谢合作！</div>
+		<div class="search-wrap flex">
+			<span class="name">
+				捐赠者:
+			</span><el-input class="inp" v-model="name" placeholder="请输入捐赠者"></el-input>
+			<span class="name">
+				金额:
+			</span><el-input class="inp" v-model="money" placeholder="请输入金额"></el-input>
+			<span class="name">
+				捐赠时间:
+			</span>
+			<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+				start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
+				value-format="yyyy-MM-dd" @change="dateChange">
+			</el-date-picker>
+			<div class="go" @click="search('re')">提交查询</div>
+		</div>
+		<div class="list-title flex">
+			<div style="width: 35%">捐赠方</div>
+			<div style="width: 15%">捐赠金额</div>
+			<div style="width: 15%">捐赠时间</div>
+			<div style="width: 35%">用途</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: 35%">{{item.donate_er}}</div>
+			<div class="clamp" style="width: 15%">{{item.money}}</div>
+			<div class="clamp" style="width: 15%">{{item.time}}</div>
+			<div class="clamp" style="width: 35%">{{item.intention}}</div>
+			<!-- <div class="clamp" style="width: 133px">{{item.mask}}</div> -->
+		</div>
+		<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" hide-on-single-page></el-pagination>
+	</div>
+</template>
+
+<script>
+	import {
+		loveList,
+		searchLoveList
+	} from '../../request/api.js'
+	import {
+		Message
+	} from 'element-ui'
+	export default {
+		data() {
+			return {
+				sdata: '',
+				tableData: [],
+				total: 100,
+				page: 1,
+				limit: 14,
+				name: '',
+				money: '',
+				pickerOptions: {
+					shortcuts: [{
+						text: '最近一周',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近一个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近三个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+							picker.$emit('pick', [start, end]);
+						}
+					}]
+				},
+				value1: '',
+				value2: ''
+			};
+		},
+		created() {
+			// this.getLiveList()
+			this.search()
+		},
+		computed: {
+			currentUrl() {
+				return this.$route.path
+			}
+		},
+		methods: {
+			gotos(path) {
+				let currentUrl = this.$route.path
+				if (currentUrl === path) {
+					return
+				} else {
+					this.$router.push(path)
+				}
+			},
+			dateChange(e) {
+				console.log(e)
+				if(e) {
+					this.sdata = this.value2[0] + ' - ' + this.value2[1]
+				}else {
+					this.sdata = ''
+				}
+			},
+			//分页页码改变触发事件
+			currentChange(e) {
+				console.log(e);
+				this.page = e
+				this.getLiveList()
+			},
+			getLiveList() {
+				let obj = this
+				let data = {
+					page: obj.page,
+					limit: obj.limit
+				}
+				loveList(data).then(res => {
+					obj.tableData = res.data.list.map(item => {
+						if (item.intention === '') {
+							item.intention = '非定向捐款'
+						}
+						let date = new Date(item.add_time * 1000)
+						let Y = date.getFullYear()
+						let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() +
+							1;
+						let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+						item.time = Y + '/' + M + '/' + D
+						return item
+					})
+					obj.total = res.data.count
+					console.log(obj.tableData)
+				})
+			},
+			search(type) {
+				console.log(this.name)
+				let obj = this
+				if(type == 're') {
+					obj.page = 1
+					obj.tableData = []
+				}
+				let data = {
+					page: obj.page,
+					limit: obj.limit,
+					key: obj.name,
+					data: obj.sdata,
+					money: obj.money
+				}
+				searchLoveList(data).then(res => {
+					// console.log(res, 'dddddddddddd')
+					let arr = res.data.data
+					if (arr.length !== 0) {
+						// Message.success('数据加载完成！')
+					} else {
+						Message('未找到数据。')
+					}
+					obj.total = res.data.count
+					obj.tableData = arr.map(item => {
+						if (item.intention === '') {
+							item.intention = '非定向捐款'
+						}
+						let date = new Date(item.pay_time * 1000)
+						let Y = date.getFullYear()
+						let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() +
+							1;
+						let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+						item.time = Y + '/' + M + '/' + D
+						return item
+					})
+
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	
+	
+	.love-list {
+		height: 870px;
+		position: relative;
+	}
+
+	/deep/ .el-table thead th {
+		font-size: 18px;
+		font-weight: bold;
+		// color: #d82020;
+		color: gray;
+	}
+
+	/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;
+	}
+
+	.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;
+		}
+	}
+
+	.tabb {
+		border-right: 1px solid #000000;
+		border-bottom: 1px solid #000000;
+	}
+
+	.list-title {
+		// display: flex;
+		text-align: center;
+		border: 2px solid #ccc;
+		line-height: 36px;
+		font-size: 18px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #D82020;
+
+		// border-top: none;
+		div {
+			border-right: 2px solid #ccc;
+
+			&:last-of-type {
+				border-right: none;
+			}
+		}
+
+	}
+
+	.list-item {
+		text-align: center;
+		border: 2px solid #ccc;
+		font-size: 16px;
+		line-height: 36px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #101010;
+		border-top: none;
+
+		div {
+			border-right: 2px solid #ccc;
+			font-size: 15px;
+			font-weight: 500;
+			&: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-wrap {
+		font-size: 16px;
+		align-items: center;
+		padding: 0 0 20px 0;
+		width: 100%;
+		justify-content: space-between;
+	
+		.inp {
+			width: 120px;
+			color: #000000;
+		}
+	
+		.name {
+			// padding: 0 10px;
+		}
+	
+		.go {
+			width: 80px;
+			height: 40px;
+			background-color: #be0202;
+			color: #FFFFFF;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+	/deep/ .el-input__inner {
+		// background: #dddddd;
+	}
+	/deep/ .el-range-input {
+		// background: #dddddd;
+	}
+	/deep/ .el-date-editor {
+		width: 300px;
+	}
+	.cate {
+		font-size: 20px;
+		display: flex;
+		border-bottom: 1px solid #ddd;
+		margin-bottom: 20px;
+		div {
+			width: 200px;
+			height: 50px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+	.red {
+		color: #be0202;
+	}
+</style>

src/views/love/loveOutList.vue

@@ -0,0 +1,350 @@
+<template>
+	<div class="love-list">
+		<div class="cate">
+			<div class="hand" :class="{'red': currentUrl.indexOf('loveoutlist') != -1}" @click="gotos('/donate/loveoutlist')">款项使用公示</div>
+			<div  class="hand" :class="{'red': currentUrl.indexOf('wuzhioutlist') != -1}" @click="gotos('/donate/wuzhioutlist')">物资使用公示</div>
+		</div>
+		<div style="padding-bottom: 15px;">款项到账后，我们将为捐赠者开具公益事业捐赠统一票据，如需请致电027-60229370，提供开票信息，谢谢合作！</div>
+		<div class="search-wrap flex">
+			<span class="name">
+				捐赠者:
+			</span><el-input class="inp" v-model="name" placeholder="请输入捐赠者"></el-input>
+			<span class="name">
+				金额:
+			</span><el-input class="inp" v-model="money" placeholder="请输入金额"></el-input>
+			<span class="name">
+				捐赠时间:
+			</span>
+			<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+				start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
+				value-format="yyyy-MM-dd" @change="dateChange">
+			</el-date-picker>
+			<div class="go" @click="search('re')">提交查询</div>
+		</div>
+		<div class="list-title flex">
+			<div style="width: 15%">拨付时间</div>
+			<div style="width: 10%">支出金额</div>
+			<div style="width: 20%">接收方</div>
+			<div style="width:40%">用途</div>
+			<div style="width: 15%">捐赠来源</div>
+		</div>
+		<div class="list-item flex" v-for="(item, index) in tableData" :key="index">
+			<div class="clamp" style="width: 15%">{{item.add_time}}</div>
+			<div class="clamp" style="width: 10%">{{item.cost}}</div>
+			<div class="clamp" style="width: 20%">{{item.recipient}}</div>
+			<div class="clamp" style="width: 40%">{{item.purpose}}</div>
+			<div class="clamp" style="width: 15%">{{item.the_donor}}</div>
+		</div>
+		<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" hide-on-single-page></el-pagination>
+	</div>
+</template>
+
+<script>
+	import {
+		loveList,
+		searchLoveList,
+		getOutList
+	} from '../../request/api.js'
+	import {
+		Message
+	} from 'element-ui'
+	export default {
+		data() {
+			return {
+				sdata: '',
+				tableData: [],
+				total: 100,
+				page: 1,
+				limit: 14,
+				name: '',
+				money: '',
+				pickerOptions: {
+					shortcuts: [{
+						text: '最近一周',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近一个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近三个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+							picker.$emit('pick', [start, end]);
+						}
+					}]
+				},
+				value1: '',
+				value2: ''
+			};
+		},
+		created() {
+			this.search()
+		},
+		computed: {
+			currentUrl() {
+				return this.$route.path
+			}
+		},
+		methods: {
+			gotos(path) {
+				let currentUrl = this.$route.path
+				if (currentUrl === path) {
+					return
+				} else {
+					this.$router.push(path)
+				}
+			},
+			dateChange(e) {
+				console.log(e)
+				if (e) {
+					this.sdata = this.value2[0] + ' - ' + this.value2[1]
+				} else {
+					this.sdata = ''
+				}
+			},
+			//分页页码改变触发事件
+			currentChange(e) {
+				console.log(e);
+				this.page = e
+				this.search()
+			},
+			search(type) {
+				console.log(this.name)
+				let obj = this
+				if (type == 're') {
+					obj.page = 1
+					obj.tableData = []
+				}
+				let data = {
+					page: obj.page,
+					limit: obj.limit,
+					the_donor: obj.name,
+					data: obj.sdata,
+					title: obj.money,
+					type: 1
+					// money: obj.money
+				}
+				getOutList(data).then(res => {
+					// console.log(res, 'dddddddddddd')
+					let arr = res.data.data
+					if (arr.length !== 0) {
+						// Message.success('数据加载完成！')
+					} else {
+						Message('未找到数据。')
+					}
+					obj.total = res.data.count
+					obj.tableData = arr.map(item => {
+						if (item.intention === '') {
+							item.intention = '非定向捐款'
+						}
+						item.add_time = item.add_time.replace(/-/g,'/')
+						// let date = new Date(item.pay_time * 1000)
+						// let Y = date.getFullYear()
+						// let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() +
+						// 	1;
+						// let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+						// item.time = Y + '/' + M + '/' + D
+						return item
+					})
+
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.clamp {
+		overflow: hidden;
+		// text-overflow: ellipsis;
+		white-space: nowrap;
+		display: block;
+	}
+	.love-list {
+		height: 870px;
+		position: relative;
+	}
+
+	/deep/ .el-table thead th {
+		font-size: 18px;
+		font-weight: bold;
+		// color: #d82020;
+		color: gray;
+	}
+
+	/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;
+	}
+
+	.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;
+		}
+	}
+
+	.tabb {
+		border-right: 1px solid #000000;
+		border-bottom: 1px solid #000000;
+	}
+
+	.list-title {
+		// display: flex;
+		text-align: center;
+		border: 2px solid #ccc;
+		line-height: 36px;
+		font-size: 18px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #D82020;
+
+		// border-top: none;
+		div {
+			border-right: 2px solid #ccc;
+
+			&:last-of-type {
+				border-right: none;
+			}
+		}
+
+	}
+
+	.list-item {
+		text-align: center;
+		border: 2px solid #ccc;
+		font-size: 16px;
+		line-height: 36px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #101010;
+		border-top: none;
+
+		div {
+			border-right: 2px solid #ccc;
+			font-size: 15px;
+			font-weight: 500;
+			&: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-wrap {
+		font-size: 16px;
+		align-items: center;
+		padding: 0 0 20px 0;
+		width: 100%;
+		justify-content: space-between;
+
+		.inp {
+			width: 120px;
+			color: #000000;
+		}
+
+		.name {
+			// padding: 0 10px;
+		}
+
+		.go {
+			width: 80px;
+			height: 40px;
+			background-color: #be0202;
+			color: #FFFFFF;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+
+	/deep/ .el-input__inner {
+		// background: #dddddd;
+	}
+
+	/deep/ .el-range-input {
+		// background: #dddddd;
+	}
+
+	/deep/ .el-date-editor {
+		width: 300px;
+	}
+	.cate {
+		font-size: 20px;
+		display: flex;
+		border-bottom: 1px solid #ddd;
+		margin-bottom: 20px;
+		div {
+			width: 200px;
+			height: 50px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+	.red {
+		color: #be0202;
+	}
+</style>

src/views/love/wuzhiList.vue

@@ -0,0 +1,349 @@
+<template>
+	<div class="love-list">
+		<div class="cate">
+			<div class="hand" :class="{'red': currentUrl.indexOf('lovelist') != -1}" @click="gotos('/donate/lovelist')">款项捐赠公示</div>
+			<div  class="hand" :class="{'red': currentUrl.indexOf('wuzhilist') != -1}" @click="gotos('/donate/wuzhilist')">物资捐赠公示</div>
+		</div>
+		<div style="padding-bottom: 15px;">款项到账后，我们将为捐赠者开具公益事业捐赠统一票据，如需请致电027-60229370，提供开票信息，谢谢合作！</div>
+		<div class="search-wrap flex">
+			<span class="name">
+				捐赠者:
+			</span><el-input class="inp" v-model="name" placeholder="请输入捐赠者"></el-input>
+			<span class="name">
+				物品:
+			</span><el-input class="inp" v-model="money" placeholder="请输入物品"></el-input>
+			<span class="name">
+				捐赠时间:
+			</span>
+			<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+				start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
+				value-format="yyyy-MM-dd" @change="dateChange">
+			</el-date-picker>
+			<div class="go" @click="search('re')">提交查询</div>
+		</div>
+		<div class="list-title flex">
+			<div style="width: 16%">捐赠者</div>
+			<div style="width: 26%">物品名称</div>
+			<div style="width: 6%">单位</div>
+			<div style="width: 6%">数量</div>
+			<div style="width: 10%">价值</div>
+			<div style="width: 12%">捐献时间</div>
+			<div style="width: 24%">用途</div>
+		</div>
+		<div class="list-item flex" v-for="(item, index) in tableData" :key="index">
+			<div class="clamp" style="width: 16%">{{item.the_donor}}</div>
+			<div class="clamp" style="width: 26%">{{item.title}}</div>
+			<div class="clamp" style="width: 6%">{{item.unit}}</div>
+			<div class="clamp" style="width: 6%">{{item.num}}</div>
+			<div class="clamp" style="width: 10%">{{item.cost*1}}</div>
+			<div class="clamp" style="width: 12%">{{item.add_time}}</div>
+			<div class="clamp" style="width: 24%">{{item.purpose}}</div>
+		</div>
+		<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" hide-on-single-page></el-pagination>
+	</div>
+</template>
+
+<script>
+	import {
+		loveList,
+		searchLoveList,
+		getOutList
+	} from '../../request/api.js'
+	import {
+		Message
+	} from 'element-ui'
+	export default {
+		data() {
+			return {
+				sdata: '',
+				tableData: [],
+				total: 100,
+				page: 1,
+				limit: 14,
+				name: '',
+				money: '',
+				pickerOptions: {
+					shortcuts: [{
+						text: '最近一周',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近一个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近三个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+							picker.$emit('pick', [start, end]);
+						}
+					}]
+				},
+				value1: '',
+				value2: ''
+			};
+		},
+		created() {
+			// this.getLiveList()
+			this.search()
+		},
+		computed: {
+			currentUrl() {
+				return this.$route.path
+			}
+		},
+		methods: {
+			gotos(path) {
+				let currentUrl = this.$route.path
+				if (currentUrl === path) {
+					return
+				} else {
+					this.$router.push(path)
+				}
+			},
+			dateChange(e) {
+				console.log(e)
+				if (e) {
+					this.sdata = this.value2[0] + ' - ' + this.value2[1]
+				} else {
+					this.sdata = ''
+				}
+			},
+			//分页页码改变触发事件
+			currentChange(e) {
+				console.log(e);
+				this.page = e
+				this.search()
+			},
+			search(type) {
+				console.log(this.name)
+				let obj = this
+				if (type == 're') {
+					obj.page = 1
+					obj.tableData = []
+				}
+				let data = {
+					page: obj.page,
+					limit: obj.limit,
+					the_donor: obj.money,
+					data: obj.sdata,
+					title: obj.name,
+					type: 0
+					// money: obj.money
+				}
+				getOutList(data).then(res => {
+					// console.log(res, 'dddddddddddd')
+					let arr = res.data.data
+					if (arr.length !== 0) {
+						// Message.success('数据加载完成！')
+					} else {
+						Message('未找到数据。')
+					}
+					obj.total = res.data.count
+					obj.tableData = arr.map(item => {
+						if (item.intention === '') {
+							item.intention = '非定向捐款'
+						}
+						item.add_time = item.add_time.replace(/-/g,'/')
+						// let date = new Date(item.pay_time * 1000)
+						// let Y = date.getFullYear()
+						// let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() +
+						// 	1;
+						// let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+						// item.time = Y + '/' + M + '/' + D
+						return item
+					})
+
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.love-list {
+		height: 870px;
+		position: relative;
+	}
+
+	/deep/ .el-table thead th {
+		font-size: 18px;
+		font-weight: bold;
+		// color: #d82020;
+		color: gray;
+	}
+
+	/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;
+	}
+
+	.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;
+		}
+	}
+
+	.tabb {
+		border-right: 1px solid #000000;
+		border-bottom: 1px solid #000000;
+	}
+
+	.list-title {
+		// display: flex;
+		text-align: center;
+		border: 2px solid #ccc;
+		line-height: 36px;
+		font-size: 18px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #D82020;
+
+		// border-top: none;
+		div {
+			border-right: 2px solid #ccc;
+
+			&:last-of-type {
+				border-right: none;
+			}
+		}
+
+	}
+
+	.list-item {
+		text-align: center;
+		border: 2px solid #ccc;
+		font-size: 16px;
+		line-height: 36px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #101010;
+		border-top: none;
+
+		div {
+			border-right: 2px solid #ccc;
+			font-size: 15px;
+			font-weight: 500;
+			&: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-wrap {
+		font-size: 16px;
+		align-items: center;
+		padding: 0 0 20px 0;
+		width: 100%;
+		justify-content: space-between;
+
+		.inp {
+			width: 120px;
+			color: #000000;
+		}
+
+		.name {
+			// padding: 0 10px;
+		}
+
+		.go {
+			width: 80px;
+			height: 40px;
+			background-color: #be0202;
+			color: #FFFFFF;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+
+	/deep/ .el-input__inner {
+		// background: #dddddd;
+	}
+
+	/deep/ .el-range-input {
+		// background: #dddddd;
+	}
+
+	/deep/ .el-date-editor {
+		width: 300px;
+	}
+	.cate {
+		font-size: 20px;
+		display: flex;
+		border-bottom: 1px solid #ddd;
+		margin-bottom: 20px;
+		div {
+			width: 200px;
+			height: 50px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+	.red {
+		color: #be0202;
+	}
+</style>

src/views/love/wuzhiOutList.vue

@@ -0,0 +1,357 @@
+<template>
+	<div class="love-list">
+		<div class="cate">
+			<div class="hand" :class="{'red': currentUrl.indexOf('loveoutlist') != -1}" @click="gotos('/donate/loveoutlist')">款项使用公示</div>
+			<div  class="hand" :class="{'red': currentUrl.indexOf('wuzhioutlist') != -1}" @click="gotos('/donate/wuzhioutlist')">物资使用公示</div>
+		</div>
+		<div style="padding-bottom: 15px;">款项到账后，我们将为捐赠者开具公益事业捐赠统一票据，如需请致电027-60229370，提供开票信息，谢谢合作！</div>
+		<div class="search-wrap flex">
+			<span class="name">
+				捐赠者:
+			</span><el-input class="inp" v-model="name" placeholder="请输入捐赠者"></el-input>
+			<span class="name">
+				物品:
+			</span><el-input class="inp" v-model="money" placeholder="请输入物品"></el-input>
+			<span class="name">
+				捐赠时间:
+			</span>
+			<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+				start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
+				value-format="yyyy-MM-dd" @change="dateChange">
+			</el-date-picker>
+			<div class="go" @click="search('re')">提交查询</div>
+		</div>
+		<div class="list-title flex">
+			<div style="width: 13%">发放时间</div>
+			<div style="width: 15%">物品名称</div>
+			<div style="width: 10%">数量</div>
+			<div style="width: 5%">单位</div>
+			<div style="width: 10%">价值</div>
+			<div style="width:15%">接收方</div>
+			<div style="width:17%">用途</div>
+			<div style="width: 15%">捐赠来源</div>
+		</div>
+		<div class="list-item flex" v-for="(item, index) in tableData" :key="index">
+			<div class="clamp" style="width:13%">{{item.add_time}}</div>
+			<div class="clamp" style="width: 15%">{{item.title}}</div>
+			<div class="clamp" style="width: 10%">{{item.num}}</div>
+			<div class="clamp" style="width: 5%">{{item.unit}}</div>
+			<div class="clamp" style="width: 10%">{{item.cost*1}}</div>
+			<div class="clamp" style="width: 15%">{{item.recipient}}</div>
+			<div class="clamp" style="width: 17%">{{item.purpose}}</div>
+			<div class="clamp" style="width: 15%">{{item.the_donor}}</div>
+		</div>
+		<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" hide-on-single-page></el-pagination>
+	</div>
+</template>
+
+<script>
+	import {
+		loveList,
+		searchLoveList,
+		getOutList
+	} from '../../request/api.js'
+	import {
+		Message
+	} from 'element-ui'
+	export default {
+		data() {
+			return {
+				sdata: '',
+				tableData: [],
+				total: 100,
+				page: 1,
+				limit: 14,
+				name: '',
+				money: '',
+				pickerOptions: {
+					shortcuts: [{
+						text: '最近一周',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近一个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+							picker.$emit('pick', [start, end]);
+						}
+					}, {
+						text: '最近三个月',
+						onClick(picker) {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+							picker.$emit('pick', [start, end]);
+						}
+					}]
+				},
+				value1: '',
+				value2: ''
+			};
+		},
+		created() {
+			// this.getLiveList()
+			this.search()
+		},
+		computed: {
+			currentUrl() {
+				return this.$route.path
+			}
+		},
+		methods: {
+			gotos(path) {
+				let currentUrl = this.$route.path
+				if (currentUrl === path) {
+					return
+				} else {
+					this.$router.push(path)
+				}
+			},
+			dateChange(e) {
+				console.log(e)
+				if (e) {
+					this.sdata = this.value2[0] + ' - ' + this.value2[1]
+				} else {
+					this.sdata = ''
+				}
+			},
+			//分页页码改变触发事件
+			currentChange(e) {
+				console.log(e);
+				this.page = e
+				this.search()
+			},
+			search(type) {
+				console.log(this.name)
+				let obj = this
+				if (type == 're') {
+					obj.page = 1
+					obj.tableData = []
+				}
+				let data = {
+					page: obj.page,
+					limit: obj.limit,
+					the_donor: obj.name,
+					data: obj.sdata,
+					title: obj.money,
+					type: 2
+					// money: obj.money
+				}
+				getOutList(data).then(res => {
+					// console.log(res, 'dddddddddddd')
+					let arr = res.data.data
+					if (arr.length !== 0) {
+						// Message.success('数据加载完成！')
+					} else {
+						Message('未找到数据。')
+					}
+					obj.total = res.data.count
+					obj.tableData = arr.map(item => {
+						if (item.intention === '') {
+							item.intention = '非定向捐款'
+						}
+						item.add_time = item.add_time.replace(/-/g,'/')
+						// let date = new Date(item.pay_time * 1000)
+						// let Y = date.getFullYear()
+						// let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() +
+						// 	1;
+						// let D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+						// item.time = Y + '/' + M + '/' + D
+						return item
+					})
+
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.clamp {
+		overflow: hidden;
+		// text-overflow: ellipsis;
+		white-space: nowrap;
+		display: block;
+	}
+	.love-list {
+		height: 870px;
+		position: relative;
+	}
+
+	/deep/ .el-table thead th {
+		font-size: 18px;
+		font-weight: bold;
+		// color: #d82020;
+		color: gray;
+	}
+
+	/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;
+	}
+
+	.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;
+		}
+	}
+
+	.tabb {
+		border-right: 1px solid #000000;
+		border-bottom: 1px solid #000000;
+	}
+
+	.list-title {
+		// display: flex;
+		text-align: center;
+		border: 2px solid #ccc;
+		line-height: 36px;
+		font-size: 18px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #D82020;
+
+		// border-top: none;
+		div {
+			border-right: 2px solid #ccc;
+
+			&:last-of-type {
+				border-right: none;
+			}
+		}
+
+	}
+
+	.list-item {
+		text-align: center;
+		border: 2px solid #ccc;
+		font-size: 16px;
+		line-height: 36px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #101010;
+		border-top: none;
+
+		div {
+			border-right: 2px solid #ccc;
+			font-weight: 500;
+			font-size: 15px;
+			&: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-wrap {
+		font-size: 16px;
+		align-items: center;
+		padding: 0 0 20px 0;
+		width: 100%;
+		justify-content: space-between;
+
+		.inp {
+			width: 120px;
+			color: #000000;
+		}
+
+		.name {
+			// padding: 0 10px;
+		}
+
+		.go {
+			width: 80px;
+			height: 40px;
+			background-color: #be0202;
+			color: #FFFFFF;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+
+	/deep/ .el-input__inner {
+		// background: #dddddd;
+	}
+
+	/deep/ .el-range-input {
+		// background: #dddddd;
+	}
+
+	/deep/ .el-date-editor {
+		width: 300px;
+	}
+	.cate {
+		font-size: 20px;
+		display: flex;
+		border-bottom: 1px solid #ddd;
+		margin-bottom: 20px;
+		div {
+			width: 200px;
+			height: 50px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+	.red {
+		color: #be0202;
+	}
+</style>

src/views/newsCenter/blood/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>
@@ -38,5 +38,13 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
 </style>

src/views/newsCenter/body/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>
@@ -38,5 +38,13 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
 </style>

src/views/newsCenter/echeng/Detail.vue

@@ -1,10 +1,10 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../../request/api.js'
 	export default {
@@ -35,8 +35,16 @@
 				})
 			}
 		}
-	}
-</script>
-
-<style>
-</style>
+	}
+</script>
+
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+</style>

src/views/newsCenter/hematopoiesis/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>
@@ -38,5 +38,13 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
 </style>

src/views/newsCenter/huarong/Detail.vue

@@ -1,10 +1,10 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../../request/api.js'
 	export default {
@@ -35,8 +35,16 @@
 				})
 			}
 		}
-	}
-</script>
-
-<style>
-</style>
+	}
+</script>
+
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+</style>

src/views/newsCenter/humanity/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>
@@ -38,5 +38,13 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
 </style>

src/views/newsCenter/laws/Detail.vue

@@ -1,10 +1,10 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../../request/api.js'
 	export default {
@@ -35,8 +35,16 @@
 				})
 			}
 		}
-	}
-</script>
-
-<style>
-</style>
+	}
+</script>
+
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+</style>

src/views/newsCenter/liangzihu/Detail.vue

@@ -1,10 +1,10 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../../request/api.js'
 	export default {
@@ -35,8 +35,16 @@
 				})
 			}
 		}
-	}
-</script>
-
-<style>
-</style>
+	}
+</script>
+
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+</style>

src/views/newsCenter/protect/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>
@@ -38,5 +38,13 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
 </style>

src/views/newsCenter/redNews/Detail.vue

@@ -1,10 +1,10 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../../request/api.js'
 	export default {
@@ -35,8 +35,15 @@
 				})
 			}
 		}
-	}
-</script>
-
-<style>
-</style>
+	}
+</script>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+</style>

src/views/newsCenter/rescue/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>
@@ -37,6 +37,13 @@
 		}
 	}
 </script>
-
-<style>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
 </style>

src/views/newsCenter/work/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>

src/views/open/finance/Detail.vue

@@ -1,25 +1,27 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>
 </template>
 
 <script>
-	import { details } from '../../../request/api.js'
+	import {
+		details
+	} from '../../../request/api.js'
 	export default {
 		data() {
 			return {
 				content: '',
 				detail: {},
-				idd:0
+				idd: 0
 			}
 		},
 		created() {
 			console.log('ddddddddddddddd')
 			this.getContent()
 		},
-		methods:{
+		methods: {
 			getContent() {
 				let obj = this
 				this.idd = this.$route.query.id
@@ -28,7 +30,7 @@
 			},
 			getDetail() {
 				let obj = this
-				details({},this.idd).then(res => {
+				details({}, this.idd).then(res => {
 					console.log(res)
 					obj.content = res.data.content
 					console.log()
@@ -38,5 +40,13 @@
 	}
 </script>
 
-<style>
-</style>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+</style>

src/views/open/laws/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>
@@ -38,5 +38,13 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
 </style>

src/views/open/notice/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 		</div>
 	</div>
@@ -38,5 +38,13 @@
 	}
 </script>
 
-<style>
-</style>
+<style scoped lang="scss">
+	/deep/ table{
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+	/deep/ td {
+		border: 1px solid #000 !important;
+		text-align: center !important;
+	}
+</style>

src/views/popularScience/Detail.vue

@@ -1,9 +1,9 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div class="content" v-html="content"></div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	export default {
@@ -29,9 +29,9 @@
 				
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style lang="scss" scoped>
 	.title {
 		// width: 184px;
@@ -49,5 +49,5 @@
 		font-family: PingFang SC;
 		font-weight: bold;
 		color: #333333;
-	}
-</style>
+	}
+</style>

src/views/publicity/Detail.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="new-detail">
+	<div class="new-details">
 		<div id="" v-html="content">
 			
 		</div>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import { details } from '../../request/api.js'
 	export default {
@@ -36,8 +36,8 @@
 				})
 			}
 		}
-	}
-</script>
-
-<style>
-</style>
+	}
+</script>
+
+<style>
+</style>