未登录搜索逻辑调整

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

@@ -1389,6 +1389,15 @@ position: absolute;
   color: #686868;
   cursor: pointer;
 }
+.search-tabs .search-tab-right{
+  display: flex;
+  align-items: center;
+  height: 48px;
+  float: right;
+  font-size: 14px;
+  color: #1D1D1D;
+  line-height: 22px;
+}
 .search-tabs .search-tab-item.tab-active{
   position: relative;
   color: #2CB7CA;

src/web/templates/pc/entsearchindex.html

@@ -150,6 +150,9 @@
                     <span class="tab-item" v-show="!isLogin && !inIframe" @click="location.replace('/jylab/supsearch/index.html')">招标采购公告</span>
                     <span class="tab-item tab-active" @click="location.replace('/jylab/entSearch/index.html')">企业搜索</span>
                     <span class="tab-item" v-show="!isLogin && !inIframe" @click="location.replace('/jylab/purSearch/index.html')">采购单位搜索</span>
+                    <span class="tab-item" v-show="!isLogin && !inIframe" @click="location.replace('/swordfish/page_web_pc/search/issued')">供应搜索</span>
+                    <span class="tab-item" v-show="!isLogin && !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>
                 <div class="search-header-content">
                     <div class="search-header-top">

src/web/templates/pc/pursearchindex.html

@@ -99,6 +99,9 @@
                   <span class="tab-item" v-show="!isLogin && !inIframe" @click="location.replace('/jylab/supsearch/index.html')">招标采购公告</span>
                   <span class="tab-item" v-show="!isLogin && !inIframe" @click="location.replace('/jylab/entSearch/index.html')">企业搜索</span>
                   <span class="tab-item tab-active" @click="location.replace('/jylab/purSearch/index.html')">采购单位搜索</span>
+                  <span class="tab-item" v-show="!isLogin && !inIframe" @click="location.replace('/swordfish/page_web_pc/search/issued')">供应搜索</span>
+                  <span class="tab-item" v-show="!isLogin && !inIframe" @click="location.replace('/jylab/supsearch/index.html?tab=2')">超前项目查询</span>
+                  <!-- <span class="tab-item" v-show="!isLogin && !inIframe" @click="location.replace('/jylab/entSearch/index.html')">拟在建项目查询</span> -->
                 </div>
                 <div class="search-header-content w">
                     <div class="search-header-top">

src/web/templates/pc/supsearch.html

@@ -608,7 +608,11 @@
       searchInnerVue.attachVal_cg = buyerTelVal?buyerTelVal:''
       searchInnerVue.attachVal_zb = winnerTelVal?winnerTelVal:''
       $("#zbSeatchT [name='fileExists']").val(fileExistsTemp)
-      searchInnerVue.searchTab = loginStatusTem ? searchGroup : 1
+      if(getParam('tab') === '2') {
+        searchInnerVue.searchTab = Number(getParam('tab'))
+      } else {
+        searchInnerVue.searchTab = loginStatusTem ? searchGroup : 1
+      }
       searchInnerVue.keywordSearchType = searchModel
       if (addKeyTemp) {
         searchInnerVue.keywordTags = addKeyTemp.split(',')
@@ -724,6 +728,13 @@
         <span class="search-tab-item badge-recommend nologin-hide" :class="{'tab-active': searchTab === 2}" @click="onSearchTab(2)">超前项目</span>
         <span class="search-tab-item tab-item-ent-search" style="display: none;"  @click="location.replace('/jylab/entSearch/index.html')">企业搜索</span>
         <span class="search-tab-item tab-item-buyer-search" style="display: none;"  @click="location.replace('/jylab/purSearch/index.html')">采购单位搜索</span>
+        <span class="search-tab-item tab-item-supply-search" style="display: none;"  @click="location.replace('/swordfish/page_web_pc/search/issued')">供应搜索</span>
+        <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;">进入工作台</span>
+        </div>
       </div>
       <!--搜索-->
       <div class="searchInput clearfix" :class="{'change-search-input': showAddKeyword || keywordMult}">
@@ -1942,17 +1953,28 @@
         }
       }
     }
-    if(!loginflag){//未登录隐藏
+    if(!loginflag){ //未登录隐藏
       $('#go-customer-4').addClass('hide')
-      $('.nologin-hide').addClass('hide')
+      if(getParam('tab') === '2') {
+        searchInnerVue.searchTab = 2
+      }
+      if(!searchInnerVue.hideCQ) {
+        $('.nologin-hide').removeClass('hide')
+        $('.badge-recommend').addClass('hide')
+        $('.search-tab-item-0').addClass('hide')
+      } else {
+        $('.nologin-hide').addClass('hide')
+      }
       $('.city-list-divide').addClass('hide')
       $('#sideIcon').addClass('hide')
       try{
         searchInnerVue.$refs.areaRefs.shoWcity=false//隐藏地市
       }catch(e){
       }
-      $('.tab-item-ent-search').show()
-      $('.tab-item-buyer-search').show()
+      const searchDoms = ['.tab-item-ent-search', '.tab-item-buyer-search', '.tab-item-supply-search', '.tab-item-recommend-search', '.tab-item-nzj-search', '.search-tab-right']
+      for (let i = 0; i < searchDoms.length; i++) {
+        $(searchDoms[i]).show()
+      }
     }
 
     // 数据导出后续不再提示复选框
@@ -1984,8 +2006,10 @@
       }catch(e){
       }
       searchInnerVue.islogin=true
-      $('.tab-item-ent-search').hide()
-      $('.tab-item-buyer-search').hide()
+      const searchDoms = ['.tab-item-ent-search', '.tab-item-buyer-search', '.tab-item-supply-search', '.tab-item-recommend-search', '.tab-item-nzj-search', '.search-tab-right']
+      for (let i = 0; i < searchDoms.length; i++) {
+        $(searchDoms[i]).hide()
+      }
       /**
        * @date 2022/12/15 山川环境嵌入搜索
        */
@@ -1999,7 +2023,7 @@
         var formNode_ = $('#zbSeatchT')
         var goHref_ = location.origin + '/jylab/supsearch/index.html'
         if (getParam('resource') !== 'BI') {
-          window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(goHref_ + '?' + formNode_.serialize()))
+          // window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent(goHref_ + '?' + formNode_.serialize()))
         }
       }
     }
@@ -3068,6 +3092,9 @@ function checkTagDisabled () {
       hideCQ: function () {
         if (this.islogin) {
           return this.searchTab == 1 || this.searchTab == 0
+        } else if(getParam('tab') === '2') {
+          // 未登录点击超前项目搜索tab
+          return false
         } else {
           return true
         }
@@ -4887,6 +4914,9 @@ function checkTagDisabled () {
       },
       // 全部、招标采购搜索公告、超前项目切换
       onSearchTab: function (item) {
+        if(item === 1) {
+          location.replace('/jylab/supsearch/index.html')
+        }
         this.searchTab = item
         // if (item !== 0) {
         //   // 招标采购公共、超前项目切换时要清除信息类型选择结果