liting2017 6 년 전
부모
커밋
a23e0c1b16
6개의 변경된 파일12개의 추가작업 그리고 10개의 파일을 삭제
  1. 7 5
      src/css/newMenu/public.css
  2. 1 1
      src/js/newMenu/achievementList.js
  3. 1 1
      src/js/newMenu/demandList.js
  4. 1 1
      src/js/newMenu/serviceList.js
  5. 1 1
      src/js/public.js
  6. 1 1
      src/js/thinkTank/policyList.js

+ 7 - 5
src/css/newMenu/public.css

@@ -824,18 +824,20 @@ header .colorRed{
 	position: fixed;
 	width: 100%;
 	height: 100%;
-	background: rgba(0, 0, 0, 0.1);
+	background: rgba(221, 218, 218, 0.1);
 	top: 0;
 	left: 0;
 	z-index: 99999999999;
 }
 .loading{
+	width: 100%;
+	height: 100%;
 	display: none;
 }
 .loading div{
 	position: fixed;
-	width: 98vw;
-	height: 100vh;
+	width: 100%;
+	height: 100%;
 }
 .loading p{
 	position: absolute;
@@ -851,11 +853,11 @@ header .colorRed{
 	display: inline-block;
 	font-size: 30px;
 	color: #17a2b8;
-	transition: all .2s ease-in-out;
+	transition: all 1s ease-in-out;
 }
 .loading p span.active{
 	margin-left: -4px;
-	transition: all .2s ease-in;
+	transition: all 1s ease-in;
 }
 /* banner */
 .carousel{

+ 1 - 1
src/js/newMenu/achievementList.js

@@ -195,7 +195,7 @@ $(function () {
                         </li>`);
                     };
                 };
-                $('.loading').hide();
+                $('.loading').hide().stop(true,true);
                 $('.achievementHot .hotList').empty();
                 $('.achievementHot .hotList').append(theArrs.join(''));
                 $('.pagination_box').css('display', 'block');

+ 1 - 1
src/js/newMenu/demandList.js

@@ -198,7 +198,7 @@ $(function () {
                         </li>`);
                     };
                 };
-                $('.loading').hide();
+                $('.loading').hide().stop(true,true);
                 $('.achievementHot .hotList').empty();
                 $('.achievementHot .hotList').append(theArrs.join(''));
                 $('.pagination_box').css('display', 'block');

+ 1 - 1
src/js/newMenu/serviceList.js

@@ -160,7 +160,7 @@ $(function () {
                         </li>`);
                     };
                 };
-                $('.loading').hide();
+                $('.loading').hide().stop(true,true);
                 $('.achievementHot .hotList').empty();
                 $('.achievementHot .hotList').append(theArrs.join(''));
 

+ 1 - 1
src/js/public.js

@@ -368,7 +368,7 @@ $(function(){
 	//loading
 	loading();
 	function loading(){
-		$('.loading').height($('body').height()+'px');
+		//$('.loading').height($('body').height()+'px');
 		clearInterval(setTime);
 		let txt = "loading...",htmls=[],i=0,
 			txtArr = txt.split('');

+ 1 - 1
src/js/thinkTank/policyList.js

@@ -90,7 +90,7 @@ $(function () {
 						].join(''));
 					};
 				};
-				$('.loading').hide();
+				$('.loading').hide().stop(true,true);
 				$('.policy ul').empty();
 				$('.policy ul').append(theArr.join(''));
 				if (data.data.list.length === 0) {