From 000ff0a8b4b9aadaec0c46b142ba9d654498859f Mon Sep 17 00:00:00 2001 From: gaojuan Date: Sat, 14 Apr 2018 20:19:40 +0800 Subject: [PATCH 1/5] update --- fangija-zsyf/js/quotations/cityDetail.js | 15 +- fangija-zsyf/views/house/cityDetail.html | 27 +- fangija-zsyf/views/house/houseDetail.html | 4 +- fangija-zsyf/views/house/houseDetail1.html | 1504 -------------- fangija-zsyf/views/quotations/index.html | 2048 -------------------- 5 files changed, 31 insertions(+), 3567 deletions(-) delete mode 100644 fangija-zsyf/views/house/houseDetail1.html delete mode 100644 fangija-zsyf/views/quotations/index.html diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index 12aa4d7..ae65de7 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -27,7 +27,6 @@ function loadMyCollectCity(){ function loadCurCity(city){ plus.nativeUI.showWaiting(); - axios.get("/rest/quotations/userCollectCitys",{}).then(function (response) { var curDatas = response.data.data if(curDatas && curDatas.length>0){ @@ -237,10 +236,20 @@ function loadTrends(times, cityPriceMap, countMap){ var pm = cityPriceMap; var cm = countMap; if(pm){ - prices.push(pm[time]) + if(pm[time]){ + prices.push(pm[time]) + }else{ + prices.push(null) + } + } if(cm){ - counts.push(cm[time]); + if(cm[time]){ + counts.push(cm[time]); + }else{ + counts.push(null); + } + } } showChart("price_chart", times, prices, counts) diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index c2e6027..c50cad5 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -46,7 +46,8 @@ 当前参考均价
-
{{myCityMap.cityTopMonthAvgPrice}}元/㎡
+
{{myCityMap.cityTopMonthAvgPrice}}元/㎡
+
暂无
-
{{house_type}}
+
{{house_room_num}}
@@ -152,7 +152,7 @@ $.config = {router: false} data:{ name:"", city_region:"", - house_type:"" + house_room_num:"" } }) var house_price = new Vue({ @@ -222,7 +222,8 @@ $.config = {router: false} h = response.data.data house_info.name = h.name house_info.city_region = h.city+"-"+h.region - house_info.house_type = (h.roomCount==0?"":h.roomCount+"室")+(h.hallCount==0?"":h.hallCount+"厅 ")+(h.area==0?"":h.area+"㎡ ")+((h.floor==0||h.height==0)?"":h.floor+"/"+h.height+"层") + house_info.house_room_num = (h.houseRoomNum==null||h.houseRoomNum=="")?"暂无":h.houseRoomNum; +// house_info.house_type = (h.roomCount==0?"":h.roomCount+"室")+(h.hallCount==0?"":h.hallCount+"厅 ")+(h.area==0?"":h.area+"㎡ ")+((h.floor==0||h.height==0)?"":h.floor+"/"+h.height+"层") if(h.totalPrice==0){ house_price.total_price = "暂无"; }else{ From 81e3ac529adb281744b4eeb6602a86c0567fd12a Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 16 Apr 2018 10:29:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=B3=E6=B3=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseDetail.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 70ce3ae..f04faaa 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -1235,7 +1235,6 @@ $.config = {router: false} } }) - document.addEventListener('plusready', onPlusReady, false); function onPlusReady(){ var city = ""; @@ -1249,8 +1248,6 @@ $.config = {router: false} //lng = p.coords.longitude;//获取到当前位置的经度 //lat = p.coords.latitude;//获取到当前位置的纬度; - - loadMyCollectCity(); }, function(e){ }, { @@ -1341,6 +1338,8 @@ $.config = {router: false} $(".cardNearby").on("click", function(){ window.location.href = "01_index04_districtDetail.html"; }); + + loadMyCollectCity(); } From 07d560f2a09cd2937981d68a41dbd90add76b79b Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 16 Apr 2018 10:48:01 +0800 Subject: [PATCH 4/5] YOUFANG1.0.3 --- .../views/evaluate/evaluateReport.html | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 4ea7e4f..5425532 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -244,17 +244,22 @@ $.config = {router: false} house_price.percentage_30="暂无" } house_price.city=h.city - if(h.compareMoney<0){ - house_price.compare_word="低" - house_price.words="元" - house_price.compare_money=-h.compareMoney - }else if(h.compareMoney>0){ - house_price.compare_word="高" - house_price.words="元" - house_price.compare_money=h.compareMoney + if(h.avgPrice==0){ + house_price.words="暂无" }else{ - house_price.compare_money="相等" + if(h.compareMoney<0){ + house_price.compare_word="低" + house_price.words="元" + house_price.compare_money=-h.compareMoney + }else if(h.compareMoney>0){ + house_price.compare_word="高" + house_price.words="元" + house_price.compare_money=h.compareMoney + }else{ + house_price.compare_money="相等" + } } + // if(h.evaluatePercent<0){ // evaluate_msg.evaluate_words="下跌概率" // evaluate_msg.arrow="icon icon-arrow-green" From ffa9851e33c949198a9199baed73efed1434cf3a Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 16 Apr 2018 10:56:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E5=87=A0=E5=AE=A4=E5=87=A0=E5=8E=85=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=88=90=E6=A5=BC=E6=A0=8B=E5=8F=B7=20=E5=AE=A4?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseManageList.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index abe038d..18bce1a 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -208,7 +208,12 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap htmlContent = htmlContent +"
"; htmlContent = htmlContent +"
"+result.city+"-"+result.region+"
"; htmlContent = htmlContent +"
"; - htmlContent = htmlContent +"
"+result.roomCount+"室"+result.hallCount+"厅  "+result.area+"㎡  "+result.floor+"/"+result.height+"层
"; + + //htmlContent = htmlContent +"
"+result.roomCount+"室"+result.hallCount+"厅"; + var houseRoomNum = result.houseRoomNum==""?"暂无":result.houseRoomNum; + htmlContent = htmlContent +"
"+houseRoomNum; + + htmlContent = htmlContent +"  "+result.area+"㎡  "+result.floor+"/"+result.height+"层
" htmlContent = htmlContent +"
"; //对应城市地区小区30天涨跌幅 //动态构建key