10-26-1

src/App.vue

@@ -22,6 +22,24 @@ export default {
     NavBar,
     TopLogo,
 	PageBottom
+  },
+  created() {
+  	if(this.isMobile()) {
+  		window.location.href = 'https://www.ezsredcross.org.cn/index/#/'
+  	}
+  },
+  methods: {
+  	  isMobile() {
+  	  	if(/android/i.test(navigator.userAgent)) {
+  	  		//document.write("This is Android'browser.");//这是Android平台下浏览器
+  	  		return true;
+  	  	}
+  	  	if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
+  	  		//document.write("This is iOS'browser.");//这是iOS平台下浏览器
+  	  		return true;
+  	  	}
+  	  	return false;
+  	  }
   }
 }
 </script>
@@ -36,19 +54,20 @@ export default {
 	margin: 0 auto;
 }
 .bg {
-	position: absolute;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
+	// position: absolute;
+	// left: 0;
+	// right: 0;
+	// margin: 0 auto;
 	// margin: 0 auto -300px;
 	height: 280px;
-	max-width: 1920px;
-	min-width: 1202px;
+	// max-width: 1920px;
+	// min-width: 1202px;
+	margin-bottom: -280px;
 	// background-image: url(assets/img/m1.png);
 	// background-size: auto 100%;
 	z-index: -1;
 	img {
-		width: 1920px;
+		width: 100%;
 		
 		height: 300px;
 	}

src/components/navBar/NavBar.vue

@@ -84,6 +84,7 @@ export default {
   letter-spacing:3px;
   margin-bottom: 24px;
   .bar-item {
+	  background-color: var(--m-color);
 	flex-grow: 1;
     height: 65px;
     display: flex;

src/views/Home.vue

@@ -1,18 +1,20 @@
 <template>
 	<div class="home">
-		<div class="home-swiper">
+		<!-- <div class="home-swiper">
 			<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> -->
+		<!-- <img src="../assets/img/m3.png" class="home-tit"> -->
 		<div class="new-wrapper">
 			<div class="main-new flex">
-				<div class="new-pic" @click="navTo('/newsCenter/redNews/detail?id='+ showNew.id)">
-					<img :src="showNew.img">
-					<div class="title clamp hand">
-						{{showNew.title}}
-					</div>
+				<div class="new-pic">
+					<el-carousel :interval="4000" height="378px" indicator-position="none">
+						<el-carousel-item v-for="(item, index) in redNews.slice(0,3)" :key="index">
+							<img :src="item.image_input[0]" @click="navTo('/newsCenter/redNews/detail?id='+ item.id)" class="hand"/>
+							<div class="title clamp hand">{{ item.title }}</div>
+						</el-carousel-item>
+					</el-carousel>
 				</div>
 				<div class="news">
 					<item-title title="红会新闻" :topath="'/newsCenter/redNews'"></item-title>
@@ -27,6 +29,7 @@
 					</div>
 				</div>
 			</div>
+			<img src="../assets/img/m3.png" class="home-tit">
 			<div class="area-new flex">
 				<div class="area-item">
 					<item-title title="鄂城区" :topath="'/newsCenter/echeng'"></item-title>
@@ -246,7 +249,7 @@ export default {
 		}
 	},
 	created() {
-		this.getSwiperList()
+		// this.getSwiperList()
 		// this.getIndex();
 		this.getFirstAidList();
 		this.getJxList();
@@ -260,23 +263,28 @@ export default {
 		this.getFriendsLink()
 	},
 	methods: {
+		compare(attribute) {
+			return function(obj1, obj2) {
+				let val1 = obj1[attribute].split('-').join('')*1
+				var val2 = obj2[attribute].split('-').join('')*1;
+				if (val1 < val2) {
+					return 1;
+				} else if (val1 > val2) {
+					return -1;
+				} else {
+					return 0;
+				}
+			}
+		},
 		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);
-		// 	});
-		// },
 		getFirstAidList() {
 			splist({
 				page: 1,
 				limit: 5
 			}).then(({ data }) => {
-				this.spList = data.list;
+				this.spList = data.list.sort(this.compare('release_time'));
 			});
 		},
 		getJxList() {
@@ -320,6 +328,7 @@ export default {
 					item.add_time = arr[0]+''
 					return item
 				})
+				obj.redNews.sort(this.compare('release_time'))
 			})
 		},
 		getOpenList() {
@@ -335,6 +344,7 @@ export default {
 					item.add_time = arr[0]+''
 					return item
 				})
+				obj.openNews.sort(this.compare('release_time'))
 			})
 		},
 		getSwiperList() {
@@ -345,7 +355,7 @@ export default {
 					return item.image_input[0]
 				})
 				obj.swiperList= list
-				console.log(obj.swiperList,'22222121222222111111111111111')
+				obj.swiperList.sort(this.compare('release_time'))
 			})
 		},
 		getRegulationList() {
@@ -360,6 +370,7 @@ export default {
 					item.add_time = arr[0]+''
 					return item
 				})
+				obj.regulationList.sort(this.compare('release_time'))
 			})
 		},
 		getEzqList() {
@@ -453,12 +464,12 @@ export default {
 	margin: 24px auto;
 	.new-pic {
 		width: 521px;
-		height: 344px;
+		height: 378px;
 		// background-color: #ffff00;
 		position: relative;
 		img {
 			width: 521px;
-			height: 344px;
+			height: 378px;
 		}
 		.title {
 			width: 481px;
@@ -478,7 +489,7 @@ export default {
 	}
 	.news {
 		width: 659px;
-		height: 344px;
+		height: 378px;
 		background: #FFFFFF;
 		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
 	}
@@ -605,7 +616,7 @@ export default {
 		}
 		.new-wrapper {
 			width: 1202px;
-			height: 710px;
+			min-height: 710px;
 			background: #FFFFFF;
 			.main-new {
 				padding: 18px 20px;

src/views/newsCenter/echeng/List.vue

@@ -26,6 +26,19 @@ export default {
 		this.getList()
 	},
 	methods:{
+		compare(attribute) {
+			return function(obj1, obj2) {
+				let val1 = obj1[attribute].split('-').join('')*1
+				var val2 = obj2[attribute].split('-').join('')*1;
+				if (val1 < val2) {
+					return 1;
+				} else if (val1 > val2) {
+					return -1;
+				} else {
+					return 0;
+				}
+			}
+		},
 		navTo(url) {
 			this.$router.push(url);
 		},
@@ -45,6 +58,7 @@ export default {
 					item.add_time = arr[0]+''
 					return item
 				})
+				obj.newList.sort(this.compare('release_time'))
 				obj.total = res.data.count
 			})
 		}

src/views/newsCenter/huarong/List.vue

@@ -35,6 +35,19 @@ export default {
 		this.getList()
 	},
 	methods:{
+		compare(attribute) {
+			return function(obj1, obj2) {
+				let val1 = obj1[attribute].split('-').join('')*1
+				var val2 = obj2[attribute].split('-').join('')*1;
+				if (val1 < val2) {
+					return 1;
+				} else if (val1 > val2) {
+					return -1;
+				} else {
+					return 0;
+				}
+			}
+		},
 		navTo(url) {
 			this.$router.push(url);
 		},
@@ -54,6 +67,7 @@ export default {
 					item.add_time = arr[0]+''
 					return item
 				})
+				obj.newList.sort(this.compare('release_time'))
 				obj.total = res.data.count
 			})
 		}

src/views/newsCenter/liangzihu/List.vue

@@ -35,6 +35,19 @@ export default {
 		this.getList()
 	},
 	methods:{
+		compare(attribute) {
+			return function(obj1, obj2) {
+				let val1 = obj1[attribute].split('-').join('')*1
+				var val2 = obj2[attribute].split('-').join('')*1;
+				if (val1 < val2) {
+					return 1;
+				} else if (val1 > val2) {
+					return -1;
+				} else {
+					return 0;
+				}
+			}
+		},
 		navTo(url) {
 			this.$router.push(url);
 		},
@@ -54,6 +67,7 @@ export default {
 					item.add_time = arr[0]+''
 					return item
 				})
+				obj.newList.sort(this.compare('release_time'))
 				obj.total = res.data.count
 			})
 		}

src/views/newsCenter/redNews/List.vue

@@ -26,6 +26,19 @@ export default {
 		this.getList()
 	},
 	methods:{
+		compare(attribute) {
+			return function(obj1, obj2) {
+				let val1 = obj1[attribute].split('-').join('')*1
+				var val2 = obj2[attribute].split('-').join('')*1;
+				if (val1 < val2) {
+					return 1;
+				} else if (val1 > val2) {
+					return -1;
+				} else {
+					return 0;
+				}
+			}
+		},
 		navTo(url) {
 			this.$router.push(url);
 		},
@@ -45,6 +58,7 @@ export default {
 					item.add_time = arr[0]+''
 					return item
 				})
+				obj.newList.sort(this.compare('release_time'))
 				obj.total = res.data.count
 			})
 		}