Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1

This commit is contained in:
zongzhimin
2018-05-09 13:48:47 +08:00
2 changed files with 32 additions and 6 deletions
@@ -388,6 +388,8 @@ function getAnalysisDetail(){
})
}
}
//当前小区在当前城市占比情况
houseInfo.city = _houseInfo.city;
houseInfo.roseRanking = _houseInfo.roseRanking;
houseInfo.avgpriceRanking = _houseInfo.avgpriceRanking;
@@ -397,6 +399,16 @@ function getAnalysisDetail(){
$('#roseRankingPercent').css("width", houseInfo.roseRanking+"%");
$('#sliderNotePercent').css("left", resultsMap.priceRateContent+"%");
$('#curRatePercent').css("width", resultsMap.curRate+"%");
if((_houseInfo.roseRanking == 0) && (_houseInfo.avgpriceRanking == 0 || resultsMap.priceRateContent == 0 || _houseInfo.price == 0 || _houseInfo.minSellPrice == 0 || _houseInfo.maxSellPrice == 0 || resultsMap.curRate == 0)){
$('#rankingAndPriceContent').hide();
}
if(_houseInfo.roseRanking == 0){
$('#rankingAndPriceContentRanking').hide();
}
if(_houseInfo.avgpriceRanking == 0 || resultsMap.priceRateContent == 0 || _houseInfo.price == 0 || _houseInfo.minSellPrice == 0 || _houseInfo.maxSellPrice == 0 || resultsMap.curRate == 0){
$('#rankingAndPriceContentPrice').hide();
}
//挂牌建议
houseInfo.minAndMaxTotalPrice = (resultsMap.minTotalPrice==0 || resultsMap.maxTotalPrice==0)?"暂无":(parseFloat(resultsMap.minTotalPrice)/10000).toFixed(2)+"万"+" - "+(parseFloat(resultsMap.maxTotalPrice)/10000).toFixed(2)+"万";
houseInfo.minAndMaxPrice = (resultsMap.minPrice==0 || resultsMap.maxPrice==0)?"暂无":(parseFloat(resultsMap.minPrice)/10000).toFixed(2)+"万/㎡"+" - "+(parseFloat(resultsMap.maxPrice)/10000).toFixed(2)+"万/㎡";
@@ -420,6 +432,8 @@ function getAnalysisDetail(){
//控制周边中介量在当前城市排名显示
if(resultsMap.maxCityAgency == 0 || resultsMap.agencyLevel == 0 ){
$('#maxCityAgencyContent').hide();
//添加此topic, 控制结构显示
$('#maxCityAgencyContent_').show();
}
//周边房产中介显示
if(resultsMap.agencyCount == 0){
@@ -95,22 +95,28 @@
</div>
</div>
<div class="topic">
<div class="topic" id="rankingAndPriceContent">
<div class="topicContent">
<div class="topicTitle01">{{name}}在{{city}}:</div>
<div class="topicContent_bottom" style="border-bottom:solid 1px #e7e7e7;padding-bottom:0.5rem;">
<div class="topicContent_bottom" id="rankingAndPriceContentRanking" style="border-bottom:solid 1px #e7e7e7;padding-bottom:0.5rem;">
<p style="margin-bottom:20px;">涨幅(近12个月)超过了<em>{{roseRanking}}%</em>的住宅</p>
<font><i id="roseRankingPercent" style=""></i></font>
<small class="rankingNote"><span class="rankingNoteLeft" style="line-height:17px;margin-top:7px;">0%</span><span class="rankingNoteRight" style="line-height:17px;margin-top:7px;text-align:right;">100%</span></small>
<small class="rankingNote">
<span class="rankingNoteLeft" style="line-height:17px;margin-top:7px;">0%</span>
<span class="rankingNoteRight" style="line-height:17px;margin-top:7px;text-align:right;">100%</span>
</small>
</div>
<div class="topicContent_bottom">
<div class="topicContent_bottom" id="rankingAndPriceContentPrice">
<p>均价超过了<em>{{avgpriceRanking}}%</em>的住宅</p>
<div class="slider_note" id="sliderNotePercent" style="">
<img src="../../images/arrow_note_down.png">
<span>{{price}}元/㎡</span>
</div>
<font><i id="curRatePercent" style=""></i></font>
<small class="rankingNote" style="height:45px;"><span class="rankingNoteLeft" style="line-height:17px;margin-top:7px;">相对最低<br>{{minSellPrice}}</span><span class="rankingNoteRight" style="line-height:17px;margin-top:7px;text-align:right;">相对最高<br>{{maxSellPrice}}</span></small>
<small class="rankingNote" style="height:45px;">
<span class="rankingNoteLeft" style="line-height:17px;margin-top:7px;">相对最低<br>{{minSellPrice}}</span>
<span class="rankingNoteRight" style="line-height:17px;margin-top:7px;text-align:right;">相对最高<br>{{maxSellPrice}}</span>
</small>
</div>
</div>
</div>
@@ -170,10 +176,16 @@
<div class="topicContent_bottom">
<p style="margin-bottom:20px;margin-top:0;color:#333;">周边中介量在{{city}}排名:<em style="float:right;">{{agencyLevel}}%</em></p>
<font><i style="" id="agencyLevelPercent"></i></font>
<small class="rankingNote"><span class="rankingNoteLeft" style="line-height:17px;margin-top:7px;">最低:0</span><span class="rankingNoteRight" style="line-height:17px;margin-top:7px;text-align:right;">最高:{{maxCityAgency}}</span></small>
<small class="rankingNote">
<span class="rankingNoteLeft" style="line-height:17px;margin-top:7px;">最低:0</span>
<span class="rankingNoteRight" style="line-height:17px;margin-top:7px;text-align:right;">最高:{{maxCityAgency}}</span>
</small>
</div>
</div>
</li>
<li class="topic" style="display:none; border-top:none;" id="maxCityAgencyContent_">
<!-- 当 maxCityAgencyContent 不显示结构会乱, 添加次处控制 -->
</li>
</ul>
</div>