chao %!s(int64=4) %!d(string=hai) anos
pai
achega
cf5b5fa6e0

+ 13 - 5
src/main/resources/static/css/base/base.h5.css

@@ -117,14 +117,22 @@
 .loginAlert .bd span{display:block}
 .loginAlert .bd a.btn{display:block;width:55.2vw;height:11.6vw;line-height:11.6vw;text-align:center;color:#FFF;background:#E15621;border-radius:5.8vw;margin:5.4vw auto 4.2vw}
 .loginAlert .bd em.btn{font-style:normal;padding:0 5.4vw}
-
+/* 咨询,回到顶部 */
 #scrollTop{display:none;position:fixed;right:0;;z-index:9999;bottom:4vw;}
 #scrollTop .item{width:12vw;background-color:rgba(190,194,201,.3);box-sizing:border-box;text-align:center;margin-bottom:2.5vw;font-size:3vw;position:relative}
 #scrollTop .item>span{box-sizing:border-box;display:block;padding:1.5vw;line-height:3.4vw;}
-#scrollTop .item .toTop{width:100%;height:100%;}
-#scrollTop .item .toTop:before{display:block;margin:0 auto;width:5.8vw;height:5.8vw;background-position:21.5% 26%;}
-
-
+#scrollTop .item .phone,#scrollTop .item .toTop{width:100%;height:100%;}
+#scrollTop .item .phone:before,#scrollTop .item .toTop:before{display:block;margin:0 auto;width:5.8vw;height:5.8vw;}
+#scrollTop .item .phone:before{background-position:31.5% 26%;}
+#scrollTop .item .toTop:before{background-position:21.5% 26%;}
+#scrollTop .phoneHover{display:none;background-color:rgba(74,79,88,.7);z-index:999;}
+#scrollTop .phoneHover>div{box-sizing:border-box;width:74.6vw;height:107.3vw;padding-top:32vw;background:url(/img/common/hotline_m.jpg) no-repeat left top;background-size:100% 100%;border-radius:1.6vw;position:relative;top:50%;margin:-60vw auto 0 auto;line-height:9.6vw;font-size:4.2vw}
+#scrollTop .phoneHover i{font-style:normal;color:#FFF}
+#scrollTop .phoneHover .close{position:absolute;left:50%;bottom:-12vw;margin-left:-2.7vw;width:5.4vw;height:5.4vw;line-height:5.4vw;text-align:center;border:1px solid #FFF;border-radius:50%;font-size:0}
+#scrollTop .phoneHover .close:before{content:'\2715';font-size:4vw}
+#scrollTop .phoneHover span{color:#93979F;display:block;margin-top:1.4vw}
+#scrollTop .phoneHover a{color:#E15616}
+#scrollTop .phoneHover a>i{display:inline-block;height:7.2vw;line-height:7.2vw;padding:0 2vw;background:#F55C5C;border-radius:3.6vw;margin-left:4vw;font-size:3.4vw}
 
 
 

+ 9 - 3
src/main/resources/static/css/base/base.pc.css

@@ -193,13 +193,19 @@ body{min-width:1184px;}
 .loginAlert .bd a.btn{right:16px;color:#FFF;background:#E15621}
 .loginAlert .bd em.btn{font-style:normal;right:100px;color:#22272E;background:#FFF;border:1px solid #B8BFCA}
 
-/* 首页右侧导航 */
+/* 咨询,回到顶部 */
 #scrollTop{display:none;position:fixed;right:50%;margin-right:-700px;width:88px;z-index:9999;bottom:120px;}
 #scrollTop .item{width:100%;background-color:#fff;box-sizing:border-box;text-align:center;box-shadow:0 2px 4px rgb(254,246,243);border-radius:2px;margin-bottom:10px;font-size:12px;position:relative}
-#scrollTop .item span{display:block;width:100%;box-sizing:border-box}
-#scrollTop .item>span{position:relative;cursor:pointer;}
+#scrollTop .item>span{display:block;width:100%;box-sizing:border-box;position:relative;cursor:pointer;}
 #scrollTop .item>span:hover{color:#E15616;}
+#scrollTop .item .phone{padding:4px 16px 4px 48px;line-height:16px;}
+#scrollTop .item .phone:before{width:32px;height:32px;background-position:0 -254px;position:absolute;top:4px;left:16px}
 #scrollTop .item .toTop{padding:12px 16px 12px 48px;line-height:16px;}
 #scrollTop .item .toTop:before{width:32px;height:32px;background-position:-42px -254px;position:absolute;top:4px;left:16px}
+#scrollTop .item .phoneHover{display:none;position:absolute;left:-282px;top:-168px;z-index:999;width:281px;height:383px;background:url(/img/common/hotline.png) no-repeat left top;box-sizing:border-box;padding:120px 20px 0 0;line-height:32px;font-size:16px;white-space:nowrap}
+#scrollTop .item .phoneHover a{color:#E15616}
+#scrollTop .item .phoneHover span{color:#93979F;margin-top:10px}
+#scrollTop .item .phoneHover a:hover{text-decoration:underline}
+#scrollTop .item:hover .phoneHover{display:block}
 
 

+ 1 - 1
src/main/resources/static/css/base/init.css

@@ -1,6 +1,6 @@
 @charset "utf-8";
 html,body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,p,pre,img,table,tr,th,td,form,input,textarea,button{margin:0;padding:0;}
-body,input,textarea,button,select{font-family:Source Han Sans CN,'Microsoft YaHei',SimSun,Arial,Helvetica,sans-serif;}
+body,input,textarea,button,select{font-family:'Microsoft YaHei',SimSun,Arial,Helvetica,sans-serif;}
 body{width:100%;min-height:100%;font-size:14px;color:#4A4F58;background:#F5F5F5;}
 .clear{clear:both;}
 .clear:after{content:'';display:table;clear:both;}

+ 2 - 18
src/main/resources/static/css/index/index.h5.css

@@ -3,6 +3,8 @@
 * 移动端
 */
 li{list-style:none;}
+/* 首页右侧导航 */
+#advertising,#sideNav{display:none;}
 /* 轮播 */
 #swiper-container{width:100%;height:48vw;overflow:hidden;position:relative}
 #swiper-container .swiper-wrapper{position:relative;height:100%;z-index:0}
@@ -77,22 +79,4 @@ li{list-style:none;}
 .supplierList ul li a{display:block;width:100%;height:100%}
 .supplierList ul li img{width:100%;height:21.4vw;}
 .supplierList li p{position:absolute;left:0;bottom:0;width:100%;box-sizing:border-box;line-height:5.2vw;text-align:center;background:rgba(255,255,255,.6);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-size:2.6vw;color:#93979F}
-/* 首页右侧导航 */
-#advertising,#sideNav .item:first-child{display:none;}
-#sideNav{display:none;position:fixed;right:0;;z-index:9999;bottom:4vw;}
-#sideNav .item{width:12vw;background-color:rgba(190,194,201,.3);box-sizing:border-box;text-align:center;margin-bottom:2.5vw;font-size:3vw;position:relative}
-#sideNav .item>span{box-sizing:border-box;display:block;padding:1.5vw;line-height:3.4vw;}
-#sideNav .item .phone,#sideNav .item .toTop{width:100%;height:100%;}
-#sideNav .item .phone:before,#sideNav .item .toTop:before{display:block;margin:0 auto;width:5.8vw;height:5.8vw;}
-#sideNav .item .phone:before{background-position:31.5% 26%;}
-#sideNav .item .toTop:before{background-position:21.5% 26%;}
-#sideNav .phoneHover{display:none;background-color:rgba(74,79,88,.7);z-index:999;}
-#sideNav .phoneHover>div{box-sizing:border-box;width:74.6vw;height:107.3vw;padding-top:32vw;background:url(/img/common/hotline_m.jpg) no-repeat left top;background-size:100% 100%;border-radius:1.6vw;position:relative;top:50%;margin:-60vw auto 0 auto;line-height:9.6vw;font-size:4.2vw}
-#sideNav .phoneHover i{font-style:normal;color:#FFF}
-#sideNav .phoneHover .close{position:absolute;left:50%;bottom:-12vw;margin-left:-2.7vw;width:5.4vw;height:5.4vw;line-height:5.4vw;text-align:center;border:1px solid #FFF;border-radius:50%;font-size:0}
-#sideNav .phoneHover .close:before{content:'\2715';font-size:4vw}
-#sideNav .phoneHover span{color:#93979F;display:block;margin-top:1.4vw}
-#sideNav .phoneHover a{color:#E15616}
-#sideNav .phoneHover a>i{display:inline-block;height:7.2vw;line-height:7.2vw;padding:0 2vw;background:#F55C5C;border-radius:3.6vw;margin-left:4vw;font-size:3.4vw}
-
 

+ 3 - 15
src/main/resources/static/css/index/index.pc.css

@@ -31,7 +31,7 @@ li{list-style:none;}
 .floorTit h5{font-weight:normal;color:#999FAB;font-size:14px;line-height:16px}
 .floorTit a.more{position:absolute;right:0;top:40px;height:30px;line-height:30px}
 .floorTit a.more:after{margin-left:5px;content:'\276F'}
-.floorCon{width:1184px;margin:0 auto}
+.floorCon{width:1184px;margin:0 auto;overflow: hidden;}
 .floorList{width:200%}
 .floorList>li{width:224px;height:278px;margin-right:16px;background:#FFF;position:relative}
 .floorList>li a{display:block;width:100%;height:100%}
@@ -77,22 +77,10 @@ li{list-style:none;}
 #advertising .close{position:absolute;right:0;top:0;width:20px;height:20px;line-height:20px;text-align:center;font-size:0;background:rgba(255,255,255,.6)}
 #advertising .close:before{content:'\2715';font-size:16px}
 /* 首页右侧导航 */
-#sideNav{display:none;position:fixed;right:50%;margin-right:-700px;width:88px;z-index:9999;bottom:120px;}
+#sideNav{display:none;position:fixed;right:50%;margin-right:-700px;width:88px;z-index:9999;bottom:220px;}
 #sideNav .item{width:100%;background-color:#fff;box-sizing:border-box;text-align:center;box-shadow:0 2px 4px rgb(254,246,243);border-radius:2px;margin-bottom:10px;font-size:12px;position:relative}
-#sideNav .item>a,#sideNav .item span{display:block;width:100%;box-sizing:border-box}
-#sideNav .item>a{padding:8px 6px;line-height:14px;position:relative}
+#sideNav .item>a{display:block;width:100%;box-sizing:border-box;padding:8px 6px;line-height:14px;position:relative}
 #sideNav .item>a:before{content:'';position:absolute;width:70px;left:9px;top:0;border-top:1px solid #FEF6F3}
 #sideNav .item>a:first-child:before{display:none}
 #sideNav .item>a.on{background:#FEF6F3;color:#E15616}
-#sideNav .item>span{position:relative;cursor:pointer;}
-#sideNav .item>span:hover{color:#E15616;}
-#sideNav .item .phone{padding:4px 16px 4px 48px;line-height:16px;}
-#sideNav .item .phone:before{width:32px;height:32px;background-position:0 -254px;position:absolute;top:4px;left:16px}
-#sideNav .item .toTop{padding:12px 16px 12px 48px;line-height:16px;}
-#sideNav .item .toTop:before{width:32px;height:32px;background-position:-42px -254px;position:absolute;top:4px;left:16px}
-#sideNav .item .phoneHover{display:none;position:absolute;left:-282px;top:-168px;z-index:999;width:281px;height:383px;background:url(/img/common/hotline.png) no-repeat left top;box-sizing:border-box;padding:120px 20px 0 0;line-height:32px;font-size:16px;white-space:nowrap}
-#sideNav .item .phoneHover a{color:#E15616}
-#sideNav .item .phoneHover span{color:#93979F;margin-top:10px}
-#sideNav .item .phoneHover a:hover{text-decoration:underline}
-#sideNav .item:hover .phoneHover{display:block}
 

+ 1 - 1
src/main/resources/static/css/product/list.css

@@ -6,7 +6,7 @@ li{list-style:none}
 @media screen and (min-width:768px){
     .crumbs{width:1184px;margin:0 auto;box-sizing:border-box;padding:15px 0;font-size:16px}
     .sortBox{width:1184px;margin:16px auto;box-sizing:border-box;padding:12px;font-size:0;text-align:center;background:#FFF}
-    .sortBox li{display:inline-block;width:128px;height:40px;line-height:40px;font-size:16px;background:#F5F5F5;color:#93979F;position:relative;margin:0 8px}
+    .sortBox li{display:inline-block;cursor:pointer;width:128px;height:40px;line-height:40px;font-size:16px;background:#F5F5F5;color:#93979F;position:relative;margin:0 8px}
     .sortBox li.on,.sortBox li.up,.sortBox li.down{background:#FFE6DC;color:#E15616}
     .sortBox li:before,.sortBox li:after{position:absolute;right:35px;content:'';width:0;height:0;border-style:solid}
     .sortBox li:before{border-width:0 5px 5px 5px;border-color:transparent transparent #BEC2C9 transparent;top:14px}

+ 2 - 2
src/main/resources/static/css/single-page/promotions.css

@@ -8,7 +8,7 @@ li{list-style:none}
     .promotions a{display:block;font-size:20px;}
     .promotions img{display:block;width:100%;height:auto}
     .promotions p{position:absolute;left:0;bottom:0;width:100%;height:48px;line-height:48px;box-sizing:border-box;padding:0 360px 0 16px;background:rgba(255,255,255,.8);color:#E15616;}
-    .promotions .time{position:absolute;right:0;color:#FFF;height:48px;line-height:48px;padding:0 16px;background:-webkit-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:-moz-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:-o-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);opacity:.8}
+    .promotions .time{position:absolute;right:0;color:#FFF;height:48px;line-height:48px;padding:0 16px;background-color:#F94B4B;background:-webkit-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:-moz-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:-o-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:-ms-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);opacity:.8}
     .promotions .finish{position:absolute;left:0;bottom:0;width:100%;height:100%;background:rgba(255,255,255,.8) url(/img/common/act-end.png) no-repeat center center}
 
 
@@ -22,7 +22,7 @@ li{list-style:none}
 .promotions a{display:block;font-size:3.1vw;white-space:nowrap}
 .promotions img{display:block;width:100%;height:auto}
 .promotions p{position:absolute;left:0;bottom:0;width:100%;height:9.6vw;line-height:9.6vw;box-sizing:border-box;padding:0 1vw;background:rgba(255,255,255,.8);color:#E15616;font-size:3.4vw;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
-.promotions .time{position:absolute;top:0;left:50%;transform:translateX(-50%);color:#FFF;height:6.4vw;line-height:6.4vw;padding:0 2.6vw;background:-webkit-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:-moz-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:-o-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);opacity:.8}
+.promotions .time{position:absolute;top:0;left:50%;transform:translateX(-50%);color:#FFF;height:6.4vw;line-height:6.4vw;padding:0 2.6vw;background:-webkit-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:-moz-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:-o-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:-ms-linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);background:linear-gradient(135deg,rgba(249,75,75,1) 0%,rgba(188,60,255,1) 100%);opacity:.8}
 .promotions .finish{position:absolute;left:0;bottom:0;width:100%;height:100%;background:rgba(255,255,255,.8) url(/img/common/act-end.png) no-repeat center center;background-size:32%;}
 
 

+ 23 - 11
src/main/resources/static/js/base.js

@@ -95,18 +95,30 @@ $(function(){
     $('#scrollTop').on("click", '.toTop',function () {
         $("html,body").animate({scrollTop:0},500);
     });
-        // 侧边栏滚动判断
-        $(window).scroll(function () {
-            if($('body').attr("style") && $('body').attr("style").indexOf('fixed')>0){
-                return false;
-            }
-            var scoll = Math.max($('html').scrollTop(), $('body').scrollTop());
-            if(scoll >200){
-                $('#scrollTop').show();
-            }else {
-                $('#scrollTop').hide();
-            }
+    // 热线
+    if(!isPC){
+        $('#scrollTop').on("click", '.phone',function () {
+            $('#scrollTop').find('.phoneHover').show();
+            fixedBody();
+        }).on("click", '.phoneHover div',function (e) {
+            e.stopPropagation();
+        }).on("click", '.phoneHover,.phoneHover .close',function () {
+            $('#scrollTop').find('.phoneHover').hide();
+            looseBody();
         });
+    }
+    // 侧边栏滚动判断
+    $(window).scroll(function () {
+        if($('body').attr("style") && $('body').attr("style").indexOf('fixed')>0){
+            return false;
+        }
+        var scoll = Math.max($('html').scrollTop(), $('body').scrollTop());
+        if(scoll >200){
+            $('#scrollTop').show();
+        }else {
+            $('#scrollTop').hide();
+        }
+    });
 
 });
 // 公共方法

+ 0 - 14
src/main/resources/static/js/index.js

@@ -203,8 +203,6 @@ var homeData = new Vue({
                 $('#advertising').hide();
             }
         });
-        // 移除公共置顶
-        $('#scrollTop').remove();
         // 置顶
         $('#sideNav').on("click", '.toTop',function () {
             $("html,body").animate({scrollTop:0},500);
@@ -215,18 +213,6 @@ var homeData = new Vue({
             var floorScroll = $('.floorTit [data-id='+id+']').offset().top;
             $('html,body').animate({scrollTop: floorScroll},600);
         });
-        // 热线
-        if(!isPC){
-            $('#sideNav').on("click", '.phone',function () {
-                $('#sideNav').find('.phoneHover').show();
-                fixedBody();
-            }).on("click", '.phoneHover div',function (e) {
-                e.stopPropagation();
-            }).on("click", '.phoneHover,.phoneHover .close',function () {
-                $('#sideNav').find('.phoneHover').hide();
-                looseBody();
-            });
-        }
         //关闭广告图
         $('#advertising').on('click','.close',function () {
             $(this).parents('.item').hide();

+ 12 - 0
src/main/resources/templates/components/footer.html

@@ -57,6 +57,18 @@
         </div>
     </div>
     <div id="scrollTop">
+        <div class="item">
+            <span class="phone icon mIcon">咨询热线</span>
+            <div class="phoneHover mFixed">
+                <div>
+                    <p><a href="tel:075522907771">0755-22907771<i class="h5Only">点击咨询</i></a></p>
+                    <p><a href="tel:15338851365">153-3885-1365<i class="h5Only">点击咨询</i></a></p>
+                    <p><span>工作日</span></p>
+                    <p>周一 ~ 周五 / 09:00~18:00</p>
+                    <i class="close"></i>
+                </div>
+            </div>
+        </div>
         <div class="item">
             <span class="toTop icon mIcon">置顶</span>
         </div>

+ 0 - 15
src/main/resources/templates/index.html

@@ -172,21 +172,6 @@
         <div class="item">
             <a v-for="nav in asideNav" :data-id="nav.id" v-text="nav.value" href="javascript:void(0);"></a>
         </div>
-        <div class="item">
-            <span class="phone icon mIcon">咨询热线</span>
-            <div class="phoneHover mFixed">
-                <div>
-                    <p><a href="tel:075522907771">0755-22907771<i class="h5Only">点击咨询</i></a></p>
-                    <p><a href="tel:15338851365">153-3885-1365<i class="h5Only">点击咨询</i></a></p>
-                    <p><span>工作日</span></p>
-                    <p>周一 ~ 周五 / 09:00~18:00</p>
-                    <i class="close"></i>
-                </div>
-            </div>
-        </div>
-        <div class="item">
-            <span class="toTop icon mIcon">置顶</span>
-        </div>
     </div>
     <!--左侧广告图-->
     <div id="advertising">