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

This commit is contained in:
2018-04-13 15:59:52 +08:00
7 changed files with 62 additions and 51 deletions
+1 -1
View File
@@ -63,7 +63,7 @@ function addEstate(number, lastIndex) {
'</div>'+
'<div class="item-title-row">'+
'<div class="item-title"><i class="icon icon-address03"></i><small>'+(this.address?(this.city+this.region+this.address):'')+'</small></div>'+
'<div class="item-after"><span>'+(this.distance?"距您"+this.distance+"m":"暂无")+'</span></div>'+
// '<div class="item-after"><span>'+(this.distance?"距您"+this.distance+"m":"暂无")+'</span></div>'+
'</div>'+
'<div class="item-subtitle">'+
'<div>潜力指数: <span class="star">'+starStr+'</span></div>'+
+1 -1
View File
@@ -81,7 +81,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap,
}
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'>"+result.name+" <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{
@@ -183,7 +183,7 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
htmlContent = htmlContent +"<div class='item-inner'><div class='item-title-row'>";
htmlContent = htmlContent +"<div class='item-title'>"+result.name+"<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+"m&nbsp;&nbsp;"+result.floor+"/"+result.height+"层</small></div>";
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><div class='item-subtitle'>";
//对应城市地区小区30天涨跌幅
//动态构建key
+54 -44
View File
@@ -40,7 +40,7 @@
<div class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><b>{{name}}</b><span class="span01">{{city_region}}</span></div>
<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>
@@ -54,10 +54,10 @@
<div class="card cardPrice cardPrice01" id="house_price">
<div class="card-header">
<span>评估总价</span>
<span>均价:<em>{{avg_price}}元/㎡</em></span>
<span>均价:<em>{{avg_price}}</em></span>
</div>
<div class="card-content">
<div class="card-content-inner">{{total_price}}<span>万</span></div>
<div class="card-content-inner">{{total_price}}<span>{{w}}</span></div>
</div>
<div class="card-footer">
<span>
@@ -104,7 +104,7 @@
</li>
</ul>
</div>
<a class="ad"><img src="../../images/adImg.png" id="img"></a>
<a class="ad"><img id="img"></a>
<div class="topic">
<div class="topicTitle" style="position:relative;">均价走势
<div class="content-block">
@@ -166,7 +166,8 @@ $.config = {router: false}
compare_word:"",
compare_money:"",
words:"",
p:""
p:"",
w:""
}
})
// var evaluate_msg = new Vue({
@@ -221,9 +222,14 @@ $.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+"m ")+((h.floor==0||h.height==0)?"":h.floor+"/"+h.height+"层")
house_price.total_price = h.totalPrice==0?"暂无":(h.totalPrice/10000).toFixed(0)
house_price.avg_price = h.avgPrice==0?"暂无":h.avgPrice
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{
house_price.total_price = (h.totalPrice/10000).toFixed(0)
house_price.w = "万"
}
house_price.avg_price = h.avgPrice==0?"暂无":h.avgPrice+"元/㎡"
house_price.percentage_30=h.oneMonthUpDownRange==0?"暂无":h.oneMonthUpDownRange
if(h.oneMonthUpDownRange<0){
house_price.arrow="icon icon-arrow-green"
@@ -260,10 +266,12 @@ $.config = {router: false}
// evaluate_msg.evaluate_words="暂无"
// }
// evaluate_msg.msg=h.evaluateMsg
$("#img").attr("src",BASE_PATH+"/img/"+h.imgId);
$("#img").click(function(){
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: h.city, mobile: ""},function(){})
})
if(typeof(h.imgId)!="undefined"&&h.imgId!=null&&$.trim(h.imgId)!=""){
$("#img").attr("src",BASE_PATH+"/img/"+h.imgId);
$("#img").click(function(){
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: h.city, mobile: ""},function(){})
})
}
loadingChart(h.city,h.region,h.name,2)
//按照时间范围加载数据
$(".avgPriceTrend a").click(function(){
@@ -277,6 +285,39 @@ $.config = {router: false}
}).catch(function(error){
console.log(error)
})
/* 房产用途 */
$(document).on('click','.open-vertical-modal', function () {
var houseStatus = 0;
$.modal({
title: '房产用途',
verticalButtons: true,
buttons: [
{
text: '自住',
onClick: function() {
addManagement(hid, houseStatus, "自住");
}
},
{
text: '出租',
onClick: function() {
addManagement(hid, houseStatus, "自住");
}
},
{
text: '空置',
onClick: function() {
addManagement(hid, houseStatus, "自住");
}
},
{
text: '取消'
}
]
})
});
}
@@ -292,7 +333,6 @@ function addManagement(id, houseStatus, liveStatus){
var status = response.data.status;
if(status){
$.toast(response.data.data);
window.location.reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('views/house/houseList.html').reload();
@@ -319,37 +359,7 @@ $(".content-block .button").on("click", function () {
$(this).addClass("active");
});
/* 房产用途 */
$(document).on('click','.open-vertical-modal', function () {
var houseStatus = 0;
$.modal({
title: '房产用途',
verticalButtons: true,
buttons: [
{
text: '自住',
onClick: function() {
addManagement(hid, houseStatus, "自住");
}
},
{
text: '出租',
onClick: function() {
addManagement(hid, houseStatus, "自住");
}
},
{
text: '空置',
onClick: function() {
addManagement(hid, houseStatus, "自住");
}
},
{
text: '取消'
}
]
})
});
</script>
+3 -2
View File
@@ -1742,13 +1742,14 @@ $("#evaluation_btn").on("click", function () {
}
}
}
if(c && c.indexOf("别墅")>-1){
if(c && c.indexOf("别墅")<0){
var num = e.replace(/第/g,"").replace(/层/g,"").replace(/共/g,"").split(" ");
if(parseInt(num[0])>parseInt(num[1])){
$.toast("总楼层选择错误!")
return false
}
}
if($("#cityAddress").val() != "" && $("#cityAddress").val() != $("#input_city").val()){
$.toast("城市和房屋地址不匹配")
return false
@@ -1785,7 +1786,7 @@ $("#evaluation_btn").on("click", function () {
//var loginFlag=false;
function checkIsLogin(){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
clicked('/views/user/passLogin.html',true,false,{},{},function(){
clicked('/views/user/codeSms.html',true,false,{},{},function(){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
}else{
+1 -1
View File
@@ -61,7 +61,7 @@
<div class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><b>{{name}}</b><span class="span01">{{cityRegion}}</span></div>
<div class="item-title"><label><b>{{name}}</b></label><span class="span01">{{cityRegion}}</span></div>
</div>
<div class="item-title-row">
<div class="item-title"><small><label v-if="roomCount > 0">{{roomCount}}室</label><label v-if="hallCount > 0">{{hallCount}}厅</label>&nbsp;&nbsp;{{area}}m&nbsp;&nbsp;<label v-if="floor > 0 && height">{{floor}}/{{height}}层</label></small></div>
@@ -212,7 +212,7 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
}
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'>"+result.name+"<span class='span01'>"+result.city+"-"+result.region+"</span></div>";
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+"m&nbsp;&nbsp;"+result.floor+"/"+result.height+"层</small></div>";
htmlContent = htmlContent +"</div><div class='item-subtitle'>";