Domů Procházet Nápověda
Registrovat se Přihlásit se
lhl
/
ezpc
1
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

6-20-1

lhl před 1 rokem
rodič
a2d5cf1a20 c7a8e5f565
revize
898b760b6f
28 změnil soubory, kde provedl 145 přidání a 56 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 4 4
      public/index.html
  2. 26 7
      src/App.vue
  3. 1 1
      src/assets/css/base.css
  4. binární
      src/assets/img/logo1.png
  5. binární
      src/assets/img/logo2.png
  6. 4 3
      src/components/navBar/NavBar.vue
  7. 1 1
      src/components/topLogo/TopLogo.vue
  8. 1 1
      src/store.js
  9. 34 23
      src/views/Home.vue
  10. 1 1
      src/views/about/ChineseRedCross.vue
  11. 1 1
      src/views/about/EzhouRedCross.vue
  12. 1 1
      src/views/about/RedCrossMovement.vue
  13. 1 1
      src/views/help/Aid.vue
  14. 1 1
      src/views/help/Juvenile.vue
  15. 1 1
      src/views/help/Service.vue
  16. 4 2
      src/views/homeChild/ItemTitle.vue
  17. 1 1
      src/views/join/Contribution.vue
  18. 1 1
      src/views/join/Hpc.vue
  19. 1 1
      src/views/join/Member.vue
  20. 1 1
      src/views/join/OrganDonation.vue
  21. 1 1
      src/views/join/Rescue.vue
  22. 1 1
      src/views/join/Train.vue
  23. 1 1
      src/views/join/Volunteer.vue
  24. 14 0
      src/views/newsCenter/echeng/List.vue
  25. 14 0
      src/views/newsCenter/huarong/List.vue
  26. 14 0
      src/views/newsCenter/liangzihu/List.vue
  27. 14 0
      src/views/newsCenter/redNews/List.vue
  28. 1 1
      src/views/popularScience/Detail.vue

+ 4 - 4
public/index.html
Zobrazit soubor 

@@ -3,11 +3,11 @@
 
   <head>
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">

-	<meta name="keywords" content="鄂州市红十字会官方网站,鄂州市红十字会官方,鄂州市红十字会官网,鄂州红会官网,鄂州红会,鄂州市,鄂州,红十字会">
 
-    <title>鄂州市红十字会 - 官网</title>

+    <meta name="viewport" content="width=device-width,initial-scale=1.0">

+	<meta name="keywords" content="鄂州市红十字会官方网站,鄂州市红十字会官方,鄂州市红十字会官网,鄂州红会官网,鄂州红会,鄂州市,鄂州,红十字会">

 	<meta name="description" content="鄂州市红十字会位于湖北省鄂州市鄂城区滨湖南路60号，电话：027-60229380。鄂州市红十字会是在市委、市政府领导下从事人道主义工作的社会救助团体，依照《中华人民共和国红十字会法》，秉承“人道、博爱、奉献”红十字精神，履行法定职责，充分发挥党和政府在人道领域的桥梁和纽带作用。">
 
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
+    <title>鄂州市红十字会 - 官网</title>
 
   </head>
 
   <body>
 
     <noscript>

+ 26 - 7
src/App.vue
Zobrazit soubor 

@@ -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;
 
 	}

+ 1 - 1
src/assets/css/base.css
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 body {

-	--m-color: #BF3333;

+	--m-color: #be0202;

 	--m-acolor: #c95151;

 	background-color: #f6f6f6;

 }

binární
src/assets/img/logo1.png
Zobrazit soubor


binární
src/assets/img/logo2.png
Zobrazit soubor


+ 4 - 3
src/components/navBar/NavBar.vue
Zobrazit soubor 

@@ -76,7 +76,7 @@ export default {
 
   height: 65px;

   margin: 0 auto;

   display: flex;

-  background-color: var(--m-color);

+  background-color: #be0202;

   font-size: 18px;

   font-family: PingFang SC;

   font-weight: bold;

@@ -84,13 +84,14 @@ export default {
 
   letter-spacing:3px;

   margin-bottom: 24px;

   .bar-item {

+	  background-color: #be0202;

 	flex-grow: 1;

     height: 65px;

     display: flex;

     justify-content: center;

     align-items: center;

     font-family: PingFang SC;

-	font-size: 18px;

+	font-size: 24px;

 	cursor:pointer;

     img {

       width: 20px;

@@ -100,7 +101,7 @@ export default {
 
     }

   }

   .action {

-  	background-color: var(--m-acolor);

+  	background-color: #be0202;

   }

 }

 </style>

+ 1 - 1
src/components/topLogo/TopLogo.vue
Zobrazit soubor 

@@ -1,6 +1,6 @@
 
 <template>

   <div class="top">

-    <div class="logo"><img src="../../assets/img/logo.png" alt="" /></div>

+    <div class="logo"><img src="../../assets/img/logo2.png" alt="" /></div>

   </div>

 </template>

+ 1 - 1
src/store.js
Zobrazit soubor 

@@ -5,7 +5,7 @@ Vue.use(Vuex)
 
 
 export default new Vuex.Store({
 
   state: {
 
-	www: "https://ez.igxys.com"
 
+	www: "https://www.ezsredcross.org.cn"
 
   },
 
   mutations: {

+ 34 - 23
src/views/Home.vue
Zobrazit soubor 

@@ -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;

+ 1 - 1
src/views/about/ChineseRedCross.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="organ-donation">

+	<div class="new-detail">

 		<div class="content" v-html="content"></div>

 	</div>
 
 </template>

+ 1 - 1
src/views/about/EzhouRedCross.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="organ-donation">

+	<div class="new-detail">

 		<div class="content" v-html="content"></div>

 	</div>
 
 </template>

+ 1 - 1
src/views/about/RedCrossMovement.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="organ-donation">

+	<div class="new-detail">

 		<div class="content" v-html="content"></div>

 	</div>
 
 </template>

+ 1 - 1
src/views/help/Aid.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="contribution">

+	<div class="new-detail">

 		<div class="" v-html="content">

 			

 		</div>

+ 1 - 1
src/views/help/Juvenile.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="contribution">

+	<div class="new-detail">

 		<div class="" v-html="content">

 			

 		</div>

+ 1 - 1
src/views/help/Service.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="contribution">

+	<div class="new-detail">

 		<div class="" v-html="content">

 			

 		</div>

+ 4 - 2
src/views/homeChild/ItemTitle.vue
Zobrazit soubor 

@@ -40,9 +40,11 @@ export default {
 
 	align-items: center;

 	border-bottom: #e5e5e5 1px solid;

 	.title {

-		width: 159px;

+		// width: 100px;

+		padding-left: 20px;

+		padding-right: 20px;

 		height: 54px;

-		font-size: 28px;

+		font-size: 22px;

 		font-family: PingFang SC;

 		font-weight: 500;

 		color: #ffffff;

+ 1 - 1
src/views/join/Contribution.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="contribution">

+	<div class="new-detail">

 		<div class="" v-html="content">

 			

 		</div>

+ 1 - 1
src/views/join/Hpc.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="contribution">

+	<div class="new-detail">

 		<div class="" v-html="content">

 			

 		</div>

+ 1 - 1
src/views/join/Member.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="member">

+	<div class="new-detail">

 		<div class="" v-html="content">

 			

 		</div>

+ 1 - 1
src/views/join/OrganDonation.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="organ-donation">

+	<div class="new-detail">

 		<div class="content" v-html="content"></div>

 	</div>
 
 </template>

+ 1 - 1
src/views/join/Rescue.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="rescue">

+	<div class="new-detail">

 		<div class="" v-html="content">

 			

 		</div>

+ 1 - 1
src/views/join/Train.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="train">

+	<div class="new-detail">

 		<div class="" v-html="content">

 			

 		</div>

+ 1 - 1
src/views/join/Volunteer.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="volunteer">

+	<div class="new-detail">

 		<div class="" v-html="content">

 			

 		</div>

+ 14 - 0
src/views/newsCenter/echeng/List.vue
Zobrazit soubor 

@@ -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

 			})

 		}

+ 14 - 0
src/views/newsCenter/huarong/List.vue
Zobrazit soubor 

@@ -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

 			})

 		}

+ 14 - 0
src/views/newsCenter/liangzihu/List.vue
Zobrazit soubor 

@@ -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

 			})

 		}

+ 14 - 0
src/views/newsCenter/redNews/List.vue
Zobrazit soubor 

@@ -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

 			})

 		}

+ 1 - 1
src/views/popularScience/Detail.vue
Zobrazit soubor 

@@ -1,5 +1,5 @@
 
 <template>

-	<div class="detail">

+	<div class="new-detail">

 		<div class="content" v-html="content"></div>

 	</div>
 
 </template>