Merge branch 'dev2.0' of http://192.168.3.17/gitlab/qmx/jy into dev2.0

src/jfw/front/entsearch.go

@@ -2,9 +2,11 @@ package front
 
 import (
 	"fmt"
+	"jfw/config"
 	"jfw/jylabutil"
 	_ "jfw/jyutil"
 	"log"
+	"math/rand"
 	"qfw/util"
 	"time"
 
@@ -25,6 +27,12 @@ func init() {
 
 func (e *Entsearch) Bidsearchforent() error {
 	defer util.Catch()
+	var shareid = e.GetString("id")
+	e.T["logid"] = config.Seoconfig["jyzbqyss"].(string)
+	if len(shareid) == 0 {
+		shareid = fmt.Sprintf("%s%d", config.Seoconfig["jysslby"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
+	}
+
 	searchvalue := e.GetString("searchvalue")
 	area := e.GetString("area")
 	pricetype := e.GetString("pricetype")
@@ -34,14 +42,14 @@ func (e *Entsearch) Bidsearchforent() error {
 		//搜索minprice和maxprice价格区间的数据
 	}
 	if pricetype == "n" || pricetype == "" {
-		//搜索所有价格
+		//搜索所有的价格
 	}
 
-	fmt.Println("searchvalue1==", searchvalue)
-	fmt.Println("area1==", area)
-	fmt.Println("lower1==", minprice)
-	fmt.Println("upper1==", maxprice)
-	fmt.Println("pricetype1==", pricetype)
+	//fmt.Println("searchvalue1==", searchvalue)
+	//fmt.Println("area1==", area)
+	//fmt.Println("lower1==", minprice)
+	//fmt.Println("upper1==", maxprice)
+	//fmt.Println("pricetype1==", pricetype)
 
 	if minprice == 0 {
 		e.T["minprice"] = ""
@@ -57,6 +65,7 @@ func (e *Entsearch) Bidsearchforent() error {
 	e.T["searchvalue"] = searchvalue
 	e.T["area"] = area
 	e.T["pricetype"] = pricetype
+	e.T["shareid"] = se.EncodeString(shareid)
 	log.Println("-------中标企业搜索：")
 
 	list := []map[string]interface{}{}

src/seo.json

@@ -274,6 +274,7 @@
 	"jybky":"15",
 	"jygywmy":"16",
 	"jySEMtgy":"17",
+	"jyzbqyss":"18",
 	"module":{
 		"subscribe":"订阅页",
 		"/list/":"标签页",

src/web/staticres/css/search/superSearch.css

@@ -1626,36 +1626,36 @@ body{
 	color: #686868;
 }
 #table table{
-	width: 870px;
+	width: 880px;
 	padding: 20px 20px 0px 20px;
 	display:block;
 }
-#table table>tbody>tr>td:nth-child(1){
+#table table>tbody>tr>td:nth-child(1) div{
 	width:30px;
 }
-#table table>tbody>tr>td:nth-child(2){
+#table table>tbody>tr>td:nth-child(2) div{
+	width:58px;
+}
+#table table>tbody>tr>td:nth-child(3) div{
 	width:60px;
 }
-#table table>tbody>tr>td:nth-child(3){
-	width:100px;
+#table table>tbody>tr>td:nth-child(4) div{
+	width:125px;
 }
-#table table>tbody>tr>td:nth-child(4){
+#table table>tbody>tr>td:nth-child(5) div{
 	width:160px;
 }
-#table table>tbody>tr>td:nth-child(5){
-	width:200px;
-}
-#table table>tbody>tr>td:nth-child(6){
-	width:40px;
+#table table>tbody>tr>td:nth-child(6) div{
+	width:60px;
 }
-#table table>tbody>tr>td:nth-child(7){
-	width:100px;
+#table table>tbody>tr>td:nth-child(7) div{
+	width:75px;
 }
-#table table>tbody>tr>td:nth-child(8){
-	width: 140px;
+#table table>tbody>tr>td:nth-child(8) div{
+	width: 110px;
 }
-#table table>tbody>tr>td:nth-child(9){
-	width: 40px;
+#table table>tbody>tr>td:nth-child(9) div{
+	width: 60px;
 }
 #table tr td{
 	border: 1px solid #E0E0E0;

src/web/templates/pc/biddingsearch_enterprise.html

@@ -11,7 +11,7 @@
 		<link href="/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<link href="/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<link href="/css/dev2/biddingSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-		<link href="/css/dev2/biddingSearch1.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+		<link href="/css/dev2/superSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<script src="/js/jquery.cookie.js"></script>
 		<script src="/js/biddingSearch.js?v={{Msg "seo" "version"}}"></script>
 		<script language="javascript" type="text/javascript" src="/My97DatePicker/WdatePicker.js"></script>
@@ -380,7 +380,9 @@
 							</table>
 						</div>
 					</div>
-
+					<div class="hasNoData" style="display: none;">
+						<img src="/images/pc_12.png" id="hasNoData">
+					</div>
 				</div>
 				<!--分页-->
 				<div class="pagination clearfix w">
@@ -403,44 +405,6 @@
 		var areas = {{.T.area}};
 		var searchvalue = {{.T.searchvalue}};
 		
-		//地区回显样式设置
-		if(areas != ""){
-			$("#regionBtn").removeClass("active");
-			areas = areas.split(",");
-			for(var i=0;i<areas.length;i++){
-				$(".region-content>font:not('.parent-node')").each(function(){
-					if($(this).text() == areas[i]){
-						$(this).addClass("active");
-						return false;
-					}
-				});
-			}
-		}
-		$(".region-content .parent-node").each(function(){
-			var fontLen = $(this).nextUntil(".parent-node").filter("font").length;
-			var activeLen = $(this).nextUntil(".parent-node").filter(".active").length;
-			if(fontLen == activeLen){
-				$(this).addClass("active");
-			}
-			if(activeLen >0 && activeLen < fontLen){
-				$(this).addClass("secondActice");
-			}
-		});
-		
-		//搜索关键词回显页面样式设置
-		if(searchvalue != "" && searchvalue != null){
-			$(".seaTender-inner").css({'border':'0px'});
-			$(".lucene-table").css({'padding':'0px','border-bottom':'0px','display':'block'});		
-			$(".tabTitle").addClass("hidden");
-			$(".lucene").attr("style","display:none");
-		}
-		
-		//价格回显样式设置
-		if({{.T.pricetype}} == "y"){
-			$(".Price-content").find("span:first-child").removeClass("active");
-			$(".pricefat").addClass("active");
-		}
-		
 		$(function(){
 			haslogin({{.T.logid}});
 			$(".j-nav .j-nav-link:eq(2)").addClass("active");
@@ -452,6 +416,55 @@
 				}
 			});
 			
+			//查询数据不存在判断
+			if(mainList == null || mainList.length == 0){
+				$(".tabContainer").hide();
+				$(".pagination").hide();
+				$(".hasNoData").show();
+			}else{
+				$(".tabContainer").show();
+				$(".pagination").show();
+				$(".hasNoData").hide();
+			}
+			//地区回显样式设置
+			if(areas != ""){
+				$("#regionBtn").removeClass("active");
+				areas = areas.split(",");
+				for(var i=0;i<areas.length;i++){
+					$(".region-content>font:not('.parent-node')").each(function(){
+						if($(this).text() == areas[i]){
+							$(this).addClass("active");
+							return false;
+						}
+					});
+				}
+			}
+			$(".region-content .parent-node").each(function(){
+				var fontLen = $(this).nextUntil(".parent-node").filter("font").length;
+				var activeLen = $(this).nextUntil(".parent-node").filter(".active").length;
+				if(fontLen == activeLen){
+					$(this).addClass("active");
+				}
+				if(activeLen >0 && activeLen < fontLen){
+					$(this).addClass("secondActice");
+				}
+			});
+			
+			//搜索关键词回显页面样式设置
+			if(searchvalue != "" && searchvalue != null){
+				$(".seaTender-inner").css({'border':'0px'});
+				$(".lucene-table").css({'padding':'0px','border-bottom':'0px','display':'block'});		
+				$(".tabTitle").addClass("hidden");
+				$(".lucene").attr("style","display:none");
+			}
+			
+			//价格回显样式设置
+			if({{.T.pricetype}} == "y"){
+				$(".Price-content").find("span:first-child").removeClass("active");
+				$(".pricefat").addClass("active");
+			}
+				
+			
 			//筛选关闭和打开
 			//根据cookie值设置筛选是否显示
 			var rsw = localStorage.getItem("entstore");

src/web/templates/weixin/search/superSearch.html

@@ -441,7 +441,7 @@
 				//招标单位
                 var agency=list[i].agency==null?"":list[i].agency;
 				//预算
-				var budget=list[i].budget==null?"":list[i].budget/10000;
+				var budget=list[i].budget==null?"":((list[i].budget)/1000+"").substring(0,5);
 				//开标时间
 				var bidopentime=""
 				var optim=list[i].bidopentime;
@@ -454,7 +454,7 @@
 				//中标单位
 				var winner=list[i].winner==null?"":list[i].winner;
 				//中标金额
-				var bidamount=list[i].bidamount==null?"":list[i].bidamount/10000;
+				var bidamount=list[i].bidamount==null?"":(list[i].bidamount/10000+"").substring(0,5);
 				
                 ListHtml += '<div class="tslist">'
                     +'<div class="resnumb">'
@@ -474,15 +474,15 @@
                     +'</div>';
                 //
                 TableHtml +='<tr s="'+href+'"  sid="'+list[i]._id+'">'+
-                    '<td>'+index+'</td>'+
-                    '<td>'+fullTime+'</td>'+
-                    '<td>'+datatype+'公告</td>'+
-                    '<td>'+agency+'</td>'+
-                    '<td>'+projectname+'</td>'+
-					'<td>'+budget+'</td>'+
-					'<td>'+bidopentime+'</td>'+
-					'<td>'+winner+'</td>'+
-					'<td>'+bidamount+'</td>'+
+                    '<td><div>'+index+'</div></td>'+
+                    '<td><div>'+fullTime+'</div></td>'+
+                    '<td><div>'+datatype+'公告</div></td>'+
+                    '<td><div>'+agency+'</div></td>'+
+                    '<td><div>'+projectname+'</div></td>'+
+					'<td><div>'+budget+'</div></td>'+
+					'<td><div>'+bidopentime+'</div></td>'+
+					'<td><div>'+winner+'</div></td>'+
+					'<td><div>'+bidamount+'</div></td>'+
                     '</tr>'
             }
             html["ListHtml"]=ListHtml;
@@ -549,7 +549,7 @@
                 var sds = s_words.replace(/\+/g,"+");
                 myredirect(h,sid,sds);
             })
-            $("#table .content").html("<tr><td>序号</td><td>发布时间</td><td>公告类型</td><td>招标单位</td><td>项目名称</td><td>预算（万元）</td><td>开标时间</td><td>中标单位</td><td>中标金额（万元）</td></tr>");
+            $("#table .content").html("<tr><td><div>序号</div></td><td><div>发布时间</div></td><td><div>公告类型</div></td><td><div>招标单位</div></td><td><div>项目名称</div></td><td><div>预算<br>（万元）</div></td><td><div>开标时间</div></td><td>中标单位</td><td><div>中标金额<br>（万元）</div></td></tr>");
             $("#table .content").append(TableHtmlobj);
 
             if(!window.top.isBackIndex){
@@ -823,15 +823,15 @@
 			<div id="table" class="hidden">
 				<div class="data"><table class="content">
 					<tr>
-						<td>序号</td>
-						<td>发布时间</td>
-						<td>公告类型</td>
-						<td>招标单位</td>
-						<td>项目名称</td>
-						<td>预算（万元）</td>
-						<td>开标时间</td>
-						<td>中标单位</td>
-						<td>中标金额（万元）</td>
+						<td><div>序号</div></td>
+						<td><div>发布时间</div></td>
+						<td><div>公告类型</div></td>
+						<td><div>招标单位</div></td>
+						<td><div>项目名称</div></td>
+						<td><div>预算<br>（万元）</div></td>
+						<td><div>开标时间</div></td>
+						<td><div>中标单位</div></td>
+						<td><div>中标金额<br>（万元）</div></td>
 					</tr>
 				</table></div>
 				<div class="TableTip">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>