Merge remote-tracking branch 'origin/feature/v4.8.0' into feature/v4.8.0

src/web/staticres/css/pc.css

@@ -1964,15 +1964,18 @@ form{
 	display: flex;
 }
 .jy_classify_l dl{
-	margin-right: 80px;
+	margin-right: 40px;
 	flex: 1;
 }
-.jy_classify_l dl dt{
+.jy_classify_l dl dt,
+.jy_classify_l dl dt > a{
 	font-size: 14px;
 	color: rgba(255,255,255,.8);
 	line-height: 22px;
 	margin-bottom: 8px;
+  white-space: nowrap;
 }
+
 .jy_classify_l dl dd{
 	position: relative;
 }

src/web/staticres/site/page/bankLanding/index.js

@@ -44,17 +44,15 @@ $(function () {
 $('.btn_').click(function(){
   consultDialog.isshow=true // 咨询弹窗
 })
-$('.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() {
-  if($(window).scrollTop() > 120){
-    return
-  }
-  setNavTheme('dark')
-  $('.loginBtn').css({'color': '#fff', 'border-color': '#fff'})
+// $('.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() {
+  
+//   setNavTheme('dark')
+//   $('.loginBtn').css({'color': '#fff', 'border-color': '#fff'})
 
-})
+// })
 
 })

src/web/templates/common/pcbottom.html

@@ -26,7 +26,7 @@
                         <dd><a href="/product/index?serviceType=2">招标代理机构服务</a></dd>
                         <!-- <dd><a href="">商机管理</a></dd> -->
                     </dl>
-                    <dl>
+                    <!-- <dl>
                       <dt>百宝箱</dt>
                       <dd><a href="javascript:;" data-type="work-bench" data-href="/swordfish/page_web_pc/issued/info">信息发布</a></dd>
                       <dd><a href="/jyxspc">中标必听课</a></dd>
@@ -39,21 +39,41 @@
                       <dd><a href="/big/page/sc">市场分析</a></dd>
                       <dd><a href="/big/page/cg">客户分析</a></dd>
                       <dd><a href="/jyblog/index.html">剑鱼博客</a></dd>
+                    </dl> -->
+                    <dl>
+                      <dt>服务</dt>
+                      <dd><a href="javascript:;" data-type="work-bench" data-href="/swordfish/page_web_pc/issued/info">信息发布</a></dd>
+                      <dd><a href="/front/advservices.html">广告服务</a></dd>
+                      <dd><a href="/swordfish/frontPage/bidedoc/free/index">标书制作</a></dd>
+                      <dd><a href="/swordfish/frontPage/enterpriseCertificatio/free/index">剑鱼认证服务</a></dd>
+                      <dd><a href="/active/transit/exhibitionPage">行业展会</a></dd>
                     </dl>
                     <dl>
-                        <dt>数据</dt>
+                        <dt>数据市场</dt>
                         <!-- <dd><a href="javascript:;">数据超市</a></dd> -->
                         <dd><a href="/front/dataExport/toSieve">自助导出</a></dd>
-                        <dd><a href="/front/structed/pc_index.html">定制服务</a></dd>
-                        <dd><a href="/front/dataPack/createOrder">数据流量包</a></dd>
-                        <!-- <dd><a href="javascript:;">数据定制导出</a></dd> -->
-                        <!-- <dd><a href="javascript:;">API接口</a></dd> -->
+                        <!-- <dd><a href="/front/structed/pc_index.html">定制服务</a></dd>
+                        <dd><a href="/front/dataPack/createOrder">数据流量包</a></dd> -->
+                        <dd><a href="/front/dataMarket/customExport">数据定制导出</a></dd>
+                        <dd><a href="/front/dataMarket/dataInterface">API接口</a></dd>
                     </dl>
                     <dl>
                         <dt>解决方案</dt>
                         <dd><a href="/swordfish/frontPage/solution/free/index">电信运营商</a></dd>
-                        <!-- <dd><a href="javascript:;">医疗器械</a></dd> -->
-                        <!-- <dd><a href="javascript:;">银行</a></dd> -->
+                        <dd><a href="http://clpages.cn/yxtgwyxy?from_wecom=1">医械通</a></dd>
+                        <dd><a href="/bank/pc/scheme">银行</a></dd>
+                    </dl>
+                    <dl>
+                      <dt><a href="/jySchool/index">剑鱼学堂</a></dt>
+                      <dd><a href="/swordfish/frontPage/solution/free/index">中标必听课</a></dd>
+                      <dd><a href="http://clpages.cn/yxtgwyxy?from_wecom=1">剑鱼文库</a></dd>
+                      <dd><a href="/bank/pc/scheme">招投标攻略</a></dd>
+                    </dl>
+                    <dl>
+                      <dt><a href="/industryInfo/index">行业资讯</a></dt>
+                    </dl>
+                    <dl>
+                      <dt><a href="/helpCenter/index">帮助中心</a></dt>
                     </dl>
 
                     <dl>

src/web/templates/common/pchead.html

@@ -43,7 +43,7 @@
               {{end}}
           </li>
           {{end}}
-          <li name="消息" id="noticed" style="display: none;margin-left: 11px;">
+          <li name="消息" id="noticed" style="display: none;margin-left: 11px;height: 63px;">
             <a href="/swordfish/frontPage/messageCenter/sess/index">
               <div class="img-flex">
                 <img data-theme="light"

src/web/templates/site/page/bankLanding/pc/index.html

@@ -95,6 +95,7 @@
 <script src='{{Msg "seo" "cdn"}}/site/page/bankLanding/index.js?v={{Msg "seo" "version"}}'></script>
 <script>
   // setNavTheme(firstTheme = 'light')
+  haslogin({{.T.logid}})
 </script>
 <!-- 弹窗 -->
 {{include "/common/consultDialog.html"}}