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

fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css

@@ -1,6 +1,7 @@
+
 .navigationBar {
     width: 100%;
-    height: 102px;
+    height: 6.375rem;
     position: relative;
 }
 .navigationBarBack {
@@ -9,12 +10,12 @@
     height: 100%;
     top: 0;
     left: 0;
-    background: #fff;
+    /* background: #fff; */
     color: #595959 !important;
 }
 .navigationTitle {
-    max-width: 1300px;
-    height: 102px;
+    max-width: 81.25rem;
+    height: 6.375rem;
     margin: auto;
     position: relative;
     display: flex;
@@ -22,21 +23,21 @@
     justify-content: space-between
 }
 .navigationTitle img {
-    width: 130px;
-    height: 58px;
+    width: 8.125rem;
+    height: 3.625rem;
 }
 .navigationUl {
-    margin-left: 40px;
+    margin-left: 2.5rem;
 }
 .navigationUl a {
     color: #5e95f8 !important;
 }
 .navigationUl li {
-    margin: 0 10px;
+    margin: 0 .625rem;
 }
 .navigationUl, .navigationUl li{
     display: inline-block;
-    font-size: 16px;
+    font-size: 1rem;
 }
 .inBlock {
     display: inline-block;
@@ -52,8 +53,8 @@
     color: #333;
 }
 .til {
-    height: 102px;
-    line-height: 102px;
+    height: 6.375rem;
+    line-height: 6.375rem;
     position: relative;
     overflow: hidden;
     cursor: pointer;
@@ -70,20 +71,20 @@
 .product {
     width: 100%;
     position: fixed;
-    top: 100px;
+    top: 6.25rem;
     left: 0;
     background: #fff;
-    height: 300px;
-    border-top: 1px solid rgb(163, 163, 163);
+    height: 18.75rem;
+    border-top: .0625rem solid rgb(163, 163, 163);
 }
 .connont {
-    width: 1300px;
+    width: 81.25rem;
     margin: auto;
 }
 
 .tils::before {
     content:"";
-    height: 2px;
+    height: .125rem;
     width: 100%;
     bottom: 0;
     left: 0;
@@ -92,43 +93,43 @@
 }
 
 /* 轮播图三个点样式 */
-.slideBox{ width:100%; height: 630px; overflow:hidden; position:relative;}
-.slideBox .hd{ height:15px; overflow:hidden; position:absolute; left:120px; bottom:30px; z-index:1;}
+.slideBox{ width:100%; height: 39.375rem; overflow:hidden; position:relative;}
+.slideBox .hd{ height:.9375rem; overflow:hidden; position:absolute; left:7.5rem; bottom:1.875rem; z-index:1;}
 .slideBox .hd ul{ overflow:hidden; zoom:1; float:right;  }
-.slideBox .hd ul li{ float:right; margin-right:2px;  width:80px; height:3px; line-height:14px; text-align:center; background:rgb(77, 77, 77); cursor:pointer;border-radius: 3px;margin-left: 20px;}
+.slideBox .hd ul li{ float:right; margin-right:.125rem;  width:5rem; height:.1875rem; line-height:.875rem; text-align:center; background:rgb(77, 77, 77); cursor:pointer;border-radius: .1875rem;margin-left: 1.25rem;}
 .slideBox .hd ul li.on div{ background:#fff; color:#fff;}
 .slideBox .bd{ position:relative; height:100%; z-index:0;   }
 .slideBox .bd li{ zoom:1; vertical-align:middle; }
-.slideBox .bd img{ width:100%;height: 630px;display:block;  }
+.slideBox .bd img{ width:100%;height: 39.375rem;display:block;  }
 
 /* 导航下拉 */
 .management {
-    margin-top: 20px;
-    width: 540px;
-    font-size: 16px;
+    margin-top: 1.25rem;
+    width: 33.75rem;
+    font-size: 1rem;
 }
 .management h3 {
     width: 100%;
-    font-size: 16px;
+    font-size: 1rem;
     font-weight: normal;
     color: #333333;
-    line-height: 40px;
-    border-bottom: 1px solid rgb(180, 180, 180);
-    margin-left: 20px;
+    line-height: 2.5rem;
+    border-bottom: .0625rem solid rgb(180, 180, 180);
+    margin-left: 1.25rem;
 }
 .management ul {
-    margin-top: 10px;
-    width: 180px;
+    margin-top: .625rem;
+    width: 11.25rem;
 }
 .management li{
-    margin-top: 10px;
-    line-height: 40px;
+    margin-top: .625rem;
+    line-height: 2.5rem;
     cursor:pointer;
-    padding-left: 20px;
+    padding-left: 1.25rem;
 }
 .management li:hover {
     background: #F0F4FF;
-    border-radius: 10px;
+    border-radius: .625rem;
     color: #3370FF;
 }
 .hide {
@@ -140,32 +141,32 @@
 /* 系统管理 */
 .managements {
     width: 100%;
-    height: 1000px;
-    max-width: 1920px;
+    height: 62.5rem;
+    max-width: 120rem;
     margin: auto;
     background: url(../image/gongshi.jpg) no-repeat center;
-    background-size: 1920px 100%;
+    background-size: 120rem 100%;
 }
 .manContent {
     width: 100%;
     text-align: center;
-    font-size: 26px !important;
+    font-size: 1.625rem !important;
     color: #595959;
 }
 .manContent img {
-    /* margin-top: 169px;
-    margin-bottom: 27px; */
-    margin-top: 260px;
-    margin-bottom: 55px;
-    width: 206px;
-    height: 206px;
+    /* margin-top: 10.5625rem;
+    margin-bottom: 1.6875rem; */
+    margin-top: 16.25rem;
+    margin-bottom: 3.4375rem;
+    width: 12.875rem;
+    height: 12.875rem;
 }
 .manContent p {
-    font-size: 31px !important;
+    font-size: 1.9375rem !important;
     color: #595959;
     font-weight: bold;
-    word-spacing: 15px;
-    letter-spacing:5px
+    word-spacing: .9375rem;
+    letter-spacing:.3125rem
 }
 .manContent span {
     color: #5e95f8;
@@ -173,37 +174,37 @@
 /* 智能 */
 .smart {
     width: 100%;
-    max-width: 1920px;
-    height: 833px;
+    max-width: 120rem;
+    height: 52.0625rem;
     margin: auto;
     background: url(../image/zhineg.jpg) no-repeat center;
-    background-size: 1920px 100%;
+    background-size: 120rem 100%;
 }
 .smart h2 {
     text-align: center;
-    font-size: 42px !important;
+    font-size: 2.625rem !important;
     color: #595959 !important;
-    padding: 140px;
-    padding-bottom: 65px;
+    padding: 8.75rem;
+    padding-bottom: 4.0625rem;
     display: flex;
     justify-content: center;
-    word-spacing: 15px;
-    letter-spacing:5px
+    word-spacing: .9375rem;
+    letter-spacing:.3125rem
 }
 .smart h2 p {
-    font-size: 57px;
+    font-size: 3.5625rem;
     font-weight: bold;
-    margin-right: 20px;
+    margin-right: 1.25rem;
 }
 .smart h2 span {
     color: #5e95f8;
 }
 .connonst {
-    width: 1530px;
+    width: 95.625rem;
     margin: auto;
 }
 .smartEngine {
-    width: 1451px;
+    width: 90.6875rem;
     margin: auto;
     display: flex;
 }
@@ -213,49 +214,49 @@
 .smartEngineLeftCon {
     display: flex;
     flex-wrap: wrap;
-    width: 624px;
-    height: 470px;
+    width: 39rem;
+    height: 29.375rem;
     justify-content: space-around;
     align-content: space-between;
-    margin-right: 20px;
+    margin-right: 1.25rem;
 }
 .selMou {
-    width: 305px;
-    height: 220px;
-    border-radius: 10px;
-    box-shadow: 0px 0px 5px 1px #cbcbcb;
+    width: 19.0625rem;
+    height: 13.75rem;
+    border-radius: .625rem;
+    box-shadow: 0rem 0rem .3125rem .0625rem #cbcbcb;
     background: #f7fcfc;
     text-align: center;
 }
 .selMou p {
     font-weight: 400;
     color: #595959;
-    letter-spacing:5px;
-    font-size: 26px;
-    margin-top: 14px;
+    letter-spacing:.3125rem;
+    font-size: 1.625rem;
+    margin-top: .875rem;
 }
 .selMou img {
-    width: 87px;
-    height: 90px;
-    margin-top: 15px;
+    width: 5.4375rem;
+    height: 5.625rem;
+    margin-top: .9375rem;
 }
 .selMouR img{
-    width: 88px;
-    height: 88px;
-    margin-top: 10px;
+    width: 5.5rem;
+    height: 5.5rem;
+    margin-top: .625rem;
 }
 .selMouR p {
     font-weight: 400;
     color: #595959;
-    letter-spacing:5px;
-    font-size: 26px;
-    margin-top: 10px;
+    letter-spacing:.3125rem;
+    font-size: 1.625rem;
+    margin-top: .625rem;
 }
 .selMouR {
-    width: 194px;
-    height: 207px;
-    border-radius: 10px;
-    box-shadow: 0px 0px 5px 1px #cbcbcb;
+    width: 12.125rem;
+    height: 12.9375rem;
+    border-radius: .625rem;
+    box-shadow: 0rem 0rem .3125rem .0625rem #cbcbcb;
     background: #f7fcfc;
     text-align: center;
 }
@@ -265,8 +266,8 @@
 .smartEngineRightCon {
     display: flex;
     flex-wrap: wrap;
-    width: 798px;
-    height: 470px;
+    width: 49.875rem;
+    height: 29.375rem;
     justify-content: space-around; 
     align-content: space-between;
 }
@@ -274,22 +275,22 @@
 /* 填报 */
 .fill {
     width: 100%;
-    max-width: 1920px;
-    height: 851px;
+    max-width: 120rem;
+    height: 53.1875rem;
     margin: auto;
     background: url(../image/fill.jpg) no-repeat center;
-    background-size: 1920px 100%;
+    background-size: 120rem 100%;
 }
 .fill h2 {
-    font-size: 40px;
-    letter-spacing:5px;
-    padding: 90px 0 39px 50px;
+    font-size: 2.5rem;
+    letter-spacing:.3125rem;
+    padding: 5.625rem 0 2.4375rem 3.125rem;
 }
 .fillCon {
     width: 100%;
-    height: 615px;
+    height: 38.4375rem;
     position: relative;
-    transform: translate(0,260px);
+    transform: translate(0,16.25rem);
 }
 .fillCons {
     animation: move 2s;
@@ -298,7 +299,7 @@
 
 @keyframes move {
     0%{
-        transform: translate(0,260px);
+        transform: translate(0,16.25rem);
     }
     100%{
         transform: translate(0,0);
@@ -308,50 +309,50 @@
 .fillConCen {
     display: inline-block;
     position: absolute;
-    width: 357px;
+    width: 22.3125rem;
     top: 0;
     /* left: 0; */
-    height: 538px;
+    height: 33.625rem;
     background: #fff;
-    border-radius: 5px;
-    box-shadow: 9px 9px 20px 9px #cbcbcb;
+    border-radius: .3125rem;
+    box-shadow: .5625rem .5625rem 1.25rem .5625rem #cbcbcb;
 }
 .fccCon {
-    width: 250px;
-    height: 363px;
-    border-radius: 5px;
+    width: 15.625rem;
+    height: 22.6875rem;
+    border-radius: .3125rem;
     margin: auto;
-    margin-top: 125px;
+    margin-top: 7.8125rem;
     position: relative;
     text-align: center;
 }
 .fccCon img {
-    width: 97px;
-    height: 97px;
+    width: 6.0625rem;
+    height: 6.0625rem;
     position: absolute;
-    top: -48.5px;
+    top: -3.0313rem;
     left: 50%;
-    margin-left: -48.5px;
+    margin-left: -3.0313rem;
 }
 .fccCon h3 {
-    font-size: 30px;
-    padding: 66px 0 14px 0;
+    font-size: 1.875rem;
+    padding: 4.125rem 0 .875rem 0;
     text-align: center;
 }
 .ios {
-    width: 70px;
-    height: 5px;
+    width: 4.375rem;
+    height: .3125rem;
     margin: auto;
 }
 .fccConP p {
     width: 100%;
-    font-size: 24px;
+    font-size: 1.5rem;
     color: #887979;
-    line-height: 46px;
+    line-height: 2.875rem;
 }
 .fccConP {
     width: 100%;
-    height: 242px;
+    height: 15.125rem;
     display: flex;
     flex-wrap: wrap;
     justify-content: center;
@@ -361,45 +362,45 @@
 /* 便捷 */
 .convenient {
     width: 100%;
-    max-width: 1920px;
-    height: 873px;
+    max-width: 120rem;
+    height: 54.5625rem;
     margin: auto;
     background: url(../image/tabl.jpg) no-repeat center;
-    background-size: 1920px 873px;
+    background-size: 120rem 54.5625rem;
 }
 .cvit {
     text-align: center;
     color: #fff !important;
 }
 .cvit h2 {
-    padding: 100px 0 15px 0;
-    font-size: 40px;
+    padding: 6.25rem 0 .9375rem 0;
+    font-size: 2.5rem;
     color: #fff;
 }
 .cvit span {
-    font-size: 66px;
+    font-size: 4.125rem;
 }
 .cvit p {
     color: #fff;
-    font-size: 20px;
+    font-size: 1.25rem;
     text-align: center;
 }
 .tablTab {
     display: flex;
     width: 100%;
     box-sizing: border-box;
-    padding: 52px 90px 19px 90px;
+    padding: 3.25rem 5.625rem 1.1875rem 5.625rem;
     justify-content: space-between;
 }
 .tablTab li{
-    height: 59px;
-    width: 138px;
-    border-radius: 8px;
+    height: 3.6875rem;
+    width: 8.625rem;
+    border-radius: .5rem;
     /* background: #fff; */
     display: flex;
     align-items: center;
     justify-content: center;
-    font-size: 18px;
+    font-size: 1.125rem;
     color: #fff;
     cursor:pointer;
 }
@@ -408,11 +409,11 @@
     color: #5e9ffc !important;
 }
 .tabFool {
-    width: 1150px;
-    height: 550px;
+    width: 71.875rem;
+    height: 34.375rem;
     /* background-color: #a1b9fe; */
     margin: auto;
-    border-radius: 10px;
+    border-radius: .625rem;
     position: relative;
     position: relative;
 }
@@ -425,30 +426,30 @@
     left: 0%;
     top: 0;
     z-index: 1;
-    border-radius: 10px;
+    border-radius: .625rem;
 }
 .tabFool img {
-    width: 1070px;
-    height: 502px;
+    width: 66.875rem;
+    height: 31.375rem;
     position: absolute;
     bottom: 0;
-    right: 10px;
+    right: .625rem;
     z-index: 2;
 }
 
 /* 客户 */
 .kehu {
     width: 100%;
-    max-width: 1920px;
-    height: 979px;
+    max-width: 120rem;
+    height: 61.1875rem;
     margin: auto;
     background: url(../image/rke.jpg) no-repeat center;
-    background-size: 1920px 979px;
+    background-size: 120rem 61.1875rem;
 }
 .kehu h2, .pricings h2 {
-    font-size: 42px;
+    font-size: 2.625rem;
     color: #333;
-    padding: 142px 80px 80px 80px;
+    padding: 8.875rem 5rem 5rem 5rem;
 }
 .conImg {
     width: 100%;
@@ -456,54 +457,90 @@
     justify-content: space-between;
 }
 .conImg img {
-    width: 500px;
+    width: 31.25rem;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+.conImgCon {
+    width: 31.25rem;
+    position: relative;
+    height: 39.1875rem;
+}
+.conImgFiz {
+    position: relative;
+    z-index: 2;
+    height: 19.375rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 32px 30px 0 30px;
+    color: #fff;
+    text-align: center;
+    font-size: 1.25rem;
+    line-height: 2rem;
+}
+.conIngFoot {
+    position: relative;
+    z-index: 2;
+}
+.conIngFoot p {
+    font-size: 1.875rem;
+    color: #fff;
+    padding: 2.5rem 2.1875rem 1.25rem 2.1875rem;
+}
+.conIngFoot span {
+    display: block;
+    font-size: 1.25rem !important;
+    color: #fff;
+    padding: 0 2.1875rem;
 }
 
 /* 产品定价 */
 .pricings {
     width: 100%;
-    max-width: 1920px;
-    height: 941px;
+    max-width: 120rem;
+    height: 58.8125rem;
     margin: auto;
     background: url(../image/dingj.jpg) no-repeat center;
-    background-size: 1920px 941px;
+    background-size: 120rem 58.8125rem;
 }
 .pri {
     display: flex;
     justify-content: space-between;
-    width: 78rem;
+    width: 1248px;
     margin: auto;
 }
 .li {
     text-align: center;
     background: #fff;
-    padding: .625rem;
-    box-shadow: 0px 1px 20px 0px #c8c8c8;
+    padding: 10px;
+    box-shadow: 0rem .0625rem 1.25rem 0rem #c8c8c8;
     cursor: pointer;
     transition: all  .25s  ease-in;
 }
 .li_con {
-    width: 15rem;
-    height: 10.5rem;
+    width: 240px;
+    height: 168px;
     background: #f3f3f3;
     box-sizing: border-box;
-    padding-top: 2.875rem;
+    padding-top: 46px;
 }
 .li_con div {
     width: 100%;
     text-align: center;
-    font-size: 1.5rem;
+    font-size: 24px;
     color: #565656;
-    margin-bottom: 1.375rem;
+    margin-bottom: 22px;
 }
 .li_con div span{
-    font-size: 1.75rem;
+    font-size: 28px;
 }
 .li li {
     width: 100%;
-    height: 2rem;
-    font-size: 0.9rem;
-    line-height: 2rem;
+    height: 32px;
+    font-size: 14.4px;
+    line-height: 32px;
     text-align: center;
     list-style-type:none;
     color: #b5b0b0;
@@ -512,17 +549,17 @@
     background: #f3f3f3;
 }
 .btn {
-    width: 6rem;
-    height: 1.6rem;
+    width: 96px;
+    height: 25.6px;
     margin: auto;
     background-image: url(../image/xg.png);
     background-size: 100% 100%;
-    margin-bottom: 1.2rem;
+    margin-bottom: 19.2px;
     border: 0;
     background-repeat: no-repeat;
 }
 .li:hover {
-    transform:translateY(-20px);
+    transform:translateY(-1.25rem);
 }
 .li:hover .btn{
     background: url(../image/xgs.png);
@@ -549,32 +586,32 @@
 .al::after {
     content: '';
     width: 100%;
-    height: .1875rem;
+    height: 3px;
     background: #407be7;
     position: absolute;
-    bottom: -1.25rem;
+    bottom: -20px;
     left: 0;
 }
 
 /* 底部 */
 .footer-frame {
 	width: 100%;
-	height: 1.5rem;
+	height: 24px;
 }
 
 .footer {
-	padding-top: 3rem;
-	padding-bottom: 0.5rem;
+	padding-top: 48px;
+	padding-bottom: 8px;
 	background-color: #20a0ff;
-    margin-top: -2px;
+    margin-top: -0.125rem;
 }
 
 .footer .footer-col {
-	margin-bottom: 2.25rem;
+	margin-bottom: 36px;
 }
 
 .footer h4 {
-	margin-bottom: 0.625rem;
+	margin-bottom: 10px;
 	color: #fff;
 }
 
@@ -585,27 +622,27 @@
 
 .footer .footer-col.middle .list-unstyled .fas {
 	color: #fff;
-	font-size: 0.5rem;
-	line-height: 1.5rem;
+	font-size: 8px;
+	line-height: 24px;
 }
 
 .footer .footer-col.middle .list-unstyled .media-body {
-	margin-left: 0.5rem;
+	margin-left: 8px;
 }
 
 .footer .footer-col.last .list-unstyled .fas {
 	color: #fff;
-	font-size: 0.875rem;
-	line-height: 1.5rem;
+	font-size: 14px;
+	line-height: 24px;
 }
 
 .footer .footer-col.last .list-unstyled .media-body {
-	margin-left: 0.625rem;
+	margin-left: 10px;
 }
 
 .footer .footer-col.last .list-unstyled .fas.fa-globe {
-	margin-left: 1rem;
-	margin-right: 0.625rem;
+	margin-left: 16px;
+	margin-right: 10px;
 }
 
 .navbar {
@@ -618,46 +655,52 @@
 .alss {
     display: flex;
     justify-content: space-around;
-    width: 1400px;
+    width: 87.5rem;
     margin: auto;
 }
 
 /* 尝试滚动 */
 .jiesao {
-    height: 200vh;
+    /* height: 200vh; */
+    height: 125.8125rem;
     width: 100%;
 }
 .managements {
     /* height: 72vh; */
-    height: 90vh;
+    /* height: 90vh; */
+    height: 56.625rem;
     position: sticky;
-    top: 100px;
+    top: 6.25rem;
 }
 body {
     overflow-x: hidden;
 }
 
 .znyq {
-    height: 400vh;
+    /* height: 400vh; */
+    height: 251.6875rem;
     width: 100%;
 }
 .smart {
-    height: 90vh;
+    /* height: 90vh; */
+    height: 56.625rem;
     position: sticky;
-    top: 100px;
+    top: 6.25rem;
 }
 .tb {
     height: 300vh;
     width: 100%;
 }
 .fill {
-    height: 90vh;
+    /* height: 90vh; */
+    height: 56.625rem;
     position: sticky;
-    top: 100px;
+    top: 6.25rem;
 }
 .hanAll {
-    background: url(../image/backk.jpg) no-repeat;
-    background-size: 100%;
+    /* background: url(../image/backk.jpg) no-repeat;
+    background-size: 100%; */
+    background: #fff;
 }
 .abc .til {
     color: #fff !important;
@@ -675,18 +718,52 @@ body {
 .zhixun {
     display: block;
     position: fixed;
-    bottom: 20rem;
-    right: 0rem;
-    padding: 1rem;
+    bottom: 7.5rem;
+    right: 20px;
+    padding: 16px;
     background: #fff;
-    box-shadow: 3px 3px 10px #ccc;
+    box-shadow: .1875rem .1875rem .625rem #ccc;
     z-index: 99999999;
     text-align: center;
 }
 .zhixun p {
-    margin: 0.5rem 0;
+    margin: 8px 0;
 }
 .zhixun img {
-    width: 8rem;
+    width: 128px;
+}
+
+.tabOn {
+    background: #fff;
+    color: #20a0ff !important;
+}
+
+.consulting {
+    width: 3.125rem;
+    height: 3.125rem;
+    border-radius: 50%;
+    background: #fff;
+    position: fixed;
+    bottom: 3.75rem;
+    right: 6.25rem;
+    z-index: 4;
+    box-shadow: 0 0 20px 0px #cbcbcb;
+    cursor:pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.consulting:hover {
+    background: #3396FB;
+}
+.conImgConImg {
+    width: 40px;
+    height: 40px;
+    position: relative;
+    margin-top: 25px;
+    margin-left: 18px;
+}
+.conImgConImg img{
+    width: 100%;
 }
 

fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -15,7 +15,8 @@
     <script src="js/jquery1.42.min.js"></script>
     <script src="js/jquery.SuperSlide.2.1.3.js"></script>
 </head>
-<body data-spy="scroll" data-target=".fixed-top" style="overflow-y:none">
+
+<body data-spy="scroll" data-target=".fixed-top" id="body">
     <!-- 加载三个点 -->
     <!-- <div class="spinner-wrapper">
         <div class="spinner">
@@ -28,13 +29,13 @@
     <!-- <nav class="navbar navbar-expand-lg navbar-dark navbar-custom fixed-top"> -->
     <nav class="navbar headers" style="z-index: 9;">
         <div class="navigationBar">
-            <div class="navigationBarBack hanAll" id="all"></div>
+            <div class="navigationBarBack" id="all"></div>
             <div class="navigationTitle abc" id="abc">
                 <div class="flexs">
                     <div class="inBlock"><a href="./index.html"><img id="loGo" src="./image/logo.png" alt=""></a></div>
                     <div class="inBlock">
                         <ul class="navigationUl fonsColorBai aus">
-                            <li class="til" id="productHov">产品矩形</li>
+                            <li class="til" id="productHov">产品矩阵</li>
                             <li class="til"><a href="#customer"> 客户案例</li></a>
                             <li class="til"><a href="./mobile.html">手机版</a></li>
                             <li class="til"><a href="#pricing">产品定价</a></li>
@@ -53,11 +54,16 @@
         </div>
     </nav>
     <!-- 咨询客服 -->
-    <div class="zhixun" id="zhixun">
+    <div class="zhixun" id="zhixun" style="display: none">
         <p>微信扫码咨询</p>
         <img src="./image/codecopy.jpg" alt="">
         <p><span style="color: #595959;">客服QQ：</span>3052894409</p>
     </div>
+
+    <!-- 咨询的图标 -->
+    <div class="consulting" id="consulting">
+        <img id="consultigImg" src="./image/ions/kefu2.png" alt="">
+    </div>
     <!-- 产品介绍 -->
     <div class="product" id="product" style="display: none">
         <div class="connont">
@@ -76,7 +82,7 @@
         </div>
     </div>
     
-    <div style="height: 102px"></div>
+    <!-- <div style="height: 102px"></div> -->
     
     <!-- 轮播图 -->
     <div class="bannar">
@@ -180,7 +186,7 @@
         <div class="fill">
             <div class="connonst">
                 <h2>填报、审批、统计分分钟搞定</h2>
-                <div class="fillCon" id="fillCon">
+                <div class="fillCon fillCons" 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">
@@ -244,16 +250,17 @@
                 <p>提供便携强大的工时填报、审核、统计功能，围绕企业成本提供一站式解决方案。</p>
             </div>
             <ul class="tablTab" id="tablTabUl">
-                <!-- <li>工时填报</li>
-                <li>报告查看</li>
-                <li>工时审批</li>
-                <li>项目管理</li>
-                <li>成本统计</li>
-                <li>财务核算</li>
-                <li>客户管理</li>
-                <li>费用报销</li>
-                <li>工程管理</li> -->
-                <li><img src="./image/ions/1.png" alt=""></li>
+                <li class="tabOn"><img src="./image/ions/1.png" alt="" style="margin-right: 10px;">工时填报</li>
+                <li><img style="margin-right: 10px;" src="./image/ions/2.1.png" alt="">报告查看</li>
+                <li><img style="margin-right: 10px;" src="./image/ions/3.1.png" alt="">工时审批</li>
+                <li><img style="margin-right: 10px;" src="./image/ions/4.1.png" alt="">项目管理</li>
+                <li><img style="margin-right: 10px;" src="./image/ions/5.1.png" alt="">成本统计</li>
+                <li><img style="margin-right: 10px;" src="./image/ions/6.1.png" alt="">财务核算</li>
+                <li><img style="margin-right: 10px;" src="./image/ions/7.1.png" alt="">客户管理</li>
+                <li><img style="margin-right: 10px;" src="./image/ions/8.1.png" alt="">费用报销</li>
+                <li><img style="margin-right: 10px;" src="./image/ions/9.1.png" alt="">工程管理</li>
+                <li><img style="margin-right: 10px;" src="./image/ions/10.1.png" alt="">审批流</li>
+                <!-- <li><img src="./image/ions/1.png" alt=""></li>
                 <li><img src="./image/ions/2.1.png" alt=""></li>
                 <li><img src="./image/ions/3.1.png" alt=""></li>
                 <li><img src="./image/ions/4.1.png" alt=""></li>
@@ -262,7 +269,7 @@
                 <li><img src="./image/ions/7.1.png" alt=""></li>
                 <li><img src="./image/ions/8.1.png" alt=""></li>
                 <li><img src="./image/ions/9.1.png" alt=""></li>
-                <li><img src="./image/ions/10.1.png" alt=""></li>
+                <li><img src="./image/ions/10.1.png" alt=""></li> -->
             </ul>
             <div class="tabFool">
                 <div></div>
@@ -276,9 +283,57 @@
         <div class="connonst">
             <h2>来自客户的认可</h2>
             <div class="conImg">
-                <img src="./image/kehu1.jpg" alt="">
-                <img src="./image/kehu2.jpg" alt="">
-                <img src="./image/kehu3.jpg" alt="">
+                <div class="conImgCon">
+                    <img src="./image/kehu1.jpg" alt="">
+                    <div class="conImgConImg">
+                        <img src="./image/ions/chengdu.png" alt="">
+                    </div>
+                    <div class="conImgFiz">
+                        我们是做建筑工程设计的<br />
+                        需要把控每个项目的投入成本<br />
+                        工时管家系统提供了面向工程专业的系统化<br />
+                        标准化的工时统计，我们得以进行更好的<br />
+                        财务核算及人力成本控制!
+                    </div>
+                    <div class="conIngFoot">
+                        <p>成都中为工程科技</p>
+                        <span>项目主管</span>
+                    </div>
+                </div>
+                <div class="conImgCon">
+                    <img src="./image/kehu2.jpg" alt="">
+                    <div class="conImgConImg">
+                        <img src="./image/ions/xinchun.png" alt="">
+                    </div>
+                    <div class="conImgFiz">
+                        企业上市对我们的财务提出了严格的要求<br />
+                        工时管家系统帮助我们达到了目标<br />
+                        每个月的成本可以自动分摊到项目上<br />
+                        精确化管理研发项目成本，非常方便好用
+                    </div>
+                    <div class="conIngFoot">
+                        <p>芯传汇</p>
+                        <span>财务总监</span>
+                    </div>
+                </div>
+                <div class="conImgCon">
+                    <img src="./image/kehu3.jpg" alt="">
+                    <div class="conImgConImg">
+                        <img src="./image/ions/tanggu.png" alt="">
+                    </div>
+                    <div class="conImgFiz">
+                        财比多家供应商后，我们选择了工时管家<br />
+                        事实证明我们的选择是正确的<br />
+                        制药生产车间的各个环节人工成本得队数据化<br />
+                        我们实现了远程的成本把控
+                    </div>
+                    <div class="conIngFoot">
+                        <p>唐古信息科技</p>
+                        <span>总经理</span>
+                    </div>
+                </div>
+                <!-- <img src="./image/kehu2.jpg" alt="">
+                <img src="./image/kehu3.jpg" alt=""> -->
             </div>
         </div>
     </div>
@@ -460,5 +515,16 @@
 
     <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 () {
+            bodyScale();
+        };
+    </script>
 </body>
 </html>

fhKeeper/formulahousekeeper/inva_4_tivo/js/index.js

@@ -21,7 +21,6 @@ $('.auss li').hover(function () {
 
 // 智能系统管家模块的js效果
 let screenHeight = $(window).height()
-console.log(screenHeight)
 // 系统智能的高度
 let jiesaoTop = $('.jiesao').offset().top
 
@@ -29,19 +28,16 @@ let jiesaoTop = $('.jiesao').offset().top
 let znyqTop = $('.znyq').offset().top
 
 let fill = $('.fill').offset().top
-console.log(fill)
 
 $(window).scroll(function () {
     // 当前滚动的高度
     let currentTop = $(window).scrollTop()
     if(currentTop < 2) {
-        console.log('不执行')
-        $('#all').addClass('hanAll')
+        $('#all').removeClass('hanAll')
         $('#abc').addClass('abc')
         $("#loGo").attr("src", './image/logo.png')
     } else {
-        console.log('执行ll')
-        $("#all").removeClass("hanAll");
+        $("#all").addClass("hanAll");
         $("#abc").removeClass("abc");
         $("#loGo").attr("src", './image/logo.jpg')
     }
@@ -54,7 +50,6 @@ $(window).scroll(function () {
     }
     // 智能引擎滚动计算
     if(currentTop > znyqTop && currentTop < (znyqTop + screenHeight) && currentTop < 3000) {
-        console.log('执行')
         let znyqTopopacity = (2900 - currentTop)
         let znyqToppadding = (znyqTopopacity - 1) * 1.15 + 'px'
         $('#znyqH').css({'transform':'translate(0,'+znyqToppadding+')'})
@@ -85,12 +80,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 > fill - 300) {
+    //     $('#fillCon').addClass('fillCons')
+    // }
+    // if(currentTop < fill - 400){
+    //     $("#fillCon").removeClass("fillCons");
+    // }
 })
 
 // tab点击
@@ -100,8 +95,26 @@ $(function() {
         var arr = $('#tablTabUl li')
         for(var i in arr) {
             $('#tablTabUl li').eq(i).find('img').attr("src", './image/ions/'+ (+i + 1)+'.1.png')
+            $('#tablTabUl li').removeClass('tabOn')
         }
+        $(this).addClass("tabOn")
         $(this).find('img').attr("src", './image/ions/'+(+index + 1)+'.png')
         $('#finImg').attr("src", './image/gs'+(+index + 1)+'.jpg')
     })
-})
+})
+
+// 客服hover
+$('#zhixun').hover(function () {
+    $("#zhixun").show()
+    $("#consultigImg").attr("src", './image/ions/kefu1.png')
+},function () {
+    $("#zhixun").hide()
+    $("#consultigImg").attr("src", './image/ions/kefu2.png')
+})
+$('#consulting').hover(function () {
+    $("#zhixun").show()
+    $("#consultigImg").attr("src", './image/ions/kefu1.png')
+},function () {
+    $("#zhixun").hide()
+    $("#consultigImg").attr("src", './image/ions/kefu2.png')
+})

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -629,7 +629,6 @@
         select `user`.name as userName,report.create_date as createDate,report.create_time as createTime from report
         left join `user` on `user`.id=report.creator_id
         where report.company_id=#{companyId}
-        and report.state=1
         and report.create_date between #{startDate} and #{endDate}
         group by `user`.id,report.create_date
     </select>