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

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

@@ -1,7 +1,39 @@
 .jy-index {
   overflow-x: hidden !important;
+  padding-top: 80px;
 }
-
+/* 广告位 */
+.advertising_position_brand{
+  display: block!important;
+}
+.advertising_position{
+  display: block!important;
+}
+#public-nav{
+  height: 144px !important;
+}
+/* 结束 */
+/* 头部按钮 及文案 */
+#public-nav[data-theme] .btn_box{
+  display: block !important;
+}
+#public-nav[data-theme] .btn_box .brand{
+  display: none !important;
+}
+#public-nav[data-theme] .logo img{
+  width: 106px !important;
+  margin-top: 10px !important;
+}
+#public-nav[data-theme] .logo_box{
+  width: 106px !important;
+}
+#public-nav[data-theme] .logo_box .logo_desc{
+  display: flex!important;
+}
+#public-nav[data-theme] .logo_box .logo_desc .index{
+  display: block!important;
+}
+/* 结束 */
 @keyframes CfadeInUp {
   from {
     transform: translateY(50px);
@@ -445,7 +477,7 @@
   border-radius: 4px;
   display: flex;
   align-items: center;
-  padding: 12px;
+  padding: 12px 0 12px 12px;
   box-sizing: border-box;
 }
 
@@ -485,9 +517,9 @@
 }
 
 .hot-container .hot-banner .right {
-  max-width: 170px;
+  max-width: 183px;
   min-height: 54px;
-  margin-left: 12px;
+  margin-left: 11px;
 }
 
 .hot-container .hot-banner .right a {

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

@@ -115,18 +115,26 @@
 
 /* 上箭头 */
 .icon-arrow--up {
-  width: 56px;
+  /* width: 56px;
   height: 56px;
   margin: 0 auto;
   background-size: 56px;
   background-repeat: no-repeat;
   background-position: center center;
-  background-image: url(/images/pc/slide_arrow_grey.png);
+  background-image: url(/images/pc/slide_arrow_grey.png); */
   /* background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAEnSURBVHgB7ZbNrYJAFEaH9zYuLQb6sAN1ydIOtAN3sFP7YaEdaAdWAF4TvsQQZgTmXnXxnYSQYfg5BzIJzhFCCCGEEPItEmdEnufLuq73SZLcZdsWRXFyBvw7A57yTdMcRXwmw7lsiyzLrlVVXZwy6gGQ75kyiVANCMgD9Qi1gAHyQDVCZREH5Nft/tCdkPWx0ljY0V8gJF+W5VHe9DlN05uMF515lS8RFfBOHgPLiMkBQ+WBVcSkgLHywCJidMBUeaAdMSogVh5oRgwO0JIHWhGDArTlgUbE2wAreRAbEQywlgcxEd6AT8mDqRF/vhuK/LbnsIk8aO+97pna+64JBcw7h0zlQV+EuNx953sD5G9xI7tre/FH5MFLBJ6/c4QQQgghhPwcD62mJ887e9SSAAAAAElFTkSuQmCC); */
+  width: 24px;
+  height: 24px;
+  margin: 0 auto;
+  background-size: 24px;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-image: url(/images/index/new/up.png);
+  margin-top: 11px;
 }
 
 .icon-arrow--up.white {
-  background-image: url(/images/pc/slide_arrow.png);
+  background-image: url(/images/index/new/up1.png);
   /* background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAC5SURBVHgB7ZdRDoMgEAX3pvXmHMEjUBv5eDGtSgvL0swkJH7I7swnZgAAAAAAf0fO+bGddTvp9W0zUeSPzBHxQX6OiAv52BE35WNGnMgv5cSNOJOXf2JG3JGXf2NF1MjLnRgR38jL3bERv8jLjDERLeRllm9ES3mZ6RPRQ15m943oKS87+kR4yMuuthGe8rKzXUTeHyJu8rL3XcRqteT9NeUqL7uPEclqKUNSCVnMmdH7AQAAAACueQIAR4pmNbCOwAAAAABJRU5ErkJggg==); */
 }
 
@@ -143,10 +151,11 @@
   box-sizing: border-box;
   position: fixed;
   z-index: 100;
-  min-width: 56px;
+  /* min-width: 56px; */
+  width: 80px;
   bottom: 108px;
   left: initial;
-  right: 16px;
+  right: 1px;
   transition: all 0.75s;
 }
 
@@ -158,13 +167,13 @@
   height: 100%;
   box-sizing: border-box;
   display: -ms-flexbox;
-  display: flex;
+  /* display: flex; */
   -ms-flex-direction: row;
   flex-direction: row;
   -ms-flex-align: center;
-  align-items: center;
+  /* align-items: center; */
   -ms-flex-pack: start;
-  justify-content: flex-start;
+  /* justify-content: flex-start; */
   cursor: pointer;
   border: none !important;
 }
@@ -193,16 +202,77 @@
 .right-side-box>.right-side-item .text-customer {
   font-size: 13px;
   line-height: 16px;
-  height: 56px;
+  /* height: 80px; */
   text-align: center;
   color: #1D1D1D;
   margin-left: 0;
 }
 
-.right-side-box .right-side-phone {
+.right-side-box .desc_text {
+  font-size: 14px;
+  line-height: 22px;
+  /* identical to box height, or 157% */
+  text-align: center;
+  /* white/100% */
+  color: #FFFFFF;
+  margin-top: 4px;
+}
+
+.right-side-box .desc_text_b {
+  font-size: 14px;
+  line-height: 22px;
+  /* identical to box height, or 157% */
+  text-align: center;
+  /* Font/#1d1d1d */
+  color: #1D1D1D;
+  margin-top: 4px;
+}
+
+/* .right-side-box .right-side-phone {
   height: 56px;
   margin: 6px 0;
   position: relative;
+} */
+.right-side-box .right-side-phone {
+  position: relative;
+  border-radius: 10px 0 0 0;
+  width: 100%;
+  height: 80px;
+  background: linear-gradient(180deg, #1699F9 0%, #19C6DC 100%);
+  border-top: 2px solid #FFF;
+  border-left: 2px solid #FFF;
+  box-sizing: border-box;
+}
+
+.right-side-box .right-side-wx {
+  position: relative;
+  width: 100%;
+  height: 80px;
+  background: linear-gradient(180deg, #F1F4F9 0%, #FFFFFF 100%);
+  border-radius: 0;
+  border-left: 2px solid #FFF;
+  box-sizing: border-box;
+}
+
+.right-side-box .right-side-app {
+  position: relative;
+  border-radius: 0 0 0 10px;
+  width: 100%;
+  height: 80px;
+  background: linear-gradient(180deg, #F1F4F9 0%, #FFFFFF 100%);
+  border-bottom: 2px solid #FFF;
+  border-left: 2px solid #FFF;
+  box-sizing: border-box;
+}
+
+.right-side-box .right-side-kf {
+  position: relative;
+  border-radius: 0 !important;
+  width: 100% !important;
+  height: 80px !important;
+  background: linear-gradient(180deg, #F56500 0%, #F79E51 100%) !important;
+  border-left: 2px solid #FFF;
+  box-sizing: border-box;
 }
 
 /* .right-side-box .right-side-pop::before {
@@ -221,7 +291,7 @@
   padding: 3px 5px;
 } */
 
-.right-side-box .right-side-pop::after {
+/* .right-side-box .right-side-pop::after {
   content: '';
   position: absolute;
   left: -12px;
@@ -232,11 +302,15 @@
   border-top: 6px solid transparent;
   border-left: 8px solid #2cb7ca;
   border-bottom: 6px solid transparent;
-}
+} */
 
 .right-side-box>.right-side-item .text-customer img,
 .right-side-box .right-side-phone .text-customer img {
-  width: 56px;
+  width: 32px;
+  width: 32px;
+  display: block;
+  margin: auto !important;
+  margin-top: 12px !important;
 }
 
 .right-side-box .right-side-phone .text-customer-hover {
@@ -268,19 +342,35 @@
   display: inherit;
 }
 
-.right-side-box .right-side-wx .slidePop {
+/* .right-side-box .right-side-wx .slidePop {
   display: none;
   position: absolute;
-  left: -134px;
+  left: -163px;
   top: 0;
-  width: 120px;
-  height: 148px;
+  width: 157px;
+  height:176px;
   background: #ffffff;
+  box-sizing: border-box;
   border-radius: 8px;
   box-shadow: 0px 0px 28px 0px rgba(0, 0, 0, 0.16);
+} */
+
+.right-side-box .right-side-wx .slidePop {
+  display: none;
+  position: absolute;
+  left: -165px;
+  top: 0;
+  width: 157px;
+  height:176px;
+  background: linear-gradient(180deg, #F1F4F8 0%, #FEFEFF 100%);
+  border: 2px solid #FFFFFF;
+  box-shadow: 0px 0px 20px rgba(8, 31, 38, 0.12);
+  border-radius: 8px;
+  padding: 12px 19px;
+  box-sizing: border-box;
 }
 
-.right-side-box .right-side-wx .slidePop::before {
+/* .right-side-box .right-side-wx .slidePop::before {
   content: '';
   position: absolute;
   right: -8px;
@@ -292,16 +382,31 @@
   border-left: 8px solid #fff;
   box-shadow: 0px 0px 28px 0px rgba(0, 0, 0, 0.16);
   border-bottom: 6px solid transparent;
-}
+} */
 
-.right-side-box .right-side-wx .slidePop img {
+/* .right-side-box .right-side-wx .slidePop img {
   border-radius: 8px;
   width: 120px;
+} */
+.right-side-box .right-side-wx .slidePop img {
+  width: 104px;
+  height: 104px;
+  margin: auto;
+  display: block;
 }
 
+/* .right-side-box .right-side-wx .slidePop p {
+  font-size: 14px;
+  text-align: center;
+} */
 .right-side-box .right-side-wx .slidePop p {
   font-size: 14px;
+  line-height: 22px;
+  /* or 157% */
   text-align: center;
+  /* Font/#1d1d1d */
+  color: #1D1D1D;
+  margin-top: 2px;
 }
 
 .right-side-box>.right-side-item:last-child {
@@ -312,7 +417,7 @@
   width: 100%;
   position: relative;
   height: 56px;
-  margin: 6px 0;
+  /* margin: 6px 0; */
   box-sizing: border-box;
 }
 
@@ -329,6 +434,7 @@
   border-top-width: 0;
   border-bottom-width: 0;
   border-radius: 0;
+  width: 100%;
 }
 
 .right-side-box>.right-side-item.fix-b-w .hover-open-box {
@@ -411,6 +517,7 @@
 
 .icon-badge-number {
   position: relative;
+  width: 100%;
 }
 
 .white.icon-badge-number::before {
@@ -436,26 +543,41 @@
   box-sizing: border-box;
 }
 
-.right-side-box .back-to-up {
+/* .right-side-box .back-to-up {
   background-color: #b5b6ba;
   border-radius: 50%;
   width: 56px;
   display: none;
-}
+} */
 
 .right-side-box .back-to-up:hover {
-  background: #2cb7ca;
+  /* background: #2cb7ca; */
+}
+
+.right-side-box .back-to-up {
+  width: 80px;
+  height: 72px;
+  background: linear-gradient(180deg, #F1F4F8 0%, #FEFEFF 100%);
+  border-width: 2px 0px 2px 2px;
+  border-style: solid;
+  border-color: #FFFFFF;
+  box-shadow: 0px 0px 20px rgba(8, 31, 38, 0.12);
+  border-radius: 12px 0px 0px 12px;
+  display: none;
+  box-sizing: border-box;
+  margin-top: 16px;
 }
 
 .silde-float {
   position: absolute;
   left: -210px;
-  width: 200px;
+  min-width: 200px;
   background: #fff;
   border-radius: 8px;
   box-shadow: 0px 0px 28px 0px rgb(0 0 0 / 16%);
   z-index: 100;
 }
+
 .help-slide {
   top: -29px;
 }
@@ -521,11 +643,22 @@
 .kf-phone {
   display: none;
   top: 6px;
-  color: #fff;
-  background: #2cb7ca;
-  line-height: 2.3;
+  /* color: #fff; */
+  /* background: #2cb7ca; */
+  /* line-height: 2.3;
+  font-size: 14px; */
   font-size: 14px;
-  padding: 3px 5px;
+  line-height: 22px;
+  /* or 157% */
+  /* Font/#1d1d1d */
+  left: -240px;
+  color: #1D1D1D;
+  padding: 12px 20px;
+  background: linear-gradient(180deg, #F1F4F8 0%, #FEFEFF 100%);
+  border: 2px solid #FFFFFF;
+  box-shadow: 0px 0px 20px rgba(8, 31, 38, 0.12);
+  border-radius: 8px;
+  box-sizing: border-box;
 }
 
 .kf-phone::after {
@@ -572,4 +705,36 @@
 
 .jy_friendlink_content ul li:last-child::after {
   display: none;
+}
+
+.qr_box {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  margin-top: 14px;
+}
+
+.qr_box div {
+  /* width: 64px;
+  height: 64px;
+  background: #FFFFFF;
+  border-radius: 4px;
+  display: flex;
+  justify-content: center;
+  align-items: center; */
+}
+
+.qr_box div img {
+  width: 64px;
+  height: 64px;
+  display: block;
+  border-radius: 4px;
+}
+
+.qr_box div p {
+  font-size: 12px;
+  line-height: 18px;
+  color: rgba(255, 255, 255, 0.8);
+  text-align: center;
+  margin-top: 3px;
 }

src/web/templates/common/pcbottom.html

@@ -41,7 +41,7 @@
                         <img src='{{Msg "seo" "cdn"}}/images/pc/logo.png?v={{Msg "seo" "version"}}' alt="" />
                         <span>400-108-6670</span>
                     </div>
-                    <div class="jy_classify_list">
+                    <!-- <div class="jy_classify_list">
                         <ul>
                             <li class="active">
                                 <span></span>
@@ -65,10 +65,20 @@
                                     <p>扫码关注</p>
                                 </div>
                             </li>
-                            <!-- <li>
+                            <li>
                                 <span id="share-sqq" ></span>
-                            </li> -->
+                            </li>
                         </ul>
+                    </div> -->
+                    <div class="qr_box">
+                      <div>
+                        <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
+                        <p>扫码下载</p>
+                    </div>
+                    <div>
+                      <img data-share-img src="/front/share/10" alt="">
+                      <p>扫码关注</p>
+                    </div>
                     </div>
                 </div>
 			</div>
@@ -128,42 +138,57 @@
 <!--S-侧边栏-->
 <div class="right-side-box" data-backside>
 <!--      <div id="shareslider" style="width: 88px"></div>-->
-    <div id="sideIcon" class="" style="right: -15px;width: 88px;height: 88px;">
+    <div id="sideIcon" class="" style="right: 1px;width: 88px;height: 88px;">
 <!--        <a href="/swordfish/frontPage/share/sess/index"><img src="{{Msg "seo" "cdn"}}/share/img/active-icon.png"  alt="" style="width: 88px;"></a>-->
     </div>
-    <div class="right-side-item" id="go-customer-4" style="display: none;">
-        <div class="hover-open-box" style="padding: 0;">
-            <div class="icon-customer white icon-badge-number" data-badge-number=""></div>
-            <div class="icon-badge-number text-customer" data-badge-number="">
-                <img src='{{Msg "seo" "cdn"}}/images/pc/slide_kefu_grey.png?v={{Msg "seo" "version"}}' alt="">
+      <div class="right-side-phone right-side-pop">
+        <span class=" text-customer">
+          <img src='{{Msg "seo" "cdn"}}/images/index/new/telphone.png?v={{Msg "seo" "version"}}' alt="">
+        </span>
+        <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/telphone.png?v={{Msg "seo" "version"}}' alt=""></span>
+        <p class="desc_text">客服热线</p>
+        <div class="silde-float kf-phone">客服热线：400-108-6670<br>服务时间：工作日 9:00-17:40</div>
+      </div>
+      <div class="right-side-item right-side-kf" id="go-customer-4" style="display: block">
+          <div class="hover-open-box" style="padding: 0;">
+              <!-- <div class="icon-customer white icon-badge-number" data-badge-number=""></div> -->
+              <div class="icon-badge-number text-customer" data-badge-number="">
+                  <img src='{{Msg "seo" "cdn"}}/images/index/new/kf.png?v={{Msg "seo" "version"}}' alt="">
+              </div>
+              <p class="desc_text">在线客服</p>
+          </div>
+          <div class="silde-float help-slide">
+            <img class="help-close" src='{{Msg "seo" "cdn"}}/images/t-close.png?v={{Msg "seo" "version"}}' alt="">
+            <div class="help-slide-top">有什么可以帮助您吗?</div>
+            <div class="help-slide-bottom">
+              <div class="help-slide-kf">客服热线</div>
+              <div class="help-slide-zx open-customer">在线咨询</div>
             </div>
-        </div>
-        <div class="silde-float help-slide">
-          <img class="help-close" src='{{Msg "seo" "cdn"}}/images/t-close.png?v={{Msg "seo" "version"}}' alt="">
-          <div class="help-slide-top">有什么可以帮助您吗?</div>
-          <div class="help-slide-bottom">
-            <div class="help-slide-kf">客服热线</div>
-            <div class="help-slide-zx open-customer">在线咨询</div>
           </div>
-        </div>
-    </div>
-    <div class="right-side-phone right-side-pop">
-        <span class=" text-customer"><img src='{{Msg "seo" "cdn"}}/images/pc/slide_phone_grey.png?v={{Msg "seo" "version"}}' alt=""></span>
-        <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/pc/slide_phone.png?v={{Msg "seo" "version"}}' alt=""></span>
-        <div class="silde-float kf-phone">客服热线：400-108-6670<br>服务时间：工作日 9:00-17:40</div>
-    </div>
-    <div class="right-side-phone right-side-wx">
-        <span class=" text-customer"><img src='{{Msg "seo" "cdn"}}/images/pc/slide_wx_grey.png?v={{Msg "seo" "version"}}' alt=""></span>
-        <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/pc/slide_wx.png?v={{Msg "seo" "version"}}' alt=""></span>
+      </div>
+      <div class="right-side-phone right-side-wx">
+          <span class=" text-customer"><img src='{{Msg "seo" "cdn"}}/images/index/new/wx.png?v={{Msg "seo" "version"}}' alt=""></span>
+          <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/wx1.png?v={{Msg "seo" "version"}}' alt=""></span>
+          <p class="desc_text_b">关注剑鱼</p>
+          <div class="slidePop">
+              <img data-share-img src="/front/share/10" alt="">
+              <p>关注剑鱼标讯<br>免费追踪全国商机</p>
+          </div>
+      </div>
+      <div class="right-side-phone right-side-wx right-side-app">
+        <span class=" text-customer"><img src='{{Msg "seo" "cdn"}}/images/index/new/weixin_miam_b.png?v={{Msg "seo" "version"}}' alt=""></span>
+        <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/weixin_miam.png?v={{Msg "seo" "version"}}' alt=""></span>
+        <p class="desc_text_b">下载App</p>
         <div class="slidePop">
-            <img data-share-img src="/front/share/10" alt="">
-            <p>微信扫码关注</p>
+            <img  src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
+            <p>下载App<br>免费查看全国商机</p>
         </div>
     </div>
     <div class="right-side-item back-to-up" data-backtop>
         <div class="hover-open-box">
             <div class="icon-arrow--up white"></div>
             <div class="icon-arrow--up"></div>
+            <p class="desc_text_b">回到顶部</p>
         </div>
     </div>
 </div>

src/web/templates/common/pchead.html

@@ -1,17 +1,41 @@
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/public-pc/css/header-nav.css?v={{Msg "seo" "version"}}">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/common-module/ad/css/index.css?v={{Msg "seo" "version"}}">
-{{$TopMenu := JyTopMenu .Request.URL.Path}}
 <section class="public-nav" id="public-nav" style="display: none">
+  <div class="advertising_position">
+    <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')">
+    </div>
+    <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')">
+    </div>
+  </div>
     <div class="iner">
+      <div class="logo_box">
         <a class="logo" href="/">
             <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>
-
-         <h1><a href="/" {{if eq $TopMenu.Site "main"}}style="color:red"{{end}} >剑鱼主站</a></h1>
-         <h1><a href="/brand/index" {{if eq $TopMenu.Site "brand"}}style="color:red"{{end}} >品牌网站</a></h1>
-
-
+        <div class="logo_desc"><div class="line"></div><p class="index">剑鱼标讯官网</p><p class="brand">品牌官网</p><div class="line"></div></div>
+      </div>
+        <div class="btn_box">
+          <div class="index" onclick="golink('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>
+          <div class="brand" onclick="golink('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>
+          <div class="zx" onclick="golink('zx')">
+            <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>
+        </div>  
         <div class="header-right-box fr">
           <ul class="jynav">
           {{range $i, $v := $TopMenu.MenuList }}
@@ -80,7 +104,7 @@
           <li class="slider"></li>
         </ul>
             <div class='useronline' id="login" style="float:left;">
-              <button  clle="display: none" class='loginBtn' data-toggle='modal' onclick='openLoginDig(true)'>登录</button>
+              <button  clle="display: none" class='loginBtn' data-toggle='modal' onclick='openLoginDig(true)'>登录/注册</button>
               <img style="display: none" class="nav-avatar user-avatar" data-user-avatar alt="头像">
               <div class="work-user-info" style="display: none">
                 <div class="info-group">
@@ -186,4 +210,16 @@ $("#bidLogin .login-dig-input-box [name='verify_entname']").on('input', function
 })
 /* E-企业联想 */
 })
+function golink (type){
+  if(type == 'index'){
+    location.href = '/'
+  }else if(type == 'brand'){
+    location.href = '/brand/index'
+  }else if(type == 'zx'){
+    location.href = '/industryInfo/index'
+  }
+
+  
+
+}
 </script>

src/web/templates/pc/index.html

@@ -101,24 +101,24 @@
               <div class="left yellow">项目数据</div>
               <div class="right">
                 <a href="/list/stype/NJXM.html">拟建项目</a>
-                <a href="">采购意向</a>
-                <a href="">拟在建项目</a>
-                <a href="">潜在项目预测</a>
+                <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>
               </div>
             </div>
             <div class="hot-banner">
               <div class="left green">机构数据</div>
               <div class="right">
-                <a href="">企业搜索</a>
-                <a href="">企业监控</a>
-                <a href="">采购单位搜索</a>
+                <a data-href="/jylab/entSearch/index.html" data-type="work-bench">企业搜索</a>
+                <a href="/swordfish/page_big_pc/free/ent_follow">企业监控</a>
+                <!-- <a href="">采购单位搜索</a> -->
               </div>
             </div>
             <div class="hot-banner">
               <div class="left violet">数据市场</div>
               <div class="right">
                 <a href="/front/dataExport/toSieve">自助数据导出</a>
-                <a href="">数据超市</a>
+                <!-- <a href="/front/dataMarket/index">数据超市</a> -->
                 <a href="/front/dataMarket/customExport">数据定制</a>
                 <a href="/front/dataMarket/dataInterface">数据API</a>
               </div>
@@ -130,29 +130,29 @@
           <h3 class="module-title">独家行业洞察</h3>
           <div class="w1200 product-container">
             <div class="other-product">
-              <div class="product-item other-product-item buyer-product" data-href="/swordfish/frontPage/serviceSystem/free/index?serviceType=1">
+              <div class="product-item other-product-item buyer-product" data-href="/front/subscribe.html">
                 <div class="p-link">了解详情</div>
                 <div class="p-name">商机情报</div>
                 <div class="p-detail">提前推送超前项目，优先对接项目负责人，抢占绝对先机。</div>
               </div>
-              <div class="product-item other-product-item agency-product" data-href="/swordfish/frontPage/serviceSystem/free/index?serviceType=2">
+              <div class="product-item other-product-item agency-product" data-href="/big/page/qy">
                 <div class="p-link">了解详情</div>
                 <div class="p-name">企业全景分析</div>
                 <div class="p-detail">360°全景洞察，全面掌握企业动态，分析企业中标项目，了解客户和竞争对手。</div>
               </div>
-              <div class="product-item other-product-item data-market-product" data-href="/front/dataMarket/index">
+              <div class="product-item other-product-item data-market-product" data-href="/big/page/tb">
                 <div class="p-link">了解详情</div>
                 <div class="p-name">投标决策分析</div>
                 <div class="p-detail">分析同类项目，优化投标分析流程，提高企业投标决策效率。</div>
               </div>
             </div>
             <div class="main-product">
-              <div class="product-item main-product-item svip-product" data-href="/front/subscribe.html">
+              <div class="product-item main-product-item svip-product" data-href="/big/page/sc">
                 <div class="p-link">了解详情</div>
                 <div class="p-name">市场洞察</div>
                 <div class="p-detail">针对目标市场、区域进行市场分析、定制市场分析报告，精准分析客户、竞对、市场 ，帮助市场决策和拓展。</div>
               </div>
-              <div class="product-item main-product-item bigmember-product"  data-href="/big/page/index">
+              <div class="product-item main-product-item bigmember-product"  data-href="http://clpages.cn/yxtsjgwyxy">
                 <div class="p-link">了解详情</div>
                 <div class="p-name">医械行业版</div>
                 <div class="p-detail">面向医械领域的行业专版，汇集专业数据帮助医械厂商、经销商拓展优质经销商渠道、拓展合作关系，掌握市场格局和趋势。</div>
@@ -274,7 +274,7 @@
         <div class="title-box w1200">
           <h3 class="module-title">最新标讯</h3>
           <p class="more">
-            <a href="" class="item-link" target="_blank">查看更多</a>
+            <a class="item-link" onclick="goSupsearch()">查看更多</a>
           </p>
         </div>
         
@@ -328,7 +328,7 @@
               <div class="item"><img src="{{Msg "seo" "cdn"}}/images/index/new/ic-4.png?v={{Msg "seo" "version"}}" alt="">拓宽采购渠道</div>
             </div>
           </div>
-          <div class="btn_">免费注册</div>
+          <div class="btn_" onclick=gologin()>免费注册</div>
         </div>
       </div>
       <div class="jy-index-dataServices CfadeInUp">
@@ -789,6 +789,9 @@
         }
       }
     }
+    function gologin(){
+      location.href ='/notin/page'
+    }
   </script>
   <script>
   $(function () {
@@ -801,6 +804,12 @@
     $("#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_')
@@ -1015,6 +1024,15 @@
     }
 
   }
+  function goSupsearch(){
+    if(!loginflag){
+        window.location.href= '/jylab/supsearch/index.html' + '?' + $('#zbIndex').serialize()
+      }else{
+        openWorkBenchLink({
+        link: '/jylab/supsearch/index.html'
+      })
+      }
+  }
   </script>
   {{include "/common/baiducc.html"}}
   <script type="text/javascript">