Merge branch 'dev2.0' of http://192.168.3.207:10080/qmx/jy into dev2.0

src/jfw/front/entsearch.go

@@ -19,8 +19,8 @@ import (
 type Entsearch struct {
 	*xweb.Action
 
-	bidsearchforentindex  xweb.Mapper `xweb:"/jylab/bidsearchforent/index.html"`
-	bidsearchforent       xweb.Mapper `xweb:"/jylab/bidsearchforent/list.html"`
+	bidsearchforentindex xweb.Mapper `xweb:"/jylab/bidsearchforent/index.html"`
+	//	bidsearchforent       xweb.Mapper `xweb:"/jylab/bidsearchforent/list.html"`
 	pcSearchZbqyAjax      xweb.Mapper `xweb:"/jylab/pcSearchZbqyAjax"`
 	recList               xweb.Mapper `xweb:"/jylab/bidsearchforent/recList"`
 	searchEntAndSupStatus xweb.Mapper `xweb:"/jylab/searchEntAndSupStatus"`
@@ -36,7 +36,7 @@ func (e *Entsearch) Bidsearchforentindex() error {
 	var shareid = e.GetString("id")
 	e.T["logid"] = config.Seoconfig["jyzbqyss"].(string)
 	if len(shareid) == 0 {
-		shareid = fmt.Sprintf("%s%d", config.Seoconfig["jysslby"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
+		shareid = fmt.Sprintf("%s%d", config.Seoconfig["jyzbqyss"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
 	}
 
 	searchvalue := e.GetString("searchvalue")
@@ -53,7 +53,83 @@ func (e *Entsearch) Bidsearchforentindex() error {
 		minprice = 0
 		maxprice = 0
 	}
+	var status = 0
+	var count int64
+	var Lastlist *[]map[string]interface{}
+	if len(searchvalue) > 0 {
+		list := []map[string]interface{}{}
+		list = jylabutil.GetProjectByEntName(searchvalue, area, minprice, maxprice, 1, 50)
 
+		for k, v := range list {
+			v["k"] = k + 1
+			if v["area"] == "A" {
+				v["area"] = ""
+			}
+			t1 := time.Unix(util.Int64All(v["publishtime"]), 0)
+			//v["timetemp"] = fmt.Sprint(util.Int64All(v["publishtime"]))
+			v["time1"] = util.TimeDiff(t1)
+			if v["jgtime"] != "" && v["jgtime"] != nil {
+				t2 := time.Unix(util.Int64All(v["jgtime"]), 0)
+				timeStr := t2.Format("2006-01-02")
+				v["time2"] = timeStr
+			} else {
+				v["time2"] = ""
+			}
+			if v["bidamount"] != nil {
+				v["bidamount"] = fmt.Sprintf("%.2f", v["bidamount"])
+			}
+			itemList := v["list"].([]interface{})
+			var subtypeid string
+			var bidstatusid string
+			for _, j := range itemList {
+				z := j.(map[string]interface{})
+				if z["subtype"] == "中标" || z["subtype"] == "成交" {
+					subtypeid = util.EncodeArticleId2ByCheck(util.ObjToString(z["infoid"]))
+				} else if z["bidstatus"] == "中标" || z["bidstatus"] == "成交" {
+					bidstatusid = util.EncodeArticleId2ByCheck(util.ObjToString(z["infoid"]))
+				}
+				v["linkid"] = util.EncodeArticleId2ByCheck(util.ObjToString(z["infoid"]))
+			}
+			if subtypeid != "" {
+				v["linkid"] = subtypeid
+			} else if bidstatusid != "" {
+				v["linkid"] = bidstatusid
+			}
+		}
+		e.T["list"] = list
+	} else if e.Method() == "POST" {
+		status = 2
+		mine := util.ObjToString(minprice)
+		maxe := util.ObjToString(maxprice)
+		count, Lastlist = getLastNewsData("", area, "", "", "", mine, maxe, 0, true, true)
+	} else {
+		e.DisableHttpCache()
+		NewbidsForIndex()
+		data := redis.Get("other", "index_bidentlist").([]interface{})
+		e.T["list"] = data[0]
+	}
+	if status == 2 {
+		if Lastlist != nil {
+			for _, v := range *Lastlist {
+				v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
+				stp, _ := v["subtype"].(string)
+				if stp == "" {
+					stp, _ = v["toptype"].(string)
+				}
+				area, _ := v["area"].(string)
+				ind := util.ObjToString(v["industry"])
+				v["stypeadd"], v["areaadd"], v["indadd"] = classify(stp, area, ind)
+				//正文匹配检索关键词
+				highlight, _ := v["highlight"].(map[string][]string)
+				detail := ""
+				for _, val := range highlight["detail"] {
+					detail += clearHtml.ReplaceAllString(val, "")
+				}
+				v["detail"] = detail
+			}
+		}
+		e.T["list"] = Lastlist
+	}
 	if minprice == 0 {
 		e.T["minprice"] = ""
 	} else {
@@ -66,13 +142,10 @@ func (e *Entsearch) Bidsearchforentindex() error {
 	}
 	e.T["searchvalue"] = searchvalue
 	e.T["area"] = area
+	e.T["count"] = count
 	e.T["pricetype"] = pricetype
 	e.T["shareid"] = se.EncodeString(shareid)
 
-	e.DisableHttpCache()
-	NewbidsForIndex()
-	data := redis.Get("other", "index_bidentlist").([]interface{})
-	e.T["list"] = data[0]
 	return e.Render("/pc/biddingsearch_enterprise.html", &e.T)
 }
 
@@ -102,7 +175,7 @@ func (e *Entsearch) PcSearchZbqyAjax() error {
 		for k, v := range list {
 			v["k"] = k + 1 + (currentPage-1)*50
 			if v["area"] == "A" {
-				v["area"] = "全国"
+				v["area"] = ""
 			}
 			t1 := time.Unix(util.Int64All(v["createtime"]), 0)
 			v["time1"] = util.TimeDiff(t1)
@@ -139,6 +212,7 @@ func (e *Entsearch) PcSearchZbqyAjax() error {
 		})
 	} else {
 		if area == "" && minprice == 0 && maxprice == 0 {
+			log.Println("----2222222222", currentPage)
 			data := redis.Get("other", "index_bidentlist").([]interface{})
 			e.ServeJson(map[string]interface{}{
 				"list": data[currentPage-1],
@@ -151,7 +225,7 @@ func (e *Entsearch) PcSearchZbqyAjax() error {
 			for k, v := range *list {
 				v["k"] = (k + 1) + (currentPage-1)*50
 				if v["area"] == "A" {
-					v["area"] = "全国"
+					v["area"] = ""
 				}
 				t := time.Unix(util.Int64All(v["publishtime"]), 0)
 				v["timetemp"] = fmt.Sprint(util.Int64All(v["publishtime"]))
@@ -174,7 +248,8 @@ func (e *Entsearch) PcSearchZbqyAjax() error {
 					stp, _ = v["toptype"].(string)
 				}
 				area, _ := v["area"].(string)
-				v["stypeadd"], v["areaadd"], _ = classify(stp, area, "")
+				ind := util.ObjToString(v["industry"])
+				v["stypeadd"], v["areaadd"], v["indadd"] = classify(stp, area, ind)
 				v["bidtype"] = stp
 				if v["bidamount"] != nil {
 					v["bidamount"] = fmt.Sprintf("%.2f", v["bidamount"])
@@ -192,13 +267,12 @@ func (e *Entsearch) PcSearchZbqyAjax() error {
 //点击"搜索"执行的方法
 func (e *Entsearch) Bidsearchforent() error {
 	defer util.Catch()
+	searchvalue := e.GetString("searchvalue")
 	var shareid = e.GetString("id")
 	e.T["logid"] = config.Seoconfig["jyzbqyss"].(string)
 	if len(shareid) == 0 {
 		shareid = fmt.Sprintf("%s%d", config.Seoconfig["jysslby"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
 	}
-
-	searchvalue := e.GetString("searchvalue")
 	area := e.GetString("area")
 	pricetype := e.GetString("pricetype")
 	minprice, _ := strconv.ParseFloat(e.GetString("minprice"), 64)
@@ -302,7 +376,7 @@ func NewbidsForIndex() {
 			for k, v := range *list {
 				v["k"] = (k + 1) + i*50
 				if v["area"] == "A" {
-					v["area"] = "全国"
+					v["area"] = ""
 				}
 				t := time.Unix(util.Int64All(v["publishtime"]), 0)
 				v["timetemp"] = fmt.Sprint(util.Int64All(v["publishtime"]))
@@ -320,8 +394,12 @@ func NewbidsForIndex() {
 				if stp == "" && v["toptype"] != nil {
 					stp, _ = v["toptype"].(string)
 				}
+				var ind = ""
+				if v["industry"] != nil {
+					ind = v["industry"].(string)
+				}
 				area, _ := v["area"].(string)
-				v["stypeadd"], v["areaadd"], _ = classify(stp, area, "")
+				v["stypeadd"], v["areaadd"], v["indadd"] = classify(stp, area, ind)
 				v["bidtype"] = stp
 			}
 			pages = append(pages, list)

src/jfw/front/front.go

@@ -579,6 +579,7 @@ func (m *Front) Sess(ostr string) error {
 	defer util.Catch()
 	strs := strings.Split(ostr, "__")
 	str := strings.Split(sewx.DecodeString(strs[0]), ",")
+	log.Println("str:", str)
 	if len(str) == 4 {
 		openid := str[0]
 		ok := FindUserAndCreateSess(openid, m.Session())
@@ -586,14 +587,18 @@ func (m *Front) Sess(ostr string) error {
 			actionurl := util.ObjToString(urlMap[str[3]])
 			if actionurl != "" {
 				if len(strs) > 1 {
-					//支持多个参数%s..
-					actionurl = fmt.Sprintf(actionurl, func(tmps []string) []interface{} {
-						res := make([]interface{}, len(tmps))
-						for k, v := range tmps {
-							res[k] = v
-						}
-						return res
-					}(strs[1:])...)
+					if strings.Contains(actionurl, "followent/entList") {
+						actionurl = fmt.Sprintf(actionurl, (strs[1] + "___" + strs[2]))
+					} else {
+						//支持多个参数%s..
+						actionurl = fmt.Sprintf(actionurl, func(tmps []string) []interface{} {
+							res := make([]interface{}, len(tmps))
+							for k, v := range tmps {
+								res[k] = v
+							}
+							return res
+						}(strs[1:])...)
+					}
 				}
 				m.Redirect(actionurl)
 			} else {
@@ -865,18 +870,16 @@ func (f *Front) Aboutus() error {
 
 //商务合作
 func (f *Front) Busicooperation() error {
-
+	var shareid = f.GetString("id")
+	if len(shareid) == 0 {
+		shareid = fmt.Sprintf("%s%d", config.Seoconfig["jyswhzy"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[7:14], rand.Intn(9))
+	}
+	f.T["logid"] = config.Seoconfig["jyswhzy"].(string)
+	f.T["shareid"] = se.EncodeString(shareid)
 	content, _ := f.Render4Cache("/pc/businesscooperation.html", &f.T)
 	return f.SetBody(content)
 }
 
-//中标企业搜索
-//func (f *Front) Bidsearchforent() error {
-//
-//	content, _ := f.Render4Cache("/pc/biddingsearch_enterprise.html", &f.T)
-//	return f.SetBody(content)
-//}
-
 func (f *Front) Gethotkey() error {
 	keys := []interface{}{}
 	tmp := redis.Get("sso", "jy_hotkeys")

src/jfw/front/shorturl.go

@@ -130,7 +130,7 @@ func (s *Short) Article(clientType, id string) error {
 			if href != "" && !strings.HasPrefix(href, "http") {
 				href = "http://" + href
 			}
-			po, bo, wo, obj := pcVRT(sid)
+			po, bo, wo, obj := pcVRT(sid, industry)
 			if obj != nil && len(obj) > 0 {
 				if len(po) > 0 {
 					s.T["projectOther"] = po

src/jfw/front/swordfish.go

@@ -274,6 +274,7 @@ func detailLikeRpc(Interest []string, res *[]map[string]interface{}, flag bool)
 //跳转到pc查询剑鱼信息列表
 func (m *Front) Searchinfolist(p string) error {
 	defer util.Catch()
+	return m.Redirect("/jylab/supsearch/index.html")
 	var shareid = m.GetString("id")
 	if len(shareid) == 0 {
 		shareid = fmt.Sprintf("%s%d", config.Seoconfig["jysslby"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
@@ -1092,7 +1093,7 @@ func (m *Front) PcVisitRedirect(sid string) {
 		if href != "" && !strings.HasPrefix(href, "http") {
 			href = "http://" + href
 		}
-		po, bo, wo, obj := pcVRT(sid)
+		po, bo, wo, obj := pcVRT(sid, "")
 		if obj != nil && len(obj) > 0 {
 			if len(po) > 0 {
 				m.T["projectOther"] = po
@@ -1118,7 +1119,7 @@ func (m *Front) PcVisitRedirect(sid string) {
 
 //pc三级页跳转
 //20170821增加查询字段s_subscopeclass
-func pcVRT(sid string) (po, bo, wo []map[string]interface{}, objdata map[string]interface{}) {
+func pcVRT(sid, industry string) (po, bo, wo []map[string]interface{}, objdata map[string]interface{}) {
 	defer util.Catch()
 	var projectOther, buyerOther, winnerOther []map[string]interface{}
 	if len(sid) > 5 {
@@ -1153,7 +1154,10 @@ func pcVRT(sid string) (po, bo, wo []map[string]interface{}, objdata map[string]
 					finalType = ""
 				}
 			}
-			(*obj)["stypeadd"], (*obj)["areaadd"], _ = classify(finalType, area, "")
+			if industry == "" {
+				industry = util.ObjToString((*obj)["s_subscopeclass"])
+			}
+			(*obj)["stypeadd"], (*obj)["areaadd"], (*obj)["indadd"] = classify(finalType, area, industry)
 			//增加处理信息逻辑
 			objdata = *obj
 			queryStr := ""
@@ -2100,7 +2104,7 @@ func (f *Front) SearchResult(at, name string) error {
 			}
 
 			datas = elastic.GetPage(INDEX, TYPE, query, bidSearch_sort, `"_id","title","publishtime","toptype","subtype","type","area","href","bidopentime","winner","buyer","bidamount","budget","s_subscopeclass","projectname"`, startPage, limitcount)
-			log.Println("datas:", *datas)
+			//log.Println("datas:", *datas)
 			redis.Put("other", "classify_"+name, datas, 2*60*60)
 		} else {
 			b, _ := json.Marshal(list)

src/jfw/modules/entsesearch/src/web/staticres/jylab/entsesearch/js/dropload.js

@@ -91,7 +91,6 @@
 
         // 窗口调整
         $win.on('resize',function(){
-			return;
             clearTimeout(me.timer);
             me.timer = setTimeout(function(){
                 if(me.opts.scrollArea == win){

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

@@ -457,13 +457,13 @@
 						<li>价格区间</li>
 						<li class="money-inp">
 							<div class="min-price">
-								<input class="form-control money-input" id="money_from"  placeholder="" type="number"
-									   onkeydown="if(event.keyCode!=190  && event.keyCode!=8 && (event.keyCode<48 || event.keyCode>57)){return false;}"/>
+								<input class="form-control money-input" id="money_from"  placeholder="" type="text"
+									   />
 								<span class="min-unit">万元</span>
 								<span class="fgx"></span>
 							</div>
 							<div class="max-price">
-								<input class="form-control money-input"  id="money_to" placeholder="" type="number"
+								<input class="form-control money-input"  id="money_to" placeholder="" type="text"
 									   />
 								<span class="max-unit">万元</span>
 							</div>
@@ -594,7 +594,7 @@
 
         //搜索框输入
         $("#searchname").on("input propertychange",function(){
-            var snqc = $("#searchname").val();
+            var snqc = $.trim($("#searchname").val());
             if(snqc.length > 0){
                 $(".qc").removeClass("hidden");
                 $(".tubiao").removeClass("hidden");
@@ -612,7 +612,7 @@
 
         //搜索框选中
         $("#searchname").focus(function(){
-            var snqc = $("#searchname").val();
+            var snqc = $.trim($("#searchname").val());
             if(snqc.length > 0){
                 $(".qc").removeClass("hidden");
                 $(".tubiao").removeClass("hidden");
@@ -640,8 +640,88 @@
             }
         });
 
+        //金额最小值
+        var reg = /^[\u4e00-\u9fa5]+$/;
+        var minnum = "";
+        $("#money_from").on("input propertychange",function(){
+            var minp = $.trim($(this).val()).replace(/\s/g,"");
+            $(this).val(minp);
+            if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
+                if((reg.test(minp)||isNaN(minp))&&minp.indexOf(".")<0){
+                    $(this).val(minnum);
+                }else{
+                    minp = minp.substr(0,minp.length-1);
+                    if(reg.test(minp)||isNaN(minp)){
+                        $(this).val(minnum);
+                    }else{
+                        if(minp.indexOf(".")>0){
+                            var offront = minp.split(".")[0];
+                            var ofafter = minp.split(".")[1];
+                            if(offront.length>9||ofafter.length>2){
+                                if(offront.length>9){
+                                    $(this).val(offront.substr(0,9)+"."+ minnum.split(".")[1].substr(0,2));
+                                    minnum = offront.substr(0,9)+"."+ minnum.split(".")[1].substr(0,2);
+                                }else{
+                                    $(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2));
+                                    minnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
+                                }
+                            }else{
+                                $(this).val(minp);
+                                minnum = minp;
+                            }
+                        }else{
+                            $(this).val(minp);
+                            minnum = minp;
+                        }
+                    }
+                }
+            }else{
+                minnum = minp;
+            }
+            changeStyOfMoneyInput();
+        })
+
+        var maxnum = "";
+        $("#money_to").on("input propertychange",function(){
+            var maxp = $.trim($(this).val()).replace(/\s/g,"");
+            $(this).val(maxp);
+            if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(maxp)){
+                if((reg.test(maxp)||isNaN(maxp))&&maxp.indexOf(".")<0){
+                    $(this).val(maxnum);
+                }else{
+                    maxp = maxp.substr(0,maxp.length-1);
+                    if(reg.test(maxp)||isNaN(maxp)){
+                        $(this).val(maxnum);
+                    }else{
+                        if(maxp.indexOf(".")>0){
+                            var offront = maxp.split(".")[0];
+                            var ofafter = maxp.split(".")[1];
+                            if(offront.length>9||ofafter.length>2){
+                                if(offront.length>9){
+                                    $(this).val(offront.substr(0,9)+"."+ maxnum.split(".")[1].substr(0,2));
+                                    maxnum = offront.substr(0,9)+"."+ maxnum.split(".")[1].substr(0,2);
+                                }else{
+                                    $(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2));
+                                    maxnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
+                                }
+                            }else{
+                                $(this).val(maxp);
+                                maxnum = maxp;
+                            }
+                        }else{
+                            $(this).val(maxp);
+                            maxnum = maxp;
+                        }
+                    }
+                }
+            }else{
+                maxnum = maxp;
+            }
+            changeStyOfMoneyInput();
+        })
+
         //金额输入
-        $(".money-input").on("input propertychange",function(){
+        $(".money-input aaaa").on("input propertychange",function(){
             var val_m = $(this).val();
             if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(val_m)){
                 val_m = val_m.substr(0,val_m.length-1);
@@ -654,11 +734,12 @@
             if(val!="" ||  money_from!="" || money_to!=""){
                 $(".money-inp").addClass("money-inp-active");
                 $(".money .btn").removeClass("active_m");
-			}else{
+            }else{
                 $(".money .btn").addClass("active_m");
                 $(".money-inp").removeClass("money-inp-active");
-			}
+            }
         });
+        //
 
         //金额blur
         $(".money-input").blur(function(){
@@ -754,6 +835,19 @@
         }
     });
 
+    //金额输入时 改变其样式
+	function changeStyOfMoneyInput() {
+        var money_from = $.trim($("#money_from").val());
+        var money_to = $.trim($("#money_to").val());
+        if(money_from!="" || money_to!=""){
+            $(".money-inp").addClass("money-inp-active");
+            $(".money .btn").removeClass("active_m");
+        }else{
+            $(".money .btn").addClass("active_m");
+            $(".money-inp").removeClass("money-inp-active");
+        }
+    }
+
     //企业推荐列表
     function getRecList(entName_key) {
         $("#recList").html("");

src/jfw/modules/pushproject/src/config.json

@@ -1,16 +1 @@
-{
-    "durationMinutes": "3",
-    "elasticPoolSize": 30,
-    "elasticsearch": "http://192.168.3.18:9800",
-    "lastid": "596f21935d11e1c7455ddc7f",
-    "mongodbName": "qfw",
-    "mongodbPoolSize": "20",
-    "mongodbServers": "192.168.3.18:27080",
-    "redisServers": "sso=192.168.3.14:1379,other=192.168.3.14:1379,push=192.168.3.14:3379",
-    "rpcPort": "8759",
-    "viewDomain": "192.168.3.78",
-    "weixinRpcServer": "127.0.0.1:80",
-    "wxcontent": "剑鱼推送",
-    "wxgroup": "关注项目",
-    "wxtitle": "您关注的项目《%s》有新的公告信息！"
-}
+{"durationMinutes":"3","elasticPoolSize":30,"elasticsearch":"http://192.168.3.18:9800","lastid":"","mongodbName":"qfw","mongodbPoolSize":"20","mongodbServers":"192.168.3.18:27080","redisServers":"sso=192.168.3.14:1379,other=192.168.3.14:1379,push=192.168.3.14:3379","rpcPort":"8759","viewDomain":"192.168.3.78","weixinRpcServer":"127.0.0.1:8083","wxcontent":"剑鱼推送","wxgroup":"关注项目","wxtitle":"您关注的项目《%s》有新的公告信息！"}

src/seo.json

@@ -338,6 +338,7 @@
 	"jySEMtgy":"17",
 	"jyzbqyss":"18",
 	"jynjxmy":"19",
+	"jyswhzy":"20",
 	"module":{
 		"subscribe":"订阅页",
 		"/list/":"标签页",
@@ -346,7 +347,8 @@
 		"jyblog":"博客页",
 		"aboutus":"关于我们页",
 		"bidsearchforent":"中标企业搜索页",
-		"proposedProject":"拟建项目页"
+		"proposedProject":"拟建项目页",
+		"busicooperation":"商务合作页"
 	},
 	"referer":{
 		"baidu.com":"百度SEO",

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

@@ -181,6 +181,7 @@ border-radius:2px;
   font-size: 16px;
   background-color: #ffffff;
   border: 1px solid #e0e0e0;
+	cursor: pointer;
 }
 
 #searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx .search-right-wx-inner .wx-inner-title {

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

@@ -1644,34 +1644,34 @@ body{
 	width:30px;
 }
 #table table>tbody>tr>td:nth-child(2) div{
-	width:58px;
+	width:168px;
+	text-align: left;
 }
 #table table>tbody>tr>td:nth-child(3) div{
 	width:60px;
 }
 #table table>tbody>tr>td:nth-child(4) div{
-	width:126px;
-	text-align: left;
+	width:56px;
+	text-align: right;
 }
 #table table>tbody>tr>td:nth-child(5) div{
-	width:168px;
+	width:126px;
 	text-align: left;
 }
 #table table>tbody>tr>td:nth-child(6) div{
-	width:56px;
-	text-align: right;
-}
-#table table>tbody>tr>td:nth-child(7) div{
 	width:75px;
 }
-#table table>tbody>tr>td:nth-child(8) div{
+#table table>tbody>tr>td:nth-child(7) div{
 	width: 112px;
 	text-align: left;
 }
-#table table>tbody>tr>td:nth-child(9) div{
+#table table>tbody>tr>td:nth-child(8) div{
 	width: 56px;
 	text-align: right;
 }
+#table table>tbody>tr>td:nth-child(9) div{
+	width:58px;
+}
 #table tr td{
 	border: 1px solid #E0E0E0;
 	text-align: center;
@@ -1765,5 +1765,6 @@ body{
 }
 #del_history{
 	float: right;
-	margin: 9px;
-}
+	margin: 11px;
+	width: 15px;
+}

src/web/staticres/js/biddingSearch.js

@@ -224,7 +224,7 @@ $(function() {
 				}else{
 					$("#induAll").addClass("active");
 					$(".layheader div:nth-child(1)").html("超级搜索");
-					$(".layheader div:nth-child(2)").html("按行业、金额搜索、结果可按表格显示");
+					$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
 					$("#labModal").modal("show");
 				}
 			}else{
@@ -262,7 +262,7 @@ $(function() {
 					
 				}else{
 					$(".layheader div:nth-child(1)").html("超级搜索");
-					$(".layheader div:nth-child(2)").html("按行业、金额搜索、结果可按表格显示");
+					$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
 					$("#labModal").modal("show");
 					$("#induAll").addClass("active");
 				}

src/web/staticres/js/dropload.js

@@ -91,7 +91,6 @@
 
         // 窗口调整
         $win.on('resize',function(){
-			return;
             clearTimeout(me.timer);
             me.timer = setTimeout(function(){
                 if(me.opts.scrollArea == win){

src/web/staticres/js/login.js

@@ -143,6 +143,9 @@ var getNewShareId = function(num){
 					if(keysorpname!=undefined&&keysorpname!=""){
 						$.post("/front/rediskw",{"skw":keysorpname,"num":kopshareid});
 					}
+					break;
+				case "20"://商务合作
+					
 					break;
 			}
 			if(num=="13"&&!kzyflag){

src/web/staticres/js/proproject.js

@@ -20,8 +20,11 @@ $(function() {
 	//
 	$("#timebut").click(function(){
 		$(this).hide();
-		$(".timerInput").addClass("active");
 		$(".timerInput").removeClass("customtime-active");
+		if($("#starttime").val()==""&&$("#endtime").val()==""){
+			return false;
+		}
+		$(".timerInput").addClass("active");
 		$(".timer").find("ul li:first-child").removeClass("active");
 		$(".release-time .timer li").removeClass("active");
 		beforeSubmit()
@@ -146,8 +149,6 @@ function appendDatas(datas){
 	$(".pagination-inner").find("span").text(currentPage);
 	if(datas.length<pageSize){
 		$(".nbnext").addClass("disabled");
-	}else{
-		$(".nbnext").removeClass("disabled");
 	}
 	for(var i=0;i<datas.length;i++){
 		var index = (currentPage - 1) * pageSize + i + 1;

src/web/staticres/js/superSearch.js

@@ -59,7 +59,7 @@ $(function() {
 				
 			}else{
 				$(".layheader div:nth-child(1)").html("超级搜索");
-				$(".layheader div:nth-child(2)").html("按行业、金额搜索、结果可按表格显示");
+				$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
 				$("#labModal").modal("show");
 			}
 		}else{
@@ -300,8 +300,12 @@ function appendDatas(datas,flag){
 			}
 		}
 		listHtml += '<li>'
-					+'<div class="liLuceneList" style="border-bottom: 1px solid #EBEBEB;">'
-					+'<div class="luce-left"><em>'+index+'.</em>'
+		if(datas.length==(i+1)){
+			listHtml +='<div class="liLuceneList">'
+		}else{
+			listHtml +='<div class="liLuceneList" style="border-bottom: 1px solid #EBEBEB;">'
+		}
+		listHtml +='<div class="luce-left"><em>'+index+'.</em>'
 					+'<div class="left-title">'
 					+'<a onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank"> '+title+'</a>'
 					+'</div>'

src/web/staticres/wxswordfish/superSearch.js

@@ -32,15 +32,53 @@ $(function(){
             toOpenSupersearch();
 		}
 	});
+
+    var reg = /^[\u4e00-\u9fa5]+$/;
+    var maxnum = "";
     $(".maxMrice").click(function(){
         if(!open_supersearch){
             toOpenSupersearch();
         }
     }).on("input propertychange",function(){
+    	/*
         var minp = $(this).val()
         if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
             minp = minp.substr(0,minp.length-1);
             $(this).val(minp)
+        }*/
+        var maxp = $.trim($(this).val()).replace(/\s/g,"");
+        $(this).val(maxp);
+        if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(maxp)){
+            if((reg.test(maxp)||isNaN(maxp))&&maxp.indexOf(".")<0){
+                $(this).val(maxnum);
+            }else{
+                maxp = maxp.substr(0,maxp.length-1);
+                if(reg.test(maxp)||isNaN(maxp)){
+                    $(this).val(maxnum);
+                }else{
+                    if(maxp.indexOf(".")>0){
+                        var offront = maxp.split(".")[0];
+                        var ofafter = maxp.split(".")[1];
+                        if(offront.length>9||ofafter.length>2){
+                            if(offront.length>9){
+                                $(this).val(offront.substr(0,9)+"."+ maxnum.split(".")[1].substr(0,2));
+                                maxnum = offront.substr(0,9)+"."+ maxnum.split(".")[1].substr(0,2);
+                            }else{
+                                $(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2));
+                                maxnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
+                            }
+                        }else{
+                            $(this).val(maxp);
+                            maxnum = maxp;
+                        }
+                    }else{
+                        $(this).val(maxp);
+                        maxnum = maxp;
+                    }
+                }
+            }
+        }else{
+            maxnum = maxp;
         }
     }).blur(function(){
         var max=$(".maxMrice").val(),min=$(".minMrice").val();
@@ -50,15 +88,51 @@ $(function(){
 		}
 	});
 
+    var minnum = "";
     $(".minMrice").click(function(){
         if(!open_supersearch){
             toOpenSupersearch();
         }
     }).on("input propertychange",function(){
+    	/*
         var minp = $(this).val()
         if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
             minp = minp.substr(0,minp.length-1);
             $(this).val(minp)
+        }*/
+        var minp = $.trim($(this).val()).replace(/\s/g,"");
+        $(this).val(minp);
+        if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
+            if((reg.test(minp)||isNaN(minp))&&minp.indexOf(".")<0){
+                $(this).val(minnum);
+            }else{
+                minp = minp.substr(0,minp.length-1);
+                if(reg.test(minp)||isNaN(minp)){
+                    $(this).val(minnum);
+                }else{
+                    if(minp.indexOf(".")>0){
+                        var offront = minp.split(".")[0];
+                        var ofafter = minp.split(".")[1];
+                        if(offront.length>9||ofafter.length>2){
+                            if(offront.length>9){
+                                $(this).val(offront.substr(0,9)+"."+ minnum.split(".")[1].substr(0,2));
+                                minnum = offront.substr(0,9)+"."+ minnum.split(".")[1].substr(0,2);
+                            }else{
+                                $(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2));
+                                minnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
+                            }
+                        }else{
+                            $(this).val(minp);
+                            minnum = minp;
+                        }
+                    }else{
+                        $(this).val(minp);
+                        minnum = minp;
+                    }
+                }
+            }
+        }else{
+            minnum = minp;
         }
     }).blur(function(){
         var max=$(".maxMrice").val(),min=$(".minMrice").val();
@@ -186,71 +260,7 @@ $(function(){
     });
 
 
-    //铺设行业信息
-    $.post("/jylab/getIndustry",function(result){
-        var industryData,sortArray;
-        var industryHtml="";
-        if(result){
-             industryData=result.industry;
-             sortArray=result.sortArray;
-		}
-        if(sortArray!=""&&industryData!=""){
-            for(var i in sortArray){
-                industryHtml+="<li><div id=\"dqbtn\" style=\"width:81px;\">"+sortArray[i]+"</div>";
-                var childnode=industryData[sortArray[i]];
-                for(var j in childnode){
-                    industryHtml+="<button class=\"btn\" data-value="+sortArray[i]+"_"+childnode[j]+">"+childnode[j]+"</button>";
-                }
-                industryHtml+="</li>";
-            }
-            $(".industry-dialog .contentthree ul").append(industryHtml);
-
-
-            //行业点击事件
-            var dialogObjthree = $(".contentthree");
-            dialogObjthree.find(".btn").click(function(){
-                if($(this).parent().index() == 0){
-                    dialogObjthree.find('div[id="dqbtn"]').removeClass("active");
-                    dialogObjthree.find(".btn").removeClass("active");
-                }else{
-                    if(open_supersearch){				//判断是否开通超级搜索
-                        dialogObjthree.find("ul:first li:first .btn").removeClass("active");
-                    }else{
-                        toOpenSupersearch();
-                        return
-                    }
-                };
-                $(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");
-                    dialogObjthree.find("ul:first li:first .btn").removeClass("active");
-                };
-                if(dialogObjthree.find(".btn.active").length == 0){
-                    dialogObjthree.find("ul:first li:first .btn").addClass("active");
-                };
 
-            });
-            dialogObjthree.find('div[id="dqbtn"]').click(function(){
-                if(open_supersearch){
-                    $(this).toggleClass("active");
-                    if ($(this).attr("class") != "active"){
-                        $(this).nextAll(".btn").removeClass("active");
-                    }else{
-                        $(this).nextAll(".btn").addClass("active");
-                        dialogObjthree.find("ul:first li:first .btn").removeClass("active");
-                    };
-                    if(dialogObjthree.find(".btn.active").length == 0){
-                        dialogObjthree.find("ul:first li:first .btn").addClass("active");
-                    };
-                }else{
-                    toOpenSupersearch();
-                }
-            });
-        }
-	});
 
 	//获取输入时间
 	$(".jypt-pt button").click(function(){
@@ -288,11 +298,12 @@ function setSessionStorage(){
         sessionStorage.subtype=reqParam.subtype;
         sessionStorage.scope=reqParam.scope;
         sessionStorage.publishtime=reqParam.publishtime;
-        sessionStorage.industry=reqParam.industry;
+        //sessionStorage.industry=reqParam.industry;
         sessionStorage.price=$(".money-dialog .active").attr("data-value");
         sessionStorage.pageNum=reqParam.pageNum;
         sessionStorage.xScroll=$("#table .data").scrollLeft();
         sessionStorage.yScroll=$("body").scrollTop();
+        sessionStorage.industry=$(".contentthree").html();
     }
 }
 function setUpLastPage() {
@@ -327,7 +338,6 @@ function setUpLastPage() {
     if(ptime != ""){
         $(".jypt-pt .jypt-active").removeClass("jypt-active");
         if(ptime.indexOf("_") > -1){
-            alert(1111)
             $(".jypt-timeinputs").addClass("jypt-timeinputs-active");
             spTimeArray = ptime.split("_");
             if(spTimeArray[0] != ""){
@@ -377,10 +387,21 @@ function setUpLastPage() {
     }
     //行业
     var industry=sessionStorage.industry;
-    if(industry != "A"&&industry != ""){
+    $(".contentthree").html(industry);
+    industryAction();
+    /*if(industry != "A"&&industry != ""){
         $(".contentthree").find("ul:first li:first .btn").removeClass("active");
         industry = industry.split(",");
-        for(var i=0;i<industry.length;i++){
+
+
+        if(industry.length>1){
+          //  alert(1)
+            $("[data-value='"+industry[0]+"']").parent("li").find("#dqbtn").addClass("active");
+        }else{
+            //alert(2)
+            $("[data-value='"+industry[0]+"']").addClass("active");
+        }
+        /!*for(var i=0;i<industry.length;i++){
             $(".contentthree").find(".btn").each(function(){
                 if($(this).attr("data-value") == industry[i]){
                     $(this).addClass("active");
@@ -390,8 +411,8 @@ function setUpLastPage() {
                     return false;
                 }
             });
-        }
-    }
+        }*!/
+    }*/
     //金额
     var price=sessionStorage.price;
     if(price!="all"){
@@ -401,6 +422,73 @@ function setUpLastPage() {
     reqParam.pageNum=sessionStorage.pageNum;
     beforeSubmit();
 }
+function getIndustry(){
+    //铺设行业信息
+    $.post("/jylab/getIndustry",function(result){
+        var industryData,sortArray;
+        var industryHtml="<ul><li><button class=\"btn active\">全部</button></li>";
+        if(result){
+            industryData=result.industry;
+            sortArray=result.sortArray;
+        }
+        if(sortArray!=""&&industryData!=""){
+            for(var i in sortArray){
+                industryHtml+="<li><div id=\"dqbtn\" style=\"width:81px;\">"+sortArray[i]+"</div>";
+                var childnode=industryData[sortArray[i]];
+                for(var j in childnode){
+                    industryHtml+="<button class=\"btn\" data-value="+sortArray[i]+"_"+childnode[j]+">"+childnode[j]+"</button>";
+                }
+                industryHtml+="</li>";
+            }
+            industryHtml+= "</ul>";
+            $(".industry-dialog .contentthree").html(industryHtml);
+        }
+        industryAction();
+    });
+}
+function industryAction(){
+    //行业点击事件
+    var dialogObjthree = $(".contentthree");
+    dialogObjthree.find(".btn").click(function(){
+        if($(this).parent().index() == 0){
+            dialogObjthree.find('div[id="dqbtn"]').removeClass("active");
+            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{
+                toOpenSupersearch();
+                return
+            }
+        };
+    });
+    dialogObjthree.find('div[id="dqbtn"]').click(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{
+            toOpenSupersearch();
+        }
+    });
+}
 function initMobiscroll(){
 	var starttime = null;
 	var endtime = null;
@@ -557,3 +645,5 @@ function getInputTime(){
 	}
 	return [starttime,endtime]
 }
+
+

src/web/templates/pc/biddetail.html

@@ -542,8 +542,10 @@ $(function(){
     if(s_winner){
         var winner_con = $(".winner");
         for(var i=0;i<winner_con.length;i++){
-            var top = winner_con[i].offsetTop + winner_con[i].offsetHeight + 10;
-            var left = winner_con[i].offsetLeft;
+			var top = getElementTop(winner_con[i]) - $(".j-head")[0].offsetHeight - 30 + 10 + winner_con[i].offsetHeight;
+            var left = getElementLeft(winner_con[i])-getElementLeft($(".biddetail-content")[0]);
+//            var top = winner_con[i].offsetTop + winner_con[i].offsetHeight + 10;
+//            var left = winner_con[i].offsetLeft;
             $(winner_con[i]).append('<div id="outhistory"><div class="animathistory_ent" style="display:none;top:'+top+'px;left:'+left+'px;">'
                 +'<span class="hyone"></span>'
                 +'<span class="hytwo"></span>'
@@ -560,6 +562,26 @@ $(function(){
                 +'</div></div>');
 		}
     }
+
+    function getElementLeft(element){
+        var actualLeft = element.offsetLeft;
+        var current = element.offsetParent;
+        while (current !== null){
+            actualLeft += current.offsetLeft;
+            current = current.offsetParent;
+        }
+        return actualLeft;
+    }
+    function getElementTop(element){
+        var actualTop = element.offsetTop;
+        var current = element.offsetParent;
+        while (current !== null){
+            actualTop += current.offsetTop;
+            current = current.offsetParent;
+        }
+        return actualTop;
+    }
+
     $(".winner").hover(function(){
         entProListShowFlag = true;
         $(this).find(".animathistory_ent").fadeIn(1000);
@@ -612,7 +634,7 @@ var thishtlists_ent = function(){
     var _bidamount = {{.T.obj.bidamount}};
     var projectname = {{.T.obj.projectname}};
     $.post("/front/pcEntAllNotice",{entname:s_winner},function(D){
-        var data = D.data["ress"];
+        var data = D.data["res"];
         if(data && data.length > 0){
             for(var i = 0; i < data.length; i++){
                 var id = data[i]["_id"];
@@ -911,10 +933,10 @@ if(typeof(type) != "undefined" && type != null && type != ""){
 }
 //
 if(industry){
-    $(".com-statusbar").append('<span class="com-industry"><a href="#">'+industry+'</a></span>');
+    $(".com-statusbar").append('<span class="com-industry"><a href="/list/industry/'+{{.T.obj.indadd}}+'.html">'+industry+'</a></span>');
 }else if(subscopeclass){
 	var suclass = subscopeclass.split(",")[0];
-	$(".com-statusbar").append('<span class="com-industry"><a href="#">'+suclass.split("_")[0]+'</a></span>');
+	$(".com-statusbar").append('<span class="com-industry"><a href="/list/industry/'+{{.T.obj.indadd}}+'.html">'+suclass.split("_")[0]+'</a></span>');
 }
 //
 if(publishtime != ""){

src/web/templates/pc/biddingsearch_enterprise.html

@@ -218,6 +218,9 @@
 			.PriceInput{
 				position:relative;
 			}
+			.j-clearicon {
+			    right: 118px !important;
+			}
 		</style>
 	</head>
 
@@ -283,10 +286,11 @@
 					</div>
 					<!--搜索-->
 					<div class="searchInput clearfix">
-						<form action="/jylab/bidsearchforent/list.html" method="post" id="zbSeatchT" class="clearfix" onsubmit="return true">
+						<form action="/jylab/bidsearchforent/index.html" method="post" id="zbSeatchT" class="clearfix" onsubmit="return true">
 							<input class="searchname" autocomplete="off" type="search" name="keywords" id="searchinput" value="{{.T.searchvalue}}" placeholder="高速公路" />
 
 							<input type="submit" class="searchBtn" value="搜索"/>
+							<img src="/images/pc_20.png" id="t-clear" class="j-clearicon" style="display:none;">
 							<div class="searchSlideText">
 								<ul>
 								</ul>
@@ -422,37 +426,7 @@
 				<!--全文搜索 列表-->
 				<div class="lucene">
 					<ul id="ul_list">
-						{{range $k,$v:= .T.list}}
-						<li>
-							<div class="liLuceneList">
-								<div class="luce-left">
-									<div class="left-title">
-										<em>{{$v.k}}.</em>
-										<!--<a href="/article/content/{{$v.linkid}}.html" dataid="{{$v.linkid}}" dataindustry="{{$v.industry}}" target="_blank"> {{$v.projectname}}</a>-->
-										<a onclick="noIn(this)" dataid="{{$v.linkid}}" dataindustry="{{$v.industry}}" target="_blank"> {{$v.projectname}}</a>
-									</div>
-								</div>
-								<div class="luce-right">
-									{{if $v.area }}
-										{{if and (ne $v.area "") (ne $v.area "A") (ne $v.area "全国")}}
-											<a href="/list/area/{{$v.areaadd}}.html">{{$v.area}}</a>
-										{{end}}
-									{{end}}
-									{{if $v.bidtype }}
-										{{if ne $v.bidtype ""}}
-											<a href="/list/stype/{{$v.stypeadd}}.html">{{$v.bidtype}}</a>
-										{{end}}
-									{{end}}
-									{{if $v.industry }}
-										{{if ne $v.industry ""}}
-											<a href="/list/stype/{{$v.stypeadd}}.html">{{$v.industry}}</a>
-										{{end}}
-									{{end}}
-									<span>{{$v.time1}}</span>
-								</div>
-							</div>
-						</li>
-						{{end}}
+						
 					</ul>
 				</div>
 				<!--全文搜索 表格-->
@@ -460,24 +434,26 @@
 					<table>
 						<thead>
 						<tr>
+						{{if .T.searchvalue}}
 							<td>序号</td>
 							<td width="150">中标日期</td>
 							<td width="830">项目名称</td>
 							<td>中标金额（万元）</td>
+						{{else}}
+							<td width="47">序号</td>
+							<td width="320">项目名称</td>
+							<td width="83">公告类型</td>
+							<td width="65">预算<br>（万元）</td>
+							<td width="180">招标单位</td>
+							<td width="100">开标时间</td>
+							<td width="180">中标单位</td>
+							<td>中标金额<br>（万元）</td>
+							<td width="100">发布时间</td>
+						{{end}}
 						</tr>
 						</thead>
 						<tbody class="formTable" id="formTable">
-						{{range $k,$v:= .T.list}}
-						<tr>
-							<td>{{$v.k}}</td>
-							<td>{{$v.time2}} </td>
-							<td class="tt-l">
-								<!--<a href="/article/content/{{$v.linkid}}.html">{{$v.projectname}}</a>-->
-								<a onclick="noIn(this)" dataid="{{$v.linkid}}" dataindustry="{{$v.industry}}" target="_blank"> {{$v.projectname}}</a>
-							</td>
-							<td class="tt-r">{{$v.bidamount}}</td>
-						</tr>
-						{{end}}
+						
 						</tbody>
 					</table>
 				</div>
@@ -506,29 +482,25 @@
     $(function() {
         $("#searchinput").on("input propertychange",function(){
             var searchInput = $("#searchinput").val();
-            if(searchInput.length > 0){
+            if($.trim(searchInput).length > 0){
+				$("#t-clear").show();
                 getRecList(searchInput);
             }else{
+				$("#t-clear").hide();
                 $(".searchSlideText").hide();
             }
         });
 
+		$("#t-clear").click(function(){
+			$("#t-clear").hide();
+			$("#searchinput").val("").focus();
+		})
         //隐藏企业推荐列表
         $("body").on("click",function (e) {
             if(e.target.id != "searchinput") {
                 $(".searchSlideText").hide();
             }
         });
-
-        //行数不满一页，"下一页"按钮不可用
-        var tab = document.getElementById("formTable") ;
-		var tabRows = tab.rows.length;
-        var listRows = document.getElementById("ul_list").getElementsByTagName("li").length;
-        if(listRows < 50 && tabRows < 50){
-            $(".nbnext").addClass("disabled");
-		}else {
-            $(".nbnext").removeClass("disabled");
-		}
     });
 
     //企业推荐列表
@@ -573,9 +545,13 @@
 		var areas = {{.T.area}};
 		var searchvalue = {{.T.searchvalue}};
 		var currentPage = 1;//当前页
+		var pageSize = 50;
 		
 		$(function(){
 			haslogin({{.T.logid}});
+			if(mainList != "" && mainList != null){
+				getSearchTable(mainList);
+			}
 			$(".j-nav .j-nav-link:eq(2)").addClass("active");
 			$(window).scroll(function(){
 				if($(this).scrollTop() > 0){
@@ -587,6 +563,7 @@
 			
 			//判断用户是否搜索中标企业，调整二维码样式
 			if(searchvalue != "" && searchvalue.length > 0){
+				$("#t-clear").show();
 				$(".wx-inner-title").html("扫码关注企业");
 				$(".wx-inner-bottom").html('扫码即可实时接收<span style="color:#2cb7ca">'+'"'+searchvalue+'"'+'</span>的中标信息！');
 			}
@@ -722,19 +699,85 @@
 			})
 			
 			//设置输入价格的格式
+			//
+			var reg = /^[\u4e00-\u9fa5]+$/;
+			var minnum = "";
 			$("#minprice").on("input propertychange",function(){
-				var minp = $(this).val()
+				var minp = $.trim($(this).val()).replace(/\s/g,"");
+				$(this).val(minp)
 				if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
-					minp = minp.substr(0,minp.length-1);
-					$(this).val(minp)
+					if((reg.test(minp)||isNaN(minp))&&minp.indexOf(".")<0){
+						$(this).val(minnum)
+					}else{
+						minp = minp.substr(0,minp.length-1);
+						if(reg.test(minp)||isNaN(minp)){
+							$(this).val(minnum)
+						}else{
+							if(minp.indexOf(".")>0){
+								var offront = minp.split(".")[0];
+								var ofafter = minp.split(".")[1];
+								if(offront.length>9||ofafter.length>2){
+									if(offront.length>9){
+										$(this).val(offront.substr(0,9)+"."+ minnum.split(".")[1].substr(0,2))
+										minnum = offront.substr(0,9)+"."+ minnum.split(".")[1].substr(0,2);
+									}else{
+										$(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2))
+										minnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
+									}
+								}else{
+									$(this).val(minp)
+									minnum = minp;
+								}
+							}else{
+								$(this).val(minp)
+								minnum = minp;
+							}
+							
+						}
+					}	
+				}else{
+					minnum = minp;
 				}
+				
 			})
+		
 			//
+			var maxnum = "";
 			$("#maxprice").on("input propertychange",function(){
-				var maxp = $(this).val()
+				var maxp = $.trim($(this).val()).replace(/\s/g,"");
+				$(this).val(maxp)
 				if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(maxp)){
-					maxp = maxp.substr(0,maxp.length-1);
-					$(this).val(maxp)
+					if((reg.test(maxp)||isNaN(maxp))&&maxp.indexOf(".")<0){
+						$(this).val(maxnum)
+					}else{
+						maxp = maxp.substr(0,maxp.length-1);
+						if(reg.test(maxp)||isNaN(maxp)){
+							$(this).val(maxnum)
+						}else{
+							if(maxp.indexOf(".")>0){
+								var offront = maxp.split(".")[0];
+								var ofafter = maxp.split(".")[1];
+								if(offront.length>9||ofafter.length>2){
+									if(offront.length>9){
+										$(this).val(offront.substr(0,9)+"."+ maxnum.split(".")[1].substr(0,2))
+										maxnum = offront.substr(0,9)+"."+ maxnum.split(".")[1].substr(0,2);
+									}else{
+										$(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2))
+										maxnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
+									}
+								}else{
+									$(this).val(maxp)
+									maxnum = maxp;
+								}
+							}else{
+								$(this).val(maxp)
+								maxnum = maxp;
+							}
+							
+						}
+					}	
+				}else{
+					maxnum = maxp;
 				}
 			})
 			
@@ -952,6 +995,7 @@
 		}
         //currentPage = parseInt($(".pagination-inner").find("span").text())+parseInt(1)
         if(currentPage==10){
+			console.log(currentPage+"---------")
             $(".nbnext").addClass("disabled");
         }else if(currentPage==2){
             $(".nbprev").removeClass("disabled");
@@ -970,7 +1014,7 @@
         //currentPage = parseInt($(".pagination-inner").find("span").text())-parseInt(1)
         if(currentPage==1){
             $(".nbprev").addClass("disabled");
-        }else if(currentPage==9){
+        }else if(currentPage<10){
             $(".nbnext").removeClass("disabled");
         }
         $(".currentPage").text(currentPage);
@@ -996,31 +1040,150 @@
                 $(".tabContainer").show();
                 $(".pagination").show();
                 $(".hasNoData").hide();
-                getSearchTable(r);
+                getSearchTable(r.list);
             }
         });
     }
     
-    function getSearchTable(r) {
-        if(r.list.length < 50){
+    function getSearchTable(datas) {
+        if(datas.length < 50){
             $(".nbnext").addClass("disabled");
-		}else{
-            $(".nbnext").removeClass("disabled");
 		}
         var listItem = "";
         var formItem = "";
+		var tableHtml = "";
 		listItem += '<ul>';
-		for(var i=0; i<r.list.length; i++){
-		    if(r.list[i].bidtype != "" && r.list[i].bidtype != null){
-                listItem += '<li><div class="liLuceneList"><div class="luce-left"><div class="left-title"><em>'+r.list[i].k+'.</em><a href="/article/content/'+r.list[i].linkid+'.html">'+r.list[i].projectname+'</a></div></div><div class="luce-right"><a href="#">'+r.list[i].area+'</a><a href="#">'+r.list[i].bidtype+'</a><span>'+r.list[i].time1+'</span></div></div></li>';
-            }else {
-                listItem += '<li><div class="liLuceneList"><div class="luce-left"><div class="left-title"><em>'+r.list[i].k+'.</em><a href="/article/content/'+r.list[i].linkid+'.html">'+r.list[i].projectname+'</a></div></div><div class="luce-right"><a href="#">'+r.list[i].area+'</a><span>'+r.list[i].time1+'</span></div></div></li>';
-            }
-            formItem += '<tr><td>'+r.list[i].k+'</td><td>'+r.list[i].time2+'</td><td class="tt-l"><a href="/article/content/'+r.list[i].linkid+'.html">'+r.list[i].projectname+'</a></td><td class="tt-r">'+r.list[i].bidamount+'</td></tr>'
+		for(var i=0; i<datas.length; i++){
+			var index = (currentPage - 1) * pageSize + i + 1;
+			if(searchvalue==""){
+				listItem +='<li>'
+							+'<div class="liLuceneList">'
+							+'<div class="luce-left">'
+							+'<div class="left-title">'
+							+'<em>'+index+'.</em>'
+							+'<a onclick="noIn(this)" dataid="'+datas[i]._id+'" target="_blank">'+datas[i].title+'</a>'
+							+'</div>'
+							+'</div>'
+							+'<div class="luce-right">'
+				if(typeof(datas[i].area) != "undefined" &&datas[i].area != "" && datas[i].area != null&&datas[i].area != "A" ){
+					listItem +='<a href="/list/area/'+datas[i].areaadd+'.html">'+datas[i].area+'</a>'
+				}else{
+					listItem +='<a href="javascript:volid(0);" style="display:none;"></a>'
+				}
+				//
+				var stype = datas[i].subtype
+				if(stype==""){
+					stype==datas[i].toptype
+				}
+				if(stype==""){
+					if(datas[i].bidtype == "bid"){
+						stype = "中标";
+						datas[i].stypeadd="ZHB"
+					}else if(datas[i].bidtype == "tender"){
+						datas[i].stypeadd="ZB"
+						stype = "招标";
+					}else{
+						stype = "";
+					}
+				}
+				if(typeof(stype) != "undefined" &&stype != "" && stype != null){
+					listItem +='<a href="/list/stype/'+datas[i].stypeadd+'.html">'+stype+'</a>'
+				}else{
+					listItem +='<a href="javascript:volid(0);" style="display:none;"></a>'
+				}
+				//
+				if(typeof(datas[i].industry) != "undefined" && datas[i].industry != null && datas[i].industry != ""){
+					listItem += '<a href="/list/industry/'+datas[i].indadd+'.html">'+datas[i].industry+'</a>';
+				}else{
+					listItem += '<a href="javascript:volid(0);" style="display:none;"></a>';
+				}
+				//
+				if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
+					var diff = timeDiff(new Date(Number(datas[i].publishtime+"000")));
+					if(diff != null){
+						listItem += '<span class="com-time">'+diff+'</span>';
+					}
+				}
+				listItem+='</div></div></li>'
+				tableHtml +='<tr onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank">'
+						+'<td><div>'+index+'</div></td>'
+						
+				if(typeof(datas[i].projectname) != "undefined" && datas[i].projectname != null && datas[i].projectname != ""){
+					tableHtml += '<td class="tt-l"><div>'+datas[i].projectname+'</div></td>';
+				}else{
+					tableHtml += '<td class="tt-l"><div>'+datas[i].title+'</div></td>';
+				}
+						
+				if(typeof(stype) != "undefined" && stype != null && stype != ""){
+					tableHtml += '<td><div>'+stype+'公告</div></td>';
+				}else{
+					tableHtml += '<td><div></div></td>';
+				}
+				
+				if(typeof(datas[i].budget) != "undefined" && datas[i].budget != null && datas[i].budget != ""){
+					var budget =parseInt(datas[i].budget)/10000
+					if(budget.toString().length>6){
+						if(budget.toString().indexOf(".")==5){
+							budget=budget.toString().substr(0,7)
+						}else{
+							budget=budget.toString().substr(0,6)
+						}
+					}
+					tableHtml += '<td class="tt-r"><div>'+budget+'</div></td>';
+				}else{
+					tableHtml += '<td class="tt-r"><div></div></td>';
+				}
+				if(typeof(datas[i].buyer) != "undefined" && datas[i].buyer != null && datas[i].buyer != ""){
+					tableHtml += '<td class="tt-l"><div>'+datas[i].buyer+'</div></td>';
+				}else{
+					tableHtml += '<td class="tt-l"><div></div></td>';
+				}
+				if(typeof(datas[i].bidopentime) != "undefined" && datas[i].bidopentime != null && datas[i].bidopentime != ""){
+					var diff = formatDate(Number(datas[i].bidopentime),"l");
+					tableHtml += '<td><div>'+diff+'</div></td>';
+				}else{
+					tableHtml += '<td><div></div></td>';
+				}
+				if(typeof(datas[i].winner) != "undefined" && datas[i].winner != null && datas[i].winner != ""){
+					tableHtml += '<td class="tt-l"><div>'+datas[i].winner+'</div></td>';
+				}else{
+					tableHtml += '<td class="tt-l"><div></div></td>';
+				}
+				if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
+					var bidamount = parseInt(datas[i].bidamount)/10000;
+					if(bidamount.toString().length>6){
+						if(bidamount.toString().indexOf(".")==5){
+							bidamount=bidamount.toString().substr(0,7);
+						}else{
+							bidamount=bidamount.toString().substr(0,6);
+						}
+					}
+					tableHtml += '<td class="tt-r"><div>'+bidamount+'</div></td>';
+				}else{
+					tableHtml += '<td class="tt-r"><div></div></td>';
+				}
+				
+				if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
+					var diff = formatDate(Number(datas[i].publishtime),"s");
+					if(diff != null){
+						tableHtml += '<td><div>'+diff+'</div></td>';
+					}
+				}else{
+					tableHtml += '<td><div></div></td>';
+				}
+					tableHtml+='</tr>'
+			}else{
+				 formItem += '<tr><td>'+index+'</td><td>'+datas[i].time2+'</td><td class="tt-l"><a href="/article/content/'+datas[i]._id+'.html">'+datas[i].projectname+'</a></td><td class="tt-r">'+datas[i].bidamount+'</td></tr>'
+			}
 		}
 		listItem += '</ul>';
 		$(".lucene").html(listItem);
-		$(".formTable").html(formItem);
+		if(searchvalue==""){
+			$(".formTable").html(tableHtml);
+		}else{
+			$(".formTable").html(formItem);
+		}
+		
     }
 
     //关闭超级搜索遮罩层
@@ -1033,6 +1196,26 @@
 		$("#welcome").modal("hide");
 	}
 
+	//
+	function formatDate(date,sl)   { 
+		var myDate = new Date(date*1000);      
+	    var   year=myDate.getFullYear();
+	    var   month=myDate.getMonth()+1; 
+	    var   date=myDate.getDate();
+		var hour = myDate.getHours()
+		var min = myDate.getMinutes()
+		if(sl=="l"){
+			if(hour<10){
+				hour="0"+hour
+			} 
+			if(min<10){
+				min="0"+min
+			} 
+			return   year+"-"+month+"-"+date+"<br>"+hour+":"+min; 
+		}else{
+			return   year+"-"+month+"-"+date; 
+		}
+	} 
 	//未登录
 	function noIn(p){
 		var thisId = $(p).attr("dataId");

src/web/templates/pc/businesscooperation.html

@@ -5,7 +5,100 @@
     <title>商务合作</title>
     {{include "/common/pnc.html"}}
     <link href="/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<script>
+		$(function(){
+			//
+			haslogin({{.T.logid}});
+		})
+	</script>
     <style>
+		/*j-wx-code Start*/
+		.j-wx-code{
+			width: 335px;
+			height: 355px;
+			background-color: #fff;
+			-webkit-border-radius: 6px;
+			   -moz-border-radius: 6px;
+			        border-radius: 6px;
+			position: relative;
+			/*margin: 100px auto;*/
+		}
+		.j-wx-code>.code-close{
+			width: 40px;
+			height: 40px;
+			position: absolute;
+			right: -20px;
+			top: -20px;
+			cursor: pointer;
+			-webkit-transition: all 1s;
+			-o-transition: all 1s;
+			-moz-transition: all 1s;
+			transition: all 1s;
+		}
+		.j-wx-code>.code-close:hover{
+			-webkit-transform: scale(1.2);
+			   -moz-transform: scale(1.2);
+			    -ms-transform: scale(1.2);
+			     -o-transform: scale(1.2);
+			        transform: scale(1.2);
+		}
+		.j-wx-code>.code-title{
+			height: 82px;
+			background:url(/images/j-wx-code-title.png) center center no-repeat;
+			-webkit-animation: moveYun 15s infinite linear both;
+			   -moz-animation: moveYun 15s infinite linear both;
+			     -o-animation: moveYun 15s infinite linear both;
+			        animation: moveYun 15s infinite linear both;
+		}
+		.j-wx-code>.code-wxm{
+			text-align: center;
+			margin-bottom: -6px;
+			margin-top: -16px;
+			
+		}
+		.j-wx-code>.code-wxm>img{
+			width: 200px;
+			height: 200px;
+			margin-top: -5px;
+		}
+		.j-wx-code>.code-text{
+			text-align: center;	
+		}
+		.j-wx-code .code-text .pointOne{
+			font-family: MicrosoftYaHei-bold;
+			font-size: 18px;
+			color: #2cb7ca;
+			font-weight: bold;
+		}
+		.j-wx-code .code-text .pointTwo{
+			font-family: MicrosoftYaHei;
+			font-size: 22px;
+			color: #252627;
+			margin-top: -1px;
+			display: inline-block;
+		}
+		
+		.j-wx-code>.code-bottom{
+			width: 470px;
+			height: 211px;
+			position: absolute;
+			bottom: -113px;
+			left: -73px;
+			background: url(/images/j-wx-code-bottom.png) 0 0 no-repeat;
+		}
+		.j-wx-code>.code-bottom>img{
+			position: absolute;
+			left: 280px;
+			top: 88px;
+			-webkit-animation: codeWxMove 10s linear both;
+			   -moz-animation: codeWxMove 10s linear both;
+			     -o-animation: codeWxMove 10s linear both;
+			        animation: codeWxMove 10s linear both;
+			-webkit-animation-fill-mode:forwards;
+			   -moz-animation-fill-mode:forwards;
+			     -o-animation-fill-mode:forwards;
+			        animation-fill-mode:forwards
+		}
         .coopbanner1{
             background: url(../images/coopbanner1.jpg) center center no-repeat;
             background-size: cover;

src/web/templates/pc/classifylist.html

@@ -110,13 +110,6 @@
 #keyImg{
 	width:198px;
 }
-#layerImg{
-	position:absolute;
-	width: 150px !important;
-    height: 150px !important;
-    left: 198px;
-    top: 148px;
-}
 .layheader{
 	position: absolute;
     color: #fff;
@@ -325,7 +318,7 @@ $(function(){
 				<img class="code-close" src="/images/j-wx-code-close.png" alt="" onclick="labClose();">
 				<div class="layheader">
 					<div>超级搜索</div>
-					<div>按行业、金额搜索、结果可按表格显示</div>
+					<div>按行业、金额搜索，结果可按表格显示</div>
 				</div>
 				<img src="/images/biddingSearch/labbkimg.png"/>
 				<img id="layerImg" src="/front/share/{{.T.shareid}}"/>
@@ -363,7 +356,7 @@ $(function(){
 					<input type="hidden" name="selectType" value="all">
 				</form>
 				<!--筛选-->
-				<div id="screenBtn" class="screen up">
+				<div id="screenBtn" class="screen down">
 					筛选
 				</div>
 				<!--开启超级搜索 -->
@@ -573,14 +566,14 @@ $(function(){
 						<thead>
 							<tr>
 								<td width="47">序号</td>
-								<td width="100">发布时间</td>
-								<td width="83">公告类型</td>
-								<td width="180">招标单位</td>
 								<td width="320">项目名称</td>
+								<td width="83">公告类型</td>
 								<td width="65">预算<br>（万元）</td>
-								<td width="100">开标时间</td>
+								<td width="180">招标单位</td>
+								<td width="100">开标日期</td>
 								<td width="180">中标单位</td>
 								<td>中标金额<br>（万元）</td>
+								<td width="100">发布日期</td>
 							</tr>
 						</thead>
 						<tbody>
@@ -642,19 +635,12 @@ $(function(){
 	//筛选关闭和打开
 	//根据cookie值设置筛选是否显示
 	var sod = localStorage.getItem("classify");
-	if(sod==null){
-		setTimeout(function(){
-			$(".searchTender").stop(false,true).slideDown(1000);
-			localStorage.setItem("classify", "D");
-		},500);
-	}else{
-		if(sod=="U"){
-			$("#screenBtn").addClass("down");
-			$(".searchTender").hide();
-		}else{
-			$("#screenBtn").removeClass("down");
-			$(".searchTender").show();
-		}
+	if(sod=="U"){
+		$("#screenBtn").addClass("down");
+		$(".searchTender").hide();
+	}else if(sod=="D"){
+		$("#screenBtn").removeClass("down");
+		$(".searchTender").show();
 	}
 	//记录用户刷选按钮状态
 	$("#screenBtn").click(function(){
@@ -873,31 +859,21 @@ function appendDatas(datas){
 				type = "";
 			}
 		}
-		tableHtml +='<tr>'
+		tableHtml +='<tr onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank">'
 				+'<td><div>'+index+'</div></td>'
-		if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
-			var diff = formatDate(Number(datas[i].publishtime),"s");
-			if(diff != null){
-				tableHtml += '<td><div>'+diff+'</div></td>';
-			}
+				
+		if(typeof(datas[i].projectname) != "undefined" && datas[i].projectname != null && datas[i].projectname != ""){
+			tableHtml += '<td class="tt-l"><div>'+datas[i].projectname+'</div></td>';
 		}else{
-			tableHtml += '<td><div></div></td>';
+			tableHtml += '<td class="tt-l"><div>'+datas[i].title+'</div></td>';
 		}
+				
 		if(typeof(type) != "undefined" && type != null && type != ""){
 			tableHtml += '<td><div>'+type+'公告</div></td>';
 		}else{
 			tableHtml += '<td><div></div></td>';
 		}
-		if(typeof(datas[i].buyer) != "undefined" && datas[i].buyer != null && datas[i].buyer != ""){
-			tableHtml += '<td class="tt-l"><div>'+datas[i].buyer+'</div></td>';
-		}else{
-			tableHtml += '<td class="tt-l"><div></div></td>';
-		}
-		if(typeof(datas[i].projectname) != "undefined" && datas[i].projectname != null && datas[i].projectname != ""){
-			tableHtml += '<td class="tt-l"><div>'+datas[i].projectname+'</div></td>';
-		}else{
-			tableHtml += '<td class="tt-l"><div></div></td>';
-		}
+		
 		if(typeof(datas[i].budget) != "undefined" && datas[i].budget != null && datas[i].budget != ""){
 			var budget =parseInt(datas[i].budget)/10000
 			if(budget.toString().length>6){
@@ -911,8 +887,13 @@ function appendDatas(datas){
 		}else{
 			tableHtml += '<td class="tt-r"><div></div></td>';
 		}
+		if(typeof(datas[i].buyer) != "undefined" && datas[i].buyer != null && datas[i].buyer != ""){
+			tableHtml += '<td class="tt-l"><div>'+datas[i].buyer+'</div></td>';
+		}else{
+			tableHtml += '<td class="tt-l"><div></div></td>';
+		}
 		if(typeof(datas[i].bidopentime) != "undefined" && datas[i].bidopentime != null && datas[i].bidopentime != ""){
-			var diff = formatDate(Number(datas[i].publishtime),"l");
+			var diff = formatDate(Number(datas[i].bidopentime),"l");
 			tableHtml += '<td><div>'+diff+'</div></td>';
 		}else{
 			tableHtml += '<td><div></div></td>';
@@ -923,18 +904,27 @@ function appendDatas(datas){
 			tableHtml += '<td class="tt-l"><div></div></td>';
 		}
 		if(typeof(datas[i].bidamount) != "undefined" && datas[i].bidamount != null && datas[i].bidamount != ""){
-			var bidamount = parseInt(datas[i].bidamount)/10000
+			var bidamount = parseInt(datas[i].bidamount)/10000;
 			if(bidamount.toString().length>6){
 				if(bidamount.toString().indexOf(".")==5){
-					bidamount=bidamount.toString().substr(0,7)
+					bidamount=bidamount.toString().substr(0,7);
 				}else{
-					bidamount=bidamount.toString().substr(0,6)
+					bidamount=bidamount.toString().substr(0,6);
 				}
 			}
 			tableHtml += '<td class="tt-r"><div>'+bidamount+'</div></td>';
 		}else{
 			tableHtml += '<td class="tt-r"><div></div></td>';
 		}
+		
+		if(typeof(datas[i].publishtime) != "undefined" && datas[i].publishtime != null && datas[i].publishtime != ""){
+			var diff = formatDate(Number(datas[i].publishtime),"s");
+			if(diff != null){
+				tableHtml += '<td><div>'+diff+'</div></td>';
+			}
+		}else{
+			tableHtml += '<td><div></div></td>';
+		}
 			tableHtml+='</tr>'
 	}
 	

src/web/templates/pc/supsearch.html

@@ -236,7 +236,11 @@ var list = {{.T.list}}
 var searchvalue = {{.T.searchvalue}};
 var searchvalueArray = searchvalue.split("+");
 var dataId = "";
+var curKey = "";
 $(function(){
+	$("body").keydown(function(e){   
+        curKey = e.which;
+    }); 
 	if(selectType=="all"){
 		$("#newsclass li:nth-child(1) a").addClass("active");
 		$("#newsclass li:nth-child(2) a").removeClass("active");
@@ -401,21 +405,85 @@ $(function(){
 			$(this).addClass("secondActice");
 		}
 	});
-	
 	//
+	var reg = /^[\u4e00-\u9fa5]+$/;
+	var minnum = "";
 	$("#minprice").on("input propertychange",function(){
-		var minp = $(this).val()
+		var minp = $.trim($(this).val()).replace(/\s/g,"");
+		$(this).val(minp)
 		if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
-			minp = minp.substr(0,minp.length-1);
-			$(this).val(minp)
+			if((reg.test(minp)||isNaN(minp))&&minp.indexOf(".")<0){
+				$(this).val(minnum)
+			}else{
+				minp = minp.substr(0,minp.length-1);
+				if(reg.test(minp)||isNaN(minp)){
+					$(this).val(minnum)
+				}else{
+					if(minp.indexOf(".")>0){
+						var offront = minp.split(".")[0];
+						var ofafter = minp.split(".")[1];
+						if(offront.length>9||ofafter.length>2){
+							if(offront.length>9){
+								$(this).val(offront.substr(0,9)+"."+ minnum.split(".")[1].substr(0,2))
+								minnum = offront.substr(0,9)+"."+ minnum.split(".")[1].substr(0,2);
+							}else{
+								$(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2))
+								minnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
+							}
+						}else{
+							$(this).val(minp)
+							minnum = minp;
+						}
+					}else{
+						$(this).val(minp)
+						minnum = minp;
+					}
+					
+				}
+			}	
+		}else{
+			minnum = minp;
 		}
+		
 	})
+
 	//
+	var maxnum = "";
 	$("#maxprice").on("input propertychange",function(){
-		var maxp = $(this).val()
+		var maxp = $.trim($(this).val()).replace(/\s/g,"");
+		$(this).val(maxp)
 		if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(maxp)){
-			maxp = maxp.substr(0,maxp.length-1);
-			$(this).val(maxp)
+			if((reg.test(maxp)||isNaN(maxp))&&maxp.indexOf(".")<0){
+				$(this).val(maxnum)
+			}else{
+				maxp = maxp.substr(0,maxp.length-1);
+				if(reg.test(maxp)||isNaN(maxp)){
+					$(this).val(maxnum)
+				}else{
+					if(maxp.indexOf(".")>0){
+						var offront = maxp.split(".")[0];
+						var ofafter = maxp.split(".")[1];
+						if(offront.length>9||ofafter.length>2){
+							if(offront.length>9){
+								$(this).val(offront.substr(0,9)+"."+ maxnum.split(".")[1].substr(0,2))
+								maxnum = offront.substr(0,9)+"."+ maxnum.split(".")[1].substr(0,2);
+							}else{
+								$(this).val(offront.substr(0,9)+"."+ofafter.substr(0,2))
+								maxnum = offront.substr(0,9)+"."+ofafter.substr(0,2);
+							}
+						}else{
+							$(this).val(maxp)
+							maxnum = maxp;
+						}
+					}else{
+						$(this).val(maxp)
+						maxnum = maxp;
+					}
+					
+				}
+			}	
+		}else{
+			maxnum = maxp;
 		}
 	})
 })
@@ -432,7 +500,7 @@ $(function(){
 				<img class="code-close" src="/images/j-wx-code-close.png" alt="" onclick="labClose();">
 				<div class="layheader">
 					<div>超级搜索</div>
-					<div>按行业、金额搜索、结果可按表格显示</div>
+					<div>按行业、金额搜索，结果可按表格显示</div>
 				</div>
 				<img src="/images/biddingSearch/labbkimg.png"/>
 				<img id="labImg" src="/front/share/{{.T.shareid}}"/>
@@ -791,7 +859,7 @@ $(function(){
 			var info = getlabstatus();
 			if(!info[0]){
 				$(".layheader div:nth-child(1)").html("超级搜索");
-				$(".layheader div:nth-child(2)").html("按行业、金额搜索、结果可按表格显示");
+				$(".layheader div:nth-child(2)").html("按行业、金额搜索，结果可按表格显示");
 				$("#labModal").modal("show");
 			}
 		}else{

src/web/templates/weixin/historypush.html

@@ -63,6 +63,7 @@ $(function(){
 		sessionStorage.removeItem("historypushScrollTop");
 		sessionStorage.removeItem("historypushNoMoreCache");
 		sessionStorage.removeItem("historypushCount");
+		localStorage.removeItem("listortable"+{{.T._id}},"T");
 	}else{
 		$("#list").css("visibility","hidden");
 		for(var i=0;i<firstPage.length;i++){
@@ -73,7 +74,6 @@ $(function(){
 			$("#list").css("visibility","visible");
 		},300);
 	}
-	console.log(noMore+"----")
 	if(noMore != "true"){
 		$('.listcontent').dropload({
 	        scrollArea : window,
@@ -109,7 +109,6 @@ $(function(){
 	    $(this).addClass("on").siblings().removeClass("on");
 		$(".listcontent").removeClass("hidden");
 		$(".tablecontent").addClass("hidden");
-		localStorage.setItem("listortable"+{{.T._id}},"L");
 	})
 	$(".showType .showTable").click(function(){
 		//表格是否开启超级搜索？
@@ -123,7 +122,6 @@ $(function(){
 				    $(".showType .showTable").addClass("on").siblings().removeClass("on");
 					$(".listcontent").addClass("hidden");
 					$(".tablecontent").removeClass("hidden");
-					localStorage.setItem("listortable"+{{.T._id}},"T");
 				}else{
 					window.location.href="/jylab/laboratory/sjdc";
 				}
@@ -342,6 +340,7 @@ function appendList(content,tablehtml){
 	$("#list").append(content);
 	//
 	tablejump = function(eid,h){
+		localStorage.setItem("listortable"+{{.T._id}},"T");
 		if(sessionStorage){
 			sessionStorage.historypushScrollTop = scrollTop;
 			sessionStorage.historypushListCache = listCache;
@@ -521,7 +520,7 @@ a{
 	</section>
 	<div class="prompt">提示：为了获得更佳的体验，推荐<span class="blue">打开邮件推送</span>，用电脑查看邮件中的表格。</div>
 </div>
-<span class="text-center findnull" style="position: relative;margin: auto;top: 50%;margin-top: -106.5px;">
+<span class="text-center findnull" style="position: relative;margin: auto;top: 30%;">
 	<img style="width: 150px;margin-bottom: 30px;" src="/images/wxkeyset/nopush.png">
 	<br><span style="font-size:16px;">暂时无历史推送记录</span>
 </span>

src/web/templates/weixin/resultpreview.html

@@ -71,6 +71,7 @@ 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);
@@ -129,7 +130,6 @@ if(firstPage != null && firstPage.length == 1){
 		    $(this).addClass("on").siblings().removeClass("on");
 			$(".listcontent").removeClass("hidden");
 			$(".tablecontent").addClass("hidden");
-			localStorage.setItem("listortable"+{{.T._id}},"L");
 		})
 		$(".showType .showTable").click(function(){
 			//表格是否开启超级搜索？
@@ -143,7 +143,6 @@ if(firstPage != null && firstPage.length == 1){
 					    $(".showType .showTable").addClass("on").siblings().removeClass("on");
 						$(".listcontent").addClass("hidden");
 						$(".tablecontent").removeClass("hidden");
-						localStorage.setItem("listortable"+{{.T._id}},"T");
 					}else{
 						window.location.href="/jylab/laboratory/sjdc";
 					}
@@ -182,7 +181,7 @@ if(firstPage != null && firstPage.length == 1){
 			}
 			var title = list[i].title;
 			//关键词高亮
-			console.log(keys.join(" "))
+			//console.log(keys.join(" "))
 			if(keys.length > 0){
 				title = keyWordHighlight(title,keys.join("|").replace(/\+/gm,"|").replace(" ","|"),'<font class="keyword">$1</font>');
 				$(this).find("a.bt").html(html);
@@ -357,6 +356,7 @@ if(firstPage != null && firstPage.length == 1){
 				sessionStorage.resultpreviewTableCache = tableCache;
 				sessionStorage.resultpreviewListCache = listCache;
 				sessionStorage.resultpreviewNoMoreCache = noMore;
+				localStorage.setItem("listortable"+{{.T._id}},"T");
 			}
 			newredirect(zbadd,h,eid,sds);
 		}
@@ -500,7 +500,7 @@ a{
 	width:70px;
 }
 #jytables tbody>tr>td:nth-child(6){
-	width:85px;
+	width:90px;
 }
 #jytables tbody>tr>td:nth-child(7) div{
 	width:110px;

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

@@ -27,6 +27,7 @@
 		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": "",
@@ -46,10 +47,10 @@
             if(localStorage){
                 if(localStorage.selectType=="allSearch"){
                     $("#search_all").addClass("on").siblings().removeClass("on");
-                    beforeSubmit();
+                  //  beforeSubmit();
                 }else if(localStorage.selectType=="titleSearch"){
                     $("#search_title").addClass("on").siblings().removeClass("on");
-                    beforeSubmit();
+                  //  beforeSubmit();
                 }
 
                 if(localStorage.showType=="showList"){
@@ -89,6 +90,7 @@
                                 $(".nullcontent").addClass("hidden");
                                 $("input[name=searchvalue]").focus();
                                 $("#wrapper").addClass("hidden");
+                                getIndustry();
                             }else{              //后退至本页面
 								if(sessionStorage){
                                     setUpLastPage();  //恢复筛选和页面记录值
@@ -136,14 +138,29 @@
             /**********************分页请求end****************************/
 
             canSearch();
-            $("input[name=searchvalue]").on("input",function(){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(){$(".inputDiv").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("");canSearch();});
+            $(".searchform .clearInpt").click(function(){$("input[name=searchvalue]").val("");$("input[name=searchvalue]").focus();canSearch();});
             //提交查询
             $(".searchform .query").click(function(){beforeSubmit();toquery();})
             $(".jyshxbottom .jydqsure").click(function(){
@@ -185,6 +202,7 @@
                     }
                 });
                 if(rFlag){
+                    setSessionStorage();
                     window.open("/wxkeyset/keyset/index");
 				}
             });
@@ -213,7 +231,7 @@
             $(".jytype-dialog .btn:eq(0)").trigger("click"); //清除类别
 		}
         function canSearch(){  //判断是否显示搜索按钮
-            var len=$(".searchvalue").val().length;
+            var len=$.trim($(".searchvalue").val()).length;
             if(len>0){
                 $(".clearInpt").removeClass("hidden");
                 $(".query").removeClass("hidden");
@@ -225,8 +243,8 @@
             }
         }
         function beforeSubmit(){   //提交前，更新筛选内容至提交对象
-            s_words=$("#searchform [name='searchvalue']").val();
-            reqParam.searchvalue=$("#searchform [name='searchvalue']").val();
+            s_words=$.trim($("#searchform [name='searchvalue']").val());
+            reqParam.searchvalue=$.trim($("#searchform [name='searchvalue']").val());
             //信息范围
 			var scope = [];
 			$(".contentone .btn.active").each(function(){
@@ -241,16 +259,22 @@
             reqParam.scope=scope.join(",");
 
             //行业类型
-			var industrySelect="";
-            $(".contentthree .btn.active").each(function(){
-                var thisText = $(this).text();
-                if(thisText == "全部"){
-                    return;
-                }else{
-                    industrySelect+=($(this).attr("data-value"))+",";
-                }
-            });
-            reqParam.industry=industrySelect.substring(0,industrySelect.length-1);
+            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 = "";
@@ -385,6 +409,8 @@
 
         function toquery(){    //提交表单，获取数据
 			if(reqParam.searchvalue.trim()=="") return;
+            $(".clearInpt").addClass("hidden");
+            $(".query").addClass("hidden");
 			reqParam.pageNum=1;
             $.post("/swordfish/searchlist/paging",reqParam,function(data){
                 //历史记录和我的订阅
@@ -544,18 +570,51 @@
                     +'<div style="clear:both;"></div>'
                     +detail
                     +'</div>';
-                //
-                TableHtml +='<tr s="'+href+'"  sid="'+list[i]._id+'">'+
-                    '<td><div>'+index+'</div></td>'+
-                    '<td><div>'+fullTime+'</div></td>'+
-                    '<td><div>'+datatype+'公告</div></td>'+
-                    '<td><div>'+buyer+'</div></td>'+
-                    '<td><div>'+projectname+'</div></td>'+
-					'<td><div>'+budget+'</div></td>'+
-					'<td><div>'+bidopentime+'</div></td>'+
-					'<td><div>'+winner+'</div></td>'+
-					'<td><div>'+bidamount+'</div></td>'+
-                    '</tr>'
+                //拟建项目
+                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>';
+				}
             }
             html["ListHtml"]=ListHtml;
             html["TableHtml"]=TableHtml;
@@ -569,7 +628,6 @@
         function hasData(){ //搜索信息不为空
             $(".nullcontent").addClass("hidden");
             $("#wrapper").removeClass("hidden");
-            $(".clearInpt").addClass("hidden");
             if(dyDiv){
                 $(".resbm").removeClass("hidden");
 			}
@@ -618,7 +676,11 @@
                 var sds = s_words.replace(/\+/g,"+");
                 myredirect(h,sid,sds);
             });
-            $("#table .content").html("<tr><td><div>序号</div></td><td><div>发布时间</div></td><td><div>公告类型</div></td><td><div>招标单位</div></td><td><div>项目名称</div></td><td><div>预算<br>（万元）</div></td><td><div>开标时间</div></td><td>中标单位</td><td><div>中标金额<br>（万元）</div></td></tr>");
+           	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){
@@ -628,7 +690,6 @@
             }*/
         }
         function myredirect(link,sid,sds){  //跳转三级页
-			console.log("---------------")
 			//保存当前页面至sessionStorage
 			setSessionStorage();
 			//跳转
@@ -637,9 +698,9 @@
                 link="http://"+link
             }
             if(sds){
-                window.open("{{Msg "seo" "ZBADDRESS"}}/article/content/"+sid+".html?url="+escape(link)+"&keywords="+encodeURIComponent(sds));
+                window.open("{{Msg "seo" "ZBADDRESS"}}/article/content/"+sid+".html?url="+escape(link)+"&keywords="+encodeURIComponent(sds)+"?industry="+reqParam.industry);
             }else{
-                window.open("{{Msg "seo" "ZBADDRESS"}}/article/content/"+sid+".html?url="+escape(link));
+                window.open("{{Msg "seo" "ZBADDRESS"}}/article/content/"+sid+".html?url="+escape(link)+"?industry="+reqParam.industry);
             }
         }
         function noMoreData(me){
@@ -659,7 +720,7 @@
 					$(".inputDiv .inpTitle_history").removeClass("hidden");
 					 historyHtml ="";
 	                for(var i=0;i<myhistory.length;i++){
-	                    historyHtml+="<li>"+myhistory[i]+"</li>"
+	                    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");
@@ -674,7 +735,7 @@
 					for(var m=0;m<msgset[n].length;m++){
 						mymsgset+=msgset[n][m]+" "
 					}
-					msgsetHtml+="<li>"+mymsgset+"</li>";
+					msgsetHtml+="<li>"+mymsgset.trim()+"</li>";
 				}
 				$(".inputDiv .myMsgset").html(msgsetHtml);
             }else{
@@ -711,13 +772,6 @@
         function loseblur() {
 			$("input[name=searchvalue]").blur();
         }
-        function inputnum(obj){
-            obj.value = obj.value.replace(/[^\d.]/g,""); //清除"数字"和"."以外的字符
-            obj.value = obj.value.replace(/^\./g,""); //验证第一个字符是数字
-            obj.value = obj.value.replace(/\.{2,}/g,"."); //只保留第一个, 清除多余的
-            obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
-            obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
-        }
 	</script>
 </head>
 <body>
@@ -768,11 +822,7 @@
 				</div>
 				<div class="industry-dialog">
 					<div class="dialog-content contentthree">
-						<ul>
-							<li>
-								<button class="btn active">全部</button>
-							</li>
-						</ul>
+
 					</div>
 				</div>
 				<!-->金额<-->
@@ -782,12 +832,12 @@
 						<li>价格区间</li>
 						<li class="money-inp" data-value="">
 							<div class="min-price">
-								<input class="form-control minMrice" type="number"/>
+								<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="number"/>
+								<input class="form-control maxMrice"  type="text"/>
 								<span class="max-unit">万元</span>
 							</div>
 						</li>
@@ -921,19 +971,23 @@
 		<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="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">

src/web/templates/weixin/wxinfocontent.html

@@ -1075,6 +1075,7 @@ $(function(){
 	//
     $(".myfollowent").click(function(){
         if(winner_con){
+            sessionStorage.version="1";
             winner_con = winner_con.replace(/#/g,"%23").replace(/\?/g,"%3F");
             var winner_id = "";
             window.location.href = "/jylab/followent/newInfo/"+winner_con+"___"+winner_id;

src/web/templates/weixin/wxpush.html

@@ -49,10 +49,10 @@ $(function(){
 	var tabletype = ""
 	var tableptname = ""
 	var tablebuyer = ""
-	var budget = ""
-	var bidopentime = ""
-	var winner = ""
-	var bidamount = ""
+	var budget = {};
+	var bidopentime = {};
+	var winner = {};
+	var bidamount = {};
 	var industryname = ""
 	if(bmatch){
 		$(".findnull").hide();
@@ -259,6 +259,7 @@ $(function(){
 		}
 		tablehtml +='<td>'+tabletime+'</td></tr>'
 	});
+	localStorage.removeItem("listortable"+{{.T._id}})
 	tablehtml +='</tbody></table>';
 	$("#jytables").append(tablehtml);
 	setTimeout(function(){
@@ -288,7 +289,6 @@ $(function(){
 	    $(this).addClass("on").siblings().removeClass("on");
 		$(".listcontent").removeClass("hidden");
 		$(".tablecontent").addClass("hidden");
-		localStorage.setItem("listortable"+{{.T._id}},"L");
 	})
 	$(".showType .showTable").click(function(){
 		//表格是否开启超级搜索？
@@ -302,7 +302,6 @@ $(function(){
 				    $(".showType .showTable").addClass("on").siblings().removeClass("on");
 					$(".listcontent").addClass("hidden");
 					$(".tablecontent").removeClass("hidden");
-					localStorage.setItem("listortable"+{{.T._id}},"T");
 				}else{
 					window.location.href="/jylab/laboratory/sjdc";
 				}
@@ -318,6 +317,9 @@ $(function(){
 //
 function tablejump(eid,href){
 	if(eid){
+		if($(".showtable").hasClass("on")){
+			localStorage.setItem("listortable"+{{.T._id}},"T");
+		}
 		newredirect(zbadd,href,eid,sds);
 	}
 }
@@ -544,7 +546,7 @@ a{
 	width:70px;
 }
 #jytables tbody>tr>td:nth-child(6){
-	width:85px;
+	width:90px;
 }
 #jytables tbody>tr>td:nth-child(7) div{
 	width:110px;