Merge branch 'dev/v4.8.83_cyl' of qmx/jy into feature/v4.8.83

src/web/staticres/css/pc.css

@@ -2015,12 +2015,18 @@ form{
 .jy_classify_l .jy_classify_column_content {
 	display: flex;
 	flex-direction: column;
-	/* flex-wrap: wrap;
-	max-height: 128px; */
+	flex-wrap: wrap;
+	max-height: 130px;
 }
 .jy_classify_l .jy_classify_column .jy_classify_column_content_item{
 	position: relative;
+	margin-left: 32px;
 }
+/* 前六个无左边距 */
+.jy_classify_l .jy_classify_column .jy_classify_column_content_item:nth-of-type(-n+6) {
+    margin-left: 0;
+}
+
 .jy_classify_l .jy_classify_column .jy_classify_column_content_item a{
 	display: block;
 	font-size: 12px;

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

@@ -6,6 +6,11 @@ a {
     display: none!important;
 }
 
+.w {
+    width: 1200px;
+    margin: 0 auto;
+}
+
 /* link */
 .cms-link,
 .cms-link:focus {
@@ -69,6 +74,8 @@ a {
     display: flex;
     align-items: center;
     justify-content: center;
+    width: unset;
+    height: unset;
     padding: 4px 20px;
     font-size: 14px;
     line-height: 22px;
@@ -144,6 +151,9 @@ a.j-s-button:hover {
     width: 100%;
     z-index: 999;
 }
+.fixed-header.relative {
+    position: relative;
+}
 #public-nav.header-nav-mini {
     background-color: #F2F2F4;
 }
@@ -184,6 +194,7 @@ a.j-s-button:hover {
 }
 .header-nav-content .nav-home a {
     height: 100%;
+    color: #444;
 }
 
 .header-nav-content .nav-tip {
@@ -376,7 +387,7 @@ body .menu-vip-button {
     left: 0;
     top: 44px;
     /* width: 398px; */
-    min-width: 440px;
+    min-width: 470px;
     background: #fff;
     box-shadow: 0 0 28px 0 rgba(0, 0, 0, 0.12);
     border: 1px solid #ececec;

src/web/staticres/public-pc/js/header-nav-mini.js

@@ -52,7 +52,20 @@ var headerNavMini = {
   init: function () {
     this.initEvents()
   },
-  initStyle: function () {},
+  initStyle: function () {
+    this.headerNav.show()
+  },
+  headerFixed: function (f) {
+    if (f) {
+      // 头部header固定
+      this.headerNav.removeClass('relative')
+      this.headerNavPlaceholder.show()
+    } else {
+      // 头部不固定
+      this.headerNav.addClass('relative')
+      this.headerNavPlaceholder.hide()
+    }
+  },
   changeHeaderPlaceholder: function () {
     // 头部占位
     this.headerNavPlaceholder.height(this._headerNavFixedHeight)

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

@@ -135,6 +135,7 @@ function trySelectNav (name) {
     })
     if(hasPage){
       $("#public-nav").css("position","relative")
+      $('#header-nav-mini-placeholder').hide()
       setNavTheme('light')
     }
   }

src/web/staticres/public-pc/js/sub-page.js

@@ -8,6 +8,7 @@ function fixIframeStyle () {
     'background-color': 'transparent'
   })
   $('#public-nav').hide()
+  $('#header-nav-container').hide()
   $(".j-bottom").hide()
   $(".right-side-box").hide()
 }
@@ -22,6 +23,7 @@ function toggleIframeStyle (type) {
       'background-color': 'transparent'
     })
     $('#public-nav').hide()
+    $('#header-nav-container').hide()
     $(".j-bottom").hide()
     $(".right-side-box").hide()
   } else {
@@ -31,6 +33,7 @@ function toggleIframeStyle (type) {
       $("body").attr('style', backStyle)
     }
     $('#public-nav').show()
+    $('#header-nav-container').show()
     $(".j-bottom").show()
     $(".right-side-box").show()
   }

src/web/templates/common/pc-header-nav-mini.html

@@ -35,7 +35,7 @@
                     {{$TopMenus :=JyTopMenu .Request.URL.Path}}
                     {{range $menu := $TopMenus.MenuList }}
                     <li class="menu-item hover-underline" name="{{$menu.Title}}">
-                    <a href="{{$menu.Link}}">{{$menu.Title}}</a>
+                    <a href="{{$menu.Link}}" target="_blank">{{$menu.Title}}</a>
                     </li>
                     {{end}}
                     <li class="menu-item message-menu login-show" id="noticed" style="display: none;">

src/web/templates/pc/template/index/bidding-desc-module.html

@@ -17,7 +17,7 @@
         <ul class="bidding-desc-card-column clearfix">
           {{range $kk,$vv := $v.list}}
           <li class="cms-card-list-item">
-            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="/jySite/{{$vv._id}}.html" title="{{$vv.s_title}}">{{$vv.s_title}}</a>
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" href="/jySite/{{$vv._id}}.html" title="{{$vv.s_title}}">{{$vv.s_title}}</a>
             <span class="cms-card-list-item-right">{{$vv.l_createdate}}</span>
           </li>
           {{end}}

src/web/templates/pc/template/index/data-service-module.html

@@ -13,7 +13,7 @@
           <ul class="service-tags-list clearfix">
             {{range $v := .T.hotBuyerData}}
             <li class="service-tags-item">
-              <a class="cms-link" href="{{$v.url}}">{{$v.keyword}}</a>
+              <a class="cms-link" href="{{$v.url}}" target="_blank" title="{{$v.keyword}}">{{$v.keyword}}</a>
             </li>
             {{end}}
           </ul>
@@ -23,9 +23,9 @@
         </footer>
       </section>
       <div class="service-button-list clearfix">
-        <a class="service-desc-button pointer s-plain" href="/front/dataExport/toSieve">数据导出</a>
-        <a class="service-desc-button button-blink pointer s-confirm" href="/front/dataMarket/customExport">定制服务</a>
-        <a class="service-desc-button pointer s-plain" href="/front/dataMarket/dataInterface">对接服务</a>
+        <a class="service-desc-button pointer s-plain" href="/front/dataExport/toSieve" target="_blank">数据导出</a>
+        <a class="service-desc-button button-blink pointer s-confirm" href="/front/dataMarket/customExport" target="_blank">定制服务</a>
+        <a class="service-desc-button pointer s-plain" href="/front/dataMarket/dataInterface" target="_blank">对接服务</a>
       </div>
     </div>
     <div class="service-module-content-right">

src/web/templates/pc/template/index/ent-list-module.html

@@ -13,7 +13,7 @@
           <ul class="cms-card-list clearfix">
             {{range $v := .T.hotWinner}}
             <li class="cms-card-list-item">
-              <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="{{$v.ent_name}}" href="{{$v.url}}">{{$v.ent_name}}</a>
+              <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="{{$v.ent_name}}" href="{{$v.url}}" target="_blank">{{$v.ent_name}}</a>
               <!-- <span class="cms-card-list-item-right">asdfsafsdafsadf</span> -->
             </li>
             {{end}}

src/web/templates/pc/template/index/important-gov-bidding.html

@@ -8,12 +8,12 @@
     <ul class="i-g-card-list clearfix">
       <li class="i-g-card-list-item" data-value="重点招标" style="display: none;">
         {{range $v := .T.importBidding}}
-        <a class="cms-link" href="{{$v.Url}}">{{$v.Name}}</a>
+        <a class="cms-link" href="{{$v.Url}}" title="{{$v.Name}}" target="_blank">{{$v.Name}}</a>
         {{end}}
       </li>
       <li class="i-g-card-list-item" data-value="政府招标" style="display: none;">
         {{range $n := .T.governmentBidding}}
-        <a class="cms-link" href="{{$n.Url}}">{{$n.Name}}</a>
+        <a class="cms-link" href="{{$n.Url}}" title="{{$n.Name}}" target="_blank">{{$n.Name}}</a>
         {{end}}
       </li>
     </ul>

src/web/templates/pc/template/index/search-module.html

@@ -59,8 +59,8 @@
         <i class="j-icon base-icon icon-img-huangguan"></i>
         剑鱼官网
       </a>
-      <a class="cms-link mr12" href="/brand/index">企业愿景</a>
-      <a class="cms-link" href="/brand/index#Company_Dynamic">品牌介绍</a>
+      <a class="cms-link mr12" href="/brand/index" target="_blank">企业愿景</a>
+      <a class="cms-link" href="/brand/index#Company_Dynamic" target="_blank">品牌介绍</a>
     </div>
     <div class="flex-row-center mt12">
       <a class="j-s-button plain" href="/jycms">

src/web/templates/pc/template/index/user-info-card.html

@@ -2,7 +2,7 @@
 {{if not .T.hasLogin}}
 <section class="user-info-card no-login-card">
   <header class="user-info-header">
-    <button class="service-desc-button s-confirm login-register-button">注册/登录</button>
+    <button class="service-desc-button s-confirm button-blink login-register-button">注册/登录</button>
   </header>
   <main class="user-info-main">
     <p class="user-info-desc-tip">- 注册立享，8大免费权益 -</p>

src/web/templates/pc/template/index/zb-nav-module.html

@@ -8,7 +8,7 @@
         <ul class="search-type-children clearfix">
           {{range $item:= $v.child}}
             <li class="search-type-child">
-              <a class="cms-link{{if $item.class}} {{$item.class}}{{end}}" href="{{$item.href}}" title="{{$item.name}}">{{$item.name}}</a>
+              <a class="cms-link{{if $item.class}} {{$item.class}}{{end}}" href="{{$item.href}}" title="{{$item.name}}" target="_blank">{{$item.name}}</a>
             </li>
           {{end}}
         </ul>