diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 369d1c2..ff023e2 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,14 +1,11 @@ /**服务端地址**/ //var BASE_PATH = "http://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; -<<<<<<< HEAD -var BASE_PATH = "http://192.168.10.47:8086"; -//var BASE_PATH = "http://192.168.10.161:8084"; -======= //var BASE_PATH = "http://192.168.10.47:8086"; ->>>>>>> 9c25ef0b2e3f9e2a19df5038da587d6c53827469 -//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.161: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"; //var BASE_PATH = "http://192.168.10.164: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/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html index 2284b1a..a6ab26a 100644 --- a/fangija-zsyf/views/changeHouse/index.html +++ b/fangija-zsyf/views/changeHouse/index.html @@ -1353,10 +1353,21 @@ document.addEventListener('plusready', onPlusReady, false); function onPlusReady() { var self = plus.webview.currentWebview(); hsId = self.hsId - // alert("index:"+hsId); + houseId = self.houseId if(hsId){ //如果是修改置换建议,则默认将值填入 - axios.get(BASE_PATH + "/rest/changeHouse/loadHouseSubInfo",{ + updateChangeSubtation(hsId); + } + + if(houseId){ + //小区报告页带入 + fillHouseInfo(houseId); + } + +} +//修改置换建议填充默认值 +function updateChangeSubtation(hsId){ + axios.get(BASE_PATH + "/rest/changeHouse/loadHouseSubInfo",{ params:{ hsId:hsId } @@ -1398,7 +1409,22 @@ function onPlusReady() { }).catch(function (error) { console.log(error); }); - } +} + +function fillHouseInfo(houseId){ + axios.get(BASE_PATH + "/rest/index/loadHouse",{ + params:{ + houseId:houseId + } + }).then(function (response) { + var data = response.data.data; + if(data){ + addBaseHouseInfo(data); + baseInfo.houseId = hs.houseId + } + }).catch(function (error) { + console.log(error); + }); } //填充房产价格信息 @@ -1819,7 +1845,6 @@ $("#citySearchInp").bind('keyup', function() { }); function openAddHouse(){ - alert("ssss") clicked('/views/house/add.html',true,false,{},{}); } diff --git a/fangija-zsyf/views/changeHouse/result.html b/fangija-zsyf/views/changeHouse/result.html index 221add4..2aeaa8a 100644 --- a/fangija-zsyf/views/changeHouse/result.html +++ b/fangija-zsyf/views/changeHouse/result.html @@ -399,8 +399,7 @@ $(document).on('infinite', '.infinite-scroll-bottom', function() { }); function updateChangeHouse(){ - alert(hsId); - clicked('views/changeHouse/index.html',true,false,{},{hsId:hsId}); + clicked('/views/changeHouse/index.html',true,false,{},{hsId:hsId}); } diff --git a/fangija-zsyf/views/component/baseInfoComponent.js b/fangija-zsyf/views/component/baseInfoComponent.js index 060a22c..c83766b 100644 --- a/fangija-zsyf/views/component/baseInfoComponent.js +++ b/fangija-zsyf/views/component/baseInfoComponent.js @@ -303,5 +303,6 @@ function addSubstitution(sr, hs, house){ // onclick="openUrl('${basePath}/message/openView?url=${basePath}/mad/adUrlLoad?adid=${advertisement.id!?c}')" ><#if advertisement.content??>${advertisement.content!}

// $("#suggestDiv").text(s); + $("#suggestDiv").show(); } diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 15b88e3..c9954a6 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -63,7 +63,7 @@

{{name}}

-
+

购买 龙盛佳苑 90-110㎡ 的房子,总价预计约为587-717万。
查看详情