Merge branch 'feature/v4.8.31_wky' of qmx/jy into feature/v4.8.31

src/web/staticres/brand/css/index.css

@@ -10,12 +10,7 @@
 }
 /* 结束 */
 /* 头部按钮 及文案 */
-#public-nav[data-theme] .btn_box{
-  display: block !important;
-}
-#public-nav[data-theme] .btn_box .index{
-  display: none !important;
-}
+
 #public-nav[data-theme] .logo img{
   width: 106px !important;
   margin-top: 10px !important;

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

@@ -14,12 +14,7 @@
 }
 /* 结束 */
 /* 头部按钮 及文案 */
-#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;
@@ -1626,7 +1621,7 @@ color: #999999;
   display: flex;
 }
 .freeRegistration-content .left{
-  
+
 
 }
 .freeRegistration-content .left .title{

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

@@ -71,9 +71,6 @@
   display: none;
 }
 
-.logo_box .logo_desc p {
-  display: none;
-}
 
 .logo_box .logo_desc p {
   /* margin: 0 5px; */
@@ -122,17 +119,37 @@
 .public-nav.light-bg-dark-color .logo_box .logo_desc .line {
   background-color: #E0E0E0;
 }
+
+/* 头部按钮 及文案 */
+
+#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;
+}
+/* 结束 */
+
 .btn_box{
   /* display: flex; */
+  position: absolute;
+  left: 130px;
   margin-top: 15px;
   overflow: hidden;
-  display: none;
 }
 .btn_box div{
   /* margin-left: 25px; */
   /* min-width: 100px; */
   /* height: 36px; */
   max-height: 36px;
+  min-width: max-content;
   padding: 7px 10px;
   display: flex;
   align-items: center;
@@ -1294,4 +1311,4 @@
   border: 0;
   color: #fff !important;
   border-radius: 0;
-}
+}

src/web/templates/common/pchead.html

@@ -1,15 +1,21 @@
 <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">
+    {{if eq $TopMenu.Site "brand"}}
     <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>
+    {{end}}
+    {{if eq $TopMenu.Site "main"}}
     <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>
+    {{end}}
+
   </div>
     <div class="iner">
       <div class="logo_box">
@@ -17,25 +23,40 @@
             <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><p class="index">剑鱼标讯官网</p><p class="brand">品牌官网</p><div class="line"></div></div>
-      </div>
+        <div class="logo_desc">
+          <div class="line"></div>
+          {{if eq $TopMenu.Site "main"}}
+          <p class="index">标讯主站</p>
+          {{end}}
+          {{if eq $TopMenu.Site "brand"}}
+          <p class="brand">品牌官网</p>
+          {{end}}
+          <div class="line"></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>
+          {{if ne $TopMenu.Site "main"}}
           <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>
+            <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>
+          {{end}}
+          {{if ne $TopMenu.Site "brand"}}
+          <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>  
+          {{end}}
+
+
+          <!--          <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>
         <div class="header-right-box fr">
           <ul class="jynav">
           {{range $i, $v := $TopMenu.MenuList }}
@@ -219,7 +240,7 @@ function golink (type){
     location.href = '/industryInfo/index'
   }
 
-  
+
 
 }
 </script>