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

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

@@ -47,16 +47,23 @@ func (e *EntSeSearch) RecList() {
 func (e *EntSeSearch) ProList() {
 	var searchname = e.GetString("searchname")
 	var scope = e.GetString("scope")
-	//var money = e.GetString("money")
-	var money_from,_ = strconv.Atoi(e.GetString("money_from"))
-	var money_to,_ = strconv.Atoi(e.GetString("money_to"))
+	var money_from = e.GetString("money_from")
+	var money_to = e.GetString("money_to")
+	var money_from_p = float64(0)
+	var money_to_p = float64(0)
+	if money_from !=""{
+		money_from_p,_ = strconv.ParseFloat(money_from, 64)
+	}
+	if money_to !=""{
+		money_to_p,_ = strconv.ParseFloat(money_to, 64)
+	}
 	var pageNum,_ = strconv.Atoi(e.GetString("pageNum"))
-	fmt.Println(searchname,scope,money_from,money_to)
+
+	fmt.Println(searchname,scope,money_from_p,money_to_p)
 	proList := make([]map[string]interface{},0)
-	fmt.Println("proList------------------1",proList)
 	if pageNum<=wx_maxPageNum {
-		proList = jylabutil.GetProjectByEntName(searchname,scope,money_from,money_to,pageNum,wx_pageSize)
-		fmt.Println("proList------------------2",proList)
+		proList = jylabutil.GetProjectByEntName(searchname,scope,money_from_p,money_to_p,pageNum,wx_pageSize)
+		//fmt.Println("proList------------------2",proList)
 		for _,val := range proList{
 			var jgtime = val["jgtime"]
 			if jgtime!=nil{

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

@@ -189,9 +189,9 @@
 	transform: translateZ(0);
 }
 .select{
-	height:40px;
+	height:45px;
 	width:100%;
-	line-height:40px;
+	line-height:45px;
 	border-bottom: 1px solid #ccc;
 }
 .select ul li{
@@ -202,15 +202,15 @@
 }
 .select ul li img{
 	width: 10px;
-    padding-bottom: 5px;
+    padding-bottom: 3px;
     margin-left: 8px;
 }
 .shuxian{
 	border-right: 1px solid #ccc;
     color: #2cb7ca;
-    line-height: 30px;
-    height: 30px;
-    margin-top: 4px;
+    line-height: 35px;
+    height: 35px;
+    margin-top: 5px;
 }
 .selecter{
 	padding:10px;
@@ -248,6 +248,7 @@
 }
 .money-inp input{
 	width:100%;
+	padding-right: 45px;
 }
 .money-inp .min-price{
 	width:42%;
@@ -320,7 +321,7 @@
 }
 
 #jytables{
-	//padding: .3rem;
+	/*padding: .3rem;*/
 	padding-bottom: .3rem;
 	padding-top: .4rem;
 }
@@ -374,14 +375,14 @@
 }
 
 #wrapper,.nullcontent{
-	//padding:0px 20px;
+	/*padding:0px 20px;*/
 	padding:0px 15px;
 	background-color:#fff;
 }
 .nullcontent{
 	padding-top: 10%;
 	position: absolute;
-	top: 125px;
+	top: 65px;
 	left: 0px;
 	right: 0px;
 	border-top: 1px solid #f4f4f9;
@@ -428,12 +429,16 @@
 						<li>价格区间</li>
 						<li class="money-inp">
 							<div class="min-price">
-								<input class="form-control money-input" id="money_from"  placeholder="最低价" type="number"/>
+								<input class="form-control money-input" id="money_from"  placeholder="最低价" type="number"
+									   onkeyup="(this.v=function(){this.value=/^\d+(\.\d{0,2})?$/.test(this.value)==true?this.value:'';}).call(this)"
+									   onblur="this.v();"/>
 								<span class="min-unit">万元</span>
 								<span class="fgx"></span>
 							</div>
 							<div class="max-price">
-								<input class="form-control money-input"  id="money_to" placeholder="最高价" type="number"/>
+								<input class="form-control money-input"  id="money_to" placeholder="最高价" type="number"
+									   onkeyup="(this.v=function(){this.value=/^\d+(\.\d{0,2})?$/.test(this.value)==true?this.value:'';}).call(this)"
+									   onblur="this.v();"/>
 								<span class="max-unit">万元</span>
 							</div>
 						</li>
@@ -532,8 +537,17 @@
 	<div class="tip_m">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>
 </div>
 <!--no data-->
+<!--<div class="nullcontent text-center  hidden">-->
+	<!--<div style="font-size:16px;color:#1d1d1d;">没有找到和该企业匹配的中标项目信息</div>-->
+<!--</div>-->
 <div class="nullcontent text-center  hidden">
-	<div style="font-size:16px;color:#1d1d1d;">没有找到和该企业匹配的中标项目信息</div>
+	<div >
+		<img style="width:150px;margin:0px 0 50px 0;" src="/jylab/entsesearch/images/wx/jysorry_1.png">
+	</div>
+	<div style="font-size:16px;color:#1d1d1d;">没有找到和该关键词匹配的信息</div>
+	<div style="width:100%;" class="text-center">
+		<img onClick="window.open('/swordfish/feedback')" style="width: 200px;margin-top: 25px;" src="/jylab/entsesearch/images/wx/jyyjfk.png">
+	</div>
 </div>
 </body>
 <script>
@@ -568,6 +582,7 @@
                 $(".tubiao").addClass("hidden");
                 $(".jydqsure").css("background","#ccc");
                 $(".jydqsure").removeClass("jydqsure_active");
+                $("#recList").hide();
             }
         });
 

src/jfw/modules/push/src/qfw/push/dopush/dopushes.go

@@ -138,7 +138,7 @@ func PushInfoByEs(MaxPushSize int, Config *map[string]interface{}, i_ratemode in
 	} else {
 		q["o_jy.i_ratemode"] = i_ratemode
 	}
-	q["s_m_openid"] = "oHwE_wI94DGaSDks9ky5Yj8qqSx8"
+	//q["s_m_openid"] = "oHwE_wI94DGaSDks9ky5Yj8qqSx8"
 	query := session.DB("qfw").C("user").Find(&q).Select(&map[string]interface{}{
 		"_id":        1,
 		"o_jy":       1,

src/jfw/modules/push/src/xlsx/readme.txt

@@ -0,0 +1 @@
+excel数据导出临时目录