From 07d560f2a09cd2937981d68a41dbd90add76b79b Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 16 Apr 2018 10:48:01 +0800 Subject: [PATCH 1/4] 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 2/4] =?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 From 7b019a1b35d06ad48990e8a025ff42efbb684bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 16 Apr 2018 11:11:43 +0800 Subject: [PATCH 3/4] fix bug 4775 --- fangija-zsyf/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index edb2105..fc919d7 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -1060,7 +1060,7 @@ input::-webkit-input-placeholder{ .topBg02 p a{font-size:0.75rem;} .collection{position:absolute;right:0.75rem;top:0.4rem;text-align:center;color:#666;font-size:0.7rem;} -.collection02{border:solid 1px #C3C0BC;color:#999;} + .icon-collection01{width:16px;height:16px;background:url(../images/icon-collection01.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;} .icon-collection02{width:16px;height:16px;background:url(../images/icon-collection02.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;} From 219337fb949f293f86f8df1e88ebd1ef2914217b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 16 Apr 2018 11:59:41 +0800 Subject: [PATCH 4/4] fix bug --- fangija-zsyf/views/evaluate/evaluateReport.html | 2 +- fangija-zsyf/views/house/detail.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 5425532..4119adb 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -195,7 +195,7 @@ $.config = {router: false} hid:hid, reason:i }).then(function(response){ - alert("感谢您的反馈!") + $.toast("感谢您的反馈!") $("#price_feedback").hide(); }).catch(function(error){console.log(error)}) }, diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 39c725e..66c73e4 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -425,7 +425,7 @@ function init(){ $('.rentBox').show(); if(houseInfo.leaseStartDate){ baseInfo.rentTime = formatTime(houseInfo.leaseStartDate)+"-"+formatTime(houseInfo.leaseEndDate); - baseInfo.rentPrice = houseInfo.rent+"元("+houseInfo.rentCycle+"/"+houseInfo.rentCycleUnit+")"; + baseInfo.rentPrice = houseInfo.rent+"元/"+houseInfo.rentCycleUnit; baseInfo.nextRent = formatTime2(houseInfo.lastRentDate); }else{ baseInfo.rentTime = "-";