zh

src/jfw/front/entserach.go

@@ -22,13 +22,15 @@ import (
 
 type Entsearch struct {
 	*xweb.Action
-	bidsearchforent xweb.Mapper `xweb:"/jylab/bidsearchforent"`
+	bidSearchForent xweb.Mapper `xweb:"/jylab/bidsearchforent"`
+	supsearch       xweb.Mapper `xweb:"/jylab/supsearch"`
 }
 
 func init() {
 	xweb.AddAction(&Entsearch{})
 }
 
+<<<<<<< HEAD
 func (e *Entsearch) Bidsearchforent() error {
 	log.Println("-------中标企业搜索：")
 
@@ -37,6 +39,27 @@ func (e *Entsearch) Bidsearchforent() error {
 	jyutil.BidListConvert("",&list)
 
 	for k,v := range list{
+=======
+func (e *Entsearch) Supsearch() error {
+	return e.Render("/pc/supsearch.html", &e.T)
+}
+
+func (e *Entsearch) Bidsearchforent() error {
+	//defer util.Catch()
+	//	entname := e.GetString("entname")
+	//	area := e.GetString("area")
+	//	lower, _ := strconv.Atoi(e.GetString("lower"))
+	//	upper, _ := strconv.Atoi(e.GetString("upper"))
+	//	entname := ""
+	//	data := jylabutil.GetEenNameImmediate(entname, 10)
+	//	fmt.Println(data)
+
+	list := []map[string]interface{}{}
+	list = jylabutil.GetProjectByEntName("", "", 0, 0, 1, 10)
+	jyutil.BidListConvert("", &list)
+	e.T["list"] = list
+	for k, v := range list {
+>>>>>>> 9c4a4abcabab9788a4d83f03fa60755d13ed588a
 		v["k"] = k + 1
 		t1 := time.Unix(util.Int64All(v["createtime"]), 0)
 		v["time1"] = util.TimeDiff(t1)
@@ -49,6 +72,11 @@ func (e *Entsearch) Bidsearchforent() error {
 		//	fmt.Println(z)
 		//}
 	}
+<<<<<<< HEAD
 	e.T["list"] = list
 	return e.Render("/pc/biddingsearch_enterprise.html", &e.T)
-}
+}
+=======
+	return e.Render("/pc/biddingsearch_enterprise.html", &e.T)
+}
+>>>>>>> 9c4a4abcabab9788a4d83f03fa60755d13ed588a

src/jfw/modules/followent/src/followent/followent.go

@@ -19,13 +19,13 @@ var mongodb = tools.MQFW
 type FollowEnt struct {
 	*xweb.Action
 
-	entList  xweb.Mapper `xweb:"/jylab/followent/entList"`           //获取关注企业列表
-	addEnt   xweb.Mapper `xweb:"/jylab/followent/addEnt"`            //添加关注企业页面
-	newInfo  xweb.Mapper `xweb:"/jylab/followent/newInfo/(.*)/(.*)"` //企业最新信息
-	recList  xweb.Mapper `xweb:"/jylab/followent/recList"`           //获取推荐企业列表
-	saveEnt  xweb.Mapper `xweb:"/jylab/followent/saveEnt"`           //保存关注企业
-	qgFollow xweb.Mapper `xweb:"/jylab/followent/qgFollow"`          //取消关注
-	visited  xweb.Mapper `xweb:"/jylab/followent/notice/visited"`    //用是否已查看
+	entList  xweb.Mapper `xweb:"/jylab/followent/entList"`        //获取关注企业列表
+	addEnt   xweb.Mapper `xweb:"/jylab/followent/addEnt"`         //添加关注企业页面
+	newInfo  xweb.Mapper `xweb:"/jylab/followent/newInfo/(.*)"`   //企业最新信息
+	recList  xweb.Mapper `xweb:"/jylab/followent/recList"`        //获取推荐企业列表
+	saveEnt  xweb.Mapper `xweb:"/jylab/followent/saveEnt"`        //保存关注企业
+	qgFollow xweb.Mapper `xweb:"/jylab/followent/qgFollow"`       //取消关注
+	visited  xweb.Mapper `xweb:"/jylab/followent/notice/visited"` //用是否已查看
 }
 
 func init() {

src/web/templates/pc/biddingsearch_enterprise.html

@@ -73,11 +73,11 @@
 						<div class="Price-content clearfix">
 							<span class="active">全部</span>
 							<div class="PriceInput">
-								<input type="text" name="" id="" value="" placeholder="最低价              万元" />
+								<input type="text" name="lowerPrice" id="lower" value="{{.T.lower}}" placeholder="最低价             万元" />
 								<span></span>
-								<input type="text" name="" id="" value="" placeholder="最高价              万元" />
+								<input type="text" name="upperPrice" id="upper" value="{{.T.upper}}" placeholder="最高价             万元" />
 							</div>
-							<button>确定</button>
+							<button id="priceBtn">确定</button>
 						</div>
 					</div>
 					<!--项目地区-->
@@ -86,7 +86,7 @@
 							项目地区：
 						</div>
 						<div class="region-content">
-							<span id="regionBtn" class=" active">全国</span>
+							<font id="regionBtn" class="active">全国</font>
 							<i class="diver"></i>
 							<font class="parent-node">华北地区</font>
 							<font>北京</font>
@@ -209,10 +209,28 @@
 				</div>
 			</div>
 			<!--招标搜索页面 END-->
-
-
-
 		</section>
+		<script type="text/javascript">
+			$(function(){
+				//价格
+				$("#lower").click(function(){
+					if(!$(".PriceInput").hasClass("price-active")){
+						$(".PriceInput").addClass("price-active");
+					}
+				})
+				$("#upper").click(function(){
+					if(!$(".PriceInput").hasClass("price-active")){
+						$(".PriceInput").addClass("price-active");
+					}
+				})
+				$("#priceBtn").click(function(){
+					var lower = $("#lower").val();
+					var upper = $("#upper").val();	
+				})
+				
+				
+			})
+		</script>
 		<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"}}