分支合并

README.md

@@ -5,4 +5,5 @@ web用xweb框架
 
 v2.8.5
 1.订阅付费
-2.增加对模板消息变更的支持
+2.增加对模板消息变更的支持
+

src/jfw/front/entsearch.go

@@ -4,23 +4,21 @@ import (
 	"fmt"
 	"jfw/config"
 	"jfw/jylabutil"
+
 	//"math/rand"
 	"qfw/util"
 	"strconv"
+
 	//"time"
 
 	"github.com/go-xweb/xweb"
-	"gopkg.in/mgo.v2/bson"
 )
 
 type Entsearch struct {
 	*xweb.Action
-
-	bidsearchforentindex  xweb.Mapper `xweb:"/jylab/bidsearchforent/index.html"`
-	pcSearchZbqyAjax      xweb.Mapper `xweb:"/jylab/pcSearchZbqyAjax"`
-	recList               xweb.Mapper `xweb:"/jylab/bidsearchforent/recList"`
-	searchEntAndSupStatus xweb.Mapper `xweb:"/jylab/searchEntAndSupStatus"`
-	changeEntAndSupStatus xweb.Mapper `xweb:"/jylab/changeEntAndSupStatus"`
+	bidsearchforentindex xweb.Mapper `xweb:"/jylab/bidsearchforent/index.html"`
+	pcSearchZbqyAjax     xweb.Mapper `xweb:"/jylab/pcSearchZbqyAjax"`
+	recList              xweb.Mapper `xweb:"/jylab/bidsearchforent/recList"`
 }
 
 func init() {
@@ -35,13 +33,6 @@ func (e *Entsearch) Bidsearchforentindex() error {
 	}
 	e.T["logid"] = config.Seoconfig["jyzbqyss"].(string)
 	userid := util.ObjToString(e.GetSession("userId"))
-	var supstatus = ""
-	if userid != "" {
-		if jylabutil.IsAuthorized(userid, "i_supersearch") {
-			supstatus = "T"
-		}
-	}
-	e.T["supstatus"] = supstatus
 	searchvalue := e.GetString("searchvalue")
 	area := e.GetString("area")
 	pricetype := e.GetString("pricetype")
@@ -195,32 +186,3 @@ func (e *Entsearch) RecList() {
 		})
 	}
 }
-
-//查中标企业搜索和超级搜索提示的状态
-func (e *Entsearch) SearchEntAndSupStatus() error {
-	defer util.Catch()
-	userid := util.ObjToString(e.GetSession("userId"))
-	user, ok := mongodb.FindById("user", userid, `{"s_entstatus":1,"s_supstatus":1}`)
-	if ok && user != nil && len(*user) > 0 {
-		e.ServeJson(map[string]interface{}{
-			"s_entstatus": (*user)["s_entstatus"],
-			"s_supstatus": (*user)["s_supstatus"],
-		})
-	}
-	return nil
-}
-
-//修改中标企业搜索和超级搜索提示的状态
-func (e *Entsearch) ChangeEntAndSupStatus() error {
-	defer util.Catch()
-	userid := util.ObjToString(e.GetSession("userId"))
-	data := e.GetString("data")
-	if data == "ent" {
-		set := bson.M{"$set": bson.M{"s_entstatus": "y"}}
-		mongodb.UpdateById("user", userid, set)
-	} else {
-		set := bson.M{"$set": bson.M{"s_supstatus": "y"}}
-		mongodb.UpdateById("user", userid, set)
-	}
-	return nil
-}

src/jfw/front/front.go

@@ -67,7 +67,6 @@ type Front struct {
 	urlrecord          xweb.Mapper `xweb:"/front/urlrecord.*"`
 	isrecord           xweb.Mapper `xweb:"/front/isrecord/(.*)"`
 	praise             xweb.Mapper `xweb:"/swordfish/praise"`
-	getpraise          xweb.Mapper `xweb:"/swordfish/getpraise"`
 	aboutsearch        xweb.Mapper `xweb:"/swordfish/aboutsearch"`
 	aboutSR            xweb.Mapper `xweb:"/swordfish/aboutsearchresult"`
 	delOL              xweb.Mapper `xweb:"/swordfish/delovertimelist"` //手动删除30天无更新数据

src/jfw/front/laboratory.go

@@ -3,14 +3,12 @@ package front
 import (
 	"fmt"
 	"jfw/config"
-	jylabutil "jfw/jylabutil"
 	"jfw/jyutil"
 	"jfw/wx"
 	"qfw/util"
-	"qfw/util/redis"
 
 	"github.com/go-xweb/xweb"
-	"gopkg.in/mgo.v2/bson"
+
 	//"net/url"
 	"jfw/public"
 	"net/url"
@@ -19,11 +17,9 @@ import (
 type Lab struct {
 	*xweb.Action
 	/********************剑鱼标讯实验室dev2.0**************************/
-	index          xweb.Mapper `xweb:"/jylab/index"`             //实验室首页
-	labMode        xweb.Mapper `xweb:"/jylab/laboratory/(\\w+)"` //智能订阅
-	operation      xweb.Mapper `xweb:"/jylab/operation"`         //用户操作按钮
-	qrToLab        xweb.Mapper `xweb:"/jylab/qrToLab/(.*)"`      //pc端扫码进入实验室首页
-	qrToLabSubpage xweb.Mapper `xweb:"/jylab/qr/(.*)"`           //pc端扫码进入实验室子页
+	index          xweb.Mapper `xweb:"/jylab/index"`        //实验室首页
+	qrToLab        xweb.Mapper `xweb:"/jylab/qrToLab/(.*)"` //pc端扫码进入实验室首页
+	qrToLabSubpage xweb.Mapper `xweb:"/jylab/qr/(.*)"`      //pc端扫码进入实验室子页
 }
 
 //
@@ -31,75 +27,6 @@ func init() {
 	xweb.AddAction(&Lab{})
 }
 
-//
-func (l *Lab) Operation() error {
-	defer util.Catch()
-	userid := util.ObjToString(l.GetSession("userId"))
-	if userid == "" {
-		return l.Redirect("/swordfish/about")
-	}
-	thistype := l.GetString("type")
-	labswitch := l.GetString("labswitch")
-	tp := l.GetString("tp")
-	typeswitch := ""
-	switchflag := 0
-	flag := "F"
-	var set bson.M
-	switch tp {
-	case "swt":
-		if labswitch == "O" {
-			switchflag = 1
-		}
-		if thistype == "zndy" {
-			typeswitch = "i_smartset"
-		} else if thistype == "sjdc" {
-			typeswitch = "i_dataexport"
-		} else if thistype == "cjss" {
-			typeswitch = "i_supersearch"
-			if l.GetSession("qrToLab") != nil && userid != "" {
-				redis.Put("other", "qrToLab_open_"+userid, 1, 5*60)
-			}
-		} else if thistype == "zbqy" {
-			typeswitch = "i_entsesearch"
-		} else if thistype == "gzqy" {
-			typeswitch = "i_followent"
-		}
-		if jylabutil.UpdateAuthory(userid, typeswitch, switchflag) {
-			flag = "T"
-		}
-	case "popup":
-		if thistype == "zndy" {
-			set = bson.M{
-				"i_smartsetiknow": 1,
-			}
-		} else if thistype == "sjdc" {
-			set = bson.M{
-				"i_dataexportiknow": 1,
-			}
-		} else if thistype == "cjss" {
-			set = bson.M{
-				"i_supersearchiknow": 1,
-			}
-		} else if thistype == "zbqy" {
-			set = bson.M{
-				"i_entsesearchiknow": 1,
-			}
-		} else if thistype == "gzqy" {
-			set = bson.M{
-				"i_followentiknow": 1,
-			}
-		}
-		if mongodb.Update("user", `{"_id":"`+userid+`"}`, bson.M{"$set": set}, false, false) {
-			flag = "T"
-		}
-	}
-
-	l.ServeJson(map[string]interface{}{
-		"flag": flag,
-	})
-	return nil
-}
-
 //剑鱼标讯实验室首页
 func (l *Lab) Index() error {
 	defer util.Catch()
@@ -112,7 +39,8 @@ func (l *Lab) Index() error {
 	l.T["nickname"] = l.Session().Get("s_nickname").(string)
 	l.T["avatar"] = l.Session().Get("s_avatar").(string)
 	l.T["s_m_openid"] = se.EncodeString(openid)
-	return l.Render("/weixin/jylab/lab-index.html", &l.T)
+	return l.Render("/weixin/jylab/lab-close.html", &l.T)
+	// return l.Render("/weixin/jylab/lab-index.html", &l.T)
 }
 
 //剑鱼标讯实验室-智能订阅
@@ -123,7 +51,7 @@ func (l *Lab) LabMode(mode string) error {
 	if userid == "" {
 		return l.Redirect("/swordfish/about")
 	}
-	tmp, ok := mongodb.FindById("user", userid, `{"i_smartset":1,"i_dataexport":1,"i_supersearch":1,"i_entsesearch":1,"i_followent":1,"i_smartsetiknow":1,"i_dataexportiknow":1,"i_supersearchiknow":1,"i_entsesearchiknow":1,"i_followentiknow":1,"s_headimage":1,"s_nickname":1}`)
+	tmp, ok := mongodb.FindById("user", userid, `{"s_headimage":1,"s_nickname":1}`)
 	if !ok || tmp == nil || len(*tmp) == 0 {
 		return nil
 	}
@@ -131,52 +59,12 @@ func (l *Lab) LabMode(mode string) error {
 	l.T["signature"] = wx.SignJSSDK(l.Site() + l.Url())
 	l.T["nickname"] = (*tmp)["s_nickname"]
 	l.T["avatar"] = (*tmp)["s_headimage"]
-	if mode == "zndy" { //剑鱼标讯实验室-智能订阅
-		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_smartset")
-		l.T["iknow"] = (*tmp)["i_smartsetiknow"]
-		return l.Render("/weixin/jylab/lab-zndy.html", &l.T)
-	}
-	if mode == "sjdc" { //剑鱼标讯实验室-数据导出
-		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_dataexport")
-		l.T["iknow"] = (*tmp)["i_dataexportiknow"]
-		return l.Render("/weixin/jylab/lab-sjdc.html", &l.T)
-	}
-	if mode == "cjss" { //剑鱼标讯实验室-超级搜索
-		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_supersearch")
-		l.T["iknow"] = (*tmp)["i_supersearchiknow"]
-		return l.Render("/weixin/jylab/lab-cjss.html", &l.T)
-	}
-	if mode == "zbqy" { //剑鱼标讯实验室-中标企业
-		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_entsesearch")
-		l.T["iknow"] = (*tmp)["i_entsesearchiknow"]
-		return l.Render("/weixin/jylab/lab-zbqy.html", &l.T)
-	}
-	if mode == "gzqy" { //剑鱼标讯实验室-关注企业
-		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_followent")
-		l.T["iknow"] = (*tmp)["i_followentiknow"]
-		return l.Render("/weixin/jylab/lab-gzqy.html", &l.T)
-	}
 	return l.Render("/weixin/jylab/lab-index.html", &l.T)
 }
 
 //pc端扫码进入实验室
 func (l *Lab) QrToLab(t string) error {
-	userId := l.GetSession("userId")
-	if userId == nil {
-		return nil
-	}
-	redis.Put("other", "qrToLab_"+userId.(string), 1, 10*60)
-	l.SetSession("qrToLab", true)
-	if t == "s" {
-		return l.Redirect("/jylab/laboratory/cjss")
-	} else if t == "e" {
-		return l.Redirect("/jylab/laboratory/zbqy")
-	} else if t == "d" {
-		return l.Redirect("/jylab/laboratory/sjdc")
-	} else {
-		return l.Redirect("/jylab/index")
-	}
-
+	return l.Redirect("/jylab/index")
 }
 
 //pc端扫码进入实验室子页面
@@ -189,7 +77,7 @@ func (l *Lab) QrToLabSubpage(t string) error {
 			if code != "" {
 				openid := jyutil.Getopenid(code)
 				FindUserAndCreateSess(openid, l.Session())
-				return l.Redirect("/jylab/laboratory/" + t)
+				return l.Redirect("/jylab/index")
 			} else {
 				return nil
 			}
@@ -202,6 +90,6 @@ func (l *Lab) QrToLabSubpage(t string) error {
 			}
 		}
 	} else {
-		return l.Redirect("/jylab/laboratory/" + t)
+		return l.Redirect("/jylab/index")
 	}
 }

src/jfw/front/supsearch.go

@@ -141,15 +141,9 @@ func (p *Pcsearch) Getstatus() error {
 	var supstatus, entstatus, tablepro, dataexportstatus, portraitpower, followent, smartstatus bool
 	if userid := util.ObjToString(p.GetSession("userId")); userid != "" {
 		user, b := mongodb.FindById("user", userid,
-			`{"i_supersearch":1,"i_entsesearch":1,"i_tablepro":1,"i_dataexport":1,"i_portraitpower":1,"i_followent":1,"i_smartset":1}`)
+			`{"i_tablepro":1}`)
 		if len(*user) > 0 && b {
-			supstatus = util.Int64All((*user)["i_supersearch"]) == 1
-			entstatus = util.Int64All((*user)["i_entsesearch"]) == 1
 			tablepro = util.Int64All((*user)["i_tablepro"]) == 1
-			dataexportstatus = util.Int64All((*user)["i_dataexport"]) == 1
-			portraitpower = util.Int64All((*user)["i_portraitpower"]) == 1
-			followent = util.Int64All((*user)["i_followent"]) == 1
-			smartstatus = util.Int64All((*user)["i_smartset"]) == 1
 		}
 	}
 	p.ServeJson(map[string]interface{}{
@@ -168,8 +162,31 @@ func (p *Pcsearch) Getstatus() error {
 func (p *Pcsearch) GetNewBids() error {
 	pagenum, _ := p.GetInteger("pageNumber")
 	pageType := p.GetString("pageType")
+
+	list := util.ObjArrToMapArr(Newbids(pageType)[pagenum-1].([]interface{}))
+	if pageType == "" { //最新招标信息仅第一页条展示表格多字段
+		for k, v := range list {
+			if pagenum == 1 && k < 20 {
+				continue
+			}
+			delete(v, "areaadd")
+			delete(v, "bidopentime")
+			delete(v, "buyer")
+			delete(v, "indadd")
+			delete(v, "k")
+			delete(v, "projectcode")
+			delete(v, "projectname")
+			delete(v, "stypeadd")
+			delete(v, "winner")
+			delete(v, "timetemp")
+			delete(v, "budget")
+			delete(v, "s_subscopeclass")
+			delete(v, "toptype")
+		}
+	}
+
 	p.ServeJson(map[string]interface{}{
-		"list": Newbids(pageType)[pagenum-1],
+		"list": list,
 	})
 	return nil
 }
@@ -183,13 +200,6 @@ func (p *Pcsearch) PcSearchIndex() error {
 	}
 	p.T["logid"] = config.Seoconfig["jysslby"].(string)
 	fmt.Println("logid:", config.Seoconfig["jysslby"].(string))
-	var supstatus = ""
-	if userid := util.ObjToString(p.GetSession("userId")); userid != "" {
-		if jylabutil.IsAuthorized(userid, "i_supersearch") {
-			supstatus = "T"
-		}
-	}
-	p.T["supstatus"] = supstatus
 	keywords := p.GetString("keywords")
 	area := p.GetString("area")                            //地区
 	publishtime := p.GetString("publishtime")              //发布时间

src/jfw/front/swordfish.go

@@ -76,53 +76,6 @@ func (m *Front) Praise() error {
 	return nil
 }
 
-func (m *Front) Getpraise() error {
-	defer util.Catch()
-	thistype := m.GetString("type")
-	praiseno := 125
-	switchstatus := 0
-	if m.Session().Get("userId") == nil {
-		return m.Redirect("/swordfish/about")
-	}
-	util.Try(func() {
-		data := make(map[string]interface{})
-		pdata, _ := mongodb.FindOneByField("praise", `{"s_type":"`+thistype+`"}`, `{"s_no":1}`)
-		userid := m.Session().Get("userId")
-		tmp, _ := mongodb.FindById("user", userid.(string), `{"i_smartset":1,"i_dataexport":1,"i_supersearch":1,"i_entsesearch":1,"i_followent":1,"i_smartsetiknow":1,"i_dataexportiknow":1,"i_supersearchiknow":1,"i_entsesearchiknow":1,"i_followentiknow":1}`)
-		if thistype == "zndy" {
-			data["s_name"] = "剑鱼标讯实验室-智能订阅"
-			switchstatus = util.IntAll((*tmp)["i_smartset"])
-		} else if thistype == "sjdc" {
-			data["s_name"] = "剑鱼标讯实验室-数据导出"
-			switchstatus = util.IntAll((*tmp)["i_dataexport"])
-		} else if thistype == "cjss" {
-			data["s_name"] = "剑鱼标讯实验室-超级搜索"
-			switchstatus = util.IntAll((*tmp)["i_supersearch"])
-		} else if thistype == "zbqy" {
-			data["s_name"] = "剑鱼标讯实验室-中标企业"
-			switchstatus = util.IntAll((*tmp)["i_entsesearch"])
-		} else if thistype == "gzqy" {
-			data["s_name"] = "剑鱼标讯实验室-关注企业"
-			switchstatus = util.IntAll((*tmp)["i_followent"])
-		}
-		if len(*pdata) == 0 {
-			data["s_type"] = thistype
-			data["s_no"] = 125
-			data["l_date"] = time.Now().Unix()
-			mongodb.Save("praise", data)
-		} else {
-			praiseno = util.IntAll((*pdata)["s_no"])
-		}
-	}, func(e interface{}) {
-		log.Println("剑鱼标讯实验室取赞出错", e)
-	})
-	m.ServeJson(map[string]interface{}{
-		"praiseno":     praiseno,
-		"switchstatus": switchstatus,
-	})
-	return nil
-}
-
 //剑鱼标讯pc首页
 func (m *Front) NewSordfish() error {
 	ispc, _ := m.GetInteger("ispc")
@@ -451,16 +404,9 @@ func (m *Front) Searchinfolist(p string) error {
 //ajax分页请求
 func (m *Front) PcAjaxReq() {
 	tabularflag := m.GetString("tabularflag")
-	if tabularflag == "Y" {
+	if tabularflag == "Y" && m.GetSession("userId") == nil {
 		//判断用户是否登录进行表格查询，否则返回基本数据
-		if m.GetSession("userId") != nil {
-			//验证用户是否开启超级搜索进行表格查询，否则返回基本数据
-			if !jylabutil.IsAuthorized(m.GetSession("userId").(string), "i_supersearch") {
-				tabularflag = ""
-			}
-		} else {
-			tabularflag = ""
-		}
+		tabularflag = ""
 	}
 	reqType := m.GetString("reqType")
 	//获取最新招标信息
@@ -874,7 +820,6 @@ func (m *Front) WxsearchlistPaging() {
 	var secRel *[]map[string]interface{}
 	pageNum, _ := m.GetInteger("pageNum")
 	if userid != nil && pageNum <= wx_maxPageNum {
-		open_supersearch := jylabutil.IsAuthorized(userid.(string), "i_supersearch")
 		//历史记录和订阅查询
 		one, _ := mongodb.FindOneByField("user", bson.M{"_id": bson.ObjectIdHex(userid.(string))}, `{"o_jy":1}`)
 		history := redis.GetStr("other", "s_"+userid.(string))
@@ -913,18 +858,10 @@ func (m *Front) WxsearchlistPaging() {
 				s_word := ""
 				if limitFlag {
 					if pageNum == 1 {
-						if open_supersearch {
-							list, b_word, a_word, s_word = getWxsearchlistData_new(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, pageNum, public.Lst.TotalPage*wx_pageSize, selectType, filed)
-						} else {
-							list, b_word, a_word, s_word = getWxsearchlistData_new(searchvalue, scope, publishtime, subtype, "", "", "", pageNum, public.Lst.TotalPage*wx_pageSize, selectType, filed)
-						}
+						list, b_word, a_word, s_word = getWxsearchlistData_new(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, pageNum, public.Lst.TotalPage*wx_pageSize, selectType, filed)
 					}
 				} else {
-					if open_supersearch {
-						list, b_word, a_word, s_word = getWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, pageNum, selectType, filed)
-					} else {
-						list, b_word, a_word, s_word = getWxsearchlistData(searchvalue, scope, publishtime, subtype, "", "", "", pageNum, selectType, filed)
-					}
+					list, b_word, a_word, s_word = getWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, pageNum, selectType, filed)
 				}
 				listSize := 0
 				if list != nil {
@@ -1552,7 +1489,7 @@ func (m *Front) WxpushView() error {
 	if openid == "" || userid == "" {
 		return m.Redirect("/swordfish/share/-1")
 	}
-	a_key, list := public.PushViewDatas(userid, "", bidSearch_field, 1, wx_pageSize)
+	a_key, list := public.PushViewDatas(userid, "", bidSearch_field_1, 1, wx_pageSize)
 	public.BidListConvert("", list)
 	m.T["firstPage"] = list
 	m.T["hasNextPage"] = list != nil && len(*list) == wx_pageSize
@@ -1571,7 +1508,7 @@ func (m *Front) WxpushViewPaging() {
 	var list *[]map[string]interface{}
 	pageNum, _ := m.GetInteger("pageNum")
 	if userid := m.Session().Get("userId"); userid != nil && pageNum <= wx_maxPageNum {
-		_, list = public.PushViewDatas(userid.(string), "", bidSearch_field, pageNum, wx_pageSize)
+		_, list = public.PushViewDatas(userid.(string), "", bidSearch_field_1, pageNum, wx_pageSize)
 	}
 	public.BidListConvert("", list)
 	m.ServeJson(map[string]interface{}{
@@ -2284,19 +2221,14 @@ func (f *Front) SearchResult(at, name string) error {
 	} else {
 		f.T["industrylist"], f.T["sortArray"] = getindustrys()
 	}
-	var supstatus = ""
-	if f.GetSession("userId") != nil {
-		if jylabutil.IsAuthorized(f.GetSession("userId").(string), "i_supersearch") {
-			supstatus = "T"
-		}
-	}
-	f.T["supstatus"] = supstatus
 	var shareid = f.GetString("id")
 	if len(shareid) == 0 {
 		shareid = "10" //fmt.Sprintf("%s%d", config.Seoconfig["jybqy"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
 	}
 	f.T["logid"] = config.Seoconfig["jybqy"].(string)
 	if at == "area" {
+		log.Println("config.Seoconfig", config.Seoconfig)
+		log.Println("config.Seoconfig.area", config.Seoconfig["area"])
 		areamp, _ := config.Seoconfig["area"].(map[string]interface{})
 		if areamp != nil {
 			areamp1 := areamp[name].(map[string]interface{})
@@ -2476,7 +2408,7 @@ func (f *Front) HasPushHistory() {
 	}
 	hasNextPage, list, err := public.HistoryPush.Datas(userId, 1, firstPushTime, formatTime)
 	if err == nil && len(keyArr) > 0 && len(list) == 0 && formatTime == "" {
-		flag, data := public.HistoryPush.MakeHistoryDatas(userId, bidSearch_field, o_jy)
+		flag, data := public.HistoryPush.MakeHistoryDatas(userId, bidSearch_field_1, o_jy)
 		if flag && data != nil {
 			list = data
 		}

src/jfw/modules/app/src/app/filter/filter.go

@@ -15,7 +15,7 @@ func init() {
 		AskLoginUrls:  make([]*regexp.Regexp, 0),
 		Redirect:      "/jyapp/free/login?back=index&to=back",
 	}
-	sessionfiletr.AddAnonymousUrls("^/jyapp/(dataReport|dataExport)/(wxpay|alipay)/callback$", "^/jyapp/free/.*", "^/jyapp/jylab/mainSearch$", "^/jyapp/swordfish/searchlist/paging$", "^/jyapp/jylab/supsearch/getstatus$")
+	sessionfiletr.AddAnonymousUrls("^/jyapp/(dataReport|dataExport)/(wxpay|alipay)/callback$", "^/jyapp/free/.*", "^/jyapp/jylab/mainSearch$", "^/jyapp/swordfish/searchlist/paging$", "^/jyapp/jylab/supsearch/getstatus$", "^/jyapp/followent/recList$")
 	xweb.AddFilter(sessionfiletr)
 	go func() {
 		time.Sleep(1 * time.Minute)

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

@@ -59,11 +59,6 @@ func (f *FollowEnt) AjaxSearch() error {
 }
 func (f *FollowEnt) EntList() error {
 	defer util.Catch()
-	userid, _ := f.GetSession("userId").(string)
-	authStatus := jylabutil.IsAuthorized(userid, "i_followent")
-	if !authStatus {
-		return f.Redirect("/jyapp/jylab/laboratory/gzqy")
-	}
 	f.T["followEntLimit"] = util.IntAll(config.Sysconfig["followentlimit"])
 	return f.Render("/followent/list.html", &f.T)
 }
@@ -112,9 +107,6 @@ func (f *FollowEnt) SaveEnt() {
 func (f *FollowEnt) Detail(followId string) error {
 	defer util.Catch()
 	userId := util.ObjToString(f.GetSession("userId"))
-	if !jylabutil.IsAuthorized(userId, "i_followent") {
-		return f.Redirect("/jyapp/jylab/laboratory/gzqy")
-	}
 	followId = util.DecodeArticleId2ByCheck(followId)[0]
 	winner := ""
 	winnerId := ""
@@ -158,9 +150,6 @@ func (f *FollowEnt) Detail(followId string) error {
 func (f *FollowEnt) NewInfo(param string) error {
 	defer util.Catch()
 	userId := util.ObjToString(f.GetSession("userId"))
-	if !jylabutil.IsAuthorized(userId, "i_followent") {
-		return f.Redirect("/jyapp/jylab/laboratory/gzqy")
-	}
 	winner := ""
 	winnerId := ""
 	if param != "" {

src/jfw/modules/app/src/app/front/front.go

@@ -21,7 +21,6 @@ import (
 
 type Front struct {
 	*xweb.Action
-	getpraise          xweb.Mapper `xweb:"/jyapp/swordfish/getpraise"`
 	feedback           xweb.Mapper `xweb:"/jyapp/swordfish/feedback"` //意见反馈
 	praise             xweb.Mapper `xweb:"/jyapp/swordfish/praise"`
 	myFeedbacks        xweb.Mapper `xweb:"/jyapp/swordfish/myFeedbacks"`

src/jfw/modules/app/src/app/front/laboratory.go

@@ -1,19 +1,14 @@
 package front
 
 import (
-	jylabutil "app/jylabutil"
-	"qfw/util"
-
 	"github.com/go-xweb/xweb"
-	"gopkg.in/mgo.v2/bson"
 )
 
 type Lab struct {
 	*xweb.Action
 	/********************剑鱼标讯实验室dev2.0**************************/
-	index     xweb.Mapper `xweb:"/jyapp/jylab/index"`             //实验室首页
-	labMode   xweb.Mapper `xweb:"/jyapp/jylab/laboratory/(\\w+)"` //智能订阅
-	operation xweb.Mapper `xweb:"/jyapp/jylab/operation"`         //用户操作按钮
+	index xweb.Mapper `xweb:"/jyapp/jylab/index"` //实验室首页
+
 }
 
 //
@@ -21,106 +16,8 @@ func init() {
 	xweb.AddAction(&Lab{})
 }
 
-//
-func (l *Lab) Operation() error {
-	defer util.Catch()
-	userid := util.ObjToString(l.GetSession("userId"))
-	thistype := l.GetString("type")
-	labswitch := l.GetString("labswitch")
-	tp := l.GetString("tp")
-	typeswitch := ""
-	switchflag := 0
-	flag := "F"
-	var set bson.M
-	switch tp {
-	case "swt":
-		if labswitch == "O" {
-			switchflag = 1
-		}
-		if thistype == "zndy" {
-			typeswitch = "i_smartset"
-		} else if thistype == "sjdc" {
-			typeswitch = "i_dataexport"
-		} else if thistype == "cjss" {
-			typeswitch = "i_supersearch"
-		} else if thistype == "zbqy" {
-			typeswitch = "i_entsesearch"
-		} else if thistype == "gzqy" {
-			typeswitch = "i_followent"
-		}
-		if jylabutil.UpdateAuthory(userid, typeswitch, switchflag) {
-			flag = "T"
-		}
-	case "popup":
-		if thistype == "zndy" {
-			set = bson.M{
-				"i_smartsetiknow": 1,
-			}
-		} else if thistype == "sjdc" {
-			set = bson.M{
-				"i_dataexportiknow": 1,
-			}
-		} else if thistype == "cjss" {
-			set = bson.M{
-				"i_supersearchiknow": 1,
-			}
-		} else if thistype == "zbqy" {
-			set = bson.M{
-				"i_entsesearchiknow": 1,
-			}
-		} else if thistype == "gzqy" {
-			set = bson.M{
-				"i_followentiknow": 1,
-			}
-		}
-		if mongodb.Update("user", `{"_id":"`+userid+`"}`, bson.M{"$set": set}, false, false) {
-			flag = "T"
-		}
-	}
-
-	l.ServeJson(map[string]interface{}{
-		"flag": flag,
-	})
-	return nil
-}
-
 //剑鱼标讯实验室首页
 func (l *Lab) Index() error {
-	return l.Render("/weixin/jylab/lab-index.html")
-}
-
-//剑鱼标讯实验室-智能订阅
-func (l *Lab) LabMode(mode string) error {
-	defer util.Catch()
-	userid := util.ObjToString(l.GetSession("userId"))
-	tmp, ok := mongodb.FindById("user", userid, `{"i_smartset":1,"i_dataexport":1,"i_supersearch":1,"i_entsesearch":1,"i_followent":1,"i_smartsetiknow":1,"i_dataexportiknow":1,"i_supersearchiknow":1,"i_entsesearchiknow":1,"i_followentiknow":1}`)
-	if !ok || tmp == nil || len(*tmp) == 0 {
-		return nil
-	}
-	if mode == "zndy" { //剑鱼标讯实验室-智能订阅
-		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_smartset")
-		l.T["iknow"] = (*tmp)["i_smartsetiknow"]
-		return l.Render("/weixin/jylab/lab-zndy.html", &l.T)
-	}
-	if mode == "sjdc" { //剑鱼标讯实验室-数据导出
-		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_dataexport")
-		l.T["iknow"] = (*tmp)["i_dataexportiknow"]
-		return l.Render("/weixin/jylab/lab-sjdc.html", &l.T)
-	}
-	if mode == "cjss" { //剑鱼标讯实验室-超级搜索
-		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_supersearch")
-		l.T["iknow"] = (*tmp)["i_supersearchiknow"]
-		return l.Render("/weixin/jylab/lab-cjss.html", &l.T)
-	}
-	if mode == "zbqy" { //剑鱼标讯实验室-中标企业
-		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_entsesearch")
-		l.T["iknow"] = (*tmp)["i_entsesearchiknow"]
-		return l.Render("/weixin/jylab/lab-zbqy.html", &l.T)
-	}
-	if mode == "gzqy" { //剑鱼标讯实验室-关注企业
-		l.T["switchstatus"] = jylabutil.IsAuthorized(userid, "i_followent")
-		l.T["iknow"] = (*tmp)["i_followentiknow"]
-		return l.Render("/weixin/jylab/lab-gzqy.html", &l.T)
-	}
-	return l.Render("/weixin/jylab/lab-index.html", &l.T)
+	return l.Render("/weixin/jylab/lab-close.html")
+	//return l.Render("/weixin/jylab/lab-index.html")
 }

src/jfw/modules/app/src/app/front/search.go

@@ -45,29 +45,14 @@ func (s *Search) MainSearch() error {
 }
 func (p *Search) Getstatus() error {
 	defer util.Catch()
-	var supstatus bool
-	var entstatus bool
 	var tablepro bool
-	var dataexportstatus bool
-	var smartstatus bool
-	var followent bool
 	userid := util.ObjToString(p.GetSession("userId"))
 	if userid != "" {
-		supstatus = jylabutil.IsAuthorized(userid, "i_supersearch")
-		entstatus = jylabutil.IsAuthorized(userid, "i_entsesearch")
 		tablepro = jylabutil.IsAuthorized(userid, "i_tablepro")
-		dataexportstatus = jylabutil.IsAuthorized(userid, "i_dataexport")
-		smartstatus = jylabutil.IsAuthorized(userid, "i_smartset")
-		followent = jylabutil.IsAuthorized(userid, "i_followent")
 	}
 	p.ServeJson(map[string]interface{}{
-		"supstatus":        supstatus,
-		"entstatus":        entstatus,
-		"tablepro":         tablepro,
-		"dataexportstatus": dataexportstatus,
-		"smartstatus":      smartstatus,
-		"followent":        followent,
-		"userId":           p.GetSession("userId"),
+		"tablepro": tablepro,
+		"userId":   userid,
 	})
 	return nil
 }

src/jfw/modules/app/src/app/front/swordfish.go

@@ -2,7 +2,6 @@ package front
 
 import (
 	"app/filter"
-	"app/jylabutil"
 	"fmt"
 	"jfw/config"
 	"jfw/public"
@@ -69,49 +68,6 @@ func (m *Front) Praise() error {
 	return nil
 }
 
-func (m *Front) Getpraise() error {
-	defer util.Catch()
-	thistype := m.GetString("type")
-	praiseno := 125
-	switchstatus := 0
-	util.Try(func() {
-		data := make(map[string]interface{})
-		pdata, _ := mongodb.FindOneByField("praise", `{"s_type":"`+thistype+`"}`, `{"s_no":1}`)
-		userid := util.ObjToString(m.GetSession("userId"))
-		tmp, _ := mongodb.FindById("user", userid, `{"i_smartset":1,"i_dataexport":1,"i_supersearch":1,"i_entsesearch":1,"i_followent":1,"i_smartsetiknow":1,"i_dataexportiknow":1,"i_supersearchiknow":1,"i_entsesearchiknow":1,"i_followentiknow":1}`)
-		if thistype == "zndy" {
-			data["s_name"] = "剑鱼标讯实验室-智能订阅"
-			switchstatus = util.IntAll((*tmp)["i_smartset"])
-		} else if thistype == "sjdc" {
-			data["s_name"] = "剑鱼标讯实验室-数据导出"
-			switchstatus = util.IntAll((*tmp)["i_dataexport"])
-		} else if thistype == "cjss" {
-			data["s_name"] = "剑鱼标讯实验室-超级搜索"
-			switchstatus = util.IntAll((*tmp)["i_supersearch"])
-		} else if thistype == "zbqy" {
-			data["s_name"] = "剑鱼标讯实验室-中标企业"
-			switchstatus = util.IntAll((*tmp)["i_entsesearch"])
-		} else if thistype == "gzqy" {
-			data["s_name"] = "剑鱼标讯实验室-关注企业"
-			switchstatus = util.IntAll((*tmp)["i_followent"])
-		}
-		if len(*pdata) == 0 {
-			data["s_type"] = thistype
-			data["s_no"] = 125
-			data["l_date"] = time.Now().Unix()
-			mongodb.Save("praise", data)
-		} else {
-			praiseno = util.IntAll((*pdata)["s_no"])
-		}
-	}, func(e interface{}) {
-		log.Println("剑鱼标讯实验室取赞出错", e)
-	})
-	m.ServeJson(map[string]interface{}{
-		"praiseno":     praiseno,
-		"switchstatus": switchstatus,
-	})
-	return nil
-}
 func getBidSearchQuery(area, publishtime, subtype string) string {
 	query := ``
 	if area != "" {
@@ -471,11 +427,6 @@ func (m *Front) WxsearchlistPaging() {
 	var list *[]map[string]interface{}
 	var secRel *[]map[string]interface{}
 	if pageNum, _ := m.GetInteger("pageNum"); pageNum <= wx_maxPageNum {
-		userid := util.ObjToString(m.GetSession("userId"))
-		open_supersearch := false
-		if userid != "" {
-			open_supersearch = jylabutil.IsAuthorized(userid, "i_supersearch")
-		}
 		searchvalue := strings.TrimSpace(m.GetString("searchvalue"))
 		var b_word, a_word string
 		isLimit := 1
@@ -508,18 +459,10 @@ func (m *Front) WxsearchlistPaging() {
 				s_word := ""
 				if limitFlag {
 					if pageNum == 1 {
-						if open_supersearch {
-							list, b_word, a_word, s_word = getWxsearchlistData_new(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, pageNum, public.Lst.TotalPage*wx_pageSize, selectType, feld)
-						} else {
-							list, b_word, a_word, s_word = getWxsearchlistData_new(searchvalue, scope, publishtime, subtype, "", "", "", pageNum, public.Lst.TotalPage*wx_pageSize, selectType, feld)
-						}
+						list, b_word, a_word, s_word = getWxsearchlistData_new(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, pageNum, public.Lst.TotalPage*wx_pageSize, selectType, feld)
 					}
 				} else {
-					if open_supersearch {
-						list, b_word, a_word, s_word = getWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, pageNum, selectType, feld)
-					} else {
-						list, b_word, a_word, s_word = getWxsearchlistData(searchvalue, scope, publishtime, subtype, "", "", "", pageNum, selectType, feld)
-					}
+					list, b_word, a_word, s_word = getWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, pageNum, selectType, feld)
 				}
 				listSize := 0
 				if list != nil {
@@ -658,7 +601,7 @@ func (m *Front) WxpushView() error {
 	if userid == "" {
 		return m.Redirect("/jyapp/login")
 	}
-	a_key, list := public.PushViewDatas(userid, "", bidSearch_field, 1, wx_pageSize)
+	a_key, list := public.PushViewDatas(userid, "", bidSearch_field_1, 1, wx_pageSize)
 	public.BidListConvert("", list)
 	m.T["firstPage"] = list
 	m.T["hasNextPage"] = list != nil && len(*list) == wx_pageSize
@@ -671,7 +614,7 @@ func (m *Front) WxpushViewPaging() {
 	var list *[]map[string]interface{}
 	pageNum, _ := m.GetInteger("pageNum")
 	if userid := util.ObjToString(m.GetSession("userId")); userid != "" && pageNum <= wx_maxPageNum {
-		_, list = public.PushViewDatas(userid, "", bidSearch_field, pageNum, wx_pageSize)
+		_, list = public.PushViewDatas(userid, "", bidSearch_field_1, pageNum, wx_pageSize)
 	}
 	public.BidListConvert("", list)
 	m.ServeJson(map[string]interface{}{

src/jfw/modules/app/src/web/staticres/jyapp/css/wxsearch.css

@@ -141,17 +141,11 @@ form{
   font-size: 0.3rem;
   color: #686868;
 }
-
 #searchIndex .content li:nth-of-type(1) a {
-  background: url(../images/search/search-sousuo.png) 0.3rem 0.32rem no-repeat, url(../images/search/search-lists-rightBg.png) right bottom no-repeat;
-  background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
-}
-
-#searchIndex .content li:nth-of-type(2) a {
   background: url(../images/search/search-zhongqy.png) 0.3rem 0.32rem no-repeat, url(../images/search/search-lists-rightBg.png) right bottom no-repeat;
   background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
 }
-#searchIndex .content li:nth-of-type(3) a {
+#searchIndex .content li:nth-of-type(2) a {
   background: url(../active/pullnew/images/pullnew.png) 0.3rem 0.32rem no-repeat, url(../images/search/search-lists-rightBg.png) right bottom no-repeat;
   background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
 }
@@ -1655,7 +1649,7 @@ body{
 .nullcontent{
 	padding-top: 10%;
 	position: absolute;
-	top: 125px;
+	top: 83px;
 	left: 0px;
 	right: 0px;
 	padding:0px 20px;

src/jfw/modules/app/src/web/staticres/jyapp/js/popup/tap.js

@@ -9,7 +9,7 @@ var Active_Tip = function(){
 		//拉新活动
 		_this.isLogin = r.isLogin;
 		if(r.pullnew.isActiveTime){
-			$(".content ul li a:eq(2)").unbind("tap").on("tap",function(){
+			$(".content ul li a:eq(1)").unbind("tap").on("tap",function(){
 				if(r.isLogin){
 					window.location.href = "/jyapp/active/pullnew/index?source=index";
 				}else{

src/jfw/modules/app/src/web/staticres/jyapp/js/wxEntsesearch.js

@@ -325,11 +325,15 @@ var EntSearch = {
 		});
 	},
 	recoveryPage: function(){
-		EntSearch.setUpLastPage();
 		$("#searchIndex").addClass("hidden");
 		$("#entsearchPage").removeClass("hidden");
 		$("#entsearchPage #wrapper").removeClass("hidden");
-		JyObj.hiddenBottom("0");
+		EntSearch.setUpLastPage();
+		try{
+			JyObj.hiddenBottom("0");
+		}catch(err){
+			//alert(err)
+		}
 	},
 	resetPage: function(flag){
 		this.requesting = false;

src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -252,21 +252,13 @@ var SuperSearch = {
 			$("#supersearchPage .money-dialog .money-inp").removeClass("active");
 		});
 	    $("#supersearchPage .money-dialog .money-inp").on("tap",function(){
-	    	if(localStorage.isopen_supersearch=="y"){
-	            $(this).addClass("active");
-	            $("#supersearchPage .money-dialog .btn").removeClass("active");
-			}else{
-	            SuperSearch.toOpenSupersearch();
-			}
+            $(this).addClass("active");
+            $("#supersearchPage .money-dialog .btn").removeClass("active");
 		});
 	
 	    var reg = /^[\u4e00-\u9fa5]+$/;
 	    var maxnum = "";
-	    $("#supersearchPage .maxMrice").on("click",function(){
-	        if(localStorage.isopen_supersearch!="y"){
-	            SuperSearch.toOpenSupersearch();
-	        }
-	    }).on("input propertychange",function(){
+	    $("#supersearchPage .maxMrice").on("input propertychange",function(){
 	    	/*
 	        var minp = $(this).val()
 	        if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
@@ -325,11 +317,7 @@ var SuperSearch = {
 		});
 	
 	    var minnum = "";
-	    $("#supersearchPage .minMrice").on("click",function(){
-	        if(localStorage.isopen_supersearch!="y"){
-	            SuperSearch.toOpenSupersearch();
-	        }
-	    }).on("input propertychange",function(){
+	    $("#supersearchPage .minMrice").on("input propertychange",function(){
 	    	/*
 	        var minp = $(this).val()
 	        if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
@@ -571,14 +559,6 @@ var SuperSearch = {
 			$("#supersearchPage .app-layout-content-b").off("scroll", SuperSearch.SuperSearchInputblur).on("scroll",SuperSearch.SuperSearchInputblur);
 		}
 	},
-	toOpenSupersearch: function(){
-		SuperSearch.setSessionStorage();
-		if(userId == ""){
-			window.location.href="/jyapp/free/login?to=back";
-			return;
-		}
-		window.location.href="/jyapp/jylab/laboratory/cjss?v=superSearch";
-	},
 	limitPaging: function(me){
 		$("#supersearchPage #list>.tslist.hidden").each(function(i){
 			if(i >= 50){
@@ -1462,19 +1442,13 @@ var SuperSearch = {
 				}
 			},1000);
 		}
-		if(localStorage.isopen_supersearch=="y"){
-			localStorage.superSearch_showType="showTable";
-		  	$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
-		  	$("#supersearchPage #wrapper #table").removeClass("hidden");
-		  	$("#supersearchPage #wrapper #list").addClass("hidden");
-//			if(SuperSearch.dropload != null){
-//				SuperSearch.dropload.resetload();
-//			}
-		  	SuperSearch.behaviorCollect(2);
-			SuperSearch.isTable(true);
-		}else{
-			SuperSearch.toOpenSupersearch();
-		}
+		localStorage.superSearch_showType="showTable";
+	  	$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
+	  	$("#supersearchPage #wrapper #table").removeClass("hidden");
+	  	$("#supersearchPage #wrapper #list").addClass("hidden");
+	  	SuperSearch.behaviorCollect(2);
+		SuperSearch.isTable(true);
+
 		
 	},
 	isTable:function(flag){
@@ -1783,37 +1757,28 @@ var SuperSearch = {
 			    dialogObjthree.find(".btn").removeClass("active");
 			    $(this).addClass("active");
 			}else{
-			    if(localStorage.isopen_supersearch=="y"){				//判断是否开通超级搜索
-					if($(this).hasClass("active")){
-					    dialogObjthree.find(".btn").removeClass("active");
-					    dialogObjthree.find("div[id='dqbtn']").removeClass("active");
-					    dialogObjthree.find("ul:first li:first .btn").addClass("active");
-					}else{
-					    dialogObjthree.find("ul:first li:first .btn").removeClass("active");
-					    dialogObjthree.find(".btn").removeClass("active");
-					    dialogObjthree.find("div[id='dqbtn']").removeClass("active");
-					    $(this).addClass("active");
-					}
-			    }else{
-					SuperSearch.toOpenSupersearch();
-					return
-			    }
+				if($(this).hasClass("active")){
+				    dialogObjthree.find(".btn").removeClass("active");
+				    dialogObjthree.find("div[id='dqbtn']").removeClass("active");
+				    dialogObjthree.find("ul:first li:first .btn").addClass("active");
+				}else{
+				    dialogObjthree.find("ul:first li:first .btn").removeClass("active");
+				    dialogObjthree.find(".btn").removeClass("active");
+				    dialogObjthree.find("div[id='dqbtn']").removeClass("active");
+				    $(this).addClass("active");
+				}
 			};
 	    });
 	    dialogObjthree.find('div[id="dqbtn"]').on("tap",function(){
-			if(localStorage.isopen_supersearch=="y"){
-			    if($(this).hasClass("active")){
-					dialogObjthree.find(".btn").removeClass("active");
-					dialogObjthree.find("div[id='dqbtn']").removeClass("active");
-					dialogObjthree.find("ul:first li:first .btn").addClass("active");
-			    }else{
-					dialogObjthree.find("div[id='dqbtn']").removeClass("active");
-					dialogObjthree.find(".btn").removeClass("active");
-					$(this).addClass("active");
-			    }
-			}else{
-			    SuperSearch.toOpenSupersearch();
-			}
+		    if($(this).hasClass("active")){
+				dialogObjthree.find(".btn").removeClass("active");
+				dialogObjthree.find("div[id='dqbtn']").removeClass("active");
+				dialogObjthree.find("ul:first li:first .btn").addClass("active");
+		    }else{
+				dialogObjthree.find("div[id='dqbtn']").removeClass("active");
+				dialogObjthree.find(".btn").removeClass("active");
+				$(this).addClass("active");
+		    }
 	    });
 	},
 	initMobiscroll: function(){
@@ -2024,4 +1989,4 @@ var SuperSearch = {
 			$('#supersearchPage .searchinput').removeClass("nocaret");
 		}
 	}
-};
+};

src/jfw/modules/app/src/web/templates/active/pullnew/index.html

@@ -43,7 +43,9 @@
 	                <div class="play_info">
 	                    <p>邀请好友下载、注册成为剑鱼标讯App新用户，</p>
 	                    <p>并绑定你的邀请码；</p> 
-	                    <p>邀请满3人，可免费领取资料包。</p> 
+	                    <p>邀请满3人，可免费领取资料包；</p> 
+						<p>活动截止时间：2019年10月18日；</p>
+						<p>手快有，手慢无！</p>
 	                </div>
 	            </div>
 	            <!-- 活动规则 -->

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

@@ -123,11 +123,12 @@
                 $("#recList").hide();
 			}
 			$(".rec").on("tap",function(){
-                    if($(this).text()!=""){
-                        $("input").val($(this).text());
-                        winner_id = $(this).attr("data-id");
-                        $("#recList").hide();
-                    }
+        if($(this).text()!=""){
+            $("input").val($(this).text());
+            winner_id = $(this).attr("data-id");
+            $("#recList").hide();
+            $(".opation").removeClass("disabled");
+        }
 			});
 		});
 	}

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -23,7 +23,7 @@ var hasNextPage=false;
 var words=[];
 var pageIndex=1;
 var closeAdvert=false//是否关闭广告
-//
+
 if(getUrlParam("f")=="push"){
 	removeSessionStorage();
 	if(history){
@@ -31,6 +31,51 @@ if(getUrlParam("f")=="push"){
 	}
 }
 $(function(){
+  
+	if(sessionStorage.getItem(sessionStorage.userId+"_searchTime")){
+		$("#kongH").addClass("kongH");
+		document.getElementsByClassName("icon_time")[0].style.display="block";
+		document.getElementsByClassName("time_choice")[0].style.display="none";
+    $(".showType_bg").hide();
+		initMobiscroll_()
+	}else{
+    $(".showType_bg").show();
+  }
+	//
+	$("#starttime").on("click",function(){
+        $("#starttime").mobiscroll('show');
+	});
+	//
+	$("#starttime_").on("click",function(){
+        $("#starttime_").mobiscroll('show');
+    });
+	//
+	
+	lastClickFlag=true;
+	$("#syy").on("click",function(){
+		if (lastClickFlag){
+			lastClickFlag=false;
+			setTimeout(function(){
+				lastClickFlag=true;
+			},1000);
+			shangyiye();
+		}
+	});
+	
+	nextClickFlag=true;
+	$("#xyy").on("click",function(){
+		if (nextClickFlag){
+			nextClickFlag=false;
+			setTimeout(function(){
+				nextClickFlag=true;
+			},1000);
+			xiayiye();
+		}
+	});
+	initMobiscroll();	
+  
+  
+  //===================
 	var isinitpage = false;
 	$(window).bind("pageshow", function(event){
 		if(event.originalEvent.persisted){
@@ -62,12 +107,7 @@ function initpage(){
 	$(".app-layout-content-b").scroll(function(){
 		scrollTop = $(this).scrollTop();
 	});
-	//
-	if(sessionStorage.getItem("listortable")=="T"){
-	    $(".showType .showTable").addClass("on").siblings().removeClass("on");
-		$("#list").addClass("hidden");
-		$(".tablecontent").removeClass("hidden");
-	}
+
 	//
 	if(sessionStorage && sessionStorage.historypushScrollTop && sessionStorage.historypushDataCache){
 		if(sessionStorage.historypushDataCache.length==2){
@@ -85,10 +125,8 @@ function initpage(){
 			words = sessionStorage.historypushWords.split(",");
 		}
 		dataCache = JSON.parse(sessionStorage.historypushDataCache);
-   		$("#list>*").remove();
-		$("#mytable>*").remove();
+   	$("#list>*").remove();
 		$(".showType").css("display","flex");
-		$(".showType_bg").show();
 		structureHtml(dataCache,true);
 		//appendList($(listCache),$(tableCache));
 		$(".app-layout-content-b").scrollTop(scrollTop);
@@ -153,6 +191,7 @@ function initpage(){
 			t_time_str=t_date.Format("yyyy年MM月dd日");
 			$("#starttime_").attr("date-value",ttt);
 			$("#starttime_").val(t_time_str);
+			isRightShow(t_time_str);
 			
 			document.getElementsByClassName("icon_time")[0].style.display="block";
 			if($(".icon_time").css("display")=='none') {
@@ -162,7 +201,7 @@ function initpage(){
 				document.getElementsByClassName("time_choice")[0].style.display="none";
 			}
 			$(".showType").css("display","flex");
-			$(".showType_bg").show();
+			$(".showType_bg").hide();
 		}
 		//$("#list").css("visibility","hidden");
 		dataCache = dataCache.concat(firstPage);
@@ -197,36 +236,7 @@ function initpage(){
 	    });
 		noMoreData(wxflag);
 	}
-	
-	//展示
-	$(".showType .showlist").click(function(){
-	    $(this).addClass("on").siblings().removeClass("on");
-		$("#list").removeClass("hidden");
-		$(".dropload-down").removeClass("dropcss");
-		$(".tablecontent").addClass("hidden");
-		wxflag.resetload();
-	})
-	$(".showType .showTable").click(function(){
-		//表格是否开启超级搜索？
-		$.ajax({
-	       type:'post',
-	       url:'/jyapp/jylab/supsearch/getstatus',
-	       async:false,
-	       dataType:'json', 
-	       success:function(r){
-				if(r&&r.dataexportstatus){
-				    $(".showType .showTable").addClass("on").siblings().removeClass("on");
-					$("#list").addClass("hidden");
-					$(".dropload-down").addClass("dropcss");
-					$(".tablecontent").removeClass("hidden");
-					wxflag.resetload();
-				}else{
-					setSessionStorage();
-					window.location.href="/jyapp/jylab/laboratory/sjdc";
-				}
-			}
-		})
-	});
+
 }
 //下拉刷新
 function reloadFirstPage(me){
@@ -245,7 +255,6 @@ function reloadFirstPage(me){
        			count=0;
 				dataCache = new Array();
 				$("#list>*").remove();
-				$("#mytable>*").remove();
 				hasNextPage = true;
 		   		me.$domDown.html(me.opts.domDown.domLoad);
 				me.isData = true;
@@ -280,18 +289,6 @@ function loadDatas(me,le){
 		data: {"pageNum": pageIndex,"selectTime":sessionStorage.getItem(sessionStorage.userId+"_searchTime")},
 		dataType: 'json',
 		success: function(data){
-			/*if(le==-1){
-				count=0;
-				dataCache = new Array();
-				$("#list>*").remove();
-				$("#mytable>*").remove();
-				hasNextPage = true;
-		        me.$domDown.html(me.opts.domDown.domLoad);
-				me.isData = true;
-				me.isLockUp = false;
-        		me.isLockDown = false;
-				JyObj.hideRedSpotOnMenu("subscribe");
-			}*/
 			//没有数据
 			if(data.data.length==0){
 				noMoreData(me);
@@ -342,8 +339,6 @@ function hasNoDataByTime(){
 	$("#loading").hide();
 }
 function structureHtml(object,showAd){
-//	var count =0;
-	var tablehtml = '';
 	var listhtml='';
 	for(var index in object){
     var obj=object[index];
@@ -394,39 +389,6 @@ function structureHtml(object,showAd){
 				showdateList='<span><i class="glyphicon bofangjilu" style="color:#7a7a7a;margin-right:2px;"></i>'+showdateList+'</span>'
 			}
 		}
-		//预算
-		var budgetTable="";
-		if(typeof(obj.budget) != "undefined" && obj.budget != null && obj.budget != ""){
-			budgetTable=parseInt(obj.budget)/10000
-			if(budgetTable.toString().length>6){
-				if(budgetTable.toString().indexOf(".")==5){
-					budgetTable=budgetTable.toString().substr(0,7)
-				}else{
-					budgetTable=budgetTable.toString().substr(0,6)
-				}
-			}
-		}
-		//中标金额
-		var bidamountTable="";
-		if(typeof(obj.bidamount) != "undefined" && obj.bidamount != null && obj.bidamount != ""){
-			bidamountTable = parseInt(obj.bidamount)/10000
-			if(bidamountTable.toString().length>6){
-				if(bidamountTable.toString().indexOf(".")==5){
-					bidamountTable=bidamountTable.toString().substr(0,7)
-				}else{
-					bidamountTable=bidamountTable.toString().substr(0,6)
-				}
-			}
-		}
-		//招标单位
-		var buyerTable=obj.buyer==undefined?"":obj.buyer;
-		//中标单位
-		var winnerTable=obj.winner==undefined?"":obj.winner;
-		//开标时间
-		var opentimeTable=""
-		if(typeof(obj.bidopentime) != "undefined" && obj.bidopentime != null && obj.bidopentime != ""){
-			opentimeTable = formatDate(Number(obj.bidopentime),"l");
-		}
 		//序号位置
 		var paddingLeft=20
 		var countLength = count.toString().length;
@@ -438,17 +400,6 @@ function structureHtml(object,showAd){
 		if(obj.ca_visit==1){
 			visited="visited"
 		}		
-		tablehtml+='<tr class="'+visited+'" onclick="tablejump($(this))"  data_id="'+obj["_id"]+'"  data_mWords="'+mWords+'"  push_date="'+obj["ca_date"]+'" openlist_index="'+obj["ca_openlist_index"]+'">'
-						+'<td>'+count+'</td>'
-						+'<td>'+title+'</td>'
-						+'<td>'+datatypeTable+'</td>'
-						+'<td>'+budgetTable+'</td>'
-						+'<td>'+buyerTable+'</td>'
-						+'<td><div>'+opentimeTable+'</div></td>'
-						+'<td class="tt-l"><div>'+winnerTable+'</div></td>'
-						+'<td class="tt-r"><div>'+bidamountTable+'</div></td>'
-						+'<td>'+showdateTable+'</td>'
-					+'</tr>'
     if(showAd&&index==3&&!closeAdvert){//广告位
       var ad=$("#advertscript").html()
       if(ad!=""){
@@ -458,7 +409,7 @@ function structureHtml(object,showAd){
 								+'<span class="xh '+visited+'">'+count+'.</span>'
 							+'</div>'
 							+'<div class="two bt-parent" style="padding-left:'+paddingLeft+'px;">'
-								+'<a class="bt '+visited+'" target="_blank" eid="'+obj["_id"]+'" href="javascript:void(0);"  push_date="'+obj["ca_date"]+'" openlist_index="'+obj["ca_openlist_index"]+'">'+title+'</a>'
+								+'<a class="bt '+visited+'" eid="'+obj["_id"]+'"  push_date="'+obj["ca_date"]+'" openlist_index="'+obj["ca_openlist_index"]+'">'+title+'</a>'
 							+'</div>'
 						+'</div>'
 						+'<div style="clear:both;">'
@@ -476,7 +427,7 @@ function structureHtml(object,showAd){
 								+'<span class="xh '+visited+'">'+count+'.</span>'
 							+'</div>'
 							+'<div class="two bt-parent" style="padding-left:'+paddingLeft+'px;">'
-								+'<a class="bt '+visited+'" target="_blank" eid="'+obj["_id"]+'" href="javascript:void(0);"  push_date="'+obj["ca_date"]+'" openlist_index="'+obj["ca_openlist_index"]+'">'+title+'</a>'
+								+'<a class="bt '+visited+'" eid="'+obj["_id"]+'"  push_date="'+obj["ca_date"]+'" openlist_index="'+obj["ca_openlist_index"]+'">'+title+'</a>'
 							+'</div>'
 						+'</div>'
 						+'<div style="clear:both;">'
@@ -487,9 +438,9 @@ function structureHtml(object,showAd){
 		
 	}
 	if (object.length<=3&&$("#advertscript").html()!=""&&!closeAdvert&&showAd){
-		appendList($("<div>"+listhtml+"<div class='adv-wxpush-center' id='E1'>"+$("#advertscript").html()+"</div></div>"),tablehtml);
+		appendList($("<div>"+listhtml+"<div class='adv-wxpush-center' id='E1'>"+$("#advertscript").html()+"</div></div>"));
 	}else{
-		appendList($("<div>"+listhtml+"</div>"),tablehtml);
+		appendList($("<div>"+listhtml+"</div>"));
 	}
 	if(object.length<=4&&$("#advertscript").html()!=""){
 		$(".closeadv").css("display","none");
@@ -527,7 +478,7 @@ function formatDate(date,sl)   {
 }
 
 //
-function appendList(content,tablehtml){
+function appendList(content){
 	content.children(".tslist").on("click", function(event){
 		var isv=$(this).find("a.bt").hasClass("visited");//是否为已读
 		setVisitedIndex($(this),"");
@@ -539,7 +490,6 @@ function appendList(content,tablehtml){
 		beforeJump(eid,h,sds,index,pdate,isv);
 	});
 	$("#list").append(content);
-	$("#mytable").append(tablehtml);
 	$(".findnull").hide();
 	$(".listcontent").show();
 	setTimeout(function(){
@@ -578,9 +528,6 @@ function setSessionStorage(){
 		sessionStorage.historypushHasNextPage = hasNextPage;
 		sessionStorage.historypushCount = count;
 		sessionStorage.historypushWords = words;
-		if($(".showType .showTable").hasClass("on")){
-			sessionStorage.setItem("listortable","T");
-		}
 	}
 }
 
@@ -590,7 +537,6 @@ function removeSessionStorage(){
 	sessionStorage.removeItem("historypushScrollTop");
 	sessionStorage.removeItem("historypushHasNextPage");
 	sessionStorage.removeItem("historypushCount");
-	sessionStorage.removeItem("listortable");
 	sessionStorage.removeItem("historypushWords");
   sessionStorage.removeItem("closeAdvert");
 }
@@ -649,109 +595,12 @@ a{
 .showType div{
 	padding-left: 30px;
 }
-.showType .showlist{
-	background: url(/jyapp/images/search/showList.png)10px 3px no-repeat;
-	background-size: 30%;
-    margin-right: 15px;
-	line-height: 21px;
-}
-.showType .showtable{
-	background: url(/jyapp/images/search/showTable.png)10px 2px no-repeat;
-	background-size: 30%;
-    margin-left: 15px;
-	line-height: 21px;
-}
-.showType .showlist.on{
-	background: url(/jyapp/images/search/showList_on.png)10px 3px no-repeat;
-	background-size: 30%;
-	color: #2cb7ca;
-}
-.showType .showtable.on{
-	background: url(/jyapp/images/search/showTable_on.png)10px 2px no-repeat;
-	background-size: 30%;
-	color: #2cb7ca;
-}
-.shuxian{
-	padding: 0px !important;
-    margin-right: -10px;
-	color: #e0e0e0;
-}
-#jytables{
-	/*不需要可自己删除*/
-	padding: .2rem;
-	width:880px;
-}
-#jytables table{
-	width: 100%;
-	border-collapse: collapse;
-}
-#jytables table td {
-	padding: 5px;
-	border: 1px solid #E0E0E0;
-	text-align: center;
-	vertical-align: middle;
-}
-#jytables table thead{
-	/**font-size: .28rem;**/
-	font-size: 14px;
-	color: #686868;
-}
-#jytables table tbody{
-	/**font-size: .3rem;**/
-	font-size: 15px;
-	color: #1d1d1d;
-}
-/*高亮字体*/
-#jytables table span.higHlight{
-	color: #2cb7ca;
-}
-.tablecontent{
-	width: 100%;
-    overflow-x: scroll;
-}
-#jytables thead>tr>td:nth-child(1){
-	padding:.3rem 0;
-	width:30px;
-}
-#jytables tbody>tr>td:nth-child(9){
-	width:68px;
-}
-#jytables tbody>tr>td:nth-child(3){
-	width:74px;
-}
-#jytables tbody>tr>td:nth-child(5){
-	width:160px;
-	padding: 17px 5px;
-    line-height: 21px;
-    text-align: left;
-}
-#jytables tbody>tr>td:nth-child(2){
-	width: 160px;
-    padding: 17px 5px;
-    line-height: 21px;
-    text-align: left;
-}
 .prompt{
 	padding:10px 10px 20px;
 }
 .blue{
 	color:#0987ff;
 }
-#jytables tbody>tr>td:nth-child(4){
-	width:70px;
-}
-#jytables tbody>tr>td:nth-child(6){
-	width:85px;
-}
-#jytables tbody>tr>td:nth-child(7) div{
-	width:110px;
-}
-#jytables tbody>tr>td:nth-child(7){
-	width:110px;
-}
-#jytables tbody>tr>td:nth-child(8){
-	width:72px;
-}
 .resnumb .two{
 	max-height: 45px;
 	min-height:24px;
@@ -1014,35 +863,10 @@ body .loading_ p span {
 				<i class="iconfont">&#xe603;</i>
 				<input type="text" name="starttime" class="starttime" readonly="readonly" id="starttime" data-value="" placeholder="时间筛选"/>
 			</span>
-			<div  class="shuxian"></div>
-			<div class="showlist on">列表</div>
-			<div class="showtable">表格</div>
 		</div>
 		<div class="showType_bg" style="display:none;height:37px;border-bottom:1px solid #ddd;border-top: 1px solid #ddd;"></div>
 		<div class="listcontent">
 			<div id="list"></div>
-			<div class="tablecontent hidden">
-				<section id="jytables">
-					<table>
-						<thead> 
-							<tr>
-								<td>序号</td>
-								<td>项目名称</td>
-								<td>公告类型</td>
-								<td>预算<br>（万元）</td>
-								<td>招标单位</td>
-								<td>开标日期</td>
-								<td>中标单位</td>
-								<td>中标金额<br>（万元）</td>
-								<td>发布日期</td>
-							</tr>
-						</thead>
-						<tbody id="mytable">	
-						</tbody>
-					</table>
-				</section>
-				<div class="prompt">提示：为了获得更佳的体验，推荐<span class="blue" id="openmailpush">打开邮件推送</span>，用电脑查看邮件中的表格。</div>
-			</div>
 		</div>
 		
 		<span class="text-center findnull" style="position: absolute;left:0px;right:0px;top: 50%;margin-top: -130px;padding: 0px 30px;">
@@ -1093,49 +917,6 @@ body .loading_ p span {
 </body>
 <script>
 var one_day =86400000;
-$(function(){
-	//如果选中时间后，只显示中间时间。
-	//if(sessionStorage.search_starttime){
-	if(sessionStorage.getItem(sessionStorage.userId+"_searchTime")){
-			$("#kongH").addClass("kongH");
-			document.getElementsByClassName("icon_time")[0].style.display="block";
-			document.getElementsByClassName("time_choice")[0].style.display="none";
-			initMobiscroll_()
-	}
-	//
-	$("#starttime").on("click",function(){
-        $("#starttime").mobiscroll('show');
-	});
-	//
-	$("#starttime_").on("click",function(){
-        $("#starttime_").mobiscroll('show');
-    });
-	//
-	
-	lastClickFlag=true;
-	$("#syy").on("click",function(){
-		if (lastClickFlag){
-			lastClickFlag=false;
-			setTimeout(function(){
-				lastClickFlag=true;
-			},1000);
-			shangyiye();
-		}
-	});
-	
-	nextClickFlag=true;
-	$("#xyy").on("click",function(){
-		if (nextClickFlag){
-			nextClickFlag=false;
-			setTimeout(function(){
-				nextClickFlag=true;
-			},1000);
-			xiayiye();
-		}
-	});
-	initMobiscroll();	
-})
-
 //
 function shangyiye(){
 	//var l_time = sessionStorage.search_starttime;
@@ -1257,6 +1038,7 @@ function initMobiscroll(){
 					document.getElementsByClassName("time_choice")[0].style.display="block";
 				}else{
 					document.getElementsByClassName("time_choice")[0].style.display="none";
+          document.getElementsByClassName("showType_bg")[0].style.display="none";
 				}
 				initMobiscroll_();
 				isRightShow(valueText);
@@ -1449,13 +1231,11 @@ function ajaxFun(time){
 		return;
 	}else{
 		$(".showType").css("display","flex");
-		$(".showType_bg").show();
 		$(".findnull_").css("display","none");
 	}
 	//$("#list").css("visibility","hidden");
 	dataCache = firstPage;
 	$("#list").html("");
-	$("#mytable").html("");
 	count=0;
 	structureHtml(firstPage,true);
 	setTimeout(function(){
@@ -1507,4 +1287,4 @@ function AdClick(e,isExternal,link,title){
   }
 }
 </script>
-</html>
+</html>

src/jfw/modules/app/src/web/templates/weixin/jylab/lab-close.html

@@ -0,0 +1,69 @@
+<html lang="zh-cn">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="format-detection" content="telephone=no" />
+		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+		<script src="{{Msg "seo" "cdn"}}/jyapp/js/rem.js?v={{Msg "seo" "version"}}"></script>
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/reset.css?v={{Msg "seo" "version"}}" />
+		<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
+		<title>剑鱼标讯实验室</title>
+    <style>
+      body {
+        background: #2cb7ca;
+      }
+      header{
+        font-size: .32rem;
+        text-align: center;
+        color: #fff;
+        padding-top: .7rem;
+      }
+      section{
+        position: absolute;
+        top: 50%;
+        height: 10rem;
+        margin-top: -5rem;
+        width: 100%;
+      }
+      article{
+        height: 8rem;
+      }
+      .main{
+        text-align: center;
+        color:#fff;
+        font-size: .32rem;
+        
+        background: url(/jyapp/images/syzindex/lab_closed.png);
+        background-size:  90% auto;
+        background-repeat: no-repeat;
+        background-position: center;
+      }
+      .main span{
+        position: relative;
+        top: 7rem;
+      }
+      .toDeatil{
+        color: #2cb7ca;
+        height: .9rem;
+        width: 2.5rem;
+        text-align: center;
+        margin: 0 auto;
+        line-height: .9rem;
+        border-radius: .1rem;
+        background: #fff;
+        font-size: .32rem;
+      }
+
+    </style>
+	</head>
+	<body>
+    <header>剑鱼标讯实验室</header>
+    <section>
+      <article class="main">
+        <span>剑鱼标讯实验室已关闭</span>
+      </article>
+      <div class="toDeatil" onclick="window.location.href='https://res.jianyu360.com/jyapp/free/message/QQtIV11EUwMBA0xfEVpUQwBTVAYVDhZY.html';">
+        查看详情
+      </div>
+    </section>
+  </body>
+</html>  

src/jfw/modules/app/src/web/templates/weixin/jylab/lab-index.html

@@ -31,31 +31,31 @@ body{
 			<section class="content">
 				<ul>
 					<li>
-						<a href="/jyapp/jylab/laboratory/zndy">
+						<a href="#">
 							<div>智能订阅模式</div>
 							<div>更聪明的招标订阅模式</div>
 						</a>
 					</li>
 					<li>
-						<a href="/jyapp/jylab/laboratory/sjdc">
+						<a href="#">
 							<div>订阅数据导出</div>
 							<div>用表格呈现订阅数据，可下载导出</div>
 						</a>
 					</li>
 					<li>
-						<a href="/jyapp/jylab/laboratory/cjss">
+						<a href="#">
 							<div>超级搜索</div>
 							<div>按行业、金额搜索，结果可按表格显示</div>
 						</a>
 					</li>
 					<li>
-						<a href="/jyapp/jylab/laboratory/zbqy">
+						<a href="#">
 							<div>中标企业搜索</div>
 							<div>搜索企业的所有中标项目信息</div>
 						</a>
 					</li>
 					<li>
-						<a href="/jyapp/jylab/laboratory/gzqy">
+						<a href="#">
 							<div>我关注的企业</div>
 							<div>第一时间接收关注企业的中标信息</div>
 						</a>
@@ -75,7 +75,6 @@ body{
 	$(function(){
 		new FastClick(document.body);
 		$("#navbar-laboratory").addClass("active");
-        behaviorCollect();
 		/*实验室首页动画*/
 		var syzIndexMove = function(){
 			var $lists = $("#sys-main .content li"),
@@ -112,28 +111,5 @@ body{
 		/*调用*/
 		syzIndexMove.moveNow()
 	})
-
-       //行为采集
-       function behaviorCollect() {
-           if(userId){
-               var model = "lab_comm";
-               var s_url = "/jyapp/jylab/laboratory/index/";
-               var s_model = "实验室";
-               var s_open = "";
-
-               var encode= {{ConEncode "/jyapp/jylab/laboratory/index/"}};
-               var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+userId+'","s_open":"'+s_open+'"}'
-
-//                $.ajax({
-//                    url:"http://192.168.3.14:1711/accesslog/byajax",
-//                    dataType:'jsonp',
-//                    data:{json:content},
-//                    jsonp:'callback'
-//                });
-
-			$.post('/accesslog/byajax',{json:content},function(r){
-			});
-           }
-       }
 </script>
 </html>

src/jfw/modules/app/src/web/templates/weixin/resultpreview.html

@@ -46,17 +46,10 @@ if(firstPage != null && firstPage.length == 1){
 		$(".app-layout-content-b").scroll(function(){
 			scrollTop = $(this).scrollTop();
 		});
-		//
-		if(localStorage.getItem("listortable"+{{.T._id}})!=null&&localStorage.getItem("listortable"+{{.T._id}})=="T"){
-		    $(".showType .showTable").addClass("on").siblings().removeClass("on");
-			$("#list").addClass("hidden");
-			$(".tablecontent").removeClass("hidden");
-		}
 		if(sessionStorage && sessionStorage.resultpreviewScrollTop && sessionStorage.resultpreviewListCache){
 			pageNum = sessionStorage.resultpreviewPageNumCache;
 			noMore = sessionStorage.resultpreviewNoMoreCache;
-			appendListHtml([sessionStorage.resultpreviewListCache,sessionStorage.resultpreviewTableCache],pageNum);
-			$("#mytable").html(sessionStorage.resultpreviewTableCache);
+			appendListHtml([sessionStorage.resultpreviewListCache],pageNum);
 			if(noMore == "true"){
 				wxflag = $('.listcontent').dropload({
 			        scrollArea : $(".app-layout-content-b"),
@@ -74,7 +67,6 @@ if(firstPage != null && firstPage.length == 1){
 			sessionStorage.removeItem("resultpreviewPageNumCache");
 			sessionStorage.removeItem("resultpreviewListCache");
 			sessionStorage.removeItem("resultpreviewNoMoreCache");
-			localStorage.removeItem("listortable"+{{.T._id}})
 		}else{
 			$("#list").css("visibility","hidden");
 			appendListHtml(getHtml(firstPage,1),2);
@@ -138,35 +130,6 @@ if(firstPage != null && firstPage.length == 1){
 					noMoreData(wxflag);
 				}
 		}
-		//展示
-		$(".showType .showlist").on("tap",function(){
-		    $(this).addClass("on").siblings().removeClass("on");
-			$("#list").removeClass("hidden");
-			$(".dropload-down").removeClass("dropcss");
-			$(".tablecontent").addClass("hidden");
-			wxflag.resetload();
-		})
-		$(".showType .showTable").on("tap",function(){
-			//表格是否开启超级搜索？
-			$.ajax({
-	        type:'post',
-	        url:'/jyapp/jylab/supsearch/getstatus',
-	        async:false,
-	        dataType:'json', 
-	        success:function(r){
-					if(r&&r.dataexportstatus){
-					    $(".showType .showTable").addClass("on").siblings().removeClass("on");
-						$("#list").addClass("hidden");
-						$(".dropload-down").addClass("dropcss");
-						$(".tablecontent").removeClass("hidden");
-						wxflag.resetload();
-					}else{
-						window.location.href="/jyapp/jylab/laboratory/sjdc";
-					}
-				}
-			})
-		})
-		//
 	});
 	function open_window(link){
 		if(!/^http/.test(link)){
@@ -178,13 +141,10 @@ if(firstPage != null && firstPage.length == 1){
 	function hasNoData(){
 		$(".listcontent").hide();
 		$(".findnull").css("display","block");
-		$(".showType").hide();
-		$(".showType").next().hide();
 		$(".app-layout-content-b>div:first").hide();
 	}
 	function getHtml(list,pageNum){
 		var html = '';
-		var tablehtml='';
 		for(var i=0;i<list.length;i++){
 			var index = (pageNum-1)*pageSize+i+1;
 			var thisStyle = " style='padding-left: 15px;'";
@@ -219,32 +179,6 @@ if(firstPage != null && firstPage.length == 1){
 					}
 				}
 			}
-			tablehtml +='<tr onClick="tablejump(\''+list[i]._id+'\',\''+list[i].href+'\')" >'+
-						'<td>'+index+'</td>'
-			if(list[i].projectname!=null&&list[i].projectname!=""){
-				var pn = list[i].projectname;
-				if(a_key.length > 0){
-					for(var n=0;n<a_key.length;n++){
-						var keysTemp = a_key[n];
-						var isReplace = true;
-						var pnTemp = pn;
-						for(var m=0;m<keysTemp.length;m++){
-							var _pnTemp = keyWordHighlight(pnTemp,keysTemp[m],'<font class="keyword">$1</font>');
-							if(pnTemp == _pnTemp){
-								isReplace = false;
-								break;
-							}
-							pnTemp = _pnTemp;
-						}
-						if(isReplace){
-							pn = pnTemp;
-						}
-					}
-				}
-				tablehtml +='<td>'+pn+'</td>'
-			}else{
-				tablehtml +='<td>'+title+'</td>'
-			}
 			//
 			var area = list[i].area;
 			if(!area){
@@ -283,71 +217,24 @@ if(firstPage != null && firstPage.length == 1){
 			var industry = "";
 			if(list[i].industry){
 				industry='<span class="industry">'+list[i].industry+'</span>'
-			}
-			tablehtml +='<td>'+datatype+'公告</td>'
-			
-			if(typeof(list[i].budget) != "undefined" && list[i].budget != null && list[i].budget != ""){
-				var budgetone =parseInt(list[i].budget)/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(list[i].buyer!=undefined&&list[i].buyer!=""){
-				tablehtml += '<td>'+list[i].buyer+'</td>'
-			}else{
-				tablehtml += '<td></td>'
-			}
-			if(typeof(list[i].bidopentime) != "undefined" && list[i].bidopentime != null && list[i].bidopentime != ""){
-				var diff = formatDate(Number(list[i].bidopentime),"l");
-				tablehtml += '<td><div>'+diff+'</div></td>';
-			}else{
-				tablehtml += '<td><div></div></td>';
-			}
-			if(typeof(list[i].winner) != "undefined" && list[i].winner != null && list[i].winner != ""){
-				tablehtml += '<td class="tt-l"><div>'+list[i].winner+'</div></td>';
-			}else{
-				tablehtml += '<td class="tt-l"><div></div></td>';
-			}
-			if(typeof(list[i].bidamount) != "undefined" && list[i].bidamount != null && list[i].bidamount != ""){
-				var bidamountone = parseInt(list[i].bidamount)/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>';
-			}
-			var tabletime = formatDate(list[i].publishtime);
-			tablehtml +='<td>'+tabletime+'</td></tr>'
-			//					
-	    	html += '<div class="tslist">'
-						+'<div class="resnumb">'
-							+'<div class="one">'
-								+'<span class="xh">'+index+'.</span>'
-							+'</div>'
-							+'<div class="two bt-parent"'+thisStyle+'>'
-								+'<a class="bt" eid="'+list[i]._id+'" s="'+href+'" href="javascript:void(0);">'+title+'</a>'
-							+'</div>'
+			}				
+    	html += '<div class="tslist">'
+					+'<div class="resnumb">'
+						+'<div class="one">'
+							+'<span class="xh">'+index+'.</span>'
 						+'</div>'
-						+'<div style="clear:both;"></div>'
-						+'<div class="restime time-diff">'
-							+area+datatype+industry+tdf
+						+'<div class="two bt-parent"'+thisStyle+'>'
+							+'<a class="bt" eid="'+list[i]._id+'" s="'+href+'" href="javascript:void(0);">'+title+'</a>'
 						+'</div>'
-						+'<div style="clear:both;"></div>'
-					+'</div>';
+					+'</div>'
+					+'<div style="clear:both;"></div>'
+					+'<div class="restime time-diff">'
+						+area+datatype+industry+tdf
+					+'</div>'
+					+'<div style="clear:both;"></div>'
+				+'</div>';
 	    }
-		return [html,tablehtml];							                    					                    
+		return [html];							                    					                    
 	}
 	
 	//
@@ -384,17 +271,12 @@ if(firstPage != null && firstPage.length == 1){
 		var htmlObj = $(html[0]);
 		//缓存数据
 		listCache += html[0];
-		var tableObj = $(html[1]);
-		//缓存数据
-		tableCache += html[1];
 		htmlObj.on("click", function(event){
 			var h = $(this).find("a.bt").attr("s");
 			var eid = $(this).find("a.bt").attr("eid");
 			beforeJump(eid,h);
 		});
 	    $('#list').append(htmlObj);
-		//
-		$("#mytable").append(tableObj);
 	}
 	function noMoreData(me){
 		if(me == null){
@@ -409,9 +291,6 @@ if(firstPage != null && firstPage.length == 1){
 	    me.resetload();
 	}
 	function tablejump(eid,h){
-		if(localStorage){
-			localStorage.setItem("listortable"+{{.T._id}},"T");
-		}
 		beforeJump(eid,h);
 	}
 	function beforeJump(eid,h){
@@ -419,7 +298,6 @@ if(firstPage != null && firstPage.length == 1){
 			sessionStorage.resultpreviewScrollTop = scrollTop;
 			sessionStorage.resultpreviewPageNumCache = pageNum;
 			sessionStorage.resultpreviewListCache = listCache;
-			sessionStorage.resultpreviewTableCache = tableCache;
 			sessionStorage.resultpreviewNoMoreCache = noMore;
 		}
 		newredirect("",h,eid,sds);
@@ -449,132 +327,12 @@ a{
 .listcontent{
 	padding:0px 10px;
 }
-.showType{
-	/*margin-top: 8px;*/
-    padding-right: 15px;
-	display: flex;
-	justify-content: space-around;
-	align-content: center;
-	float:right;
-}
-.showType div{
-	padding-left: 30px;
-}
-.showType .showlist{
-	background: url(/jyapp/images/search/showList.png)7px 11px no-repeat;
-	background-size: 30%;
-    margin-right: 15px;
-	line-height: 21px;
-	padding-top: 8px;
-    padding-bottom: 6px;
-}
-.showType .showtable{
-	background: url(/jyapp/images/search/showTable.png)7px 10px no-repeat;
-	background-size: 30%;
-    margin-left: 15px;
-	line-height: 21px;
-	padding-top: 8px;
-    padding-bottom: 6px;
-}
-.showType .showlist.on{
-	background: url(/jyapp/images/search/showList_on.png)7px 11px no-repeat;
-	background-size: 30%;
-	color: #2cb7ca;
-}
-.showType .showtable.on{
-	background: url(/jyapp/images/search/showTable_on.png)7px 10px no-repeat;
-	background-size: 30%;
-	color: #2cb7ca;
-}
-.shuxian{
-	padding: 8px  0px !important;
-    margin-right: -10px;
-	color: #e0e0e0;
-}
-#jytables{
-	/*不需要可自己删除*/
-	padding: .2rem 0rem;
-	width:880px;
-}
-#jytables table{
-	width: 100%;
-	border-collapse: collapse;
-}
-#jytables table td {
-	padding: 5px;
-	border: 1px solid #E0E0E0;
-	text-align: center;
-	vertical-align: middle;
-}
-#jytables table thead{
-	/**font-size: .28rem;**/
-	font-size: 14px;
-	color: #686868;
-}
-#jytables table tbody{
-	/**font-size: .3rem;**/
-	font-size: 15px;
-	color: #1d1d1d;
-}
-/*高亮字体*/
-#jytables table span.higHlight{
-	color: #2cb7ca;
-}
-.tablecontent{
-	width: 100%;
-    overflow-x: scroll;
-}
-#jytables thead>tr>td:nth-child(1){
-	padding:.3rem 0;
-	width:30px;
-}
-#jytables tbody>tr>td:nth-child(9){
-	width:68px;
-}
-#jytables tbody>tr>td:nth-child(3){
-	width:74px;
-}
-#jytables tbody>tr>td:nth-child(5){
-	width:160px;
-	padding: 17px 5px;
-  line-height: 21px;
-  text-align: left;
-}
-#jytables tr td{
-  word-break: break-word;
-}
-#jytables tbody>tr>td:nth-child(1){
-	width: 40px;
-  padding: 17px 5px;
-  line-height: 21px;
-}
-#jytables tbody>tr>td:nth-child(2){
-	width: 160px;
-  padding: 17px 5px;
-  line-height: 21px;
-  text-align: left;
-}
 .prompt{
 	padding:10px 10px 0px;
 }
 .blue{
 	color:#0987ff;
 }
-#jytables tbody>tr>td:nth-child(4){
-	width:70px;
-}
-#jytables tbody>tr>td:nth-child(6){
-	width:90px;
-}
-#jytables tbody>tr>td:nth-child(7) div{
-	width:110px;
-}
-#jytables tbody>tr>td:nth-child(7){
-	width:110px;
-}
-#jytables tbody>tr>td:nth-child(8){
-	width:72px;
-}
 .resnumb .two{
 	max-height: 45px;
     overflow: hidden;
@@ -588,37 +346,9 @@ a{
 	</div>
 	<div class="app-layout-content-b">
 		<div>根据您设置的关键词：<font class="keyword"></font>，为您预览30天之内的信息，点击标题可查看详细信息。</div>
-		<div class="showType">
-			<div class="showlist on">列表</div>
-			<div class="shuxian">|</div>
-			<div class="showtable">表格</div>
-		</div>
-		<div style="height:37px;border-bottom:1px solid #ddd;border-top: 1px solid #ddd;"></div>
 		<div class="listcontent">
 			<div id="list"></div>
-			<div class="tablecontent hidden">
-				<section id="jytables">
-					<table>
-						<thead> 
-							<tr>
-								<td>序号</td>
-								<td>项目名称</td>
-								<td>公告类型</td>
-								<td>预算<br>（万元）</td>
-								<td>招标单位</td>
-								<td>开标日期</td>
-								<td>中标单位</td>
-								<td>中标金额<br>（万元）</td>
-								<td>发布日期</td>
-							</tr>
-						</thead>
-						<tbody id="mytable">	
-						</tbody>
-					</table>
-				</section>
-				<div class="prompt">提示：为了获得更佳的体验，推荐<span class="blue" onclick="window.location.href='/jyapp/wxkeyset/keyset/seniorset'">打开邮件推送</span>，用电脑查看邮件中的表格。</div>
-			</div>
-		</div>
+	</div>
 		
 		<span class="text-center findnull">
 			<div>

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -49,12 +49,6 @@
 	</div>
 	<section class="content">
 		<ul>
-			<li>
-				<a>
-					<div>超级搜索</div>
-					<div>按行业、金额搜索，结果可按表格显示</div>
-				</a>
-			</li>
 			<li>
 				<a>
 					<div>中标企业搜索</div>
@@ -634,36 +628,18 @@
 	    });
 		//查询是否开通超级搜索和中标企业搜索
 	    $.post("/jyapp/jylab/supsearch/getstatus?t="+new Date().getTime(),function(result){
-			$("#searchIndex .inp-search").unbind("touchend").on("touchend",function () {
-	            SuperSearch.init(true,true,true);
-	        });
-			//超级搜索跳转
-		    $(".content ul li a:eq(0)").unbind("tap").on("tap",function(){
-				SuperSearch.init(true,true,true);
-		    });
-			if(result.userId==""){
-				userId = "";
-				//中标企业搜索跳转
-			    $(".content ul li a:eq(1)").unbind("tap").on("tap",function(){
-					setTimeout(function(){
-						window.location.href='/jyapp/free/login?back=index';
-					},100);
-			    });
-			}else{
-				userId = result.userId;
-				localStorage.isopen_supersearch=result.supstatus?"y":"n";
-				localStorage.isopen_entsesearch=result.entstatus?"y":"n";
-				SuperSearch.openTablepro=result.tablepro;
-				//中标企业搜索跳转
-			    $(".content ul li a:eq(1)").unbind("tap").on("tap",function(){
-					if(localStorage.isopen_entsesearch=="y"){
-						EntSearch.clearSessionStorage();
-						EntSearch.init(true,true,true);
-			        }else{
-			            window.location.href='/jyapp/jylab/laboratory/zbqy?v=entSearch_back';
-			        }
-			    });
-			}
+			  $("#searchIndex .inp-search").unbind("touchend").on("touchend",function () {
+	        SuperSearch.init(true,true,true);
+	      });
+
+			userId = result.userId;
+			SuperSearch.openTablepro=result.tablepro;
+			//中标企业搜索跳转
+	    $(".content ul li a:eq(0)").unbind("tap").on("tap",function(){
+				EntSearch.clearSessionStorage();
+				EntSearch.init(true,true,true);
+	    });
+
 	    });
 	}
 	function backThisPage(){

src/jfw/modules/app/src/web/templates/weixin/wxkeyset/index.html

@@ -44,10 +44,6 @@ if(localStorage&&localStorage.tsGuide_status=="1"){
 $(function(){
 	$("#navbar-subscribe").addClass("active");
 	$("body").css("background-color","FFF");
-    if(localStorage.hasTopMsg!="false"){
-        $(".keyWordTip").show();
-    }
-
 	if(!isIOS){
 		$(".relRecom").addClass("isnotios");
 	}
@@ -137,9 +133,6 @@ $(function(){
 			$(".inputText").remove();
 			$(".relRecom").removeClass("slideInUp");
 			$(".relRecom").removeClass("animated");
-		    if(localStorage.hasTopMsg!="false"){
-		        $(".keyWordTip").show();
-		    }
 			if(thisClass.parents(".keyWordGroup").index() != focusinputindex){
 				return;
 			}
@@ -158,7 +151,6 @@ $(function(){
 		},300);
 	}).focus(function(){
 		$(".app-layout-header").css("position","absolute");
-		$(".keyWordTip").hide();
 		$(".header,.keyWordContent").addClass("absolute");
 		if(focusinputindex != $(this).parents(".keyWordGroup").index()){
 			istiped = false;
@@ -653,11 +645,6 @@ function saveSeniorset(r){
 		
 	});
 }
-
-function hideTip() {
-	$(".keyWordTip").hide();
-    localStorage.hasTopMsg="false";
-}
 </script>
 </head>
 <body class="keysetpage">
@@ -672,12 +659,6 @@ function hideTip() {
 			<span class="complate hide">完成</span>
 			<span class="seniorset" style="float: right;font-size: 15px;color: #686868;"><img src="/jyapp/images/wxkeyset/set.png" style="width: 17px;margin-right: 4px;margin-top: -3px;">推送设置</span>
 		</div>
-		<!--关键词上方红字提示-->
-		<div class="keyWordTip" style="display: none; position:relative; padding:5px 0px 5px 15px; background-color:rgba(253,238,210,1);">
-			<div style="width:90%; font-size:13px; color:rgba(216,86,27,1);">在推送设置中，开启智能订阅模式，剑鱼标讯将更智能地与公告正文进行匹配。</div>
-			<img src="/jyapp/images/wxkeyset/zhaobiaodingyue-close.png" style="position:absolute; top:16px; right:10px; width:18px; height:18px;" onclick="hideTip();">
-		</div>
-	
 		<div class="keyWordContent">
 			<div class="keyWordGroup">
 				<lable>1</lable>

src/jfw/modules/app/src/web/templates/weixin/wxkeyset/seniorset.html

@@ -79,21 +79,6 @@ $(function(){
 	});
 	////////////////////////////////
 	$(".modal-dialog").css("margin-top",$(window).height()*0.25);
-
-    //智能订阅
-    $("#intelligentSubscribtion").click(function(){
-		if(!clickDelayed){
-			return;
-		}
-        window.location.href = "/jyapp/jylab/laboratory/zndy";
-    });
-    //订阅数据导出
-    $("#dataExport").click(function(){
-		if(!clickDelayed){
-			return;
-		}
-        window.location.href = "/jyapp/jylab/laboratory/sjdc";
-    });
 	//推送结果预览
 	$("#resultpreview").click(function(){
 		if(!clickDelayed){
@@ -392,23 +377,6 @@ function docheck(n,th){
 	</div>
 	<div class="app-layout-content-b">
 		<div class="content">
-			<div class="navchoose-top">
-				<ul>
-					<li id="intelligentSubscribtion">
-						<div>
-							<div>智能订阅模式</div>
-							<div>更聪明的招标订阅模式</div>
-						</div>
-					</li>
-					<li id="dataExport">
-						<div>
-							<div>订阅数据导出</div>
-							<div>用表格呈现订阅数据，可下载导出</div>
-						</div>
-					</li>
-				</ul>
-			</div>
-
 			<div id="pushfrequency">
 				<ul class="navchoose">
 					<li><img src="/jyapp/images/wxkeyset/pushfrequency.png">推送时间</li>

src/jfw/modules/app/src/web/templates/weixin/wxpush.html

@@ -359,22 +359,9 @@ $(function(){
 		$(".tablecontent").addClass("hidden");
 	})
 	$(".showType .showTable").click(function(){
-		//表格是否开启超级搜索？
-		$.ajax({
-        type:'post',
-        url:'/jyapp/jylab/supsearch/getstatus',
-        async:false,
-        dataType:'json',
-        success:function(r){
-				if(r&&r.dataexportstatus){
-				    $(".showType .showTable").addClass("on").siblings().removeClass("on");
-					$(".listcontent").addClass("hidden");
-					$(".tablecontent").removeClass("hidden");
-				}else{
-					window.location.href="/jyapp/jylab/laboratory/sjdc";
-				}
-			}
-		})
+		$(".showType .showTable").addClass("on").siblings().removeClass("on");
+		$(".listcontent").addClass("hidden");
+		$(".tablecontent").removeClass("hidden");
 	})
 	//
 	$(".blue").click(function(){

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

@@ -41,10 +41,6 @@ func (e *EntSeSearch) ToSearch() error {
 	if userid == "" || userid == "" {
 		return e.Redirect("/swordfish/about")
 	}
-	authStatus := jylabutil.IsAuthorized(userid, "i_entsesearch")
-	if !authStatus {
-		return e.Redirect("/jylab/laboratory/zbqy")
-	}
 	e.T["pageSize"] = wx_pageSize
 	e.T["s_m_openid"] = openid
 	return e.Render("/weixin/entseSearch.html", &e.T)
@@ -74,13 +70,6 @@ func (e *EntSeSearch) ProList() {
 	defer util.Catch()
 	proList := make([]map[string]interface{}, 0)
 	userid := util.ObjToString(e.GetSession("userId"))
-	if userid == "" {
-		e.ServeJson(map[string]interface{}{
-			"proList":     proList,
-			"hasNextPage": false,
-		})
-		return
-	}
 	var searchname = e.GetString("searchname")
 	var scope = e.GetString("scope")
 	var money_from = e.GetString("money_from")

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

@@ -63,12 +63,8 @@ func (f *FollowEnt) EntList() error {
 	if userid == "" {
 		return f.Redirect("/swordfish/about")
 	}
-	authStatus := jylabutil.IsAuthorized(userid, "i_followent")
-	if !authStatus {
-		return f.Redirect("/jylab/laboratory/gzqy")
-	}
-	followEntLimit, _ := strconv.Atoi(config.Sysconfig["followentlimit"].(string))
 
+	followEntLimit, _ := strconv.Atoi(config.Sysconfig["followentlimit"].(string))
 	datas, ok := mongodb.Find("jylab_followent", `{"s_userid":"`+userid+`","s_entname":{"$ne":""}}`, `{"l_lastpushtime":-1,"l_createtime":-1}`, `{"_id":1,"s_entname":1,"s_userid":1,"s_openid":1,"l_createtime":1,"l_lastpushtime":1,"s_id":1,"i_ispush":1}`, false, 0, 10)
 	f.T["flag"] = false
 	if ok && datas != nil && len(*datas) > 0 {
@@ -127,9 +123,6 @@ func (f *FollowEnt) Detail(followId string) error {
 	if userId == "" {
 		return f.Redirect("/swordfish/about")
 	}
-	if !jylabutil.IsAuthorized(userId, "i_followent") {
-		return f.Redirect("/jylab/laboratory/gzqy")
-	}
 	followId = util.DecodeArticleId2ByCheck(followId)[0]
 	winner := ""
 	winnerId := ""
@@ -175,9 +168,6 @@ func (f *FollowEnt) NewInfo(param string) error {
 	if userId == "" {
 		return f.Redirect("/swordfish/about")
 	}
-	if !jylabutil.IsAuthorized(userId, "i_followent") {
-		return f.Redirect("/jylab/laboratory/gzqy")
-	}
 	winner := ""
 	winnerId := ""
 	if param != "" {

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

@@ -126,11 +126,12 @@
                 $("#recList").hide();
 			}
 			$(".rec").click(function(){
-                if($(this).text()!=""){
-                    $("input").val($(this).text());
-                    winner_id = $(this).attr("data-id");
-                    $("#recList").hide();
-                }
+        if($(this).text()!=""){
+            $("input").val($(this).text());
+            winner_id = $(this).attr("data-id");
+            $("#recList").hide();
+            $(".opation").removeClass("disabled");
+        }
 			});
 		});
 	}

src/jfw/modules/pushent/src/followpush/push.go

@@ -397,21 +397,21 @@ func push(fid, sname, userId string, res *[]map[string]interface{}) {
 				log.Println("微信推送", isPushOk, userId, s_m_openid, pushnum, sname)
 			}
 			if jpushid != "" || opushid != "" {
+				descriptAppend := ""
 				jpushtitle := strings.Replace((*((*pushArray)[0]))["s_title"].(string), "\n", "", -1)
-				if len([]rune(jpushtitle)) > 80 {
-					jpushtitle = string([]rune(jpushtitle)[:80]) + "..."
-				}
 				if pushnum > 1 {
-					jpushtitle = fmt.Sprintf("1. %s\n...(共%d条)", jpushtitle, pushnum)
+					descriptAppend = fmt.Sprintf("\n...(共%d条)", pushnum)
+					jpushtitle = fmt.Sprintf("1. %s", jpushtitle)
 				}
 				isPushOk := rpccall.AppPushServiceCall(map[string]interface{}{
-					"phoneType":   phoneType,
-					"otherPushId": opushid,
-					"jgPushId":    jpushid,
-					"descript":    jpushtitle,
-					"type":        "entname",
-					"userId":      userId,
-					"url":         "/jyapp/free/sess/" + se.EncodeString(userId+",_id,"+strconv.Itoa(int(time.Now().Unix()))+",followEntDetail") + "__" + util.EncodeArticleId2ByCheck(fid),
+					"phoneType":      phoneType,
+					"otherPushId":    opushid,
+					"jgPushId":       jpushid,
+					"descript":       jpushtitle,
+					"descriptAppend": descriptAppend,
+					"type":           "entname",
+					"userId":         userId,
+					"url":            "/jyapp/free/sess/" + se.EncodeString(userId+",_id,"+strconv.Itoa(int(time.Now().Unix()))+",followEntDetail") + "__" + util.EncodeArticleId2ByCheck(fid),
 				})
 				log.Println("app推送", isPushOk, userId, s_m_openid, a_m_openid, s_phone, phoneType, jpushid, opushid, pushnum, sname)
 			}

src/jfw/modules/pushproject/src/followpush/push.go

@@ -505,21 +505,21 @@ func push(fid interface{}, sname, scode, title, userId string, res *[]map[string
 						log.Println("微信推送", isPushOk, userId, s_m_openid, pushnum, tit)
 					}
 					if jpushid != "" || opushid != "" { //极光推送
+						descriptAppend := ""
 						jpushtitle := strings.Replace((*((*pushArray)[0]))["s_title"].(string), "\n", "", -1)
-						if len([]rune(jpushtitle)) > 80 {
-							jpushtitle = string([]rune(jpushtitle)[:80]) + "..."
-						}
 						if pushnum > 1 {
-							jpushtitle = fmt.Sprintf("1. %s\n...(共%d条)", jpushtitle, pushnum)
+							descriptAppend = fmt.Sprintf("\n...(共%d条)", pushnum)
+							jpushtitle = fmt.Sprintf("1. %s", jpushtitle)
 						}
 						isPushOk := rpccall.AppPushServiceCall(map[string]interface{}{
-							"phoneType":   phoneType,
-							"otherPushId": opushid,
-							"jgPushId":    jpushid,
-							"descript":    jpushtitle,
-							"type":        "project",
-							"userId":      userId,
-							"url":         "/jyapp/free/sess/" + se.EncodeString(userId+",_id,"+strconv.Itoa(int(time.Now().Unix()))+",wxpushfollowlist") + "__" + tmpid + "__" + followid,
+							"phoneType":      phoneType,
+							"otherPushId":    opushid,
+							"jgPushId":       jpushid,
+							"descript":       jpushtitle,
+							"descriptAppend": descriptAppend,
+							"type":           "project",
+							"userId":         userId,
+							"url":            "/jyapp/free/sess/" + se.EncodeString(userId+",_id,"+strconv.Itoa(int(time.Now().Unix()))+",wxpushfollowlist") + "__" + tmpid + "__" + followid,
 						})
 						log.Println("app推送", userId, s_m_openid, a_m_openid, s_phone, phoneType, jpushid, opushid, isPushOk, pushnum, tit)
 					}

src/jfw/modules/pushsubscribe/src/match/config.json

@@ -1,12 +1,12 @@
 {
 	"elasticPoolSize": 1,
-	"elasticSearch": "http://192.168.3.18:9800",
-	"redisServers": "pushcache_1=192.168.3.18:2001",
+	"elasticSearch": "http://192.168.3.128:9800",
+	"redisServers": "pushcache_1=192.168.3.128:5000",
 	"maxPushSize": 50,
 	"maxSearch": 5000,
-	"mgoAddr": "192.168.3.18:27080",
+	"mgoAddr": "192.168.3.128:27080",
 	"mgoSize": 10,
-	"testids": ["5ca5a56e25ef8723d82b8cb5"],
+	"testids": [],
 	"filterWords":["项目","中标","公告"],
 	"matchPoolSize": 60,
 	"matchDuration": 1, 

src/jfw/modules/pushsubscribe/src/match/job/matchjob.go

@@ -106,17 +106,17 @@ func (m *MatchJob) Execute() {
 		a_key_user := make(map[string]*[]*UserInfo)
 		a_notkey_user := make(map[string]*[]*UserInfo)
 		//开启智能订阅的用户
-		s_key_user := make(map[string]*[]*UserInfo)
-		s_notkey_user := make(map[string]*[]*UserInfo)
+		//s_key_user := make(map[string]*[]*UserInfo)
+		//s_notkey_user := make(map[string]*[]*UserInfo)
 		for _, v := range *m.users {
 			m.MakeKeyUser(v.Keys, v, &a_key_user)
 			m.MakeKeyUser(v.NotKeys, v, &a_notkey_user)
-			if v.SmartSet == 1 {
-				m.MakeKeyUser(v.Keys, v, &s_key_user)
-				m.MakeKeyUser(v.NotKeys, v, &s_notkey_user)
-			}
+			// if v.SmartSet == 1 {
+			// 	m.MakeKeyUser(v.Keys, v, &s_key_user)
+			// 	m.MakeKeyUser(v.NotKeys, v, &s_notkey_user)
+			// }
 		}
-		m.ToMatch(user_batch_index, a_key_user, a_notkey_user, s_key_user, s_notkey_user)
+		m.ToMatch(user_batch_index, a_key_user, a_notkey_user, nil, nil)
 		if user_batch_size < SysConfig.UserBatch {
 			break
 		}
@@ -184,22 +184,22 @@ func (m *MatchJob) Save(a_p, s_p *Pjob) {
 		}
 		user := (*m.users)[openid]
 		m.saveBatch = append(m.saveBatch, map[string]interface{}{
-			"s_m_openid":    user.S_m_openid,
-			"a_m_openid":    user.A_m_openid,
-			"phone":         user.Phone,
-			"jpushid":       user.Jpushid,
-			"opushid":       user.Opushid,
-			"appphonetype":  user.AppPhoneType,
-			"userid":        user.Id,
-			"ratemode":      user.RateMode,
-			"wxpush":        user.WxPush,
-			"apppush":       user.AppPush,
-			"mailpush":      user.MailPush,
-			"pchelperpush":  user.PchelperPush,
-			"smartset":      user.SmartSet,
-			"usertype":      user.UserType,
-			"email":         user.Email,
-			"dataexport":    user.DataExport,
+			"s_m_openid":   user.S_m_openid,
+			"a_m_openid":   user.A_m_openid,
+			"phone":        user.Phone,
+			"jpushid":      user.Jpushid,
+			"opushid":      user.Opushid,
+			"appphonetype": user.AppPhoneType,
+			"userid":       user.Id,
+			"ratemode":     user.RateMode,
+			"wxpush":       user.WxPush,
+			"apppush":      user.AppPush,
+			"mailpush":     user.MailPush,
+			"pchelperpush": user.PchelperPush,
+			//"smartset":      user.SmartSet,
+			"usertype": user.UserType,
+			"email":    user.Email,
+			//"dataexport":    user.DataExport,
 			"list":          array,
 			"size":          size,
 			"subscribe":     user.Subscribe,
@@ -318,15 +318,15 @@ func (m *MatchJob) OnceUserBatch(user_batch_index int) int {
 		"s_jpushid":       1,
 		"s_opushid":       1,
 		"i_ispush":        1,
-		"i_dataexport":    1,
 		"i_type":          1,
-		"i_smartset":      1,
 		"i_supersearch":   1,
 		"s_appponetype":   1,
 		"i_applystatus":   1,
 		"a_mergeorder":    1,
 		"s_nickname":      1,
 		"l_firstpushtime": 1,
+		//"i_dataexport": 1,
+		//"i_smartset":1,
 	}).Iter()
 	n := 0
 	for temp := make(map[string]interface{}); query.Next(temp); {
@@ -391,10 +391,10 @@ func (m *MatchJob) OnceUserBatch(user_batch_index int) int {
 			continue
 		}
 		userId := fmt.Sprintf("%x", string(temp["_id"].(bson.ObjectId)))
-		smartset := util.IntAll(temp["i_smartset"])
+		//smartset := util.IntAll(temp["i_smartset"])
+		//dataExport := util.IntAll(temp["i_dataexport"])
 		rateMode := util.IntAllDef(o_msgset["i_ratemode"], 2)
-		dataExport := util.IntAll(temp["i_dataexport"])
-		logger.Info("第", user_batch_index, "批用户，userid", userId, "s_m_openid", s_m_openid, "a_m_openid", a_m_openid, "s_phone", s_phone, "jpushid", jpushid, "opushid", opushid, "applystatus", applystatus, "smartset", smartset, "email", email, "rateMode", rateMode, "dataExport", dataExport, "wxpush", wxpush, "apppush", apppush, "mailpush", mailpush)
+		logger.Info("第", user_batch_index, "批用户，userid", userId, "s_m_openid", s_m_openid, "a_m_openid", a_m_openid, "s_phone", s_phone, "jpushid", jpushid, "opushid", opushid, "applystatus", applystatus, "email", email, "rateMode", rateMode, "wxpush", wxpush, "apppush", apppush, "mailpush", mailpush)
 		keys := []string{}                           //过滤后的关键词
 		notkeys := []string{}                        //排除词
 		key_notkey := map[string]map[string]bool{}   //关键词所对应的排除词
@@ -464,14 +464,14 @@ func (m *MatchJob) OnceUserBatch(user_batch_index int) int {
 			UserType:     userType,
 			RateMode:     rateMode,
 			AllKeys:      allkeysTemp, //原始关键词
-			SmartSet:     smartset,
-			DataExport:   dataExport,
 			ModifyDate:   modifydate,
 			AppPhoneType: appPhoneType,
 			ApplyStatus:  applystatus,
 			Subscribe:    isPush,
 			MergeOrder:   temp["a_mergeorder"],
 			NickName:     util.ObjToString(temp["s_nickname"]),
+			//SmartSet:     smartset,
+			//DataExport:   dataExport,
 		}
 		(*m.users)[user.Id] = user
 		m.lastUserId = user.Id

src/jfw/modules/pushsubscribe/src/match/main.go

@@ -26,7 +26,6 @@ func main() {
 		job.Jobs.Match.Execute()
 	} else {
 		go job.Task.Match.Execute()
-		flag := make(chan bool)
-		<-flag
+		<-chan bool(nil)
 	}
 }

src/jfw/modules/pushsubscribe/src/public/entity.go

@@ -25,9 +25,7 @@ type UserInfo struct {
 	MailPush      int
 	PchelperPush  int
 	RateMode      int
-	SmartSet      int //智能订阅 1开启 0关闭
 	Email         string
-	DataExport    int //是否导出数据 1开启 0关闭
 	AllKeys       []elastic.KeyConfig
 	ModifyDate    string
 	AppPhoneType  string
@@ -37,6 +35,8 @@ type UserInfo struct {
 	MergeOrder    interface{}
 	NickName      string
 	FirstPushTime int64
+	//SmartSet      int //智能订阅 1开启 0关闭
+	//DataExport    int //是否导出数据 1开启 0关闭
 	//
 	//Active int
 	//Fail   *Fail //失败重试

src/jfw/modules/pushsubscribe/src/push/config.json

@@ -8,7 +8,7 @@
 		"size": 5,
 		"timeout": 20
 	},
-	"redisServers": "pushcache_2_a=192.168.3.18:2002,pushcache_2_b=192.168.3.18:2003",
+	"redisServers": "pushcache_2_a=192.168.3.128:5000,pushcache_2_b=192.168.3.128:5000",
 	"mail_content": "<tr><td><num>%d</num></td><td><div class='tit'><a style='color: #000;text-decoration: none;' href='%s?mail' >%s</a></div></td><td style='float: right;' class='infos' ><span class='%s'>%s</span><span class='%s'>%s</span><span class='%s'>%s</span><span class='time'>%s</span></td></tr>",
 	"mail_html": "<body><style> *,body,html{margin:0;padding:0;font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;font-size:16px; }#all{margin:0 auto;width:1024px;overflow:hidden;}.head{margin:5x;margin-top:20px;}.des{padding-bottom:15px;border-bottom:1px solid #e8ecee;color: #686868;}td a:hover {color: #fe7379;text-decoration: underline;} .tit{width:560px;overflow: hidden;    white-space: nowrap;text-overflow: ellipsis;}.area {background-color: #2cb7ca;border-radius: 3px;color: #fff;padding: 1px 2px;}.type {background-color: #ffba00;border-radius: 3px;color: #fff;padding: 1px 2px;margin-left:5px;}.industry {background-color: #25c78c;border-radius: 3px;color: #fff;padding: 1px 2px;margin-left:5px;}.infos span{display:inline-block;margin-left:5px;}td{padding-top:8px;padding-bottom:8px;height:20px;line-height:20px;}num{padding:0 5px 0 0; font-size:16px;color:#2cb7ca;font-weight:bolder;}.keys{color:blue;} </style><div id='all'><div class='head'><IMG width='100px' src=http://www.zhaobiao.info/images/swordfish/sf_01.png /></div><div class='head des'>根据您设置的关键词 ：<span class='keys'>%s</span>，剑鱼标讯为您推送30天之内的信息。点击标题可查看详情信息</div><table cellpadding='0' cellspacing='0'>%s</table></div> </body>",
 	"mail_title": "您有新的%s信息-剑鱼标讯",
@@ -31,32 +31,31 @@
 		}
 	],
 	"maxPushSize": 50,
-	"mgoAddr": "192.168.3.18:27080",
+	"mgoAddr": "192.168.3.128:27080",
 	"mgoSize": 10,
-	"testids": ["5c8f4f4325ef8723d0bc1082"],
+	"testids": ["5d6e142a25ef871f08a72662"],
 	"weixinRpcServer": "127.0.0.1:8083",
 	"wxColor": "#2cb7ca",
-	"wxContent": "剑鱼标讯推送",
 	"wxGroup": "招标信息",
 	"wxTitle": "根据你订阅的关键词“%s”，剑鱼标讯为你推送以下信息。如果不想继续收到此类信息，可进入招标订阅的设置页面取消订阅。",
 	"wxDetailColor":"#686868",
 	"appPushServiceRpc":"127.0.0.1:5566",
 	"pcHelper":"192.168.20.129:8082",
-	"startPushTime":"08:00",
-	"endPushTime":"20:00",
 	"oncePushTime": "9:00",
 	"otherPushTimes":[
+		"07:30",
 		"14:00",
 		"18:00"
 	],
 	"cassandraPollSize":10,
 	"pushPoolSize": 60,
+	"mergePoolSize": 40,
+	"movePoolSize": 40,
 	"minutePushSize": 300,
 	"fastigiumMinutePushSize": 100,
 	"fastigiumTime":"9-11",
 	"wxPollSize": 40,
 	"appPollSize": 50,
-	"pushDuration": 60,
 	"mailSleep":200,
 	"cassandraSleep":200,
 	"appSleep":5,

src/jfw/modules/pushsubscribe/src/push/config/config.go

@@ -4,6 +4,7 @@ import (
 	"qfw/util"
 	"qfw/util/mail"
 	"regexp"
+	"strings"
 )
 
 type sysConfig struct {
@@ -11,6 +12,8 @@ type sysConfig struct {
 	Cassandra               *cassandra  `json:"cassandra"`
 	RedisServers            string      `json:"redisServers"`
 	PushPoolSize            int         `json:"pushPoolSize"`
+	MergePoolSize           int         `json:"mergePoolSize"`
+	MovePoolSize            int         `json:"movePoolSize"`
 	Mail_content            string      `json:"mail_content"`
 	Mail_html               string      `json:"mail_html"`
 	Mail_title              string      `json:"mail_title"`
@@ -22,15 +25,11 @@ type sysConfig struct {
 	WeixinRpcServer         string      `json:"weixinRpcServer"`
 	WxColor                 string      `json:"wxColor"`
 	WxGroup                 string      `json:"wxGroup"`
-	WxContent               string      `json:"wxContent"`
 	WxTitle                 string      `json:"wxTitle"`
 	WxDetailColor           string      `json:"wxDetailColor"`
 	AppPushServiceRpc       string      `json:"appPushServiceRpc"`
 	PcHelper                string      `json:"pcHelper"`
-	PushDuration            int64       `json:"pushDuration"`
 	PushBatch               int         `json:"pushBatch"`
-	StartPushTime           string      `json:"startPushTime"`
-	EndPushTime             string      `json:"endPushTime"`
 	OncePushTime            string      `json:"oncePushTime"`
 	OtherPushTimes          []string    `json:"otherPushTimes"`
 	WxPollSize              int         `json:"wxPollSize"`
@@ -67,17 +66,23 @@ type cassandra struct {
 }
 
 var (
-	Gmails       []*mail.GmailAuth
-	Se           = util.SimpleEncrypt{Key: "topnet"}
-	Re           = regexp.MustCompile("<[^>]+>([^<]+)?<[^>]+>")
-	SysConfig    *sysConfig
-	WxContentLen int
+	Gmails         []*mail.GmailAuth
+	Se             = util.SimpleEncrypt{Key: "topnet"}
+	Re             = regexp.MustCompile("<[^>]+>([^<]+)?<[^>]+>")
+	SysConfig      *sysConfig
+	WxGroupLen     int
+	FastigiumStart int
+	FastigiumEnd   int
 )
 
 func init() {
 	util.ReadConfig("./config.json", &SysConfig)
 	//
-	WxContentLen = len([]rune(SysConfig.WxContent))
+	if fastigiumTimes := strings.Split(SysConfig.FastigiumTime, "-"); len(fastigiumTimes) == 2 {
+		FastigiumStart = util.IntAll(fastigiumTimes[0])
+		FastigiumEnd = util.IntAll(fastigiumTimes[1])
+	}
+	WxGroupLen = len([]rune(SysConfig.WxGroup))
 	Gmails = make([]*mail.GmailAuth, len(SysConfig.Mails))
 	for k, v := range SysConfig.Mails {
 		Gmails[k] = &mail.GmailAuth{

src/jfw/modules/pushsubscribe/src/push/job/dopush.go

@@ -18,8 +18,12 @@ import (
 )
 
 func init() {
-	putil.LimitMaxOneMinutePush(&DoPush.minutePushPool, SysConfig.MinutePushSize)
-	putil.LimitMaxOneMinutePush(&DoPush.fastigiumMinutePushPool, SysConfig.FastigiumMinutePushSize)
+	if SysConfig.MinutePushSize > 0 {
+		putil.LimitMaxOneMinutePush(&DoPush.minutePushPool, SysConfig.MinutePushSize)
+	}
+	if SysConfig.FastigiumMinutePushSize > 0 {
+		putil.LimitMaxOneMinutePush(&DoPush.fastigiumMinutePushPool, SysConfig.FastigiumMinutePushSize)
+	}
 }
 
 type doPush struct {
@@ -28,22 +32,17 @@ type doPush struct {
 }
 
 func (d *doPush) Execute(taskType int, wxPush, appPush, mailPush int, u *UserInfo, list, tempList SortList) (isSaveSuccess bool, wxStatus, appStatus, mailStatus int) {
-	isSaveSuccess = true
-	//开通订阅推送或邮箱推送的用户，由实时推送修改成九点推送，app推送用list字段，微信和邮箱推送用templist字段
 	if wxPush == 1 || appPush == 1 || mailPush == 1 || u.PchelperPush == 1 {
 		if list != nil && tempList != nil {
 			isSaveSuccess, _, appStatus, _ = d.Do(taskType, true, 0, appPush, 0, u, &list)
-			if !isSaveSuccess {
-				return
+			if isSaveSuccess {
+				_, wxStatus, _, mailStatus = d.Do(taskType, false, wxPush, 0, mailPush, u, &tempList)
 			}
-			_, wxStatus, _, mailStatus = d.Do(taskType, false, wxPush, 0, mailPush, u, &tempList)
 		} else if list != nil {
 			isSaveSuccess, wxStatus, appStatus, mailStatus = d.Do(taskType, true, wxPush, appPush, mailPush, u, &list)
-			if !isSaveSuccess {
-				return
-			}
 		} else if tempList != nil {
 			_, wxStatus, appStatus, mailStatus = d.Do(taskType, false, wxPush, 0, mailPush, u, &tempList)
+			isSaveSuccess = true
 		}
 	}
 	return isSaveSuccess, wxStatus, appStatus, mailStatus
@@ -59,7 +58,7 @@ func (d *doPush) Do(taskType int, isSave bool, wxPush, appPush, mailPush int, k
 	publishTitle := map[string]bool{}
 	pushIds := []string{}
 	//邮件附件
-	var fmdatas = []map[string]interface{}{}
+	//var fmdatas = []map[string]interface{}{}
 	for _, ks := range *sl {
 		k2 := *ks.Info
 		title := strings.Replace(k2["title"].(string), "\n", "", -1)
@@ -138,19 +137,19 @@ func (d *doPush) Do(taskType int, isSave bool, wxPush, appPush, mailPush int, k
 				industryclass = ""
 			}
 			mailContent += fmt.Sprintf(SysConfig.Mail_content, i, url, otitle, classArea, area, classType, infotype, industryclass, industry, dates)
-			if k.DataExport == 1 {
-				//附件数据
-				fmdatas = append(fmdatas, map[string]interface{}{
-					"publishtime": k2["publishtime"],
-					"subtype":     k2["subtype"],
-					"buyer":       k2["buyer"],
-					"projectname": k2["projectname"],
-					"budget":      k2["budget"],
-					"bidopentime": k2["bidopentime"],
-					"winner":      k2["winner"],
-					"bidamount":   k2["bidamount"],
-				})
-			}
+			// if k.DataExport == 1 {
+			// 	//附件数据
+			// 	fmdatas = append(fmdatas, map[string]interface{}{
+			// 		"publishtime": k2["publishtime"],
+			// 		"subtype":     k2["subtype"],
+			// 		"buyer":       k2["buyer"],
+			// 		"projectname": k2["projectname"],
+			// 		"budget":      k2["budget"],
+			// 		"bidopentime": k2["bidopentime"],
+			// 		"winner":      k2["winner"],
+			// 		"bidamount":   k2["bidamount"],
+			// 	})
+			// }
 		}
 		if i >= SysConfig.MaxPushSize {
 			//限制最大信息条数
@@ -161,16 +160,26 @@ func (d *doPush) Do(taskType int, isSave bool, wxPush, appPush, mailPush int, k
 		logger.Info("推送任务", taskType, "没有要推送的数据！", k.Id)
 		return
 	}
+	//限制一分钟最大的推送数量
+	if d.fastigiumMinutePushPool != nil {
+		if hour := time.Now().Hour(); hour >= FastigiumStart && hour <= FastigiumEnd {
+			<-d.fastigiumMinutePushPool //高峰期
+		}
+	} else if d.minutePushPool != nil {
+		<-d.minutePushPool //正常期
+	}
 	if taskType != 0 && isSave {
 		//推送记录id
 		pushId := putil.SaveSendInfo(k, pushIds, infos)
 		if pushId == "" {
 			logger.Info("推送任务", taskType, "保存到cassandra出错", k.Id)
 			return
-		} else {
-			logger.Info("推送任务", taskType, "成功保存到cassandra", pushId, k.Id)
 		}
+		logger.Info("推送任务", taskType, "成功保存到cassandra", pushId, k.Id)
 		isSaveSuccess = true
+	}
+	logger.Info("推送任务", taskType, "开始进行终端推送", k.Id)
+	if isSaveSuccess {
 		//pc端助手推送
 		if k.S_m_openid != "" {
 			logger.Info("推送任务", taskType, "开始助手推送", k.Id, "s_m_openid", k.S_m_openid)
@@ -183,20 +192,6 @@ func (d *doPush) Do(taskType int, isSave bool, wxPush, appPush, mailPush int, k
 			logger.Info("推送任务", taskType, "助手推送结束", isPushOk, k.Id, "phone", k.Phone)
 		}
 	}
-	logger.Info("推送任务", taskType, "开始进行终端推送", k.Id)
-	//限制一分钟最大的推送数量
-	hour := time.Now().Hour()
-	fastigiumStart, fastigiumEnd := 0, 0
-	fastigiumTimes := strings.Split(SysConfig.FastigiumTime, "-")
-	if len(fastigiumTimes) == 2 {
-		fastigiumStart = util.IntAll(fastigiumTimes[0])
-		fastigiumEnd = util.IntAll(fastigiumTimes[1])
-	}
-	if hour >= fastigiumStart && hour <= fastigiumEnd {
-		<-d.fastigiumMinutePushPool //高峰期
-	} else {
-		<-d.minutePushPool //正常期
-	}
 	if wxPush == 1 {
 		logger.Info("推送任务", taskType, "开始微信推送", k.ApplyStatus, k.Id)
 		isPushOk := true
@@ -226,11 +221,7 @@ func (d *doPush) Do(taskType int, isSave bool, wxPush, appPush, mailPush int, k
 			}
 			wxtitle := fmt.Sprintf(SysConfig.WxTitle, wxTitleKeys)
 			TitleLen := len([]rune(wxtitle))
-			GroupLen := len([]rune(k.ModifyDate))
-			reLen := 200 - TitleLen - GroupLen - WxContentLen - len([]rune(Tip1))
-			//if infoType == 2 {
-			//	reLen = reLen - 4
-			//}
+			reLen := 200 - TitleLen - 10 - WxGroupLen - len([]rune(Tip1))
 			WXTitle := ""
 			bshow := false
 			for n := 1; n < len(TitleArray)+1; n++ {
@@ -278,11 +269,10 @@ func (d *doPush) Do(taskType int, isSave bool, wxPush, appPush, mailPush int, k
 	}
 	if appPush == 1 {
 		logger.Info("推送任务", taskType, "开始app推送", k.Id)
-		if len([]rune(jpushtitle)) > 80 {
-			jpushtitle = string([]rune(jpushtitle)[:80]) + "..."
-		}
+		descriptAppend := ""
 		if i > 1 {
-			jpushtitle = fmt.Sprintf("1. %s\n...(共%d条)", jpushtitle, i)
+			descriptAppend = fmt.Sprintf("\n...(共%d条)", i)
+			jpushtitle = fmt.Sprintf("1. %s", jpushtitle)
 		}
 		go mongodb.Update("user", map[string]interface{}{
 			"_id": bson.ObjectIdHex(k.Id),
@@ -292,11 +282,12 @@ func (d *doPush) Do(taskType int, isSave bool, wxPush, appPush, mailPush int, k
 			},
 		}, false, false)
 		isPushOk := putil.SendApp(map[string]interface{}{
-			"phoneType": k.AppPhoneType,
-			"descript":  jpushtitle,
-			"type":      "bid",
-			"userId":    k.Id,
-			"url":       "/jyapp/free/sess/" + Se.EncodeString(k.Id+",_id,"+strconv.Itoa(int(time.Now().Unix()))+",historypush"),
+			"phoneType":      k.AppPhoneType,
+			"descript":       jpushtitle,
+			"descriptAppend": descriptAppend,
+			"type":           "bid",
+			"userId":         k.Id,
+			"url":            "/jyapp/free/sess/" + Se.EncodeString(k.Id+",_id,"+strconv.Itoa(int(time.Now().Unix()))+",historypush"),
 			//"url":       "/jyapp/free/sess/" + Se.EncodeString(sess_openid+",_id,"+strconv.Itoa(int(time.Now().Unix()))+",historypush"),
 			//"url":         "/jyapp/free/sess/" + push.Se.EncodeString(k.Openid+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",wxpushlist") + "__" + pushid,
 			"otherPushId": k.Opushid,
@@ -311,16 +302,16 @@ func (d *doPush) Do(taskType int, isSave bool, wxPush, appPush, mailPush int, k
 	}
 	//发送邮件
 	if mailPush == 1 {
-		logger.Info("推送任务", taskType, "开始邮箱推送", k.DataExport, k.Id)
+		logger.Info("推送任务", taskType, "开始邮箱推送", k.Id)
 		html := fmt.Sprintf(SysConfig.Mail_html, strings.Replace(strings.Join(k.OriginalKeys, ";"), "+", " ", -1), mailContent)
 		subject := fmt.Sprintf(SysConfig.Mail_title, "招标")
-		isPushOk := d.SendMail(k.Email, subject, html, fmdatas)
+		isPushOk := d.SendMail(k.Email, subject, html, nil)
 		if isPushOk {
 			mailStatus = 1
 		} else {
 			mailStatus = -1
 		}
-		logger.Info("推送任务", taskType, "邮箱推送结束", k.DataExport, isPushOk, k.Id)
+		logger.Info("推送任务", taskType, "邮箱推送结束", isPushOk, k.Id)
 	}
 	return
 }
@@ -336,9 +327,9 @@ func (d *doPush) SendMail(email, subject, html string, fmdatas []map[string]inte
 	defer util.Catch()
 	//生成附件
 	var fnamepath, rename string
-	if len(fmdatas) > 0 { //开启导出
-		fnamepath, rename = putil.GetBidInfoXlsx(fmdatas)
-	}
+	// if len(fmdatas) > 0 { //开启导出
+	// 	fnamepath, rename = putil.GetBidInfoXlsx(fmdatas)
+	// }
 	status := false
 	index := len(email) % 2
 	if index >= len(Gmails) {

src/jfw/modules/pushsubscribe/src/push/job/job.go

@@ -17,9 +17,15 @@ var Jobs = struct {
 	Repair *repairJob
 }{
 	Push: &pushJob{
-		pool: make(chan bool, config.SysConfig.PushPoolSize),
-		wait: &sync.WaitGroup{},
-		lock: &sync.Mutex{},
+		pool:      make(chan bool, config.SysConfig.PushPoolSize),
+		wait:      &sync.WaitGroup{},
+		lock:      &sync.Mutex{},
+		moveLock:  &sync.Mutex{},
+		moveWait:  &sync.WaitGroup{},
+		movePool:  make(chan bool, config.SysConfig.MovePoolSize),
+		mergeLock: &sync.Mutex{},
+		mergeWait: &sync.WaitGroup{},
+		mergePool: make(chan bool, config.SysConfig.MergePoolSize),
 	},
 	Repair: &repairJob{
 		pool: make(chan bool, config.SysConfig.PushPoolSize),

src/jfw/modules/pushsubscribe/src/push/job/pushjob.go

@@ -17,7 +17,7 @@ import (
 )
 
 var (
-	MoveFields = []string{"s_m_openid", "a_m_openid", "phone", "usertype", "jpushid", "opushid", "words", "ratemode", "wxpush", "apppush", "mailpush", "pchelperpush", "smartset", "timestamp", "subscribe", "applystatus", "appphonetype", "email", "size", "modifydate", "mergeorder", "nickname", "firstpushtime"}
+	MoveFields = []string{"s_m_openid", "a_m_openid", "phone", "usertype", "jpushid", "opushid", "words", "ratemode", "wxpush", "apppush", "mailpush", "pchelperpush", "timestamp", "subscribe", "applystatus", "appphonetype", "email", "size", "modifydate", "mergeorder", "nickname", "firstpushtime"}
 )
 
 type Move struct {
@@ -26,12 +26,18 @@ type Move struct {
 }
 
 type pushJob struct {
-	taskType int
-	pool     chan bool
-	wait     *sync.WaitGroup
-	lock     *sync.Mutex
-	lastId   string
-	users    *[]map[string]interface{}
+	taskType  int
+	pool      chan bool
+	wait      *sync.WaitGroup
+	lock      *sync.Mutex
+	moveLock  *sync.Mutex
+	moveWait  *sync.WaitGroup
+	movePool  chan bool
+	mergeLock *sync.Mutex
+	mergeWait *sync.WaitGroup
+	mergePool chan bool
+	lastId    string
+	users     *[]map[string]interface{}
 }
 
 //taskType 1--实时推送 2--实时推送+一天三次的8点推送 3--一天三次推送 4--九点推送
@@ -46,6 +52,7 @@ func (p *pushJob) Execute(taskType int, isMoveDatas bool) {
 	p.Push()
 }
 func (p *pushJob) Move() {
+	defer util.Catch()
 	logger.Info("推送任务", p.taskType, "开始迁移数据。。。")
 	nowUnix := time.Now().Unix()
 	sess := mongodb.GetMgoConn()
@@ -58,53 +65,65 @@ func (p *pushJob) Move() {
 	moves := map[string]*Move{}
 	logger.Info("推送任务", p.taskType, "开始遍历pushspace_temp")
 	index, number, length := 0, 0, 0
-	for temp := make(map[string]interface{}); it.Next(&temp); {
-		userId := util.ObjToString(temp["userid"])
-		move := moves[userId]
-		if move != nil {
-			list, _ := move.Info["list"].(SortList)
-			idMap := map[string]bool{}
-			for _, v := range list {
-				idMap[util.ObjToString((*v.Info)["_id"])] = true
-			}
-			newList := putil.ToSortList(temp["list"])
-			for _, v := range newList {
-				if idMap[util.ObjToString((*v.Info)["_id"])] {
-					continue
+	for data := make(map[string]interface{}); it.Next(&data); {
+		p.movePool <- true
+		p.moveWait.Add(1)
+		index++
+		go func(temp map[string]interface{}) {
+			defer func() {
+				<-p.movePool
+				p.moveWait.Done()
+				p.moveLock.Unlock()
+			}()
+			userId := util.ObjToString(temp["userid"])
+			p.moveLock.Lock()
+			move := moves[userId]
+			if move != nil {
+				list, _ := move.Info["list"].(SortList)
+				idMap := map[string]bool{}
+				for _, v := range list {
+					idMap[util.ObjToString((*v.Info)["_id"])] = true
+				}
+				newList := putil.ToSortList(temp["list"])
+				for _, v := range newList {
+					if idMap[util.ObjToString((*v.Info)["_id"])] {
+						continue
+					}
+					list = append(list, v)
+				}
+				sort.Sort(list)
+				if len(list) > SysConfig.MaxPushSize {
+					list = list[:SysConfig.MaxPushSize]
+				}
+				temp["list"] = list
+				move.Info = temp
+				move.Ids = append(move.Ids, temp["_id"])
+			} else {
+				temp["list"] = putil.ToSortList(temp["list"])
+				move = &Move{
+					Info: temp,
+					Ids:  []interface{}{temp["_id"]},
 				}
-				list = append(list, v)
-			}
-			sort.Sort(list)
-			if len(list) > SysConfig.MaxPushSize {
-				list = list[:SysConfig.MaxPushSize]
 			}
-			temp["list"] = list
-			move.Info = temp
-			move.Ids = append(move.Ids, temp["_id"])
-		} else {
-			temp["list"] = putil.ToSortList(temp["list"])
-			move = &Move{
-				Info: temp,
-				Ids:  []interface{}{temp["_id"]},
+			moves[userId] = move
+			length++
+			if length == SysConfig.MoveBatch {
+				p.Merge(&number, nowUnix, moves)
+				length = 0
+				moves = map[string]*Move{}
 			}
-		}
-		moves[userId] = move
-		temp = make(map[string]interface{})
-		index++
-		length++
+		}(data)
+		data = make(map[string]interface{})
 		if index%500 == 0 {
 			logger.Info("推送任务", p.taskType, "pushspace_temp加载到内存：", index)
 		}
-		if length == SysConfig.MoveBatch {
-			length = 0
-			p.Merge(&number, nowUnix, moves)
-			moves = map[string]*Move{}
-		}
 	}
+	p.moveWait.Wait()
 	if length > 0 {
 		p.Merge(&number, nowUnix, moves)
+		length = 0
+		moves = map[string]*Move{}
 	}
-	moves = nil
 	logger.Info("推送任务", p.taskType, "迁移数据结束。。。", index)
 }
 func (p *pushJob) Merge(number *int, nowUnix int64, moves map[string]*Move) {
@@ -116,81 +135,96 @@ func (p *pushJob) Merge(number *int, nowUnix int64, moves map[string]*Move) {
 	updateArray_query := []map[string]interface{}{}
 	updateArray_set := []map[string]interface{}{}
 	updateArray_delete := []interface{}{}
-	sess := mongodb.GetMgoConn()
-	defer mongodb.DestoryMongoConn(sess)
-	for userId, move := range moves {
-		var data map[string]interface{}
-		sess.DB(DbName).C("pushspace").Find(map[string]interface{}{"userid": userId}).Select(map[string]interface{}{"list": 1, "templist": 1}).One(&data)
-		if data == nil { //批量新增
-			saveArray = append(saveArray, move.Info)
-			saveArray_delete = append(saveArray_delete, move.Ids...)
-			if len(saveArray) == BulkSize {
-				p.SaveBulk(sess, &saveArray, &saveArray_delete)
-			}
-		} else { //批量更新
-			setMap := map[string]interface{}{}
-			for _, field := range MoveFields {
-				if move.Info[field] == nil {
-					continue
+	for u, m := range moves {
+		p.mergePool <- true
+		p.mergeWait.Add(1)
+		go func(userId string, move *Move) {
+			defer func() {
+				<-p.mergePool
+				p.mergeWait.Done()
+			}()
+			sess := mongodb.GetMgoConn()
+			defer mongodb.DestoryMongoConn(sess)
+			var data map[string]interface{}
+			sess.DB(DbName).C("pushspace").Find(map[string]interface{}{"userid": userId}).Select(map[string]interface{}{"list": 1, "templist": 1}).One(&data)
+			if data == nil { //批量新增
+				p.mergeLock.Lock()
+				saveArray = append(saveArray, move.Info)
+				saveArray_delete = append(saveArray_delete, move.Ids...)
+				if len(saveArray) == BulkSize {
+					p.SaveBulk(sess, &saveArray, &saveArray_delete)
 				}
-				setMap[field] = move.Info[field]
-			}
-			//
-			newListOrig, _ := move.Info["list"].(SortList)
-			if newListOrig == nil || len(newListOrig) == 0 {
-				continue
-			}
-			pushAll := make(map[string]interface{})
-			for _, v := range []string{"", "temp"} {
-				oldList := putil.ToSortList(data[v+"list"])
-				if v == "temp" && oldList == nil {
-					continue
+				p.mergeLock.Unlock()
+			} else { //批量更新
+				setMap := map[string]interface{}{}
+				for _, field := range MoveFields {
+					if move.Info[field] == nil {
+						continue
+					}
+					setMap[field] = move.Info[field]
 				}
-				idMap := map[string]bool{}
-				for _, vv := range oldList {
-					idMap[util.ObjToString((*vv.Info)["_id"])] = true
+				//
+				newListOrig, _ := move.Info["list"].(SortList)
+				if newListOrig == nil || len(newListOrig) == 0 {
+					return
 				}
-				newList := make(SortList, 0)
-				//去重
-				for _, vv := range newListOrig {
-					if idMap[util.ObjToString((*vv.Info)["_id"])] {
+				pushAll := make(map[string]interface{})
+				for _, v := range []string{"", "temp"} {
+					oldList := putil.ToSortList(data[v+"list"])
+					if v == "temp" && oldList == nil {
+						continue
+					}
+					idMap := map[string]bool{}
+					for _, vv := range oldList {
+						idMap[util.ObjToString((*vv.Info)["_id"])] = true
+					}
+					newList := make(SortList, 0)
+					//去重
+					for _, vv := range newListOrig {
+						if idMap[util.ObjToString((*vv.Info)["_id"])] {
+							continue
+						}
+						newList = append(newList, vv)
+					}
+					pLength := len(newList)
+					if pLength == 0 {
 						continue
 					}
-					newList = append(newList, vv)
+					rLength := len(oldList)
+					if rLength+pLength > SysConfig.MaxPushSize {
+						newList = append(newList, oldList...)
+						sort.Sort(newList)
+						setMap[v+"list"] = newList[:SysConfig.MaxPushSize]
+						setMap[v+"size"] = SysConfig.MaxPushSize
+					} else { //追加
+						setMap[v+"size"] = rLength + pLength
+						pushAll[v+"list"] = newList
+					}
 				}
-				pLength := len(newList)
-				if pLength == 0 {
-					continue
+				upSet := map[string]interface{}{
+					"$set": setMap,
 				}
-				rLength := len(oldList)
-				if rLength+pLength > SysConfig.MaxPushSize {
-					newList = append(newList, oldList...)
-					sort.Sort(newList)
-					setMap[v+"list"] = newList[:SysConfig.MaxPushSize]
-					setMap[v+"size"] = SysConfig.MaxPushSize
-				} else { //追加
-					setMap[v+"size"] = rLength + pLength
-					pushAll[v+"list"] = newList
+				if len(pushAll) > 0 {
+					upSet["$pushAll"] = pushAll
 				}
+				p.mergeLock.Lock()
+				updateArray_delete = append(updateArray_delete, move.Ids...)
+				updateArray_query = append(updateArray_query, map[string]interface{}{"_id": data["_id"]})
+				updateArray_set = append(updateArray_set, upSet)
+				if len(updateArray_query) == BulkSize {
+					p.UpdateBulk(sess, &updateArray_query, &updateArray_set, &updateArray_delete)
+				}
+				p.mergeLock.Unlock()
 			}
-			upSet := map[string]interface{}{
-				"$set": setMap,
-			}
-			if len(pushAll) > 0 {
-				upSet["$pushAll"] = pushAll
-			}
-			updateArray_delete = append(updateArray_delete, move.Ids...)
-			updateArray_query = append(updateArray_query, map[string]interface{}{"_id": data["_id"]})
-			updateArray_set = append(updateArray_set, upSet)
-			if len(updateArray_query) == BulkSize {
-				p.UpdateBulk(sess, &updateArray_query, &updateArray_set, &updateArray_delete)
-			}
-		}
+		}(u, m)
 		index++
 		if index%500 == 0 {
 			logger.Info("推送任务", p.taskType, "第", *number, "次合并数据：", index)
 		}
 	}
+	p.mergeWait.Wait()
+	sess := mongodb.GetMgoConn()
+	defer mongodb.DestoryMongoConn(sess)
 	if len(saveArray) > 0 {
 		p.SaveBulk(sess, &saveArray, &saveArray_delete)
 	}
@@ -255,6 +289,7 @@ func (p *pushJob) DelBulk(sess *mgo.Session, array *[]interface{}) {
 	*array = []interface{}{}
 }
 func (p *pushJob) Push() {
+	defer util.Catch()
 	logger.Info("推送任务", p.taskType, "开始推送。。。")
 	batch_index := 0
 	for {
@@ -285,22 +320,22 @@ func (p *pushJob) Push() {
 				}()
 				words, _ := v["words"].([]interface{})
 				u := &UserInfo{
-					Id:            util.ObjToString(v["userid"]),
-					OriginalKeys:  util.ObjArrToStringArr(words),
-					WxPush:        util.IntAll(v["wxpush"]),
-					AppPush:       util.IntAll(v["apppush"]),
-					MailPush:      util.IntAll(v["mailpush"]),
-					PchelperPush:  util.IntAll(v["pchelperpush"]),
-					Email:         util.ObjToString(v["email"]),
-					S_m_openid:    util.ObjToString(v["s_m_openid"]),
-					A_m_openid:    util.ObjToString(v["a_m_openid"]),
-					Phone:         util.ObjToString(v["phone"]),
-					Jpushid:       util.ObjToString(v["jpushid"]),
-					Opushid:       util.ObjToString(v["opushid"]),
-					UserType:      util.IntAll(v["usertype"]),
-					RateMode:      util.IntAllDef(v["ratemode"], 1),
-					SmartSet:      util.IntAllDef(v["smartset"], 1),
-					DataExport:    util.IntAll(v["dataexport"]),
+					Id:           util.ObjToString(v["userid"]),
+					OriginalKeys: util.ObjArrToStringArr(words),
+					WxPush:       util.IntAll(v["wxpush"]),
+					AppPush:      util.IntAll(v["apppush"]),
+					MailPush:     util.IntAll(v["mailpush"]),
+					PchelperPush: util.IntAll(v["pchelperpush"]),
+					Email:        util.ObjToString(v["email"]),
+					S_m_openid:   util.ObjToString(v["s_m_openid"]),
+					A_m_openid:   util.ObjToString(v["a_m_openid"]),
+					Phone:        util.ObjToString(v["phone"]),
+					Jpushid:      util.ObjToString(v["jpushid"]),
+					Opushid:      util.ObjToString(v["opushid"]),
+					UserType:     util.IntAll(v["usertype"]),
+					RateMode:     util.IntAllDef(v["ratemode"], 1),
+					//SmartSet:      util.IntAllDef(v["smartset"], 1),
+					//DataExport:    util.IntAll(v["dataexport"]),
 					AppPhoneType:  util.ObjToString(v["appphonetype"]),
 					ApplyStatus:   util.IntAll(v["applystatus"]),
 					Subscribe:     util.IntAllDef(v["subscribe"], 1),
@@ -308,7 +343,7 @@ func (p *pushJob) Push() {
 					MergeOrder:    v["mergeorder"],
 					FirstPushTime: util.Int64All(v["firstpushtime"]),
 				}
-				logger.Info("推送任务", p.taskType, "开始推送用户,userid", u.Id, "s_m_openid", u.S_m_openid, "a_m_openid", u.A_m_openid, "phone", u.Phone, "subscribe", u.Subscribe, "applystatus", u.ApplyStatus, "jpushid", u.Jpushid, "opushid", u.Opushid, "phoneType", u.AppPhoneType, "rateMode", u.RateMode, "smartSet", u.SmartSet, "email", u.Email, "dataExport", u.DataExport)
+				logger.Info("推送任务", p.taskType, "开始推送用户", "userType", u.UserType, "userId", u.Id, "s_m_openid", u.S_m_openid, "a_m_openid", u.A_m_openid, "phone", u.Phone, "subscribe", u.Subscribe, "applystatus", u.ApplyStatus, "jpushid", u.Jpushid, "opushid", u.Opushid, "phoneType", u.AppPhoneType, "rateMode", u.RateMode, "email", u.Email)
 				wxPush, appPush, mailPush := 0, 0, 0
 				if p.taskType == 1 {
 					if u.WxPush == 1 {
@@ -359,11 +394,11 @@ func (p *pushJob) Push() {
 						mailPush = 0
 					}
 				}
-				logger.Info("推送任务", p.taskType, "用户接收方式,userid", u.Id, "wxPush", wxPush, "appPush", appPush, "mailPush", mailPush, "pchelperPush", u.PchelperPush, "t_wxPush", t_wxPush, "t_mailPush", t_mailPush)
+				logger.Info("推送任务", p.taskType, "用户接收方式", "userId", u.Id, "wxPush", wxPush, "appPush", appPush, "mailPush", mailPush, "pchelperPush", u.PchelperPush, "t_wxPush", t_wxPush, "t_mailPush", t_mailPush)
 				if wxPush != 1 && appPush != 1 && mailPush != 1 {
 					return
 				}
-				//再对取消关注以及app没有登录的用户进行过滤
+				//再对取消关注以及app没有登录的用户进行过滤,但是依然可以进行助手推送
 				if u.Subscribe == 0 {
 					wxPush = 0
 				}
@@ -416,7 +451,7 @@ func (p *pushJob) Push() {
 				} else {
 					err := sess.DB(DbName).C("pushspace").RemoveId(v["_id"])
 					if err != nil {
-						logger.Error("推送任务", p.taskType, "update error", err)
+						logger.Error("推送任务", p.taskType, "remove error", err)
 					}
 				}
 				if wxStatus == -1 || appStatus == -1 || mailStatus == -1 {

src/jfw/modules/pushsubscribe/src/push/job/repairjob.go

@@ -51,8 +51,8 @@ func (r *repairJob) Execute(param string) bool {
 					Opushid:      util.ObjToString(v["opushid"]),
 					UserType:     util.IntAll(v["usertype"]),
 					RateMode:     util.IntAllDef(v["ratemode"], 1),
-					SmartSet:     util.IntAllDef(v["smartset"], 1),
-					DataExport:   util.IntAll(v["dataexport"]),
+					//SmartSet:     util.IntAllDef(v["smartset"], 1),
+					//DataExport:   util.IntAll(v["dataexport"]),
 					AppPhoneType: util.ObjToString(v["appphonetype"]),
 					ApplyStatus:  util.IntAll(v["applystatus"]),
 					Subscribe:    util.IntAllDef(v["subscribe"], 1),

src/jfw/modules/pushsubscribe/src/push/job/timetask.go

@@ -9,77 +9,15 @@ import (
 )
 
 type timeTask struct {
-	RealPush  *RealPushTimeTask  //实时推送
 	NinePush  *NinePushTimeTask  //九点推送
 	OtherPush *OtherPushTimeTask //一天三次
 }
 
 var Task = &timeTask{
-	RealPush:  &RealPushTimeTask{},  //实时推送
 	NinePush:  &NinePushTimeTask{},  //九点推送
 	OtherPush: &OtherPushTimeTask{}, //一天三次
 }
 
-type RealPushTimeTask struct {
-}
-
-func (r *RealPushTimeTask) Execute() {
-	s_h_m := strings.Split(SysConfig.StartPushTime, ":")
-	if len(s_h_m) != 2 {
-		log.Fatalln("error：startpushtime", SysConfig.StartPushTime)
-	}
-	now := time.Now()
-	start := time.Date(now.Year(), now.Month(), now.Day(), util.IntAll(s_h_m[0]), util.IntAll(s_h_m[1]), 0, 0, time.Local)
-	//程序启动在开始时间之前
-	if now.Before(start) {
-		sub := start.Sub(now)
-		log.Println("start", SysConfig.StartPushTime, "pushjob after", sub)
-		time.AfterFunc(sub, func() {
-			go r.run(2)
-			ticker := time.NewTicker(time.Hour * 24)
-			for {
-				select {
-				case <-ticker.C:
-					go r.run(2)
-				}
-			}
-		})
-	} else {
-		go r.run(1)
-		start = start.AddDate(0, 0, 1)
-		sub := start.Sub(now)
-		log.Println("start", SysConfig.StartPushTime, "pushjob after", sub)
-		timer := time.NewTimer(sub)
-		for {
-			select {
-			case <-timer.C:
-				timer.Reset(time.Hour * 24)
-				go r.run(2)
-			}
-		}
-	}
-}
-func (r *RealPushTimeTask) run(taskType int) {
-	e_h_m := strings.Split(SysConfig.EndPushTime, ":")
-	if len(e_h_m) != 2 {
-		log.Fatalln("endpushtime", SysConfig.EndPushTime)
-	}
-	now := time.Now()
-	end := time.Date(now.Year(), now.Month(), now.Day(), util.IntAll(e_h_m[0]), util.IntAll(e_h_m[1]), 0, 0, time.Local)
-	if now.Before(end) {
-		Jobs.Push.Execute(taskType, true)
-	}
-	//隔天的话，不继续
-	//判断下一轮是否还需要继续
-	if now.Day() != time.Now().Day() || time.Now().After(end) {
-		return
-	}
-	log.Println("start pushjob after", SysConfig.PushDuration, "m")
-	time.AfterFunc(time.Duration(SysConfig.PushDuration)*time.Minute, func() {
-		r.run(1)
-	})
-}
-
 type OtherPushTimeTask struct {
 }
 
@@ -98,12 +36,12 @@ func (o *OtherPushTimeTask) Execute() {
 		sub := newDate.Sub(now)
 		log.Println("start", otherpushtime, "pushjob after", sub)
 		time.AfterFunc(sub, func() {
-			go Jobs.Push.Execute(3, true)
+			go Jobs.Push.Execute(2, true)
 			ticker := time.NewTicker(time.Hour * 24)
 			for {
 				select {
 				case <-ticker.C:
-					go Jobs.Push.Execute(3, true)
+					go Jobs.Push.Execute(2, true)
 				}
 			}
 		})

src/jfw/modules/pushsubscribe/src/push/main.go

@@ -13,16 +13,14 @@ import (
 	"push/util"
 	"qfw/util/mongodb"
 	"qfw/util/redis"
-	"time"
 	ca "ucbsutil/cassandra"
 
 	"github.com/donnie4w/go-logger/logger"
 )
 
 func main() {
-	sleep := flag.Int("s", 0, "程序启动完以后，实时推送休眠s分钟再开始")
 	modle := flag.Int("m", 0, "0 定时任务模式推送；1 非定时任务模式推送；2 定时任务模式推送之前先执行-t的任务")
-	taskType := flag.Int("t", 1, "1 实时推送；2 实时推送+一天三次的八点推送；3 一天三次推送；4 九点推送")
+	taskType := flag.Int("t", 1, "1 实时推送；2 实时推送+一天三次的推送；3 一天三次推送；4 九点推送")
 	customCaDate := flag.String("d", "", "自定义日志库，推送数据时间；例(2006-01-02)")
 	moveDatas := flag.String("v", "y", "是否迁移数据")
 	flag.Parse()
@@ -61,18 +59,11 @@ func main() {
 	if *modle == 1 {
 		job.Jobs.Push.Execute(*taskType, isMoveDatas)
 	} else {
-		if *modle == 2 {
-			job.Jobs.Push.Execute(*taskType, isMoveDatas)
-		}
 		go job.Task.OtherPush.Execute()
 		go job.Task.NinePush.Execute()
-		if *sleep > 0 {
-			log.Println("实时推送先休眠", *sleep, "m")
-			time.AfterFunc(time.Duration(*sleep)*time.Minute, job.Task.RealPush.Execute)
-		} else {
-			go job.Task.RealPush.Execute()
+		if *modle == 2 {
+			job.Jobs.Push.Execute(*taskType, isMoveDatas)
 		}
-		flag := make(chan bool)
-		<-flag
+		<-chan bool(nil)
 	}
 }

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

@@ -1197,7 +1197,7 @@ func CreateMenu(rw http.ResponseWriter, r *http.Request) {
 	menu.Buttons[2].Name = "发现"
 	menu.Buttons[2].SubButtons = make([]MenuButton, 5)
 
-	menu.Buttons[2].SubButtons[0].Name = string(0x1F4A1) + "剑鱼标讯实验室！"
+	menu.Buttons[2].SubButtons[0].Name = string(0x1F4A1) + "实验室！"
 	menu.Buttons[2].SubButtons[0].Type = MenuButtonTypeUrl
 	menu.Buttons[2].SubButtons[0].Url = fmt.Sprintf(urlstr, "labindex")
 

src/jfw/public/public.go

@@ -114,7 +114,7 @@ func PushView(userid, allquery, field string, pageNum, pageSize int) (keys []int
 	if userid == "" {
 		return
 	}
-	tmp, ok := MQFW.FindById("user", userid, `{"_id":1,"o_jy":1,"i_smartset": 1}`)
+	tmp, ok := MQFW.FindById("user", userid, `{"_id":1,"o_jy":1}`)
 	if !ok || tmp == nil || len(*tmp) == 0 {
 		return
 	}
@@ -123,12 +123,6 @@ func PushView(userid, allquery, field string, pageNum, pageSize int) (keys []int
 	if len(a_key) == 0 {
 		return
 	}
-	i_smartset := util.IntAll((*tmp)["i_smartset"])
-	findf := `"title"`
-	if i_smartset == 1 {
-		//开启智能订阅
-		findf = `"title","detail"`
-	}
 	for _, v := range a_key {
 		keyMap, _ := v.(map[string]interface{})
 		key, _ := keyMap["key"].([]interface{})
@@ -139,7 +133,7 @@ func PushView(userid, allquery, field string, pageNum, pageSize int) (keys []int
 	if err == nil {
 		json.Unmarshal(_bs, &allkeys)
 	}
-	list = elastic.GetResForJY(INDEX, TYPE, allkeys, allquery, findf, `{"publishtime":"desc"}`, field, (pageNum-1)*pageSize, pageSize)
+	list = elastic.GetResForJY(INDEX, TYPE, allkeys, allquery, `"title"`, `{"publishtime":"desc"}`, field, (pageNum-1)*pageSize, pageSize)
 	return
 }
 

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

@@ -89,7 +89,6 @@
 .shade_table{
 	width: 1199px;
 	position: absolute;
-	z-index: 999; 
 	margin-top: -110px; 
 	height: 150px;
 	background: linear-gradient(to bottom, rgba(255,255,255,0),rgba(255,255,255,0.8),rgba(255,255,255,1));

src/web/staticres/css/wxkeyset.css

@@ -203,6 +203,7 @@ html.hidden,body.hidden,.keysetpage .keyWordContent.adjustment{
 /*********************seniorsetpage************************/
 .seniorsetpage .content{
 	background-color: inherit;
+	/* margin-top: 15px; */
 }
 .seniorsetpage .content>div{
 	margin-bottom: 15px;

src/web/staticres/css/wxsearch.css

@@ -132,15 +132,17 @@ form{
 }
 
 #searchIndex .content li:nth-of-type(1) a {
-  background: url(../images/search/search-sousuo.png) 0.3rem 0.32rem no-repeat, url(../images/search/search-lists-rightBg.png) right bottom no-repeat;
+  background: url(../images/search/search-zhongqy.png) 0.3rem 0.32rem no-repeat, url(../images/search/search-lists-rightBg.png) right bottom no-repeat;
   background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
 }
-
-#searchIndex .content li:nth-of-type(2) a {
-  background: url(../images/search/search-zhongqy.png) 0.3rem 0.32rem no-repeat, url(../images/search/search-lists-rightBg.png) right bottom no-repeat;
+/*
+#searchIndex .content li:nth-of-type(1) a {
+  background: url(../images/search/search-sousuo.png) 0.3rem 0.32rem no-repeat, url(../images/search/search-lists-rightBg.png) right bottom no-repeat;
   background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
 }
-/*#searchIndex .content li:nth-of-type(1) a {
+
+
+#searchIndex .content li:nth-of-type(1) a {
   background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
 }
 

src/web/staticres/js/biddingSearch.js

@@ -182,126 +182,33 @@ $(function() {
 		}
 		/*全选功能*/
 		$content.on('click', 'font:not(".parent-node")' ,function() {
-			if(loginflag){
-				var info = getlabstatus();
-				if(info[0]){
-					var s_supstatus = localStorage.getItem("s_supstatus");
-					if(s_supstatus != "y"){
-						//存入缓存
-						localStorage.setItem("s_supstatus","y");
-						//修改库中状态
-						changeEntAndSupStatus("sup");
-						/*子级全选添加类名*/
-						var $prevNode = $(this).prevAll(".parent-node:eq(0)");
-						$(this).toggleClass("active").siblings().removeClass("active").removeClass("secondActice");
-						if($prevNode.nextUntil(".diver").filter(".active").length === 0) {
-							$prevNode.removeClass("active").removeClass("secondActice");
-						} else {
-							$prevNode.removeClass("active").addClass("secondActice");
-						}
-						$(".modal-footer-welcome").text("欢迎体验剑鱼标讯实验室—超级搜索功能。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。");
-						$("#welcome").modal("show");
-						$("#welcome").on("shown.bs.modal", function () {
-							setTimeout(function(){
-								labWelClose();
-							},5000);
-						})
-						$("#welcome").on("hidden.bs.modal", function () {
-							beforeSubmit();
-						})
-					}else{
-						/*子级全选添加类名*/
-						var $prevNode = $(this).prevAll(".parent-node:eq(0)");
-						$(this).toggleClass("active").siblings().removeClass("active").removeClass("secondActice");
-						if($prevNode.nextUntil(".diver").filter(".active").length === 0) {
-							$prevNode.removeClass("active").removeClass("secondActice");
-						} else {
-							$prevNode.removeClass("active").addClass("secondActice");
-						}
-						beforeSubmit();
-					}
-					
-				}else{
-					$("#induAll").addClass("active");
-					qr_type = "s";
-					//if(!$("#labImg").attr("src")){
-						$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-					//}
-					$(".layheader div:nth-child(1)").html("超级搜索");
-					$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-					$("#labModal").modal("show");
-				}
-			}else{
-				unseatflag = true;
-				$(".code-text").html('<span style="font-size: 22px;margin-top: 10px;display: inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
-				$("#induAll").addClass("active");
-				$("#bidLogin").modal("show");
+			var $prevNode = $(this).prevAll(".parent-node:eq(0)");
+			$(this).toggleClass("active").siblings().removeClass("active").removeClass("secondActice");
+			if($prevNode.nextUntil(".diver").filter(".active").length === 0) {
+				$prevNode.removeClass("active").removeClass("secondActice");
+			} else {
+				$prevNode.removeClass("active").addClass("secondActice");
 			}
+			beforeSubmit();			
 		});
 		$parentNode.on('click', function() {
-			if(loginflag){
-				var info = getlabstatus();
-				if(info[0]){
-					var s_supstatus = localStorage.getItem("s_supstatus");
-					if(s_supstatus != "y"){
-						//存入缓存
-						localStorage.setItem("s_supstatus","y");
-						//修改库中状态
-						changeEntAndSupStatus("sup");
-						$(this).parent().find("font").removeClass("active").removeClass("secondActice");
-						$(this).toggleClass("active").removeClass("secondActice");
-						$(".modal-footer-welcome").text("欢迎体验剑鱼标讯实验室—超级搜索功能。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。");
-						$("#welcome").modal("show");
-						$("#welcome").on("shown.bs.modal", function () {
-							setTimeout(function(){
-								labWelClose();
-							},5000);
-						})
-						$("#welcome").on("hidden.bs.modal", function () {
- 				 			beforeSubmit();
-						})
-					}else{
-						$(this).parent().find("font").removeClass("active").removeClass("secondActice");
-						$(this).toggleClass("active").removeClass("secondActice");
-						beforeSubmit();
-					}
-					
-				}else{
-					qr_type = "s";
-					//if(!$("#labImg").attr("src")){
-						$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-					//}
-					$(".layheader div:nth-child(1)").html("超级搜索");
-					$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-					$("#labModal").modal("show");
-					$("#induAll").addClass("active");
-				}
-			}else{
-				unseatflag = true;
-				$(".code-text").html('<span style="font-size: 22px;margin-top: 10px;display: inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
-				$("#bidLogin").modal("show");
-				$("#induAll").addClass("active");
-			}
-
+			$(this).parent().find("font").removeClass("active").removeClass("secondActice");
+			$(this).toggleClass("active").removeClass("secondActice");
+			beforeSubmit();
 		});
 		/*如果点击没有内容给全部添加类名*/
 		$content.on("click", "font", function() {
-			if(loginflag&&supsearchflag){
-				if($content.children().hasClass("active")) {
-					$induAll.removeClass("active");
-				} else {
-					$induAll.addClass("active");
-				}
-			}
-			
+			if($content.children().hasClass("active")) {
+				$induAll.removeClass("active");
+			} else {
+				$induAll.addClass("active");
+			}	
 		})
 		/*全部点击*/
 		$induAll.on("click", function() {
 			$(this).addClass("active");
 			$content.children().not($(this)).removeClass("active secondActice");
-			if(loginflag&&supsearchflag){
-				beforeSubmit();
-			}
+			beforeSubmit();
 		})
 	};
 	/*时间发布*/
@@ -325,50 +232,13 @@ $(function() {
 			$controlDiv_2 = $(".tabContainer-2>div");
 		$tabBtn.on("click", function() {
 			if($(this).attr("id")=="right-table"){
-				if(!loginflag){
-					unseatflag = true;
-					$(".code-text").html('<span style="font-size:22px;margin-top:10px;display:inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
-					$("#bidLogin").modal("show");
-				}else{
-					var info = getlabstatus();
-					if(info[0]){
-						if(getVIPData()){
-							var s_supstatus = localStorage.getItem("s_supstatus");
-							if(s_supstatus != "y"){
-								//存入缓存
-								localStorage.setItem("s_supstatus","y");
-								//修改库中状态
-								changeEntAndSupStatus("sup");
-								$(".modal-footer-welcome").text("欢迎体验剑鱼标讯实验室—超级搜索功能。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。");
-								$("#welcome").modal("show");
-								$("#welcome").on("shown.bs.modal", function () {
-									setTimeout(function(){
-										labWelClose();
-									},5000);
-								})
-								$("#welcome").on("hidden.bs.modal", function () {
-		 				 			$("#right-table").addClass("active").siblings().removeClass("active");
-									$(".tabContainer-2>div").eq(1).show().siblings().hide();
-									$("#allnews>div").eq(1).show().siblings().hide();
-								})
-							}else{
-								$("#right-table").addClass("active").siblings().removeClass("active");
-								$(".tabContainer-2>div").eq(1).show().siblings().hide();
-								$("#allnews>div").eq(1).show().siblings().hide();
-							}
-						}
-					}else{
-						qr_type = "s";
-						//if(!$("#labImg").attr("src")){
-							$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-						//}
-						$(".layheader div:nth-child(1)").html("超级搜索");
-						$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-						$("#labModal").modal("show");
-					}
+				if(getVIPData()){
+					$("#right-table").addClass("active").siblings().removeClass("active");
+					$(".tabContainer-2>div").eq(1).show().siblings().hide();
+					$("#allnews>div").eq(1).show().siblings().hide();
 				}
 				//隐藏翻页(仅超级搜索页面、拟建项目不隐藏)
-				if(window.location.href.indexOf("supsearch/index.html")>-1){
+				if(window.location.href.indexOf("supsearch/index.html")>-1||window.location.href.indexOf("bidsearchforent/index.html")>-1){
 					$(".pagination.clearfix.w").css("display","none");			
 				}
 			}else if($(this).attr("id")=="right-list"){
@@ -376,7 +246,7 @@ $(function() {
 				$controlDiv.eq($(this).index()).show().siblings().hide();
 				$controlDiv_2.eq($(this).index()).show().siblings().hide();
 				//显示翻页
-				if(window.location.href.indexOf("supsearch/index.html")>-1){
+				if(window.location.href.indexOf("supsearch/index.html")>-1||window.location.href.indexOf("bidsearchforent/index.html")>-1){
 					$(".pagination.clearfix.w").css("display","");
 				}
 			}else if($(this).attr("id")=="right-export"){

src/web/staticres/js/jypraise.js

@@ -1,137 +0,0 @@
-/**剑鱼标讯点赞js**/
-
-var labflag = true;
-//
-var popup = function(thistype,flag){
-	$.ajax({
-        type:'post',
-        url:'/jylab/operation',
-        data:{type:thistype,tp:"popup"},
-        cache:false,
-        dataType:'json', 
-        success:function(data){
-			//console.log("data:"+JSON.stringify(data));
-			if(!flag){
-				setTimeout(function(){
-					$(".syz-Popup").fadeOut();
-				},3000);
-			}
-        }
-    });
-}
-//操作按钮
-var operatingswitch=function(thistype){
-	var labswitch = "C"
-	if($("#check").hasClass('checked')){
-	    labswitch = "O"
-	}
-	$.ajax({
-        type:'post',
-        url:'/jylab/operation',
-        data:{type:thistype,labswitch:labswitch,tp:"swt"},
-        cache:false,
-        dataType:'json', 
-        success:function(data){
-			if(data.flag=="T"&&(thistype=="cjss"||thistype=="zbqy"||thistype=="gzqy")){
-				if(labswitch == "O"){
-					$("#searchuse").removeClass("hidden");
-				}else{
-					$("#searchuse").addClass("hidden");
-				}
-			}
-        }
-    });
-}
-//取得赞数
-var getpraise = function(thistype){
-	$.ajax({
-        type:'post',
-        url:'/swordfish/getpraise',
-        data:{type:thistype},
-        cache:false,
-        dataType:'json', 
-        success:function(data){
-			if(data.praiseno){
-				$("#dz").next().text(Number(data.praiseno));
-			}
-			if(data.switchstatus&&data.switchstatus==1){
-				$("#searchuse").removeClass("hidden");
-			}else{
-				$("#searchuse").addClass("hidden");
-			}
-        }
-    });
-}
-//
-var praiseupdown = function(thistype){
-	if (labflag){
-		labflag=false
-		upid = localStorage.getItem("up_"+thistype);
-		downid = localStorage.getItem("down_"+thistype);
-		if(upid == null&&downid == null){
-			upordown("U",thistype)
-			localStorage.setItem("up_"+thistype,thistype);
-		}else{
-			if(upid != null){
-				upordown("D",thistype)
-				localStorage.setItem("down_"+thistype,thistype);
-				localStorage.removeItem("up_"+thistype);
-			}else if(downid != null){
-				upordown("U",thistype)
-				localStorage.removeItem("down_"+thistype);
-				localStorage.setItem("up_"+thistype,thistype);
-			}
-		}
-	}
-}
-//
-var upordown = function(uod,thistype){
-	var no = $("#dz").next().text();
-	$.ajax({
-        type:'post',
-        url:'/swordfish/praise',
-        data:{type:thistype,uod:uod},
-        cache:false,
-        dataType:'json', 
-        success:function(data){
-			if(data.flag == "T"){
-				labflag=true
-				if(uod == "U"){
-					$("#dz").next().text(Number(no)+Number(1));
-				}else if(uod == "D"){
-					$("#dz").next().text(Number(no)-Number(1));
-				}
-			}
-        }
-    });
-}
-function afterShareTimeline(t){
-	if(t == "trigger"){
-		JylabShareTimeline.update(3000);
-	}else{
-		JylabShareTimeline.update(0);
-	}
-}
-var JylabShareTimeline = {
-	flag: false,
-	update: function(t){
-		$(".mustshare-mark").hide();
-		if(!this.flag){
-			return;
-		}
-		setTimeout(function(){
-			$("#check").addClass("checked");
-			canOpenSwitch();
-			$(".syz-Popup").show();
-		},t);		
-		popup(thistype,true);
-		$.post("/front/jylabShareTimeline",{reqType:"update"},function(r){
-			
-		});
-	}
-}
-
-function canOpenSwitch(){
-	behaviorCollect(1);
-	operatingswitch(thistype);
-}

src/web/staticres/js/login.js

@@ -19,8 +19,6 @@ var ldmold = "";//落地页扫码后调整标识
 var pageshareid = "";
 var kopshareid = "";
 var oldshareid = "";
-var supsearchflag = false;
-var entsearchflag = false;
 var encryptId = null;
 var qr_type = "s";
 var unseatflag = false;//未登录情况下，用户点击超级搜索等开启按钮或者功能，根据此状态看是否弹出二维码
@@ -357,7 +355,6 @@ var processpage = function(shareid,num){
 		return;
 	}
 	clearInterval(loginfg);
-	getEntAndSupStatus();
 	switch(num){
 		case "10"://10首页
 			var ful = $("#myModal").attr("aria-hidden");
@@ -365,7 +362,6 @@ var processpage = function(shareid,num){
 				break;
 			}
 			$("#myModal").modal("hide");
-			getlabstatus();
 //			if(dataListId!=""){
 //				setTimeout(function(){
 //					window.open("/article/content/"+dataListId+".html");
@@ -377,33 +373,7 @@ var processpage = function(shareid,num){
 			break;
 		case "12"://12搜索列表
 			var ful = $("#myModal").attr("aria-hidden");
-			var info = getlabstatus();
-			if(!info[0]&&unseatflag){
-				setTimeout(function(){
-					qr_type = "s";
-					$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-					$(".layheader div:nth-child(1)").html("超级搜索");
-					$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-					$("#labModal").modal("show");
-					unseatflag = false;
-				},1000)
-			}
-			if(!info[1]&&unseatzbqyflag){
-				setTimeout(function(){
-					qr_type = "e";
-					$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-					$(".layheader div:nth-child(1)").html("中标企业搜索");
-					$(".layheader div:nth-child(2)").html("搜索企业的所有中标项目信息");
-					$("#labModal").modal("show");
-					unseatzbqyflag = false;
-				},1000)
-			}else if(entjumpflag){
-				entjumpflag=false;
-				setTimeout(function(){
-					$("#entsearch").click(); //window.open("/jylab/bidsearchforent/index.html");
-				},500);
-				break
-			}
+			
 			if(ful=="true"){
 				break;
 			}
@@ -431,27 +401,7 @@ var processpage = function(shareid,num){
 			}
 			break;
 		case "14"://14标签页面
-			var info = getlabstatus();
-			if(!info[0]&&unseatflag){
-				setTimeout(function(){
-					qr_type = "s";
-					$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-					$(".layheader div:nth-child(1)").html("超级搜索");
-					$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-					$("#labModal").modal("show");
-					unseatflag = false;
-				},1000)
-			}
-			if(!info[1]&&unseatzbqyflag){
-				setTimeout(function(){
-					qr_type = "e";
-					$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-					$(".layheader div:nth-child(1)").html("中标企业搜索");
-					$(".layheader div:nth-child(2)").html("搜索企业的所有中标项目信息");
-					$("#labModal").modal("show");
-					unseatzbqyflag = false;
-				},1000)
-			}
+		
 			var ful = $("#myModal").attr("aria-hidden");
 			if(ful=="true"){
 				break;
@@ -468,43 +418,27 @@ var processpage = function(shareid,num){
 		case "16"://关于我们页面16
 			break;
 		case "18"://中标企业搜索
-			var info = getlabstatus();
-			if(!info[0]&&unseatflag){
-				setTimeout(function(){
-					qr_type = "s";
-					$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-					$(".layheader div:nth-child(1)").html("超级搜索");
-					$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-					$("#labModal").modal("show");
-					unseatflag = false;
-				},1000)
+			var ful = $("#myModal").attr("aria-hidden");	
+			if(ful=="true"){
+				break;
 			}
-			if(!info[1]&&unseatzbqyflag){
+			$("#myModal").modal("hide");
+			$("#labModal").modal("hide");
+			if(dataId!=""){
 				setTimeout(function(){
-					qr_type = "e";
-					$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-					$(".layheader div:nth-child(1)").html("中标企业搜索");
-					$(".layheader div:nth-child(2)").html("搜索企业的所有中标项目信息");
-					$("#labModal").modal("show");
-					unseatzbqyflag = false;
-				},1000)
+					//$('a[dataId="'+ dataId +'"]').click();
+					var aHref = "";
+					if(searchvalue != ""){
+						aHref += '.html?kds='+searchvalue;
+					}else{
+						aHref += '.html';
+					}
+					window.open("/article/content/"+dataId+aHref);
+				},500);
 			}
-			getlabstatus();
+			break;
 			break;
 		case "19"://拟建项目
-			var info = getlabstatus();
-			if(!info[0]&&unseatflag){
-				qr_type = "s";
-				$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-				setTimeout(function(){
-					qr_type = "s";
-					$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-					$(".layheader div:nth-child(1)").html("超级搜索");
-					$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-					$("#labModal").modal("show");
-					unseatflag = false;
-				},1000)
-			}
 			var ful = $("#myModal").attr("aria-hidden");
 			if(ful=="true"){
 				break;
@@ -638,7 +572,6 @@ var haslogin = function(num,kyorpn,url){
 				commonMouseEvent();
 			}catch(e){}
 			getNewShareId(num);
-			getlabstatus();
 			changeER();
 		}else{
 			$("#login").html("<button class='loginBtn' data-toggle='modal' data-target='#bidLogin'  >登录</button>");
@@ -646,7 +579,6 @@ var haslogin = function(num,kyorpn,url){
 			getNewShareId(num);
 			LoginPolling.start();
 			createWebSocket(false);
-			getlabstatus();
 			kzyflag = true;//未登录进入快照页面
 			changeER();
 		}
@@ -674,71 +606,5 @@ function loginBtnType(){
 		$(".loginBtn").attr("onmouseout","this.style.borderColor='#e0e0e0'; this.style.color='#252627';");
 	}
 }
-//
-function getlabstatus(){
-	var sjdcflag = false;
-	if(loginflag){
-		$.ajax({
-        type:'post',
-        url:'/jylab/supsearch/getstatus',
-        async:false,
-        dataType:'json', 
-        success:function(r){
-				if(r&&r.supstatus){
-					$(".superSearch").hide();
-					supsearchflag = true;
-					$(".control-tabBtn>a:first>font").text("超级搜索");
-				}else{
-					$(".superSearch").show();
-					supsearchflag = false;
-					$(".control-tabBtn>a:first>font").text("招标搜索");
-				}
-				if(r&&r.entstatus){
-					entsearchflag = true;
-				}else{
-					entsearchflag = false;
-				}
-				if(r&&r.dataexportstatus){
-					sjdcflag = true;
-				}else{
-					sjdcflag = false;
-				}
-				//
-				if(r&&r.portraitpower){
-					$(".control-tabBtn>a:eq(2)").removeClass("hidden");
-					$(".control-tabBtn>a:eq(3)").removeClass("hidden");
-				}else{
-					$(".control-tabBtn>a:eq(2)").addClass("hidden");
-					$(".control-tabBtn>a:eq(3)").addClass("hidden");
-				}
-			}
-		})
-	}else{
-		$(".superSearch").show();
-	}
-	return [supsearchflag,entsearchflag,sjdcflag]
-}
-
-//
-function getEntAndSupStatus(){
-	var s_entstatus = localStorage.getItem("s_entstatus");
-	var s_supstatus = localStorage.getItem("s_supstatus");
-	if(s_entstatus != "y" || s_supstatus != "y"){
-		$.post("/jylab/searchEntAndSupStatus",function(r){
-			localStorage.setItem("s_entstatus",r.s_entstatus);
-			localStorage.setItem("s_supstatus",r.s_supstatus);
-		})
-	}
-}
-//修改是否已显示中标企业搜索和超级搜索库中的状态
-function changeEntAndSupStatus(w){
-	var data = ""
-	if(w == "ent"){
-		data = "ent";
-	}else{
-		data = "sup";
-	}
-	$.post("/jylab/changeEntAndSupStatus",{"data":data},function(){})
 
-}
 	

src/web/staticres/js/superSearch.js

@@ -21,43 +21,8 @@ $(function() {
 	})
 	//
 	$(".pricebut").click(function(){
-		var info = getlabstatus();
-		if(loginflag){
-			if(info[0]){
-				var s_supstatus = localStorage.getItem("s_supstatus");
-				if(s_supstatus != "y"){ 
-					if(priceCss()){
-						//存入缓存
-						localStorage.setItem("s_supstatus","y");
-						//修改库中状态
-						changeEntAndSupStatus("sup");
-						$(".modal-footer-welcome").text("欢迎体验剑鱼标讯实验室—超级搜索功能。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。");
-						$("#welcome").modal("show");
-						$("#welcome").on("shown.bs.modal", function () {
-							setTimeout(function(){
-								labWelClose();
-							},5000);
-						})
-					}	
-					$("#welcome").on("hidden.bs.modal", function () {
-				 		beforeSubmit();
-					})
-				}else{
-					priceCss();
-					beforeSubmit();
-				}
-			}else{
-				qr_type = "s";
-				$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-				$(".layheader div:nth-child(1)").html("超级搜索");
-				$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-				$("#labModal").modal("show");
-			}
-		}else{
-			unseatflag = true;
-			$(".code-text").html('<span style="font-size: 22px;margin-top: 10px;display: inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
-			$("#bidLogin").modal("show");
-		}
+		priceCss();
+		beforeSubmit();
 	})
 	//
 	$("#timebut").click(function(){
@@ -157,42 +122,7 @@ $(function() {
 	})
 	//
 	$("#entsearch").click(function(){
-		if(loginflag){
-			var id = $(this).attr("datahref");
-			var info = getlabstatus();
-			if(info[1]){
-				var s_entstatus = localStorage.getItem("s_entstatus");
-				if(s_entstatus != "y"){
-					//存入缓存
-					localStorage.setItem("s_entstatus","y");
-					//修改库中状态
-					changeEntAndSupStatus("ent");
-					$("#welcome").modal("show");
-					$("#welcome").on("shown.bs.modal", function () {
-						setTimeout(function(){
-							labWelClose();
-						},5000);
-					})
-					$("#welcome").on("hidden.bs.modal", function () {
-			 			window.location.href=id;
-					})
-				}else{
-					window.location.href=id;
-				}
-			}else{
-				qr_type = "e";
-				$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-				$(".layheader div:nth-child(1)").html("中标企业搜索");
-				$(".layheader div:nth-child(2)").html("搜索企业的所有中标项目信息");
-				$("#labModal").modal("show");
-			}
-		}else{
-			entjumpflag = true;
-			unseatzbqyflag = true;
-			$(".code-text").html('<span style="font-size: 22px;margin-top: 10px;display: inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
-			$("#bidLogin").modal("show");
-		}
-			
+		window.location.href= $(this).attr("datahref");;
 	})
 })
 //

src/web/staticres/js/wxSupersearch.js

@@ -219,21 +219,13 @@ var SuperSearch = {
 			$("#supersearchPage .money-dialog .money-inp").removeClass("active");
 		});
 	    $("#supersearchPage .money-dialog .money-inp").on("tap",function(){
-	    	if(open_supersearch){
-	            $(this).addClass("active");
-	            $("#supersearchPage .money-dialog .btn").removeClass("active");
-			}else{
-	            SuperSearch.toOpenSupersearch();
-			}
+            $(this).addClass("active");
+            $("#supersearchPage .money-dialog .btn").removeClass("active");
 		});
 	
 	    var reg = /^[\u4e00-\u9fa5]+$/;
 	    var maxnum = "";
-	    $("#supersearchPage .maxMrice").on("click",function(){
-	        if(!open_supersearch){
-	            SuperSearch.toOpenSupersearch();
-	        }
-	    }).on("input propertychange",function(){
+	    $("#supersearchPage .maxMrice").on("input propertychange",function(){
 	    	/*
 	        var minp = $(this).val()
 	        if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
@@ -292,11 +284,7 @@ var SuperSearch = {
 		});
 	
 	    var minnum = "";
-	    $("#supersearchPage .minMrice").on("click",function(){
-	        if(!open_supersearch){
-	            SuperSearch.toOpenSupersearch();
-	        }
-	    }).on("input propertychange",function(){
+	    $("#supersearchPage .minMrice").on("input propertychange",function(){
 	    	/*
 	        var minp = $(this).val()
 	        if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
@@ -537,10 +525,6 @@ var SuperSearch = {
 			$("#supersearchPage input[name=super_searchinput]").addClass("searchinput-padding");
 		}
 	},
-	toOpenSupersearch: function(){
-		SuperSearch.setSessionStorage();
-		window.location.href="/jylab/laboratory/cjss?v=superSearch";
-	},
 	limitPaging: function(me){
 		$("#supersearchPage #list>.tslist.hidden").each(function(i){
 			if(i >= 50){
@@ -1376,22 +1360,13 @@ var SuperSearch = {
 				}
 			},1000);
 		}
-		if(!open_supersearch){
-			checkIsOpen();
-		}
+		checkIsOpen();
 		setTimeout(function(){
-			if(open_supersearch){
-			  	SuperSearch.behaviorCollect(2);
-			  	$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
-			  	$("#supersearchPage #wrapper #table").removeClass("hidden");
-			  	$("#supersearchPage #wrapper #list").addClass("hidden");
-				//if(SuperSearch.dropload != null){
-				//	SuperSearch.dropload.resetload();
-				//}
-				SuperSearch.isTable(true);
-			}else{
-				SuperSearch.toOpenSupersearch();
-			}
+		  	SuperSearch.behaviorCollect(2);
+		  	$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
+		  	$("#supersearchPage #wrapper #table").removeClass("hidden");
+		  	$("#supersearchPage #wrapper #list").addClass("hidden");
+			SuperSearch.isTable(true);
 		},300)
 		
 	},
@@ -1674,38 +1649,28 @@ var SuperSearch = {
 			    dialogObjthree.find(".btn").removeClass("active");
 			    $(this).addClass("active");
 			}else{
-			    if(open_supersearch){				//判断是否开通超级搜索
-					if($(this).hasClass("active")){
-					    dialogObjthree.find(".btn").removeClass("active");
-					    dialogObjthree.find("div[id='dqbtn']").removeClass("active");
-					    dialogObjthree.find("ul:first li:first .btn").addClass("active");
-					}else{
-					    dialogObjthree.find("ul:first li:first .btn").removeClass("active");
-					    dialogObjthree.find(".btn").removeClass("active");
-					    dialogObjthree.find("div[id='dqbtn']").removeClass("active");
-					    $(this).addClass("active");
-					}
-			    }else{
-					SuperSearch.toOpenSupersearch();
-					return
-			    }
+				if($(this).hasClass("active")){
+				    dialogObjthree.find(".btn").removeClass("active");
+				    dialogObjthree.find("div[id='dqbtn']").removeClass("active");
+				    dialogObjthree.find("ul:first li:first .btn").addClass("active");
+				}else{
+				    dialogObjthree.find("ul:first li:first .btn").removeClass("active");
+				    dialogObjthree.find(".btn").removeClass("active");
+				    dialogObjthree.find("div[id='dqbtn']").removeClass("active");
+				    $(this).addClass("active");
+				}
 			};
 	    });
 	    dialogObjthree.find('div[id="dqbtn"]').on("tap",function(){
-			if(open_supersearch){
-		
-			    if($(this).hasClass("active")){
-					dialogObjthree.find(".btn").removeClass("active");
-					dialogObjthree.find("div[id='dqbtn']").removeClass("active");
-					dialogObjthree.find("ul:first li:first .btn").addClass("active");
-			    }else{
-					dialogObjthree.find("div[id='dqbtn']").removeClass("active");
-					dialogObjthree.find(".btn").removeClass("active");
-					$(this).addClass("active");
-			    }
-			}else{
-			    SuperSearch.toOpenSupersearch();
-			}
+		    if($(this).hasClass("active")){
+				dialogObjthree.find(".btn").removeClass("active");
+				dialogObjthree.find("div[id='dqbtn']").removeClass("active");
+				dialogObjthree.find("ul:first li:first .btn").addClass("active");
+		    }else{
+				dialogObjthree.find("div[id='dqbtn']").removeClass("active");
+				dialogObjthree.find(".btn").removeClass("active");
+				$(this).addClass("active");
+		    }
 	    });
 	},
 	initMobiscroll: function(){

src/web/staticres/pccss/index.css

@@ -179,7 +179,7 @@ text-decoration:none;
 #index .links .linkul .linksitem .linkdiv {
   display: none;
   position: absolute;
-  left: -.5rem;
+  left: -.2rem;
   top: -1.8rem;
   width: 1.46rem;
   height: 1.78rem;

src/web/templates/pc/biddingsearch_enterprise.html

@@ -297,7 +297,7 @@
 				<div class="w searchHeader-container">
 					<!--搜索-->
 					<div class="searchInput clearfix">
-						<form action="/jylab/bidsearchforent/index.html" method="post" id="zbSeatchT" class="clearfix" onsubmit="return checkstatus()">
+						<form action="/jylab/bidsearchforent/index.html" method="post" id="zbSeatchT" class="clearfix">
 							<input class="searchname" autocomplete="off" type="search" name="keywords" id="searchinput" value="{{.T.searchvalue}}" placeholder="中标企业搜索" />
 
 							<input type="submit" class="searchBtn" value="搜索"/>
@@ -316,10 +316,6 @@
 						<div id="screenBtn" class="screen down">
 							筛选
 						</div>
-						<!--开启超级搜索 -->
-						<div class="superSearch" {{if eq .T.supstatus "T"}} style="display:none;"{{end}}>
-							开启超级搜索
-						</div>
 						<!--二维码-->
 						<div class="search-right-wx">
 							<img src="{{Msg "seo" "cdn"}}/images/biddingSearch/sea-right-wx.png" />
@@ -342,7 +338,7 @@
 					<div class="control-tabBtn">
 						<span class="bidbutdir" style="left:187px;"></span>
 						<a class="supbtn" left="50" href="javascript:void(0)">
-							<i></i><font>{{if eq .T.supstatus "T"}}超级搜索{{else}}招标搜索{{end}}</font>
+							<i></i><font>招标搜索</font>
 						</a>
 						<a href="#" class="on" left="187"><i></i>中标企业搜索</a>
 						<a href="{{Msg "seo" "url.portrait_winner"}}"{{if not .T.portraitpower}} class="hidden"{{end}} left="335"><i></i>中标企业画像</a>
@@ -449,7 +445,7 @@
 				</div>
 			</div>
 			<!--tab切换内容-->
-			<div class="tabContainer tabContainer-2"  id="allnews" >
+			<div class="tabContainer tabContainer-2"  id="allnews">
 				<!--全文搜索 列表-->
 				<div class="lucene">
 					<ul id="ul_list">
@@ -485,6 +481,11 @@
 						
 						</tbody>
 					</table>
+          <div class="shade_table" style="">
+            <div class="more" onclick="toPaydataExport()">
+              查看更多&gt;
+            </div>
+          </div>
 				</div>	
 			</div>
 			<div class="hasNoData" style="display: none;">
@@ -714,7 +715,7 @@
 		var currentPage = 1;//当前页
 		var pageSize = 50;
 		var tabularflag = "Y";
-		
+		var dataId="";
 		$(function(){
 			new TableHeadFixed("tabContainer-2",searchvalue=="",false);
 			haslogin({{.T.logid}});
@@ -835,43 +836,8 @@
 			$(".pricebut").click(function(){
 				var min = $("#minprice").val();
 				var max = $("#maxprice").val();
-				var info = getlabstatus();
-				if(loginflag){
-					if(info[0]){
-						var s_supstatus = localStorage.getItem("s_supstatus");
-						if(s_supstatus != "y"){
-							if(priceCss()){
-								//存入缓存
-								localStorage.setItem("s_supstatus","y");
-								//修改库中状态
-								changeEntAndSupStatus("sup");
-								priceCss();
-								$(".modal-footer-welcome").text("欢迎体验剑鱼标讯实验室—超级搜索功能。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。");
-								$("#welcome").modal("show");
-								$("#welcome").on("shown.bs.modal", function () {
-									setTimeout(function(){
-										labWelClose();
-									},5000);
-								})
-							}
-							$("#welcome").on("hidden.bs.modal", function () {
-	 				 			beforeSubmit();
-							})
-						}else{
-							priceCss();
-							beforeSubmit();
-						}
-					}else{
-                        qr_type = "s";
-						$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-						$(".layheader div:nth-child(1)").html("超级搜索");
-						$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-						$("#labModal").modal("show");
-					}
-				}else{
-					reStyle();
-					$("#bidLogin").modal("show");
-				}
+				priceCss();
+				beforeSubmit();
 			})
 			
 			//设置输入价格的格式
@@ -976,52 +942,13 @@
 				window.location.href = "/jylab/supsearch/index.html";
 			})
 			
-			//点击超级搜索按钮
-			$(".superSearch").click(function(){
-				if(!loginflag){
-					reStyle();
-					unseatflag = true;
-					$("#bidLogin").modal("show");
-				}else{
-					getlabstatus();
-					if(!supsearchflag){
-						$(".control-tabBtn .on>span").text("招标搜索");
-                        qr_type = "s";
-						$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-						$(".layheader div:nth-child(1)").html("超级搜索");
-						$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-						$("#labModal").modal("show");
-					}else{
-						$(".control-tabBtn .on>span").text("超级搜索");
-					}
-				}
-			})	
 			//
 			$(".bidbut").click(function(){
 				window.location.href = "/jylab/supsearch/index.html";
 			})
 			//点击搜索框上方显示超级搜索
 			$(".supbtn").click(function(){
-				var s_supstatus = localStorage.getItem("s_supstatus");
-				if(s_supstatus != "y"){
-					//存入缓存
-					localStorage.setItem("s_supstatus","y");
-					//修改库中状态
-					changeEntAndSupStatus("sup");
-					$(".modal-footer-welcome").text("欢迎体验剑鱼标讯实验室—超级搜索功能。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。");
-					$("#welcome").modal("show");
-					$("#welcome").on("shown.bs.modal", function () {
-						setTimeout(function(){
-							labWelClose();
-						},5000);
-					})
-					$("#welcome").on("hidden.bs.modal", function () {
-			 			window.location.href = "/jylab/supsearch/index.html";
-					})
-				}else{
 					window.location.href = "/jylab/supsearch/index.html";
-				}
-				
 			})
 			
 			//下一页
@@ -1052,50 +979,7 @@
 		function preSearchJd(r){
 			var searchname = $("#zbSeatchT input[name='keywords']").val();
 			$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname));
-			if($.trim(searchname) != ""){	
-				getlabstatus();
-				//点击搜索判断是否登录，未登录进行登录
-				r.preventDefault();  //阻止默认事件
-				if(!loginflag){
-					reStyle();
-					$("#bidLogin").modal("show");	
-				}else{
-					//已登录判断有没有开启中标企业搜索功能，未开启弹出二维码开启
-					entsearchflag = true;
-					if(entsearchflag){
-						localStorage.setItem("smflag","true");
-						var s_entstatus = localStorage.getItem("s_entstatus");
-						if(s_entstatus != "y"){
-							//存入缓存
-							localStorage.setItem("s_entstatus","y");
-							//修改库中状态
-							changeEntAndSupStatus("ent");
-							$("#welcome").modal("show");
-							$("#welcome").on("shown.bs.modal", function () {
-								setTimeout(function(){
-									labWelClose();
-								},5000);
-							})
-							$("#welcome").on("hidden.bs.modal", function () {
- 				 				$("#zbSeatchT").submit();
-							})
-						}else{
-							$("#zbSeatchT").submit();
-						}
-						
-					}else{
-                        qr_type = "e";
-						$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-						$(".layheader div:nth-child(1)").html("中标企业搜索");
-						$(".layheader div:nth-child(2)").html("搜索企业的所有中标项目信息");
-						$("#labModal").modal("show");
-						
-					}
-				}
-			}else{
-				localStorage.setItem("smflag","false");
-				$("#zbSeatchT").submit();
-			}
+			$("#zbSeatchT").submit();
 		}
 		
 		function priceCss(){
@@ -1131,27 +1015,7 @@
 			$("#zbSeatchT input[name='pricetype']").val(pricetype);
 			return true;
 		}
-		
-		//
-		function checkstatus(){
-			if($.trim($("#zbSeatchT input[name='keywords']").val()) != ""){
-				getlabstatus();
-				if(!entsearchflag){
-                    qr_type = "e";
-					$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-					$(".layheader div:nth-child(1)").html("中标企业搜索");
-					$(".layheader div:nth-child(2)").html("搜索企业的所有中标项目信息");
-					$("#labModal").modal("show");
-					return false;
-				}else{
-					return true;
-				}
-			}else{
-				return true;
-			}
 			
-		}
-		
 		//取redis里的数据
 		function getNewBids(pnum){
 			$.post("/jylab/supsearch/getNewBids",{pageNumber:pnum},function(r){
@@ -1248,13 +1112,11 @@
 				$("#zbSeatchT [name='maxprice']").val(selectMaxPrices);
 				
 				//搜索关键词
-				var searchname = "";
-				if("true" == localStorage.getItem("smflag")){
-					searchname = searchvalue;
-					$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname));
-				}else{
-					$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname));	
-				}
+        var searchname = "";
+				searchname = searchvalue;
+				$("#zbSeatchT input[name='searchvalue']").val($.trim(searchname));
+
+        
 				currentPage=1;
 				if(currentPage==1){
 					$(".nbprev").addClass("disabled");
@@ -1263,30 +1125,16 @@
 					getNewBids(currentPage)
 				}else{
 					if($.trim(searchname) != ""){
-						getlabstatus();
-						if(!loginflag){
-							$("#bidLogin").modal("show");
-						}else{
-							//开启了中标企业搜索
-							if(entsearchflag){
-								getTableInfo();
-							}else{
-		                        qr_type = "e";
-								$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-								$(".layheader div:nth-child(1)").html("中标企业搜索");
-								$(".layheader div:nth-child(2)").html("搜索企业的所有中标项目信息");
-								$("#labModal").modal("show");
-							}	
-						}
+						getTableInfo();
 					}else{
 						$(".tabTitle").removeClass("hidden");
 						//$(".lucene").attr("style","display:block");
 						//$(".lucene-table").attr("style","display:none");
 						$(".wx-inner-title").html("扫码关注剑鱼标讯");
 						$(".wx-inner-bottom").html("微信扫一扫<br>随时随地掌握招标信息");
-	                    currentPage = 1;
-	                    $(".currentPage").text(currentPage);
-	                    $(".nbprev").addClass("disabled");
+            currentPage = 1;
+            $(".currentPage").text(currentPage);
+            $(".nbprev").addClass("disabled");
 						searchOnsubmit();
 					}
 				}
@@ -1489,6 +1337,9 @@
 					}
 				}
 				listItem+='</div></div></li>'
+        if (i >= 20||currentPage!=1){
+    			continue
+    		}
 				tableHtml +='<tr onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank">'
 						+'<td width="48"><div>'+index+'</div></td>'
 						
@@ -1582,12 +1433,17 @@
 		$(".lucene").html(listItem);
 		if(searchvalue==""){
 			$(".lucene-table").removeClass("entlist");
-			$(".formTable").html(tableHtml);
+      if(currentPage==1){
+  			$(".formTable").html(tableHtml);
+      }
+      $(".shade_table").show();
+      $(".lucene-table").css({"margin-bottom":"60px"});
 		}else{
 			$(".lucene-table").addClass("entlist");
 			$(".formTable").html(formItem);
+      $(".shade_table").hide();
+      //$(".tabContainer").css({"margin-bottom":"30px"});
 		}
-		
     }
 
     //关闭超级搜索遮罩层
@@ -1623,7 +1479,7 @@
 	function noIn(p){
 		var thisId = $(p).attr("dataId");
 		var dataindustry = $(p).attr("dataindustry");
-		//dataId = thisId;
+		dataId = thisId;
 		if(loginflag){
 			var aHref = "";
 			if(searchvalue != ""){

src/web/templates/pc/classifylist.html

@@ -237,41 +237,8 @@ $(function(){
 	})
 	//
 	$(".pricebut").click(function(){
-		var info = getlabstatus();
-		if(loginflag){
-			if(info[0]){
-				var s_supstatus = localStorage.getItem("s_supstatus");
-				if(s_supstatus != "y"){ 
-					if(priceCss()){
-						//存入缓存
-						localStorage.setItem("s_supstatus","y");
-						//修改库中状态
-						changeEntAndSupStatus("sup");
-						$(".modal-footer-welcome").text("欢迎体验剑鱼标讯实验室—超级搜索功能。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。");
-						$("#welcome").modal("show");
-						$("#welcome").on("shown.bs.modal", function () {
-							setTimeout(function(){
-								labWelClose();
-							},5000);
-						})
-					}	
-					$("#welcome").on("hidden.bs.modal", function () {
-				 		beforeSubmit();
-					})
-				}else{
-					priceCss();
-					beforeSubmit();
-				}
-			}else{
-				qr_type = "s";
-				$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-				$(".layheader div:nth-child(1)").html("超级搜索");
-				$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-				$("#labModal").modal("show");
-			}
-		}else{
-			$("#bidLogin").modal("show");
-		}
+		priceCss();
+		beforeSubmit();
 	})
 	//
 	$("#timebut").click(function(){
@@ -299,24 +266,6 @@ $(function(){
 	$(".bidbtn").click(function(){
 		window.location.href = "/jylab/supsearch/index.html";
 	})
-	//点击超级搜索按钮
-	$(".superSearch").click(function(){
-		if(loginflag){
-			var info = getlabstatus();
-			if(!info[0]){
-				qr_type = "s";
-				$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-				$(".layheader div:nth-child(1)").html("超级搜索");
-				$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-				$("#labModal").modal("show");
-			}
-		}else{
-			unseatflag = true;
-			$(".code-text").html('<span style="font-size: 22px;margin-top: 10px;display: inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="{{Msg "seo" "cdn"}}/images/wx1.png">请先微信扫码登录</span>')
-			$("#bidLogin").modal("show");
-		}
-	});
-	
 	//
 	$(".searchname").on("input propertychange",function(){
 		var kw = $("#zbSeatchT [name='keywords']").val();
@@ -498,10 +447,6 @@ function priceCss(){
 				<div id="screenBtn" class="screen">
 					筛选
 				</div>
-				<!--开启超级搜索 -->
-				<div class="superSearch" {{if .T.supstatus}}{{if eq .T.supstatus "T"}} style="display:none;"{{end}}{{end}}>
-					开启超级搜索
-				</div>
 				<!--二维码-->
 				<div class="search-right-wx">
 					<img src="{{Msg "seo" "cdn"}}/images/biddingSearch/sea-right-wx.png" />
@@ -524,7 +469,7 @@ function priceCss(){
 			<div class="control-tabBtn">
 				<span class="bidbutdir"></span>
 				<a href="/jylab/supsearch/index.html" left="50" class="on">
-					<i></i><font>{{if eq .T.supstatus "T"}}超级搜索{{else}}招标搜索{{end}}</font>
+					<i></i><font>招标搜索</font>
 				</a>
 				<a id="entsearch" href="javascript:" left="187" datahref="/jylab/bidsearchforent/index.html">
 					<i></i>中标企业搜索
@@ -903,39 +848,7 @@ $(function(){
 	}
 	//
 	$("#entsearch").click(function(){
-		if(loginflag){
-			var id = $(this).attr("datahref");
-			var info = getlabstatus();
-			if(info[1]){
-				var s_entstatus = localStorage.getItem("s_entstatus");
-				if(s_entstatus != "y"){
-					//存入缓存
-					localStorage.setItem("s_entstatus","y");
-					//修改库中状态
-					changeEntAndSupStatus("ent");
-					$("#welcome").modal("show");
-					$("#welcome").on("shown.bs.modal", function () {
-						setTimeout(function(){
-							labWelClose();
-						},5000);
-					})
-					$("#welcome").on("hidden.bs.modal", function () {
-			 			window.location.href=id;
-					})
-				}else{
-					window.location.href=id;
-				}
-			}else{  
-				qr_type = "e";
-				$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-				$(".layheader div:nth-child(1)").html("中标企业搜索");
-				$(".layheader div:nth-child(2)").html("搜索企业的所有中标项目信息");
-				$("#labModal").modal("show");
-			}
-		}else{
-			$("#bidLogin").modal("show");
-		}
-			
+		window.location.href=$(this).attr("datahref");
 	})
 	////////////////////////////////////////////
 });
@@ -1141,12 +1054,8 @@ function appendDatas(datas){
 function noIn(p){
 	var thisId = $(p).attr("dataId");
 	dataId = thisId;
-	if(loginflag){
-		window.open("/article/content/"+thisId+".html");
-	}else{
-		$('#myModal').modal("show");
-		//setLogin(15);
-	}
+	window.open("/article/content/"+thisId+".html");
+
 }
 
 //关闭遮罩层

src/web/templates/pc/index.html

@@ -118,7 +118,7 @@
 				<ul class="linkul clearfix">
 					<li class="linksitem">
 						<a style="padding-left: 0rem;">APP</a>
-						<div class="linkdiv">
+						<div class="linkdiv" style="left: -0.55rem;">
 							<img src="https://www.jianyu360.com/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan"/>
 							<p>扫描二维码下载</p>
 						</div>

src/web/templates/pc/supsearch.html

@@ -634,10 +634,6 @@ $(function(){
 				<div id="screenBtn" class="screen down">
 					筛选
 				</div>
-				<!--开启超级搜索 -->
-				<div class="superSearch" {{if .T.supstatus}}{{if eq .T.supstatus "T"}} style="display:none;"{{end}}{{end}}>
-					开启超级搜索
-				</div>
 				<!--二维码-->
 				<div class="search-right-wx">
 					<img src="{{Msg "seo" "cdn"}}/images/biddingSearch/sea-right-wx.png" />
@@ -660,7 +656,7 @@ $(function(){
 			<div class="control-tabBtn">
 				<span class="bidbutdir"></span>
 				<a href="#" class="on" left="50">
-					<i></i><font>{{if eq .T.supstatus "T"}}超级搜索{{else}}招标搜索{{end}}</font>
+					<i></i><font>招标搜索</font>
 				</a>
 				<a id="entsearch" href="javascript:" left="187" datahref="/jylab/bidsearchforent/index.html">
 					<i></i>中标企业搜索
@@ -1005,27 +1001,6 @@ $(function(){
 	new TableHeadFixed("",true,true,"supsearch");
 	new JyWebScoket.qrToLab();
 	haslogin({{.T.logid}},keys);
-	//点击超级搜索按钮
-	$(".superSearch").click(function(){
-		if(loginflag){
-			var info = getlabstatus();
-			if(!info[0]){
-				$(".control-tabBtn .on>font").text("招标搜索");
-				qr_type = "s";
-				$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-				$(".layheader div:nth-child(1)").html("超级搜索");
-				$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
-				$("#labModal").modal("show");
-			}else{
-				$(".control-tabBtn .on>font").text("超级搜索");
-			}
-		}else{
-			unseatflag = true;
-			$(".code-text").html('<span style="font-size: 22px;margin-top: 10px;display: inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="{{Msg "seo" "cdn"}}/images/wx1.png">请先微信扫码登录</span>')
-			$("#bidLogin").modal("show");
-		}
-	})
-	//
 	$(".j-nav .j-nav-link:eq(2)").addClass("active");
 	$("body").on("click",function(e){
 		if(e.target.id=="q-mark"){

src/web/templates/pchelper/pushView.html

@@ -875,19 +875,10 @@
 				$(".code-text").html('<span style="font-size:22px;margin-top:10px;display:inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
 				$("#bidLogin").modal("show");
 			}else{
-				var info = getlabstatus();
-				if(info[2]){
-					$("#right-list").removeClass("active");
-					$("#right-table").addClass("active");
-					$("#data-list").hide();
-					$("#data-table").show();
-				}else{
-					qr_type = "d";
-					$("#labImg").attr("src","/jylab/supsearch/qr/"+qr_type);
-					$(".layheader div:nth-child(1)").html("订阅数据导出");
-					$(".layheader div:nth-child(2)").html("用表格呈现订阅数据，可下载导出");
-					$("#labModal").modal("show");
-				}
+				$("#right-list").removeClass("active");
+				$("#right-table").addClass("active");
+				$("#data-list").hide();
+				$("#data-table").show();
 			}
 		}else{
 			$("#right-list").addClass("active");

src/web/templates/weixin/historypush.html

@@ -130,7 +130,6 @@ function initpage(){
 			sessionStorage.removeItem("historypushScrollTop");
 			sessionStorage.removeItem("historypushHasNextPage");
 			sessionStorage.removeItem("historypushCount");
-			sessionStorage.removeItem("listortable");
 		}else{
 		//最开始没有数据 
 			hasNoData();
@@ -147,12 +146,6 @@ function initpage(){
 		scrollTop = $(this).scrollTop();
 	});
 	//
-	if(sessionStorage.getItem("listortable")=="T"){
-	    $(".showType .showTable").addClass("on").siblings().removeClass("on");
-		$("#list").addClass("hidden");
-		$(".tablecontent").removeClass("hidden");
-	}
-	//
 	if(sessionStorage && sessionStorage.historypushScrollTop && sessionStorage.historypushDataCache){
 		pageIndex = sessionStorage.historypushPageIndexCache;
 		hasNextPage = sessionStorage.historypushHasNextPage=="true"?true:false;
@@ -162,7 +155,6 @@ function initpage(){
       closeAdvert=true
     }
 		$("#list>*").remove();
-		$("#mytable>*").remove();
 		count = 0;
 		if(sessionStorage.date!=""&&sessionStorage.historypushCount==0){
 			if($(".findnull").css("display")=="block"){
@@ -183,7 +175,6 @@ function initpage(){
 		sessionStorage.removeItem("historypushScrollTop");
 		sessionStorage.removeItem("historypushHasNextPage");
 		sessionStorage.removeItem("historypushCount");
-		sessionStorage.removeItem("listortable");
 	}else{
 		if(firstTime!=""){
 			sessionStorage.date=firstTime;
@@ -242,36 +233,6 @@ function initpage(){
 	    });
 		noMoreData(wxflag);
 	}
-	
-	//展示
-	$(".showType .showlist").click(function(){
-	    $(this).addClass("on").siblings().removeClass("on");
-		$("#list").removeClass("hidden");
-		$(".dropload-down").removeClass("dropcss");
-		$(".tablecontent").addClass("hidden");
-		wxflag.resetload();
-	});
-	$(".showType .showTable").click(function(){
-		//表格是否开启超级搜索？
-		$.ajax({
-	       type:'post',
-	       url:'/jylab/supsearch/getstatus',
-	       async:false,
-	       dataType:'json', 
-	       success:function(r){
-				if(r&&r.dataexportstatus){
-				    $(".showType .showTable").addClass("on").siblings().removeClass("on");
-					$("#list").addClass("hidden");
-					$(".dropload-down").addClass("dropcss");
-					$(".tablecontent").removeClass("hidden");
-					wxflag.resetload();
-				}else{
-					setSessionStorage();
-					window.location.href="/jylab/laboratory/sjdc";
-				}
-			}
-		})
-	});
 }
 function noMoreData(me){
 	if(me == null){
@@ -293,7 +254,6 @@ function hasNoData(){
 	$(".loading_").hide();
 }
 function structureHtml(object,showAd){
-	var tablehtml = '';
 	var listhtml='';
 	for(var index in object){
     var obj=object[index];
@@ -343,39 +303,7 @@ function structureHtml(object,showAd){
 				showdateList='<span><i class="glyphicon bofangjilu" style="color:#7a7a7a;margin-right:2px;"></i>'+showdateList+'</span>'
 			}
 		}
-		//预算
-		var budgetTable="";
-		if(typeof(obj.budget) != "undefined" && obj.budget != null && obj.budget != ""){
-			budgetTable=parseInt(obj.budget)/10000
-			if(budgetTable.toString().length>6){
-				if(budgetTable.toString().indexOf(".")==5){
-					budgetTable=budgetTable.toString().substr(0,7)
-				}else{
-					budgetTable=budgetTable.toString().substr(0,6)
-				}
-			}
-		}
-		//中标金额
-		var bidamountTable="";
-		if(typeof(obj.bidamount) != "undefined" && obj.bidamount != null && obj.bidamount != ""){
-			bidamountTable = parseInt(obj.bidamount)/10000
-			if(bidamountTable.toString().length>6){
-				if(bidamountTable.toString().indexOf(".")==5){
-					bidamountTable=bidamountTable.toString().substr(0,7)
-				}else{
-					bidamountTable=bidamountTable.toString().substr(0,6)
-				}
-			}
-		}
-		//招标单位
-		var buyerTable=obj.buyer==undefined?"":obj.buyer;
-		//中标单位
-		var winnerTable=obj.winner==undefined?"":obj.winner;
-		//开标时间
-		var opentimeTable=""
-		if(typeof(obj.bidopentime) != "undefined" && obj.bidopentime != null && obj.bidopentime != ""){
-			opentimeTable = formatDate(Number(obj.bidopentime),"l");
-		}
+
 		//序号位置
 		var paddingLeft=20
 		var countLength = count.toString().length;
@@ -387,17 +315,6 @@ function structureHtml(object,showAd){
 		if(obj.ca_visit==1){
 			visited="visited"
 		}
-    tablehtml+='<tr class="'+visited+'" onclick="tablejump($(this))"  data_id="'+obj["_id"]+'"  data_mWords="'+mWords+'"   push_date="'+obj["ca_date"]+'" openlist_index="'+obj["ca_openlist_index"]+'">'
-						+'<td>'+count+'</td>'
-						+'<td>'+title+'</td>'
-						+'<td>'+datatypeTable+'</td>'
-						+'<td>'+budgetTable+'</td>'
-						+'<td>'+buyerTable+'</td>'
-						+'<td><div>'+opentimeTable+'</div></td>'
-						+'<td class="tt-l"><div>'+winnerTable+'</div></td>'
-						+'<td class="tt-r"><div>'+bidamountTable+'</div></td>'
-						+'<td>'+showdateTable+'</td>'
-					+'</tr>'  
     if(showAd&&index==3&&!closeAdvert){//广告位
       var ad=$("#advertscript").html()
       if(ad!=""){
@@ -407,7 +324,7 @@ function structureHtml(object,showAd){
 								+'<span class="xh '+visited+'">'+count+'.</span>'
 							+'</div>'
 							+'<div class="two bt-parent" style="padding-left:'+paddingLeft+'px;">'
-								+'<a class="bt '+visited+'" target="_blank" eid="'+obj["_id"]+'" href="javascript:void(0);"  push_date="'+obj["ca_date"]+'" openlist_index="'+obj["ca_openlist_index"]+'">'+title+'</a>'
+								+'<a class="bt '+visited+'" eid="'+obj["_id"]+'" href="javascript:void(0);"  push_date="'+obj["ca_date"]+'" openlist_index="'+obj["ca_openlist_index"]+'">'+title+'</a>'
 							+'</div>'
 						+'</div>'
 						+'<div style="clear:both;">'
@@ -425,7 +342,7 @@ function structureHtml(object,showAd){
 								+'<span class="xh '+visited+'">'+count+'.</span>'
 							+'</div>'
 							+'<div class="two bt-parent" style="padding-left:'+paddingLeft+'px;">'
-								+'<a class="bt '+visited+'" target="_blank" eid="'+obj["_id"]+'" href="javascript:void(0);"  push_date="'+obj["ca_date"]+'" openlist_index="'+obj["ca_openlist_index"]+'">'+title+'</a>'
+								+'<a class="bt '+visited+'" eid="'+obj["_id"]+'" href="javascript:void(0);"  push_date="'+obj["ca_date"]+'" openlist_index="'+obj["ca_openlist_index"]+'">'+title+'</a>'
 							+'</div>'
 						+'</div>'
 						+'<div style="clear:both;">'
@@ -437,10 +354,10 @@ function structureHtml(object,showAd){
 		
 	}
   if (object.length<=3&&$("#advertscript").html()!=""&&!closeAdvert&&showAd){
-    appendList($("<div>"+listhtml+"<div class='adv-wxpush-center' id='E1'>"+$("#advertscript").html()+"</div></div>"),tablehtml);
+    appendList($("<div>"+listhtml+"<div class='adv-wxpush-center' id='E1'>"+$("#advertscript").html()+"</div></div>"));
     $(".closeadv").css("display","none");
   }else{
-  	appendList($("<div>"+listhtml+"</div>"),tablehtml);
+  	appendList($("<div>"+listhtml+"</div>"));
   }
   if(object.length<=4&&$("#advertscript").html()!=""){
 		$(".closeadv").css("display","none");
@@ -478,7 +395,7 @@ function formatDate(date,sl)   {
 }
 
 //
-function appendList(content,tablehtml){
+function appendList(content){
 	content.children(".tslist").on("click", function(event){
 		var isv=$(this).find("a.bt").hasClass("visited");//是否为已读
 		setVisitedIndex($(this),"");
@@ -490,7 +407,6 @@ function appendList(content,tablehtml){
 		beforeJump(eid,h,sds,index,pdate,isv);
 	});
 	$("#list").append(content);
-	$("#mytable").append(tablehtml);
 	$(".findnull").hide();
 	$(".listcontent").show();
 	setTimeout(function(){
@@ -528,10 +444,6 @@ function setSessionStorage(){
 		sessionStorage.historypushHasNextPage = hasNextPage;
 		sessionStorage.historypushCount = count;
 		sessionStorage.point="1";
-    
-		if($(".showType .showTable").hasClass("on")){
-			sessionStorage.setItem("listortable","T");
-		}
 	}
 }
 
@@ -585,112 +497,13 @@ a{
 .showType div{
 	padding-left: 30px;
 }
-.showType .showlist{
-	background: url(/images/search/showList.png)10px 3px no-repeat;
-	background-size: 30%;
-    margin-right: 15px;
-	line-height: 21px;
-}
-.showType .showtable{
-	background: url(/images/search/showTable.png)10px 2px no-repeat;
-	background-size: 30%;
-    margin-left: 15px;
-	line-height: 21px;
-}
-.showType .showlist.on{
-	background: url(/images/search/showList_on.png)10px 3px no-repeat;
-	background-size: 30%;
-	color: #2cb7ca;
-}
-.showType .showtable.on{
-	background: url(/images/search/showTable_on.png)10px 2px no-repeat;
-	background-size: 30%;
-	color: #2cb7ca;
-}
-.shuxian{
-	padding: 0px !important;
-    margin-right: 10px;
-	margin-top: -2px;
-	background-color: #e0e0e0;
-	width: 1px;
-	height: 25px;
-}
-#jytables{
-	/*不需要可自己删除*/
-	padding: .2rem;
-	width:880px;
-}
-#jytables table{
-	width: 100%;
-	border-collapse: collapse;
-}
-#jytables table td {
-	padding: 5px;
-	border: 1px solid #E0E0E0;
-	text-align: center;
-	vertical-align: middle;
-}
-#jytables table thead{
-	/**font-size: .28rem;**/
-	font-size: 14px;
-	color: #686868;
-}
-#jytables table tbody{
-	/**font-size: .3rem;**/
-	font-size: 15px;
-	color: #1d1d1d;
-}
-/*高亮字体*/
-#jytables table span.higHlight{
-	color: #2cb7ca;
-}
-.tablecontent{
-	width: 100%;
-    overflow-x: scroll;
-}
-#jytables thead>tr>td:nth-child(1){
-	padding:.3rem 0;
-	width:30px;
-}
-#jytables tbody>tr>td:nth-child(9){
-	width:68px;
-}
-#jytables tbody>tr>td:nth-child(3){
-	width:74px;
-}
-#jytables tbody>tr>td:nth-child(5){
-	width:160px;
-	padding: 17px 5px;
-    line-height: 21px;
-    text-align: left;
-}
-#jytables tbody>tr>td:nth-child(2){
-	width: 160px;
-    padding: 17px 5px;
-    line-height: 21px;
-    text-align: left;
-}
+
 .prompt{
 	padding:10px 10px 20px;
 }
 .blue{
 	color:#0987ff;
 }
-#jytables tbody>tr>td:nth-child(4){
-	width:70px;
-}
-#jytables tbody>tr>td:nth-child(6){
-	width:85px;
-}
-#jytables tbody>tr>td:nth-child(7) div{
-	width:110px;
-}
-#jytables tbody>tr>td:nth-child(7){
-	width:110px;
-}
-#jytables tbody>tr>td:nth-child(8){
-	width:72px;
-}
 .resnumb .two{
 	max-height: 45px;
     overflow: hidden;
@@ -913,35 +726,10 @@ body .loading_ p span {
 <div id="kongH"></div>
 <div class="showType">
 	<span class="times"><i class="iconfont icon-rili"></i>&nbsp;时间筛选</span>
-	<div class="shuxian"></div>
-	<div class="showlist on">列表</div>
-	<div class="showtable">表格</div>
 </div>
 <div class="showType_bg" style="display:none;height:37px;border-bottom:1px solid #ddd;border-top: 1px solid #ddd;"></div>
 <div class="listcontent">
 	<div id="list"></div>
-	<div class="tablecontent hidden">
-		<section id="jytables">
-			<table>
-				<thead> 
-					<tr>
-						<td>序号</td>
-						<td>项目名称</td>
-						<td>公告类型</td>
-						<td>预算<br>（万元）</td>
-						<td>招标单位</td>
-						<td>开标日期</td>
-						<td>中标单位</td>
-						<td>中标金额<br>（万元）</td>
-						<td>发布日期</td>
-					</tr>
-				</thead>
-				<tbody id="mytable">	
-				</tbody>
-			</table>
-		</section>
-		<div class="prompt">提示：为了获得更佳的体验，推荐<span class="blue" id="openmailpush">打开邮件推送</span>，用电脑查看邮件中的表格。</div>
-	</div>
 </div>
 
 <span class="text-center findnull" style="position: absolute;left:0px;right:0px;top: 50%;margin-top: -130px;padding: 0px 30px;">
@@ -981,10 +769,11 @@ $(function(){
 		var smouth = times[1];
 		var sday = times[2];
 		var stimes = syear+"年"+smouth+"月"+sday+"日";
-        $("span.times").hide();
+    $("span.times").hide();
+    $(".showType_bg").hide();
 		$("#kongH").addClass("kongH");
-        $(".time").show();
-        $("#times").text(stimes);
+    $(".time").show();
+    $("#times").text(stimes);
 		sessionStorage.setItem("time", stimes);
 		sessionStorage.setItem("times", formatTime(time, 'Y/M/D'));
 		var date1 = formatTime((new Date().getTime().toString().slice(0,-3)),'Y/M/D').split("/");
@@ -1053,7 +842,8 @@ $(function(){
 			$("#kongH").addClass("kongH");
 			$(".time").show();
 			$("#times").text(valueText);
-            $("span.times").hide();
+      $("span.times").hide();
+      $(".showType_bg").hide();
             //
 			var sdate = $("#times").text().slice(0, -1).replace("年", "-").replace("月", "-").split("-");
 			var syear = sdate[0];
@@ -1099,23 +889,24 @@ $(function(){
 				handler: function(event,inst){
 				}
 			},
-            {
-                text: '查看全部时间',
-                cssClass: 'dwc titlee',
-                handler: function(event,inst){
-					$("#kongH").removeClass("kongH");
-                    $(".time").hide();
-                    $("span.times").show();
-                    inst.cancel();
-                    setTimeout(function(){
-                    $(".showType").show();
-						ajaxFun("");
+      {
+        text: '查看全部时间',
+        cssClass: 'dwc titlee',
+        handler: function(event,inst){
+            inst.cancel();
+            setTimeout(function(){
+              $("#kongH").removeClass("kongH");
+              $(".time").hide();
+              $(".showType").show();
+              $(".showType_bg").show();
+              $("span.times").show();
+  						ajaxFun("");
 					},500);
-                    sessionStorage.removeItem("time");
-                    sessionStorage.removeItem("times");
-                    sessionStorage.removeItem("date");
-                }
-            },
+          sessionStorage.removeItem("time");
+          sessionStorage.removeItem("times");
+          sessionStorage.removeItem("date");
+        }
+      },
 
 		],
 		dateFormat: "yyyy年mm月dd日",
@@ -1136,10 +927,10 @@ $(function(){
 		},
 		onSelect: function (valueText, inst) {//选择时事件（点击确定后），valueText 为选择的时间，
 			$("#times").text(valueText);
-            var time = valueText.slice(0, -1);
-            var times = time.replace("年", "/").replace("月", "/");
-            var stimes = time.replace("年", "-").replace("月", "-");
-            sessionStorage.setItem("times", times);
+      var time = valueText.slice(0, -1);
+      var times = time.replace("年", "/").replace("月", "/");
+      var stimes = time.replace("年", "-").replace("月", "-");
+      sessionStorage.setItem("times", times);
 			sessionStorage.setItem("date", new Date(stimes).getTime());
 			ajaxFun(new Date(stimes).getTime());
 			reTimeS(valueText);
@@ -1312,14 +1103,12 @@ function reTimeS(selectTime){
 			return;
 		}else{
 			$(".showType").css("display","flex");
-			$(".showType_bg").show();
 			$(".findnull_").css("display","none");
 		}
 		$("#list").css("visibility","hidden");
 		//dataCache = firstPage;
 		$("#list").html("");
 		$("#tablecontent").html("");
-		$("#mytable").html("");
 		structureHtml(firstPage,true);
 		setTimeout(function(){
 			$(window).scrollTop(0);

src/web/templates/weixin/jylab/lab-cjss.html

@@ -1,174 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/js/jq-wxui/weui.min.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/reset.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/syz-public-href.css?v={{Msg "seo" "version"}}" />
-		{{include "/common/weixin.html"}}
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-			jylabInitShare();
-			function jylabInitShare(){
-				initShare({{.T.signature}},{{.T.s_m_openid}},5,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-			}
-		</script>
-		<title>剑鱼标讯实验室</title>
-	</head>
-	<body>
-		<div class="mask">
-		</div>
-		<!--开关文字弹出层-->
-		<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden{{end}}{{end}}" style="display:none">
-			<div class="popup-top">
-				实验功能逐步完善中。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。
-			</div>
-			<div class="popup-bottom" style="display:none;">
-				我知道了
-			</div>
-		</div>
-		<section id="syz-secondHtml">
-			<!--开关-->
-			<div class="weui-cells weui-cells_form title">
-				<div class="weui-cell weui-cell_switch titleInner">
-					<div class="weui-cell__bd">超级搜索 <a href="javascript:jumpTo();" id="searchuse" class="hidden">使用</a></div>
-					<div class="weui-cell__ft">
-						<a id="check" class="weui-switch titleInput" style="display: hidden;"></a>
-					</div>
-				</div>
-			</div>
-			<!--轮播-->
-			<div class="carousel">
-				<div class="carousel-title">
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-qianyin.png" />
-					<span>按行业、金额搜索，结果可按表格显示</span>
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-houyin.png" />
-				</div>
-				<!--滑动-->
-				<div id="slideBox" class="slideBox">
-					<div id="box1" class="box">
-						<div class="bd">
-						<ul>
-							<li>
-								<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-cjss-0101.png" />
-							</li>
-							<li>
-								<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-cjss-02.png" />
-							</li>
-							<li>
-								<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-cjss-03.png" />
-							</li>
-						</ul>
-					</div>
-					</div>
-					<div id="box2" class="box">
-						<div class="iner-text">
-							使用超级搜索功能，您可以按行业搜索招标信息，或者搜索金额在指定范围内的招标信息，您还可以选择以表格形式呈现搜索结果，所有信息一目了然，尽收眼底。
-						</div>
-					</div>
-					<div class="hd">
-						<ul></ul>
-					</div>
-				</div>
-			</div>
-			<!--查看详情-->
-			<div class="details">
-				<div class="details-inner">
-					<div class="iner-title">
-						<span class="on">查看详情</span>
-					</div>
-				</div>
-			</div>
-			<!--意见反馈-->
-			<div class="feedback">
-				<a href="/swordfish/feedback?fromName=cjss">意见反馈</a>
-			</div>
-		</section>
-		<div class="mustshare-mark">
-			<img src="{{Msg "seo" "cdn"}}/images/jylab-share.png">
-		</div>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/TouchSlide.1.1.js"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/syz-publicJs.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript">
-        var s_openid = {{.T.s_m_openid}};
-        var support = "";
-		var thistype = "cjss";
-		//$(function(){
-			var usebot = {{.T.switchstatus}}
-			if (usebot&&usebot==1){
-				$("#searchuse").removeClass("hidden");
-			}else{
-				$("#searchuse").addClass("hidden");
-			}
-			$("#dz").parent("div").on("tap",function(){
-                behaviorCollect(2);
-			})
-		//})
-
-        //行为采集 1-打开开关 2-分享//点赞
-        function behaviorCollect(type) {
-            if(s_openid){
-                var model = "lab_comm";
-                var s_url = "/jylab/laboratory/cjss/";
-                var s_model = "实验室-超级搜索";
-                var checkFlag = $("#check").hasClass('checked');
-                var s_open = "";
-                var s_support = "";
-                if(type==1){
-                    if(checkFlag){
-                        s_open = "1";
-                    }else{
-                        s_open = "0";
-                    }
-                }else{
-                    //s_support = "分享";
-					s_support = "share";
-                }
-
-                var encode= {{ConEncode "/jylab/laboratory/cjss/"}};
-                var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+s_openid+'","s_open":"'+s_open+'","s_share":"'+s_support+'"}';
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
-		function jumpTo(){
-			var value = getUrlParam("v");
-			if(sessionStorage){
-				if(value != null){
-					sessionStorage.searchpageName = value;
-					window.history.back();
-				}else{
-					sessionStorage.searchpageName = "lab_search_back";
-					window.location.href = "/jylab/mainSearch?v=s";
-				}
-			}else{
-				window.location.href = "/jylab/mainSearch?v=s";
-			}
-		}
-		$(function(){
-			$.ajax({
-		        type:'post',
-		        url:'/jylab/supsearch/getstatus',
-		        async:false,
-		        dataType:'json', 
-		        success:function(r){
-						if(r&&r.supstatus){
-							$("#check").addClass("checked");
-							$("#searchuse").removeClass("hidden");
-						}else{
-							$("#check").removeClass("checked");
-							$("#searchuse").addClass("hidden");
-						}
-						$("#check").css({"display":"block"});
-					}
-				})
-		})
-	</script>
-</body>
-</html>

src/web/templates/weixin/jylab/lab-close.html

@@ -0,0 +1,75 @@
+<html lang="zh-cn">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="format-detection" content="telephone=no" />
+		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/reset.css?v={{Msg "seo" "version"}}" />
+		<script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+		{{include "/common/weixin.html"}}
+		<title>剑鱼标讯实验室</title>
+    <style>
+      body {
+        background: #2cb7ca;
+      }
+      header{
+        font-size: .32rem;
+        text-align: center;
+        color: #fff;
+        padding-top: .7rem;
+        display:none;
+      }
+      section{
+        position: absolute;
+        top: 50%;
+        height: 10rem;
+        margin-top: -5rem;
+        width: 100%;
+      }
+      article{
+        height: 8rem;
+      }
+      .main{
+        text-align: center;
+        color:#fff;
+        font-size: .32rem;
+        
+        background: url(/images/syzindex/lab_closed.png);
+        background-size:  90% auto;
+        background-repeat: no-repeat;
+        background-position: center;
+      }
+      .main span{
+        position: relative;
+        top: 7rem;
+      }
+      .toDeatil{
+        color: #2cb7ca;
+        height: .9rem;
+        width: 2.5rem;
+        text-align: center;
+        margin: 0 auto;
+        line-height: .9rem;
+        border-radius: .1rem;
+        background: #fff;
+        font-size: .32rem;
+      }
+
+    </style>
+	</head>
+	<body>
+    <header>剑鱼标讯实验室</header>
+    <section>
+      <article class="main">
+        <span>剑鱼标讯实验室已关闭</span>
+      </article>
+      <div class="toDeatil" onclick="window.location.href='https://mp.weixin.qq.com/s/c8QImDnwnJKIBfA2oNTTpw'">
+        查看详情
+      </div>
+    </section>
+  </body>
+  <script>
+		initShare({{.T.signature}},{{.T.s_m_openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
+	</script>
+</html>  

src/web/templates/weixin/jylab/lab-gzqy.html

@@ -1,154 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/js/jq-wxui/weui.min.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/reset.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/syz-public-href.css?v={{Msg "seo" "version"}}" />
-		{{include "/common/weixin.html"}}
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-			jylabInitShare();
-			function jylabInitShare(){
-				initShare({{.T.signature}},{{.T.s_m_openid}},5,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-			}		
-		</script>
-		<title>剑鱼标讯实验室</title>
-	</head>
-	<body>
-		<div class="mask">
-		</div>
-		<!--开关文字弹出层-->
-		<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden {{end}}{{end}}" style="display:none;">
-			<div class="popup-top">
-				实验功能逐步完善中。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。
-			</div>
-			<div class="popup-bottom" style="display:none;">
-				我知道了
-			</div>
-		</div>
-		<section id="syz-secondHtml">
-			<!--开关-->
-			<div class="weui-cells weui-cells_form title">
-				<div class="weui-cell weui-cell_switch titleInner">
-					<div class="weui-cell__bd">我关注的企业<a href="/jylab/followent/entList" id="searchuse" class="hidden" >使用</a></div>
-					<div class="weui-cell__ft">
-						<a id="check" class="weui-switch titleInput" style="display: hidden;"></a>
-					</div>
-				</div>
-			</div>
-			<!--轮播-->
-			<div class="carousel">
-				<div class="carousel-title">
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-qianyin.png" />
-					<span>第一时间接收关注企业的中标信息</span>
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-houyin.png" />
-				</div>
-				<!--滑动-->
-				<div id="slideBox" class="slideBox">
-					<div id="box1" class="box">
-						<div class="bd">
-							<ul>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-gzqy-01.png" />
-								</li>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-gzqy-02.png" />
-								</li>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-gzqy-03.png" />
-								</li>
-							</ul>
-						</div>
-					</div>
-					<div id="box2" class="box">
-						<div class="iner-text">
-							您关注了某个企业以后，该企业一旦有项目中标，您将第一时间收到剑鱼标讯的通知消息。可以输入企业名称加关注，也可以从招标信息页面将页面上出现的企业添加关注。
-						</div>
-					</div>
-					<div class="hd">
-						<ul></ul>
-					</div>
-				</div>
-			</div>
-			<!--查看详情-->
-			<div class="details">
-				<div class="details-inner">
-					<div class="iner-title">
-						<span class="on">查看详情</span>
-					</div>
-				</div>
-			</div>
-			<!--意见反馈-->
-			<div class="feedback">
-				<a href="/swordfish/feedback?fromName=gzqy">意见反馈</a>
-			</div>
-		</section>
-		<div class="mustshare-mark">
-			<img src="{{Msg "seo" "cdn"}}/images/jylab-share.png">
-		</div>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/TouchSlide.1.1.js"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/syz-publicJs.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript">
-        var s_openid = {{.T.s_m_openid}};
-        var support = "";
-		var thistype = "gzqy";
-		$(function(){
-			$.ajax({
-		        type:'post',
-		        url:'/jylab/supsearch/getstatus',
-		        async:false,
-		        dataType:'json', 
-		        success:function(r){
-						if(r&&r.followent){
-							$("#check").addClass("checked");
-							$("#searchuse").removeClass("hidden");
-						}else{
-							$("#check").removeClass("checked");
-							$("#searchuse").addClass("hidden");
-						}
-						$("#check").css({"display":"block"});
-					}
-				})
-		})
-		//$(function(){
-			$("#dz").parent("div").on("tap",function(){
-                behaviorCollect(2);
-			});
-		//})
-
-        //行为采集 1-打开开关 2-分享//点赞
-        function behaviorCollect(type) {
-            if(s_openid){
-                var model = "lab_comm";
-                var s_url = "/jylab/laboratory/gzqy/";
-                var s_model = "实验室-我关注的企业";
-                var checkFlag = $("#check").hasClass('checked');
-                var s_open = "";
-                var s_support = "";
-                if(type==1){
-                    if(checkFlag){
-                        s_open = "1";
-                    }else{
-                        s_open = "0";
-                    }
-                }else{
-                    //s_support = "分享";
-					s_support = "share";
-                }
-
-                var encode= {{ConEncode "/jylab/laboratory/gzqy/"}};
-                var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+s_openid+'","s_open":"'+s_open+'","s_share":"'+s_support+'"}';
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
-	</script>
-</body>
-</html>

src/web/templates/weixin/jylab/lab-index.html

@@ -28,31 +28,31 @@
 		<section class="content">
 			<ul>
 				<li>
-					<a href="/jylab/laboratory/zndy" target="_blank">
+					<a href="#">
 						<div>智能订阅模式</div>
 						<div>更聪明的招标订阅模式</div>
 					</a>
 				</li>
 				<li>
-					<a href="/jylab/laboratory/sjdc" target="_blank">
+					<a href="#">
 						<div>订阅数据导出</div>
 						<div>用表格呈现订阅数据，可下载导出</div>
 					</a>
 				</li>
 				<li>
-					<a href="/jylab/laboratory/cjss" target="_blank">
+					<a href="#">
 						<div>超级搜索</div>
 						<div>按行业、金额搜索，结果可按表格显示</div>
 					</a>
 				</li>
 				<li>
-					<a href="/jylab/laboratory/zbqy" target="_blank">
+					<a href="#">
 						<div>中标企业搜索</div>
 						<div>搜索企业的所有中标项目信息</div>
 					</a>
 				</li>
 				<li>
-					<a href="/jylab/laboratory/gzqy" target="_blank">
+					<a href="#">
 						<div>我关注的企业</div>
 						<div>第一时间接收关注企业的中标信息</div>
 					</a>
@@ -66,7 +66,6 @@
 		new FastClick(document.body);
         var s_openid = {{.T.s_m_openid}};
 		//$(function(){
-            behaviorCollect();
 			$("body").css({"background-size":"2.72rem 3.29rem"})
 			/*实验室首页动画*/
 			var syzIndexMove = function(){
@@ -104,28 +103,5 @@
 			/*调用*/
 			syzIndexMove.moveNow()
 		//})
-
-        //行为采集
-        function behaviorCollect() {
-            if(s_openid){
-                var model = "lab_comm";
-                var s_url = "/jylab/laboratory/index/";
-                var s_model = "实验室";
-                var s_open = "";
-
-                var encode= {{ConEncode "/jylab/laboratory/index/"}};
-                var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+s_openid+'","s_open":"'+s_open+'"}'
-
-//                $.ajax({
-//                    url:"http://192.168.3.14:1711/accesslog/byajax",
-//                    dataType:'jsonp',
-//                    data:{json:content},
-//                    jsonp:'callback'
-//                });
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
 	</script>
 </html>

src/web/templates/weixin/jylab/lab-sjdc.html

@@ -1,152 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/js/jq-wxui/weui.min.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/reset.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/syz-public-href.css?v={{Msg "seo" "version"}}" />
-		{{include "/common/weixin.html"}}
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-			jylabInitShare();
-			function jylabInitShare(){
-				initShare({{.T.signature}},{{.T.s_m_openid}},5,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-			}
-		</script>
-		<title>剑鱼标讯实验室</title>
-	</head>
-	<body>
-		<div class="mask">
-		</div>
-		<!--开关文字弹出层-->
-		<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden{{end}}{{end}}">
-			<div class="popup-top">
-				实验功能逐步完善中。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。
-			</div>
-			<div class="popup-bottom" style="display:none;">
-				我知道了
-			</div>
-		</div>
-		<section id="syz-secondHtml">
-			<!--开关-->
-			<div class="weui-cells weui-cells_form title">
-				<div class="weui-cell weui-cell_switch titleInner">
-					<div class="weui-cell__bd">订阅数据导出</div>
-					<div class="weui-cell__ft">
-						<a id="check" class="weui-switch titleInput" style="display: hidden;"></a>
-					</div>
-				</div>
-			</div>
-			<!--轮播-->
-			<div class="carousel">
-				<div class="carousel-title">
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-qianyin.png" />
-					<span>用表格呈现订阅数据，可下载导出</span>
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-houyin.png" />
-				</div>
-				<!--滑动-->
-				<div id="slideBox" class="slideBox">
-					<div id="box1" class="box">
-						<div class="bd">
-							<ul>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-sjdc-01.png" />
-								</li>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-sjdc-02_new.png" />
-								</li>
-								
-							</ul>
-						</div>
-					</div>
-					<div id="box2" class="box">
-						<div class="iner-text">
-							剑鱼标讯向您推送多条信息时，将附带一个电子信息表格，这个表格可以将信息更清晰地呈现给您，您也可以将其导入到Excel中进行统计汇总。
-						</div>
-					</div>
-					<div class="hd">
-						<ul></ul>
-					</div>
-				</div>
-			</div>
-			<!--查看详情-->
-			<div class="details">
-				<div class="details-inner">
-					<div class="iner-title">
-						<span class="on">查看详情</span>
-					</div>
-				</div>
-			</div>
-			<!--意见反馈-->
-			<div class="feedback">
-				<a href="/swordfish/feedback?fromName=sjdc">意见反馈</a>
-			</div>
-		</section>
-		<div class="mustshare-mark">
-			<img src="{{Msg "seo" "cdn"}}/images/jylab-share.png">
-		</div>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/TouchSlide.1.1.js"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/syz-publicJs.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript">
-        var s_openid = {{.T.s_m_openid}};
-        var support = "";
-		var thistype = "sjdc";
-		//$(function(){
-			$("#dz").parent("div").on("tap",function(){
-                behaviorCollect(2);
-			})
-		//})
-
-        //行为采集
-        function behaviorCollect(type) {
-            if(s_openid){
-                var model = "lab_comm";
-                var s_url = "/jylab/laboratory/sjdc/";
-                var s_model = "实验室-订阅数据导出";
-                var checkFlag = $("#check").hasClass('checked');
-                var s_open = "";
-                var s_support = "";
-                if(type==1){
-                    if(checkFlag){
-                        s_open = "1";
-                    }else{
-                        s_open = "0";
-                    }
-                }else{
-                    //s_support = "分享";
-					s_support = "share";
-                }
-
-                var encode= {{ConEncode "/jylab/laboratory/sjdc/"}};
-                var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+s_openid+'","s_open":"'+s_open+'","s_share":"'+s_support+'"}';
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
-		$(function(){
-			$.ajax({
-		        type:'post',
-		        url:'/jylab/supsearch/getstatus',
-		        async:false,
-		        dataType:'json', 
-		        success:function(r){
-						if(r&&r.dataexportstatus){
-							$("#check").addClass("checked");
-							$("#searchuse").removeClass("hidden");
-						}else{
-							$("#check").removeClass("checked");
-							$("#searchuse").addClass("hidden");
-						}
-						$("#check").css({"display":"block"});
-					}
-				})
-		})
-	</script>
-</body>
-</html>

src/web/templates/weixin/jylab/lab-zbqy.html

@@ -1,149 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/js/jq-wxui/weui.min.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/reset.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/syz-public-href.css?v={{Msg "seo" "version"}}" />
-		{{include "/common/weixin.html"}}
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-			jylabInitShare();
-			function jylabInitShare(){
-				initShare({{.T.signature}},{{.T.s_m_openid}},5,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-			}
-		</script>
-		<title>剑鱼标讯实验室</title>
-	</head>
-	<body>
-		<div class="mask">
-		</div>
-		<!--开关文字弹出层-->
-		<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden{{end}}{{end}}" style="display:none;">
-			<div class="popup-top">
-				实验功能逐步完善中。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。
-			</div>
-			<div class="popup-bottom" style="display:none;">
-				我知道了
-			</div>
-		</div>
-		<section id="syz-secondHtml">
-			<!--开关-->
-			<div class="weui-cells weui-cells_form title">
-				<div class="weui-cell weui-cell_switch titleInner">
-					<div class="weui-cell__bd">中标企业搜索<a href="javascript:jumpTo();" id="searchuse" class="hidden">使用</a></div>
-					<div class="weui-cell__ft">
-						<a id="check" class="weui-switch titleInput" style="display: hidden;"></a>
-					</div>
-				</div>
-			</div>
-			<!--轮播-->
-			<div class="carousel" style="border-bottom: 1px solid #e0e0e0;height:79.3vh;">
-				<div class="carousel-title">
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-qianyin.png" />
-					<span>搜索企业的所有中标项目信息</span>
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-houyin.png" />
-				</div>
-				<!--滑动-->
-				<div id="slideBox-one" class="slideBox">
-					<div class="bd">
-						<ul>
-							<li>
-								<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-zbqy.png" />
-							</li>
-						</ul>
-					</div>
-					<div class="hd" style="display:none;">
-						<ul></ul>
-					</div>
-				</div>
-			</div>
-			
-			<!--意见反馈-->
-			<div class="feedback" style="margin-top: 1.5vh;">
-				<a href="/swordfish/feedback?fromName=zbqy">意见反馈</a>
-			</div>
-		</section>
-		<div class="mustshare-mark">
-			<img src="/images/jylab-share.png">
-		</div>
-	<script type="text/javascript" src="/js/jquery-3.2.1.min.js"></script>
-	<script src="/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="/js/TouchSlide.1.1.js"></script>
-	<script type="text/javascript" src="/js/syz-publicJs.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript">
-        var s_openid = {{.T.s_m_openid}};
-        var support = "";
-		var thistype = "zbqy";
-		//$(function(){
-			$("#dz").on("tap",function(){
-                behaviorCollect(2);
-			})
-		//})
-
-        //行为采集
-        function behaviorCollect(type) {
-            if(s_openid){
-                var model = "lab_comm";
-                var s_url = "/jylab/laboratory/zbqy/";
-                var s_model = "实验室-中标企业搜索";
-                var checkFlag = $("#check").hasClass('checked');
-                var s_open = "";
-                var s_support = "";
-                if(type==1){
-                    if(checkFlag){
-                        s_open = "1";
-                    }else{
-                        s_open = "0";
-                    }
-                }else{
-                    //s_support = "分享";
-					s_support = "share";
-                }
-
-                var encode= {{ConEncode "/jylab/laboratory/zbqy/"}};
-                var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+s_openid+'","s_open":"'+s_open+'","s_share":"'+s_support+'"}';
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
-		
-		function jumpTo(){
-			var value = getUrlParam("v");
-			if(sessionStorage){
-				if(value != null){
-					sessionStorage.searchpageName = value;
-					window.history.back();
-				}else{
-					sessionStorage.searchpageName = "lab_ent_back";
-					window.location.href = "/jylab/mainSearch?v=e";
-				}
-			}else{
-				window.location.href = "/jylab/mainSearch?v=e";
-			}
-		}
-		$(function(){
-			$.ajax({
-		        type:'post',
-		        url:'/jylab/supsearch/getstatus',
-		        async:false,
-		        dataType:'json', 
-		        success:function(r){
-						if(r&&r.entstatus){
-							$("#check").addClass("checked");
-							$("#searchuse").removeClass("hidden");
-						}else{
-							$("#check").removeClass("checked");
-							$("#searchuse").addClass("hidden");
-						}
-						$("#check").css({"display":"block"});
-					}
-				})
-		})
-	</script>
-</body>
-</html>

src/web/templates/weixin/jylab/lab-zndy.html

@@ -1,155 +0,0 @@
-<html lang="zh-cn">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/js/jq-wxui/weui.min.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/reset.css?v={{Msg "seo" "version"}}" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dev2/syz-public-href.css?v={{Msg "seo" "version"}}" />
-		{{include "/common/weixin.html"}}
-		<script type="text/javascript" src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
-		<script>
-			jylabInitShare();
-			function jylabInitShare(){
-				initShare({{.T.signature}},{{.T.s_m_openid}},5,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-			}
-		</script>
-		<title>剑鱼标讯实验室</title>
-	</head>
-	<body>
-		<div class="mask">
-		</div>
-		<!--开关文字弹出层-->
-		<div class="syz-Popup {{if .T.iknow}}{{if eq .T.iknow 1}}hidden {{end}}{{end}}">
-			<div class="popup-top">
-				实验功能逐步完善中。实验随时可能结束，或者进行调整，请密切关注剑鱼标讯通知。
-			</div>
-			<div class="popup-bottom" style="display:none;">
-				我知道了
-			</div>
-		</div>
-		<section id="syz-secondHtml">
-			<!--开关-->
-			<div class="weui-cells weui-cells_form title">
-				<div class="weui-cell weui-cell_switch titleInner">
-					<div class="weui-cell__bd">智能订阅模式</div>
-					<div class="weui-cell__ft">
-						<a id="check" class="weui-switch titleInput{{ if .T.switchstatus}}{{if eq .T.switchstatus true}} checked{{end}}{{end}}" style="display: block;"></a>
-					</div>
-				</div>
-			</div>
-			<!--轮播-->
-			<div class="carousel">
-				<div class="carousel-title">
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-qianyin.png" />
-					<span>更聪明的招标订阅模式</span>
-					<img src="{{Msg "seo" "cdn"}}/images/syzindex/sys-houyin.png" />
-				</div>
-				<!--滑动-->
-				<div id="slideBox" class="slideBox">
-					<div id="box1" class="box">
-						<div class="bd">
-							<ul>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/zndy01.png" />
-								</li>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/zndy02.jpg" />
-								</li>
-								<li>
-									<img src="{{Msg "seo" "cdn"}}/images/syzindex/zndy03.png" />
-								</li>
-							</ul>
-						</div>
-					</div>
-					<div id="box2" class="box">
-						<div class="iner-text">
-							如果您打开“智能订阅模式”，除了将关键词与公告标题匹配，剑鱼标讯还将更智能的与公告正文进行匹配。比如您订阅了关键词“路由器”，一般路由器是与其他设备合并在一个项目里采购，很少有项目单独采购路由器，使用智能匹配模式，您就可以收到采购内容包含了“路由器”的招标公告信息，无论公告标题有没有包含“路由器”。如果公告正文中列举了采购内容，剑鱼标讯将与采购内容匹配，否则，将与正文全文匹配。您打开智能订阅模式情况下，添加排除词，排除词匹配全文。
-						</div>
-					</div>
-					<div class="hd">
-						<ul></ul>
-					</div>
-				</div>
-			</div>
-			<!--查看详情-->
-			<div class="details">
-				<div class="details-inner">
-					<div class="iner-title">
-						<span class="on">查看详情</span>
-					</div>
-				</div>
-			</div>
-			<!--意见反馈-->
-			<div class="feedback">
-				<a href="/swordfish/feedback?fromName=zndy">意见反馈</a>
-			</div>
-		</section>
-		<div class="mustshare-mark">
-			<img src="{{Msg "seo" "cdn"}}/images/jylab-share.png">
-		</div>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/TouchSlide.1.1.js"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/syz-publicJs.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/jypraise.js?v={{Msg "seo" "version"}}"></script>
-	<script type="text/javascript">
-		var s_openid = {{.T.s_m_openid}};
-		var support = "";
-		var thistype = "zndy";
-		//$(function(){
-			$("#dz").parent("div").on("tap",function(){
-                behaviorCollect(2);
-			})
-		//})
-
-        //行为采集  1-打开开关 2-分享//点赞
-        function behaviorCollect(type) {
-            if(s_openid){
-                var model = "lab_comm";
-                var s_url = "/jylab/laboratory/zndy/";
-                var s_model = "实验室-智能订阅模式";
-                var checkFlag = $("#check").hasClass('checked');
-                var s_open = "";
-                var s_support = "";
-                if(type==1){
-                    if(checkFlag){
-                        s_open = "1";
-                    }else{
-                        s_open = "0";
-                    }
-                }else{
-                    //s_support = "分享";
-					s_support = "share";
-				}
-
-                var encode= {{ConEncode "/jylab/laboratory/zndy/"}};
-                var content='{"encode":"'+encode+'","model":"'+model+'","s_url":"'+s_url+'","s_model":"'+s_model+'","s_openid":"'+s_openid+'","s_open":"'+s_open+'","s_share":"'+s_support+'"}';//原s_support改成了s_share
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
-		//
-		$(function(){
-			$.ajax({
-		        type:'post',
-		        url:'/jylab/supsearch/getstatus',
-		        async:false,
-		        dataType:'json', 
-		        success:function(r){
-						if(r&&r.smartstatus){
-							$("#check").addClass("checked");
-							$("#searchuse").removeClass("hidden");
-						}else{
-							$("#check").removeClass("checked");
-							$("#searchuse").addClass("hidden");
-						}
-						$("#check").css({"display":"block"});
-					}
-				})
-		})
-	</script>
-</body>
-</html>

src/web/templates/weixin/resultpreview.html

@@ -17,7 +17,6 @@ var keys = [];
 var sds = "";
 var highlightKey = [];
 var noMore = "false";
-var tableCache = "";
 var listCache = "";
 var wxflag = null;
 if(a_key){
@@ -50,17 +49,10 @@ if(firstPage != null && firstPage.length == 1){
 		$(window).scroll(function(){
 			scrollTop = $(this).scrollTop();
 		});
-		//
-		if(localStorage.getItem("listortable"+{{.T._id}})!=null&&localStorage.getItem("listortable"+{{.T._id}})=="T"){
-		    $(".showType .showTable").addClass("on").siblings().removeClass("on");
-			$("#list").addClass("hidden");
-			$(".tablecontent").removeClass("hidden");
-		}
 		if(sessionStorage && sessionStorage.resultpreviewScrollTop && sessionStorage.resultpreviewListCache){
 			pageNum = sessionStorage.resultpreviewPageNumCache;
 			noMore = sessionStorage.resultpreviewNoMoreCache;
-			appendListHtml([sessionStorage.resultpreviewListCache,sessionStorage.resultpreviewTableCache],pageNum);
-			$("#mytable").html(sessionStorage.resultpreviewTableCache);
+			appendListHtml([sessionStorage.resultpreviewListCache],pageNum);
 			if(noMore == "true"){
 				wxflag = $('.listcontent').dropload({
 			        scrollArea : window,
@@ -78,7 +70,6 @@ if(firstPage != null && firstPage.length == 1){
 			sessionStorage.removeItem("resultpreviewPageNumCache");
 			sessionStorage.removeItem("resultpreviewListCache");
 			sessionStorage.removeItem("resultpreviewNoMoreCache");
-			localStorage.removeItem("listortable"+{{.T._id}})
 		}else{
 			$("#list").css("visibility","hidden");
 			appendListHtml(getHtml(firstPage,1),2);
@@ -142,35 +133,6 @@ if(firstPage != null && firstPage.length == 1){
 					noMoreData(wxflag);
 				}
 		}
-		//展示
-		$(".showType .showlist").click(function(){
-		    $(this).addClass("on").siblings().removeClass("on");
-			$("#list").removeClass("hidden");
-			$(".dropload-down").removeClass("dropcss");
-			$(".tablecontent").addClass("hidden");
-			wxflag.resetload();
-		})
-		$(".showType .showTable").click(function(){
-			//表格是否开启超级搜索？
-			$.ajax({
-	        type:'post',
-	        url:'/jylab/supsearch/getstatus',
-	        async:false,
-	        dataType:'json', 
-	        success:function(r){
-					if(r&&r.dataexportstatus){
-					    $(".showType .showTable").addClass("on").siblings().removeClass("on");
-						$("#list").addClass("hidden");
-						$(".dropload-down").addClass("dropcss");
-						$(".tablecontent").removeClass("hidden");
-						wxflag.resetload();
-					}else{
-						window.location.href="/jylab/laboratory/sjdc";
-					}
-				}
-			})
-		})
-		//
 	});
 	function open_window(link){
 		if(!/^http/.test(link)){
@@ -182,13 +144,10 @@ if(firstPage != null && firstPage.length == 1){
 	function hasNoData(){
 		$(".listcontent").hide();
 		$(".findnull").css("display","block");
-		$(".showType").hide();
-		$(".showType").next().hide();
-		$(".app-layout-content-b>div:first").hide();
+		$(".tipHeader").hide();
 	}
 	function getHtml(list,pageNum){
 		var html = '';
-		var tablehtml='';
 		for(var i=0;i<list.length;i++){
 			var index = (pageNum-1)*pageSize+i+1;
 			var thisStyle = " style='padding-left: 15px;'";
@@ -223,32 +182,6 @@ if(firstPage != null && firstPage.length == 1){
 					}
 				}
 			}
-			tablehtml +='<tr onClick="tablejump(\''+list[i]._id+'\',\''+list[i].href+'\')" >'+
-						'<td>'+index+'</td>'
-			if(list[i].projectname!=null&&list[i].projectname!=""){
-				var pn = list[i].projectname;
-				if(a_key.length > 0){
-					for(var n=0;n<a_key.length;n++){
-						var keysTemp = a_key[n];
-						var isReplace = true;
-						var pnTemp = pn;
-						for(var m=0;m<keysTemp.length;m++){
-							var _pnTemp = keyWordHighlight(pnTemp,keysTemp[m],'<font class="keyword">$1</font>');
-							if(pnTemp == _pnTemp){
-								isReplace = false;
-								break;
-							}
-							pnTemp = _pnTemp;
-						}
-						if(isReplace){
-							pn = pnTemp;
-						}
-					}
-				}
-				tablehtml +='<td>'+pn+'</td>'
-			}else{
-				tablehtml +='<td>'+title+'</td>'
-			}
 			//
 			var area = list[i].area;
 			if(!area){
@@ -288,52 +221,7 @@ if(firstPage != null && firstPage.length == 1){
 			if(list[i].industry){
 				industry='<span class="industry">'+list[i].industry+'</span>'
 			}
-			tablehtml +='<td>'+datatype+'公告</td>'
-			
-			if(typeof(list[i].budget) != "undefined" && list[i].budget != null && list[i].budget != ""){
-				var budgetone =parseInt(list[i].budget)/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(list[i].buyer!=undefined&&list[i].buyer!=""){
-				tablehtml += '<td>'+list[i].buyer+'</td>'
-			}else{
-				tablehtml += '<td></td>'
-			}
-			if(typeof(list[i].bidopentime) != "undefined" && list[i].bidopentime != null && list[i].bidopentime != ""){
-				var diff = formatDate(Number(list[i].bidopentime),"l");
-				tablehtml += '<td><div>'+diff+'</div></td>';
-			}else{
-				tablehtml += '<td><div></div></td>';
-			}
-			if(typeof(list[i].winner) != "undefined" && list[i].winner != null && list[i].winner != ""){
-				tablehtml += '<td class="tt-l"><div>'+list[i].winner+'</div></td>';
-			}else{
-				tablehtml += '<td class="tt-l"><div></div></td>';
-			}
-			if(typeof(list[i].bidamount) != "undefined" && list[i].bidamount != null && list[i].bidamount != ""){
-				var bidamountone = parseInt(list[i].bidamount)/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>';
-			}
 			var tabletime = formatDate(list[i].publishtime);
-			tablehtml +='<td>'+tabletime+'</td></tr>'
 			//					
 	    	html += '<div class="tslist">'
 						+'<div class="resnumb">'
@@ -351,7 +239,7 @@ if(firstPage != null && firstPage.length == 1){
 						+'<div style="clear:both;"></div>'
 					+'</div>';
 	    }
-		return [html,tablehtml];							                    					                    
+		return [html];							                    					                    
 	}
 	
 	//
@@ -388,17 +276,12 @@ if(firstPage != null && firstPage.length == 1){
 		var htmlObj = $(html[0]);
 		//缓存数据
 		listCache += html[0];
-		var tableObj = $(html[1]);
-		//缓存数据
-		tableCache += html[1];
 		htmlObj.on("click", function(event){
 			var h = $(this).find("a.bt").attr("s");
 			var eid = $(this).find("a.bt").attr("eid");
 			beforeJump(eid,h);
 		});
 	    $('#list').append(htmlObj);
-		//
-		$("#mytable").append(tableObj);
 	}
 	function noMoreData(me){
 		if(me == null){
@@ -413,9 +296,6 @@ if(firstPage != null && firstPage.length == 1){
 	    me.resetload();
 	}
 	function tablejump(eid,h){
-		if(localStorage){
-			localStorage.setItem("listortable"+{{.T._id}},"T");
-		}
 		beforeJump(eid,h);
 	}
 	function beforeJump(eid,h){
@@ -423,7 +303,6 @@ if(firstPage != null && firstPage.length == 1){
 			sessionStorage.resultpreviewScrollTop = scrollTop;
 			sessionStorage.resultpreviewPageNumCache = pageNum;
 			sessionStorage.resultpreviewListCache = listCache;
-			sessionStorage.resultpreviewTableCache = tableCache;
 			sessionStorage.resultpreviewNoMoreCache = noMore;
 		}
 		newredirect(zbadd,h,eid,sds);
@@ -453,39 +332,6 @@ a{
 .listcontent{
 	padding:0px 10px;
 }
-.showType{
-	margin-top: 8px;
-    padding-right: 15px;
-	display: flex;
-	justify-content: space-around;
-	align-content: center;
-	float:right;
-}
-.showType div{
-	padding-left: 30px;
-}
-.showType .showlist{
-	background: url(/images/search/showList.png)10px 3px no-repeat;
-	background-size: 30%;
-    margin-right: 15px;
-	line-height: 21px;
-}
-.showType .showtable{
-	background: url(/images/search/showTable.png)10px 2px no-repeat;
-	background-size: 30%;
-    margin-left: 15px;
-	line-height: 21px;
-}
-.showType .showlist.on{
-	background: url(/images/search/showList_on.png)10px 3px no-repeat;
-	background-size: 30%;
-	color: #2cb7ca;
-}
-.showType .showtable.on{
-	background: url(/images/search/showTable_on.png)10px 2px no-repeat;
-	background-size: 30%;
-	color: #2cb7ca;
-}
 .shuxian{
 	padding: 0px !important;
     margin-right: -10px;
@@ -574,40 +420,12 @@ a{
 </style>
 </head>
 <body>
-<div>根据您设置的关键词：<font class="keyword"></font>，为您预览30天之内的信息，点击标题可查看详细信息。</div>
-<div class="showType">
-	<div class="showlist on">列表</div>
-	<div class="shuxian">|</div>
-	<div class="showtable">表格</div>
-</div>
-<div style="height:37px;border-bottom:1px solid #ddd;border-top: 1px solid #ddd;"></div>
+<div class="tipHeader">根据您设置的关键词：<font class="keyword"></font>，为您预览30天之内的信息，点击标题可查看详细信息。</div>
 <div class="listcontent">
 	<div id="list"></div>
-	<div class="tablecontent hidden">
-		<section id="jytables">
-			<table>
-				<thead> 
-					<tr>
-						<td>序号</td>
-						<td>项目名称</td>
-						<td>公告类型</td>
-						<td>预算<br>（万元）</td>
-						<td>招标单位</td>
-						<td>开标日期</td>
-						<td>中标单位</td>
-						<td>中标金额<br>（万元）</td>
-						<td>发布日期</td>
-					</tr>
-				</thead>
-				<tbody id="mytable">	
-				</tbody>
-			</table>
-		</section>
-		<div class="prompt">提示：为了获得更佳的体验，推荐<span class="blue" onclick="window.location.href='/wxkeyset/keyset/seniorset'">打开邮件推送</span>，用电脑查看邮件中的表格。</div>
-	</div>
 </div>
 
-<span class="text-center findnull">
+<span class="text-center findnull" style="margin-top: 5rem;">
 	<div>
 		<img style="width:150px;margin:50px 0 50px 0;" src="{{Msg "seo" "cdn"}}/images/wx/jysorry_1.png">
 	</div>

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

@@ -37,18 +37,14 @@
 </script>
 	<style>
 		#searchIndex .content li:nth-of-type(1) a {
-			background: url("{{Msg "seo" "cdn"}}/applysub/img/search.png") 0.3rem 0.32rem no-repeat;
-			background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
-		}
-		#searchIndex .content li:nth-of-type(2) a {
 			background: url("{{Msg "seo" "cdn"}}/applysub/img/enterprise.png") 0.3rem 0.32rem no-repeat;
 			background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
 		}
-		#searchIndex .content li:nth-of-type(3) a {
+		#searchIndex .content li:nth-of-type(2) a {
 			background: url("{{Msg "seo" "cdn"}}/applysub/img/app.png") 0.3rem 0.32rem no-repeat;
 			background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
 		}
-		#searchIndex .content li:nth-of-type(4) a {
+		#searchIndex .content li:nth-of-type(3) a {
 			background: url("{{Msg "seo" "cdn"}}/images/pullnew.png") 0.3rem 0.32rem no-repeat;
 			background-size: 0.57rem 0.57rem,1.39rem 1.39rem;
 		}
@@ -75,12 +71,6 @@
 
 	<section class="content">
 		<ul>
-			<li>
-				<a>
-					<div>超级搜索</div>
-					<div>按行业、金额搜索，结果可按表格显示</div>
-				</a>
-			</li>
 			<li>
 				<a>
 					<div>中标企业搜索</div>
@@ -636,8 +626,6 @@
 	}
 
 	//
-	var open_supersearch=false;
-	var open_entsesearch=false;
 	var onceFlag_tablepro=false;
 	var onceFlag_popstate = false;
 	var onceFlag_pageshow = false;
@@ -740,12 +728,11 @@
 			event.stopPropagation();
 	    });
 		//APP下载跳转到关于剑鱼标讯
-	    $(".content ul li a:eq(2)").on('click', function () {
+	    $(".content ul li a:eq(1)").on('click', function () {
 			// window.location.href='https://www.jianyu360.com/jyapp/free/download/normal?source=weixinAutoRpl';
 			window.location.href='/swordfish/about?flag=1&come=1';
 	    });
-		//APP下载跳转到关于剑鱼标讯
-	    $(".content ul li a:eq(3)").on('click', function () {
+	    $(".content ul li a:eq(2)").on('click', function () {
 			window.location.href='https://mp.weixin.qq.com/s/ACvQRxKeLYl_DuPuvvqIXQ';
 	    });
 		//var pageType = getUrlParam("v");
@@ -757,30 +744,15 @@
 	//});
 	function checkIsOpen(){
 		$(".content ul li a:eq(0)").unbind("tap");
-		$(".content ul li a:eq(1)").unbind("tap");
 		//查询是否开通超级搜索和中标企业搜索
 	    $.post("/jylab/supsearch/getstatus?t="+new Date().getTime(),function(result){
-			open_supersearch=result.supstatus;
-	        open_entsesearch=result.entstatus;
 			onceFlag_tablepro=result.tablepro;
-			//超级搜索跳转
-		    $(".content ul li a:eq(0)").on("tap",function(){
-				if(open_supersearch){
-					SuperSearch.init(true,true,true);
-		        }else{
-		            window.location.href='/jylab/laboratory/cjss?v=superSearch_back';
-		        }
-		    });
 			//中标企业搜索跳转
-		    $(".content ul li a:eq(1)").on("tap",function(){
-		        if(open_entsesearch){
-					EntSearch.clearSessionStorage();
-					EntSearch.init(true,true,true);
-		        }else{
-		            window.location.href='/jylab/laboratory/zbqy?v=entSearch_back';
-		        }
-		    });
-	    });
+		    $(".content ul li a:eq(0)").on("tap",function(){
+				EntSearch.clearSessionStorage();
+				EntSearch.init(true,true,true);
+		    });	  
+    	});
 	}
 	function backThisPage(){
 		initFlag = 0;

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

@@ -1,1095 +0,0 @@
-<html>
-<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">
-	<link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">
-	<link href="{{Msg "seo" "cdn"}}/css/search/superSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-	<link href="{{Msg "seo" "cdn"}}/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-	<link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-	{{include "/common/inc.html"}}
-	{{include "/common/weixin.html"}}
-	<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
-	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/wxswordfish/superSearch.js?v={{Msg "seo" "version"}}"></script>
-	<script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/wxswordfish/jquery.resize.js"></script>
-	<style>
-	.adv-wxsearch-center{
-		width:100%;
-		margin:auto;
-		border:1px solid #ccc;
-		min-height:45px;
-		text-align:center;
-	}
-	</style>
-	<script>
-        var s_words = {{.T.searchvalue}};
-        var pageSize = {{.T.pageSize}};
-        var myHistory={{.T.history}};
-        var msgset={{.T.msgset}};
-        var open_supersearch=false;
-        var scrollDownObj=null;   //翻页对象
-		var dyDiv=true;     //显示订阅剑鱼标讯信息
-		var firstPage=true;
-        initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-        var s_openid = {{.T.openid}};
-        var subtype_proposed = "拟建";
-        //提交参数
-        var reqParam = {
-            "searchvalue": "",
-            "subtype": "",
-            "scope": "",
-            "publishtime": "",
-            "selectType": "",
-            "minprice":"",
-			"maxprice":"",
-            "industry":"",
-            "pageNum": 1
-        };
-        $(function(){
-            //loadTipMsg加载历史记录和我的订阅
-            loadTipMsg(myHistory,msgset);
-            //localsession存储标题/全文搜索 和 列表/表格展示
-            if(localStorage){
-                if(localStorage.selectType=="allSearch"){
-                    $("#search_all").addClass("on").siblings().removeClass("on");
-                  //  beforeSubmit();
-                }else if(localStorage.selectType=="titleSearch"){
-                    $("#search_title").addClass("on").siblings().removeClass("on");
-                  //  beforeSubmit();
-                }
-
-                if(localStorage.showType=="showList"){
-                    $(".showlist").addClass("on").siblings().removeClass("on");
-                    $("#wrapper #table").addClass("hidden");
-                    $("#wrapper #list").removeClass("hidden");
-                }else if(localStorage.showType=="showTable"){
-                    $(".showtable").addClass("on").siblings().removeClass("on");
-                    $("#wrapper #table").removeClass("hidden");
-                    $("#wrapper #list").addClass("hidden");
-                }
-            }
-            //筛选菜单展示or隐藏
-            $(".wxhead").find(".screen").click(function(){	
-                $(".wxsearch").toggleClass("hidden");
-                $("#selLable").toggleClass("hidden");
-                if($("#list").text()==""){
-					if(s_words!=""){
-						$(".nullcontent").toggleClass("hidden");	
-					}
-                }else{
-                    $("#wrapper").toggleClass("hidden");
-                }
-            });
-            /**********************分页请求start****************************/
-			//铺数据 1.首次跳转传过来的数据  2.页面搜索数据 3.下拉查询数据
-            //下拉更新
-            setTimeout(function(){
-                $('#wrapper').dropload({
-                    scrollArea : window.top.isIOS?window.top:window,
-                    loadDownFn : function(me){
-                        scrollDownObj=me;
-						if(firstPage){
-                            firstPage=false;
-                            //hasNoData();
-                            if($("input[name=searchvalue]").val()==""){    //从主页面跳转过来
-                                $(".nullcontent").addClass("hidden");
-                                $("input[name=searchvalue]").focus();
-                                $("#wrapper").addClass("hidden");
-                                getIndustry();
-                            }else{              //后退至本页面
-								if(sessionStorage){
-                                    setUpLastPage();  //恢复筛选和页面记录值
-								}
-                                $(".selLable").css("display","");
-							}
-						}
-                        //---------------------------非第一次  下拉翻页请求
-                        beforeSubmit();
-                        if( reqParam.searchvalue.trim()==""){
-                            return
-                        }
-                        reqParam["pageNum"] ++;        //翻页请求
-                        $.ajax({
-                            type: 'post',
-                            url: '/swordfish/searchlist/paging',
-                            data: reqParam,
-                            dataType: 'json',
-                            success: function(data){
-                                //没有数据
-                                if(data["list"] == null || data["list"].length == 0){
-                                    noMoreData(me);
-                                    return;
-                                }
-                                var html = getHtml(data["list"],reqParam["pageNum"]);
-                                // 每次数据插入，必须重置
-                                appendListHtml(html);
-                                //没有下一页了
-                                if(!data.hasNextPage){
-                                    // 锁定
-                                    me.lock();
-                                    // 无数据
-                                    me.noData();
-                                }
-                                me.resetload();
-                            },
-                            error: function(xhr, type){
-                                noMoreData(me);
-                            }
-                        });
-                    }
-                });
-            },0);
-
-            /**********************分页请求end****************************/
-
-            canSearch();
-            $("input[name=searchvalue]").on("input",function(){canSearch();});
-			/*
-            	.on("click",function(){
-				    if($.trim($("input[name=searchvalue]").val()).length>0){
-				        $(".clearInpt").removeClass("hidden");
-                		$(".query").removeClass("hidden");
-				    }
-				});//监听输入框是否为空
-			*/
-
-            //是否显示提示搜索框
-			$("input[name=searchvalue]").focus(function(){
-			    setTimeout(function(){$(".inputDiv").removeClass("hidden")});
-                if($.trim($("input[name=searchvalue]").val()).length>0){
-                    $(".clearInpt").removeClass("hidden");
-                    $(".query").removeClass("hidden");
-                }
-			});
-            $("input[name=searchvalue]").blur(function(){ setTimeout(function(){$(".inputDiv").addClass("hidden")},0);});
-			$(".inputDiv").css("width",($(window).width()-30)*0.85);    //调整宽度
-
-            //清除输入框功能
-            $(".searchform .clearInpt").click(function(){$("input[name=searchvalue]").val("");$("input[name=searchvalue]").focus();canSearch();});
-            //提交查询
-            $(".searchform .query").click(function(){beforeSubmit();toquery();})
-            $(".jyshxbottom .jydqsure").click(function(){
-                if($(this).hasClass("on")){
-                    beforeSubmit();
-                    toquery();
-                }
-            });
-			//清除筛选
-			$(".jyshxbottom .jydqreset").click(function(){resetSx()	});
-			//是否开通超级搜索服务
-            flush_isOpenSupersearch();
-			//关闭搜索后订阅================================================================
-			$(".dy_close").on("click",function(){
-                $(".resbm").addClass("hidden");
-                dyDiv=false;
-			});
-
-			if(dyDiv&&firstPage){   //首次进来是否显示订阅
-                $(".resbm").removeClass("hidden");
-			}
-			//订阅
-            $("#zjdy").click(function(){
-                var rFlag = false;
-                $.ajax({
-                    type: "post",
-                    url: "/member/swordfish/ajaxReq",
-                    data: {keys:$("[name='searchvalue']").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){
-                    setSessionStorage();
-                    window.open("/wxkeyset/keyset/index");
-				}
-            });
-			//订阅结束==========================================================================
-            //删除历史搜索
-            $("#del_history").click(function(){
-                if($(".inputDiv .history").find("li").length >0){
-                    $.ajax({
-                        type:"post",
-                        url:"/swordfish/delWxHistorySearch",
-                        success:function(rt){
-							$(".inputDiv .history").find("li").remove();
-							$(".inputDiv .inpTitle_history").addClass("hidden");
-                            $(".inputDiv .inpTitle_msgset").css("border-top-right-radius","5px").css("border-top-left-radius","5px");
-                        }
-                    });
-                }
-            })
-        });
-        //js 方法
-		function resetSx(){         //清除筛选
-            $(".dialog-content.contentthree ul li:eq(0) button").trigger("click");//清除行业
-            $(".money-dialog ul li:eq(0) .btn").trigger("click");//清除金额
-            $(".jypt-dialog .jypt-pt .btn:eq(0)").trigger("click");//清除时间
-            $(".jydq-dialog .btn:eq(0)").trigger("click");  //清除地区
-            $(".jytype-dialog .btn:eq(0)").trigger("click"); //清除类别
-		}
-        function canSearch(){  //判断是否显示搜索按钮
-            var len=$.trim($(".searchvalue").val()).length;
-            if(len>0){
-                $(".clearInpt").removeClass("hidden");
-                $(".query").removeClass("hidden");
-                $(".jydqsure").addClass("on");
-            }else{
-                $(".clearInpt").addClass("hidden");
-                $(".query").addClass("hidden");
-                $(".jydqsure").removeClass("on");
-            }
-        }
-        function beforeSubmit(){   //提交前，更新筛选内容至提交对象
-            s_words=$.trim($("#searchform [name='searchvalue']").val());
-            reqParam.searchvalue=$.trim($("#searchform [name='searchvalue']").val());
-            //信息范围
-			var scope = [];
-			$(".contentone .btn.active").each(function(){
-				var thisText = $(this).text();
-				if(thisText == "全国"){
-					scope.push("");
-					return false;
-				}else{
-					scope.push(thisText);
-				}
-			});
-            reqParam.scope=scope.join(",");
-
-            //行业类型
-            var industrySelect="";
-           if($(".contentthree .active").hasClass("btn")){
-               if($(".contentthree .active").text()=="全部"){
-                   industrySelect="";
-			   }else{
-                   industrySelect= $(".contentthree .active").attr("data-value");
-			   }
-
-		   }else{
-               $(".contentthree .active").parent("li").find(".btn").each(function(){
-				//console.log($(this).attr("data-value"))
-                   industrySelect+= $(this).attr("data-value")+",";
-			   });
-               industrySelect=industrySelect.substring(0,industrySelect.length-1);
-		   }
-		   reqParam.industry=industrySelect;
-
-            //信息类型
-            var selectToptypes = "";
-            $(".contenttwo #dqbtn.active").each(function(){
-                var thisText = $(this).attr("data-value");
-                if(selectToptypes != ""){
-                    selectToptypes += ",";
-                }
-                selectToptypes += thisText;
-            });
-
-            var selectSubTypes = "";
-            $(".contenttwo  .btn.active").each(function(){
-                if($(this).parent().index() == 0){
-                    return true;
-                }
-                var thisText = $(this).text();
-                if(selectSubTypes != ""){
-                    selectSubTypes += ",";
-                }
-                selectSubTypes += thisText;
-            });
-            reqParam.subtype=selectSubTypes;
-
-            //金额
-            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.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();
-
-            //全文or标题
-			if($("#search_title").hasClass("on")){
-                reqParam.selectType="title";
-			}else{
-                reqParam.selectType="all";
-			}
-            behaviorCollect(1);
-            return true;
-        }
-
-        //行为采集 type=1 搜索、type=2 显示列表次数统计
-        function behaviorCollect(type) {
-            if (s_openid && reqParam.searchvalue) {
-                var model = "lab_search";
-                var s_url = "/jylab/superSearch/";
-                var s_model = "搜索";
-
-                var s_industry = "";//行业-单选
-				var s_key = "";//关键词
-                var i_amount = 0;//中标金额 1-含 0-不含
-                var i_area = 0;//地区
-                var i_industry = 0;//行业
-                var i_infotable = 0;//显示列表
-                var i_infotype = 0;//信息类型
-                var i_time = 0;//发布时间
-				if(type==1){
-                    $(".contentthree .btn.active").each(function(){
-                        var thisText = $(this).text();
-                        if(thisText != "全部"){
-                            if($(this).attr("data-value")){
-                                s_industry = $(this).attr("data-value").split("_")[0];
-                            }else{
-                                s_industry = thisText;
-                            }
-                        }
-                    });
-                    s_key = reqParam.searchvalue;
-                    if(reqParam.minprice || reqParam.maxprice){
-                        i_amount = 1;
-                    }
-                    if(reqParam.scope!=[]){
-                        i_area = 1;
-                    }
-                    if(s_industry){
-                        i_industry = 1;
-                    }
-                    if(reqParam.subtype){
-                        i_infotype = 1;
-                    }
-                    if(reqParam.publishtime){
-                        i_time = 1;
-                    }
-				}else{
-                    i_infotable = 1;
-				}
-
-                var encode= {{ConEncode "/jylab/superSearch/"}};
-                var content = '{"encode":"' + encode + '","model":"' + model + '","s_url":"' + s_url + '","s_model":"' + s_model + '","s_openid":"' + s_openid + '","s_industry":"' + s_industry + '","s_key":"'+s_key+'","i_amount":'+i_amount+',"i_area":'+i_area+',"i_industry":'+i_industry+',"i_infotable":'+i_infotable+',"i_infotype":'+i_infotype+',"i_time":'+i_time+'}';
-
-//                $.ajax({
-//                    url: "http://192.168.3.14:1711/accesslog/byajax",
-//                    dataType: 'jsonp',
-//                    data: {json: content},
-//                    jsonp: 'callback'
-//                });
-
-				$.post('/accesslog/byajax',{json:content},function(r){
-				});
-            }
-        }
-
-        function show() {   //筛选页面和内容展示替换显示
-            if(!$(".wxsearch").hasClass("hidden")){
-                $(".selLable").removeClass("hidden");
-                $(".wxsearch").addClass("hidden");
-            }
-            if ($("#list").text() == "") {
-                $("#wrapper").addClass("hidden");
-                $(".nullcontent").removeClass("hidden");
-            } else {
-                //判断显示信息方式  列表or表格
-                $("#wrapper").removeClass("hidden");
-                if($(".showType .showlist").hasClass("on")){
-                    $("#list").removeClass("hidden");
-                    $("#table").addClass("hidden");
-                }else{
-                    $("#list").addClass("hidden");
-                    $("#table").removeClass("hidden");
-                }
-            }
-        }
-
-        function toquery(){    //提交表单，获取数据
-			if(reqParam.searchvalue.trim()=="") return;
-            $(".clearInpt").addClass("hidden");
-            $(".query").addClass("hidden");
-			reqParam.pageNum=1;
-            $.post("/swordfish/searchlist/paging",reqParam,function(data){
-                //历史记录和我的订阅
-                loadTipMsg(data["history"],data["msgset"]);
-                //查询后显示 展示方式
-                $(".selLable").css("display","");
-				//铺查询信息
-                if(data["list"] == null || data["list"].length == 0){
-                    noMoreData(scrollDownObj);
-                    $("#list").text("");
-                    hasNoData();
-					show();
-                    return
-				}else{
-                    hasData();
-                    replayListHtml(getHtml(data["list"],1));
-					show();
-				}
-                if(!data.hasNextPage){
-                    scrollDownObj.lock();
-                    scrollDownObj.noData(true);
-                }else{
-                    scrollDownObj.unlock();
-                    scrollDownObj.noData(false);
-				}
-                scrollDownObj.resetload();
-            });
-        }
-
-        function getHtml(list,pageNum){//生成list表单 或 table表单
-            var html ={};
-            var ListHtml='';
-            var TableHtml='';
-            for(var i=0;i<list.length;i++){
-				if(i==7){
-					ListHtml+='<div class="adv-wxsearch-center" id="E1">E1</div>'
-				}
-                var index = (pageNum-1)*pageSize+i+1;
-                var thisStyle = " style='padding-left: 15px;'";
-                if(index >= 10 && index < 100){
-                    thisStyle = " style='padding-left: 26px;'";
-                }else if(index >= 100 && index < 1000){
-                    thisStyle = " style='padding-left: 35px;'";
-                }else if(index >= 1000){
-                    thisStyle = " style='padding-left: 45px;'";
-                }
-                var href = list[i].href;
-                if(!href ||　href.indexOf("java") > -1){
-                    href = "";
-                }
-                var title = list[i].title;
-                //关键词高亮
-                var detail = "";
-                var highlight = list[i].highlight;
-                if(highlight){
-                    var details = highlight.detail;
-                    if(details && details.length > 0){
-                        detail = details[0];
-                    }
-                }
-                if(s_words != ""){
-                    var wordsArray = s_words.split("+");
-                    title = keyWordHighlight(title,wordsArray,'<font class="keyword">$1</font>');
-                    if(detail != ""){
-                        try{
-                            $("#tempDiv").html(detail);
-                            detail = $("#tempDiv").text().replace(/</g,"&lt;").replace(/>/g,"&gt;");
-                        }catch(e){
-                            detail = detail.replace(/</g,"&lt;").replace(/>/g,"&gt;");
-                        }
-                        detail = keyWordHighlight(detail,wordsArray,'<font class="keyword">$1</font>');
-                    }
-                }
-                if(detail != ""){
-                    detail = "<div class='detail'"+thisStyle+">"+detail+"...</div>";
-                }
-                //
-                var area = list[i].area;
-                if(!area){
-                    area = "";
-                }else{
-                    area = $.trim(area);
-                    area = area=="A"?"全国":area;
-                }
-                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].title: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());
-                    fullTime=thisTime.getFullYear()+"<br>"+month+date;
-                    tdf = timeDiff(new Date(Number(tdf+"000")));
-                    if(tdf != null){
-                        tdf='<span><i class="glyphicon bofangjilu" style="color:#7a7a7a;margin-right:2px;"></i>'+tdf+'</span>'
-                    }
-                }else{
-                    tdf = '';
-                }
-
-                var datatype = "";
-                if(list[i].subtype){
-                    datatype='<span class="type">'+list[i].subtype+'</span>'
-                }else if(list[i].toptype){
-                    datatype='<span class="type">'+list[i].toptype+'</span>'
-                }else if(list[i].type){
-                    if(list[i].type == "tender"){
-                        datatype='<span class="type">招标</span>'
-                    }else if(list[i].type == "bid"){
-                        datatype='<span class="type">中标</span>'
-                    }
-                }
-				//招标单位
-                var buyer=list[i].buyer==null?"":list[i].buyer;
-				//预算
-				var budget=list[i].budget==null?"":((list[i].budget)/10000+"").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);
-				if(i==6){
-					ListHtml += '<div class="tslist" style="border:0px;">'
-				}else{
-					ListHtml += '<div class="tslist">'
-				}
-                ListHtml += '<div class="resnumb">'
-                    +'<div class="one">'
-                    +'<span class="xh">'+index+'.</span>'
-                    +'</div>'
-                    +'<div class="two bt-parent"'+thisStyle+'>'
-                    +'<a class="bt" sid="'+list[i]._id+'" s="'+href+'" href="javascript:void(0);">'+title+'</a>'
-                    +'</div>'
-                    +'</div>'
-                    +'<div style="clear:both;"></div>'
-                    +'<div class="restime time-diff">'
-                    +area+datatype+industry+tdf
-                    +'</div>'
-                    +'<div style="clear:both;"></div>'
-                    +detail
-                    +'</div>';
-                //拟建项目
-                if(subtype_proposed==reqParam.subtype){
-                    var projectinfo = list[i].projectinfo;
-                    if(projectinfo){
-                        var approvecode = "";
-                        if(projectinfo.approvecode){
-                            approvecode = projectinfo.approvecode;
-						}
-                        var approvecontent = "";
-                        if(projectinfo.approvecontent){
-                            approvecontent = projectinfo.approvecontent;
-						}
-                        var approvestatus = "";
-                        if(projectinfo.approvestatus){
-                            approvestatus = projectinfo.approvestatus;
-						}
-                        var approvetime = "";
-                        var diff = "";
-                        if(projectinfo.approvetime){
-                            approvetime = projectinfo.approvetime.substring(0,16);
-                            diff = timeDiff(new Date(Number(projectinfo.approvetime+"000")));
-						}
-                        TableHtml +='<tr s="'+href+'"  sid="'+list[i]._id+'">'+
-                            '<td><div>'+index+'</div></td>'+
-                            '<td><div style="width: 100px;text-align: center;">'+approvecode+'</div></td>'+
-                            '<td><div style="width: 207px;text-align: left;">'+projectname+'</div></td>'+
-                            '<td><div style="width: 200px;text-align: left;">'+approvecontent+'</div></td>'+
-                            '<td><div style="width: 75px;text-align: left;">'+approvestatus+'</div></td>'+
-                            '<td><div style="width: 75px;text-align: center;">'+approvetime+'</div></td>'+
-                            '<td><div style="width: 75px;text-align: center;">'+diff+'</div></td>'+
-                            '</tr>';
-					}
-                }else{
-                    TableHtml +='<tr s="'+href+'"  sid="'+list[i]._id+'">'+
-                        '<td><div>'+index+'</div></td>'+
-                        '<td><div>'+projectname+'</div></td>'+
-                        '<td><div>'+(datatype==""?"":datatype+"公告")+'</div></td>'+
-                        '<td><div>'+budget+'</div></td>'+
-                        '<td><div>'+buyer+'</div></td>'+
-                        '<td><div>'+bidopentime+'</div></td>'+
-                        '<td><div>'+winner+'</div></td>'+
-                        '<td><div>'+bidamount+'</div></td>'+
-                        '<td><div>'+fullTime+'</div></td>'+
-                        '</tr>';
-				}
-            }
-			
-			if(list.length<8){
-				ListHtml+='<div class="adv-wxsearch-center" id="E1">E1</div>'
-			}
-            html["ListHtml"]=ListHtml;
-            html["TableHtml"]=TableHtml;
-            return html;
-        }
-
-        function hasNoData(){ //搜索信息为空
-            $(".nullcontent").removeClass("hidden");
-            $("#wrapper").addClass("hidden");
-        }
-        function hasData(){ //搜索信息不为空
-            $(".nullcontent").addClass("hidden");
-            $("#wrapper").removeClass("hidden");
-            if(dyDiv){
-                $(".resbm").removeClass("hidden");
-			}
-        }
-        function appendListHtml(html){  //下拉时展示信息
-            // 插入数据到页面，放到最后面
-            var ListHtmlObj = $(html.ListHtml);
-            ListHtmlObj.on("click", function(event){
-                var h = $(this).find("a.bt").attr("s");
-                var sid = $(this).find("a.bt").attr("sid");
-                var sds = s_words.replace(/\+/g,"+");
-                myredirect(h,sid,sds);
-            });
-            $('#list').append(ListHtmlObj);
-
-            var TableHtmlobj=$(html.TableHtml);
-            TableHtmlobj.on("click",function(event){
-                var h = $(this).attr("s");
-                var sid = $(this).attr("sid");
-                var sds = s_words.replace(/\+/g,"+");
-                myredirect(h,sid,sds);
-            });
-            $("#table .content").append(TableHtmlobj);
-
-            if(!window.top.isBackIndex){
-                if($(".jysstj").hasClass("hidden")){
-                    window.top.$(".resbm").removeClass("hidden");
-                }
-            }
-        }
-        function replayListHtml(html){ //搜索时替换信息
-            // 替换
-            var ListHtmlObj = $(html.ListHtml);
-            ListHtmlObj.on("click", function(event){
-                var h = $(this).find("a.bt").attr("s");
-                var sid = $(this).find("a.bt").attr("sid");
-                var sds = s_words.replace(/\+/g,"+");
-                myredirect(h,sid,sds);
-            });
-            $('#list').html(ListHtmlObj);
-
-            var TableHtmlobj=$(html.TableHtml);
-            TableHtmlobj.on("click",function(event){
-                var h =  $(this).attr("s");
-                var sid = $(this).attr("sid");
-                var sds = s_words.replace(/\+/g,"+");
-                myredirect(h,sid,sds);
-            });
-           	if(subtype_proposed==reqParam.subtype){
-                $("#table .content").html("<tr><td><div>序号</div></td><td><div style='width: 100px;'>项目代码</div></td><td><div style='width: 207px;'>项目名称</div></td><td><div style='width: 200px;'>审批事项</div></td><td><div style='width: 75px;'>审批结果</div></td><td><div style='width: 75px;'>审批时间</div></td><td><div style='width: 75px;'>发布时间</div></td></tr>");
-			}else{
-           	    $("#table .content").html("<tr><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>中标单位</div></td><td>中标金额<br>（万元）</td><td><div>发布时间</div></td></tr>");
-            }
-            $("#table .content").append(TableHtmlobj);
-
-           /* if(!window.top.isBackIndex){
-                if($(".jysstj").hasClass("hidden")){
-                    window.top.$(".resbm").removeClass("hidden");
-                }
-            }*/
-        }
-        function myredirect(link,sid,sds){  //跳转三级页
-			//保存当前页面至sessionStorage
-			setSessionStorage();
-			//跳转
-            link = link.replace(/\n/g,"");
-            if(link!=""&&!/^http/.test(link)){
-                link="http://"+link
-            }
-            if(sds){
-				if(reqParam.industry!=""){
-                	window.open("{{Msg "seo" "ZBADDRESS"}}/article/content/"+sid+".html?keywords="+encodeURIComponent(sds)+"?industry="+reqParam.industry);
-				}else{
-					window.open("{{Msg "seo" "ZBADDRESS"}}/article/content/"+sid+".html?keywords="+encodeURIComponent(sds));
-				}
-            }else{
-				if(reqParam.industry!=""){
-                	window.open("{{Msg "seo" "ZBADDRESS"}}/article/content/"+sid+".html?industry="+reqParam.industry);
-            	}else{
-					window.open("{{Msg "seo" "ZBADDRESS"}}/article/content/"+sid+".html");
-				}
-			}
-        }
-        function noMoreData(me){
-            // 锁定
-            me.lock();
-            // 无数据
-            me.noData();
-            me.resetload();
-        }
-       	function loadTipMsg(myhistory,msgset){
-		//历史信息
-            if(myhistory!=null){
-				if(myhistory.length==0){
-					$(".inputDiv .inpTitle_history").addClass("hidden");
-                    $(".inputDiv .inpTitle_msgset").css("border-top-right-radius","5px").css("border-top-left-radius","5px");
-				}else{
-					$(".inputDiv .inpTitle_history").removeClass("hidden");
-					 historyHtml ="";
-	                for(var i=0;i<myhistory.length;i++){
-	                    historyHtml+="<li>"+myhistory[i].trim()+"</li>"
-	                }
-	                $(".inputDiv .history").html(historyHtml);
-                    $(".inputDiv .inpTitle_history").css("border-top-right-radius","5px").css("border-top-left-radius","5px");
-				}
-            }
-            //订阅信息
-            if(msgset!=null){
-				$(".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.trim()+"</li>";
-				}
-				$(".inputDiv .myMsgset").html(msgsetHtml);
-            }else{
-                $(".inputDiv .inpTitle_msgset").addClass("hidden");
-            }
-            var len=$(".inputDiv ul li").length;
-            $(".inputDiv ul li:eq("+(len-1)+")").css("border-bottom-right-radius","5px").css("border-bottom-left-radius","5px");
-		//点击提示框内容 进行搜索
-            $(".inputDiv li").click(function () {
-                $("input[name=searchvalue]").val($(this).text());
-                canSearch();
-                resetSx();                //重置筛选
-                beforeSubmit();				//填充数据
-                toquery();				 //查询
-            })
-		}
-        function flush_isOpenSupersearch() {
-            $.post("/jylab/supsearch/getstatus",function(result){
-                open_supersearch=result.supstatus;
-                if(!open_supersearch){
-					$(".money-inp input").attr("readonly","readonly");
-					if(localStorage){
-                        if(localStorage.showType=="showTable"){
-                            localStorage.showType="showlist"
-                        }
-					}
-				}else{
-                    $(".money-inp input").removeAttr("readonly");
-				}
-
-			});
-        }
-        function toOpenSupersearch(){setSessionStorage();window.location.href="/jylab/laboratory/cjss"}
-        function loseblur() {
-			$("input[name=searchvalue]").blur();
-        }
-	</script>
-</head>
-<body>
-<div style="background-color:#fff;" id="mainDiv">
-	<div class="wxhead">
-		<form class="searchform" id="searchform" onsubmit="loseblur();beforeSubmit();toquery();return false;" action="">
-			<input class="form-control searchvalue slistbkc" style="padding: 8px 71px 8px 12px;" name="searchvalue" maxlength ="50"  placeholder="示例：税务局 软件"/>
-			<div class="inputDiv hidden">
-				<div class="inpTitle_history"><img src="{{Msg "seo" "cdn"}}/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_msgset"><img src="{{Msg "seo" "cdn"}}/images/search/msgset.png"><span>我订阅的关键词</span></div>
-					<div>
-						<ul class="myMsgset">
-						</ul>
-					</div>
-
-				</div>
-
-			<span class="query hidden"><img src="{{Msg "seo" "cdn"}}/images/wx/jywxjs.png"></span>
-			<span class="clearInpt hidden"><img src="{{Msg "seo" "cdn"}}/images/wx/jyqingchu.png"></span>
-			<span class="screen text-center" >筛选</span>
-		</form>
-	</div>
-	<div>
-		<div class="selLable" id="selLable" style="display: none">
-			<div class="com-title"><!--height:30px; margin-top:20px;-->
-				<span onclick="allSearch()" id="search_all" class="on" >全文搜索</span><span id="search_title" onclick="titleSearch()">标题搜索</span>
-			</div>
-			<div class="line-vertical">
-			</div>
-			<div class="showType">
-				<div class="showlist on" onclick="showlist();">列表</div>
-				<div class="showtable" onclick="showTable()">表格</div>
-			</div>
-		</div>
-		<div class="wxsearch hidden">
-			<div class="jysstj">
-				<div class="jyshaxuan">
-					<div class="shaixIndustry shaixcl">行业</div>
-					<div class="shaixMoney">金额</div>
-					<div class="shaixpt">发布日期</div>
-					<div class="shaixone">项目地区</div>
-					<div class="shaixtwo">信息类型</div>
-				</div>
-				<div class="industry-dialog">
-					<div class="dialog-content contentthree">
-
-					</div>
-				</div>
-				<!-->金额<-->
-				<div class="money-dialog hidden">
-					<ul>
-						<li><button data-value="all" class="btn active">全部</button></li>
-						<li>价格区间</li>
-						<li class="money-inp" data-value="">
-							<div class="min-price">
-								<input class="form-control minMrice" type="text"/>
-								<span class="min-unit">万元</span>
-								<span class="fgx"></span>
-							</div>
-							<div class="max-price">
-								<input class="form-control maxMrice"  type="text"/>
-								<span class="max-unit">万元</span>
-							</div>
-						</li>
-					</ul>
-				</div>
-				<div class="jypt-dialog hidden">
-					<div class="jypt-pt">
-						<button type="button" data-value="" class="btn jypt-active">全部</button>
-						<button type="button" data-value="lately-7" class="btn">最近7天</button>
-						<button type="button" data-value="lately-30" class="btn">最近30天</button>
-						<button type="button" data-value="thisyear" class="btn">去年</button>
-					</div>
-					<div class="jypt-timeinputs">
-						<input type="text" name="starttime" readonly="readonly" id="starttime" data-value="">
-						<div class="jypt-fg">
-							<span></span>
-						</div>
-						<input type="text" name="endtime" readonly="readonly" id="endtime" data-value="">
-					</div>
-				</div>
-				<div class="jydq-dialog hidden">
-					<div class="dialog-content contentone">
-						<ul>
-							<li>
-								<button class="btn active">全国</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:81px;">华北地区</div>
-								<button class="btn">北京</button>
-								<button class="btn">天津</button>
-								<button class="btn">河北</button>
-								<button class="btn">山西</button>
-								<button class="btn">内蒙古</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:81px;">东北地区</div>
-								<button class="btn">辽宁</button>
-								<button class="btn">吉林</button>
-								<button class="btn">黑龙江</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:81px;">华东地区</div>
-								<button class="btn">上海</button>
-								<button class="btn">江苏</button>
-								<button class="btn">浙江</button>
-								<button class="btn">安徽</button>
-								<button class="btn">福建</button>
-								<button class="btn">江西</button>
-								<button class="btn">山东</button>
-								<button class="btn">台湾</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:81px;">华南地区</div>
-								<button class="btn">澳门</button>
-								<button class="btn">广东</button>
-								<button class="btn">广西</button>
-								<button class="btn">海南</button>
-								<button class="btn">香港</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:81px;">华中地区</div>
-								<button class="btn">河南</button>
-								<button class="btn">湖北</button>
-								<button class="btn">湖南</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:81px;">西南地区</div>
-								<button class="btn">重庆</button>
-								<button class="btn">四川</button>
-								<button class="btn">贵州</button>
-								<button class="btn">云南</button>
-								<button class="btn">西藏</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:81px;">西北地区</div>
-								<button class="btn">陕西</button>
-								<button class="btn">甘肃</button>
-								<button class="btn">青海</button>
-								<button class="btn">宁夏</button>
-								<button class="btn">新疆</button>
-							</li>
-						</ul>
-					</div>
-				</div>
-				<div class="jytype-dialog hidden">
-					<div class="dialog-content contenttwo">
-						<ul>
-							<li>
-								<button class="btn active">全部</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:81px;position:relative;float:left;" data-value="拟建">拟建项目</div><img style="float:left;" class="q-mark" src="/images/wx/q-mark.png"/>
-								<button class="btn hidden" style="clear:both;">拟建</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:81px;" data-value="预告">招标预告</div>
-								<button class="btn hidden">预告</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:81px;" data-value="招标">招标公告</div>
-								<button class="btn">招标</button>
-								<button class="btn">邀标</button>
-								<button class="btn">询价</button>
-								<button class="btn">竞谈</button>
-								<button class="btn">单一</button>
-								<button class="btn">竞价</button>
-								<button class="btn">变更</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:81px;" data-value="结果">招标结果</div>
-								<button class="btn">中标</button>
-								<button class="btn">成交</button>
-								<button class="btn">废标</button>
-								<button class="btn">流标</button>
-							</li>
-							<li>
-								<div id="dqbtn" style="width:111px;" data-value="其它">招标信用信息</div>
-								<button class="btn">合同</button>
-								<button class="btn">验收</button>
-								<button class="btn">违规</button>
-								<button class="btn">其它</button>
-							</li>
-						</ul>
-					</div>
-				</div>
-			</div>
-			<div class="jyshxbottom sl-jyshxbottom">
-				<ul class="text-center">
-					<li class="jydqreset">重置</li>
-					<li class="jydqsure">确定</li>
-				</ul>
-			</div>
-		</div>
-		<div id="wrapper">
-			<div id="list" ></div>
-			<div id="table" class="hidden">
-				<div class="data">
-                    <table class="content">
-                        <!--
-                        <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><div>中标单位</div></td>
-                            <td><div>中标金额<br>（万元）</div></td>
-                        </tr>
-                        -->
-                    </table>
-                </div>
-				<div class="TableTip">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼标讯网站jianyu360.com查看数据表格。</div>
-			</div>
-			<div class="resbm hidden">
-				<div class="rests">如果您对以上结果满意可</div>
-				<div class="resdy" id="zjdy">直接订阅<img src="{{Msg "seo" "cdn"}}/images/wx/jydyyou.png"></div>
-				<div class="dy_close"><img src="{{Msg "seo" "cdn"}}/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="{{Msg "seo" "cdn"}}/images/wx/jysorry_1.png">
-		</div>
-		<div style="font-size:16px;color:#1d1d1d;">没有找到和该关键词匹配的信息</div>
-		<div style="width:100%;" class="text-center">
-			<img onClick="window.open('/swordfish/feedback')" style="width: 200px;margin-top: 25px;" src="/images/wx/jyyjfk.png">
-		</div>
-	</div>
-	<div id="tempDiv" style="display:none;"></div>
-	<script type="text/javascript">
-
-        //全文搜索
-        function allSearch(){
-            $("#search_all").addClass("on").siblings().removeClass("on");
-            //记录
-            if(localStorage){
-                localStorage.selectType="allSearch";
-            }
-            //将所选标签值作为参数传递
-            beforeSubmit();
-            toquery();
-        }
-        //标题搜索
-        function  titleSearch(){
-            $("#search_title").addClass("on").siblings().removeClass("on");
-            //记录
-            if(localStorage){
-                localStorage.selectType="titleSearch";
-            }
-            //将所选标签值作为参数传递
-            beforeSubmit();
-            toquery();
-        }
-        //展示方式
-        //1.列表展示数据
-		function showlist() {
-            $(".showlist").addClass("on").siblings().removeClass("on");
-            $("#wrapper #table").addClass("hidden");
-            $("#wrapper #list").removeClass("hidden");
-            if(localStorage){
-                localStorage.showType="showList";
-            }
-            scrollDownObj.resetload();
-        }
-        //2.表格展示数据
-		function showTable() {
-            if(open_supersearch){
-                behaviorCollect(2);
-                $(".showtable").addClass("on").siblings().removeClass("on");
-                $("#wrapper #table").removeClass("hidden");
-                $("#wrapper #list").addClass("hidden");
-                if(localStorage){
-                    localStorage.showType="showTable";
-                }
-                scrollDownObj.resetload();
-            }else{
-                toOpenSupersearch();
-            }
-        }
-	</script>
-	{{include "/common/baiducc.html"}}
-</body>
-</html>

src/web/templates/weixin/wxkeyset/index.html

@@ -32,9 +32,6 @@ $(function(){
 		}
 	}
 	$("body").css("background-color","FFF");
-    if(localStorage.hasTopMsg!="false"){
-        $(".keyWordTip").show();
-    }
 
 	if(!isIOS){
 		$(".relRecom").addClass("isnotios");
@@ -125,9 +122,6 @@ $(function(){
 			$(".inputText").remove();
 			$(".relRecom").removeClass("slideInUp");
 			$(".relRecom").removeClass("animated");
-		    if(localStorage.hasTopMsg!="false"){
-		        $(".keyWordTip").show();
-		    }
 			if(thisClass.parents(".keyWordGroup").index() != focusinputindex){
 				return;
 			}
@@ -144,7 +138,6 @@ $(function(){
 			}
 		},300);
 	}).focus(function(){
-		$(".keyWordTip").hide();
 		$(".header,.keyWordContent").addClass("absolute");
 		if(focusinputindex != $(this).parents(".keyWordGroup").index()){
 			istiped = false;
@@ -599,11 +592,6 @@ function saveSeniorset(r){
 		
 	});
 }
-
-function hideTip() {
-	$(".keyWordTip").hide();
-    localStorage.hasTopMsg="false";
-}
 </script>
 </head>
 <body class="keysetpage">
@@ -613,12 +601,6 @@ function hideTip() {
 		<span class="complate hide">完成</span>
 		<span class="seniorset" style="float: right;font-size: 15px;color: #686868;"><img src="{{Msg "seo" "cdn"}}/images/wxkeyset/set.png" style="width: 17px;margin-right: 4px;margin-top: -3px;">推送设置</span>
 	</div>
-	<!--关键词上方红字提示-->
-	<div class="keyWordTip" style="display: none; position:relative; padding:5px 0px 5px 15px; background-color:rgba(253,238,210,1);">
-		<div style="width:90%; font-size:13px; color:rgba(216,86,27,1);">在推送设置中，开启智能订阅模式，剑鱼标讯将更智能地与公告正文进行匹配。</div>
-		<img src="{{Msg "seo" "cdn"}}/images/wxkeyset/zhaobiaodingyue-close.png" style="position:absolute; top:16px; right:10px; width:18px; height:18px;" onclick="hideTip();">
-	</div>
-
 	<div class="keyWordContent">
 		<div class="keyWordGroup">
 			<lable>1</lable>

src/web/templates/weixin/wxkeyset/seniorset.html

@@ -81,21 +81,6 @@ $(function(){
 	});
 	////////////////////////////////
 	$(".modal-dialog").css("margin-top",$(window).height()*0.25);
-
-    //智能订阅
-    $("#intelligentSubscribtion").click(function(){
-		if(!clickDelayed){
-			return;
-		}
-        window.location.href = "/jylab/laboratory/zndy";
-    });
-    //订阅数据导出
-    $("#dataExport").click(function(){
-		if(!clickDelayed){
-			return;
-		}
-        window.location.href = "/jylab/laboratory/sjdc";
-    });
 	//推送结果预览
 	$("#resultpreview").click(function(){
 		if(!clickDelayed){
@@ -393,23 +378,6 @@ function docheck(n,th){
 	</div>
 
 	<div class="content">
-		<div class="navchoose-top">
-			<ul>
-				<li id="intelligentSubscribtion">
-					<div>
-						<div>智能订阅模式</div>
-						<div>更聪明的招标订阅模式</div>
-					</div>
-				</li>
-				<li id="dataExport">
-					<div>
-						<div>订阅数据导出</div>
-						<div>用表格呈现订阅数据，可下载导出</div>
-					</div>
-				</li>
-			</ul>
-		</div>
-
 		<div id="pushfrequency">
 			<ul class="navchoose">
 				<li><img src="{{Msg "seo" "cdn"}}/images/wxkeyset/pushfrequency.png">推送时间</li>

src/web/templates/weixin/wxpush.html

@@ -361,22 +361,9 @@ $(function(){
 			$(".tablecontent").addClass("hidden");
 		})
 		$(".showType .showTable").click(function(){
-			//表格是否开启超级搜索？
-			$.ajax({
-	        type:'post',
-	        url:'/jylab/supsearch/getstatus',
-	        async:false,
-	        dataType:'json', 
-	        success:function(r){
-					if(r&&r.dataexportstatus){
-					    $(".showType .showTable").addClass("on").siblings().removeClass("on");
-						$(".listcontent").addClass("hidden");
-						$(".tablecontent").removeClass("hidden");
-					}else{
-						window.location.href="/jylab/laboratory/sjdc";
-					}
-				}
-			})
+			$(".showType .showTable").addClass("on").siblings().removeClass("on");
+			$(".listcontent").addClass("hidden");
+			$(".tablecontent").removeClass("hidden");
 		})
 		//
 		$(".blue").click(function(){