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

src/jfw/front/laboratory.go

@@ -29,9 +29,11 @@ func (l *Lab) Operation() error {
 		return l.Redirect("/swordfish/about")
 	}
 	userId, _ := l.GetSession("userId").(string)
+	myopenid := l.Session().Get("s_m_openid")
 	thistype := l.GetString("type")
 	labswitch := l.GetString("labswitch")
 	tp := l.GetString("tp")
+	typeswitch := ""
 	switchflag := 0
 	flag := "F"
 	var set bson.M
@@ -41,27 +43,17 @@ func (l *Lab) Operation() error {
 			switchflag = 1
 		}
 		if thistype == "zndy" {
-			set = bson.M{
-				"i_smartset": switchflag,
-			}
+			typeswitch = "i_smartset"
 		} else if thistype == "sjdc" {
-			set = bson.M{
-				"i_dataexport": switchflag,
-			}
+			typeswitch = "i_dataexport"
 		} else if thistype == "cjss" {
-			set = bson.M{
-				"i_supersearch": switchflag,
-			}
+			typeswitch = "i_supersearch"
 		} else if thistype == "zbqy" {
-			set = bson.M{
-				"i_entsesearch": switchflag,
-			}
+			typeswitch = "i_entsesearch"
 		} else if thistype == "gzqy" {
-			set = bson.M{
-				"i_followent": switchflag,
-			}
+			typeswitch = "i_followent"
 		}
-		if mongodb.Update("user", `{"_id":"`+userId+`"}`, bson.M{"$set": set}, false, false) {
+		if jylabutil.UpdateAuthory(myopenid.(string), typeswitch, switchflag) {
 			flag = "T"
 		}
 	case "popup":
@@ -117,34 +109,28 @@ func (l *Lab) LabMode(mode string) error {
 	if !ok || tmp == nil || len(*tmp) == 0 {
 		return nil
 	}
-	if mode == "zndy" {
+	if mode == "zndy" { //剑鱼实验室-智能订阅
 		l.T["switchstatus"] = jylabutil.IsAuthorized(myopenid.(string), "i_smartset")
-		l.T["name"] = "剑鱼实验室-智能订阅"
-		//l.T["switchstatus"] = (*tmp)["i_smartset"]
 		l.T["iknow"] = (*tmp)["i_smartsetiknow"]
 		return l.Render("/weixin/jylab/lab-zndy.html", &l.T)
 	}
-	if mode == "sjdc" {
-		l.T["name"] = "剑鱼实验室-数据导出"
-		l.T["switchstatus"] = (*tmp)["i_dataexport"]
+	if mode == "sjdc" { //剑鱼实验室-数据导出
+		l.T["switchstatus"] = jylabutil.IsAuthorized(myopenid.(string), "i_dataexport")
 		l.T["iknow"] = (*tmp)["i_dataexportiknow"]
 		return l.Render("/weixin/jylab/lab-sjdc.html", &l.T)
 	}
-	if mode == "cjss" {
-		l.T["name"] = "剑鱼实验室-超级搜索"
-		l.T["switchstatus"] = (*tmp)["i_supersearch"]
+	if mode == "cjss" { //剑鱼实验室-超级搜索
+		l.T["switchstatus"] = jylabutil.IsAuthorized(myopenid.(string), "i_supersearch")
 		l.T["iknow"] = (*tmp)["i_supersearchiknow"]
 		return l.Render("/weixin/jylab/lab-cjss.html", &l.T)
 	}
-	if mode == "zbqy" {
-		l.T["name"] = "剑鱼实验室-中标企业"
-		l.T["switchstatus"] = (*tmp)["i_entsesearch"]
+	if mode == "zbqy" { //剑鱼实验室-中标企业
+		l.T["switchstatus"] = jylabutil.IsAuthorized(myopenid.(string), "i_entsesearch")
 		l.T["iknow"] = (*tmp)["i_entsesearchiknow"]
 		return l.Render("/weixin/jylab/lab-zbqy.html", &l.T)
 	}
-	if mode == "gzqy" {
-		l.T["name"] = "剑鱼实验室-关注企业"
-		l.T["switchstatus"] = (*tmp)["i_followent"]
+	if mode == "gzqy" { //剑鱼实验室-关注企业
+		l.T["switchstatus"] = jylabutil.IsAuthorized(myopenid.(string), "i_followent")
 		l.T["iknow"] = (*tmp)["i_followentiknow"]
 		return l.Render("/weixin/jylab/lab-gzqy.html", &l.T)
 	}

src/jfw/front/search.go

@@ -9,21 +9,19 @@ import (
 type Search struct {
 	*xweb.Action
 	/********************剑鱼搜索dev2.0**************************/
-	mainSearch  xweb.Mapper `xweb:"/front/mainSearch"`
-	superSearch xweb.Mapper `xweb:"/front/superSearch"`
+	mainSearch  xweb.Mapper `xweb:"/jylab/mainSearch"`
+	superSearch xweb.Mapper `xweb:"/jylab/superSearch"`
 }
 
-//
 func init() {
 	xweb.AddAction(&Search{})
 }
-
-//
 func (s *Search) MainSearch() error {
 	fmt.Println("------主页面搜索------")
 	s.T["name"] = "主页面搜索"
 	return s.Render("/weixin/search/mainSearch.html", &s.T)
 }
+
 func (s *Search) SuperSearch() error {
 	fmt.Println("------超级搜索------")
 	s.T["name"] = "超级搜索"

src/jfw/modules/entsesearch/src/config.json

@@ -6,11 +6,12 @@
     "influxdb": "jy_logs",
     "elasticsearch": "http://192.168.3.18:9800",
     "elasticPoolSize": 30,
-    "redisaddrs": "other=192.168.3.14:3379,push=192.168.3.14:3379,sso=192.168.3.14:3379",
-    "webport": "8086",
+    "redisaddrs": "other=192.168.3.14:3379,push=192.168.3.14:3379,sso=192.168.3.14:3379,session=192.168.3.14:3379",
+    "webport": "8090",
     "webrpcport": "84",
     "weixinrpc": "127.0.0.1:83",
     "cacheflag": false,
-    "agreement": "http"
+    "agreement": "http",
+    "recommendEntLimit":"50"
 
 }

src/jfw/modules/entsesearch/src/main.go

@@ -5,10 +5,11 @@ import (
 	"qfw/util"
 	"qfw/util/elastic"
 	"qfw/util/redis"
+	_ "search"
 	"tag"
 	"time"
-	_"search"
 
+	"github.com/go-xweb/httpsession"
 	"github.com/go-xweb/xweb"
 )
 
@@ -19,6 +20,7 @@ func init() {
 }
 
 func main() {
+
 	go func() {
 		xweb.Run(":" + config.Sysconfig["webport"].(string))
 	}()
@@ -27,6 +29,7 @@ func main() {
 }
 
 func initXweb() {
+	httpsession.IsRedisSessionStore = true
 	xweb.Config.Profiler = true
 	xweb.RootApp().AppConfig.TemplateDir = "web/templates"
 	xweb.RootApp().AppConfig.StaticDir = "web/staticres"

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

@@ -2,15 +2,17 @@ package search
 
 import (
 	"fmt"
-	"strconv"
 	"github.com/go-xweb/xweb"
+	"qfw/util/elastic"
+	"config"
+	"strconv"
 )
 
 type EntSeSearch struct {
 	*xweb.Action
-	toSearch  xweb.Mapper `xweb:"/entSeSearch/search"`  //跳转到中标企业查询页面
-	recList   xweb.Mapper `xweb:"/entSeSearch/recList"` //获取推荐企业列表
-	proList   xweb.Mapper `xweb:"/entSeSearch/proList"` //获取企业中标项目
+	toSearch  xweb.Mapper `xweb:"/jylab/entsesearch/search"`  //跳转到中标企业查询页面
+	recList   xweb.Mapper `xweb:"/jylab/entsesearch/recList"` //获取推荐企业列表
+	proList   xweb.Mapper `xweb:"/jylab/entsesearch/proList"` //获取企业中标项目列表
 
 }
 
@@ -24,13 +26,17 @@ func (e *EntSeSearch) ToSearch() error{
 
 func (e *EntSeSearch) RecList() {
 	fmt.Println("entName", e.GetString("entName"))
-	var recArr [10]string
-	for i := 0; i < len(recArr); i++ {
-		recArr[i] = "河南省凯陆电子科技有限公司" + strconv.Itoa(i+1)
+	var entName = e.GetString("entName")
+	if entName!=""{
+		limit,_ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
+		r := elastic.GetPage("winner", "winner", `{"winner":"`+entName+`"}`, ``, `"_id","winner"`, 0, limit)
+		if r!=nil && len(*r) != 0{
+			fmt.Println("RecList",r)
+			e.ServeJson(map[string]interface{}{
+				"recList": r,
+			})
+		}
 	}
-	e.ServeJson(map[string]interface{}{
-		"recList": recArr,
-	})
 }
 
 func (e *EntSeSearch) ProList() {

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

@@ -0,0 +1,78 @@
+// search
+package search
+
+import (
+	"fmt"
+	"qfw/util/elastic"
+	"strings"
+)
+
+/**即时获取企业名称列表
+name  名称
+limit 取几条
+*/
+func GetEenNameImmediate(name string, limit int) []map[string]interface{} {
+	//query := `{"term":{"winner":"` + name + `"}}`
+	list := *elastic.GetByNgram(
+		"winner", "winner",
+		name, ``,
+		`"winner"`,
+		``,
+		`"winner"`,
+		0, limit)
+	return list
+}
+
+/*根据企业名称、地区、中标价获取项目列表
+entname 企业名称
+area	区域多值","号隔开
+lower	下限单位万
+upper	上限单位万
+*/
+func GetProjectByEntName(entname string, area string, lower, upper, pagenum, pagesize int) []map[string]interface{} {
+	if pagenum < 1 {
+		pagenum = 1
+	}
+	mastquery := getBidSearchQuery(area, lower, upper)
+	list := *elastic.GetByNgram(
+		"projectset", "projectset",
+		entname, mastquery,
+		`"winner"`,
+		`{"createtime":-1}`, ``, (pagenum-1)*pagesize, pagesize,
+	)
+	return list
+}
+
+func getBidSearchQuery(area string, lower, upper int) string {
+	query := ``
+	if area != "" {
+		query += `{"terms":{"area":[`
+		for k, v := range strings.Split(area, ",") {
+			if k > 0 {
+				query += `,`
+			}
+			query += `"` + v + `"`
+		}
+		query += `]}}`
+	}
+	if lower > 0 && upper > 0 {
+		if len(query) > 0 {
+			query += ","
+		}
+		query += `{"range":{"bidamount":{"gte":` + fmt.Sprint(lower*10000) + `,"lte":` + fmt.Sprint(upper*10000) + `}}}`
+	} else {
+		if lower > 0 {
+			if len(query) > 0 {
+				query += ","
+			}
+			query += `{"range":{"bidamount":{"gte":` + fmt.Sprint(lower*10000) + `}}}`
+		}
+		if upper > 0 {
+			if len(query) > 0 {
+				query += ","
+			}
+			query += `{"range":{"bidamount":{"lte":` + fmt.Sprint(upper*10000) + `}}}`
+		}
+	}
+	return query
+}

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

@@ -7,9 +7,9 @@
 <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="no" />
 <meta name="renderer" content="webkit">
 {{include "/common/pnc.html"}}
-<script src="/js/jquery.js"></script>
-<script src="/js/rem.js"></script>
-<link rel="stylesheet" href="/css/reset.css" />
+<script src="/jylab/entsesearch/js/jquery.js"></script>
+<script src="/jylab/entsesearch/js/rem.js"></script>
+<link rel="stylesheet" href="/jylab/entsesearch/css/reset.css" />
 <style>
 #searchDiv .searchform{
 	width:79%;
@@ -216,6 +216,19 @@
 	color: #2cb7ca;
 }
 
+.tip{
+	font-size: 14px;
+	padding: 0 .3rem;
+	margin-bottom:70px;
+	line-height: 20px;
+}
+#recList{
+	z-index: 1;
+	position: absolute;
+	background: rgb(255, 255, 255);
+	width: 79%;
+}
+
 </style>
 </head>
 <body>
@@ -225,8 +238,8 @@
 	<div class="wxhead">
 	<input class="form-control searchname" id="searchname" name="searchname" maxlength ="50" value="{{if .T.shname}}{{.T.shname}}{{end}}" placeholder="中标企业名称"/>
 	<div id="recList" style="display: none"></div>
-	<span class="tubiao"><img src="/images/wx/jywxjs.png"/></span>
-	<span class="qc"><img src="/images/wx/jyqingchu.png"/></span>
+	<span class="tubiao"><img src="/jylab/entsesearch/images/wx/jywxjs.png"/></span>
+	<span class="qc"><img src="/jylab/entsesearch/images/wx/jyqingchu.png"/></span>
 	<span class="shaixuan">筛选</span>
 	</div>
 	</form>
@@ -235,9 +248,9 @@
 <div id="set_search" class="hidden">
 	<div class="select">
 		<ul>
-			<li>金额<img src="/images/wx/sys-jt-bottom.png"></li>
+			<li>金额<img src="/jylab/entsesearch/images/wx/sys-jt-bottom.png"></li>
 			<li class="shuxian"></li>
-			<li>项目地区<img src="/images/wx/sys-jt-bottom.png"></li>
+			<li>项目地区<img src="/jylab/entsesearch/images/wx/sys-jt-bottom.png"></li>
 		</ul>
 	</div>
 	<div>
@@ -335,29 +348,28 @@
 				<td>序号</td>
 				<td>中标日期</td>
 				<td>项目名称</td>
-				<td>中标金额
-					(万元)</td>
+				<td>中标金额(万元)</td>
 			</tr>
 			</thead>
 			<tbody>
 			<tr>
 				<td>1</td>
 				<td>2017 0721</td>
-				<td><span class="higHlight">五峰土家族自治县</span>LED单色
-					户外电子屏采购项目</td>
+				<td><span>五峰土家族自治县</span>LED单色户外电子屏采购项目</td>
 				<td>1.30</td>
 			</tr>
 			<tr>
 				<td>2</td>
 				<td>2017 0721</td>
-				<td>G320下司至麻江良田公路
-					改扩建项目</td>
+				<td>G320下司至麻江良田公路改扩建项目</td>
 				<td>31</td>
 			</tr>
 			</tbody>
 		</table>
 	</section>
 </div>
+<!--tip-->
+<div class="tip">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>
 </body>
 </html>
 <script>
@@ -386,12 +398,12 @@
 
         function getRecList(entName) {
             $("#recList").html("");
-            $.post("/entSeSearch/recList",{entName:entName},function(r){
+            $.post("/jylab/entsesearch/recList",{entName:entName},function(r){
                 if(r){
                     if(typeof (r.recList)!="undefined"){
                         var recList = r.recList;
-                        for(var i=0;i<10;i++){
-                            var entName = recList[i];
+                        for(var i=0;i<recList.length;i++){
+                            var entName = recList[i].winner;
                             if(entName!="" && entName.length>20){
                                 entName = entName.substr(0,20)+"...";
                             }
@@ -412,12 +424,18 @@
                 });
             });
         }
+
+        $("body").click(function () {
+            $("#recList").hide();
+        });
     });
 
 	//显示筛选过滤选择
 	$(".shaixuan").click(function(){
 		if($("#set_search").attr("class")=="hidden"){
 			$("#set_search").removeClass("hidden");
+			$("#searchList").addClass("hidden");
+			$(".tip").addClass("hidden");
 		}else{
 			$("#set_search").addClass("hidden");
 		}
@@ -427,16 +445,16 @@
 	$("#set_search .select ul li:eq(0)").click(function(){
 		$(this).css("color","#2cb7ca");
 		$("#set_search .select ul li:eq(2)").css("color","#888");
-		$("#set_search .select ul li:eq(0) img").attr("src","/images/wx/sys-jt-bottom2.png");
-		$("#set_search .select ul li:eq(2) img").attr("src","/images/wx/sys-jt-bottom.png");
+		$("#set_search .select ul li:eq(0) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom2.png");
+		$("#set_search .select ul li:eq(2) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom.png");
 		$(".money").removeClass("hidden");
 		$(".area").addClass("hidden");
 	})
 	$("#set_search .select ul li:eq(2)").click(function(){
 		$(this).css("color","#2cb7ca");
 		$("#set_search .select ul li:eq(0)").css("color","#888");
-		$("#set_search .select ul li:eq(0) img").attr("src","/images/wx/sys-jt-bottom.png");
-		$("#set_search .select ul li:eq(2) img").attr("src","/images/wx/sys-jt-bottom2.png");
+		$("#set_search .select ul li:eq(0) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom.png");
+		$("#set_search .select ul li:eq(2) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom2.png");
 		$(".money").addClass("hidden");
 		$(".area").removeClass("hidden");
 	})

src/jfw/modules/followent/src/config.json

@@ -11,6 +11,7 @@
     "webrpcport": "84",
     "weixinrpc": "127.0.0.1:83",
     "cacheflag": false,
-    "agreement": "http"
-
+    "agreement": "http",
+	"followentlimit":10,
+    "recommendEntLimit":"50"
 }

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

@@ -1,33 +1,29 @@
 package followent
 
 import (
+	"config"
 	"fmt"
 	"log"
 	"qfw/util"
+	"qfw/util/elastic"
 	"qfw/util/redis"
-
 	"strconv"
-	//"time"
 	"tools"
-	//"wx"
 
 	"github.com/go-xweb/xweb"
-
-//"gopkg.in/mgo.v2/bson"
-
 )
 
-var se = util.SE
 var mongodb = tools.MQFW
 
 type FollowEnt struct {
 	*xweb.Action
 
-	entList xweb.Mapper `xweb:"/jylab/followent/entList"` //获取关注企业列表
-	addEnt  xweb.Mapper `xweb:"/jylab/followent/addEnt"`  //添加关注企业页面
-	newInfo xweb.Mapper `xweb:"/jylab/followent/newInfo"` //企业最新信息
-	recList xweb.Mapper `xweb:"/jylab/followent/recList"` //获取推荐企业列表
-	saveEnt xweb.Mapper `xweb:"/jylab/followent/saveEnt"` //保存关注企业
+	entList    xweb.Mapper `xweb:"/jylab/followent/entList"`           //获取关注企业列表
+	addEnt     xweb.Mapper `xweb:"/jylab/followent/addEnt"`            //添加关注企业页面
+	newInfo    xweb.Mapper `xweb:"/jylab/followent/newInfo/(.*)/(.*)"` //企业最新信息
+	recList    xweb.Mapper `xweb:"/jylab/followent/recList"`           //获取推荐企业列表
+	saveEnt    xweb.Mapper `xweb:"/jylab/followent/saveEnt"`           //保存关注企业
+	followYorN xweb.Mapper `xweb:"/jylab/followent/followYorN"`        //查询用户是否关注企业
 
 }
 
@@ -37,49 +33,51 @@ func init() {
 
 func (f *FollowEnt) EntList() error {
 	defer util.Catch()
-	var entArr = make([]map[string]string, 0)
-	for i := 0; i < 10; i++ {
-		entMap := make(map[string]string)
-		entMap["s_projectname"] = "计算机" + strconv.Itoa(i+1)
-		entMap["l_lastpushtime"] = strconv.FormatInt(1501546210, 10)
-		entArr = append(entArr, entMap)
+	//var entArr = make([]map[string]string, 0)
+	//for i := 0; i < 10; i++ {
+	//	entMap := make(map[string]string)
+	//	entMap["s_projectname"] = "计算机" + strconv.Itoa(i+1)
+	//	entMap["l_lastpushtime"] = strconv.FormatInt(1501546210, 10)
+	//	entArr = append(entArr, entMap)
+	//}
+	//f.T["datas"] = entArr
+	f.T["followLimit"] = config.Sysconfig["followentlimit"]
+	datas, ok := mongodb.Find("jylab_followent", `{"s_userid":"`+f.GetSession("userId").(string)+`"}`, `{"l_createtime":-1}`, `{"_id":1,"winner":1,"s_userid":1,"s_openid":1,"l_createtime":1,"s_id":1}`, false, 0, 10)
+	f.T["flag"] = false
+	if ok && datas != nil && len(*datas) > 0 {
+		for k, v := range *datas {
+			v["_id"] = util.EncodeArticleId2ByCheck(util.BsonIdToSId(v["_id"]))
+			log.Println(k, ":", v["l_createtime"])
+		}
+		f.T["datas"] = datas
 	}
-	f.T["datas"] = entArr
-	f.T["followLimit"] = "10"
-
-	log.Println("session:", f.GetSession("userId").(string))
-	//	datas, ok := mongodb.Find("follow_project", `{"s_userid":"`+f.GetSession("userId").(string)+`"}`, `{"l_lastpushtime":-1,"l_createtime":-1}`, `{"s_projectname":1,"s_projectcode":1,"i_remind":1,"l_lastpushtime":1,"l_createtime":1}`, false, -1, -1)
-	//	f.T["flag"] = false
-	//	if ok && datas != nil && len(*datas) > 0 {
-	//		for k, v := range *datas {
-	//			v["_id"] = util.EncodeArticleId2ByCheck(util.BsonIdToSId(v["_id"]))
-	//			log.Println(k, ":", v["l_createtime"])
-	//			if v["l_lastpushtime"] == "" || v["l_lastpushtime"] == nil {
-	//				v["l_lastpushtime"] = v["l_createtime"]
-	//			}
-
-	//		}
-	//		f.T["datas"] = datas
-	//	}
-
-	f.T["name"] = "关注的企业---"
 	return f.Render("/weixin/list.html", &f.T)
 }
 
 func (f *FollowEnt) AddEnt() error {
-	f.T["name"] = "to add page---"
 	return f.Render("/weixin/add.html", &f.T)
 }
 
 func (f *FollowEnt) RecList() {
 	fmt.Println("entName", f.GetString("entName"))
-	var recArr [10]string
-	for i := 0; i < len(recArr); i++ {
-		recArr[i] = "河南省凯陆电子科技有限公司" + strconv.Itoa(i+1)
+	var entName = f.GetString("entName")
+	if entName != "" {
+		limit, _ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
+		r := elastic.GetPage("winner", "winner", `{"winner":"`+entName+`"}`, ``, `"_id","winner"`, 0, limit)
+		if r != nil && len(*r) != 0 {
+			fmt.Println("RecList", r)
+			for _, v := range *r {
+				v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
+			}
+			f.ServeJson(map[string]interface{}{
+				"recList": r,
+			})
+		}
 	}
-	f.ServeJson(map[string]interface{}{
-		"recList": recArr,
-	})
+	//var recArr [10]string
+	//for i := 0; i < len(recArr); i++ {
+	//	recArr[i] = "河南省凯陆电子科技有限公司" + strconv.Itoa(i+1)
+	//}
 }
 
 func (f *FollowEnt) SaveEnt() {
@@ -87,17 +85,27 @@ func (f *FollowEnt) SaveEnt() {
 }
 
 //企业最新信息
-func (f *FollowEnt) NewInfo(id string) error {
+func (f *FollowEnt) NewInfo(winner, id string) error {
 	defer util.Catch()
-	id = util.DecodeArticleId2ByCheck(id)
-	fields := `{"s_id":1,"i_source":1,"s_projectname":1,"s_projectcode":1,"s_url":1,"i_remind":1,"s_type":1,"l_bidopentime":1,"l_remindtime":1,"a_relationinfo":1,"a_visited":1,"l_lastpushtime":1,"a_lastpushids":1}`
-	data, ok := mongodb.FindOneByField("follow_project", map[string]interface{}{
-		"_id": bson.ObjectIdHex(id),
-		//"s_userid": m.GetSession("userId").(string),
-	}, fields)
-
+	////var winner = "天津超林时代科技发展有限公司"
+	fields := `{"projectname":1,"projectcode":1,"bidamount":1,"title":1,"publishtime":1,"subtype":1}`
+	data, ok := mongodb.Find("bidding", `{"winner":"`+winner+`"}`, nil, fields, false, -1, -1)
+	//if !ok || data == nil || len(*data) == 0 {
+	//	return f.Render("_error.html")
+	//}
+	if ok && data != nil && *data != nil && len(*data) != 0 {
+		f.T["data"] = data
+		fmt.Println(f.T["data"])
+	}
+	f.T["winner"] = winner
 	return f.Render("/weixin/set.html", &f.T)
 }
+func (f *FollowEnt) FollowYorN() error {
+	defer util.Catch()
+	userId := f.GetSession("userId").(string)
+	fmt.Println(userId)
+	return nil
+}
 
 //
 func (f *FollowEnt) Followent() error {

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

@@ -0,0 +1,80 @@
+package followent
+
+import (
+	"config"
+	"log"
+	"qfw/util"
+	"qfw/util/elastic"
+	"time"
+
+	"github.com/go-xweb/xweb"
+)
+
+type Myfwent struct {
+	*xweb.Action
+
+	addfwent xweb.Mapper `xweb:"/jylab/followent/addfwent"`
+}
+
+//
+func init() {
+	xweb.AddAction(&Myfwent{})
+}
+
+//
+func (m *Myfwent) Addfwent() error {
+	defer util.Catch()
+	userId := m.GetSession("userId").(string)
+	openid := m.GetSession("s_m_openid").(string)
+	followId := ""
+	s_id := ""
+	entname := m.GetString("winner")
+	if m.GetString("id") == "" {
+		s_id = Findent(entname)
+	} else {
+		s_id = util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
+	}
+	log.Println("---s_id:", s_id)
+	var status = "n"
+	if mongodb.Count("jylab_followent", `{"s_userid":"`+userId+`","s_id":"`+s_id+`"}`) > 0 {
+		status = "e" //已经关注过此企业
+	} else if mongodb.Count("jylab_followent", `{"s_userid":"`+userId+`"}`) >= util.IntAll(config.Sysconfig["followentlimit"]) {
+		status = "m" //超过最大关注数
+	} else {
+		data := make(map[string]interface{})
+		data["winner"] = m.GetString("winner")
+		data["s_userid"] = userId
+		data["s_openid"] = openid
+		data["l_createtime"] = time.Now().Unix()
+		data["s_id"] = s_id
+		if followId = mongodb.Save("jylab_followent", data); len(followId) > 0 {
+			status = "y"
+		}
+	}
+	m.ServeJson(map[string]interface{}{
+		"status":   status,
+		"followId": util.EncodeArticleId2ByCheck(followId),
+		"infoId":   util.EncodeArticleId2ByCheck(s_id),
+	})
+	return nil
+}
+
+//
+func Findent(entname string) string {
+	defer util.Catch()
+	tem, ok := mongodb.FindOneByField("winner", `{"winner":"`+entname+`"}`, `{"_id":1}`)
+	winnerid := ""
+	if ok && len(*tem) == 0 {
+		data := map[string]interface{}{}
+		data["winner"] = entname
+		data["winnersign"] = 1
+		data["l_createtime"] = time.Now().Unix()
+		winnerid = mongodb.Save("winner", data)
+		data["_id"] = winnerid
+		flag := elastic.Save("winner", "winner", data)
+		if !flag {
+			log.Println("企业保存elastic出错！")
+		}
+	}
+	return winnerid
+}

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

@@ -417,7 +417,7 @@
 }
 .jynoticelist .priceStyle{
 	position: absolute;
-    top: 47px;
+    bottom: 10px;
     font-size: 13px;
     right: 7px;
     color: #a0a0a0;
@@ -432,6 +432,7 @@
     font-size: 18px;
     margin-top: 20px;
     text-align: center;
+	margin-bottom: 20px;
 
 }
 .setpage .noticehead{

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

@@ -8,13 +8,13 @@
 		history.go(-1);
 	}
 </script>
-<link href="/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="/css/follow.css" rel="stylesheet">
-<script src="/js/jquery.js"></script>
-<script src="/js/common.js?v={{Msg "seo" "version"}}"></script>
-<script src="/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+<link href="/jylab/followent/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="/jylab/followent/css/follow.css" rel="stylesheet">
+<script src="/jylab/followent/js/jquery.js"></script>
+<script src="/jylab/followent/js/common.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
-<script src="/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 <style>
 	.addpage input{
 		width: 100%;
@@ -35,6 +35,7 @@
 	}
 </style>
 <script type="text/javascript">
+	var winner_id = "";
     $(function(){
 		/*
 		 $(window).bind("pageshow", function(event){
@@ -45,6 +46,7 @@
 		 new FastClick(document.body);
 		 */
         $("input").on("input propertychange",function(){
+            winner_id = "";
             var count = $.trim(this.value).length;
             if(count > 100){
                 this.value = this.value.substring(0,100);
@@ -69,35 +71,37 @@
                 return;
             }
             $(this).addClass("disabled");
-            $.post("/followEnt/saveEnt",{entName:entName},function(r){
-//                if(r.status == "y" && r.id != ""){
-//                    if(sessionStorage){
-//                        sessionStorage.version="0";
-//                    }
-//                    window.location.href = "/followeEnt/set/add/"+r.id;
-//                }else if(r.status == "m"){
-//                    EasyAlert.show("最多可关注<br>10个项目！");
-//                }else{
-//                    EasyAlert.show("数据提交失败！");
-//                    $(".opation").removeClass("disabled");
-//                }
-                window.location.href = "/followEnt/entList";
+            $.post("/jylab/followent/addfwent",{winner:entName,id:winner_id},function(r){
+                console.log(r);
+                if(r.status == "y" || r.status == "e"){
+                    if(sessionStorage){
+                        sessionStorage.version="0";
+                    }
+                    //window.location.href = "/followeEnt/set/add/"+r.id;
+                    window.location.href = "/jylab/followent/entList";
+                }else if(r.status == "m"){
+                    EasyAlert.show("最多可关注<br>10个企业！");
+                }else{
+                    EasyAlert.show("数据提交失败！");
+                    $(".opation").removeClass("disabled");
+                }
             });
         });
     });
 
 	function getRecList(entName) {
 		$("#recList").html("");
-		$.post("/followEnt/recList",{entName:entName},function(r){
+		$.post("/jylab/followent/recList",{entName:entName},function(r){
 			if(r){
 				if(typeof (r.recList)!="undefined"){
 					var recList = r.recList;
-					for(var i=0;i<10;i++){
-					    var entName = recList[i];
-					    if(entName!="" && entName.length>20){
-                            entName = entName.substr(0,20)+"...";
+					for(var i=0;i<recList.length;i++){
+					    var entName = recList[i].winner;
+					    var id = recList[i]._id;
+						if(entName!="" && entName.length>20){
+							entName = entName.substr(0,20)+"...";
 						}
-						var obj=$("<div class='rec'>"+entName+"</div>");
+						var obj=$("<div class='rec' data-id='"+id+"'>"+entName+"</div>");
 						$("#recList").append(obj);
 					}
 				}
@@ -105,10 +109,11 @@
 			$("#recList").show();
 
 			$(".rec").click(function(){
-				if($(this).text()!=""){
-					$("input").val($(this).text());
-					$("#recList").hide();
-				}
+                    if($(this).text()!=""){
+                        $("input").val($(this).text());
+                        winner_id = $(this).attr("data-id");
+                        $("#recList").hide();
+                    }
 			});
 		});
 	}

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

@@ -10,31 +10,28 @@ if(sessionStorage){
 	}
 }
 </script>
-<link href="/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="/css/follow.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<script src="/js/jquery.js"></script>
-<script src="/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
-<script src="/js/common.js?v={{Msg "seo" "version"}}"></script>
+<link href="/jylab/followent/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="/jylab/followent/css/follow.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<script src="/jylab/followent/js/jquery.js"></script>
+<script src="/jylab/followent/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
-<script src="/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript">
 	$(function () {
         {{if .T.datas}}
         var allHtml = "";
         var data = {{.T.datas}};
         var jyno = 0;
-        data.sort(function(a,b){return a.l_lastpushtime<b.l_lastpushtime});
+        data.sort(function(a,b){return a.l_createtime<b.l_createtime});
         for (var i in data){
-            var lastpushtime = data[i]["l_lastpushtime"];
+            var l_createtime = data[i]["l_createtime"];
             var rem = "";
             var tdf = "";
             var timestamp = parseInt($.now()/ 1000);
-            if (lastpushtime == undefined||lastpushtime==""){
-                lastpushtime = data[i]["l_createtime"];
-            }
 
             //时间标志
-            tdf = timeDiff(new Date(Number(lastpushtime+"000")));
+            tdf = timeDiff(new Date(Number(l_createtime+"000")));
             if (tdf != null){
                 tdf = "<img style='width:15px;position: relative;padding: 2px 4px;' src='/images/wx/jyclock.png'>"+tdf+"</div>";
             }else{
@@ -42,9 +39,9 @@ if(sessionStorage){
             }
 
             var listno = parseInt(i)+parseInt(1);
-            allHtml +="<li data-id='"+data[i]["_id"]+"' Sort='"+lastpushtime+"'>"
+            allHtml +="<li data-id='"+data[i]["_id"]+"' data-winner='"+data[i]["winner"]+"' Sort='"+l_createtime+"'>"
                 +"<div class='jyfwlistno'>"+listno+".</div>"
-                +"<div class='jyfwlisttitle'>"+(data[i]["s_projectname"]?data[i]["s_projectname"]:data[i]["s_projectcode"])+"</div>"
+                +"<div class='jyfwlisttitle'>"+(data[i]["winner"]?data[i]["winner"]:data[i]["winner"])+"</div>"
                 +"<div style='clear:both;'></div>"+rem
                 +"<img src='/images/wx/d.png' class='arrow-right'>"
                 +"<div class='jytimest'>"
@@ -59,11 +56,12 @@ if(sessionStorage){
             if(sessionStorage){
                 sessionStorage.version="0";
             }
-            window.location.href = "/followEnt/newInfo";
+
+            window.location.href = "/jylab/followent/newInfo/"+$(this).attr("data-winner")+"/"+$(this).attr("data-id");
         });
 	    //
         $("#addDiv").click(function(){
-            window.location.href = "/followEnt/addEnt";
+            window.location.href = "/jylab/followent/addEnt";
         });
     });
 

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

@@ -2,22 +2,66 @@
 <head>
 <title>企业信息</title>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<link href="/mobiscroll/mobiscroll.min.css" rel="stylesheet">
-<link href="/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="/css/follow.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<script src="/js/jquery.js"></script>
-<script src="/js/common.js?v={{Msg "seo" "version"}}"></script>
-<script src="/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
-<script src="/mobiscroll/mobiscroll.min.js"></script>
+<link href="/jylab/followent/mobiscroll/mobiscroll.min.css" rel="stylesheet">
+<link href="/jylab/followent/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="/jylab/followent/css/follow.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="/jylab/followent/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<script src="/jylab/followent/js/jquery.js"></script>
+<script src="/jylab/followent/js/common.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/mobiscroll/mobiscroll.min.js"></script>
 <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
-<script src="/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-<script src="/js/jy.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/js/jy.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript">
+	var data = {{.T.data}};
+	var winner = {{.T.winner}};
+	
 	$(function(){
+		$.ajax({
+			type:'post',
+			url:'/jylab/followent/followYorN',
+			data:{},
+			success:function(r){
+				
+			}
+		})
 		var easyPopup = new EasyPopup("easypopup");
+		$(".noticehead").html(winner)
 		
-		//取消企业关注
+		for(var i = 0; i < data.length; i++){
+			var noticetime = '';
+			var type = '';
+			var amountHtml = '';
+			var listhtml = '';
+			var title = data[i]["title"];
+			var amount = data[i]["bidamount"];
+
+			if(data[i]["publishtime"]){
+				noticetime = new Date(Number(data[i]["publishtime"]+"000")).Format("MM-dd");	
+			}
+			if(typeof(data[i]["subtype"]) != "undefined" && data[i]["subtype"] != "" && data[i]["subtype"] !=null){
+				type = data[i]["subtype"];
+			}
+			if(typeof(amount) != "undefined" && amount != null && amount != ""){
+				amount = parseInt(amount)/1000;
+				amountHtml = '<span class="priceStyle">'+amount+'万元中标</span>';
+			}
+			listhtml = '<div class="jynoticelist">'
+			   	 			+'<div>'
+			        			+'<span class="noticetime">'+noticetime+'</span>'
+			       		 		+'<span class="type">'+type+'</span>'
+			    			+'</div>'
+			    	 		+'<div class="timeaxis">'
+			        	 		+'<span></span>'
+			    	 		+'</div>'
+			       			+'<div>'
+								+title
+								+amountHtml
+			       			+'</div>'
+			    		+'</div>'
+			$(".jynotice").append(listhtml)			
+		}
 		$(".qy-followcancel").click(function(){
 			easyPopup.show();
 		})
@@ -28,66 +72,20 @@
 			setTimeout(function(){
 				window.location.href = "/followEnt/entList";
 			},500);
-			
-			
 		});
 		//取消
 		$("#cancel").click(function(){
 			easyPopup.hide();
 		});
 	})
+	
 </script>
 </head>
-
 <body class="setpage">
-	{{if .T.isDel}}<div class="disabledMask"></div>{{end}} 
-	<div class="noticehead">
-		万达集团股份有限公司
-	</div>
+	<div class="noticehead"></div>
 	<ul>
 		<li id="notice">企业最新信息</li>
-		<li class="jynotice">
-			<div class="jynoticelist">
-   	 			<div>
-        			<span class="noticetime">06-14</span>
-       		 		<span class="type">中标</span>
-    			</div>
-    	 		<div class="timeaxis">
-        	 		<span></span>
-    	 		</div>
-       			<div>
-					河南省畜牧局物业管理项目二次招标中标公示
-					<span class="priceStyle">200万元中标</span>
-       			</div>
-    		</div>
-			
-			<div class="jynoticelist">
-   	 			<div>
-        			<span class="noticetime">06-14</span>
-       		 		<span class="type">中标</span>
-    			</div>
-    	 		<div class="timeaxis">
-        	 		<span></span>
-    	 		</div>
-       			<div>
-					河南省畜牧局物业管理项目二次招标中标公示
-					<span class="priceStyle">200万元中标</span>
-       			</div>
-    		</div>
-			
-			<div class="jynoticelist">
-   	 			<div>
-        			<span class="noticetime">06-14</span>
-       		 		<span class="type">废标</span>
-    			</div>
-    	 		<div class="timeaxis">
-        	 		<span></span>
-    	 		</div>
-       			<div>
-					河南省畜牧局物业管理项目二次招标中标公示
-					<span class="priceStyle"></span>
-       			</div>
-    		</div>
+		<li class="jynotice">	
 		</li>
 	</ul>
 	<div class="qy-followcancel">

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

@@ -1,69 +1,262 @@
-html, body, div, span, applet, object, iframe, 
-h1, h2, h3, h4, h5, h6, p, blockquote, pre, 
-a, abbr, acronym, address, big, cite, code, 
-del, dfn, em, font, img, ins, kbd, q, s, samp, 
-small, strike, strong, sub, sup, tt, var, 
-dl, dt, dd, ol, ul, li, 
-fieldset, form, label, legend, 
-table, caption, tbody, tfoot, thead, tr, th, td { 
-margin: 0; 
-padding: 0; 
-border: 0; 
-outline: 0; 
-font-weight: inherit; 
-font-style: inherit; 
-font-size: 100%; 
-font-family: inherit; 
-vertical-align: baseline; 
--webkit-tap-highlight-color: transparent;
-
-} 
-:focus { 
-outline: 0; 
-} 
-body { 
-line-height: 1; 
-/*color: black; 
-background: white; */
-font-family: "苹方","Microsoft YaHei",sans-serif;
--webkit-font-smoothing: antialiased;
-} 
-input{
-	font-family: "苹方","Microsoft YaHei",sans-serif;
-	-webkit-appearance: none;
-	}
-ol, ul { 
-list-style: none; 
-} 
-button{ 
-	outline: none;border: none;
-	}
-table { 
-border-collapse: separate; 
-border-spacing: 0; 
-} 
-caption, th, td { 
-text-align: left; 
-font-weight: normal; 
-} 
-textarea { 
-	resize:none;
-	-webkit-appearance: none; 
-	}
-img{border:0;}
-a{
-	text-decoration:none;
-}
-/*a:link {color:#606060;} 
-a:visited {color:#606060;} 
-a:hover{color:#8cb91e;	text-decoration: underline;}
-a:active {color:#606060;}*/
+#searchDiv .searchform{
+	width:79%;
+	margin-top: 11px;
+	margin-left: 17px;
+}
+.searchform .tubiao img {
+	width: 32px;
+	display: inline-block;
+	padding-left: 10px;
+	position: absolute;
+	z-index: 10;
+	top: 20px;
+	right: 19%;
+}
+.searchform .qc img {
+	width: 30px;
+	display: inline-block;
+	padding-left: 10px;
+	position: absolute;
+	z-index: 10;
+	top: 20px;
+	right: 27%;
+}
+.searchform .shaixuan {
+	font-size: 16px;
+	color: #0987ff;
+	float: right;
+	position: absolute;
+	z-index: 10;
+	top: 20px;
+	right: 5%;
+	height: 20px;
+}
+.searchname{
+	background-color: #f5f4fa !important;
+}
+.select{
+	height:40px;
+	line-height:40px;
+	width:100%;
+	border-bottom: 1px solid #ccc;
+	padding-left: 5px;
+	display:flex;
+	justify-content:space-around;
+	align-content:center;
+}
+.select div{
+	font-size:14px;
+	color:#888;
+	background:url(/images/search/sys-jt-bottom.png)right center no-repeat;
+	background-size:7px 7px;
+	padding-right:10px;
+}
+.shuxian{
+	border-right: 1px solid #ccc;
+	color: #2cb7ca;
+	line-height: 30px;
+	height: 30px;
+	margin-top: 4px;
+}
+.money,.area,.pubtime,.infotype{
+	padding:10px;
+}
+.area ul li{
+	border-bottom: 1px solid #d9d6d6;
+	padding: 15px 0px 13px;
+	float: left;
+	width: 100%;
+}
+.money,.pubtime{
+	margin-top:15px;
+}
+.money ul li{
+	float: left;
+	width: 100%;
+	height:40px;
+	line-height:40px;
+}
+.area .btn,.infotype .btn{
+	padding: 5px 10px;
+	background-color: #F4F4F9;
+	color: #1d1d1d;
+	font-size: 14px;
+	margin-right: 10px;
+	margin-bottom: 12px;
+	width: 75px;
+	float: left;
+	border-radius: 3px;
+	height: 34px;
+}
+.btn{
+	padding: 5px 10px;
+	background-color: #F4F4F9;
+	color: #1d1d1d;
+	font-size: 14px;
+	margin-right: 10px;
+	margin-bottom: 12px;
+	float: left;
+	border-radius: 3px;
+	height: 34px;
+}
+.money-inp{
+	background-color:#f5f4fa;
+	height:60px !important;
+}
+.money-inp input{
+	width:100%;
+}
+.money-inp .min-price{
+	width:42%;
+	position:relative;
+	top:19%;
+	left:3%;
+}
+.money-inp .max-price{
+	width:42%;
+	position:relative;
+	top:-45%;
+	left:55%;
+}
+.money-inp .min-price span,.money-inp .max-price span{
+	position:absolute;
+	top: 0%;
+	left:71%;
+}
+.fgx{
+	background-color: #CECECE;
+	height: 1px;
+	width: 15px;
+	display: block;
+	top: 18px !important;
+	left:106% !important;
+}
+.bottom_btn{
+	border-top: 1px solid #ccc;
+	width: 100%;
+	height: 45px;
+	display: block;
+	line-height: 45px;
+	position: fixed;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	z-index: 999;
+}
+.bottom_btn ul li{
+	text-align: center;
+	width: 50%;
+	font-size: 18px;
+}
+.bottom_btn .reset{
+	background-color:#eff9fa;
+	color:2cb7ca;
+}
+.bottom_btn .sure{
+	background-color:#2cb7ca;
+	color:#fff;
+}
+.pubtime [type='text'] {
+	border-radius: 0px;
+	width: 130px;
+	line-height: 30px;
+	padding: 0px 0px 0px 5px;
+}
+.jypt-timeinputs{
+	background-color: #F5F4FA;
+	padding: 10px;
+	display: inline-block;
+}
+.pubtime [type='text'] {
+	border-radius: 0px;
+	width: 45%;
+	line-height: 30px;
+	padding: 0px 0px 0px 5px;
+}
+.pubtime .jypt-pt{
+	width:100%
+}
+.pubtime .jypt-fg>span {
+	background-color: #CECECE;
+	height: 1px;
+	width: 15px;
+	display: block;
+	position: relative;
+	top: 16px;
+}
+.pubtime .jypt-fg{
+	display: inline-block;
+	height: 34px;
+	vertical-align: top;
+	width: 15px;
+}
+.pubtime .jypt-timeinputs{
+	margin-top:12px;
+}
+.infotype ul li{
+	border-bottom: 1px solid #d9d6d6;
+	padding: 15px 0px 13px;
+	float: left;
+	width: 100%;
+}
+.industry{
+	display: flex;
+	justify-content: space-between;
+	width: 100%;
+	min-height: 10rem;
+	font-size: .28rem;
+	color: #1d1d1d;
+}
+.industry .hyHead {
+	width: 34%;
+	background-color: #FFFFFF;
+}
+.industry .hyHead li{
+	padding-left: 2rem;
+	height: 3rem;
+	line-height: 3rem;
+	border: 1px solid #e0e0e0;
+	margin-top: -1px;
+	float:none;
+}
+.industry .hyHead li.on{
+	background-color: #f4f4f9;
+	border-right: none;
+}
+.hyBody{
+	width: 66%;
+	background-color: #f4f4f9;
 
-/*去除表单黄色背景*/
-input:-webkit-autofill{-webkit-box-shadow: 0 0 0px 1000px white inset;}
-:-ms-input-placeholder {  color: #888888; }
-::-webkit-input-placeholder {  color: #888888; } 
-address,caption,cite,code,dfn,em,th,b,i {font-weight: normal;font-style: normal;}
-.text-center{text-align: center;}
-.clearfix:after {visibility: hidden; display: block; font-size: 0; content: " "; clear: both; height: 0; }
-.clearfix {*zoom:1; }
+}
+.hyBody .iner-list{
+	display: none;
+}
+.hyBody .iner-list ul li{
+	height: 3rem;
+	line-height: 3rem;
+	padding-left: 3rem;
+	border: 1px solid #e0e0e0;
+	margin-top: -1px;
+	border-left:none ;
+	float:none;
+}
+.hyBody .iner-list ul li.active{
+	background: #f4f4f9 url(../../images/search/icon-right-bg.png) 1.5rem center no-repeat;
+	background-size: 1rem 1rem;
+	color: #2cb7ca;
+}
+#dqbtn {
+	padding: 7px 10px;
+	background-color: #F4F4F9;
+	color: #1d1d1d;
+	font-size: 15px;
+	margin-right: 10px;
+	margin-bottom: 14px;
+	height: 36px;
+	border-radius: 3px;
+	font-weight: 600;
+}
+.q-mark{
+	width:20px;
+	margin-top: 10px;
+}

src/web/staticres/wxswordfish/superSearch.css

@@ -0,0 +1,1468 @@
+@import url(/css/common.css);
+/**************/
+.operation{
+	margin-bottom: 20px;
+}
+.operation>.parent-node{
+	background-color: #F8F8F8;
+	width: 100%;
+	height: 45px;
+	line-height: 45px;
+	border-bottom: 1px solid #CCCCCC;
+	position: relative;
+	font-size: 16px;
+}
+.parent-node-view{
+	width: 100%;
+	height: 50px;
+	line-height: 50px;
+	font-size: 16px;
+	text-align:center;
+}
+.operation>.parent-node>img{
+	margin-left: 15px;
+	margin-right: 10px;
+	width: 18px;
+	height: 18px;
+}
+.operation>.parent-node>span img{
+	position: absolute;
+	top: 40%;
+	left: 50%;
+}
+.operation>.parent-node>span{
+	display: block;
+	width: 60px;
+	height: 40px;
+	margin-top: -17px;
+	right: 10px;
+	position: absolute;
+	top: 50%;
+}
+.operation>.parent-node:last-child>span{
+	margin-top: -23px;
+}
+.operation>.parent-node>.on-off{
+	background-image: url("/wxswordfish/images/off.png");
+	background-size: 100% 100%;
+}
+
+.rule-content div{
+	height:30px;
+}
+.operation .on-off.open{
+	background-image: url("/wxswordfish/images/on.png");
+	right: 3px;
+	width: 62px;
+}
+.operation .btn-right img{
+	width: 15px;
+	height: 22px;
+	margin-top: -8.5px;
+	margin-left: -5px;
+}
+.operation .child-node{
+	padding: 0px 15px;
+	display: none;
+}
+.operation .child-node li{
+	border-bottom: 1px solid #ddd;
+	padding: 15px 10px;
+}
+
+.operation .child-node img{
+	width: 8px;
+	height: 15px;
+	float: right;
+	margin-right: 20px;
+	margin-top: 4px;
+}
+.operation .child-node li>div:first-child{
+	
+}
+.operation .child-node .com-last{
+	font-size: 15px;
+    padding-top: 15px;
+	color: #999;
+	margin-left: 38px;
+	margin-right: 20px;
+	line-height: 22px;
+}
+.operation .child-node .jycom-last{
+	font-size: 15px;
+    padding-top: 18px;
+	color: #686868;
+	margin-left: 38px;
+}
+/*弹出框*/
+.dialog{
+	position: absolute;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	top: 0px;
+	background-color: rgba(0,0,1,.5);
+	display: none;
+	z-index: 99999;
+}
+.dialog-main{
+	position: absolute;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	background-color: #ffffff;
+}
+.dialog-head{
+	width: 100%;
+	display: table;
+	height: 50px;
+	line-height: 50px;
+	border-bottom: 1px solid #CCCCCC;
+	background-color: #F4F4F9;
+}
+.dialog-head>div{
+	display: table-cell;
+	padding-left: 10px;
+	padding-right: 10px;
+}
+.dialog-head>div:first-child{
+	font-size: 18px;
+	width: 80%;
+}
+.dialog-head>div:first-child>span{
+	font-size: 14px;
+	color: #999;
+	margin-left: 5px;
+}
+.dialog-head>div:last-child{
+	font-size: 16px;
+	text-align: right;
+	color: #2CB7CA;
+	width: 20%;
+}
+.dialog-head>div:last-child>span{
+	padding: 10px 0px 10px 10px;
+}
+.dialog-content{
+	padding: 0 10px 10px 10px;
+	border-bottom: 1px solid #CCCCCC;
+	overflow-y: auto;
+}
+/*关键字*/
+.keyword-dialog .dialog-content{
+	padding-left: 0px;
+	padding-right: 0px;
+}
+.keyword-dialog .dialog-content>div{
+	display: table;
+	width: 100%;
+	height: 50px;
+	line-height: 50px;
+	margin-bottom: 10px;
+}
+.keyword-dialog .dialog-content>div>*{
+	display: table-cell;
+}
+.keyword-dialog .dialog-content>div>*:first-child{
+	width: 20%;
+	text-align: right;
+}
+.keyword-dialog .dialog-content>div>*:nth-child(2){
+	width: 70%;
+	padding: 0px 10px;
+}
+.keyword-dialog .dialog-content>div>*:nth-child(2)>[type="text"]{
+	width: 100%;
+	height: 90%;
+	font-size: inherit;
+}
+.keyword-dialog .dialog-content>div>*:last-child{
+	width: 10%;
+}
+.keyword-dialog .delete{
+	width: 20px;
+	height: 20px;
+}
+.addKeyWord{
+	padding-left: 10px;
+    width: 160px;
+    height: 45px;
+    font-size: 18px;
+	background-color:#2CB7CA;
+}
+.addKeyWord>.icon{
+	font-size: 25px;
+	position: absolute;
+	left: 10px;
+	top: 0px;
+}
+/***信息范围***/
+.scope-dialog .dialog-content{
+	padding-top: 0px;
+	padding-bottom: 0px;
+}
+.scope-dialog li>div{
+	clear: both;
+}
+.scope-dialog .btn{
+	padding: 5px 10px;
+	background-color: #F0F0F0;
+	color: #333;
+	font-size: 14px;
+	margin-right: 10px;
+	margin-bottom: 10px;
+	width: 69px;
+	float: left;
+	height:34px;
+    border-radius: 3px;
+}
+.scope-dialog .btn.active{
+	background-color: #24C0D7;
+	color: #FFFFFF;
+}
+.scope-dialog li{
+	border-bottom: 1px solid #ddd;
+	padding-top: 10px;
+	float: left;
+	width: 100%;
+}
+.scope-dialog li:last-child{
+	border-bottom-width: 0px;
+}
+.scope-dialog li>div{
+	font-size: 14px;
+	margin-bottom: 10px;
+}
+/**引导页**/
+.swiper-pagination{
+	top: 80px !important;
+	transition: 0ms !important;
+	-webkit-transition: 0ms !important;
+}
+.swiper-pagination-bullet{
+	margin-bottom: 15px !important;
+}
+.swiper-slide{
+	text-align: center;
+	z-index: -1;
+	background: #ffffff;
+	position: absolute !important;
+}
+.swiper-slide-active{
+	z-index: 2;
+}
+.slide-active{
+	z-index: 0;
+}
+.slide-down{
+	z-index: 2;
+	/* Firefox: 
+	-moz-animation-name:slidedown;
+	-moz-animation-duration:0.5s;
+	-moz-animation-timing-function:ease-in;
+	-moz-animation-iteration-count:1;
+	-moz-animation-play-state:running; */
+	/* Safari and Chrome:
+	-webkit-animation-name:slidedown;
+	-webkit-animation-duration:0.5s;
+	-webkit-animation-timing-function:ease-in;
+	-webkit-animation-iteration-count:1;
+	-webkit-animation-play-state:running; */
+	/* Opera:
+	-o-animation-name:slidedown;
+	-o-animation-duration:0.5s;
+	-o-animation-timing-function:ease-in;
+	-o-animation-iteration-count:1;
+	-o-animation-play-state:running;
+	webkit-transform: translateZ(0);
+	-moz-transform: translateZ(0);
+	-ms-transform: translateZ(0);
+	-o-transform: translateZ(0);
+	transform: translateZ(0);*/
+}
+@-webkit-keyframes slidedown {
+	0%{
+		top: -100%;
+	}
+	100% {
+		top: 0px;
+	}
+}
+.slide-up{
+	z-index: 2;
+	/* Firefox: 
+	-moz-animation-name:slideup;
+	-moz-animation-duration:0.5s;
+	-moz-animation-timing-function:ease-in;
+	-moz-animation-iteration-count:1;
+	-moz-animation-play-state:running;*/
+	/* Safari and Chrome: 
+	-webkit-animation-name:slideup;
+	-webkit-animation-duration:0.5s;
+	-webkit-animation-timing-function:ease-in;
+	-webkit-animation-iteration-count:1;
+	-webkit-animation-play-state:running;*/
+	/* Opera: 
+	-o-animation-name:slideup;
+	-o-animation-duration:0.5s;
+	-o-animation-timing-function:ease-in;
+	-o-animation-iteration-count:1;
+	-o-animation-play-state:running;
+	webkit-transform: translateZ(0);
+	-moz-transform: translateZ(0);
+	-ms-transform: translateZ(0);
+	-o-transform: translateZ(0);
+	transform: translateZ(0);*/
+}
+
+@-webkit-keyframes slideup {
+	0%{
+		top: 100%;
+	}
+	100% {
+		top: 0px;
+	}
+}
+.swiper-slide img{
+	/*position: relative;
+	top: 50%;
+	margin-top: -302px;*/
+	width: 100%;
+	height: 100%;
+}
+.swiper-pagination-bullet-active{
+	background-color: #35c5da !important;
+}
+.swiper-pagination-bullet{
+	opacity: .1;
+}
+.guide-bottom{
+	position: absolute;
+	bottom: 10px;
+	text-align: center;
+	width: 100%;
+	z-index: 99999;
+}
+.guide-bottom .arrow-up{
+	width: 30px;
+	height: 20px;
+	animation-name:start;
+	animation-duration:2s;
+	animation-timing-function:ease-in-out;
+	animation-iteration-count:infinite;
+	animation-play-state:running;
+	/* Firefox: */
+	-moz-animation-name:start;
+	-moz-animation-duration:2s;
+	-moz-animation-timing-function:ease-in-out;
+	-moz-animation-iteration-count:infinite;
+	-moz-animation-play-state:running;
+	/* Safari and Chrome: */
+	-webkit-animation-name:start;
+	-webkit-animation-duration:2s;
+	-webkit-animation-timing-function:ease-in-out;
+	-webkit-animation-iteration-count:infinite;
+	-webkit-animation-play-state:running;
+	/* Opera: */
+	-o-animation-name:start;
+	-o-animation-duration:2s;
+	-o-animation-timing-function:ease-in-out;
+	-o-animation-iteration-count:infinite;
+	-o-animation-play-state:running;
+}
+
+@-webkit-keyframes start {
+	0%{
+		opacity:0;
+		margin-bottom: 0px;
+	}
+	60% {
+		opacity:1;
+	}
+	100% {
+		opacity:0;
+		margin-bottom: 40px;
+	}
+}
+@-moz-keyframes start {
+	0%{
+		opacity:0;
+		margin-bottom: 0px;
+	}
+	60% {
+		opacity:1;
+	}
+	100% {
+		opacity:0;
+		margin-bottom: 40px;
+	}
+}
+@keyframes start {
+		0% {
+		opacity:0;
+		margin-bottom: 0px;
+	}
+	60% {
+		opacity:1;
+	}
+	100% {
+		opacity:0;
+		margin-bottom: 40px;
+	}
+}
+.guide-bottom .experience{
+	padding: 4px 8px;
+	margin-bottom: 20px;
+	display: none;
+}
+.guide-bottom .jumpGuide ,.guide-bottom .goToShare{
+	color: #D7D7D7;
+	position: absolute;
+	bottom: 10px;
+	display: block;
+	width: 50px;
+	height: 50px;
+}
+.guide-bottom .jumpGuide{
+	left: 20px;
+}
+.guide-bottom .goToShare{
+	right: 20px;
+}
+.share-dialog{
+	z-index: 10;
+}
+.share-dialog .dialog-content{
+	padding-top: 20px;
+	padding-bottom: 40px;
+}
+/**底部工具**/
+.bottom-toolbar{
+	display: table;
+	position: fixed;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	height: 45px;
+	width: 100%;
+	border-top: 1px solid #CCCCCC;
+	background-color: #F8F8F8;
+	z-index: 9999;
+}
+.bottom-toolbar>li{
+	display: table-cell;
+	width: 33%;
+	height: 45px;
+	line-height: 45px;
+	text-align: center;
+}
+.bottom-toolbar>li:first-child img{
+	width: 15px;
+    height: 15px;
+    margin-bottom: 2px;
+}
+.bottom-toolbar>li:nth-child(2) img{
+	width: 16px;
+    height: 16px;
+    margin-bottom: 2px;
+	margin-right: 2px;
+}
+.bottom-toolbar>li:last-child img{
+	width: 14px;
+    height: 14px;
+    margin-bottom: 3px;
+	margin-right: 2px;
+}
+.bottom-toolbar>li:nth-child(2){
+	width: 34%;
+	border-left: 1px solid #CCCCCC;
+	border-right: 1px solid #CCCCCC;
+}
+
+.tip{
+	margin:1px;
+	padding:5px;
+	background-color:#FAF5DF;
+	border:1px solid #F5DC9A;
+	opacity: 0.8;
+}
+.tip-button{
+	float: right;
+ 	margin-right: 20px;
+	margin-top:5px;
+}
+.tip-button span{
+	border-radius:2px;
+	display:inline-block;
+	padding:5px 35px;
+	margin-right:10px;
+	border:1px solid #24C0D7;
+	cursor:pointer;
+	color: #24C0D7;
+	background-color: #ffffff;
+}
+.tip-button span:nth-child(2){
+	background-color:#24C0D7;
+	color: #ffffff;
+}
+.visible{
+	display:none;
+}
+.show-days{
+	font-size:10px;
+	display:inline-block;
+	margin-left:2px;
+	color:#999;
+}
+#txt_tip{
+	text-indent:2em;
+	padding:10px;
+}
+/**********滑动css*********/
+.slide {
+	position: relative;
+	overflow: hidden;
+}
+.slide ul {
+	width: 100%;
+	height: 100%;
+	z-index: 1;
+	overflow: hidden;
+	background-size: 320px;
+}
+.slide li {
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	background: -webkit-radial-gradient(39% 77%,ellipse, #fff, #fff 50%, #edefff 70%);
+	background-size: 130% 120%;
+	-webkit-transition: transform .3s ease-in-out;
+	opacity: 0;
+}
+.slide img{
+	width: 100%;
+	height: 100%;
+}
+.slide-point {
+	position: absolute;
+	top: 10px;
+	right: 10px;
+	display: none;
+	width: 9px;
+	text-align: center;
+	font-size: 0;
+	z-index: 90;
+	-webkit-animation: dis-show 0s ease forwards;
+}
+.slide-point span {
+	margin: 6px auto;
+	width: 8px;
+	height: 8px;
+	border-radius: 100%;
+	background: #000;
+	opacity: .2;
+	display: block;
+	z-index: 100;
+}
+.slide-point span.current {
+	background: #007aff;
+	opacity: 1;
+}
+.no-result{
+	text-align:center;
+	color:#999;
+}
+.toolbar-list{
+	position: relative;
+}
+.toolbar-popover{
+	position: absolute;
+	width: 90px;
+	border: 1px solid #D0D0D0;
+	background-color: #F9FAFA;
+	bottom: 60px;
+	left: 50%;
+	margin-left: -50px;
+	display: none;
+	border-radius: 5px;
+	padding: 4px 2px;
+}
+.popover-ul li{
+	line-height: normal;
+	width: 90px;
+	text-align: center;
+}
+.popover-ul li div{
+	padding: 5px 0px;
+}
+.popover-ul li span{
+	display: block;
+	height: 1px;
+	width: 60px;
+	margin: 3px auto;
+	background-color: #BFBFBF;
+}
+.toolbar-popover .popover-arrow{
+	bottom: -6px;
+	left: 50%;
+	margin-left: -3px;
+	border-bottom-width: 0;
+	border-left-width: 5px;
+	border-right-width: 5px;
+	border-top-width: 6px;
+	position: absolute;
+	border-color: transparent;
+	border-style: solid;
+	border-top-color: #D0D0D0;
+}
+.toolbar-popover .popover-arrow:after{
+	position: absolute;
+	bottom: 1px;
+	margin-left: -5px;
+	content: " ";
+	border-color: transparent;
+	border-top-color: #F9FAFA;
+	border-bottom-width: 0;
+	border-left-width: 5px;
+	border-right-width: 5px;
+	border-top-width: 6px;
+	border-style: solid;
+}
+.popover-ul li.active>div{
+	background-color: #D2D2D2;
+	border-radius: 5px;
+}
+.toolbar-popover-mask{
+	background-color: transparent;
+	position: absolute;
+	left: 0px;
+	right: 0px;
+	top: 0px;
+	bottom: 0px;
+	display: none;
+}
+/*****wxsearch*****/
+
+.wxsearch .tubiao{
+	float:right;
+}
+.wxsearch .tubiao img{
+    width: 32px;
+    display: inline-block;
+    padding-left: 10px;
+/*    border-left: 3px solid #2AB9CA;*/
+	position: absolute;
+	z-index: 10;
+	top: 58px;
+	right: 100px;
+}
+.wxsearch .qc{
+	float:right;
+}
+.wxsearch .searchzhao1,.wxsearch .searchzhong1{
+	margin-top: 10px;
+	margin-bottom: 10px;
+	cursor:hand;
+	display: inline-block;
+	vertical-align: top;
+}
+
+.wxsearch .searchzhao1 img,.wxsearch .searchzhong1 img{
+	height:25px;
+	
+}
+.wxsearch .searchzhao2,.wxsearch .searchzhong2{
+	margin:0px 5px;
+	display: inline-block;
+	margin-bottom: 10px;
+	vertical-align: top;
+	margin-top: 13px;
+}
+.wxsearch .searchzhao3,.wxsearch .searchzhong3{
+	display: inline-block;
+	margin-bottom: 10px;
+	margin-top: 13px;
+	word-wrap: break-word;
+	word-break: break-all;
+	white-space: normal !important;
+	margin-left: -5px;
+	vertical-align: top;
+}
+.wxsearch .searchzhao3 span , .wxsearch .searchzhong3 span{
+	float:left;
+	
+}
+.wxsearch .rsssetbtn{
+	border:1px solid #37c6da; 
+	background-color:#37c6da;
+	height:38px; 
+	width:100%; 
+	line-height:38px;
+	vertical-align: middle;
+	border-radius: 4px;
+	font-size:15px;
+	color:#fff;
+}
+.wxsearch #myorder{
+	width:100%; 
+	margin-top:40px;
+	padding:0px 30px;
+}
+.wxsearch .searchshow{
+	border-top:1px solid #e5e6e9;
+	padding:0px 20px 10px 20px;
+}
+.wxsearch .wx-xhx{
+	border-top:1px solid #e5e6e9; 
+	width:100%;
+}
+.wxsearch .searchbs{
+	cursor:hand;
+	border-bottom:1px solid #e5e6e9; 
+}
+.wxsearch .parent-node img {
+	vertical-align: sub !important;
+}
+.wxsearch .kongbai{
+	height:149px;
+}
+.wxsearch .search-content{
+	float: left;
+	width: 100%;
+	margin-top: -20px;
+}
+.wxsearch .search-content .search-block{
+	padding-left:15px;
+	clear:both;
+}
+.wxsearch .search-content .search-block .title{
+	border-bottom:1px solid #E6E6E6;
+	height:60px;
+	line-height:60px;
+	color:#1d1d1d;
+	font-size: 17px;
+}
+.wxsearch .search-content .search-block .title img{
+	height:26px;
+	margin-right:10px;
+}
+.wxsearch .search-content .search-block div.list{
+	padding-right:15px;
+}
+.wxsearch .search-content .search-block  li{
+	word-break: break-all;
+    overflow: hidden;
+	display:block;
+	border-bottom:1px solid #E6E6E6;
+	height:52px;
+	line-height:50px;
+	width:100%;
+	clear:both;
+	color:#1d1d1d;
+}
+.wxsearch .jyshaxuan{
+	border-bottom:1px solid #e0e0e0;
+	width:100%;
+	height:40px;
+	margin:-10px 0px 0px;
+}
+.wxsearch .jyshaxuan .jyshug{
+	border-right:1px solid #ccc;
+	color:#2cb7ca;
+	line-height:30px;
+	height:30px;
+	margin-top:10px;
+}
+.wxsearch .jyshaxuan li>img{
+    width: 16px;
+    padding-bottom: 6px;
+    margin-left: 4px;
+}
+.wxsearch .shaixcl{
+	color:#2cb7ca;
+	background-image: url(/images/search/sys-jt-bottom2.png);
+}
+.wxsearch .jydq-dialog .btn,.wxsearch .jytype-dialog .btn {
+    padding: 5px 10px;
+    background-color: #F4F4F9;
+    color: #1d1d1d;
+    font-size: 14px;
+    margin-right: 10px;
+    margin-bottom: 12px;
+    width: 21%;
+    float: left;
+    border-radius: 3px;
+	height: 34px;
+}
+.wxsearch .jydq-dialog li,.wxsearch .jytype-dialog li  {
+    border-bottom: 1px solid #d9d6d6;
+    padding: 18px 0px 16px;
+    float: left;
+    width: 100%;
+}
+.wxsearch .jydq-dialog li>div ,.wxsearch .jytype-dialog li>div {
+    font-size: 14px;
+    margin-bottom: 10px;
+	clear:both;
+}
+.wxsearch .jyshxbottom{
+	border-top:1px solid #ccc;
+	width:100%;
+	height:45px;
+	display:block;
+	line-height:45px;
+    position: fixed;
+    left: 0px;
+    right: 0px;
+    bottom: 0px;
+    z-index: 999;
+}
+.wxsearch .jyshxbottom li{
+	width:50%;
+	font-size:18px;
+}
+.wxsearch .jyshxbottom .jydqsure{
+	 background: rgb(204, 204, 204);
+	 color:#fff;
+}
+.wxsearch .jyshxbottom .jydqsure.on{
+	background-color:#2cb7ca;
+	color:#fff;
+}
+.wxsearch .jyshxbottom .jydqreset{
+	background-color:#f0f9fa;
+	color:#2cb7ca;
+}
+.wxsearch .jydq-dialog .btn.active {
+    background-color: #24C0D7;
+    color: #FFFFFF;
+}
+.wxsearch .jytype-dialog .btn.active {
+    background-color: #24C0D7;
+    color: #FFFFFF;
+}
+.wxsearch .jydq-dialog #dqbtn.active {
+    background-color: #24C0D7;
+    color: #FFFFFF;
+}
+.wxsearch .jytype-dialog #dqbtn.active {
+    background-color: #24C0D7;
+    color: #FFFFFF;
+}
+.dialog-content #subdqbtn.active {
+    background-color: #24C0D7;
+    color: #FFFFFF;
+}
+#dqbtn{
+	padding: 7px 10px;
+    background-color: #F4F4F9;
+    color: #1d1d1d;
+    font-size: 15px;
+    margin-right: 10px;
+    margin-bottom: 14px;
+	height:36px;
+    border-radius: 3px;
+	font-weight: 600;
+}
+.jytype-dialog,.jydq-dialog{
+	margin-bottom: 30px;
+}
+.jy_rssetbj{
+	background-image: url("/images/wx/jysubcribe.png");
+	background-size:100% 100%;
+	height:135px;
+	width:100%;
+}
+.jy_rssetkw{
+	border-radius: 5px;
+    margin-top: -10px;
+    background-color: #fff;
+    box-shadow: 0 0 13px rgba(85, 85, 85,0.15);
+}
+.jy_rssetsc,.jy_pushmode{
+	border-radius: 5px;
+    margin-top: 10px;
+    background-color: #fff;
+    box-shadow: 0 0 13px rgba(85, 85, 85,0.15);
+}
+.jy_rssetvw{
+	border-radius: 5px;
+    margin-top: 10px;
+    background-color: #fff;
+    box-shadow: 0 0 13px rgba(85, 85, 85,0.15);
+}
+.dialog-por{
+	margin:10px;
+	padding:10px 15px;
+	background-color:#fffaf1;
+	border: 1px solid #ffba00;
+}
+/*jyabout*/
+
+.jyabout .jy-baseinfo{
+	background-color:#16DAFF;
+	width:100%;
+	padding:50px 20px 15px;
+	text-align:center;
+}
+.jyabout .jy-d{
+	color:#fff;
+	font-size:18px;
+	font-family: 微软雅黑;
+}
+.jyabout .jy-dayno{
+	float:left;
+	text-align:center;
+	color:#0069d2;
+    font-size: 75px;
+}
+.jyabout .jy-daysuf{
+	float:left;
+	text-align:left;
+	color:#0069d2;
+    font-weight: bold;
+	padding:5px;
+	line-height: 20px;
+	font-size:18px;
+	font-family: 微软雅黑;    
+	margin-top: 39px;
+}
+.jyabout .jy-daycont{
+	margin:5px auto 0px;
+	border-bottom:1px solid #0069d2;    
+	padding-bottom: 10px;
+}
+.jyabout .jy-from{
+	color:#fff;
+	font-size:18px;
+	margin:30px 0px -10px;
+	font-family: 微软雅黑;
+}
+.jyabout .jy-fromgovsuf,.jy-formentsuf{
+    float: left;
+    text-align: left;
+    color: #0069d2;
+    font-weight: bold;
+    padding:5px;
+    line-height: 20px;
+	font-size:18px;
+	font-family: 微软雅黑;    
+	margin-top: 20px;
+}
+.jyabout .jy-fromgov{
+	margin:5px auto 0px;
+	border-bottom:1px solid #0069d2;
+	padding-bottom: 30px;
+}
+.jyabout .jy-fromgovno,.jy-formentno{
+    float: left;
+    text-align: center;
+    color: #0069d2;
+    font-size: 75px;
+}
+.jyabout .jy-fromgovlist{
+	width:100%;
+	text-align:center;
+	color:#fff;
+	font-size:16px;
+	font-family: 微软雅黑;
+}
+.jyabout .jy-orin{
+	border:1px solid #fcff00;
+	padding:8px;
+	margin:30px auto;
+	color:#fcff00;
+	border-radius: 3px;
+    width: 251px;
+    font-size: 17px;
+}
+.jyabout .jy-shangx{
+	color:#fff;
+	padding: 40px 20px;
+}
+.jyabout .jy-first{
+	
+}
+.jyabout .jy-fontone{
+	font-size: 24px;
+    font-weight: bold;
+	font-family: 微软雅黑;
+}
+.jyabout .jy-fonttwo{
+	font-size: 18px;
+	font-family: 微软雅黑;
+}
+.jyabout .jy-tuxiang{
+	position: relative;
+	height:260px;
+	margin-left:10px;
+}
+.jyabout .jy-bg-line{
+	position: absolute;
+	border-right:1px solid #646467;
+	left:45px;
+}
+.jyabout .jy-bg-line li{
+	border-left:1px solid #646467;    
+	width: 45px;
+    height: 180px;
+}
+.jyabout .jy-histogram-x{
+	position: absolute;
+	top: 190px;
+    left: 40px;
+}
+.jyabout .jy-histogram-x li{
+	width: 45px;
+	color:#646467;
+}
+.jyabout .jy-histogram-y{
+	position: absolute;
+	width: 45px;
+	top: 25px;
+	text-align: center;
+}
+.jyabout .jy-histogram-y li{
+	height: 55px;
+	color:#3c3c41;
+	width: 50px;
+}
+.jyabout .jy-histogram-y li>img{
+	width: 20px;
+}
+.jyabout .jy-histogram-content{
+	position: absolute;
+	left:40px;
+	top:0px;
+	width:190px;
+	height:180px;
+}
+.jyabout .jy-histogram-content li{
+	float: left;
+    width: 100%;
+    height: 33%;
+    text-align: center;
+    position: relative;
+}
+.jyabout .jy-histogram-content li>span{
+	position: relative;
+    display: inline-block;
+    width: 100%;
+    height: 26px;
+}
+.jyabout .jy-histogram-content li>span>div{
+	position: absolute;
+    display: block;
+    height: 6px;
+	background-image:url(/images/wx/pc_8.png);
+	background-repeat:no-repeat;
+}
+.jyabout .aOne{
+    top: 33px;
+}
+.jyabout .aTwo{
+    top: 30px;
+}
+.jyabout .aThree{
+    top: 24px;
+}
+.jydiv-bidtoday,.jydiv-bidmonth,.jydiv-push{
+	position: absolute;
+    left: 99%;
+    top: -10px;
+    width: 124px;
+	text-align: left;
+	margin-left:5px;
+	color:#0bdae9;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+	height: 26px;
+}
+.jyabout .jy-tiao{
+	/*float: right;
+    margin-left: 5px;*/
+	font-size:12px;
+}
+.jyabout .jy-fengexian{
+	border:1px solid #646467; 
+	width:120px;
+	margin:15px 0px;
+}
+.jy-websearch-title{
+	margin:30px auto 20px;
+	font-size:18px;
+	font-weight:bold;
+	color:#2cb7ca;
+	letter-spacing: 2px;
+	text-align:center;
+}
+.jyabout .searchname{
+	background-color: #FFFFFF;
+    border: 1px solid #E6E6E6;
+    height: 45px;
+    padding: 2px 35px 2px 20px;
+    border-radius: 37px;
+    font-size: 16px;
+    position: relative;
+    box-shadow: none
+}
+.jyabout .wxhead{
+	margin:10px 20px;
+}
+.jyabout .tubiao{
+	float: right;
+}
+.jyabout .tubiao img {
+    top: 85px;
+    right: 10%;
+    width: 38px;
+    display: inline-block;
+    padding-left: 10px;
+    border-left: 2px solid #ccc;
+    position: absolute;
+    z-index: 10;
+}
+.jyabout .jy-websearch-result{
+	margin:30px;
+	border-top:1px solid #ccc;
+	padding: 30px 10px;
+    color: #000;
+    font-size: 14px;
+}
+.jyabout .jy-advise{
+	width: 200px;
+    margin-right: auto;
+    margin-left: auto;
+    margin-top: 30px;
+}
+.jyabout .jy-advise img{
+	width: 200px;
+}
+.jyabout .jy-N a{
+	color:#0987ff;
+	text-decoration:underline;
+}
+.interaction{
+	text-align: center;
+    margin-bottom: 20px;    
+	padding: 0px 10px;
+}
+.inin{
+	border: 1px solid #ccc;
+    height: 40px;
+    width: 80%;
+    font-size: 15px;
+	padding: 1px 10px;
+	border-radius: 4px 0px 0px 4px;
+}
+.jysub{
+	display: inline-block;
+    height: 40px;
+    background-color: #2cb7ca;
+    color: #fff;
+    width: 18%;
+    line-height: 40px;
+	position: relative;
+	top: 0px;
+	border-radius: 0px 4px 4px 0px;
+}
+.entercom{
+	margin-top:40px;
+}
+.enterspan{
+    display: inline-block;
+    border: 1px solid #27b7ca;
+    padding: 8px 16px;
+    border-radius: 20px;
+	color:#27b7ca;
+	margin-left: 10px;
+	
+}
+.enterspan img{
+	margin-left: 7px;
+    width: 10px;
+    margin-bottom: 4px;
+}
+/*拟建*/
+.prebuilt{
+}
+.prebuilt ul li{
+	border: 1px solid #f0f0f0;
+    padding: 3px 10px;
+    background-color: #F4F4F9;
+    margin-top: 5px;
+	line-height: 24px;
+    border-radius: 4px;
+}
+.pre-title{
+	font-size: 16px;
+    color: #1d1d1d;
+    font-weight: bolder;
+    margin-top: 15px;
+    margin-bottom: 10px;
+    font-family: PingFang-SC-medium;
+}
+.pre-type{
+	color:#686868;
+	font-size:15px;
+    font-family: PingFang-SC-medium;
+}
+.pre-cont{
+	color: #1d1d1d;
+    font-size: 16px;
+    font-family: PingFang-SC-medium;
+}
+.pre-enclosure{
+	border: 1px solid #e1e1e6;
+    padding: 10px;
+    background-color: #F4F4F9;
+    margin-top: 15px;
+    color: #000;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+	border-bottom:0px;
+}
+.pre-encont{
+    padding:12px 5px;
+    border-bottom: 1px solid #e1e1e6;
+}
+.pre-encont:last-child{
+	border-bottom: 0px;
+}
+.pre-dow{
+    padding:0px 5px 0px;
+    border: 1px solid #e1e1e6;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+	border-top: 0px;
+}
+.pre-encont a{
+	color: #000;
+    text-decoration: none;
+}
+.pre-encont img{
+	width: 40px;
+    margin-right: 10px;
+}
+.pre-enclosure img{
+	width: 18px;
+    margin-right: 10px;
+}
+.q-mark{
+	width: 20px;
+    margin-top: 7px;
+}
+.q-marklist{
+	width: 20px;
+    margin-top: 7px;
+}
+.newest{
+	background-color: #F53532;
+    width: 10px;
+    height: 10px;
+    position: absolute;
+    right: -3px;
+    top: -3px;
+    border-radius: 10px;
+}
+.point,.pointlist{
+	position: fixed;
+    top: 120px;
+    text-align: center;
+	padding: 20px;
+}
+.point img:nth-child(1),.pointlist img:nth-child(1){
+	width:300px;
+}
+.pointclose,.pointcloselist{
+	position: relative;
+    left: 80px;
+    width: 80px;
+    top: 20px;
+}
+/***发布时间**/
+.jypt-dialog{
+	text-align: center;
+}
+.jypt-dialog .btn.jypt-active{
+	background-color: #24C0D7;
+	color: #fff !important;
+}
+.jypt-dialog [type='text']{
+	border-radius: 0px;
+	width: 45%;
+	line-height: 30px;
+	padding: 0px 0px 0px 5px;
+}
+.jypt-dialog .jypt-timeinputs{
+	margin-top: 10px;
+	background-color: #F5F4FA;
+	padding: 10px;
+	display: inline-block;
+}
+.jypt-dialog .jypt-fg{
+	display: inline-block;
+	height: 34px;
+	vertical-align: top;
+	width: 15px;
+}
+.jypt-dialog .jypt-fg>span{
+	background-color: #CECECE;
+	height: 1px;
+	width: 15px;
+	display: block;
+	position: relative;
+	top: 16px;
+}
+.jypt-dialog .jypt-timeinputs-active{
+	background-color: #2CB7CA;
+}
+.jypt-dialog .jypt-timeinputs-active .jypt-fg>span{
+	background-color: #000;
+}
+.mbsc-ios .dwbc{
+	border-color: #ddd;
+}
+.mbsc-ios .dwb-s .dwb{
+	color: #24C0D7;
+}
+.mbsc-ios .dwbw .dwb2{
+	color: #24C0D7;
+	font-weight: bold;
+}
+.mbsc-ios .title{
+	opacity: 1 !important;
+	color: inherit !important;
+	font-weight: bold !important;
+}
+.mbsc-ios .dwbw{
+	float: left !important;
+}
+.mbsc-ios .dwb-s{
+	float: right !important;
+}
+.jyshaxuan div{
+	font-size: 14px;
+	color: #888;
+	background: url(/images/search/sys-jt-bottom.png)right center no-repeat;
+	background-size: 7px 7px;
+	padding-right: 10px;
+}
+.jyshaxuan{
+	height: 40px;
+	line-height: 40px;
+	width: 100%;
+	border-bottom: 1px solid #ccc;
+	padding-left: 5px;
+	display: flex;
+	justify-content: space-around;
+	align-content: center;
+}
+.money-dialog,.jypt-dialog{
+	padding:0 10px 10px 10px;
+	margin-top: 18px;
+}
+.money-dialog ul li {
+	color: #888;
+	float: left;
+	width: 100%;
+	height: 40px;
+	line-height: 40px;
+}
+.money-inp{
+	background-color:#f5f4fa;
+	height:60px !important;
+	color:#000 !important;
+}
+.money-inp input{
+	width:100%;
+}
+.money-inp .min-price{
+	width:42%;
+	position:relative;
+	top:19%;
+	left:3%;
+}
+.money-inp .max-price{
+	width:42%;
+	position:relative;
+	top:-45%;
+	left:55%;
+}
+.money-inp .min-price span,.money-inp .max-price span{
+	position:absolute;
+	top: 0%;
+	left:71%;
+}
+.fgx{
+	background-color: #CECECE;
+	height: 1px;
+	width: 15px;
+	display: block;
+	top: 18px !important;
+	left:106% !important;
+}
+.industry-dialog{
+	display: flex;
+	justify-content: space-between;
+	width: 100%;
+	min-height: 10rem;
+	font-size: 14px;
+	color: #1d1d1d;
+}
+.industry-dialog .hyHead {
+	width: 34%;
+	background-color: #FFFFFF;
+}
+.industry-dialog .hyHead li{
+	padding-left: 2rem;
+	height: 3rem;
+	line-height: 3rem;
+	border: 1px solid #e0e0e0;
+	margin-top: -1px;
+	float:none;
+}
+.industry-dialog .hyHead li.on{
+	background-color: #f4f4f9;
+	border-right: none;
+}
+.hyBody{
+	width: 66%;
+	background-color: #f4f4f9;
+
+}
+.hyBody .iner-list{
+	display: none;
+}
+.hyBody .iner-list ul li{
+	height: 3rem;
+	line-height: 3rem;
+	padding-left: 3rem;
+	border: 1px solid #e0e0e0;
+	margin-top: -1px;
+	border-left:none ;
+	float:none;
+}
+.hyBody .iner-list ul li.active{
+	background: #f4f4f9 url(../../images/search/icon-right-bg.png) 1.5rem center no-repeat;
+	background-size: 1rem 1rem;
+	color: #2cb7ca;
+}
+.jypt-dialog .btn,.money-dialog .btn{
+	padding: 5px 0px;
+	background-color: #F4F4F9;
+	color: #1d1d1d !important;
+	font-size: 14px;
+	margin-right: 10px;
+	margin-bottom: 12px;
+	width: 21%;
+	float: left;
+	border-radius: 3px;
+	height: 34px;
+}
+.money-dialog .active{
+	background-color: #24C0D7;
+	color: #fff;
+}

src/web/staticres/wxswordfish/superSearch.js

@@ -1,4 +1,215 @@
 $(function(){
+	
+	var winWidth=$(window).width();
+	var winHeight=$(window).height();
+	$(".point img:first").css("width",winWidth*0.8+"px");
+	$(".pointclose").css("width",winWidth*0.21+"px");
+	////
+	$(".q-mark").click(function(){
+		$(".point").removeClass("hidden");
+	});
+	$(".q-marklist").click(function(){
+		$(".pointlist").removeClass("hidden");
+	});
+	$(".pointclose").click(function(){
+		lifirst = false;
+		$(".point").addClass("hidden");
+	});
+	$(".pointcloselist").click(function(){
+		window.top.lifirst = false;
+		$(".pointlist").addClass("hidden");
+	});
+
+    //行业点击事件
+	var $leftTab = $(".industry-dialog .hyHead li"),
+		$inerLists = $(".industry-dialog .hyBody .iner-list");
+	$leftTab.on('click',function(){
+		$(this).addClass('on').siblings().removeClass("on");
+		$inerLists.eq($(this).index()).show().siblings().hide();
+		//如果点击全部 则清空以下选项
+        if($(this).index()==0){
+        	$(".hyBody li").removeClass("active");
+		}
+	})
+	$inerLists.on('click','li',function(){
+        $(".hyBody li").removeClass("active");//行业只能选一个
+		$(this).addClass('active').siblings().removeClass("active")
+	})
+
+	//金额点击事件
+	$(".money-dialog .btn").click(function(){
+		$(this).addClass("active");
+		$(".money-dialog .money-inp").removeClass("active");
+	})
+    $(".money-dialog .money-inp").click(function(){
+        $(this).addClass("active");
+        $(".money-dialog .btn").removeClass("active");
+	})
+
+    $(".shaixIndustry").click(function(){
+        $(this).addClass("shaixcl");
+        $(this).siblings().removeClass("shaixcl");
+        $(".industry-dialog").removeClass("hidden");
+        $(".jydq-dialog,.jytype-dialog,.jypt-dialog,.money-dialog").addClass("hidden");
+	})
+	$(".shaixMoney").click(function(){
+        $(this).addClass("shaixcl");
+        $(this).siblings().removeClass("shaixcl");
+		$(".money-dialog").removeClass("hidden");
+        $(".jydq-dialog,.jytype-dialog,.jypt-dialog,.industry-dialog").addClass("hidden");
+	})
+	//
+	$(".shaixpt").click(function(){
+		$(".jypt-dialog").removeClass("hidden");
+		$(".jydq-dialog,.jytype-dialog,.money-dialog,.industry-dialog").addClass("hidden");
+        $(this).addClass("shaixcl");
+        $(this).siblings().removeClass("shaixcl");
+		try{
+			adjustIframeHeight(1);
+		}catch(e){}
+	});
+	$(".shaixone").click(function(){
+		$(".jydq-dialog").removeClass("hidden");
+		$(".jypt-dialog,.jytype-dialog,.money-dialog,.industry-dialog").addClass("hidden");
+        $(this).addClass("shaixcl");
+        $(this).siblings().removeClass("shaixcl");
+		try{
+			adjustIframeHeight(0);
+		}catch(e){}
+	});
+	$(".shaixtwo").click(function(){
+		if(window.top.lipost == "F"){
+			//$.post("/front/lifirst","","")
+			window.top.lipost = "T"
+		}
+		if(window.top.lifirst){
+			$(".idpoint").removeClass("hidden");
+		}
+		$(".newest").removeClass("hidden");
+		$(".point").removeClass("idpoint");
+		$(".pointlist").removeClass("idpoint");
+		$(".jytype-dialog").removeClass("hidden");
+		$(".jypt-dialog,.jydq-dialog,.money-dialog,.industry-dialog").addClass("hidden");
+        $(this).addClass("shaixcl");
+        $(this).siblings().removeClass("shaixcl");
+		try{
+			adjustIframeHeight(0);
+		}catch(e){}
+	});
+		
+	var dialogObj = $(".contentone");
+	dialogObj.find(".btn").click(function(){
+		if($(this).parent().index() == 0){
+			dialogObj.find('div[id="dqbtn"]').removeClass("active");
+			dialogObj.find(".btn").removeClass("active");
+		}else{
+			dialogObj.find("ul:first li:first .btn").removeClass("active");
+		};
+		$(this).toggleClass("active");
+		if ($(this).attr("class")!="active"){
+			$(this).prevAll('div[id="dqbtn"]').removeClass("active");
+		};
+		if($(this).parent("li").find(".btn").length == $(this).parent("li").find(".btn.active").length){
+			$(this).prevAll('div[id="dqbtn"]').addClass("active");
+		};
+		if(dialogObj.find(".btn.active").length == 0){
+			dialogObj.find("ul:first li:first .btn").addClass("active");
+		};
+	});
+	dialogObj.find('div[id="dqbtn"]').click(function(){
+		$(this).toggleClass("active");
+		if ($(this).attr("class") != "active"){
+			$(this).nextAll(".btn").removeClass("active");
+		}else{
+			$(this).nextAll(".btn").addClass("active");
+			dialogObj.find("ul:first li:first .btn").removeClass("active");
+		};
+		if(dialogObj.find(".btn.active").length == 0){
+			dialogObj.find("ul:first li:first .btn").addClass("active");
+		};
+	});
+	
+	var dialogObjtwo = $(".contenttwo");
+	dialogObjtwo.find(".btn").click(function(){
+		if($(this).parent().index() == 0){
+			dialogObjtwo.find('div[id="dqbtn"]').removeClass("active");
+			dialogObjtwo.find(".btn").removeClass("active");
+		}else{
+			dialogObjtwo.find("ul:first li:first .btn").removeClass("active");
+		};
+		$(this).toggleClass("active");
+		if ($(this).attr("class")!="active"){
+			$(this).prevAll('div[id="dqbtn"]').removeClass("active");
+		};
+		if($(this).parent("li").find(".btn").length == $(this).parent("li").find(".btn.active").length){
+			$(this).prevAll('div[id="dqbtn"]').addClass("active");
+			dialogObjtwo.find("ul:first li:first .btn").removeClass("active");
+		};
+		if(dialogObjtwo.find(".btn.active").length == 0){
+			dialogObjtwo.find("ul:first li:first .btn").addClass("active");
+		};
+	});
+	
+	dialogObjtwo.find('div[id="dqbtn"]').click(function(){
+		$(this).toggleClass("active");
+		if ($(this).attr("class") != "active"){
+			$(this).nextAll(".btn").removeClass("active");
+		}else{
+			$(this).nextAll(".btn").addClass("active");
+			dialogObjtwo.find("ul:first li:first .btn").removeClass("active");
+		};
+		if(dialogObjtwo.find(".btn.active").length == 0){
+			dialogObjtwo.find("ul:first li:first .btn").addClass("active");
+		};
+	});
+	
+	$(".jysstj").find(".jydqsure").click(function(){
+		beforeSubmit(1);
+	});
+	$(".jysstj").find(".jydqreset").click(function(){
+		//$(".point").addClass("hidden");
+		$(".searchname [name='searchvalue']").val("");
+		$(".searchname [name='area']").val("");
+		$(".searchname [name='scope']").val("");
+		dialogObj.find(".btn").removeClass("active");
+		dialogObj.find('div[id="dqbtn"]').removeClass("active");
+		dialogObjtwo.find(".btn").removeClass("active");
+		dialogObjtwo.find('div[id="dqbtn"]').removeClass("active");
+		if(dialogObj.find(".btn.active").length == 0){
+			dialogObj.find("ul:first li:first .btn").addClass("active");
+		};
+		if(dialogObjtwo.find(".btn.active").length == 0){
+			dialogObjtwo.find("ul:first li:first .btn").addClass("active");
+		};
+		$(".jypt-timeinputs").removeClass("jypt-timeinputs-active");
+		$(".jypt-pt>button").removeClass("jypt-active");
+		$(".jypt-pt>button:first").addClass("jypt-active");
+	});
+	function processVal(value){
+		$("[name='searchvalue']").val(value.replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+"));
+	}
+
+	//获取输入时间
+	$(".jypt-pt button").click(function(){
+		var thisIndex = $(".jypt-pt .jypt-active").index();
+		$(".jypt-pt .jypt-active").removeClass("jypt-active");
+		if(thisIndex == $(this).index()){
+			$(this).removeClass("jypt-active");
+		}else{
+			$(this).addClass("jypt-active");
+		}
+		if($(".jypt-pt .jypt-active").length == 0){
+			$(".jypt-pt>button:first").addClass("jypt-active");
+		}
+		$(".jypt-timeinputs").removeClass("jypt-timeinputs-active");
+	});
+	$(".jypt-fg").click(function(){
+		$(".jypt-pt .jypt-active").removeClass("jypt-active");
+		$(".jypt-timeinputs").toggleClass("jypt-timeinputs-active");
+		if(!$(".jypt-timeinputs").hasClass("jypt-timeinputs-active")){
+			$(".jypt-pt>button:first").addClass("jypt-active");
+		}
+	});
 	$("#starttime").click(function(){
         $('#starttime').mobiscroll('show');
 	});
@@ -162,4 +373,4 @@ function getInputTime(){
 		endtime = "";
 	}
 	return [starttime,endtime]
-}
+}

src/web/staticres/wxswordfish/superSearch1.js

@@ -0,0 +1,165 @@
+$(function(){
+	$("#starttime").click(function(){
+        $('#starttime').mobiscroll('show');
+	});
+	$("#endtime").click(function(){
+        $('#endtime').mobiscroll('show');
+	});
+	initMobiscroll();
+});
+function initMobiscroll(){
+	var starttime = null;
+	var endtime = null;
+	if(localStorage){
+		var stime = localStorage.search_starttime;
+		var etime = localStorage.search_endtime;
+		if(stime){
+			$("#starttime").attr("data-value",stime);
+			starttime = new Date(Number(stime));
+			$('#starttime').val(starttime.Format("yyyy年MM月dd日"));
+		}else{
+			$("#starttime").attr("data-value","");
+			$('#starttime').val("");
+		}
+		if(etime){
+			$("#endtime").attr("data-value",etime);
+			endtime = new Date(Number(etime));
+			$('#endtime').val(endtime.Format("yyyy年MM月dd日"));
+		}else{
+			$("#endtime").attr("data-value","");
+			$('#endtime').val("");
+		}
+	}
+	$.mobiscroll.setDefaults({
+	   	theme: "ios",
+	   	lang: "zh",
+		setText: "确定",
+		clearText: "清空",
+		buttons: [ 
+		    'set',
+		    { 
+		        text: '选择时间',
+				cssClass: 'dwb title',
+		        handler: function(event,inst){ 
+		            
+		        }
+		    },
+			'clear'
+		],
+		dateFormat: "yyyy年mm月dd日",
+		dateOrder: "yyyymd",
+		timeWheels: "H",
+		timeFormat: "HH时 周DD",
+		dayNames: ["日","一","二","三","四","五","六"],
+		headerText: false,
+		yearSuffix: "年",
+		monthSuffix: "月",
+		daySuffix: "日",
+		showOnTap: false,
+		onBeforeShow: function(inst){
+			if(typeof(isWxsearchlist) != "undefined"){
+				window.top.$(".sl-jyshxbottom").addClass("hide");
+			}
+		},
+		onClosed: function(valueText, inst){
+			if(typeof(isWxsearchlist) != "undefined"){
+				window.top.$(".sl-jyshxbottom").removeClass("hide");
+			}
+		}
+	});
+	$("#starttime").mobiscroll().date({
+		maxDate: endtime,
+		onInit: function(inst){
+			if(starttime){
+				inst.setVal(new Date(Number(starttime)));
+			}
+		},
+		onSelect: function(valueText,inst){
+			var arrayVal = inst.getArrayVal();
+			var date = new Date(arrayVal[0],arrayVal[1],arrayVal[2]);
+			var inst = $("#endtime").mobiscroll('getInst');
+			inst.option({minDate: date});
+			if(localStorage){
+				localStorage.search_starttime = date.getTime();
+			}
+			$("#starttime").attr("data-value",date.getTime());
+			afterSelect();
+		},
+		onClear: function (event, inst){
+			$("#starttime").attr("data-value","");
+			if(localStorage){
+				localStorage.removeItem("search_starttime");
+			}
+			afterOnClear();
+    	}
+    });
+	$("#endtime").mobiscroll().date({
+		minDate: starttime,
+		onInit: function(inst){
+			if(endtime){
+				inst.setVal(new Date(Number(endtime)));
+			}
+		},
+		onSelect: function(valueText,inst){
+			var arrayVal = inst.getArrayVal();
+			var date = new Date(arrayVal[0],arrayVal[1],arrayVal[2]);
+			var inst = $("#starttime").mobiscroll('getInst');
+			inst.option({maxDate: date});
+			if(localStorage){
+				localStorage.search_endtime = date.getTime();
+			}
+			$("#endtime").attr("data-value",date.getTime());
+			afterSelect();
+		},
+		onClear: function (event, inst){
+			$("#endtime").attr("data-value","");
+			if(localStorage){
+				localStorage.removeItem("search_endtime");
+			}
+			afterOnClear();
+    	}
+    });
+}
+function afterSelect(){
+	$(".jypt-timeinputs").addClass("jypt-timeinputs-active");
+	$(".jypt-pt .jypt-active").removeClass("jypt-active");
+}
+function afterOnClear(){
+	if($("#starttime").attr("data-value") == "" && $("#endtime").attr("data-value") == ""){
+		$(".jypt-timeinputs").removeClass("jypt-timeinputs-active");
+		$(".jypt-pt>button:first").addClass("jypt-active");
+	}
+}
+function setPublishtime(){
+	var publishtime = $(".jypt-pt .jypt-active:not(#alltime)").attr("data-value");
+	if(publishtime){
+		return publishtime;
+	}else{
+		if(!$(".jypt-timeinputs").hasClass("jypt-timeinputs-active")){
+			return "";
+		}
+		publishtime = getInputTime().join("_");
+		if(publishtime != "_"){
+			return publishtime;	
+		}else{
+			return "";
+		}
+	}
+}
+function getInputTime(){
+	var starttime = $("#starttime").attr("data-value");
+	if(starttime){
+		starttime = $.trim(starttime);
+		starttime = starttime.substring(0,starttime.length - 3);
+	}else{
+		starttime = "";
+	}
+	var endtime = $("#endtime").attr("data-value");
+	if(endtime){
+		endtime = $.trim(endtime);
+		endtime = endtime.substring(0,endtime.length - 3);
+	}else{
+		endtime = "";
+	}
+	return [starttime,endtime]
+}

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

@@ -26,9 +26,9 @@
 			<!--开关-->
 			<div class="weui-cells weui-cells_form title">
 				<div class="weui-cell weui-cell_switch titleInner">
-					<div class="weui-cell__bd">超级搜索 <a href="/swordfish/search" id="searchuse" class="{{ if .T.switchstatus}}{{if ne .T.switchstatus 1}}hidden{{end}}{{end}}">使用</a></div>
+					<div class="weui-cell__bd">超级搜索 <a href="/swordfish/search" id="searchuse" class="{{ if .T.switchstatus}}{{if ne .T.switchstatus true}}hidden{{end}}{{end}}">使用</a></div>
 					<div class="weui-cell__ft">
-						<input id="check" class="weui-switch titleInput" type="checkbox" {{ if .T.switchstatus}}{{if eq .T.switchstatus 1}} checked="checked" {{end}}{{end}}>
+						<input id="check" class="weui-switch titleInput" type="checkbox" {{ if .T.switchstatus}}{{if eq .T.switchstatus true}} checked="checked" {{end}}{{end}}>
 					</div>
 				</div>
 			</div>

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

@@ -28,7 +28,7 @@
 				<div class="weui-cell weui-cell_switch titleInner">
 					<div class="weui-cell__bd">我关注的企业</div>
 					<div class="weui-cell__ft">
-						<input id="check" class="weui-switch titleInput" type="checkbox" {{ if .T.switchstatus}}{{if eq .T.switchstatus 1}} checked="checked" {{end}}{{end}}/>
+						<input id="check" class="weui-switch titleInput" type="checkbox" {{ if .T.switchstatus}}{{if eq .T.switchstatus true}} checked="checked" {{end}}{{end}}/>
 					</div>
 				</div>
 			</div>

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

@@ -28,7 +28,7 @@
 				<div class="weui-cell weui-cell_switch titleInner">
 					<div class="weui-cell__bd">订阅数据导出</div>
 					<div class="weui-cell__ft">
-						<input id="check" class="weui-switch titleInput" type="checkbox" {{ if .T.switchstatus}}{{if eq .T.switchstatus 1}} checked="checked" {{end}}{{end}}>
+						<input id="check" class="weui-switch titleInput" type="checkbox" {{ if .T.switchstatus}}{{if eq .T.switchstatus true}} checked="checked" {{end}}{{end}}>
 					</div>
 				</div>
 			</div>

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

@@ -28,7 +28,7 @@
 				<div class="weui-cell weui-cell_switch titleInner">
 					<div class="weui-cell__bd">中标企业搜索</div>
 					<div class="weui-cell__ft">
-						<input id="check" class="weui-switch titleInput" type="checkbox" {{ if .T.switchstatus}}{{if eq .T.switchstatus 1}} checked="checked" {{end}}{{end}}>
+						<input id="check" class="weui-switch titleInput" type="checkbox" {{ if .T.switchstatus}}{{if eq .T.switchstatus true}} checked="checked" {{end}}{{end}}>
 					</div>
 				</div>
 			</div>

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

@@ -87,7 +87,6 @@
 	<script type="text/javascript" src="/js/jypraise.js"></script>
 	<script type="text/javascript">
 		$(function(){
-			console.log({{.T.switchstatus}}+"------")
 			var thistype = "zndy";
 			$("#check").click(function(){
 				operatingswitch(thistype);

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

@@ -1,105 +1,116 @@
 <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="/wxswordfish/style.css?" rel="stylesheet">
-{{include "/common/inc.html"}}
-<script src="/js/jquery.js"></script>
-</script>
-<style type="text/css">
-body{
-	font-size:16px !important;
-	color: #000;
-	background-color:#f5f4fa;
-}
-.searchname{
-	background-color:#FFFFFF; 
-	border:1px solid #E6E6E6;
-	height:45px;
-	width:92%; 
-	padding:2px 70px 2px 20px;
-	border-radius:5px;
-	font-size:16px;
-	position:relative;
-	box-shadow:none;
-	cursor: pointer;
-	webkit-transform: translateZ(0);
-	-moz-transform: translateZ(0);
-	-ms-transform: translateZ(0);
-	-o-transform: translateZ(0);
-	transform: translateZ(0);
-}
-.wxhead{
-	height:160px;
-    padding: 45px 15px;
-	background-image:url(/images/wx/jysearch.png);
-	background-size:100% 160%;
-}
-.mainSearch .tubiao img {
-    width: 32px;
-    display: inline-block;
-    padding-left: 10px;
-    position: absolute;
-    z-index: 10;
-    top: 58px;
-    right: 62px;
-}
-.mainSearch .help img {
-    width: 23px;
-    position: absolute;
-    top: 55px;
-    right: 10px;
-}
-.mainSearch .qc img {
-    width: 30px;
-    display: inline-block;
-    padding-left: 10px;
-    position: absolute;
-    z-index: 10;
-    top: 58px;
-    right: 92px;
-}
-.otherSearch{
-	width:94%;
-	height:75px;
-	background-color:#fff;
-	border-radius:3px;
-	margin:0 auto;
-	background-position: right bottom;
-    background-size: 65px;
-    background-repeat: no-repeat;
-    background-image: url(/images/search/search-lists-rightBg.png);
-	
-	-moz-box-shadow: 5px -5px 12px #efeef3;
-	-webkit-box-shadow: 5px -5px 12px #efeef3;
-	box-shadow:5px -5px 12px #efeef3;
-}
-.otherSearch table{
-	width:100%
-}
-.otherSearch img{
-	margin-left: 15px;
-	margin-right: 8px;
-	width:30px;
-}
-.otherSearch .title{
-	width:85%;
-	padding-top:15px;
-	color:#1d1d1d;
-	font-size:18px;
-}
-.otherSearch .desc{
-	color:#686868;
-	font-size:17px;
-	
-}
-.block{
-	width:100%;
-	height:15px;
-}
-</style>
+    <title>搜索</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="renderer" content="webkit">
+    <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="no" />
+    <meta charset="utf-8">
+    <meta name="baidu-site-verification" content="cSFG2PMaYX" />
+    <meta name="applicable-device" content="pc,mobile" />
+    <link href="/css/bootstrap.min.css" rel="stylesheet">
+    <script src="/js/jquery.js"></script>
+    <script src="/js/bootstrap.min.js"></script>
+    {{Html `<!--[if lt IE 9]><script src="/js/html5shiv.min.js"></script><script src="/js/respond.min.js"></script><![endif]-->`}}
+    <script src="/js/jquery.js"></script>
+    <style type="text/css">
+        body{
+            font-size:16px !important;
+            color: #000;
+            background-color:#f5f4fa;
+        }
+        .searchname{
+            background-color:#FFFFFF;
+            border:1px solid #E6E6E6;
+            height:45px;
+            width:92%;
+            padding:2px 70px 2px 20px;
+            border-radius:5px;
+            font-size:16px;
+            position:relative;
+            box-shadow:none;
+            cursor: pointer;
+            webkit-transform: translateZ(0);
+            -moz-transform: translateZ(0);
+            -ms-transform: translateZ(0);
+            -o-transform: translateZ(0);
+            transform: translateZ(0);
+        }
+        .wxhead{
+            height:160px;
+            padding: 45px 15px;
+            background-image:url(/images/wx/jysearch.png);
+            background-size:100% 160%;
+        }
+        .mainSearch .tubiao img {
+            width: 32px;
+            display: inline-block;
+            padding-left: 10px;
+            position: absolute;
+            z-index: 10;
+            top: 58px;
+            right: 16%;
+        }
+        .mainSearch .help img {
+            width: 23px;
+            position: absolute;
+            top: 55px;
+            right: 3.5%;
+        }
+        .mainSearch .qc img {
+            width: 30px;
+            display: inline-block;
+            padding-left: 10px;
+            position: absolute;
+            z-index: 10;
+            top: 58px;
+            right: 26px;
+        }
+        .otherSearch{
+            width:94%;
+            height:75px;
+            background-color:#fff;
+            border-radius:3px;
+            margin:0 auto;
+            background-position: right bottom;
+            background-size: 65px;
+            background-repeat: no-repeat;
+            background-image: url(/images/search/search-lists-rightBg.png);
+
+            -moz-box-shadow: 5px -5px 12px #efeef3;
+            -webkit-box-shadow: 5px -5px 12px #efeef3;
+            box-shadow:5px -5px 12px #efeef3;
+        }
+        .otherSearch .img{
+            width:20%;
+            height: 100%;
+            float: left;
+        }
+        .otherSearch .img img{
+            width: 38px;
+            margin-left: 33%;
+            margin-top: 17%;
+        }
+        .otherSearch .content{
+            width:80%;
+            height: 100%;
+            float: left;
+        }
+        .content .title{
+            font-size: 17px;
+            color: #1d1d1d;
+            margin-top: 13px;
+        }
+        .content .desc{
+            margin-top: 5px;
+            font-size: 14px;
+            color: #686868;
+        }
+        .block{
+            width: 100%;
+            height: 20px;
+        }
+    </style>
 </head>
 <body class="mainSearch">
 	<!-->顶部搜索<-->
@@ -116,29 +127,25 @@ body{
 <div id="otherSearch">
 	<!-->超级搜索<-->
 	<div id="superSearch" class="otherSearch">
-		<table>
-			<tr>
-				<td rowspan="2"><img src="/images/search/search-sousuo.png"></td>
-				<td class="title">超级搜索</td>
-			</tr>
-			<tr>
-				<td class="desc">按行业、金额搜索，结果可按表格显示</td>
-			</tr>
-		</table>
+        <div class="img">
+            <img src="/images/search/search-sousuo.png">
+        </div>
+        <div class="content">
+            <div class="title">超级搜索</div>
+            <div class="desc">按行业、金额搜索，结果可按表格显示</div>
+        </div>
 	</div>
 	
 	<div class="block"></div>
 	<!-->中标企业搜索<-->
 	<div id="entseSearch" class="otherSearch">
-		<table>
-			<tr>
-				<td rowspan="2"><img src="/images/search/search-zhongqy.png"></td>
-				<td class="title">中标企业搜索</td>
-			</tr>
-			<tr>
-				<td class="desc">搜索企业的所有中标项目信息</td>
-			</tr>
-		</table>
+        <div class="img">
+            <img src="/images/search/search-zhongqy.png">
+        </div>
+        <div class="content">
+            <div class="title">中标企业搜索</div>
+            <div class="desc">搜索企业的所有中标项目信息</div>
+        </div>
 	</div>
 </div>
 </body>

src/web/templates/weixin/wxpush.html

@@ -19,7 +19,6 @@ if(sessionStorage){
 	initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 var b_view = "{{.T.view}}";
 $(function(){
-	console.log("----:"+{{.T.data}})
 	//
 	var zbadd = {{Msg "seo" "ZBADDRESS"}}
 	var width=$(window).width();
@@ -48,6 +47,9 @@ $(function(){
 			a_type[i]=o_pushinfo[i]["stype"];
 			topstype[i]=o_pushinfo[i]["topstype"];
 			substype[i]=o_pushinfo[i]["substype"];
+			projectname[i]=o_pushinfo[i]["projectname"];
+			projectid[i]=o_pushinfo[i]["projectid"];
+			buyer[i]=o_pushinfo[i]["buyer"];
 		}
 	}
 	if(typeof(s_words) != "undefined" && s_words.length > 0){
@@ -258,6 +260,7 @@ a{
 
 <body>
 <div></div>
+<div class=""></div>
 <div class="listcontent"></div>
 <span class=" text-center findnull">
 <div>