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

src/web/staticres/js/login.js

@@ -541,9 +541,6 @@ var processpage = function(item,num){
   var backToUrl = getParam('backTo')
   if (backToUrl) {
     return location.replace(decodeURIComponent(backToUrl))
-  }
-  if (document.referrer === location.href) {
-    return location.replace('/')
   }
 	var toHref=$("#bidLogin").attr("data-rec")
 	switch (toHref) {

src/web/templates/pc/supsearch.html

@@ -613,6 +613,7 @@
       } else {
         searchInnerVue.searchTab = loginStatusTem ? searchGroup : 1
       }
+      $("#zbSeatchT [name='searchGroup']").val(searchInnerVue.searchTab)
       searchInnerVue.keywordSearchType = searchModel
       if (addKeyTemp) {
         searchInnerVue.keywordTags = addKeyTemp.split(',')
@@ -1152,14 +1153,16 @@
             </div>
             <div class="info-content bi-change-group" style="position: relative;">
               <span id="infoBtn" class="active">全部</span>
-              <i v-show="showCQ" class="diver"></i>
-              <font v-show="showCQ" class="parent-node nologin-hide">拟建项目</font>
-              <font v-show="showCQ" data-value="拟建" class="hidden">拟建</font>
-              <a v-show="showCQ" id="whole"><img class="q-mark nologin-hide" id="q-mark"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
-              <i v-show="showCQ" class="diver nologin-hide"></i>
-              <font v-show="showCQ" class="parent-node nologin-hide">采购意向</font>
-              <font v-show="showCQ" data-value="采购意向" class="hidden">采购意向</font>
-              <a v-show="showCQ" id="whole"><img class="q-mark-buyer nologin-hide" id="q-mark-buyer"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
+              <i class="show-nj-cg nologin-hide">
+                <i v-show="showCQ" class="diver"></i>
+                <font v-show="showCQ" class="parent-node nologin-hide">拟建项目</font>
+                <font v-show="showCQ" data-value="拟建" class="hidden">拟建</font>
+                <a v-show="showCQ" id="whole"><img class="q-mark nologin-hide" id="q-mark"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
+                <i v-show="showCQ" class="diver nologin-hide"></i>
+                <font v-show="showCQ" class="parent-node nologin-hide">采购意向</font>
+                <font v-show="showCQ" data-value="采购意向" class="hidden">采购意向</font>
+                <a v-show="showCQ" id="whole"><img class="q-mark-buyer nologin-hide" id="q-mark-buyer"  src='{{Msg "seo" "cdn"}}/images/biddingSearch/info-icon1.png' alt="" /></a>
+              </i>
               <i v-show="hideCQ" class="diver nologin-hide"></i>
               <font v-show="hideCQ" class="parent-node">招标预告</font>
               <font v-show="hideCQ" data-value="预告">预告</font>
@@ -1960,10 +1963,17 @@
       } else {
         searchInnerVue.searchTab = 1
       }
+      $("#zbSeatchT [name='searchGroup']").val(searchInnerVue.searchTab)
       $('#setInfoBtn').text('免费发布信息')
       if(!goTemplateData.inIframe) {
+        // 超前项目：未登录状态下，隐藏部分内容
         if(!searchInnerVue.hideCQ) {
-          $('.nologin-hide').removeClass('hide')
+          $('.nologin-hide').addClass('hide')
+          const arr = ['.show-nj-cg .parent-node', '.show-nj-cg .diver', '.show-nj-cg', '.show-nj-cg img']
+          for (let i = 0; i < arr.length; i++) {
+            $(arr[i]).removeClass('hide')
+            $(arr[i]).removeClass('nologin-hide')
+          }
           $('.badge-recommend').addClass('hide')
           $('.search-tab-item-0').addClass('hide')
         } else {
@@ -1971,12 +1981,13 @@
         }
         $('.city-list-divide').addClass('hide')
         $('#sideIcon').addClass('hide')
+        $('.search-tab-right').hide()
       }
       try{
         searchInnerVue.$refs.areaRefs.shoWcity=false//隐藏地市
       }catch(e){
       }
-      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']
+      const searchDoms = ['.tab-item-ent-search', '.tab-item-buyer-search', '.tab-item-supply-search', '.tab-item-recommend-search', '.tab-item-nzj-search']
       for (let i = 0; i < searchDoms.length; i++) {
         $(searchDoms[i]).show()
       }
@@ -2018,6 +2029,7 @@
       } else {
         searchInnerVue.searchTab = 1
       }
+      $("#zbSeatchT [name='searchGroup']").val(searchInnerVue.searchTab)
       $('#setInfoBtn').text('信息发布')
       $('.city-list-divide').removeClass('hide')
       $('#sideIcon').removeClass('hide')