liuxiaolu 8 жил өмнө
parent
commit
916fc1447f

+ 28 - 19
src/jfw/modules/entsesearch/src/search/entsesearch.go

@@ -11,6 +11,10 @@ import (
 	"qfw/util"
 	"qfw/util"
 )
 )
 
 
+const (
+	wx_maxPageNum         = 20
+	wx_pageSize           = 1
+)
 type EntSeSearch struct {
 type EntSeSearch struct {
 	*xweb.Action
 	*xweb.Action
 	toSearch  xweb.Mapper `xweb:"/jylab/entsesearch/search"`  //跳转到中标企业查询页面
 	toSearch  xweb.Mapper `xweb:"/jylab/entsesearch/search"`  //跳转到中标企业查询页面
@@ -24,7 +28,7 @@ func init() {
 }
 }
 
 
 func (e *EntSeSearch) ToSearch() error{
 func (e *EntSeSearch) ToSearch() error{
-	e.T["pageSize"] = "10"
+	e.T["pageSize"] = wx_pageSize
 	return e.Render("/weixin/entseSearch.html", &e.T)
 	return e.Render("/weixin/entseSearch.html", &e.T)
 }
 }
 
 
@@ -46,27 +50,32 @@ func (e *EntSeSearch) ProList() {
 	//var money = e.GetString("money")
 	//var money = e.GetString("money")
 	var money_from,_ = strconv.Atoi(e.GetString("money_from"))
 	var money_from,_ = strconv.Atoi(e.GetString("money_from"))
 	var money_to,_ = strconv.Atoi(e.GetString("money_to"))
 	var money_to,_ = strconv.Atoi(e.GetString("money_to"))
+	var pageNum,_ = strconv.Atoi(e.GetString("pageNum"))
 	fmt.Println(searchname,scope,money_from,money_to)
 	fmt.Println(searchname,scope,money_from,money_to)
-	proMap := jylabutil.GetProjectByEntName(searchname,scope,money_from,money_to,1,10)
-	fmt.Println("proMap------------------",proMap)
-	for _,val := range proMap{
-		var jgtime = val["jgtime"]
-		if jgtime!=nil{
-			val["jgtime"] = time.Unix(int64(jgtime.(float64)),0).Format("20060102")
-		}else{
-			val["jgtime"] = ""
-		}
-		var bidamount = val["bidamount"]
-		if bidamount!=nil{
-			var bidamount_f = bidamount.(float64)/10000
-			val["bidamount"] = strings.Replace(fmt.Sprintf("%.2f", bidamount_f),".00","",-1)
-		}else{
-			val["bidamount"] = ""
+	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)
+		for _,val := range proList{
+			var jgtime = val["jgtime"]
+			if jgtime!=nil{
+				val["jgtime"] = time.Unix(int64(jgtime.(float64)),0).Format("20060102")
+			}else{
+				val["jgtime"] = ""
+			}
+			var bidamount = val["bidamount"]
+			if bidamount!=nil{
+				var bidamount_f = bidamount.(float64)/10000
+				val["bidamount"] = strings.Replace(fmt.Sprintf("%.2f", bidamount_f),".00","",-1)
+			}else{
+				val["bidamount"] = ""
+			}
+			val["sourceinfoid"] = util.EncodeArticleId2ByCheck(val["sourceinfoid"].(string))
 		}
 		}
-
-		val["sourceinfoid"] = util.EncodeArticleId2ByCheck(val["sourceinfoid"].(string))
 	}
 	}
 	e.ServeJson(map[string]interface{}{
 	e.ServeJson(map[string]interface{}{
-		"proList": proMap,
+		"proList": proList,
+		"hasNextPage": proList != nil && len(proList) == wx_pageSize && pageNum < wx_maxPageNum,
 	})
 	})
 }
 }

+ 284 - 127
src/jfw/modules/entsesearch/src/web/templates/weixin/entseSearch.html

@@ -7,6 +7,7 @@
 <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="no" />
 <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="no" />
 <meta name="renderer" content="webkit"/>
 <meta name="renderer" content="webkit"/>
 <link href="/jylab/entsesearch/wxswordfish/style.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="/jylab/entsesearch/wxswordfish/style.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="/jylab/entsesearch/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 {{include "/common/pnc.html"}}
 {{include "/common/pnc.html"}}
 <link href="/jylab/entsesearch/css/wxlist.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="/jylab/entsesearch/css/wxlist.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
@@ -16,9 +17,129 @@
 <script src="/jylab/entsesearch/wxswordfish/search.js?v={{Msg "seo" "version"}}"></script>
 <script src="/jylab/entsesearch/wxswordfish/search.js?v={{Msg "seo" "version"}}"></script>
 <script src="/jylab/entsesearch/wxswordfish/jquery.resize.js"></script>
 <script src="/jylab/entsesearch/wxswordfish/jquery.resize.js"></script>
 <script src="/jylab/entsesearch/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script src="/jylab/entsesearch/js/dropload.js?v={{Msg "seo" "version"}}"></script>
-
 <script src="/jylab/entsesearch/js/rem.js"></script>
 <script src="/jylab/entsesearch/js/rem.js"></script>
 <link rel="stylesheet" href="/jylab/entsesearch/css/reset.css" />
 <link rel="stylesheet" href="/jylab/entsesearch/css/reset.css" />
+
+<script>
+    var scrollTop = 0;
+    var listCache = "";
+    var pageNumCache = 1;
+    var noMoreCache = false;
+    var moneyFromCache = "";
+    var moneyToCache = "";
+    var scopeCache = "";
+    var pageSize = {{.T.pageSize}};
+    var pageNum = "1";
+    //是否有列表数据
+    var dataListFlag = true;
+    //查询参数
+    var reqParam = null;
+    $(function () {
+        reqParam = {
+            "searchname": $.trim($(".searchname").val()),
+            "money_from": "",
+            "money_to": "",
+            "scope": "",
+            "pageNum": pageNum
+        };
+        //返回时 在缓存取数据
+        var loadCacheData = false;
+        if (sessionStorage && sessionStorage.wxsearchScrollTop && sessionStorage.wxsearchListCache) {
+            loadCacheData = true;
+            pageNum = sessionStorage.wxsearchPageNumCache;
+            noMoreCache = sessionStorage.wxsearchNoMoreCache;
+            $("#list").css("visibility", "hidden");
+            appendListHtml(sessionStorage.wxsearchListCache, pageNum);
+            if (noMoreCache == "true") {
+                initDroploadNoMoreData();
+            }else{
+                initDropload();
+            }
+            sessionStorage.removeItem("wxsearchPageNumCache");
+            sessionStorage.removeItem("wxsearchListCache");
+
+            moneyFromCache = sessionStorage.wxsearchMoneyFromCache;
+            moneyToCache = sessionStorage.wxsearchMoneyToCache;
+            $("#money_from").val(moneyFromCache);
+            $("#money_to").val(moneyToCache);
+            if(moneyFromCache!="" || moneyToCache!=""){
+                $(".money-inp").addClass("money-inp-active");
+                $(".money .btn").removeClass("active_m");
+            }else{
+                $(".money .btn").addClass("active_m");
+                $(".money-inp").removeClass("money-inp-active");
+            }
+            sessionStorage.removeItem("wxsearchMoneyFromCache");
+            sessionStorage.removeItem("wxsearchMoneyToCache");
+
+            scopeCache = sessionStorage.wxsearchScopeCache;
+            if(scopeCache != ""){
+                $(".contentone").find("ul:first li:first .btn").removeClass("active");
+                scopeCache = scopeCache.split(",");
+                for(var i=0;i<scopeCache.length;i++){
+                    $(".contentone").find(".btn").each(function(){
+                        if($(this).text() == scopeCache[i]){
+                            $(this).addClass("active");
+                            if($(this).parent("li").find(".btn").length == $(this).parent("li").find(".btn.active").length){
+                                $(this).prevAll('div[id="dqbtn"]').addClass("active");
+                            };
+                            return false;
+                        }
+                    });
+                }
+            }
+            sessionStorage.removeItem("wxsearchScopeCache");
+
+            setTimeout(function () {
+                $(window).scrollTop(sessionStorage.wxsearchScrollTop);
+                sessionStorage.removeItem("wxsearchScrollTop");
+                $("#list").css("visibility", "visible");
+            }, 300);
+        } else {
+            $(window).scrollTop(0);
+        }
+    });
+
+    function initDropload(){
+        $(".dropload-down,.dropload-noData").remove();
+        //上拉分页
+        $('#wrapper').dropload({
+            scrollArea: window,
+            loadDownFn: function (me) {
+                beforeSubmit();
+                pageNum++;
+                reqParam["pageNum"] = pageNum;
+                $.ajax({
+                    type: 'post',
+                    url: '/jylab/entsesearch/proList',
+                    data: reqParam,
+                    dataType: 'json',
+                    success: function (data) {
+                        //没有数据
+                        if (data["proList"] == null || data["proList"].length == 0) {
+                            noMoreData(me);
+                            return;
+                        }
+                        var html = getHtml(data["proList"], reqParam["pageNum"]);
+                        // 每次数据插入,必须重置
+                        appendListHtml(html, pageNum);
+                        //没有下一页了
+                        if (!data.hasNextPage) {
+                            // 锁定
+                            me.lock();
+                            // 无数据
+                            me.noData();
+                        }
+                        me.resetload();
+                    },
+                    error: function (xhr, type) {
+                        noMoreData(me);
+                    }
+                });
+            }
+        });
+    }
+</script>
 <style>
 <style>
 #searchDiv .searchform{
 #searchDiv .searchform{
 	width:79%;
 	width:79%;
@@ -172,7 +293,7 @@
 }
 }
 .bottom_btn .reset{
 .bottom_btn .reset{
 	background-color:#eff9fa;
 	background-color:#eff9fa;
-	color:2cb7ca;
+	color:#2cb7ca;
 }
 }
 .bottom_btn .sure{
 .bottom_btn .sure{
 	background-color:#2cb7ca;
 	background-color:#2cb7ca;
@@ -199,7 +320,8 @@
 }
 }
 
 
 #jytables{
 #jytables{
-	padding: .3rem;
+	//padding: .3rem;
+	padding-bottom: .3rem;
 	padding-top: .4rem;
 	padding-top: .4rem;
 }
 }
 #jytables table{
 #jytables table{
@@ -235,12 +357,12 @@
 
 
 .tip_m{
 .tip_m{
 	font-size: 14px;
 	font-size: 14px;
-	padding: 0 .3rem;
+	/*padding: 0 .3rem;*/
 	margin-bottom:70px;
 	margin-bottom:70px;
 	line-height: 20px;
 	line-height: 20px;
 }
 }
 #recList{
 #recList{
-	z-index: 1;
+	z-index: 1000;
 	position: absolute;
 	position: absolute;
 	background: rgb(255, 255, 255);
 	background: rgb(255, 255, 255);
 	width: 79%;
 	width: 79%;
@@ -252,7 +374,8 @@
 }
 }
 
 
 #wrapper,.nullcontent{
 #wrapper,.nullcontent{
-	padding:0px 20px;
+	//padding:0px 20px;
+	padding:0px 15px;
 	background-color:#fff;
 	background-color:#fff;
 }
 }
 .nullcontent{
 .nullcontent{
@@ -269,7 +392,7 @@
 </style>
 </style>
 </head>
 </head>
 <body>
 <body>
-<!-->顶部搜索<-->
+<!--顶部搜索-->
 <div id="searchDiv">
 <div id="searchDiv">
 	<form class="searchform" id="searchform" method="post" target="listf">
 	<form class="searchform" id="searchform" method="post" target="listf">
 	<div class="wxhead">
 	<div class="wxhead">
@@ -288,7 +411,7 @@
 	</div>
 	</div>
 	</form>
 	</form>
 </div>
 </div>
-<!-->过滤搜索<-->
+<!--过滤搜索-->
 <div id="set_search" class="hidden">
 <div id="set_search" class="hidden">
 	<div class="select">
 	<div class="select">
 		<ul>
 		<ul>
@@ -388,16 +511,16 @@
 	</div>	
 	</div>	
 </div>
 </div>
 <!--数据列表-->
 <!--数据列表-->
-<div id="wrapper" style="height:700px;margin-top:.2rem;border-top: 1px solid #E0E0E0;">
+<div id="wrapper" style="margin-top:.2rem;border-top: 1px solid #E0E0E0;">
 	<div id="list">
 	<div id="list">
 		<section id="jytables">
 		<section id="jytables">
 		<table>
 		<table>
 			<thead>
 			<thead>
 			<tr>
 			<tr>
-				<td>序号</td>
-				<td>中标日期</td>
-				<td>项目名称</td>
-				<td>中标金额(万元)</td>
+				<td width="10%">序号</td>
+				<td width="20%">中标日期</td>
+				<td width="50%">项目名称</td>
+				<td width="20%">中标金额(万元)</td>
 			</tr>
 			</tr>
 			</thead>
 			</thead>
 			<tbody>
 			<tbody>
@@ -405,79 +528,25 @@
 		</table>
 		</table>
 	</section>
 	</section>
 	</div>
 	</div>
+	<!--tip-->
+	<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>
-<!--tip-->
-<div class="tip_m">提示:为了获得更佳的体验,推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>
 </body>
 </body>
 <script>
 <script>
-	var pageSize = {{.T.pageSize}};
-	var pageNum = "1";
-	//查询参数
-    var reqParam = {
-        "searchname": $.trim($(".searchname").val()),
-        "money_from": $.trim($("#money_from").val()),
-        "money_to": $.trim($("#money_to").val()),
-        "scope": "",
-        "pageNum": pageNum
-    };
-	$(function () {
-        $('#wrapper').dropload({
-            scrollArea : window.top.isIOS?window.top:window,
-            loadDownFn : function(me){
-                if(window.top.isBackIndex){
-                    noMoreData(me);
-                    return;
-                }
-//                if(!loadCacheData && firstPage){
-//                    appendListHtml(getHtml(firstPage,1),1);
-//                    firstPage = null;
-//                    isloadover = true;
-//                    setTimeout(function(){
-//                        me.resetload();
-//                    },1000);
-//                    return;
-//                }
-				beforeSubmit();
-                pageNum++;
-                reqParam["searchname"] = "";
-                reqParam["pageNum"] = pageNum;
-                $.ajax({
-                    type: 'post',
-                    url: '/jylab/entsesearch/proList',
-                    data: reqParam,
-                    dataType: 'json',
-                    success: function(data){
-                        console.log(data);
-//                        isloadover = true;
-                        //没有数据
-                        if(data["proList"] == null || data["proList"].length == 0){
-                            noMoreData(me);
-                            return;
-                        }
-                        var html = getHtml(data["proList"],reqParam["pageNum"]);
-                        // 每次数据插入,必须重置
-                        appendListHtml(html,pageNum);
-                        //没有下一页了
-                        if(!data.hasNextPage){
-                            // 锁定
-                            me.lock();
-                            // 无数据
-                            me.noData();
-                        }
-                        me.resetload();
-                    },
-                    error: function(xhr, type){
-                       // noMoreData(me);
-                    }
-                });
-            }
-        });
-	    //
+    $(function () {
+        //
+		if($("#wrapper tbody tr").length==0){
+            $("#wrapper").addClass("hidden");
+            $(".tip_m").addClass("hidden");
+		}
         $(".qc").addClass("hidden");
         $(".qc").addClass("hidden");
         $(".tubiao").addClass("hidden");
         $(".tubiao").addClass("hidden");
         $(".jydqsure").css("background","#ccc");
         $(".jydqsure").css("background","#ccc");
-        $("#wrapper").addClass("hidden");
-        $(".tip_m").addClass("hidden");
+        $(".jydqsure").removeClass("jydqsure_active");
 
 
         //选项卡
         //选项卡
         $("#set_search .select ul li:eq(0)").css("color","#2cb7ca");
         $("#set_search .select ul li:eq(0)").css("color","#2cb7ca");
@@ -485,18 +554,32 @@
         $(".money").removeClass("hidden");
         $(".money").removeClass("hidden");
         $(".jydq-dialog").addClass("hidden");
         $(".jydq-dialog").addClass("hidden");
 
 
-        //搜索框
+        //搜索框输入
         $("#searchname").on("input propertychange",function(){
         $("#searchname").on("input propertychange",function(){
             var snqc = $(".searchname").val();
             var snqc = $(".searchname").val();
             if(snqc.length > 0){
             if(snqc.length > 0){
                 $(".qc").removeClass("hidden");
                 $(".qc").removeClass("hidden");
                 $(".tubiao").removeClass("hidden");
                 $(".tubiao").removeClass("hidden");
                 $(".jydqsure").css("background","#2cb7ca");
                 $(".jydqsure").css("background","#2cb7ca");
+                $(".jydqsure").addClass("jydqsure_active");
                 getRecList(snqc);
                 getRecList(snqc);
             }else{
             }else{
                 $(".qc").addClass("hidden");
                 $(".qc").addClass("hidden");
                 $(".tubiao").addClass("hidden");
                 $(".tubiao").addClass("hidden");
                 $(".jydqsure").css("background","#ccc");
                 $(".jydqsure").css("background","#ccc");
+                $(".jydqsure").removeClass("jydqsure_active");
+            }
+        });
+
+        //搜索框选中
+        $("#searchname").focus(function(){
+            var snqc = $(".searchname").val();
+            if(snqc.length > 0){
+                $(".qc").removeClass("hidden");
+                $(".tubiao").removeClass("hidden");
+            }else{
+                $(".qc").addClass("hidden");
+                $(".tubiao").addClass("hidden");
             }
             }
         });
         });
 
 
@@ -506,13 +589,14 @@
             $(".qc").addClass("hidden");
             $(".qc").addClass("hidden");
             $(".tubiao").addClass("hidden");
             $(".tubiao").addClass("hidden");
             $(".jydqsure").css("background","#ccc");
             $(".jydqsure").css("background","#ccc");
+            $(".jydqsure").removeClass("jydqsure_active");
             $(".wxhead").find("[name='searchname']").focus();
             $(".wxhead").find("[name='searchname']").focus();
         });
         });
-
-        $("body").click(function () {
-            $("#recList").hide();
+        $("body").on("touchstart",function (e) {
+            if(e.target.id != "recList" && e.target.className !="rec"){
+                $("#recList").hide();
+            }
         });
         });
-
         //金额输入
         //金额输入
         $(".money-input").on("input propertychange",function(){
         $(".money-input").on("input propertychange",function(){
             var money_from = $.trim($("#money_from").val());
             var money_from = $.trim($("#money_from").val());
@@ -555,7 +639,9 @@
 
 
         //搜索企业项目信息
         //搜索企业项目信息
         $(".jydqsure").click(function () {
         $(".jydqsure").click(function () {
-            formSubmit();
+            if($(this).attr("class").indexOf("jydqsure_active")>0){
+                formSubmit();
+			}
         });
         });
 
 
         $(".tubiao").click(function(){
         $(".tubiao").click(function(){
@@ -565,11 +651,26 @@
         //显示筛选过滤选择
         //显示筛选过滤选择
         $(".shaixuan").click(function(){
         $(".shaixuan").click(function(){
             if($("#set_search").attr("class")=="hidden"){
             if($("#set_search").attr("class")=="hidden"){
+                if($.trim($("#searchname").val())!=""){
+                    $(".jydqsure").css("background","#2cb7ca");
+                    $(".jydqsure").addClass("jydqsure_active");
+                }
                 $("#set_search").removeClass("hidden");
                 $("#set_search").removeClass("hidden");
                 $("#wrapper").addClass("hidden");
                 $("#wrapper").addClass("hidden");
                 $(".tip_m").addClass("hidden");
                 $(".tip_m").addClass("hidden");
+                $(".nullcontent").addClass("hidden");
             }else{
             }else{
-                shaixuanHide();
+                $("#set_search").addClass("hidden");
+                //if($("#wrapper tbody tr").length==0){
+                if(!dataListFlag){
+                    $("#wrapper").addClass("hidden");
+                    $(".tip_m").addClass("hidden");
+                    $(".nullcontent").removeClass("hidden");
+                }else if($("#wrapper tbody tr").length>0){
+                    $("#wrapper").removeClass("hidden");
+                    $(".tip_m").removeClass("hidden");
+                    $(".nullcontent").addClass("hidden");
+				}
             }
             }
         });
         });
 
 
@@ -598,6 +699,7 @@
                     return;
                     return;
                 }
                 }
                 $("#searchname").blur();
                 $("#searchname").blur();
+                $("#recList").hide();
                 formSubmit();
                 formSubmit();
             }
             }
         }
         }
@@ -625,9 +727,11 @@
             $(".rec").click(function(){
             $(".rec").click(function(){
                 if($(this).text()!=""){
                 if($(this).text()!=""){
                     $("#searchname").val($(this).text());
                     $("#searchname").val($(this).text());
+                    setSearchCursor();
                     $("#recList").hide();
                     $("#recList").hide();
                     $(".qc").addClass("hidden");
                     $(".qc").addClass("hidden");
                     $(".tubiao").removeClass("hidden");
                     $(".tubiao").removeClass("hidden");
+                    //formSubmit();
                 }
                 }
             });
             });
         });
         });
@@ -636,23 +740,37 @@
     //确定
     //确定
     function formSubmit(){
     function formSubmit(){
 		beforeSubmit();
 		beforeSubmit();
-        reqParam["pageNum"]="1";
+        pageNum = "1";
+        //default
+        scrollTop = 0;
+        listCache = "";
+        pageNumCache = 1;
+        noMoreCache = false;
+
+        reqParam["pageNum"]=pageNum;
         $.post("/jylab/entsesearch/proList",reqParam,function(r){
         $.post("/jylab/entsesearch/proList",reqParam,function(r){
             if(r){
             if(r){
-                if(typeof (r.proList)!="undefined"){
-                    var proList = r.proList;
-                    //$("#wrapper tbody tr").remove();
+                var proList = r.proList;
+                if(typeof (proList)!="undefined" && proList.length>0){
+                    $("#wrapper tbody tr").remove();
+                    var html = "";
                     for(var i=0;i<proList.length;i++){
                     for(var i=0;i<proList.length;i++){
-                        var bidamount = proList[i].bidamount;
-                        var projectname = proList[i].projectname;
-                        var zbtime = proList[i].jgtime;
-                        var sourceinfoid = proList[i].sourceinfoid;
-                        var projectcode = proList[i].projectcode;
-                        var obj =$("<tr onclick=\"toDetail('"+sourceinfoid+"','"+projectcode+"','"+projectname+"')\"><td>"+(i+1)+"</td><td>"+zbtime+"</td><td>"+projectname+"</td><td>"+bidamount+"</td></tr>");
-                        $("#wrapper tbody").append(obj);
+                        var bidamount = parseNToEmpty(proList[i].bidamount);
+                        var projectname = parseNToEmpty(proList[i].projectname);
+                        var jgtime = parseNToEmpty(proList[i].jgtime);
+                        var sourceinfoid = parseNToEmpty(proList[i].sourceinfoid);
+                        var projectcode = parseNToEmpty(proList[i].projectcode);
+                        //var obj =$("<tr onclick=\"toDetail('"+sourceinfoid+"','"+projectcode+"','"+projectname+"')\"><td>"+(i+1)+"</td><td>"+jgtime+"</td><td>"+projectname+"</td><td>"+bidamount+"</td></tr>");
+                        //$("#wrapper tbody").append(obj);
+                        html +="<tr onclick=\"toDetail('"+sourceinfoid+"','"+projectcode+"','"+projectname+"')\"><td>"+(i+1)+"</td><td>"+jgtime+"</td><td>"+projectname+"</td><td>"+bidamount+"</td></tr>";
                     }
                     }
-                }
-                shaixuanHide();
+                    appendListHtml(html,1);
+                    shaixuanHide();
+                    initDropload();
+                }else{
+                    dataListFlag = false;
+                    hasNoData();
+				}
             }
             }
         });
         });
     }
     }
@@ -661,12 +779,19 @@
         var searchname = $.trim($(".searchname").val().replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+"));
         var searchname = $.trim($(".searchname").val().replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+"));
 
 
         var money = "";
         var money = "";
+        var money_from  = "";
+        var money_to = "";
         //金额
         //金额
         if($(".money .btn.active_m").first().length>0){
         if($(".money .btn.active_m").first().length>0){
             money = $(".money .btn.active_m").first().text();
             money = $(".money .btn.active_m").first().text();
         }
         }
-        var money_from = $.trim($("#money_from").val());
-        var money_to = $.trim($("#money_to").val());
+        if(money!=""){
+            money_from = "";
+            money_to = "";
+        }else{
+            money_from = $.trim($("#money_from").val());
+            money_to = $.trim($("#money_to").val());
+        }
 
 
         //项目地区
         //项目地区
         this.setScope = function(){
         this.setScope = function(){
@@ -687,7 +812,8 @@
         reqParam["money_from"] = money_from;
         reqParam["money_from"] = money_from;
         reqParam["money_to"] = money_to;
         reqParam["money_to"] = money_to;
     }
     }
-    //
+
+    //项目历程
     function toDetail(id,projectcode,projectname) {
     function toDetail(id,projectcode,projectname) {
         if(id!="" && typeof (id)!="undefined" && projectcode!="" && typeof(projectcode)!="undefined" && projectname!="" && typeof(projectname)!="undefined"){
         if(id!="" && typeof (id)!="undefined" && projectcode!="" && typeof(projectcode)!="undefined" && projectname!="" && typeof(projectname)!="undefined"){
             window.location.href="/follow/photo/"+id+"__"+projectname+"__"+projectcode;
             window.location.href="/follow/photo/"+id+"__"+projectname+"__"+projectcode;
@@ -696,13 +822,30 @@
 
 
     //筛选隐藏
     //筛选隐藏
 	function shaixuanHide() {
 	function shaixuanHide() {
+        $(".nullcontent").addClass("hidden");
         $("#set_search").addClass("hidden");
         $("#set_search").addClass("hidden");
         $("#wrapper").removeClass("hidden");
         $("#wrapper").removeClass("hidden");
         $(".tip_m").removeClass("hidden");
         $(".tip_m").removeClass("hidden");
     }
     }
 
 
+    //null || undefined to empty
+    function parseNToEmpty(str) {
+        if(str==null || typeof (str)=="undefined"){
+            str = "";
+		}
+		return str;
+    }
+
+    //搜索框光标位置
+    function setSearchCursor() {
+        $("#searchname").focus();
+        try{
+            setCursorPos(document.getElementById("searchname"),$("#searchname").val().length);
+        }catch(e){}
+    }
+
     function noMoreData(me){
     function noMoreData(me){
-        window.top.noMoreCache = "true";
+        noMoreCache = "true";
         // 锁定
         // 锁定
         me.lock();
         me.lock();
         // 无数据
         // 无数据
@@ -713,43 +856,57 @@
         var html = '';
         var html = '';
         for(var i=0;i<list.length;i++){
         for(var i=0;i<list.length;i++){
             var index = (pageNum-1)*pageSize+i+1;
             var index = (pageNum-1)*pageSize+i+1;
-            var bidamount = list[i].bidamount;
-            var projectname = list[i].projectname;
-            var zbtime = list[i].jgtime;
-            var sourceinfoid = list[i].sourceinfoid;
-            var projectcode = list[i].projectcode;
-            html +="<tr onclick=\"toDetail('"+sourceinfoid+"','"+projectcode+"','"+projectname+"')\"><td>"+(index)+"</td><td>"+zbtime+"</td><td>"+projectname+"</td><td>"+bidamount+"</td></tr>";
+            var bidamount = parseNToEmpty(list[i].bidamount);
+            var projectname = parseNToEmpty(list[i].projectname);
+            var jgtime = parseNToEmpty(list[i].jgtime);
+            var sourceinfoid = parseNToEmpty(list[i].sourceinfoid);
+            var projectcode = parseNToEmpty(list[i].projectcode);
+            html +="<tr onclick=\"toDetail('"+sourceinfoid+"','"+projectcode+"','"+projectname+"')\"><td>"+(index)+"</td><td>"+jgtime+"</td><td>"+projectname+"</td><td>"+bidamount+"</td></tr>";
         }
         }
         return html;
         return html;
     }
     }
     function hasNoData(){
     function hasNoData(){
         $(".nullcontent").removeClass("hidden");
         $(".nullcontent").removeClass("hidden");
-        window.top.$(".resbm").addClass("hidden");
+        $("#wrapper tbody tr").remove();
+        //window.top.$(".resbm").addClass("hidden");
+        $("#set_search").addClass("hidden");
         $("#wrapper").addClass("hidden");
         $("#wrapper").addClass("hidden");
-        setTimeout(function(){
-            adjustIframeHeight(0);
-        },500);
+        $(".tip_m").addClass("hidden");
     }
     }
     function appendListHtml(html,pageNum){
     function appendListHtml(html,pageNum){
         //缓存数据
         //缓存数据
         if(sessionStorage){
         if(sessionStorage){
-            window.top.listCache += html;
-            window.top.pageNumCache = pageNum;
+            listCache += html;
+            pageNumCache = pageNum;
         }
         }
         // 插入数据到页面,放到最后面
         // 插入数据到页面,放到最后面
         var htmlObj = $(html);
         var htmlObj = $(html);
-//        htmlObj.on("click", function(event){
-//            var h = $(this).find("a.bt").attr("s");
-//            var sid = $(this).find("a.bt").attr("sid");
-//            var sds = s_words.replace(/\+/g,"+");
-//            myredirect(h,sid,sds);
-//        });
+        htmlObj.on("click", function(event){
+            putToSessionStorage();
+        });
         $('#wrapper tbody').append(htmlObj);
         $('#wrapper tbody').append(htmlObj);
-//        if(!window.top.isBackIndex){
-//            if($(".jysstj").hasClass("hidden")){
-//                window.top.$(".resbm").removeClass("hidden");
-//            }
-//        }
+    }
+    function initDroploadNoMoreData(){
+        setTimeout(function(){
+            $('#wrapper').dropload({
+                scrollArea : window,
+                loadDownFn : function(me){
+                    noMoreData(me);
+                }
+            });
+        },0);
+    }
+    //put to sessionstorage
+	function  putToSessionStorage() {
+        if(sessionStorage){
+            sessionStorage.wxsearchScrollTop = scrollTop;
+            sessionStorage.wxsearchListCache = listCache;
+            sessionStorage.wxsearchPageNumCache = pageNumCache;
+            sessionStorage.wxsearchNoMoreCache = noMoreCache;
+            sessionStorage.wxsearchMoneyFromCache = reqParam["money_from"];
+            sessionStorage.wxsearchMoneyToCache = reqParam["money_to"];
+            sessionStorage.wxsearchScopeCache = reqParam["scope"];
+        }
     }
     }
 </script>
 </script>
 </html>
 </html>