From 57431d72ab95947eec46f51abec57d86ad492005 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Sat, 14 Apr 2018 18:27:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=BB=E4=BB=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/evaluate/evaluateReport.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 71e92b2..ad0dfcb 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -226,7 +226,7 @@ $.config = {router: false} if(h.totalPrice==0){ house_price.total_price = "暂无"; }else{ - house_price.total_price = (h.totalPrice/10000).toFixed(0) + house_price.total_price = (h.totalPrice/10000).toFixed(2) house_price.w = "万" } house_price.avg_price = h.avgPrice==0?"暂无":h.avgPrice+"元/㎡" From 4c8878197dce1d53ef31beeac0ee9f79db7c839e Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Sat, 14 Apr 2018 19:03:25 +0800 Subject: [PATCH 2/4] YOUFANG1.0.3 --- fangija-zsyf/js/user/myFocus.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/js/user/myFocus.js b/fangija-zsyf/js/user/myFocus.js index 54eb467..882c4bd 100644 --- a/fangija-zsyf/js/user/myFocus.js +++ b/fangija-zsyf/js/user/myFocus.js @@ -24,10 +24,9 @@ function addEstate(number, lastIndex) { // 生成新条目的HTML var html = ''; $.each(data['results'], function(i){ - var tag = this.tag; + var tags = this.tags; var tagStr = ""; - if(tag){ - var tags = tag.split("_") + if(tags!=null&&tags.length>0){ for(var j=0;j Date: Sat, 14 Apr 2018 19:50:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=88=96=E8=80=85=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=20=E6=88=BF=E4=BB=B7=E4=B8=BA?= =?UTF-8?q?=E9=9B=B6=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseList.html | 17 +++++++---------- fangija-zsyf/views/house/houseManageList.html | 15 ++++++--------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html index 3cd3c3f..7cc9a1b 100644 --- a/fangija-zsyf/views/house/houseList.html +++ b/fangija-zsyf/views/house/houseList.html @@ -314,18 +314,15 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq } for(var i in dataObj) { var result = dataObj[i]; - var tempTotalPrice = result.totalPrice; + //可抵押贷额度 - var tempTotalPricePercent; - //考虑是否为数字,加强逻辑判断 - if(!isNaN(tempTotalPrice)){ - //转换成元,四舍五入 - tempTotalPricePercent = (parseFloat(tempTotalPrice)*0.7/10000).toFixed(2); - tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2); - } + var tempTotalPricePercent = (result.totalPrice) == 0?"暂无":(parseFloat(result.totalPrice)*0.7/10000).toFixed(2)+"万"; + var tempTotalPrice = (result.totalPrice) == 0?"暂无":(parseFloat(result.totalPrice)/10000).toFixed(2)+"万"; + html += '
  • '; html += ""; if(result.level!=null && result.level == 1){ html += "豪宅级"; diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index d2ddfb0..abe038d 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -204,12 +204,6 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap if(results!=null && results.length>0){ for(var i in results){ var result = results[i]; - var tempTotalPrice = result.totalPrice; - //考虑是否为数字,加强逻辑判断 - if(!isNaN(tempTotalPrice)){ - //转换成元,四舍五入 - tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2); - } htmlContent = htmlContent +'
  • '; htmlContent = htmlContent +"
    "; htmlContent = htmlContent +"
    "+result.city+"-"+result.region+"
    "; @@ -231,7 +225,7 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap } }else{ //为非数字清空放空格 - htmlContent = htmlContent + "
    近30天涨跌幅: "+ +"%
    "; + htmlContent = htmlContent + "
    近30天涨跌幅: 暂无
    "; } //相比对于城市均价 @@ -248,8 +242,11 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap //为非数字清空放空格 htmlContent = htmlContent + "
    相比"+result.city+"均价: 暂无
    "; } - htmlContent = htmlContent + "
    均价: "+result.price+"元/㎡
    "; - htmlContent = htmlContent + "
    "+tempTotalPrice+"万
    "; + var tempTotalPrice = (result.totalPrice) == 0?"暂无":(parseFloat(result.totalPrice)/10000).toFixed(2)+"万"; + var tempPrice = (result.price) == 0?"暂无":result.price+"元/㎡"; + + htmlContent = htmlContent + "
    均价: "+tempPrice+"
    "; + htmlContent = htmlContent + "
    "+tempTotalPrice+"
    "; htmlContent = htmlContent + "
    添加管理" htmlContent = htmlContent +"
  • "; } From 1274c0c25554a83ba374260486580248596ec92b Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Sat, 14 Apr 2018 19:51:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=88=BF=E4=BA=A7=E4=B8=BA=E9=9B=B6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/user/myHouse.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js index b184d4b..7f36148 100644 --- a/fangija-zsyf/js/user/myHouse.js +++ b/fangija-zsyf/js/user/myHouse.js @@ -70,18 +70,15 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, var html = ''; for(var i in dataObj) { var result = dataObj[i]; - var tempTotalPrice = result.totalPrice; + //可抵押贷额度 - var tempTotalPricePercent; - //考虑是否为数字,加强逻辑判断 - if(!isNaN(tempTotalPrice)){ - //转换成元,四舍五入 - tempTotalPricePercent = (parseFloat(tempTotalPrice)*0.7/10000).toFixed(2); - tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2); - } + var tempTotalPricePercent = (result.totalPrice) == 0?"暂无":(parseFloat(result.totalPrice)*0.7/10000).toFixed(2)+"万"; + var tempTotalPrice = (result.totalPrice) == 0?"暂无":(parseFloat(result.totalPrice)/10000).toFixed(2)+"万"; + html += '
  • '; html += ""; if(result.level!=null && result.level == 1){ html += "豪宅级";