Jelajahi Sumber

最新招标信息

wangshan 8 tahun lalu
induk
melakukan
baad9a7fff

+ 68 - 6
src/jfw/front/supsearch.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"math/rand"
 	"qfw/util"
+	"qfw/util/redis"
 	"strings"
 	"time"
 
@@ -15,8 +16,8 @@ import (
 type Pcsearch struct {
 	*xweb.Action
 
-	pcSearchIndex xweb.Mapper `xweb:"/jylab/supsearch/index"`
-	getEntName    xweb.Mapper `xweb:"/jylab/supsearch/getentname"`
+	pcSearchIndex xweb.Mapper `xweb:"/jylab/supsearch/index.html"`
+	getNewBids    xweb.Mapper `xweb:"/jylab/supsearch/getNewBids"`
 }
 
 func init() {
@@ -24,8 +25,22 @@ func init() {
 }
 
 //
-func (p *Pcsearch) GetEntName() error {
-
+func (p *Pcsearch) GetNewBids() error {
+	pagenum, _ := p.GetInteger("pageNumber")
+	var count int64
+	count = 500
+	//	searchvalue := p.GetString("searchvalue")
+	//	area := p.GetString("area")
+	//	publishtime := p.GetString("publishtime")
+	//toptype := p.GetString("toptype")
+	//subtype := p.GetString("subtype")
+	log.Println("pagenum:", pagenum)
+	pagenum = util.IntAll(pagenum)
+	data := redis.Get("other", "index_list").([]interface{})
+	p.ServeJson(map[string]interface{}{
+		"list":  data[pagenum-1],
+		"count": count,
+	})
 	return nil
 }
 
@@ -38,7 +53,6 @@ func (p *Pcsearch) PcSearchIndex() error {
 		shareid = fmt.Sprintf("%s%d", config.Seoconfig["jysslby"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
 	}
 	industryData, ok := mongodb.Find("rc_rule", `{"s_name":{$ne:null}}`, `{"i_order":1}`, `{"_id":1,"s_name":1}`, false, -1, -1)
-	log.Println(len(*industryData), "---")
 	if ok && industryData != nil && len(*industryData) > 0 {
 		industry := map[string][]string{}
 		sortArray := []string{}
@@ -66,7 +80,55 @@ 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)
-	log.Println("-------超级搜索:")
+	p.T["list"] = data[0]
 	return p.Render("/pc/supsearch.html", &p.T)
 }
+
+//
+func Newbids() {
+	var list *[]map[string]interface{}
+	pages := make([]interface{}, 0)
+	if redis.Get("other", "index_list") == nil {
+		intns := make([]int, 0)
+		for i := 0; i < 10; i++ {
+			if len(intns) == 0 {
+				intns = append(intns, rand.Intn(100))
+			} else {
+				for {
+					v := rand.Intn(intns[(i-1)] + 100)
+					if v-intns[(i-1)] >= 30 {
+						intns = append(intns, v)
+						break
+					}
+				}
+			}
+		}
+		for i := 0; i < 10; i++ {
+			_, list = getLastNewsData("", "", "", "", intns[i], true)
+			for k, v := range *list {
+				v["k"] = (k + 1) + i*50
+				t := time.Unix(util.Int64All(v["publishtime"]), 0)
+				v["timetemp"] = fmt.Sprint(util.Int64All(v["publishtime"]))
+				v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
+				v["time"] = util.TimeDiff(t)
+				var stp = ""
+				if v["subtype"] != nil {
+					stp, _ = v["subtype"].(string)
+				} else {
+					stp = ""
+				}
+				if stp == "" && v["toptype"] != nil {
+					stp, _ = v["toptype"].(string)
+				}
+				area, _ := v["area"].(string)
+				v["stypeadd"], v["areaadd"] = classify(stp, area)
+			}
+			pages = append(pages, list)
+		}
+		redis.Put("other", "index_list", pages, 60*60*2)
+	}
+}

+ 1 - 1
src/jfw/jylabutil/entsearch.go

@@ -21,7 +21,7 @@ func GetEenNameImmediate(name string, limit int) []map[string]interface{} {
 				  "minimum_should_match": 1
 			    }
 			  },
-			  "_source": ["name"],
+			  "_source": ["name","_id"],
 			  "from": 0,"size": ` + fmt.Sprint(limit) + `
 			}`
 	list := *elastic.Get("winner", "winner", query)

+ 2 - 1
src/seo.json

@@ -296,6 +296,7 @@
 	},
 	"source":{
 		"baiduSEM":"百度SEM",
-		"360SEM":"360SEM"
+		"360SEM":"360SEM",
+		"QQqun":"QQ群广告"
 	}
 }

+ 20 - 5
src/web/staticres/css/dev2/biddingSearch.css

@@ -169,7 +169,7 @@
   -webkit-transform: scale(0);
           transform: scale(0);
   position: absolute;
-  left: -154px;
+  left: -155px;
   top: 0;
   z-index: 999;
   width: 200px;
@@ -198,7 +198,8 @@
 #searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx .search-right-wx-inner .wx-inner-bottom {
   padding: 10px;
   border-top: 1px solid #e0e0e0;
-  line-height: 20px;
+  line-height: 21px;
+	text-align:center;
 }
 
 #searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx .search-right-wx-inner .wx-inner-bottom i {
@@ -212,7 +213,7 @@
   border: 1px solid #e0e0e0;
   margin-top: 26px;
   font-size: 14px;
-  overflow: hidden;
+/*  overflow: hidden;*/
 }
 
 #searchInner .searchControl .searchTender .industry {
@@ -374,7 +375,7 @@
   margin-top: -7px;
   margin-left: 40px;
 	border: 1px solid #fff;
-    background-color: #fff;
+/*    background-color: #fff;*/
     padding: 3px 5px;
 }
 
@@ -465,6 +466,7 @@
 #searchInner .searchControl .searchTender .information {
   /*信息类型*/
   padding: 20px 0;
+  position:relative;
 }
 
 #searchInner .searchControl .searchTender .information .info-content {
@@ -477,7 +479,7 @@
   vertical-align: middle;
   margin-top: 2px;
   margin-right: 10px;
-  margin-left: 4px;
+  margin-left: 8px !important;
 }
 
 #searchInner .searchControl .searchTender .information .info-content span {
@@ -625,6 +627,11 @@
   overflow: hidden;
   font-size: 16px;
 }
+#searchInner .searchControl .seaTender-inner .tabContainer-2 .lucene li {
+  padding: 15px 20px 0;
+  overflow: hidden;
+  font-size: 16px;
+}
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li:last-of-type .liLuceneList {
   border: none;
@@ -637,6 +644,9 @@
 width:1160px;
 }
 
+#searchInner .searchControl .seaTender-inner .tabContainer-2 .lucene li .liLuceneList {
+	padding-bottom: 15px;
+}
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-left {
   float: left;
   width: 860px;
@@ -651,6 +661,7 @@ width:1160px;
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-left .left-title {
   float: left;
   line-height: 30px;
+    width: 818px
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-left .left-title a {
@@ -687,6 +698,8 @@ width:1160px;
   padding: 3px 7px;
   color: #FFFFFF;
   font-size: 15px;
+	border-radius:3px;
+    margin-left: 8px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene li .luce-right a:nth-of-type(1) {
@@ -710,6 +723,8 @@ width:1160px;
   padding-left: 26px;
   color: #888888;
   background: transparent url("/images/biddingSearch/lists-timeImg.png") 6px center no-repeat;
+    color: #686868;
+    margin-left: 3px;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene-table {

+ 3 - 0
src/web/staticres/css/dev2/biddingSearch1.css

@@ -9,4 +9,7 @@
 	border: 1px solid #fff;
     background-color: #fff;
 	padding: 3px 5px;
+}
+.active{
+	background-color: #2cb7ca;
 }

+ 8 - 8
src/web/staticres/css/pc.css

@@ -1642,8 +1642,8 @@ form{
     height: 0px;
     border: 1px solid #ccc;
     position: absolute;
-    left: 244px;
-    top: 19px;
+    left: 236px;
+    top: 21px;
     border-width: 9px;
     border-color: transparent #ccc transparent transparent;
 }
@@ -1653,8 +1653,8 @@ form{
     height: 0px;
     border: 1px solid #fff;
     position: absolute;
-    left: 246px;
-    top: 19px;
+    left: 238px;
+    top: 21px;
     border-width: 9px;
     border-color: transparent #fff transparent transparent;
 	z-index: 99;
@@ -1664,14 +1664,14 @@ form{
     width: 333px;
     border: 1px solid #cecbce;
     position: absolute;
-    left: 262px;
+    left: 254px;
     background-color: #fff;
     padding: 24px 24px;
     font-family: MicrosoftYaHer-Bold,MicrosoftYaHei;
     font-size: 14px;
     line-height: 24px;
     border-radius: 2px;
-    top: -10px;
+    top: -7px;
     color: #5c5d61;
     box-shadow: 0 0 10px rgba(0,0,0, .24);
 }
@@ -1686,8 +1686,8 @@ form{
     display: inline-block;
     border: 1px solid #cecbce;
     position: absolute;
-    left: 515px;
-    top: 130px;
+    left: 507px;
+    top: 133px;
     border-radius: 2px;
     background-color: #fff;
     padding: 7px 13px;

+ 3 - 2
src/web/staticres/js/biddingSearch.js

@@ -152,7 +152,8 @@ $(function() {
 	function silbingsTabClass(children) {
 		var $childrenLi = children;
 		$childrenLi.on("click", function() {
-			$(this).addClass("active").siblings().removeClass("active")
+			$(this).addClass("active").siblings().removeClass("active");
+			$(".timerInput").removeClass("active");
 		})
 	}
 
@@ -175,7 +176,7 @@ $(function() {
 	luceneTab();
 
 	function luceneTab() {
-		var $tab = $(".seaTender-inner .tabTitle li"),
+		var $tab = $(".seaTender-inner .tabTitle ul").not("#newsnow").find("li"),
 			$tabDIv = $(".tabContainer");
 
 		$tab.on("click", function() {

+ 267 - 3
src/web/staticres/js/superSearch.js

@@ -1,3 +1,7 @@
+var pageSize = 50;
+var nbflag = false;//是否显示的是最新招标数据
+var currentPage = 1;
+var tol = "L"
 $(function() {
 	$("#minprice").click(function(){
 		$(".pricebut").show();
@@ -7,14 +11,22 @@ $(function() {
 		$(".pricebut").show();
 		$(".pricefat").addClass("customtime-active");
 	})
-	$("#mintime").click(function(){
+	$("#starttime").click(function(){
 		$("#timebut").show();
 		$(".timerInput").addClass("customtime-active");
 	})
-	$("#maxtime").click(function(){
+	$("#endtime").click(function(){
 		$("#timebut").show();
 		$(".timerInput").addClass("customtime-active");
 	})
+	$(".Price-content").find("span:first-child").click(function(){
+		$(this).addClass("active");
+		$(".pricefat").removeClass("active");
+	})
+	$(".timer").find("ul li:first-child").click(function(){
+		$(this).addClass("active");
+		$(".timerInput").removeClass("active");
+	})
 	//
 	$(".pricebut").click(function(){
 		var minp = $("#minprice").val();
@@ -27,11 +39,263 @@ $(function() {
 			$("#maxprice").val(minp);
 		}
 		$(this).hide();
+		$(".pricefat").addClass("active");
+		$(".Price-content").find("span:first-child").removeClass("active");
 		$(".pricefat").removeClass("customtime-active");
 	})
 	//
 	$("#timebut").click(function(){
 		$(this).hide();
+		$(".timerInput").addClass("active");
 		$(".timerInput").removeClass("customtime-active");
+		$(".timer").find("ul li:first-child").removeClass("active");
+		$(".release-time .timer li").removeClass("active");
+	})
+	//
+	$(".nbprev").click(function(){
+		$(window).scrollTop(0);
+		prev();
+	})
+	$(".nbnext").click(function(){
+		$(window).scrollTop(0);
+		next();
+	})
+	//筛选关闭和打开
+	//根据cookie值设置筛选是否显示
+	var rsw = $.cookie("orshow");
+	if(typeof(rsw)=="undefined"){
+		setTimeout(function(){
+			$(".searchTender").stop(false,true).slideDown(1000);
+			$.cookie("orshow","T",{expires:360,path:"/" });
+		},500);
+	}
+	/////////////////
+	$(".right-tabBtn button:nth-child(1)").click(function(){
+		tol="L"
+		getNewBiddings(1)
+	})
+	$(".right-tabBtn button:nth-child(2)").click(function(){
+		tol="T"
+		getNewBiddings(1)
+	})
+})
+//
+function next(){
+	var page = parseInt($(".pagination-inner").find("span").text())+parseInt(1)
+	if(!nbflag&&page<11){
+		if(page==10){
+			$(".nbnext").addClass("disabled");
+		}else if(page==2){
+			$(".nbprev").removeClass("disabled");
+		}
+		getNewBiddings(page)
+	}
+}
+function prev(){
+	var page = parseInt($(".pagination-inner").find("span").text())-parseInt(1)
+	if(!nbflag&&page>0){
+		if(page==1){
+			$(".nbprev").addClass("disabled");
+		}else if(page==9){
+			$(".nbnext").removeClass("disabled");
+		}
+		getNewBiddings(page)
+	}
+}
+////最新招标信息
+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,tol);
+		}
 	})
-})
+}
+//
+
+function appendDatas(datas,flag,tol){
+	var ltHtml = '';
+	var searchvalue = '';
+	for(var i=0;i<datas.length;i++){
+		var index = (currentPage - 1) * pageSize + i + 1;
+		var title = datas[i].title;
+		var detail = datas[i].detail;
+		if(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 type = datas[i].subtype;
+		if(typeof(type) == "undefined" || type == null || type == ""){
+			type = datas[i].toptype;
+		}
+		if(typeof(type) == "undefined" || type == null || type == ""){
+			type = datas[i].type;
+			if(type == "bid"){
+				type = "中标";
+				datas[i].stypeadd="ZHB"
+			}else if(type == "tender"){
+				datas[i].stypeadd="ZB"
+				type = "招标";
+			}else{
+				type = "";
+			}
+		}
+		if(!flag){
+				$("#allnews").hide();
+				$(".tabContainer-2").show();
+			}
+		if(tol=="L"){
+			ltHtml += '<li>'
+						+'<div class="liLuceneList">'
+						+'<div class="luce-left"><em>'+index+'.</em>'
+						+'<div class="left-title">'
+						+'<a href="'+aHref+'"> '+title+'</a>'
+						+'</div>'
+			if(flag){
+				ltHtml += '<div class="left-content">'
+						+'<a href="'+aHref+'">'+detail+'...</a>'
+						+'</div>'
+			}
+			ltHtml += '</div><div class="luce-right">'
+			if($.trim(datas[i].area) != "" && datas[i].area != "A"){
+				ltHtml += '<a href="/list/area/'+datas[i].areaadd+'.html">'+datas[i].area+'</a>';
+			}else{
+				ltHtml += '<a href="#" style="display:none;"></a>';
+			}
+			if(typeof(type) != "undefined" && type != null && type != ""){
+				ltHtml += '<a href="/list/stype/'+datas[i].stypeadd+'.html">'+type+'</a>';
+			}else{
+				ltHtml += '<a href="#" style="display:none;"></a>';
+			}
+			//
+			ltHtml += '<a href="/list/stype/'+datas[i].stypeadd+'.html">建筑工程</a>';
+			//
+			if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
+				var diff = timeDiff(new Date(Number(datas[i].publishtime+"000")));
+				if(diff != null){
+					ltHtml += '<span class="com-time">'+diff+'</span>';
+				}
+			}
+			ltHtml += '</div></li>';
+		}else{
+			ltHtml +='<tr>'
+					+'<td>'+index+'</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){
+					ltHtml += '<td>'+diff+'</td>';
+				}
+			}else{
+				ltHtml += '<td></td>';
+			}
+			if(typeof(type) != "undefined" && type != null && type != ""){
+				ltHtml += '<td>'+type+'公告</td>';
+			}else{
+				ltHtml += '<td></td>';
+			}
+			if(typeof(datas[i].agency) != "undefined" && datas[i].agency != null && datas[i].agency != ""){
+				ltHtml += '<td class="tt-l">'+datas[i].agency+'</td>';
+			}else{
+				ltHtml += '<td class="tt-l"></td>';
+			}
+			if(typeof(datas[i].projectname) != "undefined" && datas[i].projectname != null && datas[i].projectname != ""){
+				ltHtml += '<td class="tt-l">'+datas[i].projectname+'</td>';
+			}else{
+				ltHtml += '<td class="tt-l"></td>';
+			}
+			if(typeof(datas[i].budget) != "undefined" && datas[i].budget != null && datas[i].budget != ""){
+				ltHtml += '<td class="tt-r">'+datas[i].budget+'</td>';
+			}else{
+				ltHtml += '<td class="tt-r"></td>';
+			}
+			if(typeof(datas[i].bidopentime) != "undefined" && datas[i].bidopentime != null && datas[i].bidopentime != ""){
+				var diff = formatDate(Number(datas[i].publishtime),"l");
+				ltHtml += '<td>'+datas[i].budget+'</td>';
+			}else{
+				ltHtml += '<td></td>';
+			}
+			if(typeof(datas[i].winner) != "undefined" && datas[i].winner != null && datas[i].winner != ""){
+				ltHtml += '<td class="tt-l">'+datas[i].winner+'</td>';
+			}else{
+				ltHtml += '<td class="tt-l"></td>';
+			}
+			if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
+				ltHtml += '<td class="tt-r">'+datas[i].bidamount+'</td>';
+			}else{
+				ltHtml += '<td class="tt-r"></td>';
+			}
+				ltHtml+='</tr>'
+		}
+	}
+	if(tol=="L"){
+		$(".tabContainer-2 .lucene ul").html(ltHtml);
+	}else{
+		$(".tabContainer-2 .lucene-table table tbody").html(ltHtml);
+	}
+	
+	backTopAdjust();
+}
+//
+//
+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 hour = myDate.getHours()
+	var min = myDate.getMinutes()
+	if(sl=="l"){
+		return   year+"-"+month+"-"+date+"<br>"+hour+":"+min; 
+	}else{
+		return   year+"-"+month+"-"+date; 
+	}
+} 
+//
+function onpicking(dp,obj){
+	var time = new Date(dp.cal.newdate.y,dp.cal.newdate.M-1,dp.cal.newdate.d).getTime()+"";
+	time = time.substring(0,time.length - 3);
+	$(obj).attr("data-value",time);
+}
+//
+function onclearing(obj){
+	$(obj).attr("data-value","");
+	//localStorage.removeItem($(obj).attr("id"))
+	if($(".customtime").hasClass("active") && getInputTime().join("") == ""){
+		$(".customtime").removeClass("active");
+		$("#publishtime #alltime").addClass("active");
+	}
+}
+//
+function picked(dp,obj){
+	//localStorage.setItem($(obj).attr("id"),$(obj).val()+"_"+$(obj).attr("data-value"))
+}
+//
+function getInputTime(){
+	var starttime = $("#starttime").attr("data-value");
+	if(starttime){
+		starttime = $.trim(starttime);
+	}else{
+		starttime = "";
+	}
+	var endtime = $("#endtime").attr("data-value");
+	if(endtime){
+		endtime = $.trim(endtime);
+	}else{
+		endtime = "";
+	}
+	return [starttime,endtime]
+}

+ 43 - 202
src/web/templates/pc/supsearch.html

@@ -12,6 +12,7 @@
 <link href="/css/dev2/biddingSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="/css/dev2/biddingSearch1.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <script src="/js/jquery.cookie.js"></script>
+<script language="javascript" type="text/javascript" src="/My97DatePicker/WdatePicker.js"></script>
 <style type="text/css">
 /*j-wx-code Start*/
 .j-wx-code{
@@ -91,6 +92,13 @@
 a{
 	text-decoration: none !important;
 }
+.disabled{
+	cursor: not-allowed;
+    color: #aea79f !important
+}
+#keyImg{
+	width:198px;
+}
 </style>
 <script>
 $(function(){
@@ -167,7 +175,8 @@ $(function(){
 							<img  id="keyImg" src="/front/share/{{.T.shareid}}"/>
 						</div>
 						<div class="wx-inner-bottom">
-							微信扫一扫,及时获取及时获取<i>"1"</i>相关招标信息
+							微信扫一扫<br>随时随地掌握招标信息
+<!--						微信扫一扫,及时获取及时获取<i>"1"</i>相关招标信息-->
 						</div>
 					</div>
 				</div>
@@ -179,7 +188,7 @@ $(function(){
 	<!--招标搜索页面 START-->
 	<div class="searchControl">
 		<!--头部功能-->
-		<div class="searchTender w">
+		<div class="searchTender w" style="display: none;">
 			<!--行业-->
 			<div class="industry">
 				<div class="leftTitle">
@@ -224,10 +233,10 @@ $(function(){
 					</ul>
 				</div>
 				<div class="timerInput fl">
-					<input type="text" name="mintime" id="mintime" value="" placeholder="" />
+					<input type="text"  onClick="WdatePicker({onclearing:function(){onclearing(this)},onpicked:function(dp){picked(dp,this)},onpicking:function(dp){onpicking(dp,this)},dateFmt:'yyyy年MM月dd日',maxDate:'#F{$dp.$D(\'endtime\')}'})" id="starttime" readonly="true" placeholder="" />
 					<span></span>
-					<input type="text" name="maxtime" id="maxtime" value="" placeholder="" />
-					<button class="fl" id="timebut">确定</button>
+					<input type="text" name="maxtime"  onClick="WdatePicker({onclearing:function(){onclearing(this)},onpicked:function(dp){picked(dp,this)},onpicking:function(dp){onpicking(dp,this)},dateFmt:'yyyy年MM月dd日',minDate:'#F{$dp.$D(\'starttime\')}'})" id="endtime" readonly="true" placeholder="" />
+					<button class="fl" id="timebut" style="display:none;">确定</button>
 				</div>
 			</div>
 			<!--项目地区-->
@@ -293,7 +302,7 @@ $(function(){
 					<span id="infoBtn" class=" active">全部</span>
 					<i class="diver"></i>
 					<font class="parent-node infoFist">拟建项目</font>
-					<a href="#"><img src="/images/biddingSearch/info-icon1.png" alt="" /></a>
+					<a><img class="q-mark" id="q-mark"  src="/images/biddingSearch/info-icon1.png" alt="" /></a>
 					<i class="diver"></i>
 					<font class="parent-node">招标预告</font>
 					<i class="diver"></i>
@@ -318,13 +327,19 @@ $(function(){
 					<font>验收</font>
 					<font>违规</font>
 				</div>
+				<span class="remind" style="display:none;">
+					<span class="remindone"></span>
+					<span class="remindonebak"></span>
+					<span class="remindtwo"><span>"拟建项目"</span>是指那些处于前期立项、审批阶段的项目。供应商应在立项阶段掌握项目信息,做到早介入,稳拿单。</span>
+					<span class="iknow">我知道了</span>
+				</span>
 			</div>
 		</div>
 		<!--招标搜索列表内容-->
 		<div class="seaTender-inner w">
 			<!--招标tab切换-->
 			<div class="tabTitle clearfix">
-				<ul>
+				<ul id="newsclass" style="display:none;">
 					<li>
 						<a class="active" href="javascript:;">全文搜索</a>
 					</li>
@@ -332,111 +347,22 @@ $(function(){
 						<a href="javascript:;">标题搜索</a>
 					</li>
 				</ul>
+				<ul id="newsnow">
+					<li>
+						<a class="active" href="javascript:;">最新招标信息</a>
+					</li>
+				</ul>
 				<div class="right-tabBtn">
 					<button class="active">列表</button>
 					<button>表格</button>
 				</div>
 			</div>
 			<!--tab切换内容-->
-			<div class="tabContainer">
+			<div class="tabContainer" id="allnews">
 				<!--全文搜索 列表-->
 				<div class="lucene">
 					<ul>
-						<li>
-							<div class="liLuceneList">
-								<div class="luce-left">
-									<div class="left-title">
-										<a href="#"> <em>1-1.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-									</div>
-									<div class="left-content">
-										<a href="#">河南五建招标有限公司受河南省开封县高速公路京秦管理处委托,根据《中华人民共和国政府采购法》等有关规定,现对河南省开封县高速公路京秦管理处养护设备采购......</a>
-									</div>
-
-								</div>
-								<div class="luce-right">
-									<a href="#">河南</a>
-									<a href="#">中标</a>
-									<a href="#">建筑工程</a>
-									<span>43分钟前</span>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="liLuceneList">
-								<div class="luce-left">
-									<div class="left-title">
-										<a href="#"> <em>2.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-									</div>
-									<div class="left-content">
-										<a href="#">河南五建招标有限公司受河南省开封县高速公路京秦管理处委托,根据《中华人民共和国政府采购法》等有关规定,现对河南省开封县高速公路京秦管理处养护设备采购......</a>
-									</div>
-
-								</div>
-								<div class="luce-right">
-									<a href="#">河南</a>
-									<a href="#">中标</a>
-									<a href="#">建筑工程</a>
-									<span>43分钟前</span>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="liLuceneList">
-								<div class="luce-left">
-									<div class="left-title">
-										<a href="#"> <em>3.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-									</div>
-									<div class="left-content">
-										<a href="#">河南五建招标有限公司受河南省开封县高速公路京秦管理处委托,根据《中华人民共和国政府采购法》等有关规定,现对河南省开封县高速公路京秦管理处养护设备采购......</a>
-									</div>
-
-								</div>
-								<div class="luce-right">
-									<a href="#">河南</a>
-									<a href="#">中标</a>
-									<a href="#">建筑工程</a>
-									<span>43分钟前</span>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="liLuceneList">
-								<div class="luce-left">
-									<div class="left-title">
-										<a href="#"> <em>4.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-									</div>
-									<div class="left-content">
-										<a href="#">河南五建招标有限公司受河南省开封县高速公路京秦管理处委托,根据《中华人民共和国政府采购法》等有关规定,现对河南省开封县高速公路京秦管理处养护设备采购......</a>
-									</div>
-
-								</div>
-								<div class="luce-right">
-									<a href="#">河南</a>
-									<a href="#">中标</a>
-									<a href="#">建筑工程</a>
-									<span>43分钟前</span>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="liLuceneList">
-								<div class="luce-left">
-									<div class="left-title">
-										<a href="#"> <em>5.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-									</div>
-									<div class="left-content">
-										<a href="#">河南五建招标有限公司受河南省开封县高速公路京秦管理处委托,根据《中华人民共和国政府采购法》等有关规定,现对河南省开封县高速公路京秦管理处养护设备采购......</a>
-									</div>
-
-								</div>
-								<div class="luce-right">
-									<a href="#">河南</a>
-									<a href="#">中标</a>
-									<a href="#">建筑工程</a>
-									<span>43分钟前</span>
-								</div>
-							</div>
-						</li>
+						
 					</ul>
 				</div>
 				<!--全文搜索 表格-->
@@ -511,107 +437,13 @@ $(function(){
 			<!--tab切换内容-->
 			<div class="tabContainer tabContainer-2" style="display: none;">
 				<!--全文搜索 列表-->
-				<div class="lucene">
+				<div class="lucene" style="display: none;">
 					<ul>
-						<li>
-							<div class="liLuceneList">
-								<div class="luce-left">
-									<div class="left-title">
-										<a href="#"> <em>2-1.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-									</div>
-									<div class="left-content">
-										<a href="#">河南五建招标有限公司受河南省开封县高速公路京秦管理处委托,根据《中华人民共和国政府采购法》等有关规定,现对河南省开封县高速公路京秦管理处养护设备采购......</a>
-									</div>
-
-								</div>
-								<div class="luce-right">
-									<a href="#">河南</a>
-									<a href="#">中标</a>
-									<a href="#">建筑工程</a>
-									<span>43分钟前</span>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="liLuceneList">
-								<div class="luce-left">
-									<div class="left-title">
-										<a href="#"> <em>2.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-									</div>
-									<div class="left-content">
-										<a href="#">河南五建招标有限公司受河南省开封县高速公路京秦管理处委托,根据《中华人民共和国政府采购法》等有关规定,现对河南省开封县高速公路京秦管理处养护设备采购......</a>
-									</div>
-
-								</div>
-								<div class="luce-right">
-									<a href="#">河南</a>
-									<a href="#">中标</a>
-									<a href="#">建筑工程</a>
-									<span>43分钟前</span>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="liLuceneList">
-								<div class="luce-left">
-									<div class="left-title">
-										<a href="#"> <em>3.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-									</div>
-									<div class="left-content">
-										<a href="#">河南五建招标有限公司受河南省开封县高速公路京秦管理处委托,根据《中华人民共和国政府采购法》等有关规定,现对河南省开封县高速公路京秦管理处养护设备采购......</a>
-									</div>
-
-								</div>
-								<div class="luce-right">
-									<a href="#">河南</a>
-									<a href="#">中标</a>
-									<a href="#">建筑工程</a>
-									<span>43分钟前</span>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="liLuceneList">
-								<div class="luce-left">
-									<div class="left-title">
-										<a href="#"> <em>4.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-									</div>
-									<div class="left-content">
-										<a href="#">河南五建招标有限公司受河南省开封县高速公路京秦管理处委托,根据《中华人民共和国政府采购法》等有关规定,现对河南省开封县高速公路京秦管理处养护设备采购......</a>
-									</div>
-
-								</div>
-								<div class="luce-right">
-									<a href="#">河南</a>
-									<a href="#">中标</a>
-									<a href="#">建筑工程</a>
-									<span>43分钟前</span>
-								</div>
-							</div>
-						</li>
-						<li>
-							<div class="liLuceneList">
-								<div class="luce-left">
-									<div class="left-title">
-										<a href="#"> <em>5.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-									</div>
-									<div class="left-content">
-										<a href="#">河南五建招标有限公司受河南省开封县高速公路京秦管理处委托,根据《中华人民共和国政府采购法》等有关规定,现对河南省开封县高速公路京秦管理处养护设备采购......</a>
-									</div>
-
-								</div>
-								<div class="luce-right">
-									<a href="#">河南</a>
-									<a href="#">中标</a>
-									<a href="#">建筑工程</a>
-									<span>43分钟前</span>
-								</div>
-							</div>
-						</li>
+						
 					</ul>
 				</div>
 				<!--全文搜索 表格-->
-				<div class="lucene-table" style="display: none;">
+				<div class="lucene-table">
 					<table>
 						<thead>
 							<tr>
@@ -683,9 +515,9 @@ $(function(){
 		<!--分页-->
 		<div class="pagination clearfix w">
 			<div class="pagination-inner fr">
-				<a href="#"><i><</i>上一页</a>
+				<a class="nbprev disabled"><i><</i>上一页</a>
 				<span>1</span>
-				<a href="#">下一页<i>></i></a>
+				<a class="nbnext">下一页<i>></i></a>
 			</div>
 		</div>
 	</div>
@@ -698,6 +530,13 @@ $(function(){
 $(function(){
 	haslogin({{.T.logid}});
 	//
+	$(".q-mark").click(function(){
+		$(".remind").fadeIn();
+	})
+	$(".iknow").click(function(){
+		$(".remind").fadeOut();
+	})
+	//
 	$(window).scroll(function(){
 		if($(this).scrollTop() > 0){
 			$("#backTop").show();
@@ -705,6 +544,8 @@ $(function(){
 			$("#backTop").hide();
 		}
 	});
+	var list = {{.T.list}}
+	appendDatas(list,false,"T");//L->列表 T->表格
 })
 </script>
 </body>

+ 5 - 6
src/web/templates/weixin/wxpush.html

@@ -37,12 +37,12 @@ $(function(){
 	var substype={};
 	var projectname={};
 	var projectid={};
-	var buyer={};
+	var agency={};
 	var bmatch={{.T.data.bmatch}};
 	var tabletime = ""
 	var tabletype = ""
 	var tableptname = ""
-	var tablebuyer = ""
+	var tableagency = ""
 	if(bmatch){
 		$(".findnull").hide();
 	}else{
@@ -58,7 +58,7 @@ $(function(){
 			substype[i]=o_pushinfo[i]["substype"];
 			projectname[i]=o_pushinfo[i]["projectname"];
 			projectid[i]=o_pushinfo[i]["projectid"];
-			buyer[i]=o_pushinfo[i]["buyer"];
+			agency[i]=o_pushinfo[i]["agency"];
 		}
 	}
 	if(typeof(s_words) != "undefined" && s_words.length > 0){
@@ -158,8 +158,7 @@ $(function(){
 							tabletype="中标"
 						}
 					}
-					//console.log(tabletype+":tabletype"+"tablebuyer:"+buyer[xh]+"---"+projectname[xh])
-					tablebuyer=buyer[xh]
+					tableagency=agency[xh]
 					tableptname=projectname[xh]
 					if (area&&area!="" && area!="undefined"){
 						area='<span class="location">'+area+'</span>';
@@ -183,7 +182,7 @@ $(function(){
 					'<td>'+xh+'</td>'+
 					'<td>'+tabletime+'</td>'+
 					'<td>'+tabletype+'公告</td>'+
-					'<td>'+tablebuyer+'</td>'+
+					'<td>'+tableagency+'</td>'+
 					'<td>'+tableptname+'</td>'+
 					'</tr>'
 	});