Browse Source

Merge branch 'master' of ssh://git.jishutao.com:55555/jishutao/jitao-portal

liting2017 6 years ago
parent
commit
cc3d22e4ba
2 changed files with 4 additions and 7 deletions
  1. 1 1
      src/css/search.css
  2. 3 6
      src/js/search.js

+ 1 - 1
src/css/search.css

@@ -9,7 +9,7 @@ line-height: 70px;cursor: pointer;overflow: hidden;}
 display: flex;justify-content: space-between;background-color: #fff;}
 .contone:nth-child(even){background-color: #F9F9F9;}
 .title{width:1200px;margin:0 auto;height:50px;line-height: 50px;color:#707070;}
-.line1{text-align: justify;text-overflow: ellipsis;overflow: hidden;/*display: -webkit-box;*/-webkit-box-orient: vertical; -webkit-line-clamp: 1;}
+.line1{overflow: hidden;white-space:nowrap;text-overflow:ellipsis;-o-text-overflow:ellipsis;}
 .key{width:300px;}
 .noLength{color:#4d4d4d;font-size: 18px;float:left;margin: 30px 0 0 10px;}
 

+ 3 - 6
src/js/search.js

@@ -41,11 +41,9 @@ $(function(){
                 if (data.error && data.error.length) {
                     msg(data.error[0].message);
                 }else if(data.error==""){
-                	console.log(data);
                     var contHtml="";
                     var dataList=data.data.list;
                     if(dataList.length){
-                    	console.log(dataList);
                     	for(var a=0;a<dataList.length;a++){
                     		var titleHtml="";
                     		var keyHtml="";
@@ -77,13 +75,12 @@ $(function(){
                     				keyHtml=`${keyData[0]}`;
                     			}
                     		}
-                    		console.log(titleData);
-                    		console.log(keyData);
+                    		console.log(keyHtml);
                     		contHtml+=`<div class="contone">
 											<h4 class="line1">${titleHtml}</h4>
-											<p >
+											<p class="line1">
 												<span>关键字:</span>
-												<span class="line1 key">${keyHtml}</span>
+												<span class="key">${keyHtml}</span>
 											</p>
 											<input type="hidden" dataType="${dataList[a].fromTable}" dataId="${dataList[a].rowId}"/>
 										</div>`;