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

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GOROOT" path="/usr/local/go" />
+</project>

src/jfw/front/entserach.go

@@ -9,7 +9,7 @@ import (
 	//"time"
 	//"math/rand"
 	"jfw/jylabutil"
-
+	"jfw/jyutil"
 	//"regexp"
 	//"strconv"
 	//"strings"
@@ -18,6 +18,7 @@ import (
 	//. "github.com/thinxer/go-word2vec"
 	//"gopkg.in/mgo.v2/bson"
 	"github.com/go-xweb/xweb"
+	"fmt"
 )
 
 type Entsearch struct {
@@ -34,13 +35,15 @@ func (m *Entsearch) Bidsearchforent() error {
 
 	list := []map[string]interface{}{}
 	list = jylabutil.GetProjectByEntName("","",0,0,1,10)
+	jyutil.BidListConvert("",&list)
 	m.T["list"] = list
-	//for k,v := range list{
-	//	fmt.Println(k)
-	//	for i,z := range v{
-	//		fmt.Println(i)
-	//		fmt.Println(z)
-	//	}
-	//}
+	for k,v := range list{
+		fmt.Println(k)
+		fmt.Println(v["industry"])
+		//for i,z := range v{
+		//	fmt.Println(i)
+		//	fmt.Println(z)
+		//}
+	}
 	return m.Render("/pc/biddingsearch_enterprise.html", &m.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,
-		`"winner"`,
+		`"winner","biddingcontent"`,
 		`{"createtime":-1}`, ``, (pagenum-1)*pagesize, pagesize,
 	)
 	return list

src/web/templates/pc/biddingsearch_enterprise.html

@@ -165,7 +165,7 @@
 										<div class="luce-right">
 											<a href="#">{{$v.area}}</a>
 											<a href="#">{{$v.bidtype}}</a>
-											<a href="#">建筑工程</a>
+											<a href="#">{{$v.industry}}</a>
 											<span>{{$v.zbtime}}</span>
 										</div>
 									</div>
@@ -237,7 +237,7 @@
 		var mainList = {{.T.list}};
 		$(function () {
 //		    for(var i=0;i<mainList.length;i++){
-//		        alert(mainList[i]["projectname"])
+//		        alert(mainList[i]["industry"])
 //			}
 
         });