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

src/jfw/front/entserach.go

@@ -13,7 +13,6 @@ import (
 
 type Entsearch struct {
 	*xweb.Action
-
 	bidsearchforent xweb.Mapper `xweb:"/jylab/bidsearchforent"`
 }
 
@@ -22,12 +21,6 @@ func init() {
 }
 
 func (p *Entsearch) Bidsearchforent() error {
-	//defer util.Catch()
-	//var shareid = p.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))
-	//}
-	//p.T["shareid"] = se.EncodeString(shareid)
 	log.Println("-------中标企业搜索：")
 	return p.Render("/pc/biddingsearch_enterprise.html", &p.T)
 }

src/jfw/jylabutil/entsearch.go

@@ -44,7 +44,7 @@ func GetProjectByEntName(entname string, area string, lower, upper, pagenum, pag
 	list := *elastic.GetByNgram(
 		"projectset", "projectset",
 		entname, mastquery,
-		`"name"`,
+		`"winner"`,
 		`{"createtime":-1}`, ``, (pagenum-1)*pagesize, pagesize,
 	)
 	return list

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

@@ -12,6 +12,7 @@
     "weixinrpc": "127.0.0.1:83",
     "cacheflag": false,
     "agreement": "http",
-    "recommendEntLimit":"50"
+    "recommendEntLimit":"50",
+    "followPushRpc": "127.0.0.1:8759"
 
 }

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

@@ -3,9 +3,10 @@ package search
 import (
 	"fmt"
 	"github.com/go-xweb/xweb"
-	"qfw/util/elastic"
+	//"qfw/util/elastic"
 	"config"
 	"strconv"
+	"jfw/jylabutil"
 )
 
 type EntSeSearch struct {
@@ -25,22 +26,38 @@ func (e *EntSeSearch) ToSearch() error{
 }
 
 func (e *EntSeSearch) RecList() {
-	fmt.Println("entName", e.GetString("entName"))
 	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,
-			})
-		}
+	limit,_ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
+	//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,
+	//		})
+	//	}
+	//}
+	fmt.Println("11111111111111111",entName,limit)
+	re := jylabutil.GetEenNameImmediate(entName,limit)
+	fmt.Println("RecList",re)
+	if re!=nil && len(re) != 0{
+		e.ServeJson(map[string]interface{}{
+			"recList": re,
+		})
 	}
 }
 
 func (e *EntSeSearch) ProList() {
+	var searchname = e.GetString("searchname")
+	var scope = e.GetString("scope")
+	//var money = e.GetString("money")
+	var money_from,_ = strconv.Atoi(e.GetString("money_from"))
+	var money_to,_ = strconv.Atoi(e.GetString("money_to"))
+	fmt.Println(searchname,scope,money_from,money_to)
+	proMap := jylabutil.GetProjectByEntName(searchname,scope,money_from,money_to,1,10)
+	fmt.Println("------------------",proMap)
 	e.ServeJson(map[string]interface{}{
-
+		"proList": proMap,
 	})
 }

src/jfw/modules/entsesearch/src/web/templates/common/pnc.html

@@ -3,14 +3,14 @@
 <meta name="renderer" content="webkit">
 <meta name="baidu-site-verification" content="cSFG2PMaYX" />
 <meta name="applicable-device" content="pc,mobile" />
-<link href="/css/bootstrap.min.css" rel="stylesheet">
-<link href="/css/bootswatch.min.css" rel="stylesheet">
-<link href="/css/jy.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<script src="/js/jquery.js"></script>
-<script src="/js/jquery.cookie.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/jy.js?v={{Msg "seo" "version"}}"></script>
-<script src="/js/login.js?v={{Msg "seo" "version"}}"></script>
-<script src="/js/common.js?v={{Msg "seo" "version"}}"></script>
-{{Html `<!--[if lt IE 9]><script src="/js/html5shiv.min.js"></script><script src="/js/respond.min.js"></script><![endif]-->`}}
+<link href="/jylab/entsesearch/css/bootstrap.min.css" rel="stylesheet">
+<link href="/jylab/entsesearch/css/bootswatch.min.css" rel="stylesheet">
+<link href="/jylab/entsesearch/css/jy.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="/jylab/entsesearch/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<script src="/jylab/entsesearch/js/jquery.js"></script>
+<script src="/jylab/entsesearch/js/jquery.cookie.js"></script>
+<script src="/jylab/entsesearch/js/bootstrap.min.js"></script>
+<script src="/jylab/entsesearch/js/jy.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/entsesearch/js/login.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/entsesearch/js/common.js?v={{Msg "seo" "version"}}"></script>
+{{Html `<!--[if lt IE 9]><script src="/js/html5shiv.min.js"></script><script src="/jylab/entsesearch/js/respond.min.js"></script><![endif]-->`}}

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

@@ -225,7 +225,7 @@
 	color: #2cb7ca;
 }
 
-.tip{
+.tip_m{
 	font-size: 14px;
 	padding: 0 .3rem;
 	margin-bottom:70px;
@@ -250,6 +250,13 @@
 	<form class="searchform" id="searchform" method="post" action="/swordfish/searchlist" target="listf">
 	<div class="wxhead">
 	<input class="form-control searchname" id="searchname" name="searchname" maxlength ="50" value="{{if .T.shname}}{{.T.shname}}{{end}}" placeholder="中标企业名称"/>
+
+	<input type="hidden" name="searchvalue" value="">
+	<input type="hidden" name="money" value="">
+	<input type="hidden" name="money_from" value="">
+	<input type="hidden" name="money_to" value="">
+	<input type="hidden" name="scope" value="">
+
 	<div id="recList" style="display: none"></div>
 	<span class="tubiao"><img src="/jylab/entsesearch/images/wx/jywxjs.png"/></span>
 	<span class="qc"><img src="/jylab/entsesearch/images/wx/jyqingchu.png"/></span>
@@ -274,12 +281,12 @@
 						<li>价格区间</li>
 						<li class="money-inp">
 							<div class="min-price">
-								<input class="form-control" id="money_from"  placeholder="最低价"/>
+								<input class="form-control money-input" id="money_from"  placeholder="最低价" type="number"/>
 								<span class="min-unit">万元</span>
 								<span class="fgx"></span>
 							</div>
 							<div class="max-price">
-								<input class="form-control"  id="money_to" placeholder="最高价"/>
+								<input class="form-control money-input"  id="money_to" placeholder="最高价" type="number"/>
 								<span class="max-unit">万元</span>
 							</div>
 						</li>
@@ -386,40 +393,46 @@
 	</section>
 </div>
 <!--tip-->
-<div class="tip">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>
+<div class="tip_m">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>
 </body>
 </html>
 <script>
 	$(function () {
         $(".qc").addClass("hidden");
         $(".tubiao").addClass("hidden");
+        $(".jydqsure").css("background","#ccc");
 
-        //
+        //选项卡
         $("#set_search .select ul li:eq(0)").css("color","#2cb7ca");
         $("#set_search .select ul li:eq(2)").css("color","#888");
         $(".money").removeClass("hidden");
         $(".jydq-dialog").addClass("hidden");
 
-        //
+        //搜索框
         $("#searchname").on("input propertychange",function(){
             var snqc = $(".searchname").val();
             if(snqc.length > 0){
                 $(".qc").removeClass("hidden");
                 $(".tubiao").removeClass("hidden");
+                $(".jydqsure").css("background","#2cb7ca");
                 getRecList(snqc);
             }else{
                 $(".qc").addClass("hidden");
                 $(".tubiao").addClass("hidden");
+                $(".jydqsure").css("background","#ccc");
             }
         });
 
+        //清除
         $(".qc").click(function(){
             $(".searchname").val("");
             $(".qc").addClass("hidden");
             $(".tubiao").addClass("hidden");
+            $(".jydqsure").css("background","#ccc");
             $(".wxhead").find("[name='searchname']").focus();
         });
 
+        //企业推荐列表
         function getRecList(entName) {
             $("#recList").html("");
             $.post("/jylab/entsesearch/recList",{entName:entName},function(r){
@@ -427,7 +440,7 @@
                     if(typeof (r.recList)!="undefined"){
                         var recList = r.recList;
                         for(var i=0;i<recList.length;i++){
-                            var entName = recList[i].winner;
+                            var entName = recList[i].name;
                             if(entName!="" && entName.length>20){
                                 entName = entName.substr(0,20)+"...";
                             }
@@ -454,7 +467,7 @@
         });
 
         //金额输入
-        $(".form-control").on("input propertychange",function(){
+        $(".money-input").on("input propertychange",function(){
             var money_from = $.trim($("#money_from").val());
             var money_to = $.trim($("#money_to").val());
             var val = $.trim($(this).val());
@@ -465,10 +478,97 @@
 			}
         });
 
+        //金额blur
+        $(".money-input").blur(function(){
+            var money_from = $.trim($("#money_from").val());
+            var money_to = $.trim($("#money_to").val());
+            var from = parseFloat(money_from);
+            var to = parseFloat(money_to);
+            if(from>to){
+                $("#money_from").val(money_to);
+                $("#money_to").val(money_from);
+			}
+        });
 
         $(".money .btn").click(function () {
             $(".money .btn").addClass("active_m");
         });
+
+        //重置
+        $(".jydqreset").click(function () {
+            $(".contentone .active").removeClass("active");
+            $(".contentone").find(".btn").first().addClass("active");
+
+            $(".money .btn").addClass("active_m");
+        });
+
+        //搜索企业项目信息
+        $(".jydqsure").click(function () {
+            formSubmit();
+        });
+
+        $(".tubiao").click(function(){
+            formSubmit();
+        });
+        //确定
+		function formSubmit(){
+			var searchname = $.trim($(".searchname").val().replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+"));
+            var dataObj = {};
+
+            var money = "";
+            //金额
+            if($(".money .btn.active_m").first().length>0){
+                money = $(".money .btn.active_m").first().text();
+                console.log(money);
+			}
+			var money_from = $.trim($("#money_from").val());
+            var money_to = $.trim($("#money_to").val());
+
+            //项目地区
+            this.setScope = function(){
+                var scope = [];
+                $(".contentone .btn.active").each(function(){
+                    var thisText = $(this).text();
+                    if(thisText == "全国"){
+                        scope.push("");
+                        return false;
+                    }else{
+                        scope.push(thisText);
+                    }
+                });
+                return scope.join(",");
+            }
+            dataObj["searchname"] = searchname;
+            dataObj["scope"] = this.setScope();
+            dataObj["money"] = money;
+            dataObj["money_from"] = money_from;
+            dataObj["money_to"] = money_to;
+            dataObj["pagenum"] = "1";
+            dataObj["pagesize"] = "10";
+
+//			  $("#searchform [name='scope']").val(this.setScope());
+//            $("#searchform [name='money']").val(money);
+//            $("#searchform [name='money_from']").val(money_from);
+//            $("#searchform [name='money_to']").val(money_to);
+//            $(".searchform").submit();
+
+            $.post("/jylab/entsesearch/proList",dataObj,function(r){
+                if(r){
+                    console.log(r);
+                    if(typeof (r.proList)!="undefined"){
+                        var proList = r.proList;
+                        for(var i=0;i<proList.length;i++){
+							var bidamount = proList[i].bidamount/10000;
+							var projectname = proList[i].projectname;
+                            var zbtime = proList[i].jgtime;
+                            var obj =$("<tr><td>"+(i+1)+"</td><td>"+zbtime+"</td><td>"+projectname+"</td><td>"+bidamount+"</td></tr>");
+                            $("#searchlist tbody").append(obj);
+                        }
+                    }
+                    shaixuanHide();
+                }
+            });
+		}
     });
 
 	//显示筛选过滤选择
@@ -476,13 +576,17 @@
 		if($("#set_search").attr("class")=="hidden"){
 			$("#set_search").removeClass("hidden");
 			$("#searchList").addClass("hidden");
-			$(".tip").addClass("hidden");
+			$(".tip_m").addClass("hidden");
 		}else{
-			$("#set_search").addClass("hidden");
-            $("#searchList").removeClass("hidden");
-            $(".tip").removeClass("hidden");
+            shaixuanHide();
 		}
 	})
+
+	function shaixuanHide() {
+        $("#set_search").addClass("hidden");
+        $("#searchList").removeClass("hidden");
+        $(".tip_m").removeClass("hidden");
+    }
 	
 	//选择金额or地区
 	$("#set_search .select ul li:eq(0)").click(function(){
@@ -501,7 +605,5 @@
 		$(".money").addClass("hidden");
 		$(".jydq-dialog").removeClass("hidden");
 	})
-
-
 	
 </script>

src/web/templates/pc/biddingsearch_enterprise.html

@@ -6,9 +6,12 @@
 		<link rel="stylesheet" type="text/css" href="/css/dev2/reset_pc.css" />
 		<link rel="stylesheet" type="text/css" href="/css/dev2/biddingSearch.css" />
 		<title>招标搜索</title>
+		{{include "/common/pnc.html"}}
+		<link href="/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 	</head>
 
 	<body>
+	{{include "/common/pchead.html"}}
 		<section id="searchInner">
 			<!--搜索头部 START-->
 			<div class="searchHeader">
@@ -286,6 +289,8 @@
 		</section>
 		<script type="text/javascript" src="/js/jquery-3.2.1.min.js"></script>
 		<script type="text/javascript" src="/js/biddingSearch.js"></script>
+	{{include "/common/pcbottom.html"}}
+	{{include "/common/baiducc.html"}}
 	</body>
 
 </html>