Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1
This commit is contained in:
@@ -296,6 +296,7 @@ em.down{color:#88D053;}
|
||||
.list-block .add{background:none;font-size:0.75rem;color:#F18D00;position:absolute;top:0;right:0;padding:0.5rem 0.75rem;}
|
||||
.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;}
|
||||
|
||||
.list-block li.noData{padding:0.75rem;padding-top:1rem;}
|
||||
.list-block li.noData img{margin:0 auto;}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 621 B |
@@ -87,7 +87,7 @@ $(document).on('click','.modal01 .confirm_btn', function () {
|
||||
var up = Number(basePrice) * Math.pow(2, year);
|
||||
var down = Number(basePrice) * Math.pow(2, -year);
|
||||
if(Number($("#input_price").val()) > up || Number($("#input_price").val()) < down){
|
||||
$('.modal01').hide();
|
||||
$('.modal01').hide();
|
||||
$.modal({
|
||||
title: '购入价格与实际情况偏差较大,是否继续?',
|
||||
buttons: [
|
||||
@@ -121,6 +121,7 @@ $(document).on('click','.modal01 .confirm_btn', function () {
|
||||
}
|
||||
]
|
||||
})
|
||||
$(".modal-text").css("text-align","center");
|
||||
} else{
|
||||
axios.post(BASE_PATH + "/rest/saleAnalysis/updateEvaluation",
|
||||
{
|
||||
@@ -418,7 +419,7 @@ function getAnalysisDetail(){
|
||||
$('#agencyLevelPercent').css("width", resultsMap.agencyLevel+"%");
|
||||
|
||||
//全局变量赋值
|
||||
_evalDate = _houseInfo.evalDate + "";
|
||||
_evalDate = _houseInfo.evalDate;
|
||||
totalPricePart = resultsMap.totalPricePart1;
|
||||
|
||||
//调用构造数据方法
|
||||
|
||||
@@ -182,6 +182,10 @@
|
||||
success: function(resData) {
|
||||
if (resData.status) {
|
||||
var data = resData.data;
|
||||
localStorage.removeItem("startPageImgUrl");
|
||||
localStorage.removeItem("startPageId");
|
||||
localStorage.removeItem("startPageClickUrl");
|
||||
localStorage.removeItem("guidePageUrls");
|
||||
if (data.imgUrl != null) {
|
||||
localStorage.setItem("startPageImgUrl", data.imgUrl);
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
<span class="icon icon-left"></span>
|
||||
</button>
|
||||
<button class="button button-link button-nav pull-right open-popover" onclick="shareHref()">
|
||||
<span class="icon icon-path"></span>
|
||||
<span class="icon icon-share"></span>
|
||||
</button>
|
||||
<h1 class="title">{{name}}</h1>
|
||||
</header>
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
<span class="icon icon-left"></span>
|
||||
</button>
|
||||
<button class="button button-link button-nav pull-right open-popover" onclick="shareHref()">
|
||||
<span class="icon icon-path"></span>
|
||||
<span class="icon icon-share"></span>
|
||||
</button>
|
||||
<h1 class="title">评估报告</h1>
|
||||
</header>
|
||||
|
||||
@@ -1673,7 +1673,6 @@ $("#evaluation_btn").on("click", function () {
|
||||
var d = $("#input_building").val();
|
||||
var e = $("#input_floor").val();
|
||||
var f = $("#input_area").val();
|
||||
|
||||
if(a == ""){
|
||||
$("#evaluation_btn").removeAttr("disabled");
|
||||
$.toast("请选择城市");
|
||||
@@ -1698,7 +1697,7 @@ $("#evaluation_btn").on("click", function () {
|
||||
$("#evaluation_btn").removeAttr("disabled");
|
||||
$.toast("所在楼层不能为空!");
|
||||
return false;
|
||||
}else if(e.indexOf("总楼层")!= -1){
|
||||
}else if(e.indexOf("总楼层")!= -1||e.indexOf("共")== -1){
|
||||
$("#evaluation_btn").removeAttr("disabled");
|
||||
$.toast("总楼层不能为空!");
|
||||
return false;
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="page page-current" id="noData" style="display: none;">
|
||||
<header class="bar bar-nav">
|
||||
<header class="bar bar-nav barBorder">
|
||||
<h1 class="title">房产评估</h1>
|
||||
</header>
|
||||
<div class="loadingBgDiv">
|
||||
@@ -142,6 +142,35 @@ $(document).on('click','.open-vertical-modal', function () {
|
||||
})
|
||||
});
|
||||
|
||||
//删除房产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);
|
||||
$('.loadingBgDiv').show();
|
||||
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");
|
||||
});
|
||||
|
||||
//添加管理AJAX请求
|
||||
function addManagement(id, houseStatus, liveStatus){
|
||||
axios.post(BASE_PATH + "/rest/evaluate/addManagement",
|
||||
@@ -265,7 +294,7 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
|
||||
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>";
|
||||
htmlContent = htmlContent +"<i class='delete confirm-ok' id="+result.id+"></i></li>";
|
||||
}
|
||||
}
|
||||
return htmlContent;
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
</button>
|
||||
<!--<a href="javascript:void(0)" class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left">返回刷新</a>-->
|
||||
<button class="button button-link button-nav pull-right open-popover" onclick="shareHref()">
|
||||
<span class="icon icon-path"></span>
|
||||
<span class="icon icon-share"></span>
|
||||
</button>
|
||||
<h1 class="title"></h1>
|
||||
</header>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<div class="page-group">
|
||||
<div class="page page-current">
|
||||
<header class="bar bar-nav barBorder">
|
||||
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
|
||||
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
|
||||
<span class="icon icon-left"></span>
|
||||
</button>
|
||||
<h1 class="title">出售分析</h1>
|
||||
|
||||
@@ -1556,13 +1556,10 @@ function initNews(page){
|
||||
// 加载完毕,则注销无限加载事件,以防不必要的加载
|
||||
$.detachInfiniteScroll($('.infinite-scroll'));
|
||||
}
|
||||
|
||||
if(page==1 && response.data.data.list.length == 0){
|
||||
if(page==1){
|
||||
todayDeployFlag = true;
|
||||
$("#todayNews").hide();
|
||||
}else{
|
||||
$("#todayNews").show();
|
||||
}
|
||||
|
||||
for(var i in response.data.data.list){
|
||||
dataObj.push(response.data.data.list[i])
|
||||
if(dataObj[i].todayDeploy && todayDeployFlag){
|
||||
|
||||
Reference in New Issue
Block a user