diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 7d545f7..49f7e75 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,8 +1,8 @@ /**服务端地址**/ //var BASE_PATH = "http://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; -var BASE_PATH = "http://192.168.10.47:8086"; -//var BASE_PATH = "http://192.168.10.53:8084"; +//var BASE_PATH = "http://192.168.10.47:8086"; +var BASE_PATH = "http://192.168.10.53:8084"; //var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index b565f64..4f34b3a 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -542,8 +542,11 @@ function showRentChart2(categories, series, roomDatas){ fontSize: 12 }, formatter: function (params) { - var res = params[0].name + '
' + "租金:"+params[0].value + '元/月'; - return res; + if(params[0].value){ + var res = params[0].name + '
' + "租金:"+params[0].value + '元/月'; + return res; + } + } }, grid:{ diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js index c49a6a5..5c2139b 100644 --- a/fangija-zsyf/js/user/myHouse.js +++ b/fangija-zsyf/js/user/myHouse.js @@ -28,9 +28,14 @@ function selectHouseInfoList(){ var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap; var xqPotentialIndexMap = resultsMap.xqPotentialIndexMap; var houseInfoTotalMap = resultsMap.houseInfoTotalMap; + //调整统计num的顺序 + mh_totalRecords = resultsMap.houseInfoPageList.totalRecords; + tab.mh_num = mh_totalRecords; + if(resultList != null && resultList.length == 0){ // 删除加载提示符 - $('#loadTip1').remove(); + $('#loadTip1').hide(); + //$('#loadTip1').remove(); //$('.infinite-scroll-preloader').remove(); // 加载完毕,则注销无限加载事件,以防不必要的加载 //$.detachInfiniteScroll($('.infinite-scroll')); @@ -39,7 +44,8 @@ function selectHouseInfoList(){ if(resultsMap.houseInfoPageList.currentPage == resultsMap.houseInfoPageList.totalPages){ //如果此次查询刚好是page = totalPages // 删除加载提示符 - $('#loadTip1').remove(); + $('#loadTip1').hide(); + //$('#loadTip1').remove(); //$('.infinite-scroll-preloader').remove(); // 加载完毕,则注销无限加载事件,以防不必要的加载 //$.detachInfiniteScroll($('.infinite-scroll')); @@ -57,8 +63,6 @@ function selectHouseInfoList(){ mh_page = resultsMap.houseInfoPageList.currentPage; mh_pageSize = resultsMap.houseInfoPageList.limit; mh_totalPages = resultsMap.houseInfoPageList.totalPages; - mh_totalRecords = resultsMap.houseInfoPageList.totalRecords; - tab.mh_num = mh_totalRecords; mhAddItems(mh_itemsPerLoad, mh_lastIndex, dataObj, xqOneMonthUpDownRangeMap, xqPotentialIndexMap, houseInfoTotalMap); }).catch(function (error) { console.log(error); diff --git a/fangija-zsyf/js/user/myMessage.js b/fangija-zsyf/js/user/myMessage.js index d0fb66c..d43a651 100644 --- a/fangija-zsyf/js/user/myMessage.js +++ b/fangija-zsyf/js/user/myMessage.js @@ -75,13 +75,13 @@ function messageGoto(_this,operation,operationPage,mid){ clicked('/views/message/detail.html',true,false,{},{mid:mid},function(){}) } if(operation==1){ -// var pages = operationPage+'.html'; + var pages = operationPage+'.html'; // if(plus.webview.getWebviewById(pages)==null){ // plus.webview.create(pages, pages, subpage_style); // } // plus.webview.show(pages); mui.fire(plus.webview.getWebviewById('HBuilder'),'switchView',{ - name:"views/house/houseDetail.html" + name:pages }); } if(operation==2){ diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index 7ac35c6..df12e7a 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -30,7 +30,7 @@