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

This commit is contained in:
2018-05-08 15:26:05 +08:00
2 changed files with 54 additions and 6 deletions
+8
View File
@@ -5,6 +5,10 @@
document.addEventListener("plusready", function() {
// 监听点击消息事件
plus.push.addEventListener("click", function(msg) {
//刷新个人中心
if (plus.webview.getWebviewById('views/user/userInfo.html') != null) {
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
// 判断是从本地创建还是离线推送的消息
var payload = msg.payload;
var title = msg.title;
@@ -87,6 +91,10 @@ document.addEventListener("plusready", function() {
// 监听在线消息事件, iOS透传消息在线时会进入这里进行处理
plus.push.addEventListener("receive", function(msg) {
//刷新个人中心
if (plus.webview.getWebviewById('views/user/userInfo.html') != null) {
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
var title = msg.title;
var content = msg.content;
var payload = msg.payload;
+46 -6
View File
@@ -460,8 +460,24 @@ function addItemsGuaPai(resultsMap){
htmlGuaPai += "<div class='item-title'><span class='c3 c3a'>"+resultsMap.houses[i].district_name+"</span><span class='c6 c6a'>"+resultsMap.houses[i].area+"㎡</span></div>";
var tempTotalPrice = resultsMap.houses[i].total_price == 0?"暂无":(parseFloat(resultsMap.houses[i].total_price)/10000).toFixed(2)+"万";
var tempAvgPrice = resultsMap.houses[i].avg_price == 0?"暂无":resultsMap.houses[i].avg_price+"元/㎡";
var roomHallDirectionFitment = "";
if(resultsMap.houses[i].room != undefined && resultsMap.houses[i].room != 0 && resultsMap.houses[i].hall != undefined && resultsMap.houses[i].hall != 0){
roomHallDirectionFitment += resultsMap.houses[i].room+"室"+resultsMap.houses[i].hall+"厅";
if((resultsMap.houses[i].direction != undefined && resultsMap.houses[i].direction != "") || (resultsMap.houses[i].fitment != undefined && resultsMap.houses[i].fitment != "")){
roomHallDirectionFitment += "/";
}
}
if(resultsMap.houses[i].direction != undefined && resultsMap.houses[i].direction != ""){
roomHallDirectionFitment += resultsMap.houses[i].direction;
if(resultsMap.houses[i].fitment != undefined && resultsMap.houses[i].fitment != ""){
roomHallDirectionFitment += "/";
}
}
if(resultsMap.houses[i].fitment != undefined && resultsMap.houses[i].fitment != ""){
roomHallDirectionFitment += resultsMap.houses[i].fitment;
}
htmlGuaPai += "<div class='item-after'><em>"+tempTotalPrice+"</em></div></div><div class='item-title-row'>";
htmlGuaPai += "<div class='item-title'><span>"+resultsMap.houses[i].room+"室"+resultsMap.houses[i].hall+"厅/"+resultsMap.houses[i].direction+"/"+resultsMap.houses[i].fitment+"</span></div>";
htmlGuaPai += "<div class='item-title'><span>"+roomHallDirectionFitment+"</span></div>";
htmlGuaPai += "<div class='item-after''><span>"+tempAvgPrice+"</span></div></div></div></a></li>";
}
htmlGuaPai += '</ul></div></div>';
@@ -477,8 +493,24 @@ function addItemsGuaPai(resultsMap){
htmlGuaPai += "<div class='item-title'><span class='c3 c3a'>"+resultsMap.disHouses[i].districtName+"</span><span class='c6 c6a'>"+resultsMap.disHouses[i].area+"㎡</span></div>";
var tempTotalPrice = resultsMap.disHouses[i].totalPrice == 0?"暂无":(parseFloat(resultsMap.disHouses[i].totalPrice)/10000).toFixed(2)+"万";
var tempAvgPrice = resultsMap.disHouses[i].avgPrice == 0?"暂无":resultsMap.disHouses[i].avgPrice+"元/㎡";
var roomHallDirectionFitment = "";
if(resultsMap.disHouses[i].room != undefined && resultsMap.disHouses[i].room != 0 && resultsMap.disHouses[i].hall != undefined && resultsMap.disHouses[i].hall != 0){
roomHallDirectionFitment += resultsMap.disHouses[i].room+"室"+resultsMap.disHouses[i].hall+"厅";
if((resultsMap.disHouses[i].direction != undefined && resultsMap.disHouses[i].direction != "") || (resultsMap.disHouses[i].fitment != undefined && resultsMap.disHouses[i].fitment != "")){
roomHallDirectionFitment += "/";
}
}
if(resultsMap.disHouses[i].direction != undefined && resultsMap.disHouses[i].direction != ""){
roomHallDirectionFitment += resultsMap.disHouses[i].direction;
if(resultsMap.disHouses[i].fitment != undefined && resultsMap.disHouses[i].fitment != ""){
roomHallDirectionFitment += "/";
}
}
if(resultsMap.disHouses[i].fitment != undefined && resultsMap.disHouses[i].fitment != ""){
roomHallDirectionFitment += resultsMap.disHouses[i].fitment;
}
htmlGuaPai += "<div class='item-after'><em>"+tempTotalPrice+"</em></div></div><div class='item-title-row'>";
htmlGuaPai += "<div class='item-title'><span>"+resultsMap.disHouses[i].room+"室"+resultsMap.disHouses[i].hall+"厅/"+resultsMap.disHouses[i].direction+"/"+resultsMap.disHouses[i].fitment+"</span></div>";
htmlGuaPai += "<div class='item-title'><span>"+roomHallDirectionFitment+"</span></div>";
htmlGuaPai += "<div class='item-after'><span>"+tempAvgPrice+"</span></div></div></div></a></li>";
}
htmlGuaPai += '</ul></div></div>';
@@ -516,9 +548,13 @@ function addItemsChengJiao(resultsMap){
htmlChengJiao += "<div class='item-title'><span class='c3 c3a'>"+resultsMap.sells[i].district_name+"</span></div>";
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)+"签约";
var tradeDate = (resultsMap.sells[i].trade_date == undefined || resultsMap.sells[i].trade_date == null)?"暂无":formatTime(resultsMap.sells[i].trade_date)+"签约";
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 + "层";
//如果direction/floor同时存在, 中间加一个"/"
if(resultsMap.sells[i].direction != undefined && resultsMap.sells[i].direction != "" && resultsMap.sells[i].floor != undefined && resultsMap.sells[i].floor != 0){
direction_floor += "/";
}
direction_floor += (resultsMap.sells[i].floor == undefined || resultsMap.sells[i].floor == 0)?"":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>";
@@ -537,9 +573,13 @@ function addItemsChengJiao(resultsMap){
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)+"签约";
var tradeDate = (resultsMap.disSellHouses[i].tradeDate == undefined || resultsMap.disSellHouses[i].tradeDate == null)?"暂无":formatTime(resultsMap.disSellHouses[i].tradeDate)+"签约";
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 + "层";
//如果direction/floor同时存在, 中间加一个"/"
if(resultsMap.disSellHouses[i].direction != undefined && resultsMap.disSellHouses[i].direction != "" && resultsMap.disSellHouses[i].floor != undefined && resultsMap.disSellHouses[i].floor != 0){
direction_floor += "/";
}
direction_floor += (resultsMap.disSellHouses[i].floor == undefined || resultsMap.disSellHouses[i].floor == 0)?"":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>";