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

This commit is contained in:
xuhe@fangjia.com
2018-05-07 09:39:52 +08:00
4 changed files with 93 additions and 19 deletions
+4
View File
@@ -297,6 +297,10 @@ em.down{color:#88D053;}
.list-block .add01{padding:0 0.5rem;top:1.1rem;right:0.75rem;}
.list-block .add01a{top:inherit;bottom:0.75rem;right:0.75rem;}
.list-block .delete{width:1.5rem;height:1.55rem;background:url(../images/delete.png) no-repeat center center;background-size:100%;position:absolute;top:-1px;right:0;}
.starBox{position:absolute;top:0.6rem;right:1.25rem;font-size:0.7rem;color:#666;text-align:right;}
.starBox .star{display:block;}
.starBox .star .icon{margin-right:0;margin-left:0.1rem;}
.cardPrice .starBox{top:0.55rem;right:0.75rem;}
.list-block li.noData{padding:0.75rem;padding-top:1rem;}
.list-block li.noData img{margin:0 auto;}
+15 -9
View File
@@ -115,25 +115,31 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap,
html += "<div>抵押可贷额度: <em style='color:#EB5F34;'>"+tempTotalPricePercent+"</em></div></div></div></a>";
//调整最新的等级显示(其它等级不显示start)
if(result.level!=null && result.level == 1){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>豪宅级</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>豪宅级</a>";
html += '<a class="starBox">房屋评级<span class="star"><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i></span></a>';
}else if(result.level!=null && result.level == 2){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>公寓级</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>公寓级</a>";
html += '<a class="starBox">房屋评级<span class="star"><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star"></i></span></a>';
}else if(result.level!=null && result.level == 3){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>平房级</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>平房级</a>";
html += '<a class="starBox">房屋评级<span class="star"><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star"></i><i class="icon icon-star"></i></span></a>';
}else if(result.level!=null && result.level == 4){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>草屋级</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>草屋级</a>";
html += '<a class="starBox">房屋评级<span class="star"><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i></span></a>';
}else if(result.level!=null && result.level == 5){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>山洞级</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>山洞级</a>";
html += '<a class="starBox">房屋评级<span class="star"><i class="icon icon-star01"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i></span></a>';
}else{
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>其它</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>其它</a>";
}
//控制贷款按钮是否可以显示,便于ios版本审核
if(localStorage.getItem("showLoanMenu")!=null && localStorage.getItem("showLoanMenu")=="true"){
html += '<a class="button theme add add01 add01a" href="#" onclick="gotoLoanApply(\''+result.id+'\', \''+result.city+'\')">立即申请</a></li>';
}else{
html += '</li>';
html += '<a class="button theme add add01 add01a" href="#" onclick="gotoLoanApply(\''+result.id+'\', \''+result.city+'\')">立即申请</a>';
}
html += "<i class='delete confirm-ok' id="+result.id+"></i></li>";
}
$('#myhouse').append(html);
}
+44 -10
View File
@@ -169,7 +169,7 @@ $(document).on('infinite', '.infinite-scroll-bottom', function() {
}, 1000);
});
//我的收藏查询请求
//我的房产查询请求
function selectHouseInfoList(){
axios.get(BASE_PATH + "/rest/index/ourHouseInfoList",
{
@@ -353,29 +353,63 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq
html += "<div>抵押可贷额度: <em style='color:#EB5F34;'>"+tempTotalPricePercent+"</em></div></div></div></a>";
//调整最新的等级显示(其它等级不显示start)
if(result.level!=null && result.level == 1){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>豪宅级</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>豪宅级</a>";
html += '<a class="starBox">房屋评级<span class="star"><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i></span></a>';
}else if(result.level!=null && result.level == 2){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>公寓级</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>公寓级</a>";
html += '<a class="starBox">房屋评级<span class="star"><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star"></i></span></a>';
}else if(result.level!=null && result.level == 3){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>平房级</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>平房级</a>";
html += '<a class="starBox">房屋评级<span class="star"><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star"></i><i class="icon icon-star"></i></span></a>';
}else if(result.level!=null && result.level == 4){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>草屋级</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>草屋级</a>";
html += '<a class="starBox">房屋评级<span class="star"><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i></span></a>';
}else if(result.level!=null && result.level == 5){
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>山洞级</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>山洞级</a>";
html += '<a class="starBox">房屋评级<span class="star"><i class="icon icon-star01"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i></span></a>';
}else{
html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>其它</a>";
//html += "<a class='add alert-text-title'><i class='icon icon-houseLevel'></i>其它</a>";
}
//控制贷款按钮是否可以显示,便于ios版本审核
if(localStorage.getItem("showLoanMenu")!=null && localStorage.getItem("showLoanMenu")=="true"){
html += '<a class="button theme add add01 add01a" href="#" onclick="gotoLoanApply(\''+result.id+'\', \''+result.city+'\')">立即申请</a></li>';
}else{
html += '</li>';
html += '<a class="button theme add add01 add01a" href="#" onclick="gotoLoanApply(\''+result.id+'\', \''+result.city+'\')">立即申请</a>';
}
html += "<i class='delete confirm-ok' id="+result.id+"></i></li>";
}
$('.infinite-scroll-bottom .list-container').append(html);
}
//删除房产AJAX请求
$(document).on("click",".confirm-ok", function () {
//获取删除的房产id
var id = $(this).attr("id");
$.confirm("确定删除?", function () {
axios.post(BASE_PATH + "/rest/index/deleteHouseInfoByStatus",
{
id: id
}).then(function (response) {
var status = response.data.status;
if(status){
$.toast(response.data.data);
checkIsLogin();
//删除房产会影响个人中心房产列表, 刷新
if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
//plus.webview.getWebviewById('yfindex.html').reload();
}else{
$.toast(response.data.message);
}
}).catch(function (error) {
console.log(error);
});
});
$(".modal-text").css("text-align","center");
});
/* 说明-房产等级 */
$(document).on('click','.alert-text-title', function () {
$.alert('房产等级是房屋在城市中的综合评级,由高至低分别为 豪宅、公寓、平房、草屋、山洞共5个级别。', '房产等级');
+30
View File
@@ -445,6 +445,36 @@ function selectUserInfo(){
});
}
//删除房产AJAX请求
$(document).on("click",".confirm-ok", function () {
//获取删除的房产id
var id = $(this).attr("id");
$.confirm("确定删除?", function () {
axios.post(BASE_PATH + "/rest/index/deleteHouseInfoByStatus",
{
id: id
}).then(function (response) {
var status = response.data.status;
if(status){
$.toast(response.data.data);
//删除后,如果需要调用checkIsLogin,需要所有的参数初始化
//checkIsLogin();
window.location.reload();
//删除房产会影响个人中心房产列表, 刷新
/*if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}*/
//plus.webview.getWebviewById('yfindex.html').reload();
}else{
$.toast(response.data.message);
}
}).catch(function (error) {
console.log(error);
});
});
$(".modal-text").css("text-align","center");
});
function openSettingPage() {
clicked('../setting/setting.html',true,false,{},{},function(){})
}