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

This commit is contained in:
尹吉欢
2018-04-14 20:00:23 +08:00
5 changed files with 23 additions and 33 deletions
+2 -3
View File
@@ -24,10 +24,9 @@ function addEstate(number, lastIndex) {
// 生成新条目的HTML
var html = '';
$.each(data['results'], function(i){
var tag = this.tag;
var tags = this.tags;
var tagStr = "";
if(tag){
var tags = tag.split("_")
if(tags!=null&&tags.length>0){
for(var j=0;j<tags.length;j++){
if(j<3){
var tag = tags[j];
+7 -10
View File
@@ -70,18 +70,15 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap,
var html = '';
for(var i in dataObj) {
var result = dataObj[i];
var tempTotalPrice = result.totalPrice;
//可抵押贷额度
var tempTotalPricePercent;
//考虑是否为数字,加强逻辑判断
if(!isNaN(tempTotalPrice)){
//转换成元,四舍五入
tempTotalPricePercent = (parseFloat(tempTotalPrice)*0.7/10000).toFixed(2);
tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2);
}
var tempTotalPricePercent = (result.totalPrice) == 0?"暂无":(parseFloat(result.totalPrice)*0.7/10000).toFixed(2)+"万";
var tempTotalPrice = (result.totalPrice) == 0?"暂无":(parseFloat(result.totalPrice)/10000).toFixed(2)+"万";
html += '<li><a href="#" onclick="gotoHouseDetail(\''+result.id+'\')" class="item-content">';
html += "<div class='item-inner'><div class='item-title-row'>";
html += "<div class='item-title'><label>"+result.name+"</label> <em>"+tempTotalPrice+"万</em><span class='tag'>";
html += "<div class='item-title'><label>"+result.name+"</label> <em>"+tempTotalPrice+"</em><span class='tag'>";
if(result.liveStatus!=null && result.liveStatus.length>0){
html += "<small>"+result.liveStatus+"</small></span></div>";
}else{
@@ -116,7 +113,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap,
html += "<div>下跌概率: <em class='down'>暂无<i class='icon'></i></em></div>";
}
html += "<div>抵押可贷额度: <em style='color:#EB5F34;'>"+tempTotalPricePercent+"万</em></div></div></div></a>";
html += "<div>抵押可贷额度: <em style='color:#EB5F34;'>"+tempTotalPricePercent+"</em></div></div></div></a>";
if(result.level!=null && result.level == 1){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>豪宅级</a>";
@@ -226,7 +226,7 @@ $.config = {router: false}
if(h.totalPrice==0){
house_price.total_price = "暂无";
}else{
house_price.total_price = (h.totalPrice/10000).toFixed(0)
house_price.total_price = (h.totalPrice/10000).toFixed(2)
house_price.w = "万"
}
house_price.avg_price = h.avgPrice==0?"暂无":h.avgPrice+"元/㎡"
+7 -10
View File
@@ -314,18 +314,15 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq
}
for(var i in dataObj) {
var result = dataObj[i];
var tempTotalPrice = result.totalPrice;
//可抵押贷额度
var tempTotalPricePercent;
//考虑是否为数字,加强逻辑判断
if(!isNaN(tempTotalPrice)){
//转换成元,四舍五入
tempTotalPricePercent = (parseFloat(tempTotalPrice)*0.7/10000).toFixed(2);
tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2);
}
var tempTotalPricePercent = (result.totalPrice) == 0?"暂无":(parseFloat(result.totalPrice)*0.7/10000).toFixed(2)+"万";
var tempTotalPrice = (result.totalPrice) == 0?"暂无":(parseFloat(result.totalPrice)/10000).toFixed(2)+"万";
html += '<li><a href="#" onclick="gotoHouseDetail(\''+result.id+'\')" class="item-content">';
html += "<div class='item-inner'><div class='item-title-row'>";
html += "<div class='item-title'><label>"+result.name+"</label> <em>"+tempTotalPrice+"万</em><span class='tag'>";
html += "<div class='item-title'><label>"+result.name+"</label> <em>"+tempTotalPrice+"</em><span class='tag'>";
if(result.liveStatus!=null && result.liveStatus.length>0){
html += "<small>"+result.liveStatus+"</small></span></div>";
}else{
@@ -359,7 +356,7 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq
html += "<div>下跌概率: <em class='down'>暂无<i class='icon'></i></em></div>";
}
html += "<div>抵押可贷额度: <em style='color:#EB5F34;'>"+tempTotalPricePercent+"万</em></div></div></div></a>";
html += "<div>抵押可贷额度: <em style='color:#EB5F34;'>"+tempTotalPricePercent+"</em></div></div></div></a>";
if(result.level!=null && result.level == 1){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>豪宅级</a>";
@@ -204,12 +204,6 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
if(results!=null && results.length>0){
for(var i in results){
var result = results[i];
var tempTotalPrice = result.totalPrice;
//考虑是否为数字,加强逻辑判断
if(!isNaN(tempTotalPrice)){
//转换成元,四舍五入
tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2);
}
htmlContent = htmlContent +'<li><a onclick="openReportWindow(\''+result.id+'\')" class="item-content">';
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>";
@@ -231,7 +225,7 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
}
}else{
//为非数字清空放空格
htmlContent = htmlContent + "<div>近30天涨跌幅: <em class='down'>"+ +"%<i class='icon icon-arrow-green'></i></em></div>";
htmlContent = htmlContent + "<div>近30天涨跌幅: <em class='down'>暂无<i class='icon'></i></em></div>";
}
//相比对于城市均价
@@ -248,8 +242,11 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
//为非数字清空放空格
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>暂无</em></div>";
}
htmlContent = htmlContent + "<div>均价: <em class='em02'>"+result.price+"元/㎡</em></div>";
htmlContent = htmlContent + "<div class='price'><em><strong>"+tempTotalPrice+"</strong>万</em></div>";
var tempTotalPrice = (result.totalPrice) == 0?"暂无</strong>":(parseFloat(result.totalPrice)/10000).toFixed(2)+"</strong>万";
var tempPrice = (result.price) == 0?"暂无":result.price+"元/㎡";
htmlContent = htmlContent + "<div>均价: <em class='em02'>"+tempPrice+"</em></div>";
htmlContent = htmlContent + "<div class='price'><em><strong>"+tempTotalPrice+"</em></div>";
htmlContent = htmlContent + "</div></div></a><a class='add open-vertical-modal' id="+result.id+" uid="+result.uid+" houseStatus="+result.houseStatus+"><i class='icon icon-add'></i>添加管理</a>"
htmlContent = htmlContent +"</li>";
}