Merge branch 'YOUFANGAPP1.1.5' of http://gitlab.fangjia.com/dev0/youfang-app into xh-YOUFANGAPP1.1.5

This commit is contained in:
xuhe@fangjia.com
2018-07-04 18:53:05 +08:00
3 changed files with 7 additions and 7 deletions
+4 -4
View File
@@ -892,10 +892,10 @@ input::-webkit-input-placeholder{
#chart01{height:260px;position:absolute;}
*/
.topic .topicTitle > div.icon01Box{overflow:hidden;float:none;display:inline-block;vertical-align:middle;}
.icon-chart01a-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01a-no.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;}
.icon-chart01a{background:url(../images/icon-chart01a.png) no-repeat center center;background-size:55%;}
.icon-chart01-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01-no.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;}
.icon-chart01{background:url(../images/icon-chart01.png) no-repeat center center;background-size:55%;}
.icon-chart01a-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01a-no.png) no-repeat center center;background-size:55%;padding:0 0.8rem;}
.icon-chart01a{width:1.1rem;height:1rem;background:url(../images/icon-chart01a.png) no-repeat center center;background-size:55%;padding:0 0.8rem;}
.icon-chart01-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01-no.png) no-repeat center center;background-size:55%;padding:0 0.8rem;}
.icon-chart01{width:1.1rem;height:1rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:55%;padding:0 0.8rem;}
.scoreBox{height:130px;position:relative;}
.score{width:250px;height:250px;margin:0 auto;margin-top:1rem;}
+1 -1
View File
@@ -802,7 +802,7 @@ function showLineChart(times, datas){
color: '#666'
},
formatter: function (params) {
var res = params[0].name + ' <br/>' + "均价:"+params[0].value + '元/㎡';
var res = params[0].name + ' <br/>' + "均价:"+(params[0].value=="undefined"?"暂无":params[0].value) + '元/㎡';
return res;
},
position: function (pos, params, el, elRect, size) {
@@ -293,9 +293,9 @@ function addSubstitution(sr, hs, house){
}
if(initPrice < soufu_min){
s +=",资金缺口约为"+Math.round(((soufu_min-initPrice)-(soufu_max-initPrice))*100)/100+"万";
s +=",资金缺口约为"+Math.abs(Math.round(((soufu_min-initPrice)-(soufu_max-initPrice))*100)/100)+"万";
}else if(initPrice > soufu_min && initPrice < soufu_max){
s += ",资金缺口约为"+Math.round((soufu_max-initPrice)*100)/100+"万";
s += ",资金缺口约为"+Math.abs(Math.round((soufu_max-initPrice)*100)/100)+"万";
}else if(initPrice > soufu_max){
s += "。";
}