9-28

src/components/leftNav/LeftNav.vue

@@ -66,7 +66,7 @@
 						title = '遗体及器官捐献'
 						break;
 					case '/join/rescue':
-						title = '救护员报名'
+						title = '成为“救在身边”志愿者'
 						break;
 					case '/join/member':
 						title = '会员入会登记'
@@ -90,6 +90,39 @@
 						title = '关于红十字运动'
 						break
 					case '/concat':
+						title = '信息公开'
+						break
+					case '/concat/publicity/list':
+						title = '公告公示'
+						break
+					case '/concat/publicity/detail':
+						title = '公告公示'
+						break
+					case '/concat/rules/list':
+						title = '规章制度'
+						break
+					case '/concat/rules/detail':
+						title = '规章制度'
+						break
+					case '/concat/finance/list':
+						title = '财务信息'
+						break
+					case '/concat/finance/detail':
+						title = '财务信息'
+						break
+					case '/concat/donation/list':
+						title = '社会捐赠信息'
+						break
+					case '/concat/donation/detail':
+						title = '社会捐赠信息'
+						break
+					case '/concat/expenditure/list':
+						title = '捐赠款物支出信息'
+						break
+					case '/concat/expenditure/detail':
+						title = '捐赠款物支出信息'
+						break
+					case '/concat/concat/detail':
 						title = '联系我们'
 						break
 					case '/popularScience/list':
@@ -105,10 +138,10 @@
 						title = '红会新闻'
 						break
 					case '/publicity/list':
-						title = '信息公示'
+						title = '公示公告'
 						break
 					case '/publicity/detail':
-						title = '信息公示'
+						title = '公示公告'
 						break
 					case '/regulations/detail':
 						title = '政策法规'
@@ -246,10 +279,10 @@
 						title = '志愿服务'
 						break
 					case '/cause/teenagers/detail':
-						title = '红十字青少年'
+						title = '红十字志愿服务和青少年'
 						break
 					case '/cause/teenagers/list':
-						title = '红十字青少年'
+						title = '红十字志愿服务和青少年'
 						break
 					default:
 						title = ''
@@ -314,7 +347,7 @@
 			background-color: #f2eeef;
 			justify-content: space-between;
 			line-height: 50px;
-			padding: 0 37px 0 26px;
+			padding: 0 20px 0 26px;
 
 			.item-name {
 				font-size: 16px;
@@ -345,7 +378,10 @@
 
 		.title {
 			border: 2px #d82020 solid;
-			width: 180px;
+			// width: 200px;
+			min-width: 180px;
+			display: inline-block;
+			padding: 0 10px;
 			height: 50px;
 			line-height: 50px;
 			text-align: center;

src/components/navBar/NavBar.vue

@@ -33,7 +33,7 @@
 
 					{
 						path: '/cause',
-						title: '红十字事业',
+						title: '业务工作',
 						imgUrl: require('@/assets/img/n1.png')
 					},
 					{
@@ -54,7 +54,7 @@
 					},
 					{
 						path: '/concat',
-						title: '联系我们',
+						title: '信息公开',
 						imgUrl: require('@/assets/img/n5.png'),
 					},
 				],

src/router.js

@@ -148,8 +148,165 @@ export default new Router({
 		name: 'concat',
 		component: () => import('./views/Concat.vue'),
 		meta: {
-			title: '联系我们'
-		}
+			title: '信息公开'
+		},
+		redirect: '/concat/publicity',
+		children: [
+			{
+				path: 'publicity',
+				name: 'publicity',
+				component: () => import('./views/concat/Publicity.vue'),
+				meta: {
+					title: '公告公示'
+				},
+				redirect: '/concat/publicity/list',
+				children: [
+					{
+						path: 'list',
+						name: 'publicityList',
+						component: () => import('./views/concat/publicity/List.vue'),
+						meta: {
+							title: '公告公示'
+						}
+					},
+					{
+						path: 'detail',
+						name: 'rescuedetail',
+						component: () => import('./views/concat/publicity/Detail.vue'),
+						meta: {
+							title: '公告公示'
+						}
+					}
+				]
+			},
+			{
+				path: 'rules',
+				name: 'rules',
+				component: () => import('./views/concat/Rules.vue'),
+				meta: {
+					title: '规章制度'
+				},
+				redirect: '/concat/rules/list',
+				children: [
+					{
+						path: 'list',
+						name: 'rulesList',
+						component: () => import('./views/concat/rules/List.vue'),
+						meta: {
+							title: '规章制度'
+						}
+					},
+					{
+						path: 'detail',
+						name: 'rescuedetail',
+						component: () => import('./views/concat/rules/Detail.vue'),
+						meta: {
+							title: '规章制度'
+						}
+					}
+				]
+			},
+			{
+				path: 'finance',
+				name: 'finance',
+				component: () => import('./views/concat/Finance.vue'),
+				meta: {
+					title: '财务信息'
+				},
+				redirect: '/concat/finance/list',
+				children: [
+					{
+						path: 'list',
+						name: 'financeList',
+						component: () => import('./views/concat/finance/List.vue'),
+						meta: {
+							title: '财务信息'
+						}
+					},
+					{
+						path: 'detail',
+						name: 'financedetail',
+						component: () => import('./views/concat/finance/Detail.vue'),
+						meta: {
+							title: '财务信息'
+						}
+					}
+				]
+			},
+			{
+				path: 'donation',
+				name: 'donation',
+				component: () => import('./views/concat/Donation.vue'),
+				meta: {
+					title: '社会捐赠信息'
+				},
+				redirect: '/concat/donation/list',
+				children: [
+					{
+						path: 'list',
+						name: 'donationList',
+						component: () => import('./views/concat/donation/List.vue'),
+						meta: {
+							title: '社会捐赠信息'
+						}
+					},
+					{
+						path: 'detail',
+						name: 'donationdetail',
+						component: () => import('./views/concat/donation/Detail.vue'),
+						meta: {
+							title: '社会捐赠信息'
+						}
+					}
+				]
+			},
+			{
+				path: 'expenditure',
+				name: 'expenditure',
+				component: () => import('./views/concat/Expenditure.vue'),
+				meta: {
+					title: '捐赠款物支出信息'
+				},
+				redirect: '/concat/expenditure/list',
+				children: [
+					{
+						path: 'list',
+						name: 'expenditureList',
+						component: () => import('./views/concat/expenditure/List.vue'),
+						meta: {
+							title: '捐赠款物支出信息'
+						}
+					},
+					{
+						path: 'detail',
+						name: 'expenditureDetail',
+						component: () => import('./views/concat/expenditure/Detail.vue'),
+						meta: {
+							title: '捐赠款物支出信息'
+						}
+					}
+				]
+			},
+			{
+				path: 'concat',
+				name: 'concat',
+				component: () => import('./views/concat/Expenditure.vue'),
+				meta: {
+					title: '联系我们'
+				},
+				redirect: '/concat/concat/detail',
+				children: [
+					{
+						path: 'detail',
+						name: 'concatDetail',
+						component: () => import('./views/concat/concat/Detail.vue'),
+						meta: {
+							title: '联系我们'
+						}
+					}
+				]
+			}
+		]
 	},
 	{
 		path: '/knowledge',
@@ -502,7 +659,7 @@ export default new Router({
 		name: 'cause',
 		component: () => import('./views/Cause.vue'),
 		meta: {
-			title: '红十字事业'
+			title: '业务工作'
 		},
 		redirect: '/cause/rescue',
 		children: [
@@ -673,7 +830,7 @@ export default new Router({
 				name: 'teenagers',
 				component: () => import('./views/cause/Teenagers.vue'),
 				meta: {
-					title: '红十字青少年'
+					title: '红十字志愿服务和青少年'
 				},
 				redirect: '/cause/teenagers/list',
 				children: [
@@ -682,7 +839,7 @@ export default new Router({
 						name: 'teenagersList',
 						component: () => import('./views/cause/teenagers/List.vue'),
 						meta: {
-							title: '红十字青少年'
+							title: '红十字志愿服务和青少年'
 						}
 					},
 					{
@@ -690,7 +847,7 @@ export default new Router({
 						name: 'teenagersdetail',
 						component: () => import('./views/cause/teenagers/Detail.vue'),
 						meta: {
-							title: '红十字青少年'
+							title: '红十字志愿服务和青少年'
 						}
 					}
 				]
@@ -783,7 +940,7 @@ export default new Router({
 		name: 'publicity',
 		component: () => import('./views/Publicity.vue'),
 		meta: {
-			title: '信息公示'
+			title: '公示公告'
 		},
 		redirect: '/publicity/list',
 		children: [
@@ -792,7 +949,7 @@ export default new Router({
 				name: 'publicitylist',
 				component: () => import('./views/publicity/List.vue'),
 				meta: {
-					title: '信息公示'
+					title: '公示公告'
 				}
 			},
 			{
@@ -800,7 +957,7 @@ export default new Router({
 				name: 'publicitydetail',
 				component: () => import('./views/publicity/Detail.vue'),
 				meta: {
-					title: '信息公示'
+					title: '公示公告'
 				}
 			}
 		]

src/views/Concat.vue

@@ -1,184 +1,15 @@
 <template>
-  <div class="about">
-    <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.uid"
-          :class="{ action: currentIndex == item.uid }"
-          @click="navClick(item.uid)"
-        >
-          <!-- :class="{'action': currentUrl.indexOf(item.path) !== -1 }"> -->
-          <div class="item-name">
-            {{ item.name }}
-          </div>
-          <div class="item-icon">></div>
-        </div>
-      </div>
-      <div class="right-content">
-        <!-- <div class="title moren" v-if="isShow">
-					{{rightTitle}}
-				</div> -->
-        <div style="padding: 35px 50px 35px 50px" class="line">
-          <div class="new-detail">
-            <div class="content" v-html="content"></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+	<div class="concat">
+		<router-view></router-view>
+	</div>
 </template>
 
 <script>
-import LeftNav from "../components/leftNav/LeftNav.vue";
-import { details, getArticleList, getArtList } from "../request/api.js";
-export default {
-  components: {
-    LeftNav,
-  },
-  data() {
-    return {
-      content: "",
-      currentIndex: "",
-      rightTitle: "",
-      navList: [
-        // { index: 0, name: '关于中国红十字会', path: '/about/chineseRedCross' },
-        // { index: 1, name: '中国红十字会法', path: '/about/redCrossLaw' },
-        // { index: 2, name: '关于红十字运动', path: '/about/redCrossMovement' },
-        // // 第十届监事会监事长名单
-        // { index: 3, name: '第十届监事会监事长名单', path: '/about/matrix' },
-      ],
-    };
-  },
-  computed: {
-    navHeight() {
-      return this.navList.length * 51 + 52 + "px";
-    },
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    getList() {
-      let that = this;
-      getArtList({
-        ifyid: 27,
-        // page: obj.page,
-        // limit: obj.limit,
-        // key: keyword,
-      })
-        .then(({ data }) => {
-          // console.log(data)
-          let arr = data.list.reverse();
-          arr.forEach((item) => {
-            let obj = {};
-            obj.name = item.title;
-            obj.uid = item.id;
-            that.navList.push(obj);
-            // console.log(that.navList,'55555')
-          });
-          this.navClick(arr[0].id);
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    },
-    navClick(id) {
-      this.currentIndex = id;
-      details({}, id).then(({ data }) => {
-        this.content = data.content;
-      });
-    },
-  },
-};
+	export default {
+		components: {
+		},
+	};
 </script>
 
-<style lang="scss" scoped>
-.wrapper {
-  width: 1200px;
-  display: flex;
-  justify-content: space-between;
-}
-
-.left-nav {
-  width: 265px;
-  // height: 154px;
-  box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
-
-  .nav-title {
-    height: 52px;
-    background-color: #d82020;
-    line-height: 52px;
-    text-align: center;
-    font-size: 18px;
-    font-family: PingFang SC;
-    font-weight: bold;
-    color: #ffffff;
-    letter-spacing: 3px;
-    cursor: default;
-  }
-
-  .nav-item {
-    cursor: pointer;
-    border-top: 1px #fcfbfb solid;
-    display: flex;
-    height: 50px;
-    background-color: #f2eeef;
-    justify-content: space-between;
-    line-height: 50px;
-    padding: 0 37px 0 26px;
-
-    .item-name {
-      font-size: 16px;
-      font-family: PingFang SC;
-      font-weight: bold;
-      color: #333333;
-      letter-spacing: 1px;
-    }
-
-    .item-icon {
-      font-size: 16px;
-      font-family: PingFang SC;
-      font-weight: bold;
-      color: #999999;
-    }
-  }
-
-  .action {
-    background-color: #f7dfdf;
-  }
-}
-
-.right-content {
-  width: 915px;
-  min-height: 706px;
-  border-top: 2px solid #d82020;
-  box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
-
-  .title {
-    border: 2px #d82020 solid;
-    width: 156px;
-    height: 50px;
-    line-height: 50px;
-    text-align: center;
-    background: #d82020;
-    font-size: 18px;
-    font-family: PingFang SC;
-    font-weight: bold;
-    color: #ffffff;
-    position: relative;
-    top: -2px;
-  }
-
-  .action {
-    background: #ffffff;
-    color: #d82020;
-  }
-}
-
-.line {
-  line-height: 1.5;
-}
-</style>
+<style>
+</style>

src/views/Home.vue

@@ -10,7 +10,7 @@
 		<div class="news-wrapper">
 			<div class="new-pic">
 				<el-carousel :interval="4000" height="344px" indicator-position="none">
-					<el-carousel-item v-for="(item, index) in redNews.slice(0, 3)" :key="index">
+					<el-carousel-item v-for="(item, index) in redNews.slice(0, 5)" :key="index">
 						<img :src="item.image" @click="navTo('/news/detail?id=' + item.id)" class="hand" />
 						<div class="title clamp hand">{{ item.title }}</div>
 					</el-carousel-item>
@@ -33,10 +33,10 @@
 		<div class="home-body">
 			<div class="body-left moren">
 				<div class="red-new">
-					<item-title title="信息公示" :topath="'/publicity'"></item-title>
+					<item-title title="公示公告" :topath="'/concat/publicity'"></item-title>
 					<div class="item-wrapper">
 						<div class="new-item hand" v-for="item in openNews" :key="item.id"
-							@click="navTo('/publicity/detail?id=' + item.id)">
+							@click="navTo('/concat/publicity/detail?id=' + item.id)">
 							<div class="title clamp">
 								<span></span>
 								{{ item.title }}
@@ -77,9 +77,9 @@
 				<div class="list">
 					<item-title title="爱心榜" :topath="'/loveList'"></item-title>
 					<div class="list-title flex">
-						<div>捐献时间</div>
-						<div>捐献者</div>
-						<div>捐献金额</div>
+						<div>捐赠时间</div>
+						<div>捐赠者</div>
+						<div>捐赠金额</div>
 						<!-- <div>捐献意向</div> -->
 					</div>
 

src/views/Join.vue

@@ -22,7 +22,7 @@
 					{ index: 3, name: '会员入会登记', path: '/join/member' },
 					{ index: 4, name: '志愿者报名', path: '/join/volunteer' },
 					{ index: 5, name: '普及培训报名', path: '/join/train' },
-					{ index: 6, name: '加入救在身边志愿者', path: '/join/rescue' },
+					{ index: 6, name: '成为“救在身边”志愿者', path: '/join/rescue' },
 				],
 				rightTitle: '志愿者报名',
 			}

src/views/Law.vue

@@ -72,7 +72,7 @@ export default {
 			// 8
 			getArtList({ifyid: 8}).then(({data}) => {
 				// console.log(data)
-				let arr = data.list.reverse()
+				let arr = data.list
 				arr.forEach(item => {
 					let obj = {}
 					obj.name = item.title
@@ -81,7 +81,8 @@ export default {
 					that.navList.push(obj)
 					// console.log(that.navList,'55555')
 				})
-				that.navList = that.navList.sort(this.compare('ps'))
+				// that.navList = that.navList.sort(this.compare('ps'))
+				 that.navList = that.navList
 				this.navClick(that.navList[0].uid)
 			}).catch( err => {
 				console.log(err)

src/views/LoveList.vue

@@ -1,22 +1,22 @@
 <template>
 	<div class="love-list">
 		<div class="search">
-			<input type="text" v-model="keyword" placeholder="请输入捐献者进行搜索" class="" @keyup.enter="getLiveList(keyword)" />
+			<input type="text" v-model="keyword" placeholder="请输入捐赠者进行搜索" class="" @keyup.enter="getLiveList(keyword)" />
 			<img src="../assets/img/search.png" class="hand" @click="getLiveList(keyword)">
 		</div>
 		<div class="list-title flex">
-			<div style="width: 350px">捐献时间</div>
-			<div style="width: 500px">捐献者</div>
-			<div style="width: 350px">捐献金额</div>
-			<!-- <div  style="width: 356px">捐献意向</div>
-			<div  style="width: 133px">备注</div> -->
+			<div style="width: 350px">捐赠时间</div>
+			<div style="width: 500px">捐赠者</div>
+			<div style="width: 350px">捐赠金额</div>
+			<div  style="width: 356px">捐赠意向</div>
+			<!-- <div  style="width: 133px">备注</div> -->
 		</div>
 		<div class="list-item flex" v-for="(item, index) in tableData" :key="index">
 			<div class="clamp" style="width: 350px">{{item.paytime | getTime}}</div>
 			<div class="clamp" style="width: 500px">{{item.name || item.contact}}</div>
 			<div class="clamp" style="width: 350px">{{item.amount + '元'}}</div>
-			<!-- <div class="clamp" style="width: 356px">{{item.intention}}</div>
-			<div class="clamp" style="width: 133px">{{item.mask}}</div> -->
+			<div class="clamp" style="width: 356px">{{item.order_name}}</div>
+			<!-- <div class="clamp" style="width: 133px">{{item.mask}}</div> -->
 		</div>
 		<div class="table-empty" v-if="tableData.length == 0">
 			暂无更多捐赠数据

src/views/News.vue

@@ -15,7 +15,7 @@
 		},
 		data() {
 			return {
-				navList: [{ index: 0, name: '红会新闻', path: '/news' }, { index: 1, name: '信息公示', path: '/publicity' }],
+				navList: [{ index: 0, name: '红会新闻', path: '/news' }],
 			};
 		}
 	};

src/views/Publicity.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="publicity">
-		<left-nav :navList="navList" :topTitle="'信息公示'">
+		<left-nav :navList="navList" :topTitle="'公示公告'">
 			<router-view></router-view>
 		</left-nav>
 	</div>
@@ -15,7 +15,7 @@
 		},
 		data() {
 			return {
-				navList: [{ index: 0, name: '红会新闻', path: '/news' }, { index: 1, name: '信息公示', path: '/publicity' }],
+				navList: [{ index: 0, name: '红会新闻', path: '/news' }, { index: 1, name: '公示公告', path: '/publicity' }],
 			};
 		}
 	};

src/views/cause/Cells.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="news">
-		<left-nav :navList="navList" :topTitle="'红十字事业'">
+		<left-nav :navList="navList" :topTitle="'业务工作'">
 			<router-view></router-view>
 		</left-nav>
 	</div>
@@ -47,14 +47,14 @@
 					},
 					{
 						index: 6,
-						name: '红十字青少年',
+						name: '红十字志愿服务和青少年',
 						path: '/cause/teenagers'
 					},
-					{
-						index: 7,
-						name: '志愿服务',
-						path: '/cause/service'
-					}
+					// {
+					// 	index: 7,
+					// 	name: '志愿服务',
+					// 	path: '/cause/service'
+					// }
 				],
 			};
 		}

src/views/cause/Emergency.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="news">
-		<left-nav :navList="navList" :topTitle="'红十字事业'">
+		<left-nav :navList="navList" :topTitle="'业务工作'">
 			<router-view></router-view>
 		</left-nav>
 	</div>
@@ -47,14 +47,14 @@
 					},
 					{
 						index: 6,
-						name: '红十字青少年',
+						name: '红十字志愿服务和青少年',
 						path: '/cause/teenagers'
 					},
-					{
-						index: 7,
-						name: '志愿服务',
-						path: '/cause/service'
-					}
+					// {
+					// 	index: 7,
+					// 	name: '志愿服务',
+					// 	path: '/cause/service'
+					// }
 				],
 			};
 		}

src/views/cause/Free.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="news">
-		<left-nav :navList="navList" :topTitle="'红十字事业'">
+		<left-nav :navList="navList" :topTitle="'业务工作'">
 			<router-view></router-view>
 		</left-nav>
 	</div>
@@ -47,14 +47,14 @@
 					},
 					{
 						index: 6,
-						name: '红十字青少年',
+						name: '红十字志愿服务和青少年',
 						path: '/cause/teenagers'
 					},
-					{
-						index: 7,
-						name: '志愿服务',
-						path: '/cause/service'
-					}
+					// {
+					// 	index: 7,
+					// 	name: '志愿服务',
+					// 	path: '/cause/service'
+					// }
 				],
 			};
 		}

src/views/cause/Humanity.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="news">
-		<left-nav :navList="navList" :topTitle="'红十字事业'">
+		<left-nav :navList="navList" :topTitle="'业务工作'">
 			<router-view></router-view>
 		</left-nav>
 	</div>
@@ -47,14 +47,14 @@
 					},
 					{
 						index: 6,
-						name: '红十字青少年',
+						name: '红十字志愿服务和青少年',
 						path: '/cause/teenagers'
 					},
-					{
-						index: 7,
-						name: '志愿服务',
-						path: '/cause/service'
-					}
+					// {
+					// 	index: 7,
+					// 	name: '志愿服务',
+					// 	path: '/cause/service'
+					// }
 				],
 			};
 		}

src/views/cause/Remains.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="news">
-		<left-nav :navList="navList" :topTitle="'红十字事业'">
+		<left-nav :navList="navList" :topTitle="'业务工作'">
 			<router-view></router-view>
 		</left-nav>
 	</div>
@@ -47,14 +47,14 @@
 					},
 					{
 						index: 6,
-						name: '红十字青少年',
+						name: '红十字志愿服务和青少年',
 						path: '/cause/teenagers'
 					},
-					{
-						index: 7,
-						name: '志愿服务',
-						path: '/cause/service'
-					}
+					// {
+					// 	index: 7,
+					// 	name: '志愿服务',
+					// 	path: '/cause/service'
+					// }
 				],
 			};
 		}

src/views/cause/Rescue.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="news">
-		<left-nav :navList="navList" :topTitle="'红十字事业'">
+		<left-nav :navList="navList" :topTitle="'业务工作'">
 			<router-view></router-view>
 		</left-nav>
 	</div>
@@ -47,14 +47,14 @@
 					},
 					{
 						index: 6,
-						name: '红十字青少年',
+						name: '红十字志愿服务和青少年',
 						path: '/cause/teenagers'
 					},
-					{
-						index: 7,
-						name: '志愿服务',
-						path: '/cause/service'
-					}
+					// {
+					// 	index: 7,
+					// 	name: '志愿服务',
+					// 	path: '/cause/service'
+					// }
 				],
 			};
 		}

src/views/cause/Service.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="news">
-		<left-nav :navList="navList" :topTitle="'红十字事业'">
+		<left-nav :navList="navList" :topTitle="'业务工作'">
 			<router-view></router-view>
 		</left-nav>
 	</div>
@@ -47,14 +47,14 @@
 					},
 					{
 						index: 6,
-						name: '红十字青少年',
+						name: '红十字志愿服务和青少年',
 						path: '/cause/teenagers'
 					},
-					{
-						index: 7,
-						name: '志愿服务',
-						path: '/cause/service'
-					}
+					// {
+					// 	index: 7,
+					// 	name: '志愿服务',
+					// 	path: '/cause/service'
+					// }
 				],
 			};
 		}

src/views/cause/Teenagers.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="news">
-		<left-nav :navList="navList" :topTitle="'红十字事业'">
+		<left-nav :navList="navList" :topTitle="'业务工作'">
 			<router-view></router-view>
 		</left-nav>
 	</div>
@@ -47,14 +47,14 @@
 					},
 					{
 						index: 6,
-						name: '红十字青少年',
+						name: '红十字志愿服务和青少年',
 						path: '/cause/teenagers'
 					},
-					{
-						index: 7,
-						name: '志愿服务',
-						path: '/cause/service'
-					}
+					// {
+					// 	index: 7,
+					// 	name: '志愿服务',
+					// 	path: '/cause/service'
+					// }
 				],
 			};
 		}

src/views/concat/Donation.vue

@@ -0,0 +1,15 @@
+<template>
+	<bases></bases>
+</template>
+
+<script>
+	import bases from './common/base.vue'
+	export default {
+		components: {
+			bases
+		}
+	}
+</script>
+
+<style>
+</style>

src/views/concat/Expenditure.vue

@@ -0,0 +1,15 @@
+<template>
+	<bases></bases>
+</template>
+
+<script>
+	import bases from './common/base.vue'
+	export default {
+		components: {
+			bases
+		}
+	}
+</script>
+
+<style>
+</style>

src/views/concat/Finance.vue

@@ -0,0 +1,15 @@
+<template>
+	<bases></bases>
+</template>
+
+<script>
+	import bases from './common/base.vue'
+	export default {
+		components: {
+			bases
+		}
+	}
+</script>
+
+<style>
+</style>

src/views/concat/Publicity.vue

@@ -0,0 +1,15 @@
+<template>
+	<bases></bases>
+</template>
+
+<script>
+	import bases from './common/base.vue'
+	export default {
+		components: {
+			bases
+		},
+	}
+</script>
+
+<style>
+</style>

src/views/concat/Rules.vue

@@ -0,0 +1,15 @@
+<template>
+	<bases></bases>
+</template>
+
+<script>
+	import bases from './common/base.vue'
+	export default {
+		components: {
+			bases
+		},
+	}
+</script>
+
+<style>
+</style>

src/views/concat/common/base.vue

@@ -0,0 +1,51 @@
+<template>
+	<div class="news">
+		<left-nav :navList="navList" :topTitle="'信息公开'">
+			<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: '/concat/publicity'
+				}, {
+					index: 1,
+					name: '规章制度',
+					path: '/concat/rules'
+				}, {
+					index: 2,
+					name: '财务信息',
+					path: '/concat/finance'
+				},{
+					index: 3,
+					name: '社会捐赠信息',
+					path: '/concat/donation'
+				},
+				{
+					index: 4,
+					name: '捐赠款物支出信息',
+					path: '/concat/expenditure'
+				},
+				{
+					index: 5,
+					name: '联系我们',
+					path: '/concat/concat'
+				}],
+			};
+		}
+	};
+</script>
+
+<style>
+</style>

src/views/concat/common/slist.vue

@@ -0,0 +1,185 @@
+<template>
+	<div class="new-list">
+		<div class="serch-wrapper">
+			<div class="search">
+				<input type="text" v-model="keyword" placeholder="请输入内容进行搜索" class="" @keyup.enter="getList(keyword)" />
+				<img src="../../../assets/img/search.png" class="hand" @click="getList(keyword)">
+			</div>
+		</div>
+		<div class="empty" v-if="newList.length == 0">
+			暂无数据
+		</div>
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo(item.url?item.url:( path+ '/detail?id='+ item.id))">
+			<div class="title clamp">
+				<span class="title-icon"></span>
+				{{ item.title }}
+			</div>
+			<div class="time">{{ item.releasetime | time }}</div>
+		</div>
+		<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 { getArtList } from '../../../request/api.js';
+export default {
+	props: {
+		path: {
+			type: String,
+			default: ''
+		},
+		cid: {
+			type: Number,
+			default: 0
+		}
+	},
+	data() {
+		return {
+			newList: [],
+			total: 0,
+			page: 1,
+			limit: 15,
+			keyword: ''
+		};
+	},
+	filters: {
+		time(val) {
+			let arr = val.split(' ')
+			let str = arr[0]
+			str = str.replace(/-/g, '.')
+			return str
+		}
+	},
+	created() {
+		this.getList()
+	},
+	methods:{
+		navTo(url) {
+			if(url.indexOf('http') != -1) {
+				window.open(url)
+			}else {
+				this.$router.push(url);
+			}
+		},
+		currentChange(e) {
+			this.page = e
+			// console.log(this.page)
+			this.getList()
+		},
+		getList(keyword) {
+			let obj = this
+			if (keyword) {
+				obj.page = 1
+			}
+			getArtList({
+					 ifyid: obj.cid,
+					page: obj.page,
+					limit: obj.limit,
+					key: obj.keyword
+				}).then(res => {
+				obj.newList = res.data.list
+				obj.total = res.data.count
+			})
+		},
+		compare(attribute) {
+			return function(obj1, obj2) {
+				var val1 = obj1[attribute];
+				var val2 = obj2[attribute];
+				if (val1 < val2) {
+					return 1;
+				} else if (val1 > val2) {
+					return -1;
+				} else {
+					return 0;
+				}
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.new-list {
+	position: relative;
+	.empty {
+		text-align: center;
+		color: #999;
+		height: 400px;
+		line-height: 400px;
+	}
+	
+	.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;
+	}
+	.serch-wrapper {
+		display: flex;
+		height: 33px;
+		position: absolute;
+		top: -80px;
+		right: -50px;
+	
+		.search {
+	
+			padding-left: 13px;
+			padding-right: 13px;
+			width: 295px;
+			height: 33px;
+			line-height: 33px;
+			background: #FFFFFF;
+			border: 1px solid #CCCCCC;
+			border-radius: 10px;
+			// margin-bottom: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			input {
+				width: 235px;
+				font-size: 16px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				outline: none;
+				border: none;
+			}
+	
+			img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	}
+</style>

src/views/concat/concat/Detail.vue

@@ -0,0 +1,40 @@
+<template>
+	<div class="new-detail">
+		<dcontent :content="content"></dcontent>
+	</div>
+</template>
+
+<script>
+	import { details } from '../../../request/api.js'
+	export default {
+		data() {
+			return {
+				content: '',
+				detail: {},
+				idd:0
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods:{
+			getContent() {
+				let obj = this
+				this.idd = 	1920
+				obj.getDetail()
+			},
+			getDetail() {
+				let obj = this
+				details({},this.idd).then(res => {
+					obj.content = res.data.content
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+.content-img {
+	max-width: 100%;
+}
+</style>

src/views/concat/donation/Detail.vue

@@ -0,0 +1,40 @@
+<template>
+	<div class="new-detail">
+		<dcontent :content="content"></dcontent>
+	</div>
+</template>
+
+<script>
+	import { details } from '../../../request/api.js'
+	export default {
+		data() {
+			return {
+				content: '',
+				detail: {},
+				idd:0
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods:{
+			getContent() {
+				let obj = this
+				this.idd = this.$route.query.id
+				obj.getDetail()
+			},
+			getDetail() {
+				let obj = this
+				details({},this.idd).then(res => {
+					obj.content = res.data.content
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+.content-img {
+	max-width: 100%;
+}
+</style>

src/views/concat/donation/List.vue

@@ -0,0 +1,21 @@
+<template>
+	<slist :path="path" :cid="cid"></slist>
+</template>
+
+<script>
+	import slist from '../common/slist.vue'
+export default {
+	components: {
+		slist
+	},
+	data() {
+		return {
+			cid: 65,
+			path: '/concat/donation',
+		};
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/concat/expenditure/Detail.vue

@@ -0,0 +1,40 @@
+<template>
+	<div class="new-detail">
+		<dcontent :content="content"></dcontent>
+	</div>
+</template>
+
+<script>
+	import { details } from '../../../request/api.js'
+	export default {
+		data() {
+			return {
+				content: '',
+				detail: {},
+				idd:0
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods:{
+			getContent() {
+				let obj = this
+				this.idd = this.$route.query.id
+				obj.getDetail()
+			},
+			getDetail() {
+				let obj = this
+				details({},this.idd).then(res => {
+					obj.content = res.data.content
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+.content-img {
+	max-width: 100%;
+}
+</style>

src/views/concat/expenditure/List.vue

@@ -0,0 +1,21 @@
+<template>
+	<slist :path="path" :cid="cid"></slist>
+</template>
+
+<script>
+	import slist from '../common/slist.vue'
+export default {
+	components: {
+		slist
+	},
+	data() {
+		return {
+			cid: 66,
+			path: '/concat/donation',
+		};
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/concat/finance/Detail.vue

@@ -0,0 +1,40 @@
+<template>
+	<div class="new-detail">
+		<dcontent :content="content"></dcontent>
+	</div>
+</template>
+
+<script>
+	import { details } from '../../../request/api.js'
+	export default {
+		data() {
+			return {
+				content: '',
+				detail: {},
+				idd:0
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods:{
+			getContent() {
+				let obj = this
+				this.idd = this.$route.query.id
+				obj.getDetail()
+			},
+			getDetail() {
+				let obj = this
+				details({},this.idd).then(res => {
+					obj.content = res.data.content
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+.content-img {
+	max-width: 100%;
+}
+</style>

src/views/concat/finance/List.vue

@@ -0,0 +1,21 @@
+<template>
+	<slist :path="path" :cid="cid"></slist>
+</template>
+
+<script>
+	import slist from '../common/slist.vue'
+export default {
+	components: {
+		slist
+	},
+	data() {
+		return {
+			cid: 64,
+			path: '/concat/finance',
+		};
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/concat/publicity/Detail.vue

@@ -0,0 +1,40 @@
+<template>
+	<div class="new-detail">
+		<dcontent :content="content"></dcontent>
+	</div>
+</template>
+
+<script>
+	import { details } from '../../../request/api.js'
+	export default {
+		data() {
+			return {
+				content: '',
+				detail: {},
+				idd:0
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods:{
+			getContent() {
+				let obj = this
+				this.idd = this.$route.query.id
+				obj.getDetail()
+			},
+			getDetail() {
+				let obj = this
+				details({},this.idd).then(res => {
+					obj.content = res.data.content
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+.content-img {
+	max-width: 100%;
+}
+</style>

src/views/concat/publicity/List.vue

@@ -0,0 +1,21 @@
+<template>
+	<slist :path="path" :cid="cid"></slist>
+</template>
+
+<script>
+	import slist from '../common/slist.vue'
+export default {
+	components: {
+		slist
+	},
+	data() {
+		return {
+			cid: 6,
+			path: '/concat/publicity',
+		};
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/concat/rules/Detail.vue

@@ -0,0 +1,40 @@
+<template>
+	<div class="new-detail">
+		<dcontent :content="content"></dcontent>
+	</div>
+</template>
+
+<script>
+	import { details } from '../../../request/api.js'
+	export default {
+		data() {
+			return {
+				content: '',
+				detail: {},
+				idd:0
+			}
+		},
+		created() {
+			this.getContent()
+		},
+		methods:{
+			getContent() {
+				let obj = this
+				this.idd = this.$route.query.id
+				obj.getDetail()
+			},
+			getDetail() {
+				let obj = this
+				details({},this.idd).then(res => {
+					obj.content = res.data.content
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+.content-img {
+	max-width: 100%;
+}
+</style>

src/views/concat/rules/List.vue

@@ -0,0 +1,21 @@
+<template>
+	<slist :path="path" :cid="cid"></slist>
+</template>
+
+<script>
+	import slist from '../common/slist.vue'
+export default {
+	components: {
+		slist
+	},
+	data() {
+		return {
+			cid: 63,
+			path: '/concat/rules',
+		};
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+</style>