cc

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

@@ -3,10 +3,12 @@ package search
 import (
 	"fmt"
 	"github.com/go-xweb/xweb"
-	//"qfw/util/elastic"
 	"config"
 	"strconv"
 	"jfw/jylabutil"
+	"time"
+	"strings"
+	"qfw/util"
 )
 
 type EntSeSearch struct {
@@ -28,17 +30,6 @@ func (e *EntSeSearch) ToSearch() error{
 func (e *EntSeSearch) RecList() {
 	var entName = e.GetString("entName")
 	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{
@@ -56,7 +47,24 @@ func (e *EntSeSearch) ProList() {
 	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)
+	fmt.Println("proMap------------------",proMap)
+	for _,val := range proMap{
+		var jgtime = val["jgtime"]
+		if jgtime!=nil{
+			val["jgtime"] = time.Unix(int64(jgtime.(float64)),0).Format("20060102")
+		}else{
+			val["jgtime"] = ""
+		}
+		var bidamount = val["bidamount"]
+		if bidamount!=nil{
+			var bidamount_f = bidamount.(float64)/10000
+			val["bidamount"] = strings.Replace(fmt.Sprintf("%.2f", bidamount_f),".00","",-1)
+		}else{
+			val["bidamount"] = ""
+		}
+
+		val["sourceinfoid"] = util.EncodeArticleId2ByCheck(val["sourceinfoid"].(string))
+	}
 	e.ServeJson(map[string]interface{}{
 		"proList": proMap,
 	})

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

@@ -221,7 +221,11 @@
 	color: #1d1d1d;
 }
 /*高亮字体*/
-#jytables table span.higHlight{
+/*#jytables table span.highLight{
+	color: #2cb7ca;
+}*/
+
+.highLight{
 	color: #2cb7ca;
 }
 
@@ -376,18 +380,6 @@
 			</tr>
 			</thead>
 			<tbody>
-			<tr>
-				<td>1</td>
-				<td>2017 0721</td>
-				<td><span>五峰土家族自治县</span>LED单色户外电子屏采购项目</td>
-				<td>1.30</td>
-			</tr>
-			<tr>
-				<td>2</td>
-				<td>2017 0721</td>
-				<td>G320下司至麻江良田公路改扩建项目</td>
-				<td>31</td>
-			</tr>
 			</tbody>
 		</table>
 	</section>
@@ -395,12 +387,13 @@
 <!--tip-->
 <div class="tip_m">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>
 </body>
-</html>
 <script>
 	$(function () {
         $(".qc").addClass("hidden");
         $(".tubiao").addClass("hidden");
         $(".jydqsure").css("background","#ccc");
+        $("#searchList").addClass("hidden");
+        $(".tip_m").addClass("hidden");
 
         //选项卡
         $("#set_search .select ul li:eq(0)").css("color","#2cb7ca");
@@ -432,36 +425,6 @@
             $(".wxhead").find("[name='searchname']").focus();
         });
 
-        //企业推荐列表
-        function getRecList(entName) {
-            $("#recList").html("");
-            $.post("/jylab/entsesearch/recList",{entName:entName},function(r){
-                if(r){
-                    if(typeof (r.recList)!="undefined"){
-                        var recList = r.recList;
-                        for(var i=0;i<recList.length;i++){
-                            var entName = recList[i].name;
-                            if(entName!="" && entName.length>20){
-                                entName = entName.substr(0,20)+"...";
-                            }
-                            var obj=$("<div class='rec'>"+entName+"</div>");
-                            $("#recList").append(obj);
-                        }
-                    }
-                }
-                $("#recList").show();
-
-                $(".rec").click(function(){
-                    if($(this).text()!=""){
-                        $("#searchname").val($(this).text());
-                        $("#recList").hide();
-                        $(".qc").addClass("hidden");
-                        $(".tubiao").removeClass("hidden");
-                    }
-                });
-            });
-        }
-
         $("body").click(function () {
             $("#recList").hide();
         });
@@ -510,41 +473,102 @@
         $(".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());
+        //显示筛选过滤选择
+        $(".shaixuan").click(function(){
+            if($("#set_search").attr("class")=="hidden"){
+                $("#set_search").removeClass("hidden");
+                $("#searchList").addClass("hidden");
+                $(".tip_m").addClass("hidden");
+            }else{
+                shaixuanHide();
+            }
+        });
+
+        //选择金额or地区
+        $("#set_search .select ul li:eq(0)").click(function(){
+            $(this).css("color","#2cb7ca");
+            $("#set_search .select ul li:eq(2)").css("color","#888");
+            $("#set_search .select ul li:eq(0) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom2.png");
+            $("#set_search .select ul li:eq(2) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom.png");
+            $(".money").removeClass("hidden");
+            $(".jydq-dialog").addClass("hidden");
+        })
+        $("#set_search .select ul li:eq(2)").click(function(){
+            $(this).css("color","#2cb7ca");
+            $("#set_search .select ul li:eq(0)").css("color","#888");
+            $("#set_search .select ul li:eq(0) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom.png");
+            $("#set_search .select ul li:eq(2) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom2.png");
+            $(".money").addClass("hidden");
+            $(".jydq-dialog").removeClass("hidden");
+        })
+    });
 
-            //项目地区
-            this.setScope = function(){
-                var scope = [];
-                $(".contentone .btn.active").each(function(){
-                    var thisText = $(this).text();
-                    if(thisText == "全国"){
-                        scope.push("");
-                        return false;
-                    }else{
-                        scope.push(thisText);
+    //企业推荐列表
+    function getRecList(entName_key) {
+        $("#recList").html("");
+        $.post("/jylab/entsesearch/recList",{entName:entName_key},function(r){
+            if(r){
+                if(typeof (r.recList)!="undefined"){
+                    var recList = r.recList;
+                    for(var i=0;i<recList.length;i++){
+                        var entName = recList[i].name;
+                        if(entName!="" && entName.length>20){
+                            entName = entName.substr(0,20)+"...";
+                        }
+                        var obj=$("<div class='rec'>"+entName.replace(entName_key,"<span class='highLight'>"+entName_key+"</span>")+"</div>");
+                        $("#recList").append(obj);
                     }
-                });
-                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";
+            $("#recList").show();
+
+            $(".rec").click(function(){
+                if($(this).text()!=""){
+                    $("#searchname").val($(this).text());
+                    $("#recList").hide();
+                    $(".qc").addClass("hidden");
+                    $(".tubiao").removeClass("hidden");
+                }
+            });
+        });
+    }
+
+    //确定
+    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);
@@ -552,58 +576,39 @@
 //            $("#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);
-                        }
+        $.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;
+                        var projectname = proList[i].projectname;
+                        var zbtime = proList[i].jgtime;
+                        var sourceinfoid = proList[i].sourceinfoid;
+                        var projectcode = proList[i].projectcode;
+                        var obj =$("<tr onclick=\"toDetail('"+sourceinfoid+"','"+projectcode+"','"+projectname+"')\"><td>"+(i+1)+"</td><td>"+zbtime+"</td><td>"+projectname+"</td><td>"+bidamount+"</td></tr>");
+                        $("#searchlist tbody").append(obj);
                     }
-                    shaixuanHide();
                 }
-            });
-		}
-    });
+                shaixuanHide();
+            }
+        });
+    }
 
-	//显示筛选过滤选择
-	$(".shaixuan").click(function(){
-		if($("#set_search").attr("class")=="hidden"){
-			$("#set_search").removeClass("hidden");
-			$("#searchList").addClass("hidden");
-			$(".tip_m").addClass("hidden");
-		}else{
-            shaixuanHide();
-		}
-	})
+    //
+    function toDetail(id,projectcode,projectname) {
+        if(id!="" && typeof (id)!="undefined" && projectcode!="" && typeof(projectcode)!="undefined" && projectname!="" && typeof(projectname)!="undefined"){
+            window.location.href="/follow/photo/"+id+"__"+projectname+"__"+projectcode;
+        }
+    }
 
+    //筛选隐藏
 	function shaixuanHide() {
         $("#set_search").addClass("hidden");
         $("#searchList").removeClass("hidden");
         $(".tip_m").removeClass("hidden");
     }
 	
-	//选择金额or地区
-	$("#set_search .select ul li:eq(0)").click(function(){
-		$(this).css("color","#2cb7ca");
-        $("#set_search .select ul li:eq(2)").css("color","#888");
-        $("#set_search .select ul li:eq(0) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom2.png");
-        $("#set_search .select ul li:eq(2) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom.png");
-        $(".money").removeClass("hidden");
-        $(".jydq-dialog").addClass("hidden");
-	})
-	$("#set_search .select ul li:eq(2)").click(function(){
-		$(this).css("color","#2cb7ca");
-		$("#set_search .select ul li:eq(0)").css("color","#888");
-		$("#set_search .select ul li:eq(0) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom.png");
-		$("#set_search .select ul li:eq(2) img").attr("src","/jylab/entsesearch/images/wx/sys-jt-bottom2.png");
-		$(".money").addClass("hidden");
-		$(".jydq-dialog").removeClass("hidden");
-	})
-	
-</script>
+</script>
+</html>