Merge branch 'feature/v4.8.31' into feature/v4.8.31_wky

src/web/staticres/css/pc/index.css

@@ -98,9 +98,9 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  width: 960px;
+  width: 905px;
   height: 24px;
-  margin: 24px auto 0;
+  margin: 0px auto 40px;
 }
 
 .jy-index .noActive {
@@ -574,27 +574,27 @@
 
 .jy-index-product .svip-product {
   /* background-image: url(/images/index/svip-product.png); */
-  background-image: url(/images/index/new/insight4.png);
+  background-image: url(/images/index/new/Insight4.png);
 }
 
 .jy-index-product .bigmember-product {
   /* background-image: url(/images/index/bigmember-product.png); */
-  background-image: url(/images/index/new/insight5.png);
+  background-image: url(/images/index/new/Insight5.png);
 }
 
 .jy-index-product .buyer-product {
   /* background-image: url(/images/index/buyer-product.png); */
-  background-image: url(/images/index/new/insight1.png);
+  background-image: url(/images/index/new/Insight1.png);
 }
 
 .jy-index-product .agency-product {
   /* background-image: url(/images/index/agency-product.png); */
-  background-image: url(/images/index/new/insight2.png);
+  background-image: url(/images/index/new/Insight2.png);
 }
 
 .jy-index-product .data-market-product {
   /* background-image: url(/images/index/data-market-product.png); */
-  background-image: url(/images/index/new/insight3.png);
+  background-image: url(/images/index/new/Insight3.png);
 }
 
 .jy-index-product .p-link {
@@ -1363,7 +1363,7 @@
 
 /* 最新标讯 */
 .jy-index-newsbeacon {
-  min-height: 846px;
+  /* min-height: 846px; */
   padding: 60px 0;
   background: url("/images/index/new/news-bg.png") no-repeat center center;
   background-size: 100% 100%;

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

@@ -146,10 +146,10 @@
 }
 .btn_box div{
   /* margin-left: 25px; */
-  /* min-width: 100px; */
+  min-width: 104px;
   /* height: 36px; */
   max-height: 36px;
-  min-width: max-content;
+  /* min-width: max-content; */
   padding: 7px 10px;
   display: flex;
   align-items: center;

src/web/templates/common/pchead.html

@@ -233,11 +233,14 @@ $("#bidLogin .login-dig-input-box [name='verify_entname']").on('input', function
 })
 function golink (type){
   if(type == 'index'){
-    location.href = '/'
+    // location.href = '/'
+    window.open('/')
   }else if(type == 'brand'){
-    location.href = '/brand/index'
+    // location.href = '/brand/index'
+    window.open('/brand/index')
   }else if(type == 'zx'){
-    location.href = '/industryInfo/index'
+    // location.href = '/industryInfo/index'
+    window.open('/industryInfo/index')
   }
 
 

src/web/templates/pc/brand/index.html

@@ -461,8 +461,18 @@
   $(function () {
     pageIndex.init()
     haslogin({{.T.logid}});
-
-
+    window.addEventListener('scroll', function() { // 滚动到顶部恢复动态获取的主体色
+      var img = document.getElementsByClassName('swiper-slide-active')[0].children[0];
+      var theme = $(img).attr('data-theme')
+      var opa = $(document).scrollTop() / 20
+      if (opa < 1) {
+        if (theme === 'light') {
+          $('.public-nav').addClass('light-bg-dark-color').removeClass('light-bg-light-color')
+        } else {
+          $('.public-nav').addClass('light-bg-light-color').removeClass('light-bg-dark-color')
+        }
+      }
+    })
     // 首页底部广告位
     {{$bottom:=(Ad "jy_pc_brand_index_bottom" -1 .Host)}}
     var bottom_img = ({{$bottom}})