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

This commit is contained in:
raoyanhui
2018-04-16 11:01:08 +08:00
2 changed files with 20 additions and 15 deletions
+18 -12
View File
@@ -43,7 +43,7 @@
<div class="item-title"><label><b>{{name}}</b></label><span class="span01">{{city_region}}</span></div>
</div>
<div class="item-title-row">
<div class="item-title"><small>{{house_type}}</small></div>
<div class="item-title"><small>{{house_room_num}}</small></div>
</div>
</div>
</div>
@@ -152,7 +152,7 @@ $.config = {router: false}
data:{
name:"",
city_region:"",
house_type:""
house_room_num:""
}
})
var house_price = new Vue({
@@ -222,7 +222,8 @@ $.config = {router: false}
h = response.data.data
house_info.name = h.name
house_info.city_region = h.city+"-"+h.region
house_info.house_type = (h.roomCount==0?"":h.roomCount+"室")+(h.hallCount==0?"":h.hallCount+"厅 ")+(h.area==0?"":h.area+"㎡ ")+((h.floor==0||h.height==0)?"":h.floor+"/"+h.height+"层")
house_info.house_room_num = (h.houseRoomNum==null||h.houseRoomNum=="")?"暂无":h.houseRoomNum;
// house_info.house_type = (h.roomCount==0?"":h.roomCount+"室")+(h.hallCount==0?"":h.hallCount+"厅 ")+(h.area==0?"":h.area+"㎡ ")+((h.floor==0||h.height==0)?"":h.floor+"/"+h.height+"层")
if(h.totalPrice==0){
house_price.total_price = "暂无";
}else{
@@ -243,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"
+2 -3
View File
@@ -1235,7 +1235,6 @@ $.config = {router: false}
}
})
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var city = "";
@@ -1249,8 +1248,6 @@ $.config = {router: false}
//lng = p.coords.longitude;//获取到当前位置的经度
//lat = p.coords.latitude;//获取到当前位置的纬度;
loadMyCollectCity();
}, function(e){
},
{
@@ -1341,6 +1338,8 @@ $.config = {router: false}
$(".cardNearby").on("click", function(){
window.location.href = "01_index04_districtDetail.html";
});
loadMyCollectCity();
}