|
@@ -315,7 +315,8 @@ function getNewBiddings(){
|
|
|
|
|
|
function appendDatas(datas,flag,isNew,onlyUpdateTable){
|
|
|
// flag // 是否有输入
|
|
|
- let is_field=$("#zbSeatchT [name='bid_field']").val()
|
|
|
+ let is_field=$("#zbSeatchT [name='bid_field']").val() //是否是领域化
|
|
|
+ let selectContext=selectType.indexOf('content') > -1 //是否正文搜索
|
|
|
console.log('selectType: ' + selectType,',flag: ',flag)
|
|
|
var listHtml = '';
|
|
|
var tableHtml = '';
|
|
@@ -358,19 +359,6 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
|
|
|
title = keyWordHighlight(title,searchvalueArray,"<font class='com-highlight'>$1</font>");
|
|
|
title=title.replace(/\<br>/g,"")
|
|
|
detail = keyWordHighlight(detail,searchvalueArray,"<font class='com-highlight'>$1</font>");
|
|
|
- if (is_field){ //领域化字段高亮
|
|
|
- if (typeof(datas[i].purchasing) != "undefined" && datas[i].purchasing != null && datas[i].purchasing != ""){
|
|
|
- datas[i].purchasing = keyWordHighlight(datas[i].purchasing,searchvalueArray,"<font class='com-highlight'>$1</font>");
|
|
|
- }
|
|
|
-
|
|
|
- if (typeof(datas[i].buyer) != "undefined" && datas[i].buyer != null && datas[i].buyer != ""){
|
|
|
- datas[i].buyer = keyWordHighlight(datas[i].buyer,searchvalueArray,"<font class='com-highlight'>$1</font>");
|
|
|
- }
|
|
|
-
|
|
|
- if (typeof(datas[i].s_winner) != "undefined" && datas[i].s_winner != null && datas[i].s_winner != ""){
|
|
|
- datas[i].s_winner = keyWordHighlight(datas[i].s_winner,searchvalueArray,"<font class='com-highlight'>$1</font>");
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
if(title.length<40){
|
|
|
title=title+"<span style='color:#fff;display:none;'>"+Math.random().toString(36).substring(2)+"<span>";
|
|
@@ -400,7 +388,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
|
|
|
listHtml +='<div class="liLuceneList" style="border-bottom: 1px solid #EBEBEB;">'
|
|
|
//}
|
|
|
// 标题搜索 选择框
|
|
|
- if (selectType.indexOf('content') == -1 || is_field || !flag) {
|
|
|
+ if (!selectContext || !flag) {
|
|
|
listHtml += '<input class="custom-checkbox title-text-checkbox" name="bid-list" type="checkbox" dataid="'+datas[i]._id+'" />'
|
|
|
listHtml +='<div class="luce-left">'
|
|
|
if(datas[i].site == '剑鱼信息发布平台') {
|
|
@@ -414,8 +402,8 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
|
|
|
}
|
|
|
listHtml+='</div>'
|
|
|
}
|
|
|
- // 全文搜索 领域化不展示正文
|
|
|
- if(flag && selectType.indexOf('content') > -1 && !is_field){
|
|
|
+ // 全文搜索
|
|
|
+ if(flag && selectContext){
|
|
|
listHtml +='<div class="luce-left">'
|
|
|
if(datas[i].site == '剑鱼信息发布平台') {
|
|
|
listHtml += '<span class="userPublish">用户发布</span>'
|
|
@@ -480,7 +468,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
|
|
|
|
|
|
|
|
|
//领域化展示 商品&采购单位&中标单位
|
|
|
- if (is_field){
|
|
|
+ if (is_field && !selectContext){
|
|
|
listHtml += '<div class="luce-field">'
|
|
|
if (typeof(datas[i].purchasing) != "undefined" && datas[i].purchasing != null && datas[i].purchasing != ""){
|
|
|
listHtml += '<div class="nowrap"><span>产品</span><span>'+datas[i].purchasing +'</span></div>'
|
|
@@ -587,7 +575,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
|
|
|
}
|
|
|
// 搜索框有输入词
|
|
|
if(flag){
|
|
|
- if(selectType.indexOf('content') > -1&&!is_field) {
|
|
|
+ if(selectContext) {
|
|
|
$("#allnews").show();
|
|
|
$(".tabContainer-2").hide();
|
|
|
} else {
|
|
@@ -606,13 +594,13 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
|
|
|
}
|
|
|
//console.log(listHtml)
|
|
|
// 没有关键词或者没有选中正文
|
|
|
- if(!flag||selectType.indexOf('content') == -1||is_field){
|
|
|
+ if(!flag||!selectContext){
|
|
|
if (!onlyUpdateTable){
|
|
|
$(".tabContainer-2 .lucene ul").html(listHtml);
|
|
|
}
|
|
|
$(".tabContainer-2 .lucene-table table tbody").html(tableHtml);
|
|
|
}else{
|
|
|
- if(selectType.indexOf('content') > -1){
|
|
|
+ if(selectContext){
|
|
|
if (!onlyUpdateTable){
|
|
|
$("#allnews .lucene ul").html(listHtml);
|
|
|
}
|