Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css

@@ -482,7 +482,6 @@
 
 
 .conImg {
-    /* width: 100%; */
     width: 4100px;
     display: flex;
     justify-content: space-between;

fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -10,7 +10,7 @@
     <!-- <link href="css/bootstrap.css" rel="stylesheet"> -->
     <link rel="stylesheet" href="./css/reset.css">
     <link rel="icon" href="image/favicon.png">
-    <link rel="stylesheet" href="./css/index.css">
+    <link rel="stylesheet" href="css/index.css">
     <!-- <script src="js/js/jquery.min.js"></script> -->
     <script src="js/jquery1.42.min.js"></script>
     <script src="js/jquery.SuperSlide.2.1.3.js"></script>
@@ -188,7 +188,8 @@
         <div class="fill">
             <div class="connonst">
                 <h2>填报、审批、统计分分钟搞定</h2>
-                <div class="fillCon fillCons" id="fillCon">
+                <!-- <div class="fillCon fillCons" id="fillCon"> -->
+                <div class="fillCon" id="fillCon">
                     <div class="fillConCen">
                         <div class="fccCon" style="border: 1px solid #5e95f8;">
                             <img src="./image/cj1.jpg" alt="" style="border-radius: 50%;border: 1px solid #5e95f8">
@@ -612,13 +613,12 @@
     
 
 
-    <script src="js/js/scripts.js"></script> 
+    <!-- <script src="js/js/scripts.js"></script>  -->
     <script src="js/index.js"></script>
     <script>
         function bodyScale() {
             var devicewidth = document.documentElement.clientWidth;
             var scale = devicewidth / 1920;  // 设计稿的尺寸
-            console.log(scale)
             document.body.style.zoom = scale;
         }
         window.onload = window.onresize = function () {

fhKeeper/formulahousekeeper/inva_4_tivo/js/index.js

@@ -42,6 +42,14 @@ let jiesaoTop = $('.jiesao').offset().top
 let znyqTop = $('.znyq').offset().top
 
 let fill = $('.fill').offset().top
+let filss = ''
+var devicewidth = document.documentElement.clientWidth
+if(document.documentElement.clientWidth < 1900) {
+    var scale = devicewidth / 1920
+    filss = fill * scale
+} else {
+    filss = fill
+}
 
 $(window).scroll(function () {
     // 当前滚动的高度
@@ -94,12 +102,12 @@ $(window).scroll(function () {
         $('#selMour8').css({'opacity': znyqTopopacityVal, 'transform':'translate('+znyqToppaddingfives+','+ znyqToppaddingfives +')'})
     }
     // 加样式
-    // if(currentTop > fill - 300) {
-    //     $('#fillCon').addClass('fillCons')
-    // }
-    // if(currentTop < fill - 400){
-    //     $("#fillCon").removeClass("fillCons");
-    // }
+    if(currentTop > filss - 300) {
+        $('#fillCon').addClass('fillCons')
+    }
+    if(currentTop < filss - 400){
+        $("#fillCon").removeClass("fillCons");
+    }
 })
 
 // tab点击
@@ -142,7 +150,6 @@ $(function() {
             nums--
             let conImgLeft = $('.conImg').css('left')
             let num = conImgLeft.replace("px","");
-            console.log(num, '值')
             $('.conImg').animate({
                 'left': (+num + 510) + 'px'
             }, 400)
@@ -152,10 +159,8 @@ $(function() {
     $('#kehuRight').click(function() {
         if(nums < 5) {
             nums++
-            console.log('执行')
             let conImgLeft = $('.conImg').css('left')
             let num = conImgLeft.replace("px","");
-            console.log(num, '值')
             $('.conImg').animate({
                 'left': (+num - 510) + 'px'
             }, 400)
@@ -165,7 +170,6 @@ $(function() {
 })
 
 function kehuFlg() {
-    console.log(nums)
     if(nums == 0) {
         $('#kehuLeft').find('img').attr("src", './image/ions/zuos.png')
         $('#kehuLeft').addClass("zhis")