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

src/web/staticres/css/dev2/biddingSearch.css

@@ -1507,6 +1507,14 @@ position: absolute;
   background: rgba(0, 0, 0, 0.75)!important;
   border-radius: 4px!important;
 }
+.tooltip-help-class.work-space-help{
+  width: 300px;
+}
+.tooltip-help-class.work-space-help .tooltip-slot-content{
+  text-align: justify;
+  font-size: 14px;
+  line-height: 22px;
+}
 .el-tooltip__popper .popper__arrow{
   opacity: 0.85!important;
 }

src/web/staticres/css/dev2/superSearch.css

@@ -696,3 +696,27 @@ left: 252px;
   left: 0;
   cursor: pointer;
 }
+
+.page-back-btn{
+  width: 90px;
+  height: 32px;
+  background: #EAF8FA;
+  border: 1px solid #2ABED1;
+  border-radius: 4px;
+  color: #2ABED1;
+  font-size: 16px;
+  cursor: pointer;
+}
+
+.into-work-space{
+  display: flex;
+  align-items: center;
+  padding: 4px 8px;
+  background: linear-gradient(to right , #2ABED1 0%, #1B8FFAF5 96%);
+  font-size: 16px;
+  line-height: 24px;
+  color: #fff;
+  border-radius: 4px;
+  margin-left: 12px;
+  cursor: pointer;
+}

src/web/staticres/js/ent-search-index-pc.js

@@ -362,6 +362,44 @@ var entSearch = new Vue({
         // }
     },
     methods: {
+        goBack () {
+          var back = function () {
+            // 判断是否在iframe，如果在iframe，则用父级返回
+            if (goTemplateData.inIframe) {
+              window.parent.history.back()
+            } else {
+              history.back()
+            }
+          }
+        
+          var referer = document.referer
+          if(referer) {
+            var inJianyuWebSite = referer.indexOf('jianyu360.cn') > 0
+            if (inJianyuWebSite) {
+              // 本站的，判断是否是新窗口打开的页面
+              // 1.window.open可以通过判断window.opener
+              // 2.a target='_black'可以通过判断history.length
+              var opener = window.opener && window.opener !== window
+              var target_blank = history.length <= 1
+              // 是否新窗口打开
+              var isNewWindow = opener || target_blank
+              if (isNewWindow) {
+                try {
+                  window.parent && window.parent.close()
+                } catch (error) {
+                  window.close()
+                }
+                back()
+              } else {
+                back()
+              }
+            } else {
+              location.href = '/'
+            }
+          } else {
+            location.href = '/'
+          }
+        },
         // 筛选条件回显
         filterEcho: function (data) {
           const filterLabel = [

src/web/staticres/js/pur-search-index-pc.js

@@ -245,6 +245,44 @@ var vm = new Vue({
         // }
     },
     methods: {
+        goBack () {
+          var back = function () {
+            // 判断是否在iframe，如果在iframe，则用父级返回
+            if (goTemplateData.inIframe) {
+              window.parent.history.back()
+            } else {
+              history.back()
+            }
+          }
+        
+          var referer = document.referer
+          if(referer) {
+            var inJianyuWebSite = referer.indexOf('jianyu360.cn') > 0
+            if (inJianyuWebSite) {
+              // 本站的，判断是否是新窗口打开的页面
+              // 1.window.open可以通过判断window.opener
+              // 2.a target='_black'可以通过判断history.length
+              var opener = window.opener && window.opener !== window
+              var target_blank = history.length <= 1
+              // 是否新窗口打开
+              var isNewWindow = opener || target_blank
+              if (isNewWindow) {
+                try {
+                  window.parent && window.parent.close()
+                } catch (error) {
+                  window.close()
+                }
+                back()
+              } else {
+                back()
+              }
+            } else {
+              location.href = '/'
+            }
+          } else {
+            location.href = '/'
+          }
+        },
         goWorkSpace: function () {
           // 不在工作台，添加缓存
           if(!this.inIframe) {

src/web/staticres/pccss/ent-search-index-pc.css

@@ -481,4 +481,54 @@
   color: #fff;
   transform: translateX(-50%) translateY(-50%);
   z-index: 99;
+}
+
+.search-tab-right{
+  display: flex;
+  margin-top: 8px;
+}
+
+.page-back-btn{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 90px;
+  height: 32px;
+  background: #EAF8FA;
+  border: 1px solid #2ABED1;
+  border-radius: 4px;
+  color: #2ABED1;
+  font-size: 16px;
+  cursor: pointer;
+}
+
+.into-work-space{
+  display: flex;
+  align-items: center;
+  padding: 4px 8px;
+  background: linear-gradient(to right , #2ABED1 0%, #1B8FFAF5 96%);
+  font-size: 16px;
+  line-height: 24px;
+  color: #fff;
+  border-radius: 4px;
+  margin-left: 12px;
+  cursor: pointer;
+}
+
+.tooltip-help-class{
+  width: 300px;
+  padding: 16px!important;
+  background: rgba(0, 0, 0, 0.75)!important;
+  border-radius: 4px!important;
+}
+.tooltip-help-class .tooltip-slot-content{
+  line-height: 22px;
+  font-size: 14px;
+}
+.tooltip-help-btn{
+  width: 15px;
+  height: 15px;
+  margin: 0 4px;
+  cursor: pointer;
+  vertical-align: middle;
 }

src/web/staticres/pccss/pur-search-index-pc.css

@@ -1133,4 +1133,54 @@
 }
 .el-loading-mask{
   background: #fff;
+}
+
+.search-tab-right{
+  display: flex;
+  margin-top: 8px;
+}
+
+.page-back-btn{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 90px;
+  height: 32px;
+  background: #EAF8FA;
+  border: 1px solid #2ABED1;
+  border-radius: 4px;
+  color: #2ABED1;
+  font-size: 16px;
+  cursor: pointer;
+}
+
+.into-work-space{
+  display: flex;
+  align-items: center;
+  padding: 4px 8px;
+  background: linear-gradient(to right , #2ABED1 0%, #1B8FFAF5 96%);
+  font-size: 16px;
+  line-height: 24px;
+  color: #fff;
+  border-radius: 4px;
+  margin-left: 12px;
+  cursor: pointer;
+}
+
+.tooltip-help-class{
+  width: 300px;
+  padding: 16px!important;
+  background: rgba(0, 0, 0, 0.75)!important;
+  border-radius: 4px!important;
+}
+.tooltip-help-class .tooltip-slot-content{
+  line-height: 22px;
+  font-size: 14px;
+}
+.tooltip-help-btn{
+  width: 15px;
+  height: 15px;
+  margin: 0 4px;
+  cursor: pointer;
+  vertical-align: middle;
 }

src/web/templates/pc/entsearchindex.html

@@ -157,8 +157,20 @@
                     <span class="tab-item" v-show="!inIframe" @click="location.replace('/jylab/supsearch/index.html?tab=2')">超前项目查询</span>
                     <!-- <span class="tab-item" v-show="!isLogin && !inIframe" @click="location.replace('/swordfish/page_web_pc/search/issued')">拟在建项目查询</span> -->
                     <div class="search-tab-right" v-show="isLogin && !inIframe">
-                      <span>完整版筛选，戳我>></span>
-                      <span style="color: #2ABED1;cursor: pointer;" @click="goWorkSpace">进入工作台</span>
+                      <button class="page-back-btn" @click="goBack">返回</button>
+                      <div class="into-work-space" @click="goWorkSpace">
+                        <span>进入工作台</span>
+                        <el-tooltip popper-class="tooltip-help-class" effect="dark" placement="bottom">
+                          <img class="tooltip-help-btn" src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon-white.png' width="15" height="15" alt="" />
+                          <template slot="content">
+                            <div class="tooltip-slot-content">
+                              工作台：
+                              <br/>
+            剑鱼工作台是剑鱼注册用户的统一访问入口。通过剑鱼工作台，用户可以访问到剑鱼平台提供的所有数据、资讯、情报、业务功能和各类服务。剑鱼工作台为个人用户提供方便快捷、集约高效的工作环境，同时也为企业用户提供业情一体、规范管理和安全可靠的数字化营销环境。
+                            </div>
+                          </template>
+                        </el-tooltip>
+                      </div>
                     </div>
                 </div>
                 <div class="search-header-content">

src/web/templates/pc/pursearchindex.html

@@ -105,9 +105,21 @@
                   <span class="tab-item" v-show="!inIframe" @click="location.replace('/swordfish/page_web_pc/search/issued')">供应搜索</span>
                   <span class="tab-item" v-show="!inIframe" @click="location.replace('/jylab/supsearch/index.html?tab=2')">超前项目查询</span>
                   <!-- <span class="tab-item" v-show="!inIframe" @click="location.replace('/jylab/entSearch/index.html')">拟在建项目查询</span> -->
-                  <div class="search-tab-right" v-show="loginIn && !inIframe">
-                    <span>完整版筛选，戳我>></span>
-                    <span style="color: #2ABED1;cursor: pointer;" @click="goWorkSpace">进入工作台</span>
+                  <div class="search-tab-right" v-show="isLogin && !inIframe">
+                    <button class="page-back-btn" @click="goBack">返回</button>
+                    <div class="into-work-space" @click="goWorkSpace">
+                      <span>进入工作台</span>
+                      <el-tooltip popper-class="tooltip-help-class" effect="dark" placement="bottom">
+                        <img class="tooltip-help-btn" src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon-white.png' width="15" height="15" alt="" />
+                        <template slot="content">
+                          <div class="tooltip-slot-content">
+                            工作台：
+                            <br/>
+          剑鱼工作台是剑鱼注册用户的统一访问入口。通过剑鱼工作台，用户可以访问到剑鱼平台提供的所有数据、资讯、情报、业务功能和各类服务。剑鱼工作台为个人用户提供方便快捷、集约高效的工作环境，同时也为企业用户提供业情一体、规范管理和安全可靠的数字化营销环境。
+                          </div>
+                        </template>
+                      </el-tooltip>
+                    </div>
                   </div>
                 </div>
                 <div class="search-header-content w">

src/web/templates/pc/supsearch.html

@@ -701,8 +701,20 @@
         <span class="search-tab-item tab-item-recommend-search" style="display: none;" :class="{'tab-active': searchTab === 2}"  @click="location.replace('/jylab/supsearch/index.html?tab=2')">超前项目查询</span>
         <!-- <span class="search-tab-item tab-item-nzj-search" style="display: none;"  @click="location.replace('/swordfish/page_web_pc/search/issued')">拟在建项目查询</span> -->
         <div class="search-tab-right">
-          <span>完整版筛选，戳我>></span>
-          <span style="color: #2ABED1;cursor: pointer;" @click="goWorkSpace">进入工作台</span>
+          <button class="page-back-btn" @click="goBack">返回</button>
+          <div class="into-work-space" @click="goWorkSpace">
+            <span>进入工作台</span>
+            <el-tooltip popper-class="tooltip-help-class work-space-help" effect="dark" placement="bottom">
+              <img class="tooltip-help-btn" src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon-white.png' width="15" height="15" alt="" />
+              <template slot="content">
+                <div class="tooltip-slot-content">
+                  工作台：
+                  <br/>
+剑鱼工作台是剑鱼注册用户的统一访问入口。通过剑鱼工作台，用户可以访问到剑鱼平台提供的所有数据、资讯、情报、业务功能和各类服务。剑鱼工作台为个人用户提供方便快捷、集约高效的工作环境，同时也为企业用户提供业情一体、规范管理和安全可靠的数字化营销环境。
+                </div>
+              </template>
+            </el-tooltip>
+          </div>
         </div>
       </div>
       <!--搜索-->
@@ -3199,6 +3211,44 @@ function checkTagDisabled () {
       }
     },
     methods: {
+      goBack () {
+        var back = function () {
+          // 判断是否在iframe，如果在iframe，则用父级返回
+          if (goTemplateData.inIframe) {
+            window.parent.history.back()
+          } else {
+            history.back()
+          }
+        }
+      
+        var referer = document.referer
+        if(referer) {
+          var inJianyuWebSite = referer.indexOf('jianyu360.cn') > 0
+          if (inJianyuWebSite) {
+            // 本站的，判断是否是新窗口打开的页面
+            // 1.window.open可以通过判断window.opener
+            // 2.a target='_black'可以通过判断history.length
+            var opener = window.opener && window.opener !== window
+            var target_blank = history.length <= 1
+            // 是否新窗口打开
+            var isNewWindow = opener || target_blank
+            if (isNewWindow) {
+              try {
+                window.parent && window.parent.close()
+              } catch (error) {
+                window.close()
+              }
+              back()
+            } else {
+              back()
+            }
+          } else {
+            location.href = '/'
+          }
+        } else {
+          location.href = '/'
+        }
+      },
       goWorkSpace: function () {
         $.ajax({
           url: '/front/dataExport/superSearchExport',