wangshan 8 жил өмнө
parent
commit
009a17b0c8

+ 2 - 2
src/web/staticres/css/dev2/superSearch.css

@@ -5,10 +5,10 @@
 }
 .pricefat{
 	float: left;
-	margin-top: -8px;
+	margin-top: -6px;
 	border: 1px solid #fff;
     background-color: #fff;
-	padding: 3px 5px;
+	padding: 2px 5px;
 }
 #searchInner .active{
 	background-color: #2cb7ca;

+ 32 - 23
src/web/staticres/js/superSearch.js

@@ -109,10 +109,6 @@ $(function() {
 			submitflag=false;
 		}
 	})
-	//点击超级搜索按钮
-	$(".superSearch").click(function(){
-		$("#labModal").modal("show");
-	})
 })
 //
 function next(){
@@ -208,13 +204,13 @@ function appendDatas(datas,flag){
 			title = keyWordHighlight(title,searchvalueArray.join("|"),"<font class='com-highlight'>$1</font>");
 			detail = keyWordHighlight(detail,searchvalueArray.join("|"),"<font class='com-highlight'>$1</font>");
 		}
-		var href = datas[i].href.replace(/\n/g,"");
-		var aHref = '/article/content/'+datas[i]._id;
-		if(searchvalue != ""){
-			aHref += '.html?kds='+searchvalue;
-		}else{
-			aHref += '.html';
-		}
+//		var href = datas[i].href.replace(/\n/g,"");
+//		var aHref = '/article/content/'+datas[i]._id;
+//		if(searchvalue != ""){
+//			aHref += '.html?kds='+searchvalue;
+//		}else{
+//			aHref += '.html';
+//		}
 		var type = datas[i].subtype;
 		if(typeof(type) == "undefined" || type == null || type == ""){
 			type = datas[i].toptype;
@@ -235,7 +231,7 @@ function appendDatas(datas,flag){
 					+'<div class="liLuceneList" style="border-bottom: 1px solid #EBEBEB;">'
 					+'<div class="luce-left"><em>'+index+'.</em>'
 					+'<div class="left-title">'
-					+'<a href="'+aHref+'"> '+title+'</a>'
+					+'<a onclick="noIn(this)" dataid="'+datas[i]._id+'" target="_blank"> '+title+'</a>'
 					+'</div>'
 		if(flag&&selectType == "all"&&detail!=""){
 			listHtml += '<div class="left-content">'
@@ -268,7 +264,7 @@ function appendDatas(datas,flag){
 			}
 		}
 		listHtml += '</div></li>';
-		tableHtml +='<tr>'
+		tableHtml +='<tr onclick="noIn(this)" dataid="'+datas[i]._id+'" target="_blank">'
 				+'<td><div>'+index+'</div></td>'
 		if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
 			var diff = formatDate(Number(datas[i].publishtime),"s");
@@ -318,12 +314,12 @@ function appendDatas(datas,flag){
 			tableHtml += '<td class="tt-l"><div></div></td>';
 		}
 		if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
-			var bidamount = parseInt(datas[i].bidamount)/10000
+			var bidamount = parseInt(datas[i].bidamount)/10000;
 			if(bidamount.toString().length>6){
 				if(bidamount.toString().indexOf(".")==5){
-					bidamount=bidamount.toString().substr(0,7)
+					bidamount=bidamount.toString().substr(0,7);
 				}else{
-					bidamount=bidamount.toString().substr(0,6)
+					bidamount=bidamount.toString().substr(0,6);
 				}
 			}
 			tableHtml += '<td class="tt-r"><div>'+bidamount+'</div></td>';
@@ -344,19 +340,32 @@ function appendDatas(datas,flag){
 	submitflag=true;
 	backTopAdjust();
 }
+//关闭遮罩层
+function layerClose(){
+	$("#myModal").modal("hide");
+}
 //
+function noIn(p){
+	var thisId = $(p).attr("dataId");
+	dataId = thisId;
+	if(loginflag){
+		var aHref = "";
+		if(searchvalue != ""){
+			aHref += '.html?kds='+searchvalue;
+		}else{
+			aHref += '.html';
+		}
+		window.open("/article/content/"+thisId+aHref);
+	}else{
+		$('#myModal').modal("show");
+	}
+}
 //
 function formatDate(date,sl)   { 
 	var myDate = new Date(date*1000);      
     var   year=myDate.getFullYear();
     var   month=myDate.getMonth()+1; 
-//	if(month<10){
-//		month="0"+month
-//	} 
-    var   date=myDate.getDate();      
-//	if(date<10){
-//		date="0"+date
-//	} 
+    var   date=myDate.getDate();
 	var hour = myDate.getHours()
 	var min = myDate.getMinutes()
 	if(sl=="l"){

+ 32 - 18
src/web/templates/pc/supsearch.html

@@ -99,7 +99,7 @@ a{
 #keyImg{
 	width:198px;
 }
-#layerImg{
+#labImg{
 	position:absolute;
 	width: 150px !important;
     height: 150px !important;
@@ -161,6 +161,9 @@ a{
 .j-clearicon{
 	right:118px !important;
 }
+.lucene-table tr{
+	cursor:pointer;
+}
 </style>
 <script>
 var areas = {{.T.area}};
@@ -342,7 +345,7 @@ $(function(){
 					<div>按行业、金额搜索、结果可按表格显示</div>
 				</div>
 				<img src="/images/biddingSearch/labbkimg.png"/>
-				<img id="layerImg" src="/front/share/{{.T.shareid}}"/>
+				<img id="labImg" src="/front/share/{{.T.shareid}}"/>
 			</div>
             <div class="modal-footer">
                 此功能尚处在实验阶段,请扫码进入<br>剑鱼实验室,打开相应开关后,即可体验!
@@ -350,6 +353,24 @@ $(function(){
         </div><!-- /.modal-content -->
     </div><!-- /.modal -->
 </div>
+//
+<div class="modal fade" id="myModal"  tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" >
+  <div class="modal-dialog" style="width:400px;border:0px;" >
+		<div class="j-wx-code" id="myModal-div">
+			<img class="code-close" src="/images/j-wx-code-close.png" alt="" onclick="layerClose();"/>
+			<div class="code-title"></div>
+			<div class="code-wxm"><img id="layerImg" src="/front/share/{{.T.shareid}}"/></div>
+			<div class="code-text">
+				<span><img id="wxpng" src="/images/wx1.png"/>微信扫码登录</span>
+				<br/>
+				<span id="freetext">立即免费使用</span>
+			</div>
+			<div class="code-bottom">
+				<img src="/images/j-wx-cose-move.png" alt=""/>
+			</div>
+		</div>
+  </div>
+</div>
 <section id="searchInner">
 	<!--搜索头部 START-->
 	<div class="searchHeader">
@@ -366,22 +387,6 @@ $(function(){
 					<input class="searchname" autocomplete="off" type="search" id="searchinput" value="{{.T.keywords}}" name="keywords" placeholder="高速公路" />
 					<img src="/images/pc_20.png" id="t-clear" class="j-clearicon" style="display: none;">
 					<input type="submit" value="搜索" />
-<!--					<div class="searchSlideText">
-						<ul>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-							<li>滁州市<i>万达集团</i>公司</li>
-							<li>大连<i>万达集团</i>股份有限公司天津共享服务分公司</li>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-							<li>滁州市<i>万达集团</i>公司</li>
-							<li>大连<i>万达集团</i>股份有限公司天津共享服务分公司</li>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-							<li>滁州市<i>万达集团</i>公司</li>
-							<li>大连<i>万达集团</i>股份有限公司天津共享服务分公司</li>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-						</ul>
-					</div>-->
 					<input type="hidden" name="searchvalue" value="{{.T.keywords}}">
 					<input type="hidden" name="publishtime" value="{{.T.publishtime}}">
 					<input type="hidden" name="timeslot" value="{{.T.timeslot}}">
@@ -677,6 +682,15 @@ $(function(){
 $(function(){
 	haslogin({{.T.logid}});
 	console.log(loginflag+"-------")
+	//点击超级搜索按钮
+	$(".superSearch").click(function(){
+		if(loginflag){
+			$("#labModal").modal("show");
+		}else{
+			$("#bidLogin").modal("show");
+		}
+		
+	})
 	//
 	$(".j-nav .j-nav-link:eq(2)").addClass("active");
 	$(".q-mark").click(function(){