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

This commit is contained in:
尹吉欢
2018-05-04 15:55:28 +08:00
6 changed files with 8 additions and 9 deletions
+1
View File
@@ -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

+3 -2
View File
@@ -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;
//调用构造数据方法
@@ -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">
@@ -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>
+2 -5
View File
@@ -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){