2312970463@qq.com 4 سال پیش
والد
کامیت
2295d28d76

+ 3 - 0
src/assets/css/base.css

@@ -25,3 +25,6 @@ html {
 .moren {
 	cursor: default;
 }
+.content-img {
+	max-width: 100%;
+}

+ 1 - 1
src/router.js

@@ -29,7 +29,7 @@ export default new Router({
       name: 'home',
       component: () => import('./views/Home.vue'),
       meta: {
-        title: '首页'
+        title: '荆州市红十字会'
       }
     },
 	{

+ 12 - 5
src/views/Home.vue

@@ -20,7 +20,7 @@
 							<span></span>
 							{{ item.title }}
 						</div>
-						<div class="time">{{ item.add_time }}</div>
+						<div class="time">{{ item.release_time?item.release_time:item.add_time | time }}</div>
 					</div>
 				</div>
 			</div>
@@ -37,7 +37,7 @@
 								<span></span>
 								{{ item.title }}
 							</div>
-							<div class="time">{{ item.add_time }}</div>
+							<div class="time">{{ item.release_time?item.release_time:item.add_time | time }}</div>
 						</div>
 					</div>
 				</div>
@@ -49,14 +49,14 @@
 								<span></span>
 								{{ item.title }}
 							</div>
-							<div class="time">{{ item.add_time}}</div>
+							<div class="time">{{ item.release_time?item.release_time:item.add_time | time}}</div>
 						</div>
 					</div>
 				</div>
 			</div>
 			<div class="body-right">
 				<div class="join">
-					<item-title title="善行参与" :topath="'/donation'"></item-title>
+					<item-title title="公众参与" :topath="'/donation'"></item-title>
 					<div class="join-main">
 						<div class="join-item" v-for="item in miniNavList" @click="navTo(item.path)" :key="item.title">
 							<div class="logo hand"><img :src="item.image" /></div>
@@ -77,7 +77,7 @@
 		</div>
 		<img src="../assets/img/m2.png" class="show-live" />
 		<div class="show-pic">
-			<item-title title="图片展示" isShow="2"></item-title>
+			<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>
@@ -164,6 +164,12 @@ export default {
 			let M = date.getMonth() +1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
 			let D = date.getDate() < 10 ? '0' + date.getDay() : date.getDate();
 			return Y + '.' + M + '.' + D;
+		},
+		time(val) {
+			let arr = val.split(' ')
+			let str = arr[0]
+			str = str.replace(/-/g, '.')
+			return str
 		}
 	},
 	computed:{
@@ -258,6 +264,7 @@ export default {
 				limit: 9
 			}).then(res => {
 				obj.openNews = res.data.list
+				console.log(obj.openNews)
 			})
 		},
 		getSwiperList() {

+ 1 - 0
src/views/news/Detail.vue

@@ -29,6 +29,7 @@
 				let obj = this
 				details({},this.idd).then(res => {
 					obj.content = res.data.content
+					obj.content = obj.content.replace(/<img/g, '<img class="content-img"')
 				})
 			}
 		}

+ 9 - 10
src/views/news/List.vue

@@ -5,7 +5,7 @@
 				<span class="title-icon"></span>
 				{{ item.title }}
 			</div>
-			<div class="time">{{ item.add_time }}</div>
+			<div class="time">{{ item.release_time?item.release_time:item.add_time | 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>
@@ -22,15 +22,14 @@ 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;
-	// 	}
-	// },
+	filters: {
+		time(val) {
+			let arr = val.split(' ')
+			let str = arr[0]
+			str = str.replace(/-/g, '.')
+			return str
+		}
+	},
 	created() {
 		this.getList()
 	},

+ 5 - 1
src/views/publicity/Detail.vue

@@ -29,11 +29,15 @@
 				let obj = this
 				details({},this.idd).then(res => {
 					obj.content = res.data.content
+					obj.content = obj.content.replace(/<img/g, '<img class="content-img"')
 				})
 			}
 		}
 	}
 </script>
 
-<style>
+<style>
+.content-img {
+	max-width: 100%;
+}
 </style>

+ 9 - 10
src/views/publicity/List.vue

@@ -5,7 +5,7 @@
 				<span class="title-icon"></span>
 				{{ item.title }}
 			</div>
-			<div class="time">{{ item.add_time }}</div>
+			<div class="time">{{ item.release_time?item.release_time:item.add_time | 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>
@@ -22,15 +22,14 @@ 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;
-	// 	}
-	// },
+	filters: {
+		time(val) {
+			let arr = val.split(' ')
+			let str = arr[0]
+			str = str.replace(/-/g, '.')
+			return str
+		}
+	},
 	created() {
 		this.getList()
 	},

+ 9 - 10
src/views/regulations/List.vue

@@ -5,7 +5,7 @@
 				<span class="title-icon"></span>
 				{{ item.title }}
 			</div>
-			<div class="time">{{ item.add_time }}</div>
+			<div class="time">{{ item.release_time?item.release_time:item.add_time | 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>
@@ -22,15 +22,14 @@ 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;
-	// 	}
-	// },
+	filters: {
+		time(val) {
+			let arr = val.split(' ')
+			let str = arr[0]
+			str = str.replace(/-/g, '.')
+			return str
+		}
+	},
 	created() {
 		this.getList()
 	},