xiugai

src/jfw/front/supsearch.go

@@ -4,9 +4,11 @@ import (
 	"fmt"
 	"jfw/config"
 	"jfw/jylabutil"
+	"log"
 	"math/rand"
 	"qfw/util"
 	"qfw/util/redis"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -29,6 +31,7 @@ type Pcsearch struct {
 var industrylist map[string][]string
 var sortArray []string
 var industryname string
+var matchSpace = regexp.MustCompile("\\s+")
 
 //
 func init() {
@@ -45,8 +48,7 @@ func (p *Pcsearch) ProposedProject() error {
 	if len(shareid) == 0 {
 		shareid = fmt.Sprintf("%s%d", config.Seoconfig["jynjxmy"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
 	}
-	keywords := p.GetString("keywords") //关键词
-	searchvalue := FilteKey(p.GetString("searchvalue"))
+	b_word, _, s_word := InterceptSearchKW(p.GetString("keywords"), false)
 	area := p.GetString("area")               //地区
 	publishtime := p.GetString("publishtime") //发布时间
 	subtype := p.GetString("subtype")         //信息类型
@@ -56,9 +58,9 @@ func (p *Pcsearch) ProposedProject() error {
 	var totalPage int64
 	var list *[]map[string]interface{}
 	var status = 1
-	if len(searchvalue) > 0 {
+	if len(s_word) > 0 {
 		status = 2
-		_, totalPage, list = getBidSearchData(searchvalue, area, publishtime, subtype, "", "", "", 0, true, "", "")
+		_, totalPage, list = getBidSearchData(s_word, area, publishtime, subtype, "", "", "", 0, true, "", "")
 	} else {
 		p.DisableHttpCache()
 		p.T["list"] = Newbids("nijian")[0]
@@ -89,10 +91,10 @@ func (p *Pcsearch) ProposedProject() error {
 	p.T["publishtime"] = publishtime
 	p.T["timeslot"] = p.GetString("timeslot")
 	p.T["totalPage"] = totalPage
-	p.T["keywords"] = keywords
-	p.T["searchvalue"] = searchvalue
+	p.T["keywords"] = b_word
+	p.T["searchvalue"] = s_word
 	p.T["login"] = p.Session().Get("user")
-	p.SetSession("paramkey", keywords)
+	p.SetSession("paramkey", b_word)
 	if publishtime == "lately-7" {
 		p.SetSession("parampublishtime", "最近7天")
 	} else if publishtime == "lately-30" {
@@ -151,8 +153,6 @@ func (p *Pcsearch) PcSearchIndex() error {
 		}
 	}
 	p.T["supstatus"] = supstatus
-	keywords := p.GetString("keywords") //关键词
-	searchvalue := FilteKey(p.GetString("searchvalue"))
 	area := p.GetString("area")                            //地区
 	publishtime := p.GetString("publishtime")              //发布时间
 	toptype := p.GetString("toptype")                      //信息类型
@@ -169,12 +169,13 @@ func (p *Pcsearch) PcSearchIndex() error {
 	//if selectType == "" {
 	selectType = "title"
 	//}
+	b_word, _, s_word := InterceptSearchKW(p.GetString("keywords"), false)
 	var list *[]map[string]interface{}
 	var status = 1
 	var count, totalPage int64
-	if len(searchvalue) > 0 || len(industry) > 0 {
+	if len(s_word) > 0 || len(industry) > 0 {
 		status = 2
-		count, totalPage, list = getBidSearchData(searchvalue, area, publishtime, subtype, industry, minprice, maxprice, 0, true, selectType, "")
+		count, totalPage, list = getBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, 0, true, selectType, "")
 	} else {
 		p.DisableHttpCache()
 		p.T["list"] = Newbids("")[0]
@@ -206,8 +207,8 @@ func (p *Pcsearch) PcSearchIndex() error {
 	p.T["timeslot"] = p.GetString("timeslot")
 	p.T["toptype"] = toptype
 	p.T["subtype"] = subtype
-	p.T["keywords"] = keywords
-	p.T["searchvalue"] = searchvalue
+	p.T["keywords"] = b_word
+	p.T["searchvalue"] = s_word
 	p.T["selectType"] = selectType
 	p.T["industry"] = industry
 	p.T["minprice"] = minprice
@@ -215,7 +216,7 @@ func (p *Pcsearch) PcSearchIndex() error {
 	p.T["login"] = p.Session().Get("user")
 	p.T["totalPage"] = totalPage
 	p.T["count"] = count
-	p.SetSession("paramkey", keywords)
+	p.SetSession("paramkey", b_word)
 	if publishtime == "lately-7" {
 		p.SetSession("parampublishtime", "最近7天")
 	} else if publishtime == "lately-30" {
@@ -349,3 +350,26 @@ func (p *Pcsearch) Qr(t string) error {
 	_, err := w.Write(pngdat)
 	return err
 }
+
+//超过20个字，截断
+//返回截取后的字符串和截取掉中的前3个字
+func InterceptSearchKW(word string, flag bool) (b_word, a_word, s_word string) {
+	word = FilteKey(word)
+	word = matchSpace.ReplaceAllString(strings.TrimSpace(word), " ")
+	words := []rune(word)
+	if len(words) > 20 && flag {
+		b_word = string(words[:20])
+		b_word = strings.TrimSpace(b_word)
+		if len(words) > 23 {
+			a_word = string(words[20:23])
+		} else {
+			a_word = string(words[20:])
+		}
+	} else {
+		b_word = word
+	}
+	a_word = strings.TrimSpace(a_word)
+	s_word = matchSpace.ReplaceAllString(b_word, "+")
+	log.Println(b_word, "==", a_word, "==", s_word)
+	return
+}

src/jfw/front/swordfish.go

@@ -492,7 +492,6 @@ func (m *Front) PcAjaxReq() {
 	start := (currentPage - 1) * pc_pageSize
 	area := m.GetString("area")
 	subtype := m.GetString("subtype")
-	searchvalue := FilteKey(m.GetString("searchvalue"))
 	publishtime := m.GetString("publishtime")
 	selectType := m.GetString("selectType")
 	industry := strings.TrimSpace(m.GetString("industry"))
@@ -502,20 +501,21 @@ func (m *Front) PcAjaxReq() {
 	if selectType == "" {
 		selectType = "all"
 	}
+	_, a_word, s_word := InterceptSearchKW(m.GetString("searchvalue"), selectType == "all")
 	var list *[]map[string]interface{}
 	var count, totalPage int64
 	status, _ := m.GetInteger("status")
-	if len(searchvalue) > 0 || len(industry) > 0 {
+	if len(s_word) > 0 || len(industry) > 0 {
 		if reqType == "filter" {
 			if status == 1 {
-				count, totalPage, list = getBidSearchData(searchvalue, area, publishtime, subtype, industry, minprice, maxprice, 0, true, selectType, tabularflag)
+				count, totalPage, list = getBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, 0, true, selectType, tabularflag)
 			} else if status == 2 {
 				//count, list = getLastNewsData(searchvalue, area, publishtime, subtype, industry, minprice, maxprice, tabularflag, 0, true, true)
 			}
 		} else if reqType == "bidSearch" {
-			count, totalPage, list = getBidSearchData(searchvalue, area, publishtime, subtype, industry, minprice, maxprice, start, true, selectType, tabularflag)
+			count, totalPage, list = getBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, start, true, selectType, tabularflag)
 		} else if reqType == "lastNews" {
-			_, list = getLastNewsData(searchvalue, area, publishtime, subtype, industry, minprice, maxprice, tabularflag, start, false, true)
+			_, list = getLastNewsData(s_word, area, publishtime, subtype, industry, minprice, maxprice, tabularflag, start, false, true)
 		}
 	}
 	if list != nil && len(*list) > 0 {
@@ -541,9 +541,11 @@ func (m *Front) PcAjaxReq() {
 		}
 	}
 	m.ServeJson(map[string]interface{}{
-		"list":      list,
-		"count":     count,
-		"totalPage": totalPage,
+		"list":          list,
+		"count":         count,
+		"totalPage":     totalPage,
+		"interceptWord": a_word,
+		"searchvalue":   s_word,
 	})
 }
 

src/jfw/modules/followent/src/seo.json

@@ -265,7 +265,7 @@
 	},
 	"jyadd":"http://127.0.0.1",
 	"limitcount":20,
-	"ZBADDRESS":"http://ws.jy.com",
+	"ZBADDRESS":"http://webwcj.qmx.top",
 	"jysy":"10",
 	"jydyy":"11",
 	"jysslby":"12",

src/jfw/modules/followent/src/web/staticres/jylab/followent/css/follow.css

@@ -118,6 +118,7 @@
 .setpage ul{
 	padding-left: 10px;
 	padding-right: 10px;
+	padding-top: 55px;
 }
 .setpage li{
 	position: relative;
@@ -426,35 +427,34 @@
 }
 .qy-followcancel{
 	background-color: #FE737A;
-    color: #FFFFFF;
-    line-height: 45px;
-    margin-left: 15px;
-    margin-right: 15px;
-    border-radius: 3px;
-    font-size: 18px;
-    margin-top: 20px;
-    text-align: center;
-	margin-bottom: 20px;
-
 }
 .gz-followcancel{
 	background-color: #2cb7ca;
+}
+.com-followcancel{
+	position: absolute;
     color: #FFFFFF;
-    line-height: 45px;
-    margin-left: 15px;
-    margin-right: 15px;
     border-radius: 3px;
-    font-size: 18px;
-    margin-top: 20px;
-    text-align: center;
-	margin-bottom: 20px;
+	top: 50%;
+	right: 10px;
+	margin-top: -15px;
+	width: 78px;
+	height: 30px;
+	line-height: 30px;
+	text-align: center;
+	font-weight: normal;
 }
 .setpage .noticehead{
 	background-color: #F8F8F8;	
 	border-bottom: 1px solid #ddd;
-	padding:10px;
+	padding: 15px 95px 15px 10px;
 	line-height: 24px;
 	font-weight: 600;
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	z-index: 1;
 }
 .setpage .noticenew{
     padding: 1px 2px 2px 3px;

src/jfw/modules/followent/src/web/templates/weixin/add.html

@@ -39,6 +39,9 @@
 		line-height: 35px;
 		font-size: 13px;
 	}
+	.rec:last-child{
+		border-bottom-width: 0px;
+	}
 .highLight{
     color: #2cb7ca;
 }

src/jfw/modules/followent/src/web/templates/weixin/set.html

@@ -35,7 +35,7 @@ if(sessionStorage){
 				window.location.reload(true);
 			}
 	    });
-		
+		$(".qyxx").css("padding-top",$(".noticehead").outerHeight());
 		//解决样式回显问题
 		$.post(
 			"/jylab/followent/ajaxSearch",
@@ -59,7 +59,6 @@ if(sessionStorage){
 		//}
 		
 		var easyPopup = new EasyPopup("easypopup");
-		$(".noticehead").html(winner);
 		if(data.length > 0){
 			for(var i = 0; i < data.length; i++){
 				var noticetime = '';
@@ -212,9 +211,12 @@ function myRedirect(zbadd,link,sid){
 </script>
 </head>
 <body class="setpage">
-	<div class="noticehead"></div>
+	<div class="noticehead">
+		{{.T.winner}}
+		<div class="com-followcancel qy-followcancel hidden">取消关注</div>
+		<div class="com-followcancel gz-followcancel hidden">关注</div>
+	</div>
 	<ul class="qyxx">
-		<li id="notice">企业最新信息</li>
 		<li class="jynotice">	
 		</li>
 	</ul>
@@ -222,12 +224,6 @@ function myRedirect(zbadd,link,sid){
 		<img src="/jylab/followent/images/wx/nullxx.png" style="margin-top:80px;width:150px;"/>
 		<div style="margin-top:38px">该企业暂时没有招投标信息</div>
 	</div>
-	<div class="qy-followcancel hidden">
-		取消企业关注
-	</div>
-	<div class="gz-followcancel hidden">
-		关注此企业
-	</div>
 	<div class="easypopup" id="easypopup">
 		<div class="easypopup-main" style="margin-top: -77.5px;">
 			<div class="easypopup-header">提示信息</div>

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

@@ -453,7 +453,6 @@ border-radius:2px;
 
 #searchInner .searchControl .searchTender .region .region-content {
   float: left;
-  width: 1015px;
 }
 
 #searchInner .searchControl .searchTender .region .region-content span {
@@ -462,7 +461,9 @@ border-radius:2px;
   cursor: pointer;
   margin: 0 2px 4px 0;
 }
-
+#searchInner .searchControl .searchTender .region .region-content span.active{
+  margin-right: 8px;
+}
 #searchInner .searchControl .searchTender .region .region-content span.active {
   color: #FFFFFF;
   background-color: #2cb7ca;
@@ -470,10 +471,10 @@ border-radius:2px;
 }
 
 #searchInner .searchControl .searchTender .region .region-content font {
-  float: left;
   padding: 4px 7px;
   cursor: pointer;
-  margin: 0 2px 8px 0;
+  margin: 0 10px 10px 0;
+  float: left;
 }
 
 #searchInner .searchControl .searchTender .region .region-content font.active {
@@ -483,11 +484,9 @@ border-radius:2px;
 }
 
 #searchInner .searchControl .searchTender .region .region-content .diver {
+  margin: 4px 5px 0px 5px;
+  color: #888888;
   float: left;
-  width: 1px;
-  height: 16px;
-  background-color: #e0e0e0;
-  margin: 3px 8px 0;
 }
 
 #searchInner .searchControl .searchTender .region .region-content .parent-node {
@@ -510,7 +509,6 @@ border-radius:2px;
 
 #searchInner .searchControl .searchTender .information .info-content {
   float: left;
-  width: 1020px;
 }
 
 #searchInner .searchControl .searchTender .information .info-content img {
@@ -527,7 +525,9 @@ border-radius:2px;
   cursor: pointer;
   margin: 0 2px 4px 0;
 }
-
+#searchInner .searchControl .searchTender .information .info-content span{
+  margin-right: 7px;
+}
 #searchInner .searchControl .searchTender .information .info-content span.active {
   color: #FFFFFF;
   background-color: #2cb7ca;
@@ -538,7 +538,7 @@ border-radius:2px;
   float: left;
   padding: 4px 7px;
   cursor: pointer;
-  margin: 0 2px 8px 0;
+  margin: 0 7px 8px 0;
 }
 
 #searchInner .searchControl .searchTender .information .info-content font.active {
@@ -552,7 +552,7 @@ border-radius:2px;
   width: 1px;
   height: 16px;
   background-color: #e0e0e0;
-  margin: 3px 8px 0;
+  margin: 3px 6px 0;
 }
 
 #searchInner .searchControl .searchTender .information .info-content .parent-node {
@@ -798,9 +798,12 @@ width:1160px;
   text-align: center;
   line-height: 26px;
 }
-
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene-table>div>table>tbody>tr:first-child>td {
+	border-top: 0px;
+}
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene-table table thead {
   font-size: 14px;
+display: block;
 }
 
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene-table table thead tr {
@@ -816,7 +819,15 @@ width:1160px;
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene-table table tbody tr:nth-of-type(2n) {
   background-color: #f5f5fb;
 }
-
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene-table>div{
+	overflow-y: auto;
+	max-height: 400px;
+	display: block;
+	width: 1176px;
+}
+#searchInner .searchControl .seaTender-inner .tabContainer .lucene-table table{
+	width: 1157px;
+}
 #searchInner .searchControl .seaTender-inner .tabContainer .lucene-table table tbody td {
   padding: 6px;
 }
@@ -863,3 +874,13 @@ width:1160px;
   background-color: #2cb7ca;
   margin: 0 10px;
 }
+#intercept{
+	margin-top: 20px;
+	padding-left: 15px;
+	font-size: 15px;
+}
+#intercept>i{
+	color: #2CB7CA;
+	font-size: 18px;
+	vertical-align: middle;
+}

src/web/staticres/css/dev2/superSearch.css

@@ -23,33 +23,6 @@
 #searchInner{
 	line-height:1;
 }
-.lucene-table tbody>tr>td:nth-child(1) div{
-	width:35px;
-}
-.lucene-table tbody>tr>td:nth-child(2) div{
-	width:303px;
-}
-.lucene-table tbody>tr>td:nth-child(3) div{
-	width:71px;
-}
-.lucene-table tbody>tr>td:nth-child(4) div{
-	width:60px;
-}
-.lucene-table tbody>tr>td:nth-child(5) div{
-	width:168px;
-}
-.lucene-table tbody>tr>td:nth-child(6) div{
-	width:90px;
-}
-.lucene-table tbody>tr>td:nth-child(7) div{
-	width:161px;
-}
-.lucene-table tbody>tr>td:nth-child(8) div{
-	width:63px;
-}
-.lucene-table tbody>tr>td:nth-child(9) div{
-	width:90px;
-}
 .com-highlight{
 	color: #2cb7ca;
 }

src/web/staticres/css/follow.css

@@ -87,6 +87,9 @@
 	line-height: 20px;
 }
 /***********设置页面******/
+.setpage{
+	padding-top: 45px;
+}
 .setpage .disabledMask{
 	position: fixed;
 	background-color: transparent;
@@ -163,9 +166,25 @@
 .setpage .followcancel img{
 	width:96%;
 }
+.setpage #followsure{
+	background-color: #2cb7ca;
+    border-radius: 3px;
+}
+.setpage #followcancel{
+	background-color: #FE737A;
+    border-radius: 3px;
+}
 .setpage .followcancel{
-	padding: 20px 10px;
+	position: absolute;
+    color: #FFFFFF;
+	top: 50%;
+	right: 10px;
+	margin-top: -15px;
+	width: 78px;
+	height: 30px;
+	line-height: 30px;
 	text-align: center;
+	font-weight: normal;
 }
 .setpage .followcancel button{
 	background-color: #FF6666;
@@ -419,9 +438,14 @@
 .setpage .noticehead{
 	background-color: #F8F8F8;	
 	border-bottom: 1px solid #ddd;
-	padding:10px;
+	padding: 10px 95px 10px 10px;
 	line-height: 24px;
 	font-weight: 600;
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	z-index: 1;
 }
 .setpage .noticenew{
     padding: 1px 2px 2px 3px;

src/web/staticres/css/wxsearch.css

@@ -2166,11 +2166,11 @@ body{
 	top: -8px;
 	right: -8px;
 }
-#supersearchPage .jydq-dialog ul>li{
+#supersearchPage .jydq-dialog ul>li,#entsearchPage .jydq-dialog ul>li{
 	padding-left: 18px;
 	position: relative;
 }
-#supersearchPage .jydq-dialog ul>li>span{
+#supersearchPage .jydq-dialog ul>li>span,#entsearchPage .jydq-dialog ul>li>span{
 	position: absolute;
     left: 0px;
 	top: 24px;

src/web/staticres/js/common.js

@@ -173,4 +173,14 @@ function getUrlParam(name){
     if(r != null)
 		return unescape(r[2]); 
 	return null;
+}
+//获取滚动条宽度
+function getScrollWidth() {
+	var noScroll, scroll, oDiv = document.createElement("DIV");
+    oDiv.style.cssText = "position:absolute; top:-1000px; width:100px; height:100px; overflow:hidden;";
+  	noScroll = document.body.appendChild(oDiv).clientWidth;
+  	oDiv.style.overflowY = "scroll";
+  	scroll = oDiv.clientWidth;
+  	document.body.removeChild(oDiv);
+  	return noScroll-scroll;
 }

src/web/staticres/js/proproject.js

@@ -72,7 +72,7 @@ function next(){
 	}else if(currentPage==2){
 		$(".nbprev").removeClass("disabled");
 	}
-	if($("#zbSeatchT [name='searchvalue']").val()==""){
+	if($("#zbSeatchT [name='keywords']").val()==""){
 		getNewBids(currentPage);
 	}else{
 		if($("#right-table").hasClass("active")){
@@ -96,7 +96,7 @@ function prev(){
 	}else if(currentPage<10){
 		$(".nbnext").removeClass("disabled");
 	}
-	if($("#zbSeatchT [name='searchvalue']").val()==""){
+	if($("#zbSeatchT [name='keywords']").val()==""){
 		getNewBids(currentPage);
 	}else{
 		if($("#right-table").hasClass("active")){
@@ -137,7 +137,7 @@ function getNewBids(pnum){
 
 //---取VIP数据---
 function getVIPData(){
-	if($("#zbSeatchT [name='keywords']").val()==""&&$("#zbSeatchT [name='searchvalue']").val()==""){
+	if($("#zbSeatchT [name='keywords']").val()==""&&$("#zbSeatchT [name='keywords']").val()==""){
 		return true;
 	}
 	var tabflag = false;
@@ -145,13 +145,13 @@ function getVIPData(){
 		$(".nbprev").addClass("disabled");
 	}
 	var reqType="bidSearch";
-	if($("#zbSeatchT [name='searchvalue']").val()==""){
+	if($("#zbSeatchT [name='keywords']").val()==""){
 		reqType="lastNews";
 	}
 	var param = {
 				pageNumber: currentPage,
 				reqType: reqType,
-				searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
+				searchvalue: $("#zbSeatchT [name='keywords']").val(),
 				area: $("#zbSeatchT [name='area']").val(),
 				subtype: $("#zbSeatchT [name='subtype']").val(),
 				publishtime: $("#zbSeatchT [name='publishtime']").val(),
@@ -168,6 +168,7 @@ function getVIPData(){
 	   data:param,
        dataType:'json', 
        success:function(r){
+			$(".side-bar-bottom-font").text("“"+$.trim($(".searchname").val()).replace(/\s+/," ")+"”");
 			if(typeof(totalPage) != "undefined" && currentPage == 1){
 				totalPage = r.totalPage;
 			}
@@ -209,7 +210,7 @@ function getNewBiddings(){
 	var param = {
 				pageNumber: currentPage,
 				reqType: "lastNews",
-				searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
+				searchvalue: $("#zbSeatchT [name='keywords']").val(),
 				area: $("#zbSeatchT [name='area']").val(),
 				subtype: $("#zbSeatchT [name='subtype']").val(),
 				publishtime: $("#zbSeatchT [name='publishtime']").val(),
@@ -302,48 +303,48 @@ function appendDatas(datas,isNew){
 		listHtml += '</div></li>';
 		if(datas[i].projectinfo!=undefined){
 			tableHtml +='<tr onclick="noIn(this)" dataid="'+datas[i]._id+'" target="_blank">'
-					+'<td><div>'+index+'</div></td>'
+					+'<td width="48"><div>'+index+'</div></td>'
 			//
 			var proinfo = datas[i].projectinfo;
 			//		
 			if(typeof(proinfo.approvecode) != "undefined" && proinfo.approvecode != null && proinfo.approvecode != ""){
-				tableHtml += '<td class="tt-l"><div>'+proinfo.approvecode+'</div></td>';
+				tableHtml += '<td class="tt-l" width="134"><div>'+proinfo.approvecode+'</div></td>';
 			}else{
-				tableHtml += '<td class="tt-l"><div></div></td>';
+				tableHtml += '<td class="tt-l" width="134"><div></div></td>';
 			}
 			//		
 			if(typeof(datas[i].projectname) != "undefined" && datas[i].projectname != null && datas[i].projectname != ""){
 				datas[i].projectname = keyWordHighlight(datas[i].projectname,searchvalueArray.join("|"),"<font class='com-highlight'>$1</font>");
-				tableHtml += '<td class="tt-l"><div>'+datas[i].projectname+'</div></td>';
+				tableHtml += '<td class="tt-l" width="324"><div>'+datas[i].projectname+'</div></td>';
 			}else{
-				tableHtml += '<td class="tt-l"><div>'+datas[i].title+'</div></td>';
+				tableHtml += '<td class="tt-l" width="324"><div>'+datas[i].title+'</div></td>';
 			}
 					
 			if(typeof(proinfo.approvecontent) != "undefined" && proinfo.approvecontent != null && proinfo.approvecontent != ""){
-				tableHtml += '<td><div>'+proinfo.approvecontent+'</div></td>';
+				tableHtml += '<td width="265"><div>'+proinfo.approvecontent+'</div></td>';
 			}else{
-				tableHtml += '<td><div></div></td>';
+				tableHtml += '<td width="265"><div></div></td>';
 			}	
 			//
 			if(typeof(proinfo.approvestatus) != "undefined" && proinfo.approvestatus != null && proinfo.approvestatus != ""){
-				tableHtml += '<td><div>'+proinfo.approvestatus+'</div></td>';
+				tableHtml += '<td width="155"><div>'+proinfo.approvestatus+'</div></td>';
 			}else{
-				tableHtml += '<td><div></div></td>';
+				tableHtml += '<td width="155"><div></div></td>';
 			}
 			
 			if(typeof(proinfo.approvetime) != "undefined" && proinfo.approvetime != null && proinfo.approvetime != ""){
-				tableHtml += '<td><div>'+proinfo.approvetime.substring(0,16)+'</div></td>';
+				tableHtml += '<td width="115"><div>'+proinfo.approvetime.substring(0,16)+'</div></td>';
 			}else{
-				tableHtml += '<td><div></div></td>';
+				tableHtml += '<td width="115"><div></div></td>';
 			}
 			//
 			if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
 				var diff = formatDate(Number(datas[i].publishtime),"");
 				if(diff != null){
-					tableHtml += '<td><div>'+diff+'</div></td>';
+					tableHtml += '<td width="116"><div>'+diff+'</div></td>';
 				}
 			}else{
-				tableHtml += '<td><div></div></td>';
+				tableHtml += '<td width="116"><div></div></td>';
 			}
 				tableHtml+='</tr>'
 		}
@@ -479,10 +480,10 @@ function beforeSubmit(n){
 		$("#zbSeatchT [name='subtype']").val(selectSubTypes);
 		
 		//搜索关键词
-		var searchname = $("#zbSeatchT input[name='searchvalue']").val();
+		var searchname = $("#zbSeatchT input[name='keywords']").val();
 		//$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname));
 		
-		if($("#zbSeatchT [name='searchvalue']").val()==""){//&&$("#zbSeatchT [name='area']").val()==""&&$("#zbSeatchT [name='publishtime']").val()==""){
+		if($("#zbSeatchT [name='keywords']").val()==""){//&&$("#zbSeatchT [name='area']").val()==""&&$("#zbSeatchT [name='publishtime']").val()==""){
 			getNewBids(currentPage);
 		}else{
 			if(n!="F"){
@@ -518,7 +519,7 @@ function searchOnsubmit(){
 	var param = {
 				pageNumber: currentPage,
 				reqType: "bidSearch",
-				searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
+				searchvalue: $("#zbSeatchT [name='keywords']").val(),
 				area: $("#zbSeatchT [name='area']").val(),
 				subtype: $("#zbSeatchT [name='subtype']").val(),
 				publishtime: $("#zbSeatchT [name='publishtime']").val(),
@@ -528,6 +529,7 @@ function searchOnsubmit(){
 				industry : "",
 			};
 	$.post("/front/pcAjaxReq",param,function(r){
+		$(".side-bar-bottom-font").text("“"+$.trim($(".searchname").val()).replace(/\s+/," ")+"”");
 		if(typeof(totalPage) != "undefined" && currentPage == 1){
 			totalPage = r.totalPage;
 		}

src/web/staticres/js/superSearch.js

@@ -203,7 +203,7 @@ function next(){
 	}else if(currentPage==2){
 		$(".nbprev").removeClass("disabled");
 	}
-	if($("#zbSeatchT [name='searchvalue']").val()==""&&$("#zbSeatchT [name='industry']").val()==""){
+	if($("#zbSeatchT [name='keywords']").val()==""&&$("#zbSeatchT [name='industry']").val()==""){
 		getNewBids(currentPage);
 	}else{
 		if($("#right-table").hasClass("active")){
@@ -227,7 +227,7 @@ function prev(){
 	}else if(currentPage<10){
 		$(".nbnext").removeClass("disabled");
 	}
-	if($("#zbSeatchT [name='searchvalue']").val()==""&&$("#zbSeatchT [name='industry']").val()==""){
+	if($("#zbSeatchT [name='keywords']").val()==""&&$("#zbSeatchT [name='industry']").val()==""){
 		getNewBids(currentPage);
 	}else{
 		
@@ -276,7 +276,7 @@ function getNewBiddings(){
 	var param = {
 				pageNumber: currentPage,
 				reqType: "lastNews",
-				searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
+				searchvalue: $("#zbSeatchT [name='keywords']").val(),
 				area: $("#zbSeatchT [name='area']").val(),
 				subtype: $("#zbSeatchT [name='subtype']").val(),
 				publishtime: $("#zbSeatchT [name='publishtime']").val(),
@@ -403,18 +403,18 @@ function appendDatas(datas,flag,isNew){
 		}
 		listHtml += '</div></li>';
 		tableHtml +='<tr onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank">'
-				+'<td><div>'+index+'</div></td>'
+				+'<td width="48"><div>'+index+'</div></td>'
 		if(typeof(datas[i].projectname) != "undefined" && datas[i].projectname != null && datas[i].projectname != ""){
 			datas[i].projectname = keyWordHighlight(datas[i].projectname,searchvalueArray.join("|"),"<font class='com-highlight'>$1</font>");
-			tableHtml += '<td class="tt-l"><div>'+datas[i].projectname+'</div></td>';
+			tableHtml += '<td class="tt-l" width="315"><div>'+datas[i].projectname+'</div></td>';
 		}else{
-			tableHtml += '<td class="tt-l"><div>'+datas[i].title+'</div></td>';
+			tableHtml += '<td class="tt-l" width="315"><div>'+datas[i].title+'</div></td>';
 		}
 				
 		if(typeof(type) != "undefined" && type != null && type != ""){
-			tableHtml += '<td><div>'+type+'公告</div></td>';
+			tableHtml += '<td width="84"><div>'+type+'公告</div></td>';
 		}else{
-			tableHtml += '<td><div></div></td>';
+			tableHtml += '<td width="84"><div></div></td>';
 		}
 		
 		if(typeof(datas[i].budget) != "undefined" && datas[i].budget != null && datas[i].budget != ""){
@@ -426,25 +426,25 @@ function appendDatas(datas,flag,isNew){
 					budget=budget.toString().substr(0,6)
 				}
 			}
-			tableHtml += '<td class="tt-r"><div>'+budget+'</div></td>';
+			tableHtml += '<td class="tt-r" width="73"><div>'+budget+'</div></td>';
 		}else{
-			tableHtml += '<td class="tt-r"><div></div></td>';
+			tableHtml += '<td class="tt-r" width="73"><div></div></td>';
 		}
 		if(typeof(datas[i].buyer) != "undefined" && datas[i].buyer != null && datas[i].buyer != ""){
-			tableHtml += '<td class="tt-l"><div>'+datas[i].buyer+'</div></td>';
+			tableHtml += '<td class="tt-l" width="181"><div>'+datas[i].buyer+'</div></td>';
 		}else{
-			tableHtml += '<td class="tt-l"><div></div></td>';
+			tableHtml += '<td class="tt-l" width="181"><div></div></td>';
 		}
 		if(typeof(datas[i].bidopentime) != "undefined" && datas[i].bidopentime != null && datas[i].bidopentime != ""){
 			var diff = formatDate(Number(datas[i].bidopentime),"l");
-			tableHtml += '<td><div>'+diff+'</div></td>';
+			tableHtml += '<td width="103"><div>'+diff+'</div></td>';
 		}else{
-			tableHtml += '<td><div></div></td>';
+			tableHtml += '<td width="103"><div></div></td>';
 		}
 		if(typeof(datas[i].winner) != "undefined" && datas[i].winner != null && datas[i].winner != ""){
-			tableHtml += '<td class="tt-l"><div>'+datas[i].winner+'</div></td>';
+			tableHtml += '<td class="tt-l" width="174"><div>'+datas[i].winner+'</div></td>';
 		}else{
-			tableHtml += '<td class="tt-l"><div></div></td>';
+			tableHtml += '<td class="tt-l" width="174"><div></div></td>';
 		}
 		if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
 			var bidamount = parseInt(datas[i].bidamount)/10000;
@@ -455,28 +455,28 @@ function appendDatas(datas,flag,isNew){
 					bidamount=bidamount.toString().substr(0,6);
 				}
 			}
-			tableHtml += '<td class="tt-r"><div>'+bidamount+'</div></td>';
+			tableHtml += '<td class="tt-r" width="76"><div>'+bidamount+'</div></td>';
 		}else{
-			tableHtml += '<td class="tt-r"><div></div></td>';
+			tableHtml += '<td class="tt-r" width="76"><div></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><div>'+diff+'</div></td>';
+				tableHtml += '<td width="103"><div>'+diff+'</div></td>';
 			}
 		}else{
-			tableHtml += '<td><div></div></td>';
+			tableHtml += '<td width="103"><div></div></td>';
 		}
 			tableHtml+='</tr>'
 	}
 	if(!flag||selectType=="title"){
 		$(".tabContainer-2 .lucene ul").html(listHtml);
-		$(".tabContainer-2 .lucene-table table tbody").html(tableHtml);
+		$(".tabContainer-2 .lucene-table>div>table tbody").html(tableHtml);
 	}else{
 		if(selectType=="all"){
 			$(".tabContainer .lucene ul").html(listHtml);
-			$(".tabContainer .lucene-table table tbody").html(tableHtml);
+			$(".tabContainer .lucene-table>div>table tbody").html(tableHtml);
 		}
 	}
 	$(".tabContainer").css("min-height","");
@@ -546,11 +546,11 @@ function getInputTime(){
 //---取VIP数据---
 function getVIPData(){
 	var tlflag = false;
-	if($("#zbSeatchT [name='keywords']").val()==""&&$("#zbSeatchT [name='searchvalue']").val()==""&&$("#zbSeatchT [name='industry']").val()==""){
+	if($("#zbSeatchT [name='keywords']").val()==""&&$("#zbSeatchT [name='keywords']").val()==""&&$("#zbSeatchT [name='industry']").val()==""){
 		return true;
 	}
 	var tabflag = false;
-	if($("#zbSeatchT [name='searchvalue']").val()!=""){
+	if($("#zbSeatchT [name='keywords']").val()!=""){
 		$("#newsclass").show();
 		$("#newsnow").hide(); 
 		tlflag = true;
@@ -563,13 +563,13 @@ function getVIPData(){
 		$(".nbprev").addClass("disabled");
 	}
 	var reqType="bidSearch";
-	if($("#zbSeatchT [name='searchvalue']").val()==""){
+	if($("#zbSeatchT [name='keywords']").val()==""){
 		reqType="lastNews";
 	}
 	var param = {
 				pageNumber: currentPage,
 				reqType: reqType,
-				searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
+				searchvalue: $("#zbSeatchT [name='keywords']").val(),
 				area: $("#zbSeatchT [name='area']").val(),
 				subtype: $("#zbSeatchT [name='subtype']").val(),
 				publishtime: $("#zbSeatchT [name='publishtime']").val(),
@@ -586,9 +586,7 @@ function getVIPData(){
 	   data:param,
        dataType:'json', 
        success:function(r){
-			if(typeof(totalPage) != "undefined" && currentPage == 1){
-				totalPage = r.totalPage;
-			}
+			afterAjaxReq(r);
 			if(r&&r.list!=null&&r.list.length>0){
 				$(".tabContainer").show();
 				$(".pagination").show();
@@ -716,10 +714,10 @@ function beforeSubmit(n){
 			$("#zbSeatchT [name='maxprice']").val("");
 		}
 		//搜索关键词
-		var searchname = $("#zbSeatchT input[name='searchvalue']").val();
+		var searchname = $("#zbSeatchT input[name='keywords']").val();
 		//$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname));
 		
-		if($("#zbSeatchT [name='searchvalue']").val()==""&&$("#zbSeatchT [name='industry']").val()==""){//$("#zbSeatchT [name='area']").val()==""&&$("#zbSeatchT [name='publishtime']").val()==""&&$("#zbSeatchT [name='subtype']").val()==""&&$("#zbSeatchT [name='minprice']").val()==""&&$("#zbSeatchT [name='maxprice']").val()==""){
+		if($("#zbSeatchT [name='keywords']").val()==""&&$("#zbSeatchT [name='industry']").val()==""){//$("#zbSeatchT [name='area']").val()==""&&$("#zbSeatchT [name='publishtime']").val()==""&&$("#zbSeatchT [name='subtype']").val()==""&&$("#zbSeatchT [name='minprice']").val()==""&&$("#zbSeatchT [name='maxprice']").val()==""){
 			getNewBids(currentPage);
 		}else{
 			if(n!="F"){
@@ -757,7 +755,7 @@ function searchOnsubmit(){
 	var param = {
 				pageNumber: currentPage,
 				reqType: "bidSearch",
-				searchvalue: $("#zbSeatchT [name='searchvalue']").val(),
+				searchvalue: $("#zbSeatchT [name='keywords']").val(),
 				area: $("#zbSeatchT [name='area']").val(),
 				subtype: $("#zbSeatchT [name='subtype']").val(),
 				publishtime: $("#zbSeatchT [name='publishtime']").val(),
@@ -767,9 +765,7 @@ function searchOnsubmit(){
 				industry : $("#zbSeatchT [name='industry']").val(),
 			};
 	$.post("/front/pcAjaxReq",param,function(r){
-		if(typeof(totalPage) != "undefined" && currentPage == 1){
-			totalPage = r.totalPage;
-		}
+		afterAjaxReq(r);
 		if(r.list == null || r.list.length == 0){
 			if(currentPage>1){
 				$(".nbnext").addClass("disabled");
@@ -791,4 +787,18 @@ function searchOnsubmit(){
 		}
 	});
 }
-
+function afterAjaxReq(r){
+	if(r.interceptWord != ""){
+		$("#intercept>span").text(r.interceptWord);
+		$("#intercept").removeClass("hidden");
+	}else{
+		$("#intercept").addClass("hidden");
+	}
+	$(".side-bar-bottom-font").text("“"+$.trim($(".searchname").val()).replace(/\s+/," ")+"”");
+	if(typeof(r.searchvalue) != "undefined"){
+		searchvalue = r.searchvalue;
+	}
+	if(typeof(totalPage) != "undefined" && currentPage == 1){
+		totalPage = r.totalPage;
+	}
+}

src/web/staticres/js/wxEntsesearch.js

@@ -276,30 +276,11 @@ var EntSearch = {
 		var dialogObj = $("#entsearchPage .contentone");
 		dialogObj.find(".btn").click(function(){
 			if($(this).parent().index() == 0){
-				dialogObj.find('div[id="dqbtn"]').removeClass("active");
 				dialogObj.find(".btn").removeClass("active");
 			}else{
 				dialogObj.find("ul:first li:first .btn").removeClass("active");
 			};
 			$(this).toggleClass("active");
-			if ($(this).attr("class")!="active"){
-				$(this).prevAll('div[id="dqbtn"]').removeClass("active");
-			};
-			if($(this).parent("li").find(".btn").length == $(this).parent("li").find(".btn.active").length){
-				$(this).prevAll('div[id="dqbtn"]').addClass("active");
-			};
-			if(dialogObj.find(".btn.active").length == 0){
-				dialogObj.find("ul:first li:first .btn").addClass("active");
-			};
-		});
-		dialogObj.find('div[id="dqbtn"]').click(function(){
-			$(this).toggleClass("active");
-			if ($(this).attr("class") != "active"){
-				$(this).nextAll(".btn").removeClass("active");
-			}else{
-				$(this).nextAll(".btn").addClass("active");
-				dialogObj.find("ul:first li:first .btn").removeClass("active");
-			};
 			if(dialogObj.find(".btn.active").length == 0){
 				dialogObj.find("ul:first li:first .btn").addClass("active");
 			};
@@ -397,9 +378,6 @@ var EntSearch = {
                     $("#entsearchPage .contentone").find(".btn").each(function(){
                         if($(this).text() == scopeCache[i]){
                             $(this).addClass("active");
-                            if($(this).parent("li").find(".btn").length == $(this).parent("li").find(".btn.active").length){
-                                $(this).prevAll('div[id="dqbtn"]').addClass("active");
-                            };
                             return false;
                         }
                     });

src/web/templates/common/pcbottom.html

@@ -173,9 +173,6 @@ function stypesearch(stype){
 }
 //
 function zbSeatch(id){
-	var keywords = $("#"+id+" [name='keywords']").val();
-	keywords = keywords.replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+");
-	$("#"+id+" [name='searchvalue']").val(keywords);
 	$("#"+id).submit();
 }
 var backTopRight = (document.body.clientWidth - 17 - 1200) / 2 - 44;

src/web/templates/pc/classifylist.html

@@ -316,7 +316,6 @@ $(function(){
 	//
 	$(".searchname").on("input propertychange",function(){
 		var kw = $("#zbSeatchT [name='keywords']").val();
-    	$("#zbSeatchT [name='searchvalue']").val(kw);
 		if($.trim(kw)!=""){
 			$("#t-clear").show();
 		}else{
@@ -326,7 +325,6 @@ $(function(){
 	$("#t-clear").click(function(){
 		$("#t-clear").hide();
 		$("#searchinput").val("").focus();
-		$("#zbSeatchT [name='searchvalue']").val("");
 	})
 	//设置输入价格的格式
 			var reg = /^[\u4e00-\u9fa5]+$/;
@@ -493,7 +491,6 @@ function priceCss(){
 					<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="搜索" />
-					<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}}">
@@ -595,51 +592,53 @@ function priceCss(){
 				</div>
 				<div class="region-content">
 					<span id="regionBtn" class=" active">全国</span>
-					<i class="diver"></i>
-					<font class="parent-node">华北地区</font>
-					<font>北京</font>
-					<font>天津</font>
-					<font>河北</font>
-					<font>山西</font>
-					<font>内蒙古</font>
-					<i class="diver"></i>
-					<font class="parent-node">东北地区</font>
-					<font>辽宁</font>
-					<font>吉林</font>
-					<font>黑龙江</font>
-					<i class="diver"></i>
-					<font class="parent-node">华东地区</font>
-					<font>上海</font>
-					<font>江苏</font>
-					<font>浙江</font>
+					<i class="diver">A</i>
 					<font>安徽</font>
+					<i class="diver">B</i>
+					<font>北京</font>
+					<i class="diver">C</i>
+					<font>重庆</font>
+					<i class="diver">F</i>
 					<font>福建</font>
-					<font>江西</font>
-					<font>山东</font>
-					<i class="diver"></i>
-					<font class="parent-node">华南地区</font>
+					<i class="diver">G</i>
 					<font>广东</font>
 					<font>广西</font>
+					<font>贵州</font>
+					<font>甘肃</font>
+					<i class="diver">H</i>
+					<font>河北</font>
+					<font>湖北</font>
+					<font>黑龙江</font>
 					<font>海南</font>
-					<i class="diver"></i>
-					<font class="parent-node">华中地区</font>
 					<font>河南</font>
-					<font>湖北</font>
 					<font>湖南</font>
-					<i class="diver"></i>
-					<font class="parent-node">西南地区</font>
-					<font>重庆</font>
+					<i class="diver">J</i>
+					<font>吉林</font>
+					<br>
+					<font>江苏</font>
+					<font>江西</font>
+					<i class="diver">L</i>
+					<font>辽宁</font>
+					<i class="diver">N</i>
+					<font>内蒙古</font>
+					<font>宁夏</font>
+					<i class="diver">Q</i>
+					<font>青海</font>
+					<i class="diver">S</i>
+					<font>山西</font>
+					<font>陕西</font>
+					<font>上海</font>
+					<font>山东</font>
 					<font>四川</font>
-					<font>贵州</font>
-					<font>云南</font>
+					<i class="diver">T</i>
+					<font>天津</font>
+					<i class="diver">X</i>
 					<font>西藏</font>
-					<i class="diver"></i>
-					<font class="parent-node">西北地区</font>
-					<font>陕西</font>
-					<font>甘肃</font>
-					<font>青海</font>
-					<font>宁夏</font>
 					<font>新疆</font>
+					<i class="diver">Y</i>
+					<font>云南</font>
+					<i class="diver">Z</i>
+					<font>浙江</font>
 				</div>
 			</div>
 			<!--信息类型-->
@@ -671,6 +670,7 @@ function priceCss(){
 					<font data-value="中标">中标</font>
 					<font data-value="成交">成交</font>
 					<font data-value="废标">废标</font>
+					<br>
 					<font data-value="流标">流标</font>
 					<i class="diver"></i>
 					<font class="parent-node">招标信用信息</font>
@@ -713,21 +713,25 @@ function priceCss(){
 					<table>
 						<thead>
 							<tr>
-								<td width="47">序号</td>
-								<td width="320">项目名称</td>
-								<td width="83">公告类型</td>
-								<td width="65">预算<br>（万元）</td>
-								<td width="180">招标单位</td>
-								<td width="100">开标日期</td>
-								<td width="180">中标单位</td>
-								<td>中标金额<br>（万元）</td>
-								<td width="100">发布日期</td>
+								<td width="48">序号</td>
+								<td width="315">项目名称</td>
+								<td width="84">公告类型</td>
+								<td width="73">预算<br>（万元）</td>
+								<td width="181">招标单位</td>
+								<td width="103">开标日期</td>
+								<td width="174">中标单位</td>
+								<td width="76">中标金额<br>（万元）</td>
+								<td width="103">发布日期</td>
 							</tr>
 						</thead>
-						<tbody>
-							
-						</tbody>
 					</table>
+					<div>
+						<table>
+							<tbody>
+								
+							</tbody>
+						</table>
+					</div>
 				</div>
 			</div>
 			<div class="hasNoData" style="display: none;">
@@ -1044,18 +1048,18 @@ function appendDatas(datas){
 			}
 		}
 		tableHtml +='<tr onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank">'
-				+'<td><div>'+index+'</div></td>'
+				+'<td width="48"><div>'+index+'</div></td>'
 				
 		if(typeof(datas[i].projectname) != "undefined" && datas[i].projectname != null && datas[i].projectname != ""){
-			tableHtml += '<td class="tt-l"><div>'+datas[i].projectname+'</div></td>';
+			tableHtml += '<td class="tt-l" width="315"><div>'+datas[i].projectname+'</div></td>';
 		}else{
-			tableHtml += '<td class="tt-l"><div>'+datas[i].title+'</div></td>';
+			tableHtml += '<td class="tt-l" width="315"><div>'+datas[i].title+'</div></td>';
 		}
 				
 		if(typeof(type) != "undefined" && type != null && type != ""){
-			tableHtml += '<td><div>'+type+'公告</div></td>';
+			tableHtml += '<td width="84"><div>'+type+'公告</div></td>';
 		}else{
-			tableHtml += '<td><div></div></td>';
+			tableHtml += '<td width="84"><div></div></td>';
 		}
 		
 		if(typeof(datas[i].budget) != "undefined" && datas[i].budget != null && datas[i].budget != ""){
@@ -1067,25 +1071,25 @@ function appendDatas(datas){
 					budget=budget.toString().substr(0,6)
 				}
 			}
-			tableHtml += '<td class="tt-r"><div>'+budget+'</div></td>';
+			tableHtml += '<td class="tt-r" width="73"><div>'+budget+'</div></td>';
 		}else{
-			tableHtml += '<td class="tt-r"><div></div></td>';
+			tableHtml += '<td class="tt-r" width="73"><div></div></td>';
 		}
 		if(typeof(datas[i].buyer) != "undefined" && datas[i].buyer != null && datas[i].buyer != ""){
-			tableHtml += '<td class="tt-l"><div>'+datas[i].buyer+'</div></td>';
+			tableHtml += '<td class="tt-l" width="181"><div>'+datas[i].buyer+'</div></td>';
 		}else{
-			tableHtml += '<td class="tt-l"><div></div></td>';
+			tableHtml += '<td class="tt-l" width="181"><div></div></td>';
 		}
 		if(typeof(datas[i].bidopentime) != "undefined" && datas[i].bidopentime != null && datas[i].bidopentime != ""){
 			var diff = formatDate(Number(datas[i].bidopentime),"l");
-			tableHtml += '<td><div>'+diff+'</div></td>';
+			tableHtml += '<td width="103"><div>'+diff+'</div></td>';
 		}else{
-			tableHtml += '<td><div></div></td>';
+			tableHtml += '<td width="103"><div></div></td>';
 		}
 		if(typeof(datas[i].winner) != "undefined" && datas[i].winner != null && datas[i].winner != ""){
-			tableHtml += '<td class="tt-l"><div>'+datas[i].winner+'</div></td>';
+			tableHtml += '<td class="tt-l" width="174"><div>'+datas[i].winner+'</div></td>';
 		}else{
-			tableHtml += '<td class="tt-l"><div></div></td>';
+			tableHtml += '<td class="tt-l" width="174"><div></div></td>';
 		}
 		if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
 			var bidamount = parseInt(datas[i].bidamount)/10000;
@@ -1096,18 +1100,18 @@ function appendDatas(datas){
 					bidamount=bidamount.toString().substr(0,6);
 				}
 			}
-			tableHtml += '<td class="tt-r"><div>'+bidamount+'</div></td>';
+			tableHtml += '<td class="tt-r" width="76"><div>'+bidamount+'</div></td>';
 		}else{
-			tableHtml += '<td class="tt-r"><div></div></td>';
+			tableHtml += '<td class="tt-r" width="76"><div></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><div>'+diff+'</div></td>';
+				tableHtml += '<td width="103"><div>'+diff+'</div></td>';
 			}
 		}else{
-			tableHtml += '<td><div></div></td>';
+			tableHtml += '<td width="103"><div></div></td>';
 		}
 			tableHtml+='</tr>'
 	}

src/web/templates/pc/proproject.html

@@ -206,51 +206,6 @@
   		  -o-transform: scale(1.2);
      	     transform: scale(1.2);
 }
-.lucene-table tbody>tr>td:nth-child(2) div{
-	width: 120px;
-}
-.lucene-table tbody>tr>td:nth-child(2){
-	width: 120px;
-	text-align: center !important;
-}
-.lucene-table tbody>tr>td:nth-child(1){
-	width: 35px;
-	text-align: center !important;
-}
-.lucene-table tbody>tr>td:nth-child(3) div{
-	width: 308px;
-}
-.lucene-table tbody>tr>td:nth-child(3){
-	width: 308px;
-}
-.lucene-table tbody>tr>td:nth-child(4) div{
-	width: 250px;
-}
-.lucene-table tbody>tr>td:nth-child(4){
-	width: 250px;
-	text-align:left !important;
-}
-.lucene-table tbody>tr>td:nth-child(5) div{
-	width: 140px;
-	white-space: normal;
-    word-break: break-all;
-}
-.lucene-table tbody>tr>td:nth-child(5){
-	width: 140px;
-	text-align: left !important;
-}
-.lucene-table tbody>tr>td:nth-child(6) div{
-	width: 101px;
-}
-.lucene-table tbody>tr>td:nth-child(6){
-	width: 101px;
-}
-.lucene-table tbody>tr>td:nth-child(7) div{
-	width: 101px;
-}
-.lucene-table tbody>tr>td:nth-child(7){
-	width: 101px;
-}
 #searchInner .searchControl .searchTender .region{
 	border-bottom:0px !important;
 }
@@ -417,7 +372,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="button" value="搜索"  onclick="zbSeatch('zbSeatchT')" />
-					<input type="hidden" name="searchvalue" value="{{.T.searchvalue}}">
 					<input type="hidden" name="publishtime" value="{{.T.publishtime}}">
 					<input type="hidden" name="timeslot" value="{{.T.timeslot}}">
 					<input type="hidden" name="area" value="{{.T.area}}">
@@ -479,51 +433,53 @@ $(function(){
 				</div>
 				<div class="region-content">
 					<span id="regionBtn" class=" active">全国</span>
-					<i class="diver"></i>
-					<font class="parent-node">华北地区</font>
-					<font>北京</font>
-					<font>天津</font>
-					<font>河北</font>
-					<font>山西</font>
-					<font>内蒙古</font>
-					<i class="diver"></i>
-					<font class="parent-node">东北地区</font>
-					<font>辽宁</font>
-					<font>吉林</font>
-					<font>黑龙江</font>
-					<i class="diver"></i>
-					<font class="parent-node">华东地区</font>
-					<font>上海</font>
-					<font>江苏</font>
-					<font>浙江</font>
+					<i class="diver">A</i>
 					<font>安徽</font>
+					<i class="diver">B</i>
+					<font>北京</font>
+					<i class="diver">C</i>
+					<font>重庆</font>
+					<i class="diver">F</i>
 					<font>福建</font>
-					<font>江西</font>
-					<font>山东</font>
-					<i class="diver"></i>
-					<font class="parent-node">华南地区</font>
+					<i class="diver">G</i>
 					<font>广东</font>
 					<font>广西</font>
+					<font>贵州</font>
+					<font>甘肃</font>
+					<i class="diver">H</i>
+					<font>河北</font>
+					<font>湖北</font>
+					<font>黑龙江</font>
 					<font>海南</font>
-					<i class="diver"></i>
-					<font class="parent-node">华中地区</font>
 					<font>河南</font>
-					<font>湖北</font>
 					<font>湖南</font>
-					<i class="diver"></i>
-					<font class="parent-node">西南地区</font>
-					<font>重庆</font>
+					<i class="diver">J</i>
+					<font>吉林</font>
+					<br>
+					<font>江苏</font>
+					<font>江西</font>
+					<i class="diver">L</i>
+					<font>辽宁</font>
+					<i class="diver">N</i>
+					<font>内蒙古</font>
+					<font>宁夏</font>
+					<i class="diver">Q</i>
+					<font>青海</font>
+					<i class="diver">S</i>
+					<font>山西</font>
+					<font>陕西</font>
+					<font>上海</font>
+					<font>山东</font>
 					<font>四川</font>
-					<font>贵州</font>
-					<font>云南</font>
+					<i class="diver">T</i>
+					<font>天津</font>
+					<i class="diver">X</i>
 					<font>西藏</font>
-					<i class="diver"></i>
-					<font class="parent-node">西北地区</font>
-					<font>陕西</font>
-					<font>甘肃</font>
-					<font>青海</font>
-					<font>宁夏</font>
 					<font>新疆</font>
+					<i class="diver">Y</i>
+					<font>云南</font>
+					<i class="diver">Z</i>
+					<font>浙江</font>
 				</div>
 			</div>
 		</div>
@@ -554,19 +510,23 @@ $(function(){
 					<table>
 						<thead>
 							<tr>
-								<td>序号</td>
-								<td>项目代码</td>
-								<td>项目名称</td>
-								<td>审批事项</td>
-								<td>审批结果</td>
-								<td>审批时间</td>
-								<td>发布时间</td>
+								<td width="48">序号</td>
+								<td width="134">项目代码</td>
+								<td width="324">项目名称</td>
+								<td width="265">审批事项</td>
+								<td width="155">审批结果</td>
+								<td width="115">审批时间</td>
+								<td width="116">发布时间</td>
 							</tr>
 						</thead>
-						<tbody>
-							
-						</tbody>
 					</table>
+					<div>
+						<table>
+							<tbody>
+								
+							</tbody>
+						</table>
+					</div>
 				</div>
 			</div>
 			<div class="hasNoData" style="display: none;">

src/web/templates/pc/supsearch.html

@@ -251,7 +251,6 @@ var sortArray = {{.T.sortArray}}
 var list = {{.T.list}}
 var totalPage = {{.T.totalPage}};
 var searchvalue = {{.T.searchvalue}};
-var searchvalueArray = searchvalue.split("+");
 var dataId = "";
 $(function(){
 	$(document).keydown(function(e){
@@ -268,18 +267,14 @@ $(function(){
 	};
 	$("#zbSeatchT [name='selectType']").val(selectType);
 	//
-	$("#zbSeatchT [name='keywords']").val($.trim(keys));
-	$("#zbSeatchT [name='searchvalue']").val($.trim(searchvalue));
 	$("#searchinput").focus();
-	if($.trim(searchvalue)!=""){
+	if(searchvalue!=""){
 		$(".wx-inner-bottom").html('');
 		$("#t-clear").show();
-		searchvalue = $.trim(searchvalue);
-		searchvalueArray = searchvalue.split("+");
 		$("#newsclass").show();
 		$("#newsnow").hide();
 		nbflag = true;
-		$(".wx-inner-bottom").html('微信扫一扫，及时获取<span class="side-bar-bottom-font">“'+searchvalue+'”</span>相关招标信息');
+		$(".wx-inner-bottom").html('微信扫一扫，及时获取<span class="side-bar-bottom-font">“'+keys+'”</span>相关招标信息');
 		$(".wx-inner-title").html('扫码订阅关键词');
 		if(list == null || list.length == 0){
 			$(".tabContainer").hide();
@@ -576,7 +571,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="button" value="搜索" onclick="zbSeatch('zbSeatchT')"/>
-					<input type="hidden" name="searchvalue" value="{{.T.searchvalue}}">
 					<input type="hidden" name="publishtime" value="{{.T.publishtime}}">
 					<input type="hidden" name="timeslot" value="{{.T.timeslot}}">
 					<input type="hidden" name="area" value="{{.T.area}}">
@@ -678,51 +672,53 @@ $(function(){
 				</div>
 				<div class="region-content">
 					<span id="regionBtn" class=" active">全国</span>
-					<i class="diver"></i>
-					<font class="parent-node">华北地区</font>
-					<font>北京</font>
-					<font>天津</font>
-					<font>河北</font>
-					<font>山西</font>
-					<font>内蒙古</font>
-					<i class="diver"></i>
-					<font class="parent-node">东北地区</font>
-					<font>辽宁</font>
-					<font>吉林</font>
-					<font>黑龙江</font>
-					<i class="diver"></i>
-					<font class="parent-node">华东地区</font>
-					<font>上海</font>
-					<font>江苏</font>
-					<font>浙江</font>
+					<i class="diver">A</i>
 					<font>安徽</font>
+					<i class="diver">B</i>
+					<font>北京</font>
+					<i class="diver">C</i>
+					<font>重庆</font>
+					<i class="diver">F</i>
 					<font>福建</font>
-					<font>江西</font>
-					<font>山东</font>
-					<i class="diver"></i>
-					<font class="parent-node">华南地区</font>
+					<i class="diver">G</i>
 					<font>广东</font>
 					<font>广西</font>
+					<font>贵州</font>
+					<font>甘肃</font>
+					<i class="diver">H</i>
+					<font>河北</font>
+					<font>湖北</font>
+					<font>黑龙江</font>
 					<font>海南</font>
-					<i class="diver"></i>
-					<font class="parent-node">华中地区</font>
 					<font>河南</font>
-					<font>湖北</font>
 					<font>湖南</font>
-					<i class="diver"></i>
-					<font class="parent-node">西南地区</font>
-					<font>重庆</font>
+					<i class="diver">J</i>
+					<font>吉林</font>
+					<br>
+					<font>江苏</font>
+					<font>江西</font>
+					<i class="diver">L</i>
+					<font>辽宁</font>
+					<i class="diver">N</i>
+					<font>内蒙古</font>
+					<font>宁夏</font>
+					<i class="diver">Q</i>
+					<font>青海</font>
+					<i class="diver">S</i>
+					<font>山西</font>
+					<font>陕西</font>
+					<font>上海</font>
+					<font>山东</font>
 					<font>四川</font>
-					<font>贵州</font>
-					<font>云南</font>
+					<i class="diver">T</i>
+					<font>天津</font>
+					<i class="diver">X</i>
 					<font>西藏</font>
-					<i class="diver"></i>
-					<font class="parent-node">西北地区</font>
-					<font>陕西</font>
-					<font>甘肃</font>
-					<font>青海</font>
-					<font>宁夏</font>
 					<font>新疆</font>
+					<i class="diver">Y</i>
+					<font>云南</font>
+					<i class="diver">Z</i>
+					<font>浙江</font>
 				</div>
 			</div>
 			<!--信息类型-->
@@ -754,6 +750,7 @@ $(function(){
 					<font data-value="中标">中标</font>
 					<font data-value="成交">成交</font>
 					<font data-value="废标">废标</font>
+					<br>
 					<font data-value="流标">流标</font>
 					<i class="diver"></i>
 					<font class="parent-node">招标信用信息</font>
@@ -769,6 +766,7 @@ $(function(){
 				</span>
 			</div>
 		</div>
+		<div id="intercept" class="hidden w"><i class="bootstrap-glyphicon glyphicon-info-sign"></i>“<span></span>”及其后面的字词均被忽略，因为剑鱼的查询限制在20个汉字以内。</div>
 		<!--招标搜索列表内容-->
 		<div class="seaTender-inner w">
 			<!--招标tab切换-->
@@ -804,21 +802,25 @@ $(function(){
 					<table>
 						<thead>
 							<tr>
-								<td width="47">序号</td>
-								<td width="320">项目名称</td>
-								<td width="83">公告类型</td>
-								<td width="65">预算<br>（万元）</td>
-								<td width="180">招标单位</td>
-								<td width="100">开标时间</td>
-								<td width="180">中标单位</td>
-								<td>中标金额<br>（万元）</td>
-								<td width="100">发布时间</td>
+								<td width="48">序号</td>
+								<td width="315">项目名称</td>
+								<td width="84">公告类型</td>
+								<td width="73">预算<br>（万元）</td>
+								<td width="181">招标单位</td>
+								<td width="103">开标日期</td>
+								<td width="174">中标单位</td>
+								<td width="76">中标金额<br>（万元）</td>
+								<td width="103">发布日期</td>
 							</tr>
 						</thead>
-						<tbody>
-							
-						</tbody>
 					</table>
+					<div>
+						<table>
+							<tbody>
+								
+							</tbody>
+						</table>
+					</div>
 				</div>
 			</div>
 			<!--tab切换内容-->
@@ -834,21 +836,28 @@ $(function(){
 					<table>
 						<thead>
 							<tr>
-								<td width="47">序号</td>
-								<td width="320">项目名称</td>
-								<td width="83">公告类型</td>
-								<td width="65">预算<br>（万元）</td>
-								<td width="180">招标单位</td>
-								<td width="100">开标日期</td>
-								<td width="180">中标单位</td>
-								<td>中标金额<br>（万元）</td>
-								<td width="100">发布日期</td>
+								<td width="48">序号</td>
+								<td width="315">项目名称</td>
+								<td width="84">公告类型</td>
+								<td width="73">预算<br>（万元）</td>
+								<td width="181">招标单位</td>
+								<td width="103">开标日期</td>
+								<td width="174">中标单位</td>
+								<td width="76">中标金额<br>（万元）</td>
+								<td width="103">发布日期</td>
 							</tr>
 						</thead>
 						<tbody>
 							
 						</tbody>
 					</table>
+					<div>
+						<table>
+							<tbody>
+								
+							</tbody>
+						</table>
+					</div>
 				</div>
 			</div>
 			<div class="hasNoData" style="display: none;">

src/web/templates/weixin/follow/set.html

@@ -49,6 +49,7 @@ $(function(){
 			window.location.reload(true);
 		}
     });
+	$(".setpage").css("padding-top",$(".noticehead").outerHeight());
 	if(sid !=""){
 		noticeid = sid
 	}else{
@@ -57,7 +58,7 @@ $(function(){
 	if (_id != ""){
 		$.post("/follow/checkFPStatus",{s_id:_id},function(fd){
 			if (fd&&fd.flag=="f"){
-				$(".followcancel").html('<button class="btn" id="followcancel">已取消项目关注</button>');	 
+				$(".followcancel").html('<div id="followcancel">已取消</div>');	 
 				var disabledMask=$(".disabledMask")
 				if(disabledMask.size()==0){
 					$(".setpage").append('<div class="disabledMask"></div>')
@@ -616,6 +617,17 @@ function myRedirect(zbadd,link,sid){
 		{{else}}
 			{{.T.projectcode}}
 		{{end}}
+		{{if .T.flag}}
+			<div class="followcancel">
+				<div id="followcancel">取消关注</div>
+			</div>
+		{{end}}
+		{{if .T.fg}}
+			<div class="followcancel">
+				<div id="followsure">关注</div>
+				<div id="followcancel" class="hidden">取消关注</div>
+			</div>
+		{{end}}
 	</div>
 	<ul>
 		<!--<li>{{.T.projectname}}</li>-->
@@ -643,17 +655,6 @@ function myRedirect(zbadd,link,sid){
 		<li class="jynotice">
 		</li>
 	</ul>
-	{{if .T.flag}}
-	<div class="followcancel">
-		<img  id="followcancel" src="/images/wx/jyclfp.png"/>
-	</div>
-	{{end}}
-	{{if .T.fg}}
-	<div class="followcancel">
-	<img  id="followsure" src="/images/wx/jynoticefw.png"/>
-	<img  id="followcancel" class="hidden" src="/images/wx/jyclfp.png"/>
-	</div>
-	{{end}}
 	<div class="easypopup" id="easypopup">
 		<div class="easypopup-main">
 			<div class="easypopup-header">提示信息</div>

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

@@ -381,57 +381,81 @@
 								<button class="btn active">全国</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">华北地区</div>
+								<span>A</span>
+								<button class="btn">安徽</button>
+							</li>
+							<li>
+								<span>B</span>
 								<button class="btn">北京</button>
-								<button class="btn">天津</button>
-								<button class="btn">河北</button>
-								<button class="btn">山西</button>
-								<button class="btn">内蒙古</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">东北地区</div>
-								<button class="btn">辽宁</button>
-								<button class="btn">吉林</button>
-								<button class="btn">黑龙江</button>
+								<span>C</span>
+								<button class="btn">重庆</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">华东地区</div>
-								<button class="btn">上海</button>
-								<button class="btn">江苏</button>
-								<button class="btn">浙江</button>
-								<button class="btn">安徽</button>
+								<span>F</span>
 								<button class="btn">福建</button>
-								<button class="btn">江西</button>
-								<button class="btn">山东</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">华南地区</div>
+								<span>G</span>
 								<button class="btn">广东</button>
 								<button class="btn">广西</button>
-								<button class="btn">海南</button>
+								<button class="btn">贵州</button>
+								<button class="btn">甘肃</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">华中地区</div>
-								<button class="btn">河南</button>
+								<span>H</span>
+								<button class="btn">河北</button>
 								<button class="btn">湖北</button>
+								<button class="btn">黑龙江</button>
+								<button class="btn">海南</button>
+								<button class="btn">河南</button>
 								<button class="btn">湖南</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">西南地区</div>
-								<button class="btn">重庆</button>
-								<button class="btn">四川</button>
-								<button class="btn">贵州</button>
-								<button class="btn">云南</button>
-								<button class="btn">西藏</button>
+								<span>J</span>
+								<button class="btn">吉林</button>
+								<button class="btn">江苏</button>
+								<button class="btn">江西</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">西北地区</div>
-								<button class="btn">陕西</button>
-								<button class="btn">甘肃</button>
-								<button class="btn">青海</button>
+								<span>L</span>
+								<button class="btn">辽宁</button>
+							</li>
+							<li>
+								<span>N</span>
+								<button class="btn">内蒙古</button>
 								<button class="btn">宁夏</button>
+							</li>
+							<li>
+								<span>Q</span>
+								<button class="btn">青海</button>
+							</li>
+							<li>
+								<span>S</span>
+								<button class="btn">山西</button>
+								<button class="btn">陕西</button>
+								<button class="btn">上海</button>
+								<button class="btn">山东</button>
+								<button class="btn">四川</button>
+							</li>
+							<li>
+								<span>T</span>
+								<button class="btn">天津</button>
+							</li>
+							<li>
+								<span>X</span>
+								<button class="btn">西藏</button>
 								<button class="btn">新疆</button>
 							</li>
+							<li>
+								<span>Y</span>
+								<button class="btn">云南</button>
+							</li>
+							<li>
+								<span>Z</span>
+								<button class="btn">浙江</button>
+							</li>
 						</ul>
 					</div>
 				</div>