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

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

@@ -58,9 +58,10 @@ function getNavTheme () {
 }
 function trySelectNav (name) {
   try {
-    if(name == '解决方案') {
-      name = '电信行业解决方案'
-    }
+    // if(name == '解决方案') {
+    //   name = '电信行业解决方案'
+    // }
+
     var activeDom = document.querySelector("#public-nav .jynav li .jynav-list span[name='"+ name +"']")
     if (activeDom) {
       activeDom.parentNode.parentNode.className = 'active'

src/web/templates/dataMarket/index.html

@@ -8,7 +8,7 @@
   <title>数据市场_剑鱼标讯，专业招标大数据服务平台</title>
   <meta name="Keywords" content="招标数据,中标数据,采购数据,结构化数据"/>
   <meta name="Description" content="剑鱼标讯提供完整的结构化数据导出和定制化合作，提供招标信息相关的项目名称、项目编号、项目范围等多达30个字段，帮助企业通过数据分析市场、获取商机、辅助企业战略决策。。"/>
-  <meta content="数据服务" theme="dark" name="enable-header"/>
+  <meta content="数据市场" theme="light" name="enable-header"/>
   {{include "/common/pnc.html"}}
   <link href='{{Msg "seo" "cdn"}}/css/swiper.min.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css"/>
   <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/reset_pc.css?v={{Msg "seo" "version"}}' />

src/web/templates/frontRouter/pc/solution/free/index.html

@@ -4,7 +4,7 @@
   <title>解决方案_剑鱼标讯，专业招标大数据服务平台</title>
   <meta name="Keywords" content="招标数据,中标数据,采购数据,结构化数据"/>
   <meta name="Description" content="剑鱼标讯提供完整的结构化数据导出和定制化合作，提供招标信息相关的项目名称、项目编号、项目范围等多达30个字段，帮助企业通过数据分析市场、获取商机、辅助企业战略决策。。"/>
-  <meta content="解决方案" theme="dark" name="enable-header"/>
+  <meta content="解决方案" theme="light" name="enable-header"/>
   {{include "/common/pnc.html"}}
   <link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 	<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/pccss/reset_pc.css?v={{Msg "seo" "version"}}" />

src/web/templates/pc/dataExport_sieve.html

@@ -28,7 +28,7 @@
     <script src="https://cdn.bootcdn.net/ajax/libs/fontfaceobserver/2.1.0/fontfaceobserver.js"></script>
     <script src="//cdn-common.jianyu360.com/cdn/lib/vue-dragscroll/3.0.1/dist/vue-dragscroll.min.js"></script>
     <title>数据导出_拟建项目导出_招标采购数据导出_中标数据导出-剑鱼标讯</title>
-    <meta content="数据导出" theme="light" name="enable-header"/>
+    <meta content="数据市场" theme="light" name="enable-header"/>
     <meta name="Keywords" content="拟建项目导出,招标采购数据导出,中标数据导出,剑鱼标讯"/>
     <meta name="Description" content="剑鱼标讯数据导出支持根据关键词、日期、区域、行业和金额等条件导出数据，定制专属你的市场分析数据，查客户、查行业、查竞争对手就用剑鱼标讯数据导出。"/>
     <style>

src/web/templates/site/page/helpCenter/index.html

@@ -76,7 +76,7 @@
           <h2 class="hot-title">热门操作指南</h2>
           <div class="hot-container">
             {{range $k,$v := .T.helpVideo }}
-            <div class="video-card" onclick="window.location.href='/helpVideo/helpCenterDetail?id={{$v._id}}'">
+            <div class="video-card" onclick="window.open('/helpVideo/helpCenterDetail?id={{$v._id}}')">
               <div class="video-card-body">
                 <img class="v-thumbnail" src='{{$v.s_picUrl2}}' alt="{{$v.s_name}}">
                 <p class="v-info">