王传进 пре 8 година
родитељ
комит
acc3de51a0
2 измењених фајлова са 29 додато и 41 уклоњено
  1. 21 17
      src/jfw/front/entserach.go
  2. 8 24
      src/web/templates/pc/biddingsearch_enterprise.html

+ 21 - 17
src/jfw/front/entserach.go

@@ -1,23 +1,23 @@
 package front
 
 import (
+	"fmt"
+	"jfw/jylabutil"
 	"log"
+	"math/rand"
 	"qfw/util"
-	//"qfw/util/redis"
-	//"github.com/go-xweb/xweb"
-	//"math/rand"
-	"jfw/jylabutil"
+	"qfw/util/redis"
+	"time"
+
 	"jfw/jyutil"
-	//"regexp"
-	//"strconv"
-	//"strings"
-	//"sync"
+	"regexp"
+	"strconv"
+	"strings"
+	"sync"
 
-	//. "github.com/thinxer/go-word2vec"
-	//"gopkg.in/mgo.v2/bson"
 	"github.com/go-xweb/xweb"
-	"fmt"
-	"time"
+	. "github.com/thinxer/go-word2vec"
+	"gopkg.in/mgo.v2/bson"
 )
 
 type Entsearch struct {
@@ -29,22 +29,26 @@ func init() {
 	xweb.AddAction(&Entsearch{})
 }
 
-func (m *Entsearch) Bidsearchforent() error {
+func (e *Entsearch) Bidsearchforent() error {
 	log.Println("-------中标企业搜索:")
 
 	list := []map[string]interface{}{}
 	list = jylabutil.GetProjectByEntName("","",0,0,1,10)
 	jyutil.BidListConvert("",&list)
-	m.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)
+		t1 := time.Unix(util.Int64All(v["createtime"]), 0)
+		v["time1"] = util.TimeDiff(t1)
+		t2 := time.Unix(util.Int64All(v["zbtime"]), 0)
+		v["time2"] = util.TimeDiff(t2)
+
 		fmt.Println(v["industry"])
 		//for i,z := range v{
 		//	fmt.Println(i)
 		//	fmt.Println(z)
 		//}
 	}
-	return m.Render("/pc/biddingsearch_enterprise.html", &m.T)
+	e.T["list"] = list
+	return e.Render("/pc/biddingsearch_enterprise.html", &e.T)
 }

+ 8 - 24
src/web/templates/pc/biddingsearch_enterprise.html

@@ -166,7 +166,7 @@
 											<a href="#">{{$v.area}}</a>
 											<a href="#">{{$v.bidtype}}</a>
 											<a href="#">{{$v.industry}}</a>
-											<span>{{$v.time}}</span>
+											<span>{{$v.time1}}</span>
 										</div>
 									</div>
 								</li>
@@ -185,30 +185,14 @@
 									</tr>
 								</thead>
 								<tbody>
+								{{range $k,$v:= .T.list}}
 									<tr>
-										<td>1</td>
-										<td>2017-6-15 </td>
-										<td class="tt-l">高速压坏地方公路建设项目</td>
-										<td class="tt-r">1000</td>
-									</tr>
-									<tr>
-										<td>1</td>
-										<td>2017-6-15 </td>
-										<td class="tt-l">高速压坏地方公路建设项目</td>
-										<td class="tt-r">1000</td>
-									</tr>
-									<tr>
-										<td>1</td>
-										<td>2017-6-15 </td>
-										<td class="tt-l">高速压坏地方公路建设项目</td>
-										<td class="tt-r">1000</td>
-									</tr>
-									<tr>
-										<td>1</td>
-										<td>2017-6-15 </td>
-										<td class="tt-l">高速压坏地方公路建设项目</td>
-										<td class="tt-r">1000</td>
+										<td>{{$v.k}}</td>
+										<td>{{$v.time2}} </td>
+										<td class="tt-l">{{$v.projectname}}</td>
+										<td class="tt-r">{{$v.bidamount}}</td>
 									</tr>
+								{{end}}
 								</tbody>
 							</table>
 						</div>
@@ -237,7 +221,7 @@
 		var mainList = {{.T.list}};
 		$(function () {
 //		    for(var i=0;i<mainList.length;i++){
-//		        alert(mainList[i]["industry"])
+//		        alert(mainList[i])
 //			}
 
         });