行业分类

src/jfw/front/supsearch.go

@@ -50,13 +50,27 @@ func (p *Pcsearch) PcSearchIndex() error {
 	defer util.Catch()
 	var shareid = p.GetString("id")
 	p.T["logid"] = config.Seoconfig["jysslby"].(string)
-	industryname := config.Sysconfig["industry"].(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))
 	}
+	industry, sortArray := getindustrys()
+	p.T["industry"] = industry
+	p.T["sortArray"] = sortArray
+	p.DisableHttpCache()
+	Newbids()
+	data := redis.Get("other", "index_list").([]interface{})
+	p.T["shareid"] = se.EncodeString(shareid)
+	p.T["list"] = data[0]
+	return p.Render("/pc/supsearch.html", &p.T)
+}
+
+//
+func getindustrys() (industry map[string][]string, sortArray []string) {
+	industry = map[string][]string{}
+	sortArray = []string{}
+	industryname := config.Sysconfig["industry"].(string)
 	classdata, ok1 := mongodb.FindOneByField("rc_task", `{"s_name":"`+industryname+`"}`, `{"s_class":1}`)
 	if ok1 && len(*classdata) > 0 {
-		log.Println("---:", (*classdata)["s_class"])
 		classid := ""
 		if util.ObjToString((*classdata)["s_class"]) != "" {
 			classids := strings.Split(util.ObjToString((*classdata)["s_class"]), ",")
@@ -67,15 +81,10 @@ func (p *Pcsearch) PcSearchIndex() error {
 				classid += `"` + v + `"`
 			}
 		}
-		log.Println("caid:", classid)
-		industryData, ok := mongodb.Find("rc_rule", `{"s_pid":{"$ne":""},"s_classid":{"$in":["592f8c14e13823494a0ef74d","5955b9d2e13823524f1c83f3","5955e200e13823050ee481ce","595cb06ae138233628af3a44","595cb0b4e138233628af3a45","597ed6cbe1382369578abf54"]}}`, `{"i_order":1}`, `{"_id":1,"s_name":1}`, false, -1, -1)
-		log.Println("chaud:", len(*industryData))
+		industryData, ok := mongodb.Find("rc_rule", `{"s_pid":{"$ne":""},"s_classid":{"$in":[`+classid+`]}}`, `{"i_order":1}`, `{"_id":1,"s_name":1}`, false, -1, -1)
 		if ok && industryData != nil && len(*industryData) > 0 {
-			industry := map[string][]string{}
-			sortArray := []string{}
 			for _, v := range *industryData {
 				fatFlag := 0
-				//childFlag := 0
 				industryname, _ := v["s_name"].(string)
 				if strings.Contains(industryname, "_") {
 					fat := strings.Split(industryname, "_")[0]
@@ -94,16 +103,9 @@ func (p *Pcsearch) PcSearchIndex() error {
 					}
 				}
 			}
-			p.T["industry"] = industry
-			p.T["sortArray"] = sortArray
 		}
 	}
-	p.DisableHttpCache()
-	Newbids()
-	data := redis.Get("other", "index_list").([]interface{})
-	p.T["shareid"] = se.EncodeString(shareid)
-	p.T["list"] = data[0]
-	return p.Render("/pc/supsearch.html", &p.T)
+	return industry, sortArray
 }
 
 //

src/jfw/front/swordfish.go

@@ -4,9 +4,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/go-xweb/xweb"
-	. "github.com/thinxer/go-word2vec"
-	"gopkg.in/mgo.v2/bson"
 	"html/template"
 	"jfw/config"
 	"jfw/jyutil"
@@ -22,6 +19,10 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/go-xweb/xweb"
+	. "github.com/thinxer/go-word2vec"
+	"gopkg.in/mgo.v2/bson"
 )
 
 const (
@@ -456,8 +457,9 @@ func (m *Front) PcAjaxReq() {
 			count, list = getLastNewsData(searchvalue, area, publishtime, subtype, industry, 0, true)
 		}
 	} else if reqType == "bidSearch" {
-		_, list = getBidSearchData(searchvalue, area, publishtime, subtype, industry, start, false, selectType)
+		count, list = getBidSearchData(searchvalue, area, publishtime, subtype, industry, start, true, selectType)
 	} else if reqType == "lastNews" {
+		log.Println("zuixin:", area)
 		_, list = getLastNewsData(searchvalue, area, publishtime, subtype, industry, start, false)
 	}
 	if list != nil && len(*list) > 0 {
@@ -874,13 +876,11 @@ func (m *Front) WxsearchlistPaging() {
 		}
 	}
 
-
-
 	m.ServeJson(map[string]interface{}{
 		"list":        list,
 		"hasNextPage": list != nil && len(*list) == wx_pageSize && pageNum < wx_maxPageNum,
-		"history":   m.T["history"],
-		"msgset": m.T["msgset"],
+		"history":     m.T["history"],
+		"msgset":      m.T["msgset"],
 	})
 }
 

src/seo.json

@@ -297,6 +297,8 @@
 	"source":{
 		"baiduSEM":"百度SEM",
 		"360SEM":"360SEM",
-		"QQqun":"QQ群广告"
+		"QQqun":"QQ群广告",
+		"BDwangmeng":"百度网盟",
+		"PCwailian":"PC端外链"
 	}
 }

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

@@ -661,7 +661,7 @@ width:1160px;
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-left .left-title {
   float: left;
   line-height: 30px;
-    width: 818px
+    width: 810px
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-left .left-title a {

src/web/staticres/css/dev2/biddingSearch1.css

@@ -12,4 +12,41 @@
 }
 .active{
 	background-color: #2cb7ca;
+}
+.hasNoData{
+	border-bottom: 1px solid #e0e0e0;
+    height: 400px;
+	text-align: center;
+	padding-top: 30px;
+	margin-bottom:60px;
+}
+.searchInner{
+	line-height:1px;
+}
+.lucene-table tbody>tr>td:nth-child(1) div{
+	width:35px;
+}
+.lucene-table tbody>tr>td:nth-child(2) div{
+	width:88px;
+}
+.lucene-table tbody>tr>td:nth-child(3) div{
+	width:71px;
+}
+.lucene-table tbody>tr>td:nth-child(4) div{
+	width:168px;
+}
+.lucene-table tbody>tr>td:nth-child(5) div{
+	width:308px;
+}
+.lucene-table tbody>tr>td:nth-child(6) div{
+	width:60px;
+}
+.lucene-table tbody>tr>td:nth-child(7) div{
+	width:88px;
+}
+.lucene-table tbody>tr>td:nth-child(8) div{
+	width:161px;
+}
+.lucene-table tbody>tr>td:nth-child(9) div{
+	width:63px;
 }

src/web/staticres/css/dev2/reset_pc.css

@@ -21,7 +21,7 @@ vertical-align: baseline;
 outline: 0; 
 } 
 body { 
-line-height: 1; 
+/*line-height: 1; */
 /*color: black; 
 background: white; */
 font-family: "Microsoft YaHei",sans-serif;

src/web/staticres/js/superSearch.js

@@ -1,6 +1,9 @@
 var pageSize = 50;
 var nbflag = false;//是否显示的是最新招标数据
 var currentPage = 1;
+var submitflag = true;
+var searchvalue = "";
+var searchvalueArray = searchvalue.split("+");
 
 $(function() {
 	$("#minprice").click(function(){
@@ -22,6 +25,7 @@ $(function() {
 	$(".Price-content").find("span:first-child").click(function(){
 		$(this).addClass("active");
 		$(".pricefat").removeClass("active");
+		beforeSubmit();
 	})
 	$(".timer").find("ul li:first-child").click(function(){
 		$(this).addClass("active");
@@ -42,6 +46,7 @@ $(function() {
 		$(".pricefat").addClass("active");
 		$(".Price-content").find("span:first-child").removeClass("active");
 		$(".pricefat").removeClass("customtime-active");
+		beforeSubmit()
 	})
 	//
 	$("#timebut").click(function(){
@@ -93,6 +98,9 @@ $(function() {
 })
 //
 function next(){
+	if($(".nbnext").hasClass("disabled")){
+		return false;
+	}
 	var page = parseInt($(".pagination-inner").find("span").text())+parseInt(1)
 	if(!nbflag&&page<11){
 		if(page==10){
@@ -104,6 +112,9 @@ function next(){
 	}
 }
 function prev(){
+	if($(".nbprev").hasClass("disabled")){
+		return false;
+	}
 	var page = parseInt($(".pagination-inner").find("span").text())-parseInt(1)
 	if(!nbflag&&page>0){
 		if(page==1){
@@ -116,11 +127,38 @@ function prev(){
 }
 ////最新招标信息
 function getNewBiddings(page){
-	currentPage = page;
-	$.post("/jylab/supsearch/getNewBids",{pageNumber: page},function(data){
-		if(data&&data.list.length>0){
-			$(".pagination-inner").find("span").text(page)
-			appendDatas(data.list,false);
+	currentPage = page
+	if(page==1){
+		$(".nbprev").addClass("disabled");
+	}
+	var param = {
+				pageNumber: currentPage,
+				reqType: "lastNews",
+				searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
+				area: $("#zbSeatchT [name='area']").val(),
+				subtype: $("#zbSeatchT [name='subtype']").val(),
+				publishtime: $("#zbSeatchT [name='publishtime']").val(),
+				selectType : $("#zbSeatchT [name='selectType']").val(),
+				minprice : $("#zbSeatchT [name='minprice']").val(),
+				maxprice : $("#zbSeatchT [name='maxprice']").val(),
+				industry : $("#zbSeatchT [name='industry']").val(),
+			};
+	$.post("/front/pcAjaxReq",param,function(r){
+		if(r&&r.list!=null&&r.list.length>0){
+			$(".tabContainer").show();
+			$(".pagination").show();
+			$(".hasNoData").hide();
+			$(".pagination-inner").find("span").text(page);
+			if(r.list.length<pageSize||page==10){
+				$(".nbnext").addClass("disabled");
+			}else{
+				$(".nbnext").removeClass("disabled");
+			}
+			appendDatas(r.list,false);
+		}else{
+			$(".tabContainer").hide();
+			$(".pagination").hide();
+			$(".hasNoData").show();
 		}
 	})
 }
@@ -164,6 +202,9 @@ function appendDatas(datas,flag){
 		if(!flag){
 				$("#allnews").hide();
 				$(".tabContainer-2").show();
+			}else{
+				$("#allnews").show();
+				$(".tabContainer-2").hide();
 			}
 			listHtml += '<li>'
 						+'<div class="liLuceneList">'
@@ -203,53 +244,66 @@ function appendDatas(datas,flag){
 			}
 			listHtml += '</div></li>';
 			tableHtml +='<tr>'
-					+'<td>'+index+'</td>'
+					+'<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");
 				if(diff != null){
-					tableHtml += '<td>'+diff+'</td>';
+					tableHtml += '<td><div>'+diff+'</div></td>';
 				}
 			}else{
-				tableHtml += '<td></td>';
+				tableHtml += '<td><div></div></td>';
 			}
 			if(typeof(type) != "undefined" && type != null && type != ""){
-				tableHtml += '<td>'+type+'公告</td>';
+				tableHtml += '<td><div>'+type+'公告</div></td>';
 			}else{
-				tableHtml += '<td></td>';
+				tableHtml += '<td><div></div></td>';
 			}
 			if(typeof(datas[i].agency) != "undefined" && datas[i].agency != null && datas[i].agency != ""){
-				tableHtml += '<td class="tt-l">'+datas[i].agency+'</td>';
+				tableHtml += '<td class="tt-l"><div>'+datas[i].agency+'</div></td>';
 			}else{
-				tableHtml += '<td class="tt-l"></td>';
+				tableHtml += '<td class="tt-l"><div></div></td>';
 			}
 			if(typeof(datas[i].projectname) != "undefined" && datas[i].projectname != null && datas[i].projectname != ""){
-				tableHtml += '<td class="tt-l">'+datas[i].projectname+'</td>';
+				tableHtml += '<td class="tt-l"><div>'+datas[i].projectname+'</div></td>';
 			}else{
-				tableHtml += '<td class="tt-l"></td>';
+				tableHtml += '<td class="tt-l"><div></div></td>';
 			}
 			if(typeof(datas[i].budget) != "undefined" && datas[i].budget != null && datas[i].budget != ""){
 				var budget =parseInt(datas[i].budget)/10000
-				
-				tableHtml += '<td class="tt-r">'+budget+'</td>';
+				if(budget.toString().length>6){
+					if(budget.toString().indexOf(".")==5){
+						budget=budget.toString().substr(0,7)
+					}else{
+						budget=budget.toString().substr(0,6)
+					}
+				}
+				tableHtml += '<td class="tt-r"><div>'+budget+'</div></td>';
 			}else{
-				tableHtml += '<td class="tt-r"></td>';
+				tableHtml += '<td class="tt-r"><div></div></td>';
 			}
 			if(typeof(datas[i].bidopentime) != "undefined" && datas[i].bidopentime != null && datas[i].bidopentime != ""){
 				var diff = formatDate(Number(datas[i].publishtime),"l");
-				tableHtml += '<td>'+diff+'</td>';
+				tableHtml += '<td><div>'+diff+'</div></td>';
 			}else{
-				tableHtml += '<td></td>';
+				tableHtml += '<td><div></div></td>';
 			}
 			if(typeof(datas[i].winner) != "undefined" && datas[i].winner != null && datas[i].winner != ""){
-				tableHtml += '<td class="tt-l">'+datas[i].winner+'</td>';
+				tableHtml += '<td class="tt-l"><div>'+datas[i].winner+'</div></td>';
 			}else{
-				tableHtml += '<td class="tt-l"></td>';
+				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
-				tableHtml += '<td class="tt-r">'+bidamount+'</td>';
+				if(bidamount.toString().length>6){
+					if(bidamount.toString().indexOf(".")==5){
+						bidamount=bidamount.toString().substr(0,7)
+					}else{
+						bidamount=bidamount.toString().substr(0,6)
+					}
+				}
+				tableHtml += '<td class="tt-r"><div>'+bidamount+'</div></td>';
 			}else{
-				tableHtml += '<td class="tt-r"></td>';
+				tableHtml += '<td class="tt-r"><div></div></td>';
 			}
 				tableHtml+='</tr>'
 	}
@@ -322,79 +376,112 @@ function getInputTime(){
 }
 ///
 function beforeSubmit(){
-	//时间
-	var publishtime = null;
-	var timeslot = getInputTime().join("_");
-	if($(".timerInput").hasClass("active")){
-		if(timeslot != "_"){
-			$("#zbSeatchT [name='publishtime']").val(timeslot);
+	setTimeout(function(){
+		//时间
+		var publishtime = null;
+		var timeslot = getInputTime().join("_");
+		if($(".timerInput").hasClass("active")){
+			if(timeslot != "_"){
+				$("#zbSeatchT [name='publishtime']").val(timeslot);
+			}else{
+				$("#zbSeatchT [name='publishtime']").val("");
+			}
 		}else{
-			$("#zbSeatchT [name='publishtime']").val("");
+			publishtime = $(".timer .active").attr("data-value");
+			if(typeof(publishtime) != "undefined"){
+				$("#zbSeatchT [name='publishtime']").val(publishtime);
+			}else{
+				$("#zbSeatchT [name='publishtime']").val("");
+			}
 		}
-	}else{
-		publishtime = $(".timer .active").attr("data-value");
-		if(typeof(publishtime) != "undefined"){
-			$("#zbSeatchT [name='publishtime']").val(publishtime);
+		if(timeslot != "_"){
+			$("#zbSeatchT [name='timeslot']").val(timeslot);	
 		}else{
-			$("#zbSeatchT [name='publishtime']").val("");
+			$("#zbSeatchT [name='timeslot']").val("");
 		}
-	}
-	if(timeslot != "_"){
-		$("#zbSeatchT [name='timeslot']").val(timeslot);	
-	}else{
-		$("#zbSeatchT [name='timeslot']").val("");
-	}
-	//地区
-	var selectAreas = "";
-	$(".region-content .active:not(.parent-node)").each(function(){
-		var thisText = $(this).text();
-		if(thisText != "全国"){
-			if(selectAreas != ""){
-				selectAreas += ",";
+		//地区
+		var selectAreas = "";
+		$(".region-content .active:not(.parent-node)").each(function(){
+			var thisText = $(this).text();
+			if(thisText != "全国"){
+				if(selectAreas != ""){
+					selectAreas += ",";
+				}
+				selectAreas += thisText;
 			}
-			selectAreas += thisText;
-		}
-	});
-	$("#zbSeatchT [name='area']").val(selectAreas);
-	//类型
-	var selectSubTypes = "";
-	$(".info-content .active:not(.parent-node)").each(function(){
-		if($(this).attr("id") == "whole"||$(this).attr("id") == "infoBtn"){
-			return true;
-		}
-		var thisText = $(this).attr("data-value");
-		if(selectSubTypes != ""){
-			selectSubTypes += ",";
-		}
-		selectSubTypes += thisText;
-	});
-	$("#zbSeatchT [name='subtype']").val(selectSubTypes);
-	//行业
-	var selectIndustrys = "";
-	$(".industry-content .active:not(.parent-node)").each(function(){
-		if($(this).attr("id") == "induAll"){
-			return true;
-		}
-		var thisText = $(this).attr("data-value");
-		if(selectIndustrys != ""){
-			selectIndustrys += ",";
-		}
-		selectIndustrys += thisText;
-	});
-	$("#zbSeatchT [name='industry']").val(selectIndustrys);
-	//价格
-	var selectMinPrices = $(".PriceInput [name='minprice']").val();
-	var selectMaxPrices =  $(".PriceInput [name='maxprice']").val();
-	$("#zbSeatchT [name='minprice']").val(selectMinPrices);
-	$("#zbSeatchT [name='maxprice']").val(selectMaxPrices);
-	//搜索关键词
-	var searchname = $("#zbSeatchT input[name='keywords']").val();
-	console.log("----"+searchname)
-	$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname))
-	searchOnsubmit();
-	return true
+		});
+		$("#zbSeatchT [name='area']").val(selectAreas);
+		//类型
+		var selectSubTypes = "";
+		$(".info-content .active:not(.parent-node)").each(function(){
+			if($(this).attr("id") == "whole"||$(this).attr("id") == "infoBtn"){
+				return true;
+			}
+			var thisText = $(this).attr("data-value");
+			if(selectSubTypes != ""){
+				selectSubTypes += ",";
+			}
+			selectSubTypes += thisText;
+		});
+		$("#zbSeatchT [name='subtype']").val(selectSubTypes);
+		//行业
+		var selectIndustrys = "";
+		$(".industry-content .active:not(.parent-node)").each(function(){
+			if($(this).attr("id") == "induAll"){
+				return true;
+			}
+			var thisText = $(this).attr("data-value");
+			if(selectIndustrys != ""){
+				selectIndustrys += ",";
+			}
+			selectIndustrys += thisText;
+		});
+		$("#zbSeatchT [name='industry']").val(selectIndustrys);
+		//价格
+		var selectMinPrices = $(".PriceInput [name='minprice']").val();
+		var selectMaxPrices =  $(".PriceInput [name='maxprice']").val();
+		$("#zbSeatchT [name='minprice']").val(selectMinPrices);
+		$("#zbSeatchT [name='maxprice']").val(selectMaxPrices);
+		//搜索关键词
+		var searchname = $("#zbSeatchT input[name='keywords']").val();
+		$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname))
+		if(submitflag){	
+			if($.trim(searchname)==""){
+				getNewBiddings(1)
+				nbflag = false;
+				console.log(nbflag+"-----")
+			}else{
+				searchOnsubmit();
+				nbflag = true;
+				console.log("2222")
+			}
+			submitflag=false;
+		}	
+		setTimeout(function(){
+			submitflag=true
+		},200);
+		return true
+	},200)
 }
 //
 function searchOnsubmit(){
-	
+	var param = {
+				pageNumber: currentPage,
+				reqType: "bidSearch",
+				searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
+				area: $("#zbSeatchT [name='area']").val(),
+				subtype: $("#zbSeatchT [name='subtype']").val(),
+				publishtime: $("#zbSeatchT [name='publishtime']").val(),
+				selectType : $("#zbSeatchT [name='selectType']").val(),
+				minprice : $("#zbSeatchT [name='minprice']").val(),
+				maxprice : $("#zbSeatchT [name='maxprice']").val(),
+				industry : $("#zbSeatchT [name='industry']").val(),
+			};
+	$.post("/front/pcAjaxReq",param,function(r){
+		if(r.list == null || r.list.length == 0){
+			
+		}else{
+			appendDatas(r.list,true)
+		}
+	});
 }

src/web/templates/pc/supsearch.html

@@ -163,6 +163,7 @@ $(function(){
 					<input type="hidden" name="minprice" value="{{.T.minprice}}">
 					<input type="hidden" name="maxprice" value="{{.T.maxprice}}">
 					<input type="hidden" name="industry" value="{{.T.selectIndustry}}">
+					<input type="hidden" name="selectType" value="all">
 				</form>
 				<!--筛选-->
 				<div id="screenBtn" class="screen up">
@@ -216,7 +217,7 @@ $(function(){
 					价格区间：
 				</div>
 				<div class="Price-content clearfix">
-					<span class="active">全部</span>
+					<span id="priceAll" class="active">全部</span>
 					<div class="pricefat">
 						<div class="PriceInput">
 							<input type="text" name="minprice" id="minprice" value="" placeholder="最低价              万元" />
@@ -234,7 +235,7 @@ $(function(){
 				</div>
 				<div class="fl timer">
 					<ul>
-						<li class="active" data-value="">全部</li>
+						<li id="timerAll" class="active" data-value="">全部</li>
 						<li data-value="lately-7">最近七天</li>
 						<li data-value="lately-30">最近30天</li>
 						<li data-value="thisyear">去年</li>
@@ -427,6 +428,9 @@ $(function(){
 					</table>
 				</div>
 			</div>
+			<div class="hasNoData" style="display: none;">
+				<img src="/images/pc_12.png" id="hasNoData">
+			</div>
 		</div>
 		<!--分页-->
 		<div class="pagination clearfix w">