Merge branch 'feature/v4.8.31' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/4.8.31_wmh

# Conflicts:
#	src/web/staticres/css/pc/index.css
#	src/web/templates/common/pchead.html
#	src/web/templates/pc/index.html

src/jfw/tag/menu.go

@@ -83,6 +83,8 @@ func (mc *MenuCache) GetSite(url string, isTopMenu bool) int {
 		return mainSite
 	} else if url == "/brand" {
 		return brandFlag
+	} else if url == "/industryInfo/index" {
+		return infoFlag
 	}
 
 	//

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

@@ -517,9 +517,13 @@
 
 .hot-container .hot-banner .right {
   max-width: 185px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  flex-wrap: wrap;
   min-height: 54px;
   margin-left: 11px;
-  margin-bottom: -10px;
 }
 
 .hot-container .hot-banner .right a {
@@ -528,7 +532,6 @@
   color: #1D1D1D;
   display: inline-block;
   margin-right: 12px;
-  margin-bottom: 10px;
 
 }
 

src/web/staticres/pccss/public-nav-1200.css

@@ -22,7 +22,7 @@
 }
 
 .public-nav .iner .logo {
-  /* float: left; */
+  float: left;
   width: 132px;
   line-height: 62px;
 }

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

@@ -33,6 +33,11 @@
   display: none;
 
 }
+.advertising_position .one img,
+.advertising_position .two img{
+  width: 100%;
+  height: 100%;
+}
 
 .advertising_position_index .one,
 .advertising_position_brand .one {
@@ -76,7 +81,7 @@
   /* margin: 0 5px; */
 }
 
-.logo_box .logo_desc .line {
+.logo_box .logo_desc .nav-logo-line {
   width: 12px;
   height: 1px;
 }
@@ -112,14 +117,14 @@
   color: #686868 !important;
 }
 
-.public-nav.light-bg-light-color .logo_box .logo_desc .line,
-#public-nav[data-theme="dark"] .iner .logo_box .logo_desc .line {
+.public-nav.light-bg-light-color .logo_box .logo_desc .nav-logo-line,
+#public-nav[data-theme="dark"] .iner .logo_box .logo_desc .nav-logo-line {
   background-color: rgba(255, 255, 255, 0.4);
 
 }
 
-#public-nav[data-theme="light"] .iner .logo_box .logo_desc .line,
-.public-nav.light-bg-dark-color .logo_box .logo_desc .line {
+#public-nav[data-theme="light"] .iner .logo_box .logo_desc .nav-logo-line,
+.public-nav.light-bg-dark-color .logo_box .logo_desc .nav-logo-line {
   background-color: #E0E0E0;
 }
 
@@ -147,7 +152,8 @@
   margin-top: 18px;
   overflow: hidden;
 }
-#public-nav .btn_box div{
+#public-nav .btn_box .nav-badge-box{
+  text-decoration: none;
   /* margin-left: 25px; */
   min-width: 104px;
   /* height: 36px; */
@@ -161,28 +167,27 @@
   font-size: 14px;
   margin-right: 12px;
   cursor: pointer;
-  float: left;
 }
 
-#public-nav[data-theme="light"] .iner .btn_box div{
+#public-nav[data-theme="light"] .iner .btn_box .nav-badge-box{
   background: rgba(255, 255, 255, 0.08);
   border: 1px solid rgba(0, 0, 0, 0.08);
   color: #686868;
 }
 
-#public-nav[data-theme="dark"] .iner .btn_box div{
+#public-nav[data-theme="dark"] .iner .btn_box .nav-badge-box{
   background: rgba(255, 255, 255, 0.08);
   border: 1px solid rgba(255, 255, 255, 0.24);
   color: #FFFFFF;
 }
 
-.public-nav.light-bg-light-color .btn_box div{
+.public-nav.light-bg-light-color .btn_box .nav-badge-box{
   background: rgba(255, 255, 255, 0.08) !important;
   border: 1px solid rgba(255, 255, 255, 0.24) !important;
   color: #FFFFFF !important;
 }
 
-.public-nav.light-bg-dark-color .btn_box div{
+.public-nav.light-bg-dark-color .btn_box .nav-badge-box{
   background: rgba(255, 255, 255, 0.08) !important;
   border: 1px solid rgba(0, 0, 0, 0.08) !important;
   ;
@@ -218,15 +223,15 @@
   display: none!important;
 
 }
-#public-nav[data-theme] .btn_box div:hover img[data-theme='dark'] {
+#public-nav[data-theme] .btn_box .nav-badge-box:hover img[data-theme='dark'] {
   display: block!important;
 
 }
-#public-nav[data-theme] .btn_box div:hover img[data-theme='light'] {
+#public-nav[data-theme] .btn_box .nav-badge-box:hover img[data-theme='light'] {
   display: none !important;
 
 }
-#public-nav[data-theme] .btn_box div:hover {
+#public-nav[data-theme] .btn_box .nav-badge-box:hover {
   background-color: #2ABED1!important;
   color: #ffff!important;
   border: 1px solid #2ABED1 !important;

src/web/templates/common/pchead.html

@@ -5,54 +5,73 @@
   <div class="advertising_position">
     {{if eq $TopMenu.Site 1}}
     <div class="advertising_position_index">
-      <img src="{{Msg "seo" "cdn"}}/images/index/new/index_bg.png?v={{Msg "seo" "version"}}" alt="" class="one" onclick="golink('index')">
-      <img src="{{Msg "seo" "cdn"}}/images/index/new/xyzx_bg.png?v={{Msg "seo" "version"}}" alt="" class="two" onclick="golink('zx')">
+      <a class="one" href="/" title="标讯主站">
+        <img src="{{Msg "seo" "cdn"}}/images/index/new/index_bg.png?v={{Msg "seo" "version"}}" alt="">
+      </a>
+      <a class="two" href="/industryInfo/index" title="资讯站群">
+        <img src="{{Msg "seo" "cdn"}}/images/index/new/xyzx_bg.png?v={{Msg "seo" "version"}}" alt="">
+      </a>
     </div>
     {{end}}
     {{if eq $TopMenu.Site 0}}
     <div class="advertising_position_brand">
-      <img src="{{Msg "seo" "cdn"}}/images/index/new/brand_bg.png?v={{Msg "seo" "version"}}" alt="" class="one" onclick="golink('brand')">
-      <img src="{{Msg "seo" "cdn"}}/images/index/new/xyzx_bg.png?v={{Msg "seo" "version"}}" alt="" class="two" onclick="golink('zx')">
+      <a class="one" href="/brand" title="品牌官网">
+        <img src="{{Msg "seo" "cdn"}}/images/index/new/brand_bg.png?v={{Msg "seo" "version"}}" alt="">
+      </a>
+      <a class="two" href="/industryInfo/index" title="资讯站群">
+        <img src="{{Msg "seo" "cdn"}}/images/index/new/xyzx_bg.png?v={{Msg "seo" "version"}}" alt="">
+      </a>
     </div>
     {{end}}
 
   </div>
     <div class="iner">
       <div class="logo_box">
-        <a class="logo" href="/">
+        {{if eq $TopMenu.Site 2}}
+          <a class="logo" href="/industryInfo/index" title="资讯站群">
+          {{ else if eq $TopMenu.Site 1 }}
+          <a class="logo" href="/brand" title="品牌官网">
+          {{ else }}
+          <a class="logo" href="/" title="标讯主站">
+        {{end}}
             <img data-theme="dark" src='{{Msg "seo" "cdn"}}/images/index/logo_white.png?v={{Msg "seo" "version"}}' alt="剑鱼标讯" />
             <img data-theme="light" src='{{Msg "seo" "cdn"}}/images/index/logo_main.png?v={{Msg "seo" "version"}}' alt="剑鱼标讯" />
         </a>
         <div class="logo_desc">
-          <div class="line"></div>
+          <div class="nav-logo-line"></div>
           {{if eq $TopMenu.Site 0}}
           <p class="index">标讯主站</p>
           {{end}}
           {{if eq $TopMenu.Site 1}}
           <p class="brand">品牌官网</p>
           {{end}}
-          <div class="line"></div>
+          {{if eq $TopMenu.Site 2}}
+          <p class="brand">资讯站群</p>
+          {{end}}
+          <div class="nav-logo-line"></div>
         </div>
         <div class="btn_box">
           {{if ne $TopMenu.Site 0}}
-          <div class="brand" onclick="navbtnGolink('index')">
+          <a href="/" title="标讯主站" class="nav-badge-box index">
             <img data-theme="dark" src='{{Msg "seo" "cdn"}}/images/index/new/book.png?v={{Msg "seo" "version"}}' alt="" />
             <img data-theme="light" src='{{Msg "seo" "cdn"}}/images/index/new/book1.png?v={{Msg "seo" "version"}}' alt="" />
             <span>标讯主站</span>
-          </div>
+          </a>
           {{end}}
           {{if ne $TopMenu.Site 1}}
-          <div class="index" onclick="navbtnGolink('brand')">
+          <a href="/brand" title="品牌官网" class="nav-badge-box brand">
             <img data-theme="dark" src='{{Msg "seo" "cdn"}}/images/index/new/king.png?v={{Msg "seo" "version"}}' alt="" />
             <img data-theme="light" src='{{Msg "seo" "cdn"}}/images/index/new/king1.png?v={{Msg "seo" "version"}}' alt="" />
             <span>品牌官网</span>
-          </div>
+          </a>
           {{end}}
-          <div class="zx" onclick="navbtnGolink('zx')">
+          {{if ne $TopMenu.Site 2}}
+          <a class="nav-badge-box zx" href="/industryInfo/index" title="资讯站群">
             <img data-theme="dark" src='{{Msg "seo" "cdn"}}/images/index/new/brand.png?v={{Msg "seo" "version"}}' alt="" />
             <img data-theme="light" src='{{Msg "seo" "cdn"}}/images/index/new/brand1.png?v={{Msg "seo" "version"}}' alt="" />
-            <span>行业资讯</span>
-          </div> 
+            <span>资讯站群</span>
+          </a>
+          {{end}}
         </div>
       </div>
         <div class="header-right-box fr">

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

@@ -280,6 +280,27 @@
 <script src='{{Msg "seo" "cdn"}}/js/swiper.min.js?v={{Msg "seo" "version"}}'></script>
 <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}'></script>
 <script type="text/javascript">
+  $('.public-nav .jynav li').hover(function(){
+    setNavTheme('light')
+    $('.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 = $('#bg_').height()
+    var scrollTop = $(window).scrollTop()
+    if (scrollTop >= bannerHeight) {
+      console.log('离开头部视图')
+    } else {
+      setNavTheme('dark')
+
+      var img = document.getElementsByClassName('swiper-slide-active')[0].children[0];
+      var theme = $(img).attr('data-theme')
+      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')
+      }
+    }
+  })
   var pageIndex = {
     init: function() {
       this.lunBoFn() // banner轮播

src/web/templates/pc/index.html

@@ -62,23 +62,23 @@
           <div class="left-tit">热门搜索</div>
           <div class="right-con">
             <div class="a_box">
-              <a href="/jylab/supsearch/index.html?keywords=信息化&searchvalue=&selectType=title">信息化</a>
-              <a href="/jylab/supsearch/index.html?keywords=软件&searchvalue=&selectType=title">软件</a>
-              <a href="/jylab/supsearch/index.html?keywords=网络安全&searchvalue=&selectType=title">网络安全</a>
-              <a href="/jylab/supsearch/index.html?keywords=监控&searchvalue=&selectType=title">监控</a>
-              <a href="/jylab/supsearch/index.html?keywords=安防&searchvalue=&selectType=title">安防</a>
-              <a href="/jylab/supsearch/index.html?keywords=服务器&searchvalue=&selectType=title">服务器</a>
-              <a href="/jylab/supsearch/index.html?keywords=弱电&searchvalue=&selectType=title">弱电</a>
-              <a href="/jylab/supsearch/index.html?keywords=智能化&searchvalue=&selectType=title">智能化</a>
-              <a href="/jylab/supsearch/index.html?keywords=数据中心&searchvalue=&selectType=title">数据中心</a>
-              <a href="/jylab/supsearch/index.html?keywords=大数据&searchvalue=&selectType=title">大数据</a>
-              <a href="/jylab/supsearch/index.html?keywords=信息安全&searchvalue=&selectType=title">信息安全</a>
-              <a href="/jylab/supsearch/index.html?keywords=计算机&searchvalue=&selectType=title">计算机</a>
-              <a href="/jylab/supsearch/index.html?keywords=云计算&searchvalue=&selectType=title">云计算</a>
-              <a href="/jylab/supsearch/index.html?keywords=物联网&searchvalue=&selectType=title">物联网</a>
-              <a href="/jylab/supsearch/index.html?keywords=物业管理&searchvalue=&selectType=title">物业管理</a>
-              <a href="/jylab/supsearch/index.html?keywords=视频监控&searchvalue=&selectType=title">视频监控</a>
-              <a href="/jylab/supsearch/index.html?keywords=物业服务&searchvalue=&selectType=title">物业服务</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=信息化&searchvalue=&selectType=title">信息化</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=软件&searchvalue=&selectType=title">软件</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=网络安全&searchvalue=&selectType=title">网络安全</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=监控&searchvalue=&selectType=title">监控</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=安防&searchvalue=&selectType=title">安防</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=服务器&searchvalue=&selectType=title">服务器</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=弱电&searchvalue=&selectType=title">弱电</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=智能化&searchvalue=&selectType=title">智能化</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=数据中心&searchvalue=&selectType=title">数据中心</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=大数据&searchvalue=&selectType=title">大数据</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=信息安全&searchvalue=&selectType=title">信息安全</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=计算机&searchvalue=&selectType=title">计算机</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=云计算&searchvalue=&selectType=title">云计算</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=物联网&searchvalue=&selectType=title">物联网</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=物业管理&searchvalue=&selectType=title">物业管理</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=视频监控&searchvalue=&selectType=title">视频监控</a>
+            <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords=物业服务&searchvalue=&selectType=title">物业服务</a>  
             </div>
           </div>
         </div>
@@ -93,16 +93,19 @@
             <div class="hot-banner">
               <div class="left blue">招标公告</div>
               <div class="right">
-                <a href="/jylab/supsearch/index.html?subtype=招标公告">招标公告</a>
-                <a href="/jylab/supsearch/index.html?subtype=招标信用">招标信用</a>
-                <a href="/jylab/supsearch/index.html?subtype=招标结果">招标结果</a>
-                <a href="">供应搜索</a>
+                <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?subtype=招标公告">招标公告</a>
+                <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?subtype=招标信用信息">招标信用</a>
+                <a href="{{if .T.hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?subtype=招标结果">招标结果</a>
               </div>
             </div>
             <div class="hot-banner">
               <div class="left yellow">项目数据</div>
               <div class="right">
+                {{if .T.hasLogin}}
+                <a href="/page_workDesktop/work-bench/page?link=/jylab/supsearch/index.html?subtype=拟建项目">拟建项目</a>
+                {{else}}
                 <a href="/list/stype/NJXM.html">拟建项目</a>
+                {{end}}
                 <a href="/list/stype/ZBCGYX.html">采购意向</a>
                 <a data-href="/succbi/nzj/app/nzj.app/nzj_search_1.spg" data-type="work-bench">拟在建项目</a>
                 <a href="/swordfish/page_big_pc/forecast_list">潜在项目预测</a>
@@ -111,8 +114,8 @@
             <div class="hot-banner">
               <div class="left green">机构数据</div>
               <div class="right">
-                <a data-href="/jylab/entSearch/index.html" data-type="work-bench">企业搜索</a>
-                <a href="/swordfish/page_big_pc/free/ent_follow">企业监控</a>
+                <a style="align-self: flex-start;" data-href="/jylab/entSearch/index.html" data-type="work-bench">企业搜索</a>
+                <a style="align-self: flex-start;" data-login target="_self" data-href="/swordfish/page_big_pc/free/ent_follow">企业监控</a>
                 <!-- <a href="">采购单位搜索</a> -->
               </div>
             </div>
@@ -279,7 +282,7 @@
             <a class="item-link" onclick="goSupsearch()">查看更多</a>
           </p>
         </div>
-        
+
         <div class="newsbeacon-content w1200">
           {{range $k,$v :=.T.newbids}}
           <div class="newsbeacon-item">
@@ -819,6 +822,19 @@
         }
       }
     })
+
+    $(window.document).on('click', '*[data-login]', function () {
+      var toHref = $(this).attr('data-href')
+      var type = $(this).attr('target')
+      var canNext = toHref
+      if (canNext) {
+        if (!loginflag) {
+          return openLoginDig()
+        }
+        window.open(toHref, type || '_blank')
+      }
+    })
+
     $('.public-nav .jynav li').hover(function(){
       setNavTheme('light')
       $('.loginBtn').css({'color': '#1d1d1d', 'border-color': 'rgb(224, 224, 224)'})