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 @@
// #if>
$("#suggestDiv").text(s);
+ $("#suggestDiv").show();
}
diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html
index 5706a60..098ee2e 100644
--- a/fangija-zsyf/views/district/detail.html
+++ b/fangija-zsyf/views/district/detail.html
@@ -63,7 +63,7 @@
{{name}}
-
+
购买 龙盛佳苑 90-110㎡ 的房子,总价预计约为587-717万。
查看详情
diff --git a/fangija-zsyf/views/house/regions.html b/fangija-zsyf/views/house/regions.html
index effcbd7..f2609d2 100644
--- a/fangija-zsyf/views/house/regions.html
+++ b/fangija-zsyf/views/house/regions.html
@@ -64,8 +64,10 @@
{{index+1}}
{{info.region}}
{{info.avgPrice}}元/㎡
-
{{info.oneMonthUpDownRange}}%
-
{{info.oneMonthUpDownRange}}%
+
+
{{info.oneMonthUpDownRange}}%
+
{{info.oneMonthUpDownRange}}%
+
暂无
@@ -137,7 +139,11 @@ $.config = {router: false}
if(msg!=null && msg.length>0){
for(var i in msg){
var da = msg[i]
- da.oneMonthUpDownRange = (da.oneMonthUpDownRange*100).toFixed(2)
+ if(da.oneMonthUpDownRange){
+ da.oneMonthUpDownRange = (da.oneMonthUpDownRange*100).toFixed(2)
+ }
+
+
}
regionsInfoVue.$data.regionInfos = msg;
}else{
diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html
index 65ede6d..807e7e6 100644
--- a/fangija-zsyf/views/user/userInfo.html
+++ b/fangija-zsyf/views/user/userInfo.html
@@ -144,7 +144,7 @@
算房贷
-->
-
![]()
+
{{t.toolName}}
@@ -337,7 +337,8 @@ $(document).on('infinite', '.infinite-scroll',function() {
// 加载完毕,则注销无限加载事件,以防不必要的加载
//$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
- $('#loadTip1').remove();
+ //$('#loadTip1').remove();
+ $('#loadTip1').hide();
return;
}
//控制查询下一页的数据
@@ -453,7 +454,8 @@ $(document).on("click",".confirm-ok", function () {
$.toast(response.data.data);
//删除后,如果需要调用checkIsLogin,需要所有的参数初始化
//checkIsLogin();
- window.location.reload();
+ //window.location.reload();
+ initMyHouseParams();
//删除房产会影响个人中心房产列表, 刷新
/*if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
@@ -469,6 +471,24 @@ $(document).on("click",".confirm-ok", function () {
$(".modal-text").css("text-align","center");
});
+//初始化分页参数, 防止回调时候重新请求出错
+function initMyHouseParams(){
+ mh_loading = false;
+ mh_page = undefined;
+ var mh_pageSize = undefined;
+ var mh_totalPages = undefined;
+ var mh_totalRecords = undefined;
+ var mh_lastIndex = undefined;
+ var mh_itemsPerLoad = undefined;
+ var mh_maxItems = 100;
+ //清空构造的container
+ $('#myhouse').html('');
+ // 删除加载提示符
+ $('#loadTip1').show();
+ //加载我的房产
+ selectHouseInfoList();
+}
+
function openSettingPage() {
clicked('../setting/setting.html',true,false,{},{},function(){})
}
@@ -483,15 +503,19 @@ function onPlusReady(){
userId:""
},
methods:{
- goto:function(url,userId){
+ goto:function(url,userId,id){
var deviceId = plus.device.uuid;
if(url.indexOf("?")>0){
url+=("&uid="+userId+"&deviceId="+deviceId)
}else{
url+=("?uid="+userId+"&deviceId="+deviceId)
}
- alert(url)
if (url != null && url != "") {
+ axios.post(BASE_PATH + "/rest/usertool/merchantToolClick",{id:id}).then(function(response){
+
+ }).catch(function(error){
+
+ });
clicked('../webview_embed.html', true,false,{},{url:url})
}
}