Merge branch 'lx_xinhot_h5_20190307'

h5/css/style.css

@@ -78,10 +78,10 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus{ -webkit-box-
 .about-box2 .about-box2-content .big img{ width: 2.05rem; height: 2.04rem; opacity: 1; } 
 .about-box2 .about-box2-content .big img{ width: 2.05rem; height: 2.04rem; opacity: 1; } 
 
 
 .about-box3{ display: block; margin: 0.5rem 0; text-align: center; }
 .about-box3{ display: block; margin: 0.5rem 0; text-align: center; }
-.about-box3 dl{ display: inline-block; margin: 0 0.2rem; }
+.about-box3 dl{ display: inline-block; margin: 0 0.3rem; }
 .about-box3 dl dt{ text-align: center; margin-bottom: 0.2rem; }
 .about-box3 dl dt{ text-align: center; margin-bottom: 0.2rem; }
 .about-box3 dl dt img{ width: 0.94rem; height: 0.94rem; }
 .about-box3 dl dt img{ width: 0.94rem; height: 0.94rem; }
-.about-box3 dl dt dd{ font-size: 0.26rem; color: #07275a; }
+.about-box3 dl dd{ font-size: 0.26rem; color: #07275a; }
 
 
 /*联系我们*/
 /*联系我们*/
 .contact-box1{ width: 6.9rem; margin: 0.5rem auto; position: relative; }
 .contact-box1{ width: 6.9rem; margin: 0.5rem auto; position: relative; }
@@ -183,7 +183,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus{ -webkit-box-
 .product-mask-content .product-mask-img{ margin: 0.5rem 0.5rem;  }
 .product-mask-content .product-mask-img{ margin: 0.5rem 0.5rem;  }
 .product-mask-content .product-mask-img li{ margin: 0 0.1rem; display: inline-block; }
 .product-mask-content .product-mask-img li{ margin: 0 0.1rem; display: inline-block; }
 .product-mask-content .product-mask-img li img{ width: 1.7rem; height: 1.3rem; }
 .product-mask-content .product-mask-img li img{ width: 1.7rem; height: 1.3rem; }
-.product-mask-content .product-mask-introduce{  margin: 0 0.5rem; max-height: 5rem; overflow-y: scroll; }
+.product-mask-content .product-mask-introduce{  margin: 0 0.5rem; max-height: 4rem; overflow-y: scroll; }
 .product-mask-content .product-mask-introduce p{ text-indent: 2em; font-size: 0.26rem; color: #666; line-height: 0.4rem; }
 .product-mask-content .product-mask-introduce p{ text-indent: 2em; font-size: 0.26rem; color: #666; line-height: 0.4rem; }
 
 
 /*.container{ position: relative; }
 /*.container{ position: relative; }

h5/js/index.js

@@ -44,6 +44,9 @@ var xinhot = {
             // var top = $(".product-mask-content").offset().top; //获取某个元素距顶部的距离
             // var top = $(".product-mask-content").offset().top; //获取某个元素距顶部的距离
             // $("body,html").animate({scrollTop:(top-50)+"px"},500);
             // $("body,html").animate({scrollTop:(top-50)+"px"},500);
             $("body,html").css({"overflow":"hidden"});
             $("body,html").css({"overflow":"hidden"});
+            $("body,html").bind("touchmove",function(e){
+                e.prevenDefault();
+            });
 
 
             $.ajax({
             $.ajax({
                 url:'./json/brandData.json',
                 url:'./json/brandData.json',
@@ -74,6 +77,9 @@ var xinhot = {
             // var top = $(".contact-mask-content").offset().top; //获取某个元素距顶部的距离
             // var top = $(".contact-mask-content").offset().top; //获取某个元素距顶部的距离
             // $("body,html").animate({scrollTop:(top-50)+"px"},500);
             // $("body,html").animate({scrollTop:(top-50)+"px"},500);
             $("body,html").css({"overflow":"hidden"});
             $("body,html").css({"overflow":"hidden"});
+            $("body,html").bind("touchmove",function(e){
+                e.prevenDefault();
+            });
             
             
             $.ajax({
             $.ajax({
                 url:'./json/jobData.json',
                 url:'./json/jobData.json',