From bf89e47760dcaee008f76a8ca8e7b5fcf0da9b35 Mon Sep 17 00:00:00 2001
From: Lee-1203 <342694918@qq.com>
Date: Mon, 14 Feb 2022 17:09:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=8D=E9=A6=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 about.html       | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
 js/javascript.js | 10 +++++-----
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/about.html b/about.html
index a7a093f..65620bd 100644
--- a/about.html
+++ b/about.html
@@ -332,6 +332,11 @@
 	<script type="text/javascript">
 		if(screen.width <= 980){
 			let navTop = $(".pull-item").offset().top-70;
+			let abstractTop = $(".abstract-bg").offset().top-129;
+			let speechTop = $(".speech-bg").offset().top-129;
+			let teamTop = $(".team-bg").offset().top-129;
+			let organizationTop = $(".organization-bg").offset().top-129;
+			let memorabiliaTop = $(".memorabilia-bg").offset().top-129;
 			$(window).bind("scroll",function(){
 				let topScroll=$(this).scrollTop();//当前窗口的滚动距离
 				if(topScroll > navTop){
@@ -339,9 +344,35 @@
 				}else{
 					$(".pull-item").removeClass("pull-item-fixed")
 				}
+				
+				if(topScroll > abstractTop){
+					$(".pull-item li").removeClass("cur");
+					$(".abstract-btn").addClass("cur");
+				}
+				if(topScroll > abstractTop & topScroll > speechTop){
+					$(".pull-item li").removeClass("cur");
+					$(".speech-btn").addClass("cur");
+				}
+				if(topScroll > abstractTop & topScroll > speechTop & topScroll > teamTop){
+					$(".pull-item li").removeClass("cur");
+					$(".team-btn").addClass("cur");
+				}
+				if(topScroll > abstractTop & topScroll > speechTop & topScroll > teamTop & topScroll > organizationTop){
+					$(".pull-item li").removeClass("cur");
+					$(".organization-btn").addClass("cur");
+				}
+				if(topScroll > abstractTop & topScroll > speechTop & topScroll > teamTop & topScroll > organizationTop & topScroll > memorabiliaTop){
+					$(".pull-item li").removeClass("cur");
+					$(".memorabilia-btn").addClass("cur");
+				}
 			});
 		}else{
 			let navTop = $(".pull-item").offset().top-90;
+			let abstractTop = $(".abstract-bg").offset().top-149;
+			let speechTop = $(".speech-bg").offset().top-149;
+			let teamTop = $(".team-bg").offset().top-149;
+			let organizationTop = $(".organization-bg").offset().top-149;
+			let memorabiliaTop = $(".memorabilia-bg").offset().top-149;
 			$(window).bind("scroll",function(){
 				let topScroll=$(this).scrollTop();//当前窗口的滚动距离
 				if(topScroll > navTop){
@@ -349,6 +380,26 @@
 				}else{
 					$(".pull-item").removeClass("pull-item-fixed")
 				}
+				if(topScroll > abstractTop){
+					$(".pull-item li").removeClass("cur");
+					$(".abstract-btn").addClass("cur");
+				}
+				if(topScroll > abstractTop & topScroll > speechTop){
+					$(".pull-item li").removeClass("cur");
+					$(".speech-btn").addClass("cur");
+				}
+				if(topScroll > abstractTop & topScroll > speechTop & topScroll > teamTop){
+					$(".pull-item li").removeClass("cur");
+					$(".team-btn").addClass("cur");
+				}
+				if(topScroll > abstractTop & topScroll > speechTop & topScroll > teamTop & topScroll > organizationTop){
+					$(".pull-item li").removeClass("cur");
+					$(".organization-btn").addClass("cur");
+				}
+				if(topScroll > abstractTop & topScroll > speechTop & topScroll > teamTop & topScroll > organizationTop & topScroll > memorabiliaTop){
+					$(".pull-item li").removeClass("cur");
+					$(".memorabilia-btn").addClass("cur");
+				}
 			});
 		};
 	</script>
diff --git a/js/javascript.js b/js/javascript.js
index 34ebd7a..e93fb0a 100644
--- a/js/javascript.js
+++ b/js/javascript.js
@@ -152,27 +152,27 @@ jQuery(function($){
 	// 走进蜀能锚点
 	if(screen.width <= 980){
 		$('.abstract-btn').click(function(){
-			$('html,body').animate({scrollTop:$('.abstract-bg').offset().top - 128}, 600);
+			$('html,body').animate({scrollTop:$('.abstract-bg').offset().top - 128}, 300);
 			$('.pull-item>li').removeClass("cur");
 			$(this).addClass("cur");
 		});
 		$('.speech-btn').click(function(){
-			$('html,body').animate({scrollTop:$('.speech-bg').offset().top - 128}, 600);
+			$('html,body').animate({scrollTop:$('.speech-bg').offset().top - 128}, 300);
 			$('.pull-item>li').removeClass("cur");
 			$(this).addClass("cur");
 		});
 		$('.team-btn').click(function(){
-			$('html,body').animate({scrollTop:$('.team-bg').offset().top - 128}, 600);
+			$('html,body').animate({scrollTop:$('.team-bg').offset().top - 128}, 300);
 			$('.pull-item>li').removeClass("cur");
 			$(this).addClass("cur");
 		});
 		$('.organization-btn').click(function(){
-			$('html,body').animate({scrollTop:$('.organization-bg').offset().top - 128}, 600);
+			$('html,body').animate({scrollTop:$('.organization-bg').offset().top - 128}, 300);
 			$('.pull-item>li').removeClass("cur");
 			$(this).addClass("cur");
 		});
 		$('.memorabilia-btn').click(function(){
-			$('html,body').animate({scrollTop:$('.memorabilia-bg').offset().top - 128}, 600);
+			$('html,body').animate({scrollTop:$('.memorabilia-bg').offset().top - 128}, 300);
 			$('.pull-item>li').removeClass("cur");
 			$(this).addClass("cur");
 		});