pc标签页开发

src/jfw/front/front.go

@@ -87,7 +87,7 @@ type Front struct {
 	historypush       xweb.Mapper `xweb:"/swordfish/historypush"`        //历时推送记录
 	historypushPaging xweb.Mapper `xweb:"/swordfish/historypush/paging"` //历时推送记录--分页
 	aboutus           xweb.Mapper `xweb:"/front/aboutus.html"`           //关于我们
-	busicooperation	  xweb.Mapper `xweb:"/front/busicooperation.html"`   //商务合作
+	busicooperation   xweb.Mapper `xweb:"/front/busicooperation.html"`   //商务合作
 	//bidsearchforent	  xweb.Mapper `xweb:"/front/bidsearchforent.html"`   //中标企业搜索
 
 	/********************wxkeyset:v1.8**************************/
@@ -102,6 +102,9 @@ type Front struct {
 	mobtopics       xweb.Mapper `xweb:"/promotional/mobtopics.html"` //移动端专题推广
 	saveuserlogs    xweb.Mapper `xweb:"/front/saveuserlogs"`         //保存用户关注日志
 	followinfo      xweb.Mapper `xweb:"/front/followinfo"`           //redis用户关注日志
+
+	/********************dev:2.0**************************/
+	getClassifyList xweb.Mapper `xweb:"/front/getClassifyList"` //得到标签页表格数据
 }
 
 var sewx util.SimpleEncrypt //微信的加密方法

src/jfw/front/supsearch.go

@@ -61,9 +61,8 @@ func (p *Pcsearch) PcSearchIndex() error {
 	subtype := p.GetString("subtype")         //信息类型
 	minprice, _ := p.GetFloat("minprice")     //最低价格
 	maxprice, _ := p.GetFloat("maxprice")     //最高价格
-	log.Println(minprice, "---", maxprice)
-	industry := p.GetString("industry")     //选中的行业
-	selectType := p.GetString("selectType") //标题或全文
+	industry := p.GetString("industry")       //选中的行业
+	selectType := p.GetString("selectType")   //标题或全文
 	selectTypesess := p.GetSession("selectType")
 	if selectTypesess != nil && selectTypesess != "" {
 		selectType = selectTypesess.(string)
@@ -73,10 +72,21 @@ func (p *Pcsearch) PcSearchIndex() error {
 	}
 	var count int64
 	var list *[]map[string]interface{}
+	var status = 1
+	log.Println(searchvalue, "___:", p.Method())
 	if len(searchvalue) > 0 {
+		status = 2
 		count, list = getBidSearchData(searchvalue, area, publishtime, subtype, industry, 0, true, selectType)
 	} else if p.Method() == "POST" {
+		status = 2
 		count, list = getLastNewsData(searchvalue, area, publishtime, subtype, industry, 0, true)
+	} else {
+		p.DisableHttpCache()
+		Newbids()
+		data := redis.Get("other", "index_list").([]interface{})
+		p.T["list"] = data[0]
+	}
+	if status == 2 {
 		if list != nil {
 			for _, v := range *list {
 				v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
@@ -96,37 +106,35 @@ func (p *Pcsearch) PcSearchIndex() error {
 			}
 		}
 		p.T["list"] = list
-		p.T["area"] = area
-		p.T["publishtime"] = publishtime
-		p.T["timeslot"] = p.GetString("timeslot")
-		p.T["toptype"] = toptype
-		p.T["subtype"] = subtype
-		p.T["count"] = count
-		p.T["keywords"] = keywords
-		p.T["searchvalue"] = searchvalue
-		p.T["selectType"] = selectType
-		p.T["login"] = p.Session().Get("user")
-		p.SetSession("paramkey", keywords)
-		if publishtime == "lately-7" {
-			p.SetSession("parampublishtime", "最近7天")
-		} else if publishtime == "lately-30" {
-			p.SetSession("parampublishtime", "最近30天")
-		} else if publishtime == "thisyear" {
-			p.SetSession("parampublishtime", "去年")
-		} else {
-			p.SetSession("parampublishtime", publishtime)
-		}
-		p.SetSession("paramarea", area)
-		if subtype != "" {
-			p.SetSession("paraminfotype", subtype)
-		} else {
-			p.SetSession("paraminfotype", toptype)
-		}
+	}
+	p.T["area"] = area
+	p.T["publishtime"] = publishtime
+	p.T["timeslot"] = p.GetString("timeslot")
+	p.T["toptype"] = toptype
+	p.T["subtype"] = subtype
+	p.T["count"] = count
+	p.T["keywords"] = keywords
+	p.T["searchvalue"] = searchvalue
+	p.T["selectType"] = selectType
+	p.T["industry"] = industry
+	p.T["minprice"] = minprice
+	p.T["maxprice"] = maxprice
+	p.T["login"] = p.Session().Get("user")
+	p.SetSession("paramkey", keywords)
+	if publishtime == "lately-7" {
+		p.SetSession("parampublishtime", "最近7天")
+	} else if publishtime == "lately-30" {
+		p.SetSession("parampublishtime", "最近30天")
+	} else if publishtime == "thisyear" {
+		p.SetSession("parampublishtime", "去年")
 	} else {
-		p.DisableHttpCache()
-		Newbids()
-		data := redis.Get("other", "index_list").([]interface{})
-		p.T["list"] = data[0]
+		p.SetSession("parampublishtime", publishtime)
+	}
+	p.SetSession("paramarea", area)
+	if subtype != "" {
+		p.SetSession("paraminfotype", subtype)
+	} else {
+		p.SetSession("paraminfotype", toptype)
 	}
 	industrylist, sortArray := getindustrys()
 	p.T["industrylist"] = industrylist

src/jfw/front/swordfish.go

@@ -855,7 +855,7 @@ func (m *Front) WxsearchlistPaging() {
 			if history == "" {
 				arrs = make([]string, 0)
 			}
-			var historyFlag= 0
+			var historyFlag = 0
 			for _, v := range arrs {
 				if v == strings.Trim(searchvalue, " ") {
 					historyFlag = 1
@@ -892,7 +892,6 @@ func (m *Front) WxsearchlistPaging() {
 		}
 	}
 
-
 	m.ServeJson(map[string]interface{}{
 		"list":        list,
 		"hasNextPage": list != nil && len(*list) == wx_pageSize && pageNum < wx_maxPageNum,
@@ -919,7 +918,7 @@ func (m *Front) DelWxHistorySearch() {
 //微信端搜索
 func getWxsearchlistData(keywords, searchvalue, scope, publishtime, subtype, industry string, pageNum int, selectType string) (list *[]map[string]interface{}) {
 	query := getBidSearchQuery(scope, publishtime, subtype, industry) //scope是地区对应传进的areas, stype是类型对应scope
-	fmt.Print("keywords>>>",keywords,"searchvalue>>",searchvalue)
+	fmt.Print("keywords>>>", keywords, "searchvalue>>", searchvalue)
 	if len(keywords) > 0 {
 		if selectType == "all" { //全文搜索
 			list = elastic.GetByNgramOther(INDEX, TYPE, searchvalue, query, `"title","detail"`, bidSearch_sort, bidSearch_field_1, (pageNum-1)*wx_pageSize, wx_pageSize, true, false, 100)
@@ -1928,9 +1927,9 @@ func searchresulthtml(list *[]map[string]interface{}) string {
 	for i := 0; i < len(*list); i++ {
 		listdata := (*list)[i]
 		j = i + 1
-		listhtml += `<li><div>` + strconv.Itoa(j) + `.</div>`
+		listhtml += `<li><div class="liLuceneList"><div class="luce-left"><em>` + strconv.Itoa(j) + `.</em>`
 		if listdata["title"] != "" {
-			listhtml += `<div><a onclick="noIn(this)" dataId="` + util.EncodeArticleId2ByCheck(util.ObjToString(listdata["_id"])) + `" target="_blank">` + util.ObjToString(listdata["title"]) + `</a></div><div>`
+			listhtml += `<div class="left-title"><a onclick="noIn(this)" dataId="` + util.EncodeArticleId2ByCheck(util.ObjToString(listdata["_id"])) + `" target="_blank">` + util.ObjToString(listdata["title"]) + `</a></div></div><div class="luce-right">`
 		}
 		area, _ := listdata["area"].(string)
 		area = strings.TrimSpace(area)
@@ -1950,19 +1949,29 @@ func searchresulthtml(list *[]map[string]interface{}) string {
 		}
 		stpadd, areaadd := classify(finalType, area)
 		if area != "" && area != "A" {
-			listhtml += `<span class="com-area"><a href="/list/area/` + areaadd + `.html">` + area + `</a></span>`
+			listhtml += `<a href="/list/area/` + areaadd + `.html">` + area + `</a>`
+		} else {
+			listhtml += `<a href="#" style="display:none;"></a>`
 		}
 		if finalType != "" {
-			listhtml += `<span class="com-type"><a href="/list/stype/` + stpadd + `.html">` + finalType + `</a></span>`
+			listhtml += `<a href="/list/stype/` + stpadd + `.html">` + finalType + `</a>`
+		} else {
+			listhtml += `<a href="#" style="display:none;"></a>`
+		}
+		industry, _ := listdata["industry"].(string)
+		if industry != "" {
+			listhtml += `<a href="javascript:volid(0);">` + industry + `</a>`
+		} else {
+			listhtml += `<a href="#" style="display:none;"></a>`
 		}
 		publishtime, _ := listdata["publishtime"].(float64)
 		if publishtime != 0 {
 			diff := util.TimeDiff(time.Unix(util.Int64All(publishtime), 0))
 			if diff != "" {
-				listhtml += `<span class="com-time"><i class="glyphicon bofangjilu"></i>` + diff + `</span>`
+				listhtml += `<span class="com-time">` + diff + `</span>`
 			}
 		}
-		listhtml += `</div></li>`
+		listhtml += `</div></div></li>`
 	}
 	return listhtml
 }
@@ -1973,12 +1982,14 @@ func (f *Front) SearchResult(at, name string) error {
 	var no = 5
 	var area = ""
 	var stype = ""
+	var industry = ""
 	var startPage, currentPage, limitcount int
 	limitcount = util.IntAll(config.Seoconfig["limitcount"])
 	var res = ""
 	var seotitle = ""
 	var seokeywords = ""
 	var seodescription = ""
+	f.T["industrylist"], f.T["sortArray"] = getindustrys()
 	var shareid = f.GetString("id")
 	if len(shareid) == 0 {
 		shareid = fmt.Sprintf("%s%d", config.Seoconfig["jybqy"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
@@ -2015,13 +2026,15 @@ func (f *Front) SearchResult(at, name string) error {
 	if area == "全国" {
 		return f.Redirect("/swordfish/searchinfolist.html")
 	}
-	if area != "" || stype != "" {
+	if area != "" || stype != "" || industry != "" {
 		list := redis.Get("other", "classify_"+name)
 		query1 := `{"query": {"bool": {"must":[`
 		if area != "" {
 			query1 += `{"term":{"area":"` + area + `"}}`
 		} else if stype != "" {
 			query1 += `{"term":{"subtype":"` + stype + `"}}`
+		} else if industry != "" {
+			query1 += `{"term":{"industry":"` + industry + `"}}`
 		}
 		query1 += `],"should": [],"minimum_should_match": 1}}}`
 		query := getLastNewsQuery(area, "", stype)
@@ -2035,17 +2048,18 @@ func (f *Front) SearchResult(at, name string) error {
 			if count1 < startPage || startPage < 0 {
 				startPage = 0
 			}
-			datas = elastic.GetPage(INDEX, TYPE, query, bidSearch_sort, `"_id","title","publishtime","toptype","subtype","type","area","href"`, startPage, limitcount)
+			datas = elastic.GetPage(INDEX, TYPE, query, bidSearch_sort, `"_id","title","publishtime","toptype","subtype","type","area","href","bidopentime","winner","agency","bidamount","budget","biddingcontent","projectname"`, startPage, limitcount)
 			redis.Put("other", "classify_"+name, datas, 2*60*60)
 		} else {
 			b, _ := json.Marshal(list)
 			json.Unmarshal(b, &datas)
 		}
-
+		jyutil.BidListConvert(industry, datas)
 		res = searchresulthtml(datas)
 		f.T["res"] = res
 		f.T["area"] = area
 		f.T["stype"] = stype
+		f.T["classifyname"] = name
 		f.SetSession("paramarea", area)
 		f.SetSession("paraminfotype", stype)
 		f.T["shareid"] = se.EncodeString(shareid)
@@ -2053,6 +2067,19 @@ func (f *Front) SearchResult(at, name string) error {
 	return f.Render("/pc/classifylist.html", &f.T)
 }
 
+//
+func (f *Front) GetClassifyList() error {
+	defer util.Catch()
+	//判断用户是否开启超级搜索？
+
+	classifyname := f.GetString("classifyname")
+	data := redis.Get("other", "classify_"+classifyname)
+	f.ServeJson(map[string]interface{}{
+		"data": data,
+	})
+	return nil
+}
+
 //
 func classify(stp, area string) (string, string) {
 	var areas, _ = config.Seoconfig["area"].(map[string]interface{})

src/seo.json

@@ -299,6 +299,7 @@
 		"360SEM":"360SEM",
 		"QQqun":"QQ群广告",
 		"BDwangmeng":"百度网盟",
-		"PCwailian":"PC端外链"
+		"PCwailian":"PC端外链",
+		"email":"邮箱广告"
 	}
 }

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

@@ -66,7 +66,7 @@
   font-size: 16px;
 }
 
-#searchInner .searchHeader .searchHeader-container .searchInput form input[type='button'] {
+#searchInner .searchHeader .searchHeader-container .searchInput form input[type='submit'] {
   float: left;
   width: 106px;
   height: 42px;
@@ -628,7 +628,7 @@
   font-size: 16px;
 }
 #searchInner .searchControl .seaTender-inner .tabContainer-2 .lucene li {
-  padding: 15px 20px 0;
+  padding: 20px 20px 0;
   overflow: hidden;
   font-size: 16px;
 }
@@ -638,14 +638,14 @@
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .liLuceneList {
-  border-bottom: 1px solid #e0e0e0;
+  border-bottom: 1px solid #EBEBEB;
   overflow: hidden;
   padding-bottom: 20px;
 width:1160px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer-2 .lucene li .liLuceneList {
-	padding-bottom: 15px;
+	padding-bottom: 20px;
 }
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-left {
   float: left;

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

@@ -10,7 +10,7 @@
     background-color: #fff;
 	padding: 3px 5px;
 }
-.active{
+#searchInner .active{
 	background-color: #2cb7ca;
 }
 .hasNoData{

src/web/staticres/js/biddingSearch.js

@@ -70,7 +70,10 @@ $(function() {
 
 	function superSearchToggle() {
 		var $superSearch = $(".searchInput .superSearch");
-		$superSearch.on("click", function() {
+		$superSearch.mouseover(function() {
+			$(this).toggleClass("active")
+		})
+		$superSearch.mouseout(function() {
 			$(this).toggleClass("active")
 		})
 	}
@@ -142,8 +145,7 @@ $(function() {
 			} else {
 				$induAll.addClass("active");
 			}
-			beforeSubmit();
-
+			//beforeSubmit();
 		})
 		/*全部点击*/
 		$induAll.on("click", function() {

src/web/staticres/js/superSearch.js

@@ -2,8 +2,6 @@ var pageSize = 50;
 var nbflag = false;//是否显示的是最新招标数据
 var currentPage = 1;//当前页
 var submitflag = true;
-var searchvalue = "";//关键词
-var searchtype = "all"//全文或标题
 
 $(function() {
 	$("#minprice").click(function(){
@@ -91,17 +89,12 @@ $(function() {
 			localStorage.setItem("hideorshow", "D");
 		}
 	})
-	//
-	$("#zbSeatchT input[type='button']").click(function(){
-		currentPage=1;
-		beforeSubmit(1)
-	})
 	//全文检索和标题检索切换
 	$("#newsclass li:nth-child(1)").click(function(){
 		$("#zbSeatchT [name='selectType']").val("all");
 		currentPage=1;
 		if(submitflag){
-			searchtype = "all";
+			selectType = "all";
 			searchOnsubmit();
 			submitflag=false;
 		}
@@ -111,7 +104,7 @@ $(function() {
 		$("#zbSeatchT [name='selectType']").val("title");
 		currentPage=1;
 		if(submitflag){
-			searchtype = "title";
+			selectType = "title";
 			searchOnsubmit();
 			submitflag=false;
 		}
@@ -200,6 +193,13 @@ function appendDatas(datas,flag){
 	var tableHtml = '';
 	var searchvalueArray = searchvalue.split("+");
 	$(".pagination-inner").find("span").text(currentPage);
+	if(flag&&selectType == "all"){
+		$("#allnews").show();
+		$(".tabContainer-2").hide();
+	}else{
+		$("#allnews").hide();
+		$(".tabContainer-2").show();
+	}
 	for(var i=0;i<datas.length;i++){
 		var index = (currentPage - 1) * pageSize + i + 1;
 		var title = datas[i].title;
@@ -231,20 +231,13 @@ function appendDatas(datas,flag){
 				type = "";
 			}
 		}
-		if(flag&&searchtype == "all"){
-			$("#allnews").show();
-			$(".tabContainer-2").hide();
-		}else{
-			$("#allnews").hide();
-			$(".tabContainer-2").show();
-		}
 		listHtml += '<li>'
-					+'<div class="liLuceneList">'
+					+'<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>'
 					+'</div>'
-		if(flag&&searchtype == "all"){
+		if(flag&&selectType == "all"&&detail!=""){
 			listHtml += '<div class="left-content">'
 					+'<a href="javascript:volid(0);">'+detail+'...</a>'
 					+'</div>'
@@ -264,7 +257,7 @@ function appendDatas(datas,flag){
 		if(typeof(datas[i].industry) != "undefined" && datas[i].industry != null && datas[i].industry != ""){
 			listHtml += '<a href="javascript:volid(0);">'+datas[i].industry+'</a>';
 		}else{
-			listHtml += '<a href="#" style="display:none;"></a>';
+			listHtml += '<a href="javascript:volid(0);" style="display:none;"></a>';
 		}
 		
 		//
@@ -339,11 +332,11 @@ function appendDatas(datas,flag){
 		}
 			tableHtml+='</tr>'
 	}
-	if(!flag||searchtype=="title"){
+	if(!flag||selectType=="title"){
 		$(".tabContainer-2 .lucene ul").html(listHtml);
 		$(".tabContainer-2 .lucene-table table tbody").html(tableHtml);
 	}else{
-		if(searchtype=="all"){
+		if(selectType=="all"){
 			$(".tabContainer .lucene ul").html(listHtml);
 			$(".tabContainer .lucene-table table tbody").html(tableHtml);
 		}
@@ -353,7 +346,7 @@ function appendDatas(datas,flag){
 }
 //
 //
-function   formatDate(date,sl)   { 
+function formatDate(date,sl)   { 
 	var myDate = new Date(date*1000);      
     var   year=myDate.getFullYear();
     var   month=myDate.getMonth()+1; 
@@ -491,7 +484,7 @@ function beforeSubmit(n){
 		$("#zbSeatchT [name='maxprice']").val(selectMaxPrices);
 		//搜索关键词
 		var searchname = $("#zbSeatchT input[name='keywords']").val();
-		$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname))
+		$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname));
 		if(n!="F"){
 			if(submitflag){	
 				if($.trim(searchname)==""){

src/web/templates/pc/supsearch.html

@@ -134,11 +134,106 @@ a{
 .modal-dialog{
 	width:500px;
 }
+.superSearch:hover{
+	background: #2cb7ca url(/images/biddingSearch/sea-header-btnImg-bai.png) 16px center no-repeat;
+    color: #ffffff;
+    background-size: 15px 16px;
+}
+#labmodalbody .code-close{
+	width: 40px;
+    height: 40px;
+    position: absolute;
+    right: 40px;
+    top: -20px;
+    cursor: pointer;
+    -webkit-transition: all 1s;
+    -o-transition: all 1s;
+    -moz-transition: all 1s;
+    transition: all 1s;
+}
+#labmodalbody .code-close:hover{
+	-webkit-transform: scale(1.2);
+	   -moz-transform: scale(1.2);
+	    -ms-transform: scale(1.2);
+	     -o-transform: scale(1.2);
+	        transform: scale(1.2);
+}
+.j-clearicon{
+	right:118px !important;
+}
 </style>
 <script>
+var areas = {{.T.area}};
+var selectPublishtime = {{.T.publishtime}};
+var selectTimeslot = {{.T.timeslot}};
+var toptype = {{.T.toptype}};
+var subtype = {{.T.subtype}};
+var isopen = {{.T.isopen}};
+var keys = {{.T.keywords}};
+var selectType = {{.T.selectType}};//全文或标题
+var industry = {{.T.industry}}
+var industrylist = {{.T.industrylist}}
+var sortArray = {{.T.sortArray}}
+var list = {{.T.list}}
+var searchvalue = {{.T.searchvalue}};
+var searchvalueArray = searchvalue.split("+");
 $(function(){
-	var industrylist = {{.T.industrylist}}
-	var sortArray = {{.T.sortArray}}
+	if(selectType=="all"){
+		$("#newsclass li:nth-child(1) a").addClass("active");
+		$("#newsclass li:nth-child(2) a").removeClass("active");
+	}else{
+		$("#newsclass li:nth-child(1) a").removeClass("active");
+		$("#newsclass li:nth-child(2) a").addClass("active");
+	};
+	$("#zbSeatchT [name='selectType']").val(selectType);
+	//
+	$("#zbSeatchT [name='keywords']").val($.trim(keys));
+	$("#zbSeatchT [name='searchvalue']").val($.trim(keys));
+	$("#searchinput").focus();
+	if($.trim(keys)!=""){
+		searchvalue = $.trim(keys);
+		searchvalueArray = searchvalue.split("+");
+		$("#newsclass").show();
+		$("#newsnow").hide();
+		if(list == null || list.length == 0){
+			$(".tabContainer").hide();
+			$(".pagination").hide();
+			$(".hasNoData").show();
+			submitflag=true;
+		}else{
+			$(".tabContainer").show();
+			$(".pagination").show();
+			$(".hasNoData").hide();
+			appendDatas(list,true);
+		}
+	}else{
+		if(list!=null&&list.length>0){
+			$(".tabContainer").show();
+			$(".pagination").show();
+			$(".hasNoData").hide();
+			appendDatas(list,false);
+		}else{
+			$(".tabContainer").hide();
+			$(".pagination").hide();
+			$(".hasNoData").show();
+			submitflag=true;
+		}
+	}
+	//
+	$(".searchname").on("input propertychange",function(){
+		var kw = $("#zbSeatchT [name='keywords']").val();
+    	$("#zbSeatchT [name='searchvalue']").val($.trim(kw));
+		if($.trim(kw)!=""){
+			$("#t-clear").show();
+		}else{
+			$("#t-clear").hide();
+		}
+  	});
+	$("#t-clear").click(function(){
+		$("#t-clear").hide();
+		$("#searchinput").val("").focus();
+	})
+	
 	var industryhtml = '<span id="induAll" class="active">全部</span>';
 	if (sortArray!=null&&sortArray.length>0){
 		for(var i in sortArray){
@@ -153,6 +248,80 @@ $(function(){
 		$(".industry-content").html(industryhtml)
 	}
 	
+	//
+	if(industry!=""){
+		$("#induAll").removeClass("active");
+		industry = industry.split(",");
+		for(var i=0;i<industry.length;i++){
+			$(".industry-content>font:not('.parent-node')").each(function(){
+				if($(this).attr("data-value") == industry[i]){
+					$(this).addClass("active");
+					return false;
+				}
+			});
+		}
+	}
+	$(".industry-content .parent-node").each(function(){
+		if($(this).nextUntil(".parent-node").filter("font").length == $(this).nextUntil(".parent-node").filter(".active").length){
+			$(this).addClass("active");
+		}
+	});
+	//
+	if(selectPublishtime != ""){
+		$("#timerAll").removeClass("active");
+		$(".timer [data-value='"+selectPublishtime+"']").addClass("active");
+		if(selectPublishtime.indexOf("_") > -1){
+			$(".timerInput").addClass("active");
+		}
+	}
+	if(selectTimeslot != "" && selectTimeslot.indexOf("_") > -1){
+		var spTimeArray = selectTimeslot.split("_");
+		if(spTimeArray[0] != ""){
+			$("#starttime").val(new Date(new Number(spTimeArray[0]+"000")).Format("yyyy年MM月dd日"));
+			$("#starttime").attr("data-value",spTimeArray[0]);
+		}
+		if(spTimeArray[1] != ""){
+			$("#endtime").val(new Date(new Number(spTimeArray[1]+"000")).Format("yyyy年MM月dd日"));
+			$("#endtime").attr("data-value",spTimeArray[1]);
+		}
+	}
+	//
+	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(){
+		if($(this).nextUntil(".parent-node").filter("font").length == $(this).nextUntil(".parent-node").filter(".active").length){
+			$(this).addClass("active");
+		}
+	});
+	//
+	if(subtype != ""){
+		$("#infoBtn").removeClass("active");
+		subtype = subtype.split(",");
+		for(var i=0;i<subtype.length;i++){
+			$(".info-content>font:not('.parent-node')").each(function(){
+				if($(this).attr("data-value") == subtype[i]){
+					$(this).addClass("active");
+					return false;
+				}
+			});
+		}
+	}
+	$(".info-content .parent-node").each(function(){
+		if($(this).nextUntil(".parent-node").filter("font").length == $(this).nextUntil(".parent-node").filter(".active").length){
+			$(this).addClass("active");
+		}
+	});
+	
 })
 </script>
 <script src="/js/biddingSearch.js?v={{Msg "seo" "version"}}"></script>
@@ -164,6 +333,7 @@ $(function(){
     <div class="modal-dialog">
         <div class="modal-content" id="labmodalcont">
             <div class="modal-body" id="labmodalbody">
+				<img class="code-close" src="/images/j-wx-code-close.png" alt="" onclick="labClose();">
 				<div class="layheader">
 					<div>超级搜索</div>
 					<div>按行业、金额搜索、结果可按表格显示</div>
@@ -190,9 +360,9 @@ $(function(){
 			<!--搜索-->
 			<div class="searchInput clearfix">
 				<form action="/jylab/supsearch/index.html" method="post"  id="zbSeatchT" class="clearfix" onsubmit="return beforeSubmit('F')">
-					<input class="searchname" autocomplete="off" type="search" id="searchinput" value="" name="keywords" placeholder="高速公路" />
-
-					<input type="button" value="搜索" />
+					<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>
@@ -209,7 +379,7 @@ $(function(){
 							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
 						</ul>
 					</div>-->
-					<input type="hidden" name="searchvalue" value="{{.T.searchvalue}}">
+					<input type="hidden" name="searchvalue" value="{{.T.keywords}}">
 					<input type="hidden" name="publishtime" value="{{.T.publishtime}}">
 					<input type="hidden" name="timeslot" value="{{.T.timeslot}}">
 					<input type="hidden" name="area" value="{{.T.area}}">
@@ -505,6 +675,7 @@ $(function(){
 	haslogin({{.T.logid}});
 	console.log(loginflag+"-------")
 	//
+	$(".j-nav .j-nav-link:eq(2)").addClass("active");
 	$(".q-mark").click(function(){
 		$(".remind").fadeIn();
 	})
@@ -519,9 +690,11 @@ $(function(){
 			$("#backTop").hide();
 		}
 	});
-	var list = {{.T.list}}
-	appendDatas(list,false);
 })
+//关闭遮罩层
+function labClose(){
+	$("#labModal").modal("hide");
+}
 </script>
 </body>
 </html>