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'; html += "
"; - html += "
"+tempTotalPrice+"万"; + html += "
"+tempTotalPrice+""; + if(result.liveStatus!=null && result.liveStatus.length>0){ html += ""+result.liveStatus+"
"; }else{ @@ -116,7 +113,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, html += "
下跌概率: 暂无
"; } - html += "
抵押可贷额度: "+tempTotalPricePercent+"万
"; + html += "
抵押可贷额度: "+tempTotalPricePercent+"
"; if(result.level!=null && result.level == 1){ html += "豪宅级"; diff --git a/fangija-zsyf/start.html b/fangija-zsyf/start.html index 8361135..cb0ba88 100644 --- a/fangija-zsyf/start.html +++ b/fangija-zsyf/start.html @@ -24,7 +24,7 @@ 跳过 5
-

立即测试

+

立即测试

diff --git a/fangija-zsyf/views/district/aroundDetail.html b/fangija-zsyf/views/district/aroundDetail.html index dbaee06..aaaf875 100644 --- a/fangija-zsyf/views/district/aroundDetail.html +++ b/fangija-zsyf/views/district/aroundDetail.html @@ -3,7 +3,7 @@ -位置及周边 +位置及周边详情 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+"元/㎡" 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 +"
  • "; } diff --git a/fangija-zsyf/views/intelligentHouse/aroundDetail.html b/fangija-zsyf/views/intelligentHouse/aroundDetail.html index e2ec9db..d5ffcf5 100644 --- a/fangija-zsyf/views/intelligentHouse/aroundDetail.html +++ b/fangija-zsyf/views/intelligentHouse/aroundDetail.html @@ -3,7 +3,7 @@ -智能选房 +智能选房匹配列表 diff --git a/fangija-zsyf/views/intelligentHouse/index.html b/fangija-zsyf/views/intelligentHouse/index.html index 02a3606..b98ba6a 100644 --- a/fangija-zsyf/views/intelligentHouse/index.html +++ b/fangija-zsyf/views/intelligentHouse/index.html @@ -3,7 +3,7 @@ -智能选房 +智能选房输入页面 diff --git a/fangija-zsyf/views/intelligentHouse/mapDetail.html b/fangija-zsyf/views/intelligentHouse/mapDetail.html index 526c535..059eeb8 100644 --- a/fangija-zsyf/views/intelligentHouse/mapDetail.html +++ b/fangija-zsyf/views/intelligentHouse/mapDetail.html @@ -3,7 +3,7 @@ -智能选房 +智能选房地图 diff --git a/fangija-zsyf/views/news/newsCollectList.html b/fangija-zsyf/views/news/newsCollectList.html index 04213c8..2c6cf0d 100644 --- a/fangija-zsyf/views/news/newsCollectList.html +++ b/fangija-zsyf/views/news/newsCollectList.html @@ -3,7 +3,7 @@ -我的收藏 +我的咨询收藏 diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 6653128..2525d05 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -1740,7 +1740,7 @@ function addItems(number, lastIndex) { ''; } if(dataObj[i].type=="推荐小区"){ - html += '
    '+ + html += '
    '+ '
    '+ '
    • '+ '
      '+ @@ -2622,7 +2622,6 @@ function openIntelligentHouseView() { } function openDistWindow(city, region, name){ clicked('views/district/detail.html',true,false,{},{city:city,region:region,name:name}); - }