From 5e2c1b6e6c7b9ebb55a4c476ad8b8190cba1203e Mon Sep 17 00:00:00 2001
From: Lee-1203 <342694918@qq.com>
Date: Fri, 11 Feb 2022 18:24:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 about.html       | 12 +++++++-
 css/style.css    | 59 ++++++++++++++++++++++++++++++++++--
 index.html       |  3 +-
 js/javascript.js | 79 +++++++++++++++++++++++++++++++++---------------
 4 files changed, 123 insertions(+), 30 deletions(-)

diff --git a/about.html b/about.html
index 4ceb2b6..8b86c96 100644
--- a/about.html
+++ b/about.html
@@ -330,7 +330,17 @@
 		</footer>
 	</body>
 	<script type="text/javascript">
-		if(screen.width > 860){
+		if(screen.width <= 860){
+			let navTop = $(".pull-item").offset().top-70;
+			$(window).bind("scroll",function(){
+				let topScroll=$(this).scrollTop();//当前窗口的滚动距离
+				if(topScroll > navTop){
+					$(".pull-item").addClass("pull-item-fixed")
+				}else{
+					$(".pull-item").removeClass("pull-item-fixed")
+				}
+			});
+		}else{
 			let navTop = $(".pull-item").offset().top-90;
 			$(window).bind("scroll",function(){
 				let topScroll=$(this).scrollTop();//当前窗口的滚动距离
diff --git a/css/style.css b/css/style.css
index c17e819..f031ec9 100644
--- a/css/style.css
+++ b/css/style.css
@@ -43,7 +43,7 @@
 }
 .logo span{
 	display: block;
-	font-size: 12px;
+	font-size: 18px;
 	line-height: 1.5;
 	opacity: .7;
 }
@@ -1885,6 +1885,9 @@ textarea::-webkit-input-placeholder {
 	.logo h1{
 		font-size: 20px;
 	}
+	.logo span{
+		font-size: 13px;
+	}
 	.head .head-btn{
 		display: block;
 		margin: 0;
@@ -2024,6 +2027,7 @@ textarea::-webkit-input-placeholder {
 	}
 	.index-information{
 		width: 100%;
+		margin-top: 15px;
 	}
 	.index-information-title,
 	.index-information-list{
@@ -2060,6 +2064,10 @@ textarea::-webkit-input-placeholder {
 	}
 	.index-business-item li>p{
 		font-size: 12px;
+		display: block;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
 	}
 	.index-about{
 		margin-top: 25px;
@@ -2107,9 +2115,10 @@ textarea::-webkit-input-placeholder {
 		width: 100%;
 	}
 	.foot-left>p{
-		text-align: justify;
+		font-size: 13px;
 	}
 	.foot-left>span{
+		font-size: 13px;
 		margin: 20px 0;
 	}
 	.links{
@@ -2166,7 +2175,8 @@ textarea::-webkit-input-placeholder {
 		margin-top: 15px;
 	}
 	.abstract-txt img{
-		margin: 15px auto;
+		max-width: 90%;
+		margin: 30px auto;
 	}
 	.team-list .team-item{
 		width: 100%;
@@ -2181,6 +2191,49 @@ textarea::-webkit-input-placeholder {
 	.organization-img img{
 		width: 98%;
 	}
+	.index-business-txt p{
+		font-size: 15px;
+		line-height: 2;
+		text-align: justify;
+	}
+	.pull-title h3{
+		font-size: 28px;
+	}
+	.pull-title span{
+		font-size: 16px;
+	}
+	.memorabili{
+		padding: 30px 0 40px;
+	}
+	
+	.memorabili-txt .swiper-slide{
+		width: 100% !important;
+		margin: 0;
+		padding: 0;
+	}
+	.memorabili-txt{
+		padding: 0;
+	}
+	.memorabili-txt .swiper-slide:nth-of-type(2n){
+		margin-top: 0;
+		padding: 0;
+	}
+	.memorabili-txt .swiper-slide strong{
+		margin: 10px 0 0 0;
+	}
+	.memorabili-txt .swiper-slide p{
+		font-size: 14px;
+		line-height: 2;
+	}
+	.memorabili-swiper .swiper-button-prev,
+	.memorabili-swiper .swiper-button-next,
+	.memorabili-txt .line,
+	.memorabili-txt .swiper-slide em{
+		display: none;
+	}
+	.pull-item.pull-item-fixed{
+		top: 70px;
+	}
 }
 @media screen and (max-width:350px){
 	
diff --git a/index.html b/index.html
index aabfce4..003c399 100644
--- a/index.html
+++ b/index.html
@@ -319,7 +319,8 @@
 		<footer class="footer w1690">
 			<div class="foot">
 				<div class="foot-left">
-					<p>Add：四川省乐山市马边彝族自治县民建镇红旗大道一层至上层（5号景观房） |  Tel：028-12345678   |    Fax：028-12345678</p>
					<p>Email：11111111@shunengkc.com</p>
+					<p>Add：四川省乐山市马边彝族自治县民建镇红旗大道一层至上层（5号景观房） </p>
+					<p>Tel：028-12345678   |    Fax：028-12345678</p>
					<p>Email：11111111@shunengkc.com</p>
 					<span>Copyright ©2022  四川蜀能矿产有限责任公司. All Rights Reserved</span>
 				</div>
 				<div class="foot-right">
diff --git a/js/javascript.js b/js/javascript.js
index 5f248d9..a89fd31 100644
--- a/js/javascript.js
+++ b/js/javascript.js
@@ -133,31 +133,60 @@ jQuery(function($){
 	// $('#toTop').click(function(){$('html,body').animate({scrollTop:$('#top').offset().top}, 600);});
 	
 	// 走进蜀能锚点
-	$('.abstract').click(function(){
-		$('html,body').animate({scrollTop:$('.abstract-bg').offset().top - 147}, 600);
-		$('.pull-item>li').removeClass("cur");
-		$(this).addClass("cur");
-	});
-	$('.speech').click(function(){
-		$('html,body').animate({scrollTop:$('.speech-bg').offset().top - 147}, 600);
-		$('.pull-item>li').removeClass("cur");
-		$(this).addClass("cur");
-	});
-	$('.team').click(function(){
-		$('html,body').animate({scrollTop:$('.team-bg').offset().top - 147}, 600);
-		$('.pull-item>li').removeClass("cur");
-		$(this).addClass("cur");
-	});
-	$('.organization').click(function(){
-		$('html,body').animate({scrollTop:$('.organization-bg').offset().top - 147}, 600);
-		$('.pull-item>li').removeClass("cur");
-		$(this).addClass("cur");
-	});
-	$('.memorabilia').click(function(){
-		$('html,body').animate({scrollTop:$('.memorabilia-bg').offset().top - 147}, 600);
-		$('.pull-item>li').removeClass("cur");
-		$(this).addClass("cur");
-	});
+	if(screen.width <= 860){
+		$('.abstract').click(function(){
+			$('html,body').animate({scrollTop:$('.abstract-bg').offset().top - 128}, 600);
+			$('.pull-item>li').removeClass("cur");
+			$(this).addClass("cur");
+		});
+		$('.speech').click(function(){
+			$('html,body').animate({scrollTop:$('.speech-bg').offset().top - 128}, 600);
+			$('.pull-item>li').removeClass("cur");
+			$(this).addClass("cur");
+		});
+		$('.team').click(function(){
+			$('html,body').animate({scrollTop:$('.team-bg').offset().top - 128}, 600);
+			$('.pull-item>li').removeClass("cur");
+			$(this).addClass("cur");
+		});
+		$('.organization').click(function(){
+			$('html,body').animate({scrollTop:$('.organization-bg').offset().top - 128}, 600);
+			$('.pull-item>li').removeClass("cur");
+			$(this).addClass("cur");
+		});
+		$('.memorabilia').click(function(){
+			$('html,body').animate({scrollTop:$('.memorabilia-bg').offset().top - 128}, 600);
+			$('.pull-item>li').removeClass("cur");
+			$(this).addClass("cur");
+		});
+	}else{
+		$('.abstract').click(function(){
+			$('html,body').animate({scrollTop:$('.abstract-bg').offset().top - 128}, 600);
+			$('.pull-item>li').removeClass("cur");
+			$(this).addClass("cur");
+		});
+		$('.speech').click(function(){
+			$('html,body').animate({scrollTop:$('.speech-bg').offset().top - 147}, 600);
+			$('.pull-item>li').removeClass("cur");
+			$(this).addClass("cur");
+		});
+		$('.team').click(function(){
+			$('html,body').animate({scrollTop:$('.team-bg').offset().top - 147}, 600);
+			$('.pull-item>li').removeClass("cur");
+			$(this).addClass("cur");
+		});
+		$('.organization').click(function(){
+			$('html,body').animate({scrollTop:$('.organization-bg').offset().top - 147}, 600);
+			$('.pull-item>li').removeClass("cur");
+			$(this).addClass("cur");
+		});
+		$('.memorabilia').click(function(){
+			$('html,body').animate({scrollTop:$('.memorabilia-bg').offset().top - 147}, 600);
+			$('.pull-item>li').removeClass("cur");
+			$(this).addClass("cur");
+		});
+	}
+	
 	
 	// 团队风采滚动
 	var teamStyleSwiper = new Swiper('.team-style-swiper', {