|
@@ -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)")
|