Merge branch 'feature/v4.8.64_zyh' of qmx/jy into feature/v4.8.64

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

@@ -515,13 +515,13 @@
   display: flex;
   align-items: center;
   box-sizing: border-box;
-  
+
 }
 .release-time .vip_box .active{
   color: #fff !important;
   background-color:#C98F37 !important;
   border-radius: 2px;
-  
+
 }
 .release-time.flex-auto{
   display: flex;
@@ -578,7 +578,7 @@
   display: flex;
   align-items: center;
   box-sizing: border-box;
- 
+
 }
 .searchSpace .search-content{
   display: flex;
@@ -686,3 +686,11 @@ left: 252px;
   font-weight: bold;
     color: #1d1d1d;
 }
+.no-login-mask {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  cursor: pointer;
+}

src/web/staticres/js/biddingSearch.js

@@ -253,6 +253,11 @@ $(function() {
 	function silbingsTabClass(children) {
 		var $childrenLi = children;
 		$childrenLi.on("click", function(e) {
+      // @2023/9/26 未登录限制搜索条件
+      if (!loginflag) {
+        return openLoginDig()
+      }
+
       if (window.vipStatus || window.memberStatus > 0 || window.entniche) {
         // 如果是付费用户 可正常切换
         $(this).addClass("active").siblings().removeClass("active");

src/web/staticres/js/superSearch.js

@@ -170,6 +170,10 @@ $(function() {
     })
   })
 
+  if (!loginflag) {
+    // @2023/9/26 未登录限制搜索条件，使用接口
+    beforeSubmit('filter-selectType')
+  }
 })
 
 //取redis里的数据
@@ -933,6 +937,14 @@ function beforeSubmit(from){
   // from=='tab-*'表示tab切换查询事件
   // from=='page-init-recovery'回显搜索
   from = from || ''
+
+  // @2023/9/26 未登录限制搜索条件
+  if (!loginflag) {
+    if (from.indexOf('filter-') !== -1 && from !== 'filter-selectType') {
+      return openLoginDig()
+    }
+  }
+
   var searchKeywords = $.trim($("#zbSeatchT input[name='keywords']").val())
   // 如果在反爬白名单，则空搜索刷新搜索结果(即允许空搜索)
   // 不在，则不允许空搜索(此处空搜索指的是主搜索框是否为空)
@@ -1200,27 +1212,52 @@ function searchOnsubmit(clickpaging){
     wordsMode: $("#zbSeatchT [name='wordsMode']").val(),
     additionalWords: $("#zbSeatchT [name='additionalWords']").val()
   };
-	$.post("/front/pcAjaxReq",param,function(r){
+
+  function queryBack (r) {
     heightWords = r.heightWords
-		if(r.limitFlag){
-			LimitClass.limitFlag = true;
-			LimitClass.result = r;
-			LimitClass.list = r.list;
-			LimitClass.paging(currentPage);
+    if(r.limitFlag){
+      LimitClass.limitFlag = true;
+      LimitClass.result = r;
+      LimitClass.list = r.list;
+      LimitClass.paging(currentPage);
       LimitClass.prevNoLimitFlag = false;
       // 重新分页
       searchInnerVue.listState.totalPage = Math.ceil(r.count / pageSize)
       allCount = r.total
       searchInnerVue.listState.allCount = r.total
       // searchInnerVue.checkPageNumAdd1()
-		}else{
-			LimitClass.prevNoLimitFlag = true;
+    }else{
+      LimitClass.prevNoLimitFlag = true;
       LimitClass.limitFlag = false;
       pcAjaxReqCallBack(r);
     }
-    autoModelFn(r)
+    if (loginflag) {
+      autoModelFn(r)
+    }
     // getBidIsColl()
-	});
+  }
+
+  // @2023/9/26 未登录限制搜索条件，更换接口
+  if (!loginflag) {
+    $.ajax({
+      type: 'POST',
+      url: '/jybx/core/nologin/search',
+      data: JSON.stringify({
+        pageNum: param.pageNumber,
+        pageSize: param.pageSize,
+        selectType: param.selectType,
+        keyWords: param.searchvalue,
+      }),
+      contentType: 'application/json',
+      success: function (r) {
+        queryBack(r)
+      }
+    })
+  } else {
+    $.post("/front/pcAjaxReq",param,function(r){
+      queryBack(r)
+    });
+  }
 }
 function showSearchTipForTimeRange (type) {
 	var tempDom = $("#hasNoData_tiptext>font:eq(0)")

src/web/templates/pc/supsearch.html

@@ -1217,7 +1217,7 @@
             <div class="leftTitle">
               信息类型：
             </div>
-            <div class="info-content bi-change-group">
+            <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>
@@ -1254,6 +1254,8 @@
               <font v-show="hideCQ" class="bi-mark" data-value="合同">合同</font>
               <font v-show="hideCQ" class="bi-mark" data-value="验收">验收</font>
               <font v-show="hideCQ" class="bi-mark" data-value="违规">违规</font>
+              <!-- 未登录用户 -->
+              <div class="no-login-mask" onclick="openLoginDig()"></div>
             </div>
             <span class="remind tips_" style="display:none;">
               <span class="remindone"></span>
@@ -1295,7 +1297,7 @@
           <!-- 更多筛选条件 -->
           <div class="other-filter clearfix" style="display: none;">
             <div class="leftTitle lh-22">更多筛选：</div>
-            <div class="other-content">
+            <div class="other-content" style="position: relative;">
                 <div class="one-filter clearfix">
                   <!-- 地区下拉筛选 -->
                    <div class="select-area mr-16">
@@ -1457,6 +1459,8 @@
                   </div>
                   <img class="icon-vip" src="{{Msg "seo" "cdn"}}/images/biddingSearch/VIP.png?v={{Msg "seo" "version"}}" alt="">
                 </div>
+                <!-- 未登录用户 -->
+                <div class="no-login-mask" onclick="openLoginDig()"></div>
             </div>
           </div>
           <!-- 其他筛选条件 -->
@@ -2470,6 +2474,16 @@
     })
     // 搜索范围点击事件
     $('.search-content .search-list .search-list-checkbox').on('click',function(){
+
+      // @2023/9/26 未登录限制搜索条件
+      if (!loginflag) {
+        var nowSelectType = $(this).attr('data-name')
+        var allowTypes = ['content', 'title']
+        if (allowTypes.indexOf(nowSelectType) === -1) {
+          return openLoginDig()
+        }
+      }
+
       // 最少选中一项
       var nowSelectTypes = $("#zbSeatchT [name='selectType']").val()
       if (nowSelectTypes !== '') {