Merge branch 'dev/4.8.31_wmh' of qmx/jy into feature/v4.8.31

src/web/staticres/public-pc/css/header-nav.css

@@ -198,6 +198,22 @@
 #public-nav[data-theme='light'] .btn_box  img[data-theme='light'] {
   display: block ;
 
+}
+.public-nav.light-bg-light-color .btn_box  img[data-theme='dark']{
+  display: block !important;
+
+}
+.public-nav.light-bg-dark-color .btn_box  img[data-theme='light']{
+  display: block !important ;
+
+}
+.public-nav.light-bg-light-color .btn_box  img[data-theme='light']{
+  display: none!important;
+
+}
+.public-nav.light-bg-dark-color .btn_box  img[data-theme='dark']{
+  display: none!important;
+
 }
 #public-nav[data-theme] .btn_box div:hover img[data-theme='dark'] {
   display: block;

src/web/staticres/public-pc/css/pc-bottom.css

@@ -242,6 +242,7 @@
   border-top: 2px solid #FFF;
   border-left: 2px solid #FFF;
   box-sizing: border-box;
+  cursor: pointer;
 }
 
 .right-side-box .right-side-wx {
@@ -252,6 +253,7 @@
   border-radius: 0;
   border-left: 2px solid #FFF;
   box-sizing: border-box;
+  cursor: pointer;
 }
 
 .right-side-box .right-side-app {
@@ -263,6 +265,7 @@
   border-bottom: 2px solid #FFF;
   border-left: 2px solid #FFF;
   box-sizing: border-box;
+  cursor: pointer;
 }
 
 .right-side-box .right-side-kf {
@@ -273,6 +276,7 @@
   background: linear-gradient(180deg, #F56500 0%, #F79E51 100%) !important;
   border-left: 2px solid #FFF;
   box-sizing: border-box;
+  cursor: pointer;
 }
 
 /* .right-side-box .right-side-pop::before {
@@ -661,7 +665,7 @@
   box-sizing: border-box;
 }
 
-.kf-phone::after {
+/* .kf-phone::after {
   content: '';
   position: absolute;
   left: 32px;
@@ -671,7 +675,7 @@
   border-left: 6px solid transparent;
   border-bottom: 8px solid #2cb7ca;
   border-right: 6px solid transparent;
-}
+} */
 
 .kf-phone-afternone::after {
   display: none;

src/web/templates/pc/index.html

@@ -804,12 +804,6 @@
     $("#share-weixinF").mouseout(function(){
       $("#share-weixin").addClass("hidden");
     });
-    if(!loginflag){
-      $('.jy-index-freeRegistration').show()
-    }else{
-      $('.jy-index-freeRegistration').hide()
-
-    }
     window.addEventListener('scroll', function() {
       // var img = document.getElementsByClassName('swiper-slide-active')[0].children[0];
       var img = document.getElementById('bg_')
@@ -828,10 +822,10 @@
       $('.loginBtn').css({'color': '#1d1d1d', 'border-color': 'rgb(224, 224, 224)'})
       $('.public-nav').removeClass('light-bg-light-color').removeClass('light-bg-dark-color')
     }, function() {
-      var bannerHeight = $('#bannerSwiper').height()
+      var bannerHeight = $('#bg_').height()
       var scrollTop = $(window).scrollTop()
       if (scrollTop >= bannerHeight) {
-        console.log('轮播图离开视图')
+        console.log('离开头部视图')
       } else {
         setNavTheme('dark')
         // $('.loginBtn').css({'color': '#fff', 'border-color': '#fff'})
@@ -1033,6 +1027,9 @@
       })
       }
   }
+  window.loginCallback = function () {
+    $('.jy-index-freeRegistration').hide()
+  }
   </script>
   {{include "/common/baiducc.html"}}
   <script type="text/javascript">