Merge branch 'feature/v4.7.23' of http://192.168.3.207:8080/qmx/jy into feature/v4.7.23

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

@@ -797,7 +797,6 @@ position: absolute;
   padding: 15px 0px 0px;
   overflow: hidden;
   font-size: 16px;
-  height:61px;
 }
 #searchInner .searchControl .seaTender-inner .tabContainer-2 .lucene li:hover a,
 #searchInner .searchControl .seaTender-inner .tabContainer-2 .lucene li:hover em{
@@ -880,6 +879,55 @@ width:1200px;
   font-size: 16px;
 }
 
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field{
+  float: left;
+  margin: 0 0 10px 22px;
+  width: calc(100% - 34px);
+}
+
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field .nowrap{
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field span:nth-child(1){
+  font-size: 12px;
+  font-weight: 400;
+  color: #999999;
+  line-height: 22px;
+  padding: 0 8px;
+}
+
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field  span:nth-child(2){
+  font-size: 14px;
+  font-weight: 400;
+  color: #686868;
+  line-height: 22px;
+  padding: 0 8px;
+}
+
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field>div{
+  padding-bottom: 10px;
+}
+
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field>div:nth-child(1){
+  margin-top: -7px;
+}
+
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field>.secondLine{
+  display: flex;
+  flex-direction: row;
+}
+
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field>.secondLine>div:nth-child(2){
+  margin-left: 16px;
+}
+
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-field>div:last-child{
+  padding-bottom: 8px;
+}
+
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-right a {
   display: inline-block;
   padding: 1px 8px;

src/web/staticres/js/superSearch.js

@@ -315,6 +315,7 @@ function getNewBiddings(){
 
 function appendDatas(datas,flag,isNew,onlyUpdateTable){
   // flag // 是否有输入
+  let is_field=$("#zbSeatchT [name='bid_field']").val()
   console.log('selectType: ' + selectType,',flag: ',flag)
 	var listHtml = '';
 	var tableHtml = '';
@@ -357,6 +358,19 @@ 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>";
@@ -386,7 +400,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
 				listHtml +='<div class="liLuceneList" style="border-bottom: 1px solid #EBEBEB;">'
       //}
       // 标题搜索 选择框
-      if (selectType.indexOf('content') == -1 || !flag) {
+      if (selectType.indexOf('content') == -1 || is_field || !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 == '剑鱼信息发布平台') {
@@ -400,8 +414,8 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
         }
         listHtml+='</div>'
       }
-      // 全文搜索
-			if(flag && selectType.indexOf('content') > -1){
+      // 全文搜索 领域化不展示正文
+			if(flag && selectType.indexOf('content') > -1 && !is_field){
 				listHtml +='<div class="luce-left">'
 				if(datas[i].site == '剑鱼信息发布平台') {
 					listHtml += '<span class="userPublish">用户发布</span>'
@@ -435,7 +449,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
 				listHtml += '<a href="#" style="display:none;"></a>';
 			}
 			//
-			if(typeof(datas[i].industry) != "undefined" && datas[i].industry != null && datas[i].industry != ""){
+			if(typeof(datas[i].industry) != "undefined" && datas[i].industry != null && datas[i].industry != ""&&!is_field){
 				listHtml += '<a href="/list/industry/'+datas[i].indadd+'.html">'+datas[i].industry+'</a>';
 			}else{
 				listHtml += '<a href="javascript:volid(0);" style="display:none;"></a>';
@@ -462,8 +476,34 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
 				}
       }
       // 是否收藏
-      listHtml += '<i class="icon-collect" dataid="'+datas[i]._id+'"></i>'
-			listHtml += '</div></li>';
+      listHtml += '<i class="icon-collect" dataid="'+datas[i]._id+'"></i></div>'
+
+
+      //领域化展示 商品&采购单位&中标单位
+      if (is_field){
+        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>'
+        }
+
+        let secondLine=''
+        if (typeof(datas[i].buyer) != "undefined" && datas[i].buyer != null && datas[i].buyer != ""){
+          secondLine += '<div class="nowrap"><span>采购单位</span><span>'+datas[i].buyer +'</span></div>'
+        }
+
+        if (typeof(datas[i].s_winner) != "undefined" && datas[i].s_winner != null && datas[i].s_winner != ""){
+          secondLine += '<div class="nowrap"><span>中标单位</span><span>'+datas[i].s_winner +'</span></div>'
+        }
+
+        if (secondLine!=='') {
+          listHtml += '<div class="secondLine">'+secondLine+'</div>'
+        }
+
+        listHtml += '</div>'
+      }
+
+      listHtml += '</div></li>';
+
 			if(i == 5) {
 				listHtml += '<div class="_t3di2018y5"></div>'
 			}
@@ -564,6 +604,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
 	}else{
 		sessionStorage.setItem("table_first_context",tableHtml)
 	}
+  //console.log(listHtml)
   // 没有关键词或者没有选中正文
 	if(!flag||selectType.indexOf('content') == -1){
 		if (!onlyUpdateTable){