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

This commit is contained in:
2018-04-16 13:00:38 +08:00
4 changed files with 23 additions and 13 deletions
+1 -1
View File
@@ -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;}
+15 -10
View File
@@ -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)})
},
@@ -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"
+1 -1
View File
@@ -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 = "-";
@@ -208,7 +208,12 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
htmlContent = htmlContent +"<div class='item-inner'><div class='item-title-row'>";
htmlContent = htmlContent +"<div class='item-title'><label>"+result.name+"</label><span class='span01'>"+result.city+"-"+result.region+"</span></div>";
htmlContent = htmlContent +"</div><div class='item-title-row'>";
htmlContent = htmlContent +"<div class='item-title'><small>"+result.roomCount+"室"+result.hallCount+"厅&nbsp;&nbsp;"+result.area+"㎡&nbsp;&nbsp;"+result.floor+"/"+result.height+"层</small></div>";
//htmlContent = htmlContent +"<div class='item-title'><small>"+result.roomCount+"室"+result.hallCount+"厅";
var houseRoomNum = result.houseRoomNum==""?"暂无":result.houseRoomNum;
htmlContent = htmlContent +"<div class='item-title'><small>"+houseRoomNum;
htmlContent = htmlContent +"&nbsp;&nbsp;"+result.area+"㎡&nbsp;&nbsp;"+result.floor+"/"+result.height+"层</small></div>"
htmlContent = htmlContent +"</div><div class='item-subtitle'>";
//对应城市地区小区30天涨跌幅
//动态构建key