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

.gitignore

@@ -1,7 +1,5 @@
 pkg
 bin
-.project
-extend
 */pkg
 *.exe
 *.log

.idea/misc.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-<<<<<<< HEAD
-  <component name="GOROOT" path="/usr/local/go" />
-=======
-  <component name="GOROOT" path="C:/go" />
->>>>>>> b673ea6b82d098a5040ba1bd5d56ac194a55394d
-</project>

extend/main.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"log"
+	"qfw/util/mongodb"
+)
+
+func main() {
+
+	mongodb.InitMongodbPool(1, "192.168.3.207:27080", "spider")
+	//log.Println(FindById("enterprise", "556d858ec2e875307286f863", `{"_id":1}`))
+	//log.Println(FindOne("identification", "{'o_identificationinfo.s_id':'12312312312312312x','i_identificationtype':2}"))
+	//查id字段
+	log.Println(mongodb.FindById("bidding", "58d8ae66e13823122b666c56", `{"title":1}`))
+	//log.Println((*FindById("user", "5668e447af537458a9000006", `{"credit_a":1}`))["credit_a"].(int64))
+
+}

src/config.json

@@ -14,7 +14,7 @@
     "agreement": "http",
     "webdomain": "http://webws.qmx.top",
     "redirect": {
-        "searchinfo": "/swordfish/search",
+        "searchinfo": "/jylab/mainSearch",
         "rssset": "/wxkeyset/keyset/index",
         "viewdemo": "/front/viewdemo",
         "wxpushlist": "/wxpush/bidinfo/%s",
@@ -29,7 +29,9 @@
         "about": "/swordfish/about",
         "followset": "/follow/set/%s/%s",
         "myfeedbacks": "/swordfish/myFeedbacks",
-        "zqluckdraw": "/active/zqLuckdraw"
+        "zqluckdraw": "/active/zqLuckdraw",
+		"followent":"/jylab/followent/entList",
+		"labindex":"/jylab/index"
     },
     "jy_activeset": {
         "activitystartcode": "3201000000",

src/jfw/front/entsearch.go

@@ -2,9 +2,11 @@ package front
 
 import (
 	"fmt"
+	"jfw/config"
 	"jfw/jylabutil"
 	_ "jfw/jyutil"
 	"log"
+	"math/rand"
 	"qfw/util"
 	"time"
 
@@ -15,7 +17,7 @@ import (
 
 type Entsearch struct {
 	*xweb.Action
-	bidsearchforent  xweb.Mapper `xweb:"/jylab/bidsearchforent.html"`
+	bidsearchforent  xweb.Mapper `xweb:"/jylab/bidsearchforent/index.html"`
 	pcSearchZbqyAjax xweb.Mapper `xweb:"/jylab/pcSearchZbqyAjax"`
 }
 
@@ -25,6 +27,12 @@ func init() {
 
 func (e *Entsearch) Bidsearchforent() error {
 	defer util.Catch()
+	var shareid = e.GetString("id")
+	e.T["logid"] = config.Seoconfig["jyzbqyss"].(string)
+	if len(shareid) == 0 {
+		shareid = fmt.Sprintf("%s%d", config.Seoconfig["jysslby"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
+	}
+
 	searchvalue := e.GetString("searchvalue")
 	area := e.GetString("area")
 	pricetype := e.GetString("pricetype")
@@ -34,14 +42,14 @@ func (e *Entsearch) Bidsearchforent() error {
 		//搜索minprice和maxprice价格区间的数据
 	}
 	if pricetype == "n" || pricetype == "" {
-		//搜索所有价格
+		//搜索所有的价格
 	}
 
-	fmt.Println("searchvalue1==", searchvalue)
-	fmt.Println("area1==", area)
-	fmt.Println("lower1==", minprice)
-	fmt.Println("upper1==", maxprice)
-	fmt.Println("pricetype1==", pricetype)
+	//fmt.Println("searchvalue1==", searchvalue)
+	//fmt.Println("area1==", area)
+	//fmt.Println("lower1==", minprice)
+	//fmt.Println("upper1==", maxprice)
+	//fmt.Println("pricetype1==", pricetype)
 
 	if minprice == 0 {
 		e.T["minprice"] = ""
@@ -57,6 +65,7 @@ func (e *Entsearch) Bidsearchforent() error {
 	e.T["searchvalue"] = searchvalue
 	e.T["area"] = area
 	e.T["pricetype"] = pricetype
+	e.T["shareid"] = se.EncodeString(shareid)
 	log.Println("-------中标企业搜索：")
 
 	list := []map[string]interface{}{}
@@ -69,7 +78,7 @@ func (e *Entsearch) Bidsearchforent() error {
 		v["time1"] = util.TimeDiff(t1)
 		t2 := time.Unix(util.Int64All(v["zbtime"]), 0)
 		v["time2"] = util.TimeDiff(t2)
-
+		v["_id"] = util.EncodeArticleId2ByCheck(util.ObjToString(v["_id"]))
 		//fmt.Println(v["industry"])
 		//for i,z := range v{
 		//	fmt.Println(i)
@@ -100,7 +109,7 @@ func (e *Entsearch) PcSearchZbqyAjax() error {
 	fmt.Println("pricetype==", pricetype)
 
 	list := []map[string]interface{}{}
-	list = jylabutil.GetProjectByEntName(searchvalue, area, minprice, maxprice, 1, 10)
+	//list = jylabutil.GetProjectByEntName(searchvalue, area, minprice, maxprice, 1, 10)
 	//jyutil.BidListConvert("", &list)
 
 	for k, v := range list {

src/jfw/front/search.go

@@ -2,12 +2,14 @@ package front
 
 import (
 	"fmt"
-	"github.com/go-xweb/xweb"
-	"gopkg.in/mgo.v2/bson"
+	"jfw/jylabutil"
 	"jfw/wx"
 	"qfw/util"
 	"qfw/util/redis"
 	"strings"
+
+	"github.com/go-xweb/xweb"
+	"gopkg.in/mgo.v2/bson"
 )
 
 type Search struct {
@@ -21,6 +23,9 @@ func init() {
 	xweb.AddAction(&Search{})
 }
 func (s *Search) MainSearch() error {
+	if s.Session().Get("s_m_openid") == nil {
+		return s.Redirect("/swordfish/about")
+	}
 	if userid := s.GetSession("userId"); userid != nil {
 		history := redis.GetStr("other", "s_"+userid.(string))
 		arrs := strings.Split(history, ",")
@@ -46,6 +51,10 @@ func (s *Search) MainSearch() error {
 			}
 			s.T["msgset"] = keys
 		}
+		//判断是否开启超级搜索or中标搜索
+		myopenid := s.Session().Get("s_m_openid")
+		s.T["open_supersearch"] = jylabutil.IsAuthorized(myopenid.(string), "i_supersearch")
+		s.T["open_entsesearch"] = jylabutil.IsAuthorized(myopenid.(string), "i_entsesearch")
 	}
 	return s.Render("/weixin/search/mainSearch.html", &s.T)
 }
@@ -53,16 +62,18 @@ func (m *Search) SuperSearch() error {
 	defer util.Catch()
 	searchvalue := strings.Trim(m.GetString("searchvalue"), " ")
 	var list *[]map[string]interface{}
+	var historyFlag = 0
 	if userid := m.GetSession("userId"); userid != nil {
+		//历史记录
+		history := redis.GetStr("other", "s_"+userid.(string))
+		arrs := strings.Split(history, ",")
+		if history == "" {
+			arrs = make([]string, 0)
+		}
 		if len(searchvalue) > 0 {
 			searchname := strings.Replace(strings.Replace(searchvalue, " ", "+", -1), "++", "+", -1)
 			list = getWxsearchlistData(searchvalue, searchname, "", "", "", "", "", "", 1, "all")
-			history := redis.GetStr("other", "s_"+userid.(string))
-			arrs := strings.Split(history, ",")
-			if history == "" {
-				arrs = make([]string, 0)
-			}
-			var historyFlag = 0
+			//新增历史记录
 			for _, v := range arrs {
 				fmt.Print(v == strings.Trim(searchvalue, " "))
 				if v == strings.Trim(searchvalue, " ") {
@@ -78,25 +89,26 @@ func (m *Search) SuperSearch() error {
 				redis.Del("other", "s_"+userid.(string))
 				redis.Put("other", "s_"+userid.(string), strings.Join(arrs, ","), -1)
 			}
-			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
-			one, _ := mongodb.FindOneByField("user", bson.M{"_id": bson.ObjectIdHex(userid.(string))}, `{"o_jy":1}`)
-			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
+		}
+		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
+		//我的订阅
+		one, _ := mongodb.FindOneByField("user", bson.M{"_id": bson.ObjectIdHex(userid.(string))}, `{"o_jy":1}`)
+		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.T["list"] = list
 		m.T["pageSize"] = wx_pageSize

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

@@ -13,7 +13,7 @@ import (
 
 const (
 	wx_maxPageNum         = 20
-	wx_pageSize           = 1
+	wx_pageSize           = 10
 )
 type EntSeSearch struct {
 	*xweb.Action

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

@@ -36,7 +36,7 @@
     var reqParam = null;
     $(function () {
         reqParam = {
-            "searchname": $.trim($(".searchname").val()),
+            "searchname": $.trim($("#searchname").val()),
             "money_from": "",
             "money_to": "",
             "scope": "",
@@ -570,7 +570,7 @@
 
         //搜索框输入
         $("#searchname").on("input propertychange",function(){
-            var snqc = $(".searchname").val();
+            var snqc = $("#searchname").val();
             if(snqc.length > 0){
                 $(".qc").removeClass("hidden");
                 $(".tubiao").removeClass("hidden");
@@ -588,7 +588,7 @@
 
         //搜索框选中
         $("#searchname").focus(function(){
-            var snqc = $(".searchname").val();
+            var snqc = $("#searchname").val();
             if(snqc.length > 0){
                 $(".qc").removeClass("hidden");
                 $(".tubiao").removeClass("hidden");
@@ -600,7 +600,7 @@
 
         //清除
         $(".qc").click(function(){
-            $(".searchname").val("");
+            $("#searchname").val("");
             $(".qc").addClass("hidden");
             $(".tubiao").addClass("hidden");
             $(".jydqsure").css("background","#ccc");
@@ -710,7 +710,7 @@
         document.onkeydown = function () {
             if (window.event && window.event.keyCode == 13) {
                 window.event.returnValue = false;
-                if($.trim($(".searchname").val()) == ""){
+                if($.trim($("#searchname").val()) == ""){
                     return;
                 }
                 $("#searchname").blur();
@@ -791,7 +791,7 @@
     }
 
     function beforeSubmit() {
-        var searchname = $.trim($(".searchname").val().replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+"));
+        var searchname = $.trim($("#searchname").val().replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+"));
 
         var money = "";
         var money_from  = "";

src/jfw/modules/followent/src/followent/followent.go

@@ -7,11 +7,13 @@ import (
 	"qfw/util/elastic"
 	"qfw/util/redis"
 	"strconv"
+	"strings"
 	"time"
 	"tools"
 
-	"github.com/go-xweb/xweb"
 	"jfw/jylabutil"
+
+	"github.com/go-xweb/xweb"
 )
 
 var mongodb = tools.MQFW
@@ -34,8 +36,11 @@ func init() {
 
 func (f *FollowEnt) EntList() error {
 	defer util.Catch()
+	if f.Session().Get("s_m_openid") == nil {
+		return f.Redirect("/swordfish/about")
+	}
 	f.T["followLimit"] = config.Sysconfig["followentlimit"]
-	datas, ok := mongodb.Find("jylab_followent", `{"s_userid":"`+f.GetSession("userId").(string)+`","s_entname":{$ne:""}}`, `{"l_createtime":-1}`, `{"_id":1,"s_entname":1,"s_userid":1,"s_openid":1,"l_createtime":1,"s_id":1,"i_ispush":1}`, false, 0, 10)
+	datas, ok := mongodb.Find("jylab_followent", `{"s_userid":"`+f.GetSession("userId").(string)+`","s_entname":{"$ne":""}}`, `{"l_createtime":-1}`, `{"_id":1,"s_entname":1,"s_userid":1,"s_openid":1,"l_createtime":1,"s_id":1,"i_ispush":1}`, false, 0, 10)
 	f.T["flag"] = false
 	if ok && datas != nil && len(*datas) > 0 {
 		for _, v := range *datas {
@@ -53,9 +58,9 @@ func (f *FollowEnt) AddEnt() error {
 
 func (f *FollowEnt) RecList() {
 	var entName = f.GetString("entName")
-	limit,_ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
-	re := jylabutil.GetEenNameImmediate(entName,limit)
-	if re!=nil && len(re) != 0{
+	limit, _ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
+	re := jylabutil.GetEenNameImmediate(entName, limit)
+	if re != nil && len(re) != 0 {
 		for _, v := range re {
 			v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
 		}
@@ -70,8 +75,17 @@ func (f *FollowEnt) SaveEnt() {
 }
 
 //企业最新信息
-func (f *FollowEnt) NewInfo(winner, id string) error {
+func (f *FollowEnt) NewInfo(winnerid string) error {
 	defer util.Catch()
+	if f.Session().Get("s_m_openid") == nil {
+		return f.Redirect("/swordfish/about")
+	}
+	winner := ""
+	id := ""
+	if winnerid != "" {
+		winner = strings.Split(winnerid, "___")[0]
+		id = strings.Split(winnerid, "___")[1]
+	}
 	userId := f.GetSession("userId").(string) //用户id
 	var follow = "n"
 	s_id := ""
@@ -117,6 +131,9 @@ func (f *FollowEnt) NewInfo(winner, id string) error {
 //取消企业关注
 func (f *FollowEnt) QgFollow() error {
 	defer util.Catch()
+	if f.Session().Get("s_m_openid") == nil {
+		return f.Redirect("/swordfish/about")
+	}
 	status := "n"
 	userId := f.GetSession("userId").(string)
 	id := f.GetString("id")

src/jfw/modules/followent/src/followent/myfwent.go

@@ -24,6 +24,9 @@ func init() {
 //
 func (m *Myfwent) Addfwent() error {
 	defer util.Catch()
+	if m.Session().Get("s_m_openid") == nil{
+		return m.Redirect("/swordfish/about")
+	}
 	userId := m.GetSession("userId").(string)
 	openid := m.GetSession("s_m_openid").(string)
 	followId := ""

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

@@ -62,7 +62,7 @@ if(sessionStorage){
                 sessionStorage.version="0";
             }
 
-            window.location.href = "/jylab/followent/newInfo/"+$(this).attr("data-entname")+"/"+$(this).attr("data-id");
+            window.location.href = "/jylab/followent/newInfo/"+$(this).attr("data-entname")+"___"+$(this).attr("data-id");
         });
 	    //
         $("#addDiv").click(function(){

src/jfw/modules/weixin/src/wx/wx.go

@@ -846,36 +846,47 @@ func CreateMenu(rw http.ResponseWriter, r *http.Request) {
 	urlstr := fmt.Sprintf("https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s/wx/oauth/%s&response_type=code&scope=snsapi_base&state=1#wechat_redirect", config.Sysconfig["appid"], config.Sysconfig["webdomain"], "%s")
 	log.Println(urlstr)
 	menu := &Menu{make([]MenuButton, 3)}
-	menu.Buttons[0].Name = "招标搜索"
+	menu.Buttons[0].Name = "搜索"
 	menu.Buttons[0].Type = MenuButtonTypeUrl
 	menu.Buttons[0].Url = fmt.Sprintf(urlstr, "searchinfo")
 
-	menu.Buttons[1].Name = "招标订阅"
-	menu.Buttons[1].Type = MenuButtonTypeUrl
-	menu.Buttons[1].Url = fmt.Sprintf(urlstr, "rssset")
+	menu.Buttons[1].Name = "发现"
+	menu.Buttons[1].SubButtons = make([]MenuButton, 5)
 
-	menu.Buttons[2].Name = "发现"
-	menu.Buttons[2].SubButtons = make([]MenuButton, 5)
+	menu.Buttons[1].SubButtons[0].Name = "产品更新/帮助"
+	menu.Buttons[1].SubButtons[0].Type = MenuButtonTypeUrl
+	menu.Buttons[1].SubButtons[0].Url = fmt.Sprintf(urlstr, "useskill")
 
-	menu.Buttons[2].SubButtons[0].Name = "产品更新/帮助"
+	menu.Buttons[1].SubButtons[1].Name = "关于剑鱼/合作"
+	menu.Buttons[1].SubButtons[1].Type = MenuButtonTypeUrl
+	menu.Buttons[1].SubButtons[1].Url = fmt.Sprintf(urlstr, "about")
+
+	menu.Buttons[1].SubButtons[2].Name = "\u270d意见反馈"
+	menu.Buttons[1].SubButtons[2].Type = MenuButtonTypeUrl
+	menu.Buttons[1].SubButtons[2].Url = fmt.Sprintf(urlstr, "feedback")
+
+	menu.Buttons[1].SubButtons[3].Name = string(0x1F465) + "招标社区"
+	menu.Buttons[1].SubButtons[3].Type = MenuButtonTypeUrl
+	menu.Buttons[1].SubButtons[3].Url = fmt.Sprintf(urlstr, "community")
+
+	menu.Buttons[1].SubButtons[4].Name = string(0x1F4A1) + "剑鱼实验室"
+	menu.Buttons[1].SubButtons[4].Type = MenuButtonTypeUrl
+	menu.Buttons[1].SubButtons[4].Url = fmt.Sprintf(urlstr, "labindex")
+
+	menu.Buttons[2].Name = "我"
+	menu.Buttons[2].SubButtons = make([]MenuButton, 3)
+
+	menu.Buttons[2].SubButtons[0].Name = "关注的企业"
 	menu.Buttons[2].SubButtons[0].Type = MenuButtonTypeUrl
-	menu.Buttons[2].SubButtons[0].Url = fmt.Sprintf(urlstr, "useskill")
+	menu.Buttons[2].SubButtons[0].Url = fmt.Sprintf(urlstr, "followent")
 
-	menu.Buttons[2].SubButtons[1].Name = "\u2139关于剑鱼"
+	menu.Buttons[2].SubButtons[1].Name = string(0x1F4C1) + "关注的项目"
 	menu.Buttons[2].SubButtons[1].Type = MenuButtonTypeUrl
-	menu.Buttons[2].SubButtons[1].Url = fmt.Sprintf(urlstr, "about")
+	menu.Buttons[2].SubButtons[1].Url = fmt.Sprintf(urlstr, "myfollow")
 
-	menu.Buttons[2].SubButtons[2].Name = "\u270d意见反馈"
+	menu.Buttons[2].SubButtons[2].Name = "\u2764招标订阅"
 	menu.Buttons[2].SubButtons[2].Type = MenuButtonTypeUrl
-	menu.Buttons[2].SubButtons[2].Url = fmt.Sprintf(urlstr, "feedback")
-
-	menu.Buttons[2].SubButtons[3].Name = string(0x1F465) + "招标社区"
-	menu.Buttons[2].SubButtons[3].Type = MenuButtonTypeUrl
-	menu.Buttons[2].SubButtons[3].Url = fmt.Sprintf(urlstr, "community")
-
-	menu.Buttons[2].SubButtons[4].Name = "\u2764我关注的项目"
-	menu.Buttons[2].SubButtons[4].Type = MenuButtonTypeUrl
-	menu.Buttons[2].SubButtons[4].Url = fmt.Sprintf(urlstr, "myfollow")
+	menu.Buttons[2].SubButtons[2].Url = fmt.Sprintf(urlstr, "rssset")
 
 	err := Mux.CreateMenu(menu)
 	if err != nil {

src/seo.json

@@ -274,13 +274,15 @@
 	"jybky":"15",
 	"jygywmy":"16",
 	"jySEMtgy":"17",
+	"jyzbqyss":"18",
 	"module":{
 		"subscribe":"订阅页",
 		"/list/":"标签页",
-		"searchinfolist":"搜索页",
+		"supsearch/index":"搜索页",
 		"article/content":"快照页",
 		"jyblog":"博客页",
-		"aboutus":"关于我们页"
+		"aboutus":"关于我们页",
+		"bidsearchforent":"中标企业搜索页"
 	},
 	"referer":{
 		"baidu.com":"百度SEO",

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

@@ -5,10 +5,10 @@
 }
 .pricefat{
 	float: left;
-	margin-top: -8px;
+	margin-top: -6px;
 	border: 1px solid #fff;
     background-color: #fff;
-	padding: 3px 5px;
+	padding: 2px 5px;
 }
 #searchInner .active{
 	background-color: #2cb7ca;

src/web/staticres/css/search/superSearch.css

@@ -1615,35 +1615,47 @@ body{
 	color: #2cb7ca;
 }
 #table{
-	width: 100%;
-	padding-left: 20px;
-	padding-top: 20px;
+	
 }
 #table>.data{
+	width: 100%;
 	overflow-x: scroll;
 }
 #table>.TableTip{
-	padding-top: 10px;
-	padding-right: 10px;
+	padding: 20px 20px 0px 20px;
 	color: #686868;
 }
 #table table{
-	width: 525px;
+	width: 880px;
+	padding: 20px 20px 0px 20px;
+	display:block;
 }
-#table table>tr>td:nth-child(1){
+#table table>tbody>tr>td:nth-child(1) div{
 	width:30px;
 }
-#table table>tbody>tr>td:nth-child(2){
-	width:68px;
+#table table>tbody>tr>td:nth-child(2) div{
+	width:58px;
 }
-#table table>tbody>tr>td:nth-child(3){
-	width:74px;
+#table table>tbody>tr>td:nth-child(3) div{
+	width:60px;
 }
-#table table>tbody>tr>td:nth-child(4){
+#table table>tbody>tr>td:nth-child(4) div{
+	width:125px;
+}
+#table table>tbody>tr>td:nth-child(5) div{
 	width:160px;
 }
-#table table>tbody>tr>td:nth-child(5){
-	width: 160px;
+#table table>tbody>tr>td:nth-child(6) div{
+	width:60px;
+}
+#table table>tbody>tr>td:nth-child(7) div{
+	width:75px;
+}
+#table table>tbody>tr>td:nth-child(8) div{
+	width: 110px;
+}
+#table table>tbody>tr>td:nth-child(9) div{
+	width: 60px;
 }
 #table tr td{
 	border: 1px solid #E0E0E0;
@@ -1707,7 +1719,7 @@ body{
 	background-color: #fff;
 	border-top: 1px solid #e0e0e0;
 }
-.inputDiv .history li,.inputDiv .myMsgset li,.inpTitle{
+.inputDiv .history li,.inputDiv .myMsgset li,.inpTitle_history,.inpTitle_msgset{
 	width: 100%;
 	height: 38px;
 	border-left: 1px solid #e0e0e0;
@@ -1724,11 +1736,11 @@ body{
 .inputDiv img{
 	width: 20px;
 }
-.inpTitle{
+.inpTitle_history,.inpTitle_msgset{
 	color:#888;
 	font-size: 16px;
 }
-.inpTitle span{
+.inputDiv span{
 	padding-left: 10px;
 }
 #del_history{

src/web/staticres/css/wxlist.css

@@ -58,4 +58,13 @@
 	padding: 1px 3px;
 	color: #fff;
 	font-size: 14px;
+}
+.restime span.industry{
+	border: 1px solid #25c78c;
+	background:#25c78c;
+	border-radius: 3px;
+	margin: 0px 5px;
+	padding: 1px 3px;
+	color: #fff;
+	font-size: 14px;
 }

src/web/staticres/js/login.js

@@ -65,6 +65,7 @@ var JYLogin = function(shareid,kopshareid,num){
 				getNewShareId(mynum);
 				jylgi = 0;
 			}
+			console.log(jylgi+"-----")
 		}
 	},1500)
 }
@@ -220,6 +221,7 @@ var processpage = function(shareid,num){
 				break;
 			}
 			$("#myModal").modal("hide");
+			$("#labModal").modal("hide");
 			if(dataId!=""){
 				setTimeout(function(){
 					var aHref = "";

src/web/staticres/js/superSearch.js

@@ -109,10 +109,6 @@ $(function() {
 			submitflag=false;
 		}
 	})
-	//点击超级搜索按钮
-	$(".superSearch").click(function(){
-		$("#labModal").modal("show");
-	})
 })
 //
 function next(){
@@ -208,13 +204,13 @@ function appendDatas(datas,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 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;
@@ -235,7 +231,7 @@ function appendDatas(datas,flag){
 					+'<div class="liLuceneList" style="border-bottom: 1px solid #EBEBEB;">'
 					+'<div class="luce-left"><em>'+index+'.</em>'
 					+'<div class="left-title">'
-					+'<a href="'+aHref+'"> '+title+'</a>'
+					+'<a onclick="noIn(this)" dataid="'+datas[i]._id+'" target="_blank"> '+title+'</a>'
 					+'</div>'
 		if(flag&&selectType == "all"&&detail!=""){
 			listHtml += '<div class="left-content">'
@@ -268,7 +264,7 @@ function appendDatas(datas,flag){
 			}
 		}
 		listHtml += '</div></li>';
-		tableHtml +='<tr>'
+		tableHtml +='<tr onclick="noIn(this)" dataid="'+datas[i]._id+'" target="_blank">'
 				+'<td><div>'+index+'</div></td>'
 		if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
 			var diff = formatDate(Number(datas[i].publishtime),"s");
@@ -318,12 +314,12 @@ function appendDatas(datas,flag){
 			tableHtml += '<td class="tt-l"><div></div></td>';
 		}
 		if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
-			var bidamount = parseInt(datas[i].bidamount)/10000
+			var bidamount = parseInt(datas[i].bidamount)/10000;
 			if(bidamount.toString().length>6){
 				if(bidamount.toString().indexOf(".")==5){
-					bidamount=bidamount.toString().substr(0,7)
+					bidamount=bidamount.toString().substr(0,7);
 				}else{
-					bidamount=bidamount.toString().substr(0,6)
+					bidamount=bidamount.toString().substr(0,6);
 				}
 			}
 			tableHtml += '<td class="tt-r"><div>'+bidamount+'</div></td>';
@@ -344,19 +340,32 @@ function appendDatas(datas,flag){
 	submitflag=true;
 	backTopAdjust();
 }
+//关闭遮罩层
+function layerClose(){
+	$("#myModal").modal("hide");
+}
 //
+function noIn(p){
+	var thisId = $(p).attr("dataId");
+	dataId = thisId;
+	if(loginflag){
+		var aHref = "";
+		if(searchvalue != ""){
+			aHref += '.html?kds='+searchvalue;
+		}else{
+			aHref += '.html';
+		}
+		window.open("/article/content/"+thisId+aHref);
+	}else{
+		$('#myModal').modal("show");
+	}
+}
 //
 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   date=myDate.getDate();
 	var hour = myDate.getHours()
 	var min = myDate.getMinutes()
 	if(sl=="l"){

src/web/templates/common/pcbottom.html

@@ -94,7 +94,7 @@
 				</div>
 			</div>
 			<div class="jy_renzheng">
-				<div class="jy_otherlink"><a href="/" target="_bank">剑鱼</a>|<a href="/front/subscribe.html">招标订阅</a>|<a href="/swordfish/searchinfolist.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼博客</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
+				<div class="jy_otherlink"><a href="/" target="_bank">剑鱼</a>|<a href="/front/subscribe.html">招标订阅</a>|<a href="/jylab/supsearch/index.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼博客</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
 				<div style="color: #B9B9BB;" id="cpinfo">©2015-2016 zhaobiao.info 版权所有 | 豫ICP备15016539号-2</div>
 			</div>
 		</div>
@@ -162,13 +162,13 @@
 //
 function areasearch(scope){
 		$("#bottomform").remove();
-		$(".j-bottom").append('<form id="bottomform" action="/swordfish/searchinfolist.html" method="post" class="hide" ><input type="hidden" name="area" value="'+scope+'"></form>');
+		$(".j-bottom").append('<form id="bottomform" action="/jylab/supsearch/index.html" method="post" class="hide" ><input type="hidden" name="area" value="'+scope+'"></form>');
 		$("#bottomform").submit();
 }
 //
 function stypesearch(stype){
 		$("#bottomform").remove();
-		$(".j-bottom").append('<form id="bottomform" action="/swordfish/searchinfolist.html" method="post" class="hide" ><input type="hidden" name="subtype" value="'+stype+'"></form>');
+		$(".j-bottom").append('<form id="bottomform" action="/jylab/supsearch/index.html" method="post" class="hide" ><input type="hidden" name="subtype" value="'+stype+'"></form>');
 		$("#bottomform").submit();
 }
 //

src/web/templates/common/pchead.html

@@ -3,7 +3,7 @@
 		<ul>
 			<li class="j-nav-logo" onclick="window.location.href='/'" style="width:120px;"><a><img src="/images/swordfish/sf_01.png"></a></li>
 				<li class="navigation">
-					<form method="post" action="/swordfish/searchinfolist.html" id="zbSeatchIndex" style="position:relative;">
+					<form method="post" action="/jylab/supsearch/index.html" id="zbSeatchIndex" style="position:relative;">
 			            <span class="j-inputgroup">
 							<input class="nav-search" type="text" name="keywords" placeholder="请输入您要查询的招标信息" value="{{.T.keywords}}" />
 			<!--				<img src="/images/pc_20.png" class="j-clearicon" id="t-clear">-->
@@ -17,7 +17,7 @@
 				<div class='useronline' id="login"></div>
 			</li>
 			<li class="j-nav-link" data-toggle="modal" data-target="#bidcommunity"><a>招标社区</a></li>
-			<li class="j-nav-link" onclick="window.location.href='/swordfish/searchinfolist.html'">
+			<li class="j-nav-link" onclick="window.location.href='/jylab/supsearch/index.html'">
 			<a class="newhead">招标搜索</a></li>
 			<li class="j-nav-link" onclick="window.location.href='/list/stype/NJ.html'"><a>拟建项目</a></li>
 			<li class="j-nav-link" onclick="window.location.href='/front/subscribe.html'"><a>招标订阅</a></li>

src/web/templates/pc/biddingsearch_enterprise.html

@@ -11,7 +11,7 @@
 		<link href="/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<link href="/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<link href="/css/dev2/biddingSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-		<link href="/css/dev2/biddingSearch1.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+		<link href="/css/dev2/superSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<script src="/js/jquery.cookie.js"></script>
 		<script src="/js/biddingSearch.js?v={{Msg "seo" "version"}}"></script>
 		<script language="javascript" type="text/javascript" src="/My97DatePicker/WdatePicker.js"></script>
@@ -106,6 +106,25 @@
 			    left: 198px;
 			    top: 148px;
 			}
+			#labmodalbody .code-close{
+				width: 40px;
+			    height: 40px;
+			    position: absolute;
+			    right: 40px;
+			    top: -20px;
+			    cursor: pointer;
+			    -webkit-transition: all 1s;
+			    -o-transition: all 1s;
+			    -moz-transition: all 1s;
+			    transition: all 1s;
+			}
+			#labmodalbody .code-close:hover{
+				-webkit-transform: scale(1.2);
+				   -moz-transform: scale(1.2);
+				    -ms-transform: scale(1.2);
+				     -o-transform: scale(1.2);
+				        transform: scale(1.2);
+			}
 			.layheader{
 				position: absolute;
 			    color: #fff;
@@ -143,6 +162,7 @@
 		    <div class="modal-dialog">
 		        <div class="modal-content" id="labmodalcont">
 		            <div class="modal-body" id="labmodalbody">
+					<img class="code-close" src="/images/j-wx-code-close.png" alt="" onclick="labClose();">
 						<div class="layheader">
 							<div>超级搜索</div>
 							<div>按行业、金额搜索、结果可按表格显示</div>
@@ -162,12 +182,12 @@
 				<div class="w searchHeader-container">
 					<!--整体页面切换tab-->
 					<div class="control-tabBtn">
-						<a href="#">超级搜索</a>
+						<a href="/jylab/supsearch/index.html">超级搜索</a>
 						<a href="#" class="on">中标企业搜索</a>
 					</div>
 					<!--搜索-->
 					<div class="searchInput clearfix">
-						<form action="/jylab/bidsearchforent.html" method="post" id="zbSeatchT" class="clearfix" onsubmit="return true">
+						<form action="/jylab/bidsearchforent/index.html" method="post" id="zbSeatchT" class="clearfix" onsubmit="return true">
 							<input class="searchname" autocomplete="off" type="search" name="keywords" id="searchinput" value="{{.T.searchvalue}}" placeholder="高速公路" />
 
 							<input type="submit" class="searchBtn" value="搜索" />
@@ -322,7 +342,7 @@
 									<div class="liLuceneList">
 										<div class="luce-left">
 											<div class="left-title">
-												<a href="#"> <em>{{$v.k}}</em>{{$v.projectname}}</a>
+												<a href="/article/content/{{$v._id}}.html"> <em>{{$v.k}}</em>{{$v.projectname}}</a>
 											</div>
 										</div>
 										<div class="luce-right">
@@ -352,7 +372,7 @@
 									<tr>
 										<td>{{$v.k}}</td>
 										<td>{{$v.time2}} </td>
-										<td class="tt-l">{{$v.projectname}}</td>
+										<td class="tt-l"><a href="/article/content/{{$v._id}}.html">{{$v.projectname}}</a></td>
 										<td class="tt-r">{{$v.bidamount}}</td>
 									</tr>
 								{{end}}
@@ -360,7 +380,9 @@
 							</table>
 						</div>
 					</div>
-
+					<div class="hasNoData" style="display: none;">
+						<img src="/images/pc_12.png" id="hasNoData">
+					</div>
 				</div>
 				<!--分页-->
 				<div class="pagination clearfix w">
@@ -383,51 +405,69 @@
 		var areas = {{.T.area}};
 		var searchvalue = {{.T.searchvalue}};
 		
-		//地区回显样式设置
-		if(areas != ""){
-			$("#regionBtn").removeClass("active");
-			areas = areas.split(",");
-			for(var i=0;i<areas.length;i++){
-				$(".region-content>font:not('.parent-node')").each(function(){
-					if($(this).text() == areas[i]){
-						$(this).addClass("active");
-						return false;
-					}
-				});
+		$(function(){
+			haslogin({{.T.logid}});
+			$(".j-nav .j-nav-link:eq(2)").addClass("active");
+			$(window).scroll(function(){
+				if($(this).scrollTop() > 0){
+				$("#backTop").show();
+				}else{
+					$("#backTop").hide();
+				}
+			});
+			
+			//查询数据不存在判断
+			if(mainList == null || mainList.length == 0){
+				$(".tabContainer").hide();
+				$(".pagination").hide();
+				$(".hasNoData").show();
+			}else{
+				$(".tabContainer").show();
+				$(".pagination").show();
+				$(".hasNoData").hide();
 			}
-		}
-		$(".region-content .parent-node").each(function(){
-			var fontLen = $(this).nextUntil(".parent-node").filter("font").length;
-			var activeLen = $(this).nextUntil(".parent-node").filter(".active").length;
-			if(fontLen == activeLen){
-				$(this).addClass("active");
+			//地区回显样式设置
+			if(areas != ""){
+				$("#regionBtn").removeClass("active");
+				areas = areas.split(",");
+				for(var i=0;i<areas.length;i++){
+					$(".region-content>font:not('.parent-node')").each(function(){
+						if($(this).text() == areas[i]){
+							$(this).addClass("active");
+							return false;
+						}
+					});
+				}
+			}
+			$(".region-content .parent-node").each(function(){
+				var fontLen = $(this).nextUntil(".parent-node").filter("font").length;
+				var activeLen = $(this).nextUntil(".parent-node").filter(".active").length;
+				if(fontLen == activeLen){
+					$(this).addClass("active");
+				}
+				if(activeLen >0 && activeLen < fontLen){
+					$(this).addClass("secondActice");
+				}
+			});
+			
+			//搜索关键词回显页面样式设置
+			if(searchvalue != "" && searchvalue != null){
+				$(".seaTender-inner").css({'border':'0px'});
+				$(".lucene-table").css({'padding':'0px','border-bottom':'0px','display':'block'});		
+				$(".tabTitle").addClass("hidden");
+				$(".lucene").attr("style","display:none");
 			}
-			if(activeLen >0 && activeLen < fontLen){
-				$(this).addClass("secondActice");
+			
+			//价格回显样式设置
+			if({{.T.pricetype}} == "y"){
+				$(".Price-content").find("span:first-child").removeClass("active");
+				$(".pricefat").addClass("active");
 			}
-		});
-		
-		//搜索关键词回显页面样式设置
-		if(searchvalue != "" && searchvalue != null){
-			$(".seaTender-inner").css({'border':'0px'});
-			$(".lucene-table").css({'padding':'0px','border-bottom':'0px','display':'block'});		
-			$(".tabTitle").addClass("hidden");
-			$(".lucene").attr("style","display:none");
-		}
-		
-		//价格回显样式设置
-		if({{.T.pricetype}} == "y"){
-			$(".Price-content").find("span:first-child").removeClass("active");
-			$(".pricefat").addClass("active");
-		}
-		
-		$(function(){
-			haslogin({{.T.logid}});
+				
 			
 			//筛选关闭和打开
 			//根据cookie值设置筛选是否显示
 			var rsw = localStorage.getItem("entstore");
-			console.log("00000"+rsw);
 			if(rsw == null){
 				setTimeout(function(){
 					$(".searchTender").stop(false,true).slideDown(1000);
@@ -499,14 +539,9 @@
 			//点击超级搜索按钮
 			$(".superSearch").click(function(){
 				$("#labModal").modal("show");
-			})
-			
-			//关闭登录二维码
-			$(".code-close").click(function(){
-				$("#bidLogin").modal("hide");
-			})
-			
+			})	
         });
+		
 		function beforeSubmit(){			
 			//地区
 			var selectAreas = "";
@@ -530,14 +565,10 @@
 			//搜索关键词
 			var searchname = $("#zbSeatchT input[name='keywords']").val();
 			$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname))
-			console.log("关键词============"+searchname);
 			if(submitflag){	
 				if($.trim(searchname) != ""){
-					console.log("搜索关键词不为空");
 					getTableInfo();
 				}else{
-					console.log("搜索关键词为空"+"--------------------");
-					
 					$(".tabTitle").removeClass("hidden");
 					$(".lucene").attr("style","display:block");
 					$(".lucene-table").attr("style","display:none");
@@ -571,6 +602,17 @@
 				
 			});
 		}
+
+//        function noIn(p){
+//            var thisId = $(p).attr("dataId");
+//            dataId = thisId;
+//			window.open("/article/content/"+thisId+".html");
+//        }
+
+		//关闭超级搜索遮罩层
+		function labClose(){
+			$("#labModal").modal("hide");
+		}
 	</script>
 	</body>
 

src/web/templates/pc/classifylist.html

@@ -172,6 +172,13 @@ a{
 .j-clearicon{
 	right:118px !important;
 }
+.bidbut{
+	background-color: #2cb7ca;
+    color: #fff;
+    font-size: 14px;
+    padding: 4px 22px 5px 23px;
+	cursor: pointer;
+}
 </style>
 <script>
 var industrylist = {{.T.industrylist}}
@@ -260,6 +267,7 @@ $(function(){
 	$("#t-clear").click(function(){
 		$("#t-clear").hide();
 		$("#searchinput").val("").focus();
+		$("#zbSeatchT [name='searchvalue']").val("");
 	})
 })
 </script>
@@ -294,7 +302,7 @@ $(function(){
 			<div class="control-tabBtn">
 				<a href="#" class="on" style="display:none;">超级搜索</a>
 				<span class="bidbut">招标搜索</span>
-				<a href="#">中标企业搜索</a>
+				<a href="/jylab/bidsearchforent/index.html">中标企业搜索</a>
 			</div>
 			<!--搜索-->
 			<div class="searchInput clearfix">

src/web/templates/pc/supsearch.html

@@ -10,7 +10,7 @@
 <link href="/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="/css/dev2/biddingSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="/css/dev2/biddingSearch1.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="/css/dev2/superSearch.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">
@@ -99,7 +99,7 @@ a{
 #keyImg{
 	width:198px;
 }
-#layerImg{
+#labImg{
 	position:absolute;
 	width: 150px !important;
     height: 150px !important;
@@ -161,6 +161,9 @@ a{
 .j-clearicon{
 	right:118px !important;
 }
+.lucene-table tr{
+	cursor:pointer;
+}
 </style>
 <script>
 var areas = {{.T.area}};
@@ -177,6 +180,7 @@ var sortArray = {{.T.sortArray}}
 var list = {{.T.list}}
 var searchvalue = {{.T.searchvalue}};
 var searchvalueArray = searchvalue.split("+");
+var dataId = "";
 $(function(){
 	if(selectType=="all"){
 		$("#newsclass li:nth-child(1) a").addClass("active");
@@ -191,6 +195,7 @@ $(function(){
 	$("#zbSeatchT [name='searchvalue']").val($.trim(keys));
 	$("#searchinput").focus();
 	if($.trim(keys)!=""){
+		$("#t-clear").show();
 		searchvalue = $.trim(keys);
 		searchvalueArray = searchvalue.split("+");
 		$("#newsclass").show();
@@ -232,6 +237,7 @@ $(function(){
 	$("#t-clear").click(function(){
 		$("#t-clear").hide();
 		$("#searchinput").val("").focus();
+		$("#zbSeatchT [name='searchvalue']").val("");
 	})
 	
 	var industryhtml = '<span id="induAll" class="active">全部</span>';
@@ -339,7 +345,7 @@ $(function(){
 					<div>按行业、金额搜索、结果可按表格显示</div>
 				</div>
 				<img src="/images/biddingSearch/labbkimg.png"/>
-				<img id="layerImg" src="/front/share/{{.T.shareid}}"/>
+				<img id="labImg" src="/front/share/{{.T.shareid}}"/>
 			</div>
             <div class="modal-footer">
                 此功能尚处在实验阶段，请扫码进入<br>剑鱼实验室，打开相应开关后，即可体验！
@@ -347,6 +353,24 @@ $(function(){
         </div><!-- /.modal-content -->
     </div><!-- /.modal -->
 </div>
+//
+<div class="modal fade" id="myModal"  tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" >
+  <div class="modal-dialog" style="width:400px;border:0px;" >
+		<div class="j-wx-code" id="myModal-div">
+			<img class="code-close" src="/images/j-wx-code-close.png" alt="" onclick="layerClose();"/>
+			<div class="code-title"></div>
+			<div class="code-wxm"><img id="layerImg" src="/front/share/{{.T.shareid}}"/></div>
+			<div class="code-text">
+				<span><img id="wxpng" src="/images/wx1.png"/>微信扫码登录</span>
+				<br/>
+				<span id="freetext">立即免费使用</span>
+			</div>
+			<div class="code-bottom">
+				<img src="/images/j-wx-cose-move.png" alt=""/>
+			</div>
+		</div>
+  </div>
+</div>
 <section id="searchInner">
 	<!--搜索头部 START-->
 	<div class="searchHeader">
@@ -355,7 +379,7 @@ $(function(){
 			<div class="control-tabBtn">
 				<a href="#" class="on" style="display:none;">超级搜索</a>
 				<span class="bidbut">招标搜索</span>
-				<a href="#">中标企业搜索</a>
+				<a href="/jylab/bidsearchforent/index.html">中标企业搜索</a>
 			</div>
 			<!--搜索-->
 			<div class="searchInput clearfix">
@@ -363,22 +387,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="submit" value="搜索" />
-<!--					<div class="searchSlideText">
-						<ul>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-							<li>滁州市<i>万达集团</i>公司</li>
-							<li>大连<i>万达集团</i>股份有限公司天津共享服务分公司</li>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-							<li>滁州市<i>万达集团</i>公司</li>
-							<li>大连<i>万达集团</i>股份有限公司天津共享服务分公司</li>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-							<li>滁州市<i>万达集团</i>公司</li>
-							<li>大连<i>万达集团</i>股份有限公司天津共享服务分公司</li>
-							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
-						</ul>
-					</div>-->
 					<input type="hidden" name="searchvalue" value="{{.T.keywords}}">
 					<input type="hidden" name="publishtime" value="{{.T.publishtime}}">
 					<input type="hidden" name="timeslot" value="{{.T.timeslot}}">
@@ -674,6 +682,15 @@ $(function(){
 $(function(){
 	haslogin({{.T.logid}});
 	console.log(loginflag+"-------")
+	//点击超级搜索按钮
+	$(".superSearch").click(function(){
+		if(loginflag){
+			$("#labModal").modal("show");
+		}else{
+			$("#bidLogin").modal("show");
+		}
+		
+	})
 	//
 	$(".j-nav .j-nav-link:eq(2)").addClass("active");
 	$(".q-mark").click(function(){

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

@@ -2,7 +2,6 @@
 <head>
     <title>搜索</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
-    <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="no" />
     <meta charset="utf-8">
@@ -121,7 +120,7 @@
            margin: 0px;
             padding: 0px;
         }
-        .inputDiv .history li,.inputDiv .myMsgset li,.inpTitle{
+        .inputDiv .history li,.inputDiv .myMsgset li,.inpTitle_history,.inpTitle_msgset{
             width: 100%;
             height: 38px;
             border-left: 1px solid #e0e0e0;
@@ -138,11 +137,11 @@
         .inputDiv img{
             width: 20px;
         }
-        .inpTitle{
+        .inpTitle_history,.inpTitle_msgset{
             color:#888;
             font-size: 16px;
         }
-        .inpTitle span{
+        .inputDiv span{
             padding-left: 10px;
         }
         #del_history{
@@ -153,6 +152,8 @@
     <script>
         var myHistory={{.T.history}};
         var msgset={{.T.msgset}};
+		var open_supersearch={{.T.open_supersearch}};
+		var open_entsesearch={{.T.open_entsesearch}};
         //initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
         $(function(){
             $(".searchvalue").on("input propertychange",function(){
@@ -176,11 +177,28 @@
                         url:"/swordfish/delWxHistorySearch",
                         success:function(rt){
                             $(".inputDiv .history").find("li").remove();
+							$(".inputDiv .inpTitle_history").addClass("hidden");	
                         }
                     });
                 }
             })
+			//判断是否开启服务
+			if(open_supersearch==true){
+				$("#superSearch").click(function(){window.location.href='/jylab/superSearch';});	
+			}else{
+				$("#superSearch").click(function(){window.location.href='/jylab/index';});	
+			}
+			if(open_entsesearch==true){
+				$("#entseSearch").click(function(){window.location.href='/jylab/entsesearch/search';});
+			}else{
+				$("#entseSearch").click(function(){window.location.href='/jylab/index';});	
+			}
+			//点击帮助
+			$(".help").click(function(){
+			window.open("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=2&sn=379fc869080a36d9d0798a3d4fb9a63a#wechat_redirect");
+		    })
         });
+		//回车搜索
         document.onkeydown = function(e){
             if(!e){
                 e = window.event;
@@ -202,24 +220,33 @@
         function loadTipMsg(myhistory,msgset){
             //历史信息
             if(myhistory!=null){
-                historyHtml ="";
-                for(var i=0;i<myhistory.length;i++){
-                    historyHtml+="<li>"+myhistory[i]+"</li>"
-                }
-                $(".inputDiv .history").html(historyHtml);
+				if(myhistory.length==0){
+					$(".inputDiv .inpTitle_history").addClass("hidden")	
+				}else{
+					 historyHtml ="";
+	                for(var i=0;i<myhistory.length;i++){
+	                    historyHtml+="<li>"+myhistory[i]+"</li>"
+	                }
+	                $(".inputDiv .history").html(historyHtml);
+				}
             }
 
             //订阅信息
             if(msgset!=null){
-                msgsetHtml="";
-                for(var n=0;n<msgset.length;n++){
-                    var  mymsgset="";
-                    for(var m=0;m<msgset[n].length;m++){
-                        mymsgset+=msgset[n][m]+" "
-                    }
-                    msgsetHtml+="<li>"+mymsgset+"</li>";
-                }
-                $(".inputDiv .myMsgset").html(msgsetHtml);
+				
+				if(msgset.length==0){
+					$(".inputDiv .inpTitle_msgset").addClass("hidden")	
+				}else{
+					 msgsetHtml="";
+	                for(var n=0;n<msgset.length;n++){
+	                    var  mymsgset="";
+	                    for(var m=0;m<msgset[n].length;m++){
+	                        mymsgset+=msgset[n][m]+" "
+	                    }
+	                    msgsetHtml+="<li>"+mymsgset+"</li>";
+	                }
+	                $(".inputDiv .myMsgset").html(msgsetHtml);
+				}
             }
 
             //点击提示框内容 进行搜索
@@ -233,17 +260,17 @@
 <body class="mainSearch">
 <!-->顶部搜索<-->
 <div id="searchDiv">
-    <form class="searchform" id="searchform" method="post" action="/jylab/superSearch">
+    <form class="searchform" id="searchform" method="get" action="/jylab/superSearch">
         <div class="wxhead">
             <input class="form-control searchvalue" id="searchvalue" name="searchvalue" maxlength ="50" value="{{if .T.shname}}{{.T.shname}}{{end}}" placeholder="示例：税务局 软件"/>
             <div class="inputDiv hidden">
-                <div class="inpTitle"><img src="/images/search/history.png"><span>历史搜索</span><img id="del_history" src="/images/search/history_clean.png"></div>
+                <div class="inpTitle_history"><img src="/images/search/history.png"><span>历史搜索</span><img id="del_history" src="/images/search/history_clean.png"></div>
                 <div>
                     <ul class="history">
                     </ul>
                 </div>
                 <div style="clear: both"></div>
-                <div class="inpTitle"><img src="/images/search/msgset.png"><span>我的订阅的关键词</span></div>
+                <div class="inpTitle_msgset"><img src="/images/search/msgset.png"><span>我的订阅的关键词</span></div>
                 <div>
                     <ul class="myMsgset">
                     </ul>

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

@@ -36,7 +36,8 @@
             "scope": "",
             "publishtime": "",
             "selectType": "",
-            "money":"",
+            "minprice":"",
+			"maxprice":"",
             "industry":"",
             "pageNum": 1
         };
@@ -44,19 +45,20 @@
         $(function(){
             //loadTipMsg加载历史记录和我的订阅
             loadTipMsg(myHistory,msgset);
-
+					
             //筛选菜单展示or隐藏
-            $(".wxhead").find(".screen").click(function(){
+            $(".wxhead").find(".screen").click(function(){	
                 $(".wxsearch").toggleClass("hidden");
                 $("#selLable").toggleClass("hidden");
 
                 if($("#list").text()==""){
-                    $(".nullcontent").toggleClass("hidden");
+					if(s_words!=""){
+						$(".nullcontent").toggleClass("hidden");	
+					}
                 }else{
                     $("#wrapper").toggleClass("hidden");
                 }
             });
-
             /**********************分页请求start****************************/
 			//铺数据 1.首次跳转传过来的数据  2.页面搜索数据 3.下拉查询数据
             //下拉更新
@@ -185,6 +187,7 @@
                         url:"/swordfish/delWxHistorySearch",
                         success:function(rt){
 							$(".inputDiv .history").find("li").remove();
+							$(".inputDiv .inpTitle_history").addClass("hidden")	
                         }
                     });
                 }
@@ -239,7 +242,6 @@
                     industrySelect+=($(this).attr("data-value"))+",";
                 }
             });
-            console.log(industrySelect.substring(0,industrySelect.length-1));
             reqParam.industry=industrySelect.substring(0,industrySelect.length-1);
 
             //信息类型
@@ -268,9 +270,15 @@
             //金额
             var moneyRange=$(".money-dialog .active").attr("data-value");
             if(moneyRange!="all"){
-                moneyRange=$(".money-dialog .money-inp .minMrice").val()+"-"+$(".money-dialog .money-inp .maxMrice").val()
-            }
-            reqParam.money=moneyRange;
+                //moneyRange=$(".money-dialog .money-inp .minMrice").val()+"-"+$(".money-dialog .money-inp .maxMrice").val()
+       			reqParam.minprice=$(".money-dialog .money-inp .minMrice").val()
+				reqParam.maxprice=$(".money-dialog .money-inp .maxMrice").val()
+			}else{
+				reqParam.minprice="";
+				reqParam.maxprice="";
+			}
+			
+            //reqParam.money=moneyRange;
 
             //日期
             reqParam.publishtime=setPublishtime();
@@ -289,8 +297,6 @@
                 $(".selLable").removeClass("hidden");
                 $(".wxsearch").addClass("hidden");
             }
-
-
             if ($("#list").text() == "") {
                 $("#wrapper").addClass("hidden");
                 $(".nullcontent").removeClass("hidden");
@@ -391,15 +397,26 @@
                 if(area != ""){
                     area = '<span class="location">'+area+'</span>';
                 }
-
-
+				//行业
+				var industry=list[i].industry;
+				if(!industry){
+                    industry="";
+				}else{
+                    industry=$.trim(industry);
+				}
+				if(industry!=""){
+                    industry='<span class="industry">'+industry+'</span>';
+				}
+				//项目
+				var projectname=list[i].projectname==null?"":list[i].projectname;
+				
                 //时间
                 var tdf = list[i].publishtime;
                 var fullTime="";
                 if(tdf){
                     var thisTime=new Date(Number(tdf+"000"))
-					var month=(thisTime.getMonth()+1)>10?(thisTime.getMonth()+1):"0"+(thisTime.getMonth()+1);
-					var date=(thisTime.getDate())>10?(thisTime.getDate()):"0"+(thisTime.getDate());
+					var month=(thisTime.getMonth()+1)>=10?(thisTime.getMonth()+1):"0"+(thisTime.getMonth()+1);
+					var date=(thisTime.getDate())>=10?(thisTime.getDate()):"0"+(thisTime.getDate());
                     fullTime=thisTime.getFullYear()+"<br>"+month+date;
                     tdf = timeDiff(new Date(Number(tdf+"000")));
                     if(tdf != null){
@@ -423,7 +440,22 @@
                 }
 				//招标单位
                 var agency=list[i].agency==null?"":list[i].agency;
-
+				//预算
+				var budget=list[i].budget==null?"":((list[i].budget)/1000+"").substring(0,5);
+				//开标时间
+				var bidopentime=""
+				var optim=list[i].bidopentime;
+				if(optim){
+					var openTime=new Date(Number(optim+"000"));
+					bidopentime=openTime.getFullYear()+"-"+((openTime.getMonth()+1)>=10?(openTime.getMonth()+1):"0"+(openTime.getMonth()+1))+"-"
+					+((openTime.getDate())>=10?(openTime.getDate()):"0"+(openTime.getDate()))+"<br>"+(openTime.getHours()>=10?openTime.getHours():"0"+openTime.getHours())+":"
+					+(openTime.getMinutes()>=10?openTime.getMinutes():"0"+openTime.getMinutes());
+				}
+				//中标单位
+				var winner=list[i].winner==null?"":list[i].winner;
+				//中标金额
+				var bidamount=list[i].bidamount==null?"":(list[i].bidamount/10000+"").substring(0,5);
+				
                 ListHtml += '<div class="tslist">'
                     +'<div class="resnumb">'
                     +'<div class="one">'
@@ -435,18 +467,22 @@
                     +'</div>'
                     +'<div style="clear:both;"></div>'
                     +'<div class="restime time-diff">'
-                    +area+datatype+tdf
+                    +area+datatype+industry+tdf
                     +'</div>'
                     +'<div style="clear:both;"></div>'
                     +detail
                     +'</div>';
                 //
                 TableHtml +='<tr s="'+href+'"  sid="'+list[i]._id+'">'+
-                    '<td>'+index+'</td>'+
-                    '<td>'+fullTime+'</td>'+
-                    '<td>'+datatype+'公告</td>'+
-                    '<td>'+agency+'</td>'+
-                    '<td>'+title+'</td>'+
+                    '<td><div>'+index+'</div></td>'+
+                    '<td><div>'+fullTime+'</div></td>'+
+                    '<td><div>'+datatype+'公告</div></td>'+
+                    '<td><div>'+agency+'</div></td>'+
+                    '<td><div>'+projectname+'</div></td>'+
+					'<td><div>'+budget+'</div></td>'+
+					'<td><div>'+bidopentime+'</div></td>'+
+					'<td><div>'+winner+'</div></td>'+
+					'<td><div>'+bidamount+'</div></td>'+
                     '</tr>'
             }
             html["ListHtml"]=ListHtml;
@@ -457,6 +493,9 @@
         function hasNoData(){ //搜索信息为空
             $(".nullcontent").removeClass("hidden");
             $("#wrapper").addClass("hidden");
+			if(s_words==""){
+				$(".nullcontent").addClass("hidden");
+			}
         }
         function hasData(){ //搜索信息不为空
             $(".nullcontent").addClass("hidden");
@@ -510,7 +549,7 @@
                 var sds = s_words.replace(/\+/g,"+");
                 myredirect(h,sid,sds);
             })
-            $("#table .content").html("<tr><td>序号</td><td>发布时间</td><td>公告类型</td><td>招标单位</td><td>项目名称</td></tr>");
+            $("#table .content").html("<tr><td><div>序号</div></td><td><div>发布时间</div></td><td><div>公告类型</div></td><td><div>招标单位</div></td><td><div>项目名称</div></td><td><div>预算<br>（万元）</div></td><td><div>开标时间</div></td><td>中标单位</td><td><div>中标金额<br>（万元）</div></td></tr>");
             $("#table .content").append(TableHtmlobj);
 
             if(!window.top.isBackIndex){
@@ -539,27 +578,36 @@
         }
        	function loadTipMsg(myhistory,msgset){
 		//历史信息
-			if(myhistory!=null){
-                historyHtml ="";
-                for(var i=0;i<myhistory.length;i++){
-                    historyHtml+="<li>"+myhistory[i]+"</li>"
-                }
-                $(".inputDiv .history").html(historyHtml);
-			}
-
-		//订阅信息
-			if(msgset!=null){
-                msgsetHtml="";
-                for(var n=0;n<msgset.length;n++){
-                    var  mymsgset="";
-                    for(var m=0;m<msgset[n].length;m++){
-                        mymsgset+=msgset[n][m]+" "
-                    }
-                    msgsetHtml+="<li>"+mymsgset+"</li>";
-                }
-                $(".inputDiv .myMsgset").html(msgsetHtml);
-			}
+            if(myhistory!=null){
+				if(myhistory.length==0){
+					$(".inputDiv .inpTitle_history").addClass("hidden")	
+				}else{
+					$(".inputDiv .inpTitle_history").removeClass("hidden")	
+					 historyHtml ="";
+	                for(var i=0;i<myhistory.length;i++){
+	                    historyHtml+="<li>"+myhistory[i]+"</li>"
+	                }
+	                $(".inputDiv .history").html(historyHtml);
+				}
+            }
 
+            //订阅信息
+            if(msgset!=null){
+				if(msgset.length==0){
+					$(".inputDiv .inpTitle_msgset").addClass("hidden")	
+				}else{
+					$(".inputDiv .inpTitle_msgset").removeClass("hidden")
+					 msgsetHtml="";
+	                for(var n=0;n<msgset.length;n++){
+	                    var  mymsgset="";
+	                    for(var m=0;m<msgset[n].length;m++){
+	                        mymsgset+=msgset[n][m]+" "
+	                    }
+	                    msgsetHtml+="<li>"+mymsgset+"</li>";
+	                }
+	                $(".inputDiv .myMsgset").html(msgsetHtml);
+				}
+            }
 		//点击提示框内容 进行搜索
             $(".inputDiv li").click(function () {
                 $("input[name=searchvalue]").val($(this).text());
@@ -577,13 +625,13 @@
 		<form class="searchform" id="searchform" method="post" action="/jylab/superSearch" >
 			<input class="form-control searchvalue slistbkc" name="searchvalue" maxlength ="50" value="{{if .T.searchvalue}}{{.T.searchvalue}}{{end}}" placeholder="示例：税务局 软件"/>
 			<div class="inputDiv hidden">
-				<div class="inpTitle"><img src="/images/search/history.png"><span>历史搜索</span><img id="del_history" src="/images/search/history_clean.png"></div>
+				<div class="inpTitle_history"><img src="/images/search/history.png"><span>历史搜索</span><img id="del_history" src="/images/search/history_clean.png"></div>
 					<div>
 						<ul class="history">
 						</ul>
 					</div>
 					<div style="clear: both"></div>
-				<div class="inpTitle"><img src="/images/search/msgset.png"><span>我的订阅的关键词</span></div>
+				<div class="inpTitle_msgset"><img src="/images/search/msgset.png"><span>我的订阅的关键词</span></div>
 					<div>
 						<ul class="myMsgset">
 						</ul>
@@ -625,129 +673,6 @@
 							</li>
 						</ul>
 					</div>
-					<!--<ul class="hyHead">
-						<li class="on">全部</li>
-						<li>建筑工程</li>
-						<li>水利水电</li>
-						<li>能源化工</li>
-						<li>弱点安防</li>
-						<li>信息技术</li>
-						<li>行政办公</li>
-						<li>机械设备</li>
-						<li>交通工程</li>
-						<li>医疗卫生</li>
-						<li>市政设施</li>
-						<li>服务采购</li>
-					</ul>
-					<div class="hyBody">
-
-						<div style="display: block;" class="iner-list">
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="建筑工程_勘察设计,建筑工程_工程施工,建筑工程_工程监理,建筑工程_材料设备">全部</li>
-								<li  data-value="建筑工程_勘察设计">勘察设计</li>
-								<li  data-value="建筑工程_工程施工">工程施工</li>
-								<li  data-value="建筑工程_工程监理">工程监理</li>
-								<li  data-value="建筑工程_材料设备">材料设备</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="水利水电_水利工程,水利水电_发电工程,水利水电_航运工程,水利水电_其他工程">全部</li>
-								<li  data-value="水利水电_水利工程">水利工程</li>
-								<li  data-value="水利水电_发电工程">发电工程</li>
-								<li  data-value="水利水电_航运工程">航运工程</li>
-								<li  data-value="水利水电_其他工程">其他工程</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="能源化工_原材料,能源化工_仪器仪表,能源化工_设备,能源化工_化工产品,能源化工_新能源">全部</li>
-								<li  data-value="能源化工_原材料">原材料</li>
-								<li  data-value="能源化工_仪器仪表">仪器仪表</li>
-								<li  data-value="能源化工_设备">设备</li>
-								<li  data-value="能源化工_化工产品">化工产品</li>
-								<li  data-value="能源化工_新能源">新能源</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="弱点安防_综合布线,弱点安防_智能系统,弱点安防_智能家居">全部</li>
-								<li  data-value="弱点安防_综合布线">综合布线</li>
-								<li  data-value="弱点安防_智能系统">智能系统</li>
-								<li  data-value="弱点安防_智能家居">智能家居</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="信息技术_系统集成及安全,信息技术_软件开发,信息技术_运维服务,信息技术_其他">全部</li>
-								<li  data-value="信息技术_系统集成及安全">系统集成及安全</li>
-								<li  data-value="信息技术_软件开发">软件开发</li>
-								<li  data-value="信息技术_运维服务">运维服务</li>
-								<li  data-value="信息技术_其他">其他</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="行政办公_办公家具,行政办公_通用办公设备,行政办公_专业设备,行政办公_办公用品">全部</li>
-								<li  data-value="行政办公_办公家具">办公家具</li>
-								<li  data-value="行政办公_通用办公设备">通用办公设备</li>
-								<li  data-value="行政办公_专业设备">专业设备</li>
-								<li  data-value="行政办公_办公用品">办公用品</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="机械设备_农业机械,机械设备_矿山机械,机械设备_工程机械,机械设备_机械零部件,机械设备_机床,机械设备_车辆,机械设备_其他机械设备">全部</li>
-								<li  data-value="机械设备_农业机械">农业机械</li>
-								<li  data-value="机械设备_矿山机械">矿山机械</li>
-								<li  data-value="机械设备_工程机械">工程机械</li>
-								<li  data-value="机械设备_机械零部件">机械零部件</li>
-								<li  data-value="机械设备_机床">机床</li>
-								<li  data-value="机械设备_车辆">车辆</li>
-								<li  data-value="机械设备_其他机械设备">其他机械设备</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="交通工程_隧道工程,交通工程_轨道工程,交通工程_桥梁工程,交通工程_其他工程">全部</li>
-								<li  data-value="交通工程_隧道工程">隧道工程</li>
-								<li  data-value="交通工程_轨道工程">轨道工程</li>
-								<li  data-value="交通工程_桥梁工程">桥梁工程</li>
-								<li  data-value="交通工程_其他工程">其他工程</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="医疗卫生_设备,医疗卫生_耗材,医疗卫生_药品">全部</li>
-								<li  data-value="医疗卫生_设备">设备</li>
-								<li  data-value="医疗卫生_耗材">耗材</li>
-								<li  data-value="医疗卫生_药品">药品</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="市政设施_市政道路,市政设施_市政绿化,市政设施_管道线路,市政设施_综合项目">全部</li>
-								<li  data-value="市政设施_市政道路">市政道路</li>
-								<li  data-value="市政设施_市政绿化">市政绿化</li>
-								<li  data-value="市政设施_管道线路">管道线路</li>
-								<li  data-value="市政设施_综合项目">综合项目</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="服务采购_法律咨询,服务采购_会计服务,服务采购_物业服务,服务采购_审计服务,服务采购_安保服务，服务采购_物流服务，服务采购_其他服务">全部</li>
-								<li  data-value="服务采购_法律咨询">法律咨询</li>
-								<li  data-value="服务采购_会计服务">会计服务</li>
-								<li  data-value="服务采购_物业服务">物业服务</li>
-								<li  data-value="服务采购_审计服务">审计服务</li>
-								<li  data-value="服务采购_安保服务">安保服务</li>
-								<li  data-value="服务采购_物流服务">物流服务</li>
-								<li  data-value="服务采购_其他服务">其他服务</li>
-							</ul>
-						</div>
-					</div>-->
 				</div>
 				<!-->金额<-->
 				<div class="money-dialog hidden">
@@ -895,25 +820,18 @@
 		</div>
 		<div id="wrapper">
 			<div id="list" ></div>
-			<!--<div id="table" class="hidden">
-				<table class="content">
-					<tr>
-						<td>序号</td>
-						<td>发布时间</td>
-						<td>公告类型</td>
-						<td>招标单位</td>
-						<td>项目名称</td>
-					</tr>
-				</table>
-			</div>-->
 			<div id="table" class="hidden">
 				<div class="data"><table class="content">
 					<tr>
-						<td>序号</td>
-						<td>发布时间</td>
-						<td>公告类型</td>
-						<td>招标单位</td>
-						<td>项目名称</td>
+						<td><div>序号</div></td>
+						<td><div>发布时间</div></td>
+						<td><div>公告类型</div></td>
+						<td><div>招标单位</div></td>
+						<td><div>项目名称</div></td>
+						<td><div>预算<br>（万元）</div></td>
+						<td><div>开标时间</div></td>
+						<td><div>中标单位</div></td>
+						<td><div>中标金额<br>（万元）</div></td>
 					</tr>
 				</table></div>
 				<div class="TableTip">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>

src/web/templates/weixin/wxpush.html

@@ -43,6 +43,10 @@ $(function(){
 	var tabletype = ""
 	var tableptname = ""
 	var tableagency = ""
+	var budget = ""
+	var bidopentime = ""
+	var winner = ""
+	var bidamount = ""
 	if(bmatch){
 		$(".findnull").hide();
 	}else{
@@ -59,6 +63,10 @@ $(function(){
 			projectname[i]=o_pushinfo[i]["projectname"];
 			projectid[i]=o_pushinfo[i]["projectid"];
 			agency[i]=o_pushinfo[i]["agency"];
+			budget[i]=o_pushinfo[i]["budget"];
+			bidopentime[i]=o_pushinfo[i]["bidopentime"];
+			winner[i]=o_pushinfo[i]["winner"];
+			bidamount[i]=o_pushinfo[i]["bidamount"];
 		}
 	}
 	if(typeof(s_words) != "undefined" && s_words.length > 0){
@@ -97,6 +105,10 @@ $(function(){
 					'<td>公告类型</td>'+
 					'<td>招标单位</td>'+
 					'<td>项目名称</td>'+
+					'<td>预算<br>（万元）</td>'+
+					'<td>开标时间</td>'+
+					'<td>中标单位</td>'+
+					'<td>中标金额<br>（万元）</td>'+
 					'</tr>'+
 					'</thead>'+
 					'<tbody>';
@@ -183,8 +195,48 @@ $(function(){
 					'<td>'+tabletime+'</td>'+
 					'<td>'+tabletype+'公告</td>'+
 					'<td>'+tableagency+'</td>'+
-					'<td>'+tableptname+'</td>'+
-					'</tr>'
+					'<td>'+tableptname+'</td>'
+					
+		
+		if(typeof(budget[xh]) != "undefined" && budget[xh] != null && budget[xh] != ""){
+			var budgetone =parseInt(budget[xh])/10000
+			if(budgetone.toString().length>6){
+				if(budgetone.toString().indexOf(".")==5){
+					budgetone=budgetone.toString().substr(0,7)
+				}else{
+					budgetone=budgetone.toString().substr(0,6)
+				}
+			}
+			tablehtml += '<td>'+budgetone+'</td>';
+		}else{
+			tablehtml += '<td></td>';
+		}
+		
+		if(typeof(bidopentime[xh]) != "undefined" && bidopentime[xh] != null && bidopentime[xh] != ""){
+			var diff = formatDate(Number(bidopentime[xh]),"l");
+			tablehtml += '<td><div>'+diff+'</div></td>';
+		}else{
+			tablehtml += '<td><div></div></td>';
+		}
+		if(typeof(winner[xh]) != "undefined" && winner[xh] != null && winner[xh] != ""){
+			tablehtml += '<td class="tt-l"><div>'+winner[xh]+'</div></td>';
+		}else{
+			tablehtml += '<td class="tt-l"><div></div></td>';
+		}
+		if(typeof(bidamount[xh]) != "undefined" && bidamount[xh] != null && bidamount[xh] != ""){
+			var bidamountone = parseInt(bidamount[xh])/10000
+			if(bidamountone.toString().length>6){
+				if(bidamountone.toString().indexOf(".")==5){
+					bidamountone=bidamountone.toString().substr(0,7)
+				}else{
+					bidamountone=bidamountone.toString().substr(0,6)
+				}
+			}
+			tablehtml += '<td class="tt-r"><div>'+bidamountone+'</div></td>';
+		}else{
+			tablehtml += '<td class="tt-r"><div></div></td>';
+		}
+		tablehtml +='</tr>'
 	});
 	tablehtml +='</tbody></table>';
 	$("#jytables").append(tablehtml);
@@ -233,20 +285,33 @@ function tablejump(eid,href){
 		newredirect(zbadd,href,eid,sds);
 	}
 }
+
 //
-function   formatDate(date)   { 
+function formatDate(date,sl)   { 
 	var myDate = new Date(date*1000);      
     var   year=myDate.getFullYear();
-    var   month=myDate.getMonth()+1;    
-	if(month<10){
+    var   month=myDate.getMonth()+1; 
+	if(month<10&&sl!="1"){
 		month="0"+month
 	} 
     var   date=myDate.getDate();      
-	if(date<10){
+	if(date<10&&sl!="1"){
 		date="0"+date
 	} 
-    return   year+" "+month+""+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+"<br>"+month+""+date; 
+	}
+}
 //
 function open_window(link){
 	if(!/^http/.test(link)){
@@ -371,6 +436,7 @@ a{
 #jytables{
 	/*不需要可自己删除*/
 	padding: .2rem;
+	width:880px;
 }
 #jytables table{
 	width: 100%;
@@ -400,9 +466,6 @@ a{
 	width: 100%;
     overflow-x: scroll;
 }
-#jytables{
-	width: 525px;
-}
 #jytables thead>tr>td:nth-child(1){
 	padding:.3rem 0;
 	width:30px;
@@ -432,6 +495,21 @@ a{
 .blue{
 	color:#0987ff;
 }
+#jytables tbody>tr>td:nth-child(6){
+	width:70px;
+}
+#jytables tbody>tr>td:nth-child(7){
+	width:85px;
+}
+#jytables tbody>tr>td:nth-child(8) div{
+	width:110px;
+}
+#jytables tbody>tr>td:nth-child(8){
+	width:110px;
+}
+#jytables tbody>tr>td:nth-child(9){
+	width:72px;
+}
 </style>
 </head>