6-29

src/App.vue

@@ -41,7 +41,7 @@ export default {
 	right: 0;
 	margin: 0 auto;
 	// margin: 0 auto -300px;
-	height: 300px;
+	height: 280px;
 	max-width: 1920px;
 	min-width: 1200px;
 	// background-image: url(assets/img/m1.png);

src/components/leftNav/LeftNav.vue

@@ -2,7 +2,7 @@
 	<div class="wrapper">
 		<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 === item.path}" @click="navTo(item.path)">
+			<div class="nav-item" v-for="item in navList" :key="item.id" :class="{'action': currentUrl.indexOf(item.path) !== -1}" @click="navTo(item.path)">
 				<div class="item-name">
 					{{item.name}}
 				</div>
@@ -15,17 +15,10 @@
 			<div class="title moren" v-if="isShow">
 				{{rightTitle}}
 			</div>
-			<div class="jg">
-				
+			<div class="title moren" v-else>
+					<span class="hand" @click="back">{{detailTitle[0]}} > </span>{{detailTitle[1]}}
 			</div>
-			<template v-else>
-				<div class="title hand" style="display: inline-block;" :class="{'action': currentIndex !== 0}" @click="changeClik(0)">
-					基础知识
-				</div>
-				<div class="title hand" style="display: inline-block;" :class="{'action': currentIndex !== 1}" @click="changeClik(1)">
-					如何报名
-				</div>
-			</template>
+			<div class="jg"></div>
 			<div style="padding: 35px 50px 35px 50px;" class="line">
 				<slot></slot>
 			</div>
@@ -44,7 +37,7 @@
 		},
 		computed: {
 			isShow() {
-				return this.$route.path !== '/donation/Hpc'
+				return this.$route.path.indexOf('detail') === -1
 			},
 			navHeight() {
 				return this.navList.length*51 + 4 + 'px'
@@ -55,12 +48,15 @@
 			rightTitle() {
 				let title = ''
 				switch(this.currentUrl) {
-				     case '/donation/contribution':
+				     case '/join/contribution':
 				        title = '我要捐款'
 				        break;
-				     case '/donation/organDonation':
+				     case '/join/organDonation':
 				         title = '我要捐献器官'
 				        break;
+					case '/join/Hpc':
+					    title = '我要造血干细胞捐献'
+					   break;
 					case '/join/rescue':
 					    title = '我要成为救护员'
 					   break;
@@ -73,12 +69,6 @@
 					case '/join/train':
 						title = '报名普及培训'
 						break
-					case '/about':
-						title = '关于我们'
-						break
-					case '/concat':
-						title = '联系我们'
-						break
 					case '/popularScience/list':
 						title = '红会科普'
 						break
@@ -95,21 +85,56 @@
 						title = '信息公示'
 						break
 					case '/publicity/detail':
-						title = '信息公示'
+						title = '信息公示,公示详情'
 						break
-					case '/regulations/detail':
-						title = '政策法规'
+					case '/newsCenter/redNews/list':
+						title = '红会新闻'
 						break
-					case '/regulations/list':
-						title = '政策法规'
+					case '/newsCenter/redNews/detail':
+						title = '红会新闻,新闻详情'
+						break
+					case '/newsCenter/echeng/list':
+						title = '鄂城区'
+						break
+					case '/newsCenter/echeng/detail':
+						title = '鄂城区,新闻详情'
 						break
-					case '/regulations':
+					case '/newsCenter/huarong/list':
+						title = '华容区'
+						break
+					case '/newsCenter/huarong/detail':
+						title = '华容区,新闻详情'
+						break
+					case '/newsCenter/liangzihu/list':
+						title = '梁子湖区'
+						break
+					case '/newsCenter/liangzihu/list':
+						title = '梁子湖区,新闻详情'
+						break
+					case '/newsCenter/laws/list':
 						title = '政策法规'
 						break
+					case '/newsCenter/laws/detail':
+						title = '政策法规,政策详情'
+						break
+					case '/about/redCrossMovement':
+						title = '关于红十字会运动'
+						break
+					case '/about/chineseRedCross':
+						title = '关于中国红十字会'
+						break
+					case '/about/ezhouRedCross':
+						title = '鄂州红十字会简介'
+						break
 				     default:
 				        title = ''
 				}
 				return title
+			},
+			detailTitle() {
+				let arr = this.rightTitle.split(',')
+				console.log(arr,'++++++++++++++++++++++++++++++')
+				return arr
 			}
 		},
 		data() {
@@ -127,11 +152,15 @@
 					this.$router.push(path)
 				}
 			},
-			changeClik(index) {
-				this.currentIndex = index
-				this.$router.push('/donation/Hpc?id=' + index)
-				console.log(index)
+			back() {
+				let url = this.$route.path.replace('/detail','')
+				this.$router.push(url)
 			}
+			// changeClik(index) {
+			// 	this.currentIndex = index
+			// 	this.$router.push('/donation/Hpc?id=' + index)
+			// 	console.log(index)
+			// }
 		}
 	}
 </script>
@@ -187,12 +216,9 @@
 		background-color: #fff;
 		
 		.title {
-			// border: 2px #d82020 solid;
-			width: 156px;
+			text-align: left;
 			height: 50px;
 			line-height: 50px;
-			text-align: center;
-			// background: #D82020;
 			font-size: 18px;
 			font-family: PingFang SC;
 			font-weight: bold;
@@ -200,6 +226,10 @@
 			position: relative;
 			top: -2px;
 			color: #BF3333;
+			padding-left: 23px;
+			span {
+				color: #999;
+			}
 		}
 		.action {
 			background: #FFFFFF;
@@ -211,6 +241,6 @@
 	}
 	.jg {
 		height: 1px;
-		background-color: ;
+		background-color: #f3f3f3;
 	}
 </style>

src/components/navBar/NavBar.vue

@@ -20,7 +20,7 @@ export default {
 				imgUrl: require('@/assets/img/n1.png')
 			},
 			{
-				path: '/donation',
+				path: '/newsCenter',
 				title: '新闻中心',
 				imgUrl: require('@/assets/img/n2.png'),
 			},

src/router.js

@@ -17,7 +17,7 @@ Router.prototype.push = function push(location) {
 Vue.use(Router)
 
 export default new Router({
-  // mode: 'history',
+  mode: 'history',
   base: process.env.BASE_URL,
   routes: [
     {
@@ -33,18 +33,26 @@ export default new Router({
       }
     },
 	{
-		path: '/donation',
-		name: 'donation',
-		component: () => import('./views/Donation.vue'),
-		redirect: '/donation/contribution',
+		path: '/loveList',
+		name: 'loveList',
+		component: () => import('./views/LoveList.vue'),
+		meta: {
+			title: '爱心榜'
+		}
+	},
+	{
+		path: '/join',
+		name: 'join',
+		component: () => import('./views/Join.vue'),
+		redirect: '/join/contribution',
 		meta: {
-			title: '捐赠平台'
+			title: '我要参与'
 		},
 		children: [
 			{
 				path: 'contribution',
 				name: 'contribution',
-				component: () => import('./views/donation/Contribution.vue'),
+				component: () => import('./views/join/Contribution.vue'),
 				meta: {
 					title: '捐款'
 				}
@@ -52,7 +60,7 @@ export default new Router({
 			{
 				path: 'organDonation',
 				name: 'organDonation',
-				component: () => import('./views/donation/OrganDonation.vue'),
+				component: () => import('./views/join/OrganDonation.vue'),
 				meta: {
 					title: '器官捐献'
 				}
@@ -60,30 +68,11 @@ export default new Router({
 			{
 				path: 'HPC',
 				name: 'HPC',
-				component: () => import('./views/donation/Hpc.vue'),
+				component: () => import('./views/join/Hpc.vue'),
 				meta: {
 					title: '捐献造血干细胞'
 				}
 			},
-		]
-	},
-	{
-		path: '/loveList',
-		name: 'loveList',
-		component: () => import('./views/LoveList.vue'),
-		meta: {
-			title: '爱心榜'
-		}
-	},
-	{
-		path: '/join',
-		name: 'join',
-		component: () => import('./views/Join.vue'),
-		redirect: '/join/volunteer',
-		meta: {
-			title: '我要参与'
-		},
-		children: [
 			{
 				path: 'volunteer',
 				name: 'volunteer',
@@ -123,16 +112,35 @@ export default new Router({
 		name: 'about',
 		component: () => import('./views/About.vue'),
 		meta: {
-			title: '关于我们'
-		}
-	},
-	{
-		path: '/concat',
-		name: 'concat',
-		component: () => import('./views/Concat.vue'),
-		meta: {
-			title: '联系我们'
-		}
+			title: '红十字概况'
+		},
+		redirect: '/about/redCrossMovement',
+		children: [
+			{
+				path: 'redCrossMovement',
+				neme: 'redCrossMovement',
+				component: () => import('./views/about/RedCrossMovement.vue'),
+				meta: {
+					title: '关于红十字会运动'
+				}
+			},
+			{
+				path: 'chineseRedCross',
+				neme: 'chineseRedCross',
+				component: () => import('./views/about/ChineseRedCross.vue'),
+				meta: {
+					title: '关于中国红十字会'
+				}
+			},
+			{
+				path: 'ezhouRedCross',
+				neme: 'ezhouRedCross',
+				component: () => import('./views/about/EzhouRedCross.vue'),
+				meta: {
+					title: '鄂州市红十字会简介'
+				}
+			},
+		]
 	},
 	{
 		path: '/popularScience',
@@ -161,33 +169,6 @@ export default new Router({
 			}
 		]
 	},
-	{
-		path: '/news',
-		name: 'news',
-		component: () => import('./views/News.vue'),
-		meta: {
-			title: '红会新闻'
-		},
-		redirect: '/news/list',
-		children: [
-			{
-				path: 'list',
-				name: 'newslist',
-				component: () => import('./views/news/List.vue'),
-				meta: {
-					title: '红会新闻'
-				}
-			},
-			{
-				path: 'detail',
-				name: 'newsdetail',
-				component: () => import('./views/news/Detail.vue'),
-				meta: {
-					title: '红会新闻'
-				}
-			}
-		]
-	},
 	{
 		path: '/publicity',
 		name: 'publicity',
@@ -216,30 +197,149 @@ export default new Router({
 		]
 	},
 	{
-		path: '/regulations',
-		name: 'regulations',
-		component: () => import('./views/Regulations.vue'),
+		path: '/newsCenter',
+		name: 'newsCenter',
+		component: () => import('./views/NewsCenter.vue'),
+		redirect: '/newsCenter/redNews',
 		meta: {
-			title: '政策法规'
+			title: '新闻中心'
 		},
-		redirect: '/regulations/list',
 		children: [
 			{
-				path: 'list',
-				name: 'regulationsList',
-				component: () => import('./views/regulations/List.vue'),
+				path: 'redNews',
+				name: 'redNews',
+				component: () => import('./views/newsCenter/RedNews.vue'),
+				redirect: '/newsCenter/redNews/list',
 				meta: {
-					title: '政策法规'
-				}
+					title: '红会新闻'
+				},
+				children: [
+					{
+						path: 'list',
+						name: 'redNewsList',
+						component: () => import('./views/newsCenter/redNews/List.vue'),
+						meta: {
+							title: '红会新闻'
+						}
+					},
+					{
+						path: 'detail',
+						name: 'redNewsDetail',
+						component: () => import('./views/newsCenter/redNews/Detail.vue'),
+						meta: {
+							title: '红会新闻'
+						}
+					}
+				]
 			},
 			{
-				path: 'detail',
-				name: 'regulationsdetail',
-				component: () => import('./views/regulations/Detail.vue'),
+				path: 'echeng',
+				name: 'echeng',
+				component: () => import('./views/newsCenter/Echeng.vue'),
+				redirect: '/newsCenter/echeng/list',
 				meta: {
-					title: '政策法规'
-				}
-			}
+					title: '鄂城区'
+				},
+				children: [
+					{
+						path: 'list',
+						name: 'echengList',
+						component: () => import('./views/newsCenter/echeng/List.vue'),
+						meta: {
+							title: '鄂城区'
+						}
+					},
+					{
+						path: 'detail',
+						name: 'echengDetail',
+						component: () => import('./views/newsCenter/echeng/Detail.vue'),
+						meta: {
+							title: '鄂城区'
+						}
+					}
+				]
+			},
+			{
+				path: 'huarong',
+				name: 'huarong',
+				component: () => import('./views/newsCenter/Huarong.vue'),
+				redirect: '/newsCenter/huarong/list',
+				meta: {
+					title: '华容区'
+				},
+				children: [
+					{
+						path: 'list',
+						name: 'huarongList',
+						component: () => import('./views/newsCenter/huarong/List.vue'),
+						meta: {
+							title: '华容区'
+						}
+					},
+					{
+						path: 'detail',
+						name: 'huarongDetail',
+						component: () => import('./views/newsCenter/huarong/Detail.vue'),
+						meta: {
+							title: '华容区'
+						}
+					}
+				]
+			},
+			{
+				path: 'liangzihu',
+				name: 'liangzihu',
+				component: () => import('./views/newsCenter/Liangzihu.vue'),
+				redirect: '/newsCenter/liangzihu/list',
+				meta: {
+					title: '梁子湖区'
+				},
+				children: [
+					{
+						path: 'list',
+						name: 'liangzihuList',
+						component: () => import('./views/newsCenter/liangzihu/List.vue'),
+						meta: {
+							title: '梁子湖区'
+						}
+					},
+					{
+						path: 'detail',
+						name: 'liangzihuDetail',
+						component: () => import('./views/newsCenter/liangzihu/Detail.vue'),
+						meta: {
+							title: '梁子湖区'
+						}
+					}
+				]
+			},
+			{
+				path: 'laws',
+				name: 'laws',
+				component: () => import('./views/newsCenter/Laws.vue'),
+				redirect: '/newsCenter/laws/list',
+				meta: {
+					title: '法律法规'
+				},
+				children: [
+					{
+						path: 'list',
+						name: 'lawsList',
+						component: () => import('./views/newsCenter/laws/List.vue'),
+						meta: {
+							title: '法律法规'
+						}
+					},
+					{
+						path: 'detail',
+						name: 'lawsDetail',
+						component: () => import('./views/newsCenter/laws/Detail.vue'),
+						meta: {
+							title: '法律法规'
+						}
+					}
+				]
+			},
 		]
 	},
 	{

src/views/About.vue

@@ -1,41 +1,28 @@
 <template>
 	<div class="about">
 		<left-nav :navList="navList">
-			<div id="" v-html="content">
-				
-			</div>
+			<router-view></router-view>
 		</left-nav>
 	</div>
 </template>
 
 <script>
 import LeftNav from '../components/leftNav/LeftNav.vue';
-import { details } from '../request/api.js'
+import { details } from '../request/api.js';
 export default {
 	components: {
-		LeftNav,
-		
+		LeftNav
 	},
 	data() {
 		return {
-			navList: [{ index: 0, name: '关于我们', path: '/about' }, { index: 1, name: '联系我们', path: '/concat' }],
-			// radio: '1'
-			content: ''
+			navList: [
+				{ index: 0, name: '关于红十字会运动', path: '/about/redCrossMovement' },
+				{ index: 1, name: '关于中国红十字会', path: '/about/chineseRedCross' },
+				{ index: 2, name: '鄂州市红十字会简介', path: '/about/ezhouRedCross' },
+			],
 		};
-	},
-	created() {
-		this.getContent()
-	},
-	methods:{
-		getContent() {
-			details({},34).then(({data}) => {
-				this.content = data.content
-			})
-		}
 	}
 };
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

src/views/Concat.vue

@@ -1,46 +0,0 @@
-<template>
-	<div class="concat"><left-nav :navList="navList"><div v-html="content">
-		
-	</div></left-nav></div>
-</template>
-
-<script>
-import LeftNav from '../components/leftNav/LeftNav.vue';
-import { details } from '../request/api.js';
-export default {
-	components: {
-		LeftNav
-		// PageTitle
-	},
-	data() {
-		return {
-			navList: [{ index: 0, name: '关于我们', path: '/about' }, { index: 1, name: '联系我们', path: '/concat' }],
-			content: ''
-		};
-	},
-	created() {
-		this.getContent()
-	},
-	methods:{
-		getContent() {
-			details({},35).then(({data}) => {
-				this.content = data.content
-			})
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.concat {
-	width: 1200px;
-	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

@@ -15,7 +15,7 @@
 					</div>
 				</div>
 				<div class="news">
-					<item-title title="红会新闻" :topath="'/news'"></item-title>
+					<item-title title="红会新闻" :topath="'/newsCenter/redNews'"></item-title>
 					<div class="item-wrapper">
 						<div class="new-item hand" v-for="item in redNews" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
 							<div class="title clamp ">
@@ -29,9 +29,9 @@
 			</div>
 			<div class="area-new flex">
 				<div class="area-item">
-					<item-title title="鄂城区" :topath="'/news'"></item-title>
+					<item-title title="鄂城区" :topath="'/newsCenter/echeng'"></item-title>
 					<div class="item-wrapper">
-						<div class="new-item hand" v-for="item in ezqList" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+						<div class="new-item hand" v-for="item in ezqList" :key="item.id" @click="navTo('/newsCenter/echeng/detail?id='+ item.id)">
 							<div class="title clamp ">
 								<span class="sj"></span>
 								{{ item.title }}
@@ -40,9 +40,9 @@
 					</div>
 				</div>
 				<div class="area-item">
-					<item-title title="华容区" :topath="'/news'"></item-title>
+					<item-title title="华容区" :topath="'/newsCenter/huarong'"></item-title>
 					<div class="item-wrapper">
-						<div class="new-item hand" v-for="item in hrqList" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+						<div class="new-item hand" v-for="item in hrqList" :key="item.id" @click="navTo('/newsCenter/huarong/detail?id='+ item.id)">
 							<div class="title clamp ">
 								<span class="sj"></span>
 								{{ item.title }}
@@ -51,9 +51,9 @@
 					</div>
 				</div>
 				<div class="area-item">
-					<item-title title="梁子湖区" :topath="'/news'"></item-title>
+					<item-title title="梁子湖区" :topath="'/newsCenter/liangzihu'"></item-title>
 					<div class="item-wrapper">
-						<div class="new-item hand" v-for="item in lzhqList" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+						<div class="new-item hand" v-for="item in lzhqList" :key="item.id" @click="navTo('/newsCenter/liangzihu/detail?id='+ item.id)">
 							<div class="title clamp ">
 								<span class="sj"></span>
 								{{ item.title }}
@@ -65,24 +65,27 @@
 		</div>
 		<div class="home-main1 flex">
 			<div class="home-join">
-				<item-title title="善行参与" :topath="'/donation'" isShow="0"></item-title>
-				<div class="join-main">
-					<div class="join-item" v-for="item in miniNavList1" @click="navTo(item.path)" :key="item.title">
-						<div class="logo hand"><img :src="item.image" /></div>
-						<div class="title hand">{{ item.title }}</div>
+				<item-title title="善行参与" :topath="'/join'" isShow="0"></item-title>
+				<div class="icon-wrapper">
+					<div class="join-main">
+						<div class="join-item" v-for="item in miniNavList1" @click="navTo(item.path)" :key="item.title">
+							<div class="logo hand"><img :src="item.image" /></div>
+							<div class="title hand">{{ item.title }}</div>
+						</div>
 					</div>
-				</div>
-				<div class="join-main">
-					<div class="join-item" v-for="item in miniNavList2" @click="navTo(item.path)" :key="item.title">
-						<div class="logo hand"><img :src="item.image" /></div>
-						<div class="title hand">{{ item.title }}</div>
+					<div class="join-main" style="padding-top: 15px;">
+						<div class="join-item" v-for="item in miniNavList2" @click="navTo(item.path)" :key="item.title">
+							<div class="logo hand"><img :src="item.image" /></div>
+							<div class="title hand">{{ item.title }}</div>
+						</div>
 					</div>
 				</div>
+				
 			</div>
 			<div class="home-open">
 				<item-title title="信息公示" :topath="'/publicity'"></item-title>
 				<div class="item-wrapper">
-					<div class="new-item hand" v-for="item in openNews" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+					<div class="new-item hand" v-for="item in openNews" :key="item.id" @click="navTo('/publicity/detail?id='+ item.id)">
 						<div class="title clamp ">
 							<span class="sj"></span>
 							{{ item.title }}
@@ -115,9 +118,9 @@
 				</div>
 			</div>
 			<div class="home-pub">
-				<item-title title="政策法规" :topath="'/publicity'"></item-title>
+				<item-title title="政策法规" :topath="'/newsCenter/laws'"></item-title>
 				<div class="item-wrapper">
-					<div class="new-item hand" v-for="item in regulationList" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+					<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 ">
 							<span class="sj"></span>
 							{{ item.title }}
@@ -157,17 +160,17 @@ export default {
 		return {
 			miniNavList1: [
 				{
-					path: '/donation/contribution',
+					path: '/join/contribution',
 					title: '爱心捐款',
 					image: require('@/assets/img/i1.png')
 				},
 				{
-					path: '/donation/organDonation',
+					path: '/join/organDonation',
 					title: '器官捐献',
 					image: require('@/assets/img/i2.png')
 				},
 				{
-					path: '/donation/Hpc',
+					path: '/join/Hpc',
 					title: '造血干细胞捐献',
 					image: require('@/assets/img/i3.png')
 				},
@@ -647,41 +650,44 @@ export default {
 				width: 588px;
 				height: 379px;
 				background: #FFFFFF;
-				.join-main {
-					padding: 29px 56px 0;
-					display: flex;
-					justify-content: space-between;
-					flex-wrap: wrap;
-					.join-item {
+
+					.join-main {
+						padding: 29px 56px 0;
 						display: flex;
-						flex-direction: column;
-						justify-content: center;
-						align-items: center;
-						margin-bottom: 14px;
-						font-size: 14px;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #323131;
-						line-height: 1;
-						.logo {
-							width: 84px;
-							height: 84px;
-							// border: 1px solid #dadada;
-							border-radius: 50%;
+						justify-content: space-between;
+						flex-wrap: wrap;
+						.join-item {
 							display: flex;
+							flex-direction: column;
 							justify-content: center;
 							align-items: center;
-							// margin-right: 47px;
-							img {
+							margin-bottom: 14px;
+							font-size: 14px;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #323131;
+							line-height: 1;
+							.logo {
 								width: 84px;
 								height: 84px;
+								// border: 1px solid #dadada;
+								border-radius: 50%;
+								display: flex;
+								justify-content: center;
+								align-items: center;
+								// margin-right: 47px;
+								img {
+									width: 84px;
+									height: 84px;
+								}
+							}
+							.title {
+								padding-top: 10px;
 							}
 						}
-						.title {
-							padding-top: 10px;
-						}
-					}
+					
 				}
+				
 			}
 			.home-open {
 				box-sizing: border-box;

src/views/Join.vue

@@ -15,9 +15,9 @@
 		data() {
 			return {
 				navList: [
-					{ index: 0, name: '我要捐款', path: '/donation/contribution' },
-					{ index: 1, name: '我要器官捐献', path: '/donation/organDonation' },
-					{ index: 2, name: '我要造血干细胞捐献', path: '/donation/Hpc' },
+					{ index: 0, name: '我要捐款', path: '/join/contribution' },
+					{ index: 1, name: '我要器官捐献', path: '/join/organDonation' },
+					{ index: 2, name: '我要造血干细胞捐献', path: '/join/Hpc' },
 					{ index: 3, name: '我要登记救护员', path: '/join/rescue' },
 					{ index: 4, name: '我要登记个人会员', path: '/join/member' },
 					{ index: 5, name: '我要登记志愿者', path: '/join/volunteer' },

src/views/News.vue

@@ -1,28 +0,0 @@
-<template>
-	<div class="news">
-		<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: '/news/list' },
-				{ index: 1, name: '鄂城区', path: '/publicity/list' },
-				{ index: 2, name: '华容区', path: '/regulations/list' },
-				{ index: 3, name: '梁子湖区', path: '/regulations/list' },
-				{ index: 4, name: '政策法规', path: '/regulations/list' },
-			]
-		};
-	}
-};
-</script>
-
-<style></style>

src/views/NewsCenter.vue

@@ -0,0 +1,31 @@
+<template>
+	<div class="news-center">
+		<!-- 444444 -->
+		<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: '/newsCenter/redNews' },
+				{ index: 1, name: '鄂城区', path: '/newsCenter/echeng' },
+				{ index: 2, name: '华容区', path: '/newsCenter/huarong' },
+				{ index: 3, name: '梁子湖区', path: '/newsCenter/liangzihu' },
+				{ index: 4, name: '政策法规', path: '/newsCenter/laws' },
+			]
+		};
+	}
+};
+</script>
+
+<style></style>

src/views/Publicity.vue

@@ -15,7 +15,7 @@
 		},
 		data() {
 			return {
-				navList: [{ index: 0, name: '红色新闻', path: '/news/list' }, { index: 1, name: '信息公示', path: '/publicity/list' },{index: 2, name: '政策法规', path: '/regulations/list'}],
+				navList: [{ index: 0, name: '信息公示', path: '/publicity' }],
 			};
 		}
 	};

src/views/about/ChineseRedCross.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/about/EzhouRedCross.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/about/RedCrossMovement.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/newsCenter/Echeng.vue

@@ -0,0 +1,11 @@
+<template>
+	<div class="echeng-news">
+		<router-view></router-view>
+	</div>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/newsCenter/Huarong.vue

@@ -0,0 +1,11 @@
+<template>
+	<div class="huarong-news">
+		<router-view></router-view>
+	</div>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/newsCenter/Laws.vue

@@ -0,0 +1,11 @@
+<template>
+	<div class="laws-news">
+		<router-view></router-view>
+	</div>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/newsCenter/Liangzihu.vue

@@ -0,0 +1,11 @@
+<template>
+	<div class="liangzihu-news">
+		<router-view></router-view>
+	</div>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/newsCenter/RedNews.vue

@@ -0,0 +1,11 @@
+<template>
+	<div class="red-news">
+		<router-view></router-view>
+	</div>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/news/Detail.vue → src/views/newsCenter/echeng/Detail.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-	import { details } from '../../request/api.js'
+	import { details } from '../../../request/api.js'
 	export default {
 		data() {
 			return {

src/views/newsCenter/echeng/List.vue

@@ -0,0 +1,91 @@
+<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="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>
+	</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
+			newsList({
+				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;
+				}
+			}
+		}
+		.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;
+			}
+		}
+	}
+}
+	/deep/ .el-pagination {
+		margin-top: 50px;
+		text-align: center;
+	}
+</style>

src/views/regulations/Detail.vue → src/views/newsCenter/huarong/Detail.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-	import { details } from '../../request/api.js'
+	import { details } from '../../../request/api.js'
 	export default {
 		data() {
 			return {
@@ -24,7 +24,6 @@
 			getContent() {
 				let obj = this
 				this.idd = this.$route.query.id
-				console.log(this.idd)
 				obj.getDetail()
 			},
 			getDetail() {

src/views/news/List.vue → src/views/newsCenter/huarong/List.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { loadIndexs, splist, loveList, friendList , newsList, openList } from '../../request/api.js';
+import { loadIndexs, splist, loveList, friendList , newsList, openList } from '../../../request/api.js';
 export default {
 	data() {
 		return {

src/views/newsCenter/laws/Detail.vue

@@ -0,0 +1,42 @@
+<template>
+	<div class="new-detail">
+		<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
+				obj.getDetail()
+			},
+			getDetail() {
+				let obj = this
+				details({},this.idd).then(res => {
+					console.log(res)
+					obj.content = res.data.content
+					console.log()
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

src/views/regulations/List.vue → src/views/newsCenter/laws/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('/regulations/detail?id='+ item.id)">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { loadIndexs, splist, loveList, friendList , newsList, openList , regulationList } from '../../request/api.js';
+import { loadIndexs, splist, loveList, friendList , newsList, openList } from '../../../request/api.js';
 export default {
 	data() {
 		return {
@@ -45,7 +45,7 @@ export default {
 		},
 		getList() {
 			let obj = this
-			regulationList({
+			newsList({
 				page: obj.page,
 				limit: obj.limit
 			}).then(res => {

src/views/newsCenter/liangzihu/Detail.vue

@@ -0,0 +1,42 @@
+<template>
+	<div class="new-detail">
+		<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
+				obj.getDetail()
+			},
+			getDetail() {
+				let obj = this
+				details({},this.idd).then(res => {
+					console.log(res)
+					obj.content = res.data.content
+					console.log()
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

src/views/newsCenter/liangzihu/List.vue

@@ -0,0 +1,100 @@
+<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="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>
+	</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
+		};
+	},
+	// filters: {
+	// 	time(val) {
+	// 		let date = new Date(val * 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();
+	// 		return Y + '-' + M + '-' + D;
+	// 	}
+	// },
+	created() {
+		this.getList()
+	},
+	methods:{
+		navTo(url) {
+			this.$router.push(url);
+		},
+		currentChange(e) {
+			console.log(e);
+			this.page = e
+			this.getList()
+		},
+		getList() {
+			let obj = this
+			newsList({
+				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;
+				}
+			}
+		}
+		.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;
+			}
+		}
+	}
+}
+	/deep/ .el-pagination {
+		margin-top: 50px;
+		text-align: center;
+	}
+</style>

src/views/newsCenter/redNews/Detail.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/newsCenter/redNews/List.vue

@@ -0,0 +1,95 @@
+<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="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>
+	</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;
+			}
+		}
+	}
+}
+	/deep/ .el-pagination {
+		margin-top: 50px;
+		text-align: center;
+	}
+</style>
+

src/views/publicity/List.vue

@@ -22,15 +22,6 @@ export default {
 			limit: 15
 		};
 	},
-	// filters: {
-	// 	time(val) {
-	// 		let date = new Date(val * 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();
-	// 		return Y + '-' + M + '-' + D;
-	// 	}
-	// },
 	created() {
 		this.getList()
 	},
@@ -78,6 +69,9 @@ export default {
 				}
 			}
 		}
+		&:last-of-type {
+			border-bottom: none;
+		}
 		.title {
 			width: 500px;
 			.title-icon {