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

This commit is contained in:
bayi
2018-05-07 18:45:43 +08:00
2 changed files with 20 additions and 6 deletions
+6 -6
View File
@@ -517,9 +517,9 @@ function addItemsChengJiao(resultsMap){
var tempTotalPrice = resultsMap.sells[i].total_price == 0?"暂无":(parseFloat(resultsMap.sells[i].total_price)/10000).toFixed(2)+"万";
var tempAvgPrice = resultsMap.sells[i].avg_price == 0?"暂无":resultsMap.sells[i].avg_price+"元/㎡";
var tradeDate = resultsMap.sells[i].trade_date == null?"暂无":formatTime(resultsMap.sells[i].trade_date)+"签约";
htmlChengJiao += "<div class='item-after'><em>"+tempTotalPrice+"</em></div></div>";
var direction_floor = (resultsMap.sells[i].direction == undefined || resultsMap.sells[i].direction == "")?"":resultsMap.sells[i].direction;
direction_floor += (resultsMap.sells[i].floor == undefined || resultsMap.sells[i].floor == "")?"":resultsMap.sells[i].floor + "层";
htmlChengJiao += "<div class='item-after'><em>"+tempTotalPrice+"</em></div></div>";
htmlChengJiao += "<div class='item-title-row'><div class='item-title'><span>"+direction_floor+"</span></div>";
htmlChengJiao += "<div class='item-after'><span>"+tempAvgPrice+"</span></div></div>";
htmlChengJiao += "<div class='item-subtitle'><span class='tag'><small>"+tradeDate+"</small></span></div></div></a></li>";
@@ -528,24 +528,24 @@ function addItemsChengJiao(resultsMap){
}
if(resultsMap.disSellHouses!=null && resultsMap.disSellHouses.length>0){
if(resultsMap.sells!=null && resultsMap.sells.length>0){
htmlGuaPai += '<div id="tabDeal2" class="tab"><div class="list-block media-list"><ul>';
htmlChengJiao += '<div id="tabDeal2" class="tab"><div class="list-block media-list"><ul>';
}else{
htmlGuaPai += '<div id="tabDeal2" class="tab active"><div class="list-block media-list"><ul>';
htmlChengJiao += '<div id="tabDeal2" class="tab active"><div class="list-block media-list"><ul>';
}
for(var i in resultsMap.disSellHouses){
htmlChengJiao += '<li><a class="item-content"><div class="item-inner"><div class="item-title-row">';
htmlChengJiao += "<div class='item-title'><span class='c3 c3a'>"+resultsMap.disSellHouses[i].name+"</span></div>";
htmlChengJiao += "<div class='item-title'><span class='c3 c3a'>"+resultsMap.disSellHouses[i].districtName+"</span></div>";
var tempTotalPrice = resultsMap.disSellHouses[i].totalPrice == 0?"暂无":(parseFloat(resultsMap.disSellHouses[i].totalPrice)/10000).toFixed(2)+"万";
var tempAvgPrice = resultsMap.disSellHouses[i].avgPrice == 0?"暂无":resultsMap.disSellHouses[i].avgPrice+"元/㎡";
var tradeDate = resultsMap.disSellHouses[i].tradeDate == null?"暂无":formatTime(resultsMap.disSellHouses[i].tradeDate)+"签约";
htmlChengJiao += "<div class='item-after'><em>"+tempTotalPrice+"</em></div></div>";
var direction_floor = (resultsMap.disSellHouses[i].direction == undefined || resultsMap.disSellHouses[i].direction == "")?"":resultsMap.disSellHouses[i].direction;
direction_floor += (resultsMap.disSellHouses[i].floor == undefined || resultsMap.disSellHouses[i].floor == "")?"":resultsMap.disSellHouses[i].floor + "层";
htmlChengJiao += "<div class='item-after'><em>"+tempTotalPrice+"</em></div></div>";
htmlChengJiao += "<div class='item-title-row'><div class='item-title'><span>"+direction_floor+"</span></div>";
htmlChengJiao += "<div class='item-after'><span>"+tempAvgPrice+"</span></div></div>";
htmlChengJiao += "<div class='item-subtitle'><span class='tag'><small>"+tradeDate+"</small></span></div></div></a></li>";
}
htmlGuaPai += '</ul></div></div>';
htmlChengJiao += '</ul></div></div>';
}
htmlChengJiao += '</div>';
$('#showTopic2').html(htmlChengJiao);
+14
View File
@@ -1401,6 +1401,7 @@ function updateChangeSubtation(hsId){
sellToBuy();
}
$("#input_city").text(hs.intentionCity)
loadingRegion(hs.intentionCity);
selectTxt("select_region", hs.intentionRegion);
selectTxt("select_result", hs.intentionTags);
@@ -1709,6 +1710,8 @@ $("#select_area").RangeSlider({min: 0, max: 100, step: 14.2857, callback: change
/* 弹出城市选择页面 */
$(document).on("click",".open-about01", function () {
$("#citySearchInp").val("");
$("#selectContainer").hide();
$.popup(".popup-about01");
});
@@ -1848,6 +1851,17 @@ function openAddHouse(){
clicked('/views/house/add.html',true,false,{},{});
}
/* 定位城市 */
$("body").on("click", ".letter a", function () {
var s = $(this).html();
$(".popup-about01 .content").scrollTop(0);
$(".popup-about01 .content").scrollTop($("#" + s + "1").offset().top - 106);
});
$("#tabCity1 .content-block01").scroll(function () {
$("#tabCity1 .content-block01 .letter").css("position","absolute");
$("#tabCity1 .content-block01 .letter").css("top", 85 - $("#cityContainer").position().top);
});
</script>
</body>