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

src/jfw/front/search.go

@@ -15,7 +15,6 @@ type Search struct {
 	/********************剑鱼搜索dev2.0**************************/
 	mainSearch  xweb.Mapper `xweb:"/jylab/mainSearch"`				//剑鱼搜索主页面
 	superSearch xweb.Mapper `xweb:"/jylab/superSearch"`				//超级搜索
-	getSearchData xweb.Mapper `xweb:"/jylab/getSearchData"`                       //获取数据action
 }
 
 func init() {
@@ -78,10 +77,7 @@ func (m *Search) SuperSearch() error{
 	m.T["pageSize"] = wx_pageSize
 	m.T["keywords"] = keywords
 	m.T["searchvalue"] = searchvalue
-	m.T["toptype"] = toptype
-	m.T["subtype"] = subtype
-	m.T["scope"] = scope
-	m.T["publishtime"] = publishtime
+
 	//搜索列表增加分享
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
 	myopenid, _ := m.Session().Get("s_m_openid").(string)
@@ -92,49 +88,56 @@ func (m *Search) SuperSearch() error{
 	m.T["avatar"] = myavatar
 	return  m.Render("/weixin/search/superSearch.html", &m.T)
 }
-func (m *Search) GetSearchData() error{
+
+/*
+func (m *Front) Wxsearch() error {
 	defer util.Catch()
-	keywords := m.GetString("searchname")
-	searchvalue := m.GetString("searchvalue")
-	toptype := m.GetString("toptype")
-	subtype := m.GetString("subtype")
-	money :=m.GetString("money")
-	industry := m.GetString("industry")
-	scope := m.GetString("scope")
-	publishtime := m.GetString("publishtime")
-	fmt.Println("keywords:",keywords,"searchvalue:",searchvalue,"toptype:",toptype,"subtype",subtype,"scope",scope,"publishtime",publishtime)
-	fmt.Println("money---->>",money,"   industry----->>",industry)
-	selectType := m.GetString("selectType")
-	var list *[]map[string]interface{}
-	if userid := m.GetSession("userId"); userid != nil {
-		if len(keywords) > 0 {
-			if selectType == "" { //默认设置为全文搜索
-				selectType = "all"
-			}
-			list = getWxsearchlistData(keywords, searchvalue, scope, publishtime, subtype,industry, 1, selectType)
-			fmt.Println("list",list)
-			r := redis.GetStr("other", "s_"+userid.(string))
-			arrs := strings.Split(r, ",")
-			if r == "" {
-				arrs = make([]string, 0)
-			}
-			var historyFlag = 0
-			for _, v := range arrs {
-				if v == strings.Trim(keywords, " ") {
-					historyFlag = 1
-					break
-				}
-			}
-			if historyFlag != 1 {
-				arrs = append(arrs, keywords)
-				if len(arrs) > 5 {
-					arrs = arrs[1:6]
-				}
-				redis.Del("other", "s_"+userid.(string))
-				redis.Put("other", "s_"+userid.(string), strings.Join(arrs, ","), -1)
+	shname := m.GetSession("shname")
+	toptype := m.GetSession("toptype")
+	subtype := m.GetSession("subtype")
+	scope := m.GetSession("scope")
+	publishtime := m.GetSession("publishtime")
+	industry := m.GetSession("industry")
+	if shname != "" && shname != nil {
+		m.T["shname"] = shname
+	}
+	m.T["toptype"] = toptype
+	m.T["subtype"] = subtype
+	m.T["scope"] = scope
+	m.T["publishtime"] = publishtime
+	m.T["industry"] = industry
+	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
+	mynickname, _ := m.Session().Get("s_nickname").(string)
+	myavatar, _ := m.Session().Get("s_avatar").(string)
+	m.T["nickname"] = mynickname
+	m.T["avatar"] = myavatar
+	myopenid, _ := m.Session().Get("s_m_openid").(string)
+	m.T["openid"] = se.EncodeString(myopenid)
+	if userId := m.GetSession("userId"); userId != nil {
+		one, _ := mongodb.FindOneByField("user", bson.M{"_id": bson.ObjectIdHex(userId.(string))}, `{"o_jy":1}`)
+		history := redis.GetStr("other", "s_"+userId.(string))
+		arrs := strings.Split(history, ",")
+		if history == "" {
+			arrs = make([]string, 0)
+		}
+		l := len(arrs) - 1
+		for i := 0; i < len(arrs)/2; i++ {
+			tmp := arrs[l-i]
+			arrs[l-i] = arrs[i]
+			arrs[i] = tmp
+		}
+		m.T["history"] = arrs
+		if one != nil && len(*one) > 0 {
+			o_jy, _ := (*one)["o_jy"].(map[string]interface{})
+			a_key, _ := o_jy["a_key"].([]interface{})
+			var keys []interface{}
+			for _, v := range a_key {
+				keyMap, _ := v.(map[string]interface{})
+				key, _ := keyMap["key"].([]interface{})
+				keys = append(keys, key)
 			}
+			m.T["msgset"] = keys
 		}
 	}
-	m.ServeJson(list)
-	return nil
-}
+	return m.Render("/weixin/wxsearch.html", &m.T)
+}*/

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)
+	}
+}

src/jfw/front/swordfish.go

@@ -4,8 +4,12 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"github.com/go-xweb/xweb"
+	. "github.com/thinxer/go-word2vec"
+	"gopkg.in/mgo.v2/bson"
 	"html/template"
 	"jfw/config"
+	"jfw/jyutil"
 	"jfw/tools"
 	"jfw/wx"
 	"log"
@@ -18,10 +22,6 @@ import (
 	"strings"
 	"sync"
 	"time"
-
-	"github.com/go-xweb/xweb"
-	. "github.com/thinxer/go-word2vec"
-	"gopkg.in/mgo.v2/bson"
 )
 
 const (
@@ -29,7 +29,7 @@ const (
 	bidSearch_maxPageSize = 10 //招标搜索分页--最大页数
 	wx_maxPageNum         = 20
 	wx_pageSize           = 50
-	bidSearch_field_1     = `"_id","title","publishtime","toptype","subtype","type","area","href","bidopentime","winner","agency","bidamount","budget","biddingcontent"`
+	bidSearch_field_1     = `"_id","title","publishtime","toptype","subtype","type","area","href","bidopentime","winner","agency","bidamount","budget","biddingcontent","projectname"`
 	bidSearch_field       = bidSearch_field_1 + `,"detail"`
 	bidSearch_sort        = `{"publishtime":-1}`
 )
@@ -140,7 +140,7 @@ func (m *Front) NewSordfish() error {
 			m.DisableHttpCache()
 			lastBids := elastic.GetPage("bidding", "bidding", "{}", bidSearch_sort, `"_id","title","publishtime","toptype","subtype","type","area","href","biddingcontent"`, 0, 18)
 			if lastBids != nil && len(*lastBids) > 0 {
-				bidListConvert("", lastBids)
+				jyutil.BidListConvert("", lastBids)
 				lbnHtml, olHtml := structureLastBidsHtml(lastBids)
 				m.T["lbnHtml"] = lbnHtml
 				m.T["olHtml"] = olHtml
@@ -422,7 +422,7 @@ func (m *Front) PcAjaxReq() {
 	//获取最新招标信息
 	if reqType == "lastBids" {
 		ls := elastic.GetPage(INDEX, TYPE, "{}", bidSearch_sort, bidSearch_field_1, 0, 18)
-		bidListConvert("", ls)
+		jyutil.BidListConvert("", ls)
 		m.ServeJson(map[string]interface{}{
 			"list": ls,
 		})
@@ -508,7 +508,7 @@ func getBidSearchData(searchvalue, area, publishtime, subtype, industry string,
 			repl = elastic.GetByNgram(INDEX, TYPE, searchvalue, query, `"title"` /*FINDF*/, bidSearch_sort, bidSearch_field, start, bidSearch_pageSize)
 		}
 		if repl != nil && *repl != nil && len(*repl) > 0 {
-			bidListConvert(industry, repl)
+			jyutil.BidListConvert(industry, repl)
 			list = repl
 		}
 	}
@@ -533,7 +533,7 @@ func getLastNewsData(searchvalue, area, publishtime, subtype, industry string, s
 		}
 		repl := elastic.GetByNgramOther(INDEX, TYPE, searchvalue, query, `"title","detail"` /*FINDF*/, bidSearch_sort, bidSearch_field, start, bidSearch_pageSize, true, false, 115)
 		if repl != nil && *repl != nil && len(*repl) > 0 {
-			bidListConvert(industry, repl)
+			jyutil.BidListConvert(industry, repl)
 			list = repl
 		}
 	}
@@ -846,9 +846,41 @@ func (m *Front) WxsearchlistPaging() {
 		industry := m.GetString("industry")
 		list = getWxsearchlistData(keywords, searchvalue, scope, publishtime, subtype, industry, pageNum, selectType)
 	}
+	//历史记录和订阅查询
+	if userId := m.GetSession("userId"); userId != nil {
+		one, _ := mongodb.FindOneByField("user", bson.M{"_id": bson.ObjectIdHex(userId.(string))}, `{"o_jy":1}`)
+		history := redis.GetStr("other", "s_"+userId.(string))
+		arrs := strings.Split(history, ",")
+		if history == "" {
+			arrs = make([]string, 0)
+		}
+		l := len(arrs) - 1
+		for i := 0; i < len(arrs)/2; i++ {
+			tmp := arrs[l-i]
+			arrs[l-i] = arrs[i]
+			arrs[i] = tmp
+		}
+		m.T["history"] = arrs
+		if one != nil && len(*one) > 0 {
+			o_jy, _ := (*one)["o_jy"].(map[string]interface{})
+			a_key, _ := o_jy["a_key"].([]interface{})
+			var keys []interface{}
+			for _, v := range a_key {
+				keyMap, _ := v.(map[string]interface{})
+				key, _ := keyMap["key"].([]interface{})
+				keys = append(keys, key)
+			}
+			m.T["msgset"] = keys
+		}
+	}
+
+
+
 	m.ServeJson(map[string]interface{}{
 		"list":        list,
 		"hasNextPage": list != nil && len(*list) == wx_pageSize && pageNum < wx_maxPageNum,
+		"history":   m.T["history"],
+		"msgset": m.T["msgset"],
 	})
 }
 
@@ -878,7 +910,7 @@ func getWxsearchlistData(keywords, searchvalue, scope, publishtime, subtype, ind
 		}
 
 		if list != nil {
-			bidListConvert("", list)
+			jyutil.BidListConvert("", list)
 			for _, v := range *list {
 				v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
 			}
@@ -2126,53 +2158,3 @@ func (m *Front) Subscribe() error {
 	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
 	return m.Render("/pc/subscribe.html", &m.T)
 }
-
-/*
- * 结果列表转换，目前只换行行业字段
- * 所有的招标搜索都要调用此方法，列表中有展示行业的也可以用
- * industry 搜索条件中的行业，默认为空
- */
-func bidListConvert(industry string, list *[]map[string]interface{}) {
-	if list == nil {
-		return
-	}
-	commonSubstring := func(v string) (value string) {
-		bcs := strings.Split(v, "_")
-		if len(bcs) == 1 {
-			value = bcs[0]
-		} else if len(bcs) == 2 {
-			value = bcs[1]
-			if strings.TrimSpace(value) == "" {
-				value = bcs[0]
-			}
-		}
-		return
-	}
-	for _, v := range *list {
-		value := ""
-		biddingcontent, _ := v["biddingcontent"].([]interface{})
-		bct := util.ObjArrToStringArr(biddingcontent)
-		if bct == nil || len(bct) == 0 {
-			continue
-		}
-		//搜索条件中没有行业的话，取查询结果中第一个行业
-		if industry == "" {
-			value = commonSubstring(bct[0])
-		} else { //搜索条件中有行业的话，取行业中和搜索条件相对应的第一个
-			industrys := strings.Split(industry, ",")
-		L:
-			for _, bc := range bct {
-				for _, is := range industrys {
-					if bc == is {
-						value = commonSubstring(bc)
-						break L
-					}
-				}
-			}
-		}
-		if strings.TrimSpace(value) == "" {
-			continue
-		}
-		v["industry"] = value
-	}
-}

src/jfw/modules/entsesearch/src/search/entsesearch.go

@@ -24,6 +24,7 @@ func init() {
 }
 
 func (e *EntSeSearch) ToSearch() error{
+	e.T["pageSize"] = "10"
 	return e.Render("/weixin/entseSearch.html", &e.T)
 }
 

src/jfw/modules/entsesearch/src/web/templates/weixin/entseSearch.html

@@ -251,7 +251,7 @@
 <body>
 <!-->顶部搜索<-->
 <div id="searchDiv">
-	<form class="searchform" id="searchform" method="post" action="/swordfish/searchlist" target="listf">
+	<form class="searchform" id="searchform" method="post" target="listf">
 	<div class="wxhead">
 	<input class="form-control searchname" id="searchname" name="searchname" maxlength ="50" value="{{if .T.shname}}{{.T.shname}}{{end}}" placeholder="中标企业名称"/>
 
@@ -388,6 +388,16 @@
 <div class="tip_m">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>
 </body>
 <script>
+	var pageSize = {{.T.pageSize}};
+	var pageNum = "1";
+	//查询参数
+    var reqParam = {
+        "searchname": $.trim($(".searchname").val()),
+        "money_from": $.trim($("#money_from").val()),
+        "money_to": $.trim($("#money_to").val()),
+        "scope": "",
+        "pageNum": pageNum
+    };
 	$(function () {
         $(".qc").addClass("hidden");
         $(".tubiao").addClass("hidden");
@@ -502,6 +512,14 @@
             $(".money").addClass("hidden");
             $(".jydq-dialog").removeClass("hidden");
         })
+
+        $('#searchList').dropload({
+            scrollArea: window.top.isIOS ? window.top : window,
+            loadDownFn: function (me) {
+                alert(111);
+            }
+        });
+
     });
 
     //企业推荐列表
@@ -543,7 +561,6 @@
         //金额
         if($(".money .btn.active_m").first().length>0){
             money = $(".money .btn.active_m").first().text();
-            console.log(money);
         }
         var money_from = $.trim($("#money_from").val());
         var money_to = $.trim($("#money_to").val());
@@ -562,6 +579,7 @@
             });
             return scope.join(",");
         };
+        reqParam["scope"] = this.setScope();
         dataObj["searchname"] = searchname;
         dataObj["scope"] = this.setScope();
         dataObj["money"] = money;
@@ -578,9 +596,9 @@
 
         $.post("/jylab/entsesearch/proList",dataObj,function(r){
             if(r){
-                console.log(r);
                 if(typeof (r.proList)!="undefined"){
                     var proList = r.proList;
+                    //$("#searchList tbody tr").remove();
                     for(var i=0;i<proList.length;i++){
                         var bidamount = proList[i].bidamount;
                         var projectname = proList[i].projectname;
@@ -588,7 +606,7 @@
                         var sourceinfoid = proList[i].sourceinfoid;
                         var projectcode = proList[i].projectcode;
                         var obj =$("<tr onclick=\"toDetail('"+sourceinfoid+"','"+projectcode+"','"+projectname+"')\"><td>"+(i+1)+"</td><td>"+zbtime+"</td><td>"+projectname+"</td><td>"+bidamount+"</td></tr>");
-                        $("#searchlist tbody").append(obj);
+                        $("#searchList tbody").append(obj);
                     }
                 }
                 shaixuanHide();

src/seo.json

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

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 {

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;
 }

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;

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() {

src/web/staticres/js/superSearch.js

@@ -1,3 +1,7 @@
+var pageSize = 50;
+var nbflag = false;//是否显示的是最新招标数据
+var currentPage = 1;
+
 $(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,267 @@ $(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);
+		}
+	})
+}
+//
+
+function appendDatas(datas,flag){
+	var listHtml = '';
+	var tableHtml = '';
+	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();
+			}
+			listHtml += '<li>'
+						+'<div class="liLuceneList">'
+						+'<div class="luce-left"><em>'+index+'.</em>'
+						+'<div class="left-title">'
+						+'<a href="'+aHref+'"> '+title+'</a>'
+						+'</div>'
+			if(flag){
+				listHtml += '<div class="left-content">'
+						+'<a href="'+aHref+'">'+detail+'...</a>'
+						+'</div>'
+			}
+			listHtml += '</div><div class="luce-right">'
+			if($.trim(datas[i].area) != "" && datas[i].area != "A"){
+				listHtml += '<a href="/list/area/'+datas[i].areaadd+'.html">'+datas[i].area+'</a>';
+			}else{
+				listHtml += '<a href="#" style="display:none;"></a>';
+			}
+			if(typeof(type) != "undefined" && type != null && type != ""){
+				listHtml += '<a href="/list/stype/'+datas[i].stypeadd+'.html">'+type+'</a>';
+			}else{
+				listHtml += '<a href="#" style="display:none;"></a>';
+			}
+			//
+			listHtml += '<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){
+					listHtml += '<span class="com-time">'+diff+'</span>';
+				}
+			}
+			listHtml += '</div></li>';
+			tableHtml +='<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){
+					tableHtml += '<td>'+diff+'</td>';
+				}
+			}else{
+				tableHtml += '<td></td>';
+			}
+			if(typeof(type) != "undefined" && type != null && type != ""){
+				tableHtml += '<td>'+type+'公告</td>';
+			}else{
+				tableHtml += '<td></td>';
+			}
+			if(typeof(datas[i].agency) != "undefined" && datas[i].agency != null && datas[i].agency != ""){
+				tableHtml += '<td class="tt-l">'+datas[i].agency+'</td>';
+			}else{
+				tableHtml += '<td class="tt-l"></td>';
+			}
+			if(typeof(datas[i].projectname) != "undefined" && datas[i].projectname != null && datas[i].projectname != ""){
+				tableHtml += '<td class="tt-l">'+datas[i].projectname+'</td>';
+			}else{
+				tableHtml += '<td class="tt-l"></td>';
+			}
+			if(typeof(datas[i].budget) != "undefined" && datas[i].budget != null && datas[i].budget != ""){
+				var budget =parseInt(datas[i].budget)/10000
+				
+				tableHtml += '<td class="tt-r">'+budget+'</td>';
+			}else{
+				tableHtml += '<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");
+				tableHtml += '<td>'+diff+'</td>';
+			}else{
+				tableHtml += '<td></td>';
+			}
+			if(typeof(datas[i].winner) != "undefined" && datas[i].winner != null && datas[i].winner != ""){
+				tableHtml += '<td class="tt-l">'+datas[i].winner+'</td>';
+			}else{
+				tableHtml += '<td class="tt-l"></td>';
+			}
+			if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
+				var bidamount = parseInt(datas[i].bidamount)/10000
+				tableHtml += '<td class="tt-r">'+bidamount+'</td>';
+			}else{
+				tableHtml += '<td class="tt-r"></td>';
+			}
+				tableHtml+='</tr>'
+	}
+	$(".tabContainer-2 .lucene ul").html(listHtml);
+	$(".tabContainer-2 .lucene-table table tbody").html(tableHtml);
+	
+	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"){
+		if(hour<10){
+			hour="0"+hour
+		} 
+		if(min<10){
+			min="0"+min
+		} 
+		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]
+}

src/web/staticres/wxswordfish/superSearch.css

@@ -1099,7 +1099,7 @@
 	text-align:center;
 }
 .jyabout .searchname{
-	background-color: #FFFFFF;
+	background-color: #FFFFFF ;
     border: 1px solid #E6E6E6;
     height: 45px;
     padding: 2px 35px 2px 20px;
@@ -1411,6 +1411,8 @@
 	min-height: 10rem;
 	font-size: 14px;
 	color: #1d1d1d;
+	position: absolute;
+	z-index: 999;
 }
 .industry-dialog .hyHead {
 	width: 34%;
@@ -1471,13 +1473,14 @@ body{
 	font-size:16px !important;
 }
 .searchname{
-	background-color: #f5f4fa;
-	border:1px solid #E6E6E6;
+	background-color: #EEEEEE !important;
 	width:85% !important;
 	font-size:16px;
 	position:relative;
 	box-shadow:none;
 	cursor: pointer;
+	border: none !important;
+	border-radius: 5px !important;
 	webkit-transform: translateZ(0);
 	-moz-transform: translateZ(0);
 	-ms-transform: translateZ(0);
@@ -1584,10 +1587,15 @@ body{
 	width: 59%;
 }
 .com-title span{
-	margin: 0 10px;
+	float: left;
+	height: 100%;
+	display: block;
+	padding: 0 5px;
+	margin-left: 5px;
 }
 .com-title .on{
 	color: #2cb7ca;
+	border-bottom: 2px solid #2cb7ca;
 }
 .selLable .line-vertical{
 	width: 1px;
@@ -1653,4 +1661,51 @@ body{
 }
 .content .keyword{
 	color: #2cb7ca;
+}
+.resbm{
+	display: table;
+	position: fixed;
+	bottom: 0px;
+	z-index: 2000;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	height: 50px;
+	width: 100%;
+	background-color: #37c6da;
+	border: 1px solid #37c6da;
+	display: flex;
+	justify-content: space-around;
+	align-content: center;
+}
+.rests {
+	height: 50px;
+	line-height: 50px;
+	padding-left: 15px;
+	color: #fff;
+	font-size: 14px;
+	float: left;
+	overflow: hidden;
+	width: 60%;
+	text-align: center;
+}
+.resdy {
+	float: left;
+	height: 35px;
+	margin: 7px 10px;
+	width: 107px;
+	border: 1px solid #fff;
+	line-height: 35px;
+	border-radius: 20px;
+	color: #fff;
+	padding-left: 20px;
+	cursor: hand;
+}
+.resdy img {
+	width: 12px;
+	margin: 2px;
+}
+.dy_close img{
+	width: 12px;
+	margin: 4px;
 }

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);
 })
 </script>
 </body>

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

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta name="renderer" content="webkit">
 	<link href="/mobiscroll/mobiscroll.min.css" rel="stylesheet">
-	<link href="/wxswordfish/superSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<link href="/css/search/superSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 	<link href="/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 	<link href="/css/wxlist.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 	{{include "/common/inc.html"}}
@@ -19,11 +19,11 @@
 	<script>
 
         var s_words = {{.T.searchvalue}};
-        var isloadover = false;
         var firstPage = {{.T.list}};
         var pageSize = {{.T.pageSize}};
         window.top.noMoreCache = "false";
-        var scrollDownObj=null;
+        var scrollDownObj=null;   //翻页对象
+		var dyDiv=true;     //显示订阅剑鱼信息
         initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
         //提交参数
         var reqParam = {
@@ -32,12 +32,11 @@
             "subtype": "",
             "scope": "",
             "publishtime": "",
-            "selectType": $("#searchform [name='selectType']").val(),
+            "selectType": "",
             "money":"",
             "industry":"",
-            "pageNum": ""
+            "pageNum": 1
         };
-        var pageNum = 1;
         var loadCacheData = true;
         $(function(){
             //筛选菜单展示or隐藏
@@ -53,7 +52,7 @@
             });
 
             /**********************分页请求start****************************/
-                //铺数据 1.首次跳转传过来的数据  2.页面搜索数据 3.下拉查询数据
+			//铺数据 1.首次跳转传过来的数据  2.页面搜索数据 3.下拉查询数据
             //下拉更新
             setTimeout(function(){
 
@@ -61,12 +60,11 @@
                     scrollArea : window.top.isIOS?window.top:window,
                     loadDownFn : function(me){
                         scrollDownObj=me;
-                        if(loadCacheData){
+                        if(loadCacheData&&firstPage){
                             if(firstPage.length>0){
-                                appendListHtml(getHtml(firstPage,1),1);
+                                appendListHtml(getHtml(firstPage,1));
                                 firstPage = null;
                                 loadCacheData=false;
-                                isloadover = true;
                                 setTimeout(function(){
                                     me.resetload();
                                 },1000);
@@ -76,15 +74,14 @@
                             return;
                         }
                         beforeSubmit();
-                        pageNum++;
-                        reqParam["pageNum"] = pageNum;
+                       // pageNum++;
+                        reqParam["pageNum"] ++;        //翻页请求
                         $.ajax({
                             type: 'post',
                             url: '/swordfish/searchlist/paging',
                             data: reqParam,
                             dataType: 'json',
                             success: function(data){
-                                isloadover = true;
                                 //没有数据
                                 if(data["list"] == null || data["list"].length == 0){
                                     noMoreData(me);
@@ -92,7 +89,7 @@
                                 }
                                 var html = getHtml(data["list"],reqParam["pageNum"]);
                                 // 每次数据插入，必须重置
-                                appendListHtml(html,pageNum);
+                                appendListHtml(html);
                                 //没有下一页了
                                 if(!data.hasNextPage){
                                     // 锁定
@@ -137,6 +134,38 @@
                 $(".jydq-dialog .btn:eq(0)").trigger("click");  //清除地区
 				$(".jytype-dialog .btn:eq(0)").trigger("click"); //清除类别
 			})
+			//关闭搜索后订阅================================================================
+			$(".dy_close").on("click",function(){
+                $(".resbm").addClass("hidden");
+                dyDiv=false;
+			})
+			if(dyDiv&&$("#list").text()!=""){   //首次进来是否显示订阅
+                $(".resbm").removeClass("hidden");
+			}
+			//订阅
+            $("#zjdy").click(function(){
+                var rFlag = false;
+                $.ajax({
+                    type: "post",
+                    url: "/member/swordfish/ajaxReq",
+                    data: {keys:$("[name='searchname']").val(),reqType: "subscribe"},
+                    dataType: "json",
+                    async: false,
+                    success: function(r){
+                        if(r.flag=="y"){
+                            rFlag = true;
+                        }else if(r.flag=="o"){
+                            EasyAlert.show("您已经超过订阅<br>关键字上限");
+                        }
+                    },error: function(){
+                        rFlag = true;
+                    }
+                });
+                if(rFlag){
+                    window.open("/wxkeyset/keyset/index");
+				}
+            });
+			//订阅结束==========================================================================
 
         });
         function canSearch(){  //判断是否显示搜索按钮
@@ -219,8 +248,11 @@
         }
 
         function show() {   //筛选页面和内容展示替换显示
-            $(".selLable").removeClass("hidden");
-            $(".wxsearch").addClass("hidden");
+            if(!$(".wxsearch").hasClass("hidden")){
+                $(".selLable").removeClass("hidden");
+                $(".wxsearch").addClass("hidden");
+            }
+
 
             if ($("#list").text() == "") {
                 $("#wrapper").addClass("hidden");
@@ -237,25 +269,35 @@
                 }
             }
         }
+
         function toquery(){    //提交表单，获取数据
-			console.log(reqParam);
 			if(reqParam.searchname=="") return
-            $.post("/jylab/getSearchData",reqParam,function(result){
+			reqParam.pageNum=1
+            $.post("/swordfish/searchlist/paging",reqParam,function(data){
+                var history=data.history;
+				var msgset=data.msgset;
 
-				if(result.length>0){
+
+				//铺查询信息
+                if(data["list"] == null || data["list"].length == 0){
+                    noMoreData(scrollDownObj);
+                    $("#list").text("")
+                    hasNoData();
+					show();
+                    return
+				}else{
                     hasData();
-                    pageNum=1;
-                    replayListHtml(getHtml(result,1));
-                    scrollDownObj.noData(false);
+                    replayListHtml(getHtml(data["list"],1));
+					show();
+				}
+                if(!data.hasNextPage){
+                    scrollDownObj.lock();
+                    scrollDownObj.noData(true);
+                }else{
                     scrollDownObj.unlock();
-                    scrollDownObj.resetload();
-                    if(!$(".wxsearch").hasClass("hidden")){
-                        show();
-                    }
-				}else{
-                    hasNoData();
+                    scrollDownObj.noData(false);
 				}
-
+                scrollDownObj.resetload();
             });
         }
 
@@ -384,6 +426,9 @@
         function hasData(){ //搜索信息不为空
             $(".nullcontent").addClass("hidden");
             $("#wrapper").removeClass("hidden");
+            if(dyDiv){
+                $(".resbm").removeClass("hidden");
+			}
         }
         function appendListHtml(html){  //下拉时展示信息
 
@@ -481,8 +526,8 @@
 			<input type="hidden" name="scope" value="{{.T.scope}}">
 			<input type="hidden" name="publishtime" value="{{.T.publishtime}}">
 			<input type="hidden" name="industry" value="">
-			<input type="hidden" name="money" value="">-->
-			<input type="hidden" name="selectType" value="all">
+			<input type="hidden" name="money" value="">
+			<input type="hidden" name="selectType" value="all">-->
 			<span class="query hidden"><img src="/images/wx/jywxjs.png"></span>
 			<span class="clearInpt hidden"><img src="/images/wx/jyqingchu.png"></span>
 			<span class="screen text-center" >筛选</span>
@@ -791,8 +836,15 @@
 					</tr>
 				</table>
 			</div>
+			<div class="resbm hidden">
+				<div class="rests">如果您对以上结果满意可</div>
+				<div class="resdy" id="zjdy">直接订阅<img src="/images/wx/jydyyou.png"></div>
+				<div class="dy_close"><img src="/images/search/dy_close.png"/></div>
+				<div style="clear:both"></div>
+			</div>
 		</div>
 	</div>
+
 	<div class="nullcontent text-center  hidden">
 		<div >
 			<img style="width:150px;margin:0px 0 50px 0;" src="/images/wx/jysorry_1.png">

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>'
 	});