qyss

src/jfw/front/entserach.go

@@ -1,35 +1,23 @@
 package front
 
 import (
-	//"fmt"
-<<<<<<< HEAD
-	//"jfw/jylabutil"
-	//"log"
-	//"math/rand"
-	//"qfw/util"
-	//	"qfw/util/redis"
-	//"time"
-
-	"github.com/go-xweb/xweb"
-=======
-	"log"
-	//"qfw/util"
-	//"qfw/util/redis"
-	//"github.com/go-xweb/xweb"
-	//"time"
-	//"math/rand"
+	"fmt"
 	"jfw/jylabutil"
+	"log"
+	"math/rand"
+	"qfw/util"
+	"qfw/util/redis"
+	"time"
+
 	"jfw/jyutil"
->>>>>>> 0454ce96bd62c73a8333730d0175a5310bccf16d
-	//"regexp"
-	//"strconv"
-	//"strings"
-	//"sync"
+	"regexp"
+	"strconv"
+	"strings"
+	"sync"
 
-	//. "github.com/thinxer/go-word2vec"
-	//"gopkg.in/mgo.v2/bson"
 	"github.com/go-xweb/xweb"
-	"fmt"
+	. "github.com/thinxer/go-word2vec"
+	"gopkg.in/mgo.v2/bson"
 )
 
 type Entsearch struct {
@@ -42,12 +30,11 @@ func init() {
 	xweb.AddAction(&Entsearch{})
 }
 
-
 func (e *Entsearch) Supsearch() error {
 	return e.Render("/pc/supsearch.html", &e.T)
 }
 
-func ( *Entsearch) Bidsearchforent() error {
+func (e *Entsearch) Bidsearchforent() error {
 	//defer util.Catch()
 	//	entname := e.GetString("entname")
 	//	area := e.GetString("area")
@@ -57,19 +44,19 @@ func ( *Entsearch) Bidsearchforent() error {
 	//	data := jylabutil.GetEenNameImmediate(entname, 10)
 	//	fmt.Println(data)
 
-
 	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)
+	list = jylabutil.GetProjectByEntName("", "", 0, 0, 1, 10)
+	jyutil.BidListConvert("", &list)
+	e.T["list"] = list
+	for k, v := range list {
+		v["k"] = k + 1
+		t := time.Unix(util.Int64All(v["createtime"]), 0)
+		v["time"] = util.TimeDiff(t)
 		fmt.Println(v["industry"])
 		//for i,z := range v{
 		//	fmt.Println(i)
 		//	fmt.Println(z)
 		//}
 	}
-	return m.Render("/pc/biddingsearch_enterprise.html", &m.T)
+	return e.Render("/pc/biddingsearch_enterprise.html", &e.T)
 }
-

src/web/templates/pc/biddingsearch_enterprise.html

@@ -159,14 +159,14 @@
 									<div class="liLuceneList">
 										<div class="luce-left">
 											<div class="left-title">
-												<a href="#"> <em>{{$k}}</em>{{$v.projectname}}</a>
+												<a href="#"> <em>{{$v.k}}</em>{{$v.projectname}}</a>
 											</div>
 										</div>
 										<div class="luce-right">
 											<a href="#">{{$v.area}}</a>
 											<a href="#">{{$v.bidtype}}</a>
 											<a href="#">{{$v.industry}}</a>
-											<span>{{$v.zbtime}}</span>
+											<span>{{$v.time}}</span>
 										</div>
 									</div>
 								</li>