7-1-1

src/App.vue

@@ -1,56 +1,56 @@
 <template>
-  <div id="app">
-	<div class="bg">
-		<img src="@/assets/img/m1.png" >
-	</div>
-	<div>
+  <div id="app">
+	<div class="bg">
+		<img src="@/assets/img/m1.png" >
+	</div>
+	<div>
 	</div>
     <top-logo></top-logo>
-    <nav-bar></nav-bar>
-	<div class="main-wrapper">
-		<router-view />
-	</div>
+    <nav-bar></nav-bar>
+	<div class="main-wrapper">
+		<router-view />
+	</div>
 	<page-bottom></page-bottom>
   </div>
 </template>
 <script>
 import TopLogo from './components/topLogo/TopLogo.vue'
-import NavBar from './components/navBar/NavBar.vue'
+import NavBar from './components/navBar/NavBar.vue'
 import PageBottom from './components/pageBottom/PageBottom.vue'
 export default {
   components: {
     NavBar,
-    TopLogo,
+    TopLogo,
 	PageBottom
   }
 }
 </script>
-<style lang="scss" scoped>
-#app {
-	max-width: 1920px;
-	min-width: 1200px;
-	margin: 0 auto;
+<style lang="scss" scoped>
+#app {
+	max-width: 1920px;
+	min-width: 1202px;
+	margin: 0 auto;
+}
+.main-wrapper {
+	width: 1202px;
+	margin: 0 auto;
 }
-.main-wrapper {
-	width: 1200px;
-	margin: 0 auto;
-}
-.bg {
-	position: absolute;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-	// margin: 0 auto -300px;
-	height: 280px;
-	max-width: 1920px;
-	min-width: 1200px;
-	// background-image: url(assets/img/m1.png);
-	// background-size: auto 100%;
-	z-index: -1;
-	img {
-		width: 1920px;
-		
-		height: 300px;
-	}
+.bg {
+	position: absolute;
+	left: 0;
+	right: 0;
+	margin: 0 auto;
+	// margin: 0 auto -300px;
+	height: 280px;
+	max-width: 1920px;
+	min-width: 1202px;
+	// background-image: url(assets/img/m1.png);
+	// background-size: auto 100%;
+	z-index: -1;
+	img {
+		width: 1920px;
+		
+		height: 300px;
+	}
 }
 </style>

src/components/leftNav/LeftNav.vue

@@ -32,7 +32,7 @@
 		props: {
 			navList: {
 				type: Array,
-				default:[]
+				default: []
 			}
 		},
 		computed: {
@@ -73,7 +73,7 @@
 						title = '红会科普'
 						break
 					case '/popularScience/detail':
-						title = '红会科普'
+						title = '红会科普,科普详情'
 						break
 					case '/news/list':
 						title = '红会新闻'
@@ -108,7 +108,7 @@
 					case '/newsCenter/liangzihu/list':
 						title = '梁子湖区'
 						break
-					case '/newsCenter/liangzihu/list':
+					case '/newsCenter/liangzihu/detail':
 						title = '梁子湖区,新闻详情'
 						break
 					case '/newsCenter/laws/list':
@@ -126,6 +126,15 @@
 					case '/about/ezhouRedCross':
 						title = '鄂州红十字会简介'
 						break
+					case '/help/aid':
+						title = '人道救助'
+						break
+					case '/help/service':
+						title = '红十字志愿服务'
+						break
+					case '/help/juvenile':
+						title = '红十字少年'
+						break
 				     default:
 				        title = ''
 				}
@@ -167,7 +176,7 @@
 
 <style lang="scss" scoped>
 	.wrapper {
-		width: 1200px;
+		width: 1202px;
 		display: flex;
 		justify-content: space-between;
 		
@@ -186,7 +195,7 @@
 			border-top: 1px #fcfbfb solid;
 			display: flex;
 			height: 50px;
-			background-color: #f2eeef;
+			// background-color: #f2eeef;
 			justify-content: space-between;
 			line-height: 50px;
 			padding: 0 37px 0 26px;
@@ -205,7 +214,14 @@
 			}
 		}
 		.action {
-			background-color: #f7dfdf;
+			background-color: #fae9e9;
+			
+			.item-name {
+				color: #C81B15;
+			}
+			.item-icon {
+				color: #C81B15;
+			}
 		}
 	}
 	.right-content {

src/components/pageBottom/PageBottom.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="view-bottom">
-		<div class="bqsy">版权所有：Copyright©2016-2019 　版权所有 鄂州市红十字会</div>
-		<div class="address">地址：鄂州市滨湖南路17号 ICP备19012901号-1</div>
+		<div class="bqsy">版权所有：Copyright©2017-现在 　版权所有 鄂州市红十字会</div>
+		<div class="address">地址：鄂州市滨湖南路17号 浙ICP备17054590号-1</div>
 	</div>
 </template>
 

src/components/topLogo/TopLogo.vue

@@ -10,18 +10,18 @@ export default {};
 
 <style lang="scss" scoped>
 .top {
-  width: 1200px;
-  height: 178px;
+  width: 1202px;
+  height: 129px;
   display: flex;
   justify-content: flex-start;
   align-items: center;
   margin: 0 auto;
   .logo {
-    width: 489px;
-    height: 104px;
+    width: 423px;
+    height: 86px;
 	img {
-		width: 489px;
-		height: 104px;
+		width: 423px;
+		height: 86px;
 	}
   }
 }

src/request/api.js

@@ -13,7 +13,7 @@ export function loadIndexs(data) {
 // 获取轮播图数据
 export function banner(data) {
 	return request({
-		url: '/api/article/list/9',
+		url: '/api/article/list/22',
 		method: 'get',
 		params: data
 	});
@@ -30,15 +30,15 @@ export function splist(data) {
 // 获取红会新闻文章列表
 export function newsList(data) {
 	return request({
-		url: '/api/article/list/7',
+		url: '/api/article/list/13',
 		method: 'get',
 		params: data
 	});
 }
-// 获取红会新闻文章列表
+// 获取信息公示文章列表
 export function openList(data) {
 	return request({
-		url: '/api/article/list/8',
+		url: '/api/article/list/19',
 		method: 'get',
 		params: data
 	});
@@ -46,7 +46,7 @@ export function openList(data) {
 //获取政策法规文章列表
 export function regulationList(data) {
 	return request({
-		url: '/api/article/list/10',
+		url: '/api/article/list/17',
 		method: 'get',
 		params: data
 	});
@@ -70,7 +70,7 @@ export function loveList(data) {
 //获取鄂州区新闻
 export function ezqList(data) {
 	return request({
-		url: '/api/article/list/7',
+		url: '/api/article/list/14',
 		method: 'get',
 		params: data
 	});
@@ -79,7 +79,7 @@ export function ezqList(data) {
 //获取华容区新闻
 export function hrqList(data) {
 	return request({
-		url: '/api/article/list/7',
+		url: '/api/article/list/15',
 		method: 'get',
 		params: data
 	});
@@ -88,7 +88,25 @@ export function hrqList(data) {
 //获取梁子湖区新闻
 export function lzhqList(data) {
 	return request({
-		url: '/api/article/list/7',
+		url: '/api/article/list/16',
+		method: 'get',
+		params: data
+	});
+}
+
+//获取红会风采
+export function redshow(data) {
+	return request({
+		url: '/api/article/list/20',
+		method: 'get',
+		params: data
+	});
+}
+
+//获取友情链接
+export function friendLink(data) {
+	return request({
+		url: '/api/article/list/21',
 		method: 'get',
 		params: data
 	});

src/router.js

@@ -342,6 +342,60 @@ export default new Router({
 			},
 		]
 	},
+	{
+		path: '/download',
+		name: 'download',
+		component: () => import('./views/DownLoad.vue'),
+		redirect: '/download/list',
+		meta: {
+			title: '表格下载'
+		},
+		children: [
+			{
+				path: 'list',
+				name: 'downlist',
+				component: () => import('./views/download/List.vue'),
+				meta: {
+					title: '表格下载'
+				}
+			}
+		]
+	},
+	{
+		path: '/help',
+		name: 'help',
+		component: () => import('./views/Help.vue'),
+		redirect: '/help/aid',
+		meta: {
+			title: '人道救助'
+		},
+		children: [
+			{
+				path: 'aid',
+				name: 'aid',
+				component: () => import('./views/help/Aid.vue'),
+				meta: {
+					title: '人道救助'
+				}
+			},
+			{
+				path: 'service',
+				name: 'service',
+				component: () => import('./views/help/Service.vue'),
+				meta: {
+					title: '红十字志愿服务'
+				}
+			},
+			{
+				path: 'juvenile',
+				name: 'juvenile',
+				component: () => import('./views/help/Juvenile.vue'),
+				meta: {
+					title: '红十字少年'
+				}
+			}
+		]
+	},
 	{
 		path: '*',
 		redirect: '/home'

src/store.js

@@ -5,7 +5,7 @@ Vue.use(Vuex)
 
 export default new Vuex.Store({
   state: {
-	www: "http://jz.red.igxys.com"
+	www: "http://ez.igxys.com"
   },
   mutations: {
 

src/views/Donation.vue

@@ -1,36 +0,0 @@
-<template>
-	<div class="donation">
-		<left-nav :navList="navList" :rightTitle="rightTitle" :currentIndex="currentIndex">
-			<router-view></router-view>
-		</left-nav>
-	</div>
-</template>
-
-<script>
-	import LeftNav from '../components/leftNav/LeftNav.vue'
-	import PageTitle from '../components/pageTitle/PageTitle.vue'
-	export default {
-		components: {
-			LeftNav,
-			PageTitle
-		},
-		data() {
-			return {
-				navList: [
-					{ index: 0, name: '我要捐款', path: '/donation/contribution' },
-					{ index: 1, name: '我要器官捐献', path: '/donation/organDonation' },
-					{ index: 2, name: '我要造血干细胞捐献', path: '/donation/Hpc' },
-					{ index: 3, name: '我要登记救护员', path: '/join/rescue' },
-					{ index: 4, name: '我要登记个人会员', path: '/join/member' },
-					{ index: 5, name: '我要登记志愿者', path: '/join/volunteer' },
-					{ index: 6, name: '我要报名普及培训', path: '/join/train' },
-				],
-				rightTitle: '我要捐款',
-				currentIndex: 0
-			}
-		}
-	}
-</script>
-
-<style>
-</style>

src/views/Regulations.vue → src/views/DownLoad.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="regulations">
+	<div class="download">
 		<left-nav :navList="navList">
 			<router-view></router-view>
 		</left-nav>
@@ -15,12 +15,11 @@
 		},
 		data() {
 			return {
-				navList: [{ index: 0, name: '红色新闻', path: '/news/list' }, { index: 1, name: '信息公示', path: '/publicity/list' },{index: 2, name: '政策法规', path: '/regulations/list'}],
-				// radio: '1'
+				navList: [{ index: 0, name: '表格下载', path: '/download' }],
 			};
 		}
 	};
 </script>
 
 <style>
-</style>
+</style>

src/views/Help.vue

@@ -0,0 +1,40 @@
+<template>
+	<div class="join">
+		<left-nav :navList="navList">
+			<router-view></router-view>
+		</left-nav>
+	</div>
+</template>
+
+<script>
+	import LeftNav from '../components/leftNav/LeftNav.vue'
+	export default {
+		components: {
+			LeftNav
+		},
+		data() {
+			return {
+				navList: [
+					{ index: 0, name: '人道救助', path: '/help/aid' },
+					{ index: 1, name: '红十字志愿服务', path: '/help/service' },
+					{ index: 2, name: '红十字少年', path: '/help/juvenile' }
+				],
+				rightTitle: '我要登记志愿者',
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.join {
+		width: 1202px;
+		margin: 0 auto;
+		display: flex;
+		justify-content: space-between;
+		.right-wrapper {
+			width: 915px;
+			min-height: 776px;
+			box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
+		}
+	}
+</style>

src/views/Home.vue

@@ -1,14 +1,14 @@
 <template>
 	<div class="home">
 		<div class="home-swiper">
-			<el-carousel height="484px" :interval="4000" v-if="swiperList">
+			<el-carousel height="588px" :interval="4000" v-if="swiperList">
 				<el-carousel-item v-for="(item, index) in swiperList" :key="index"><el-image :src="item" alt="" class="swiper-img" /></el-carousel-item>
 			</el-carousel>
 		</div>
 		<img src="../assets/img/m3.png" class="home-tit">
 		<div class="new-wrapper">
 			<div class="main-new flex">
-				<div class="new-pic" @click="navTo('/news/detail?id='+ showNew.id)">
+				<div class="new-pic" @click="navTo('/newsCenter/redNews/detail?id='+ showNew.id)">
 					<img :src="showNew.img">
 					<div class="title clamp hand">
 						{{showNew.title}}
@@ -96,10 +96,10 @@
 			</div>
 		</div>
 		<div class="home-nav flex">
-			<img src="../assets/img/z1.png" >
-			<img src="../assets/img/z2.png" >
-			<img src="../assets/img/z3.png" >
-			<img src="../assets/img/z4.png" >
+			<img src="../assets/img/z1.png" class="hand" @click="navTo('/help/aid')">
+			<img src="../assets/img/z2.png" class="hand" @click="navTo('/help/service')">
+			<img src="../assets/img/z3.png" class="hand" @click="navTo('/help/juvenile')">
+			<img src="../assets/img/z4.png" class="hand" @click="navTo('/download')">
 		</div>
 		<div class="home-main2 flex">
 			<div class="love-wrapper">
@@ -134,14 +134,14 @@
 		<div class="show-pic">
 			<item-title title="红会风采" isShow="2"></item-title>
 			<div class="imgs-wrapper">
-				<div class="imgs"><img v-for="(item, index) in imgList" :key="item.id" :src="item.picture" /></div>
+				<div class="imgs"><img v-for="(item, index) in imgList" :key="item.id" :src="item.image_input[0]" /></div>
 			</div>
 		</div>
 		<div class="friends">
 			<item-title title="友情链接" isShow="2"></item-title>
 			<div class="friend-list-wrapper">
 				<div class="friend-item" v-for="item in friendList" :key="item.id">
-					<a :href="item.link" class="item-a" target="_blank">{{ item.name }}</a>
+					<a :href="item.synopsis" class="item-a" target="_blank">{{ item.title }}</a>
 				</div>
 			</div>
 		</div>
@@ -151,7 +151,7 @@
 <script>
 import ItemTitle from './homeChild/ItemTitle.vue';
 
-import { loadIndexs, splist, loveList, friendList , newsList, openList, banner, regulationList, ezqList, hrqList, lzhqList } from '../request/api.js';
+import { loadIndexs, splist, loveList, friendLink , newsList, openList, banner, regulationList, ezqList, hrqList, lzhqList, redshow } from '../request/api.js';
 export default {
 	components: {
 		ItemTitle
@@ -214,22 +214,6 @@ export default {
 			ezqList: [],
 			hrqList: [],
 			lzhqList: [],
-			ceshi: [
-				{ id: 1, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				{ id: 2, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				{ id: 3, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				{ id: 4, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				{ id: 5, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				{ id: 6, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				{ id: 7, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				{ id: 8, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				{ id: 9, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				// { id: 10, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				// { id: 11, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				// { id: 12, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				// { id: 13, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-				// { id: 14, title: '测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据', add_time: '2021-05-09' },
-			]
 		};
 	},
 	filters: {
@@ -263,7 +247,7 @@ export default {
 	},
 	created() {
 		this.getSwiperList()
-		this.getIndex();
+		// this.getIndex();
 		this.getFirstAidList();
 		this.getJxList();
 		this.getNewsList()
@@ -272,19 +256,21 @@ export default {
 		this.getEzqList()
 		this.getHrqList()
 		this.getLzhqList()
+		this.getRedshow()
+		this.getFriendsLink()
 	},
 	methods: {
 		navTo(url) {
 			this.$router.push(url);
 		},
-		getIndex() {
-			loadIndexs().then(({ data }) => {
-				console.log(data);
-				this.friendList = data.friend_link;
-				this.imgList = data.picture_list;
-				console.log(this.swiperList);
-			});
-		},
+		// getIndex() {
+		// 	loadIndexs().then(({ data }) => {
+		// 		console.log(data);
+		// 		this.friendList = data.friend_link;
+		// 		this.imgList = data.picture_list;
+		// 		console.log(this.swiperList);
+		// 	});
+		// },
 		getFirstAidList() {
 			splist({
 				page: 1,
@@ -359,7 +345,6 @@ export default {
 					return item.image_input[0]
 				})
 				obj.swiperList= list
-				
 				console.log(obj.swiperList,'22222121222222111111111111111')
 			})
 		},
@@ -367,7 +352,7 @@ export default {
 			let obj = this
 			regulationList({
 				page: 1,
-				limit: 7
+				limit: 9
 			}).then(res => {
 				console.log(res.data.list,'0000000000')
 				obj.regulationList = res.data.list.map(item => {
@@ -418,6 +403,26 @@ export default {
 					return item
 				})
 			})
+		},
+		getRedshow() {
+			let obj = this
+			redshow({
+				page: 1,
+				limit: 12
+			}).then( res => {
+				console.log(res,'++++++++++++++++')
+				obj.imgList = res.data.list
+			})
+		},
+		getFriendsLink() {
+			let obj = this
+			friendLink({
+				page: 1,
+				limit: 20
+			}).then( res => {
+				console.log(res,'-------------------------')
+				obj.friendList = res.data.list
+			})
 		}
 	}
 };
@@ -426,14 +431,14 @@ export default {
 <style lang="scss" spcode>
 .home-swiper {
 	width: 1202px;
-	height: 484px;
+	height: 588px;
 	// background: pink;
 	margin: -20px auto 0px;
 	el-carousel {
 		width: 1202px;
 		el-carousel-item {
 			width: 1202px;
-			height: 484px;
+			height: 588px;
 		}
 	}
 	.swiper-img {
@@ -550,7 +555,7 @@ export default {
 	}
 }
 .item-wrapper {
-			padding: 9px 0px 0 13px;
+			padding: 20px 0px 0 13px;
 			color: #666666;
 			.new-item {
 				display: flex;

src/views/Join.vue

@@ -3,9 +3,9 @@
 		<left-nav :navList="navList">
 			<router-view></router-view>
 		</left-nav>
-	</div>
-</template>
-
+	</div>
+</template>
+
 <script>
 	import LeftNav from '../components/leftNav/LeftNav.vue'
 	export default {
@@ -26,12 +26,12 @@
 				rightTitle: '我要登记志愿者',
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style lang="scss" scoped>
 	.join {
-		width: 1200px;
+		width: 1202px;
 		margin: 0 auto;
 		display: flex;
 		justify-content: space-between;
@@ -40,5 +40,5 @@
 			min-height: 776px;
 			box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
 		}
-	}
-</style>
+	}
+</style>

src/views/about/ChineseRedCross.vue

@@ -1,8 +1,34 @@
-<template>
+<template>
+	<div class="organ-donation">
+		<div class="content" v-html="content"></div>
+	</div>
 </template>
 
-<script>
+<script>
+	import { details } from '../../request/api.js'
+	
+	export default {
+		data() {
+			return {
+				content: ''
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods: {
+			getContent() {
+				details({},83).then(({data}) => {
+					this.content = data.content
+				})
+			}
+		}
+	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	// .content {
+	// 	width: 100%;
+	// 	// overflow: hidden;
+	// }
 </style>

src/views/about/EzhouRedCross.vue

@@ -1,8 +1,34 @@
-<template>
+<template>
+	<div class="organ-donation">
+		<div class="content" v-html="content"></div>
+	</div>
 </template>
 
-<script>
+<script>
+	import { details } from '../../request/api.js'
+	
+	export default {
+		data() {
+			return {
+				content: ''
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods: {
+			getContent() {
+				details({},84).then(({data}) => {
+					this.content = data.content
+				})
+			}
+		}
+	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	// .content {
+	// 	width: 100%;
+	// 	// overflow: hidden;
+	// }
 </style>

src/views/about/RedCrossMovement.vue

@@ -1,8 +1,34 @@
-<template>
+<template>
+	<div class="organ-donation">
+		<div class="content" v-html="content"></div>
+	</div>
 </template>
 
-<script>
+<script>
+	import { details } from '../../request/api.js'
+	
+	export default {
+		data() {
+			return {
+				content: ''
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods: {
+			getContent() {
+				details({},82).then(({data}) => {
+					this.content = data.content
+				})
+			}
+		}
+	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	// .content {
+	// 	width: 100%;
+	// 	// overflow: hidden;
+	// }
 </style>

src/views/download/List.vue

@@ -0,0 +1,99 @@
+<template>
+	<div class="new-list">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/download/detail?id='+ item.id)">
+			<div class="title clamp">
+				<!-- <span class="title-icon"></span> -->
+				<img src="../../assets/img/download.png" >
+				{{ item.title }}
+			</div>
+			<div class="time">{{ item.add_time }}</div>
+		</div>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15"></el-pagination>
+	</div>
+</template>
+
+<script>
+import { loadIndexs, splist, loveList, friendList , newsList, openList } from '../../request/api.js';
+export default {
+	data() {
+		return {
+			newList: [],
+			total: 0,
+			page: 1,
+			limit: 15
+		};
+	},
+	created() {
+		this.getList()
+	},
+	methods:{
+		navTo(url) {
+			this.$router.push(url);
+		},
+		currentChange(e) {
+			console.log(e);
+			this.page = e
+			this.getList()
+		},
+		getList() {
+			let obj = this
+			openList({
+				page: obj.page,
+				limit: obj.limit
+			}).then(res => {
+				obj.newList = res.data.list
+				obj.total = res.data.count
+			})
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.new-list {
+	// padding: 0px 72px 0 40px;
+	.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;
+			// }
+			img {
+				width: 14px;
+				height: 14px;
+			}
+		}
+	}
+}
+	/deep/ .el-pagination {
+		margin-top: 50px;
+		text-align: center;
+	}
+</style>

src/views/help/Aid.vue

@@ -0,0 +1,32 @@
+<template>
+	<div class="contribution">
+		<div class="" v-html="content">
+			
+		</div>
+	</div>
+</template>
+
+<script>
+	import { details } from '../../request/api.js'
+	
+	export default {
+		data() {
+			return {
+				content: ''
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods: {
+			getContent() {
+				details({},25).then(({data}) => {
+					this.content = data.content
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped="">
+</style>

src/views/help/Juvenile.vue

@@ -0,0 +1,32 @@
+<template>
+	<div class="contribution">
+		<div class="" v-html="content">
+			
+		</div>
+	</div>
+</template>
+
+<script>
+	import { details } from '../../request/api.js'
+	
+	export default {
+		data() {
+			return {
+				content: ''
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods: {
+			getContent() {
+				details({},25).then(({data}) => {
+					this.content = data.content
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped="">
+</style>

src/views/help/Service.vue

@@ -0,0 +1,32 @@
+<template>
+	<div class="contribution">
+		<div class="" v-html="content">
+			
+		</div>
+	</div>
+</template>
+
+<script>
+	import { details } from '../../request/api.js'
+	
+	export default {
+		data() {
+			return {
+				content: ''
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods: {
+			getContent() {
+				details({},25).then(({data}) => {
+					this.content = data.content
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped="">
+</style>

src/views/join/Contribution.vue

@@ -20,7 +20,7 @@
 		},
 		methods: {
 			getContent() {
-				details({},25).then(({data}) => {
+				details({},85).then(({data}) => {
 					this.content = data.content
 				})
 			}

src/views/join/Hpc.vue

@@ -1,11 +1,14 @@
 <template>
-	<div class="hpc">
-		<div v-html="content"></div>
+	<div class="contribution">
+		<div class="" v-html="content">
+			
+		</div>
 	</div>
 </template>
 
 <script>
 	import { details } from '../../request/api.js'
+	
 	export default {
 		data() {
 			return {
@@ -13,33 +16,11 @@
 			}
 		},
 		created() {
-			this.getData()
-			this.getContent(27)
-		},
-		computed: {
-			iid() {
-				return this.$route.query.id || 0
-			}
-		},
-		watch: {
-			iid(val) {
-				console.log(val)
-				this.getData(val)
-			}
+			this.getContent()
 		},
 		methods: {
-			getData(val) {
-				if(!val){
-					val = 0
-				}
-				if(val==0){
-					this.getContent(27)
-				}else {
-					this.getContent(28)
-				}
-			},
-			getContent(id) {
-				details({},id).then(({data}) => {
+			getContent() {
+				details({},87).then(({data}) => {
 					this.content = data.content
 				})
 			}
@@ -47,5 +28,5 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped="">
 </style>

src/views/join/Member.vue

@@ -20,7 +20,7 @@
 		},
 		methods: {
 			getContent() {
-				details({},31).then(({data}) => {
+				details({},89).then(({data}) => {
 					this.content = data.content
 				})
 			}

src/views/join/OrganDonation.vue

@@ -18,7 +18,7 @@
 		},
 		methods: {
 			getContent() {
-				details({},26).then(({data}) => {
+				details({},86).then(({data}) => {
 					this.content = data.content
 				})
 			}

src/views/join/Rescue.vue

@@ -20,7 +20,7 @@
 		},
 		methods: {
 			getContent() {
-				details({},30).then(({data}) => {
+				details({},88).then(({data}) => {
 					this.content = data.content
 				})
 			}

src/views/join/Train.vue

@@ -20,7 +20,7 @@
 		},
 		methods: {
 			getContent() {
-				details({},38).then(({data}) => {
+				details({},91).then(({data}) => {
 					this.content = data.content
 				})
 			}

src/views/join/Volunteer.vue

@@ -20,7 +20,7 @@
 		},
 		methods: {
 			getContent() {
-				details({},32).then(({data}) => {
+				details({},90).then(({data}) => {
 					this.content = data.content
 				})
 			}

src/views/newsCenter/echeng/Detail.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="new-detail">
 		<div id="" v-html="content">
-			
 		</div>
 	</div>
 </template>
@@ -24,6 +23,7 @@
 			getContent() {
 				let obj = this
 				this.idd = this.$route.query.id
+				console.log(this.idd)
 				obj.getDetail()
 			},
 			getDetail() {

src/views/newsCenter/echeng/List.vue

@@ -1,18 +1,18 @@
 <template>
 	<div class="new-list">
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newsCenter/echeng/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
 			</div>
 			<div class="time">{{ item.add_time }}</div>
 		</div>
-		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15"></el-pagination>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15" hide-on-single-page></el-pagination>
 	</div>
 </template>
 
 <script>
-import { loadIndexs, splist, loveList, friendList , newsList, openList } from '../../../request/api.js';
+import { ezqList } from '../../../request/api.js';
 export default {
 	data() {
 		return {
@@ -36,7 +36,7 @@ export default {
 		},
 		getList() {
 			let obj = this
-			newsList({
+			ezqList({
 				page: obj.page,
 				limit: obj.limit
 			}).then(res => {
@@ -51,6 +51,7 @@ export default {
 <style lang="scss" scoped>
 .new-list {
 	// padding: 0px 72px 0 40px;
+	
 	.new-item {
 		display: flex;
 		justify-content: space-between;
@@ -88,4 +89,5 @@ export default {
 		margin-top: 50px;
 		text-align: center;
 	}
+	
 </style>

src/views/newsCenter/huarong/Detail.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="new-detail">
 		<div id="" v-html="content">
-			
 		</div>
 	</div>
 </template>
@@ -24,6 +23,7 @@
 			getContent() {
 				let obj = this
 				this.idd = this.$route.query.id
+				console.log(this.idd)
 				obj.getDetail()
 			},
 			getDetail() {

src/views/newsCenter/huarong/List.vue

@@ -1,18 +1,18 @@
 <template>
 	<div class="new-list">
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newsCenter/huarong/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
 			</div>
 			<div class="time">{{ item.add_time }}</div>
 		</div>
-		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15"></el-pagination>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15" hide-on-single-page></el-pagination>
 	</div>
 </template>
 
 <script>
-import { loadIndexs, splist, loveList, friendList , newsList, openList } from '../../../request/api.js';
+import { hrqList } from '../../../request/api.js';
 export default {
 	data() {
 		return {
@@ -45,7 +45,7 @@ export default {
 		},
 		getList() {
 			let obj = this
-			newsList({
+			hrqList({
 				page: obj.page,
 				limit: obj.limit
 			}).then(res => {

src/views/newsCenter/laws/Detail.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="new-detail">
 		<div id="" v-html="content">
-			
 		</div>
 	</div>
 </template>
@@ -24,6 +23,7 @@
 			getContent() {
 				let obj = this
 				this.idd = this.$route.query.id
+				console.log(this.idd)
 				obj.getDetail()
 			},
 			getDetail() {

src/views/newsCenter/laws/List.vue

@@ -1,18 +1,18 @@
 <template>
 	<div class="new-list">
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newsCenter/laws/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
 			</div>
 			<div class="time">{{ item.add_time }}</div>
 		</div>
-		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15"></el-pagination>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15" hide-on-single-page></el-pagination>
 	</div>
 </template>
 
 <script>
-import { loadIndexs, splist, loveList, friendList , newsList, openList } from '../../../request/api.js';
+import { loadIndexs, splist, loveList, friendList , newsList, openList, regulationList } from '../../../request/api.js';
 export default {
 	data() {
 		return {
@@ -45,7 +45,7 @@ export default {
 		},
 		getList() {
 			let obj = this
-			newsList({
+			regulationList({
 				page: obj.page,
 				limit: obj.limit
 			}).then(res => {

src/views/newsCenter/liangzihu/Detail.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="new-detail">
 		<div id="" v-html="content">
-			
 		</div>
 	</div>
 </template>
@@ -24,6 +23,7 @@
 			getContent() {
 				let obj = this
 				this.idd = this.$route.query.id
+				console.log(this.idd)
 				obj.getDetail()
 			},
 			getDetail() {

src/views/newsCenter/liangzihu/List.vue

@@ -1,18 +1,18 @@
 <template>
 	<div class="new-list">
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newsCenter/liangzihu/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
 			</div>
 			<div class="time">{{ item.add_time }}</div>
 		</div>
-		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15"></el-pagination>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15" hide-on-single-page></el-pagination>
 	</div>
 </template>
 
 <script>
-import { loadIndexs, splist, loveList, friendList , newsList, openList } from '../../../request/api.js';
+import { lzhqList } from '../../../request/api.js';
 export default {
 	data() {
 		return {
@@ -45,7 +45,7 @@ export default {
 		},
 		getList() {
 			let obj = this
-			newsList({
+			lzhqList({
 				page: obj.page,
 				limit: obj.limit
 			}).then(res => {

src/views/newsCenter/redNews/Detail.vue

@@ -1,7 +1,41 @@
-<template>
+<template>
+	<div class="new-detail">
+		<div id="" v-html="content">
+		</div>
+	</div>
 </template>
 
-<script>
+<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>

src/views/newsCenter/redNews/List.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="new-list">
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/publicity/detail?id='+ item.id)">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/newsCenter/redNews/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}

src/views/publicity/List.vue

@@ -7,7 +7,7 @@
 			</div>
 			<div class="time">{{ item.add_time }}</div>
 		</div>
-		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15"></el-pagination>
+		<el-pagination layout="prev, pager, next" :total="total" background prev-text="上一页" next-text="下一页" @current-change="currentChange" :page-size="15" hide-on-single-page></el-pagination>
 	</div>
 </template>