This commit is contained in:
xuhe@fangjia.com
2018-05-18 16:45:10 +08:00
parent cd3a815a33
commit d14079c880
2 changed files with 22 additions and 19 deletions
+9 -2
View File
@@ -69,8 +69,15 @@
<div class="col-15 tac" v-if="index <= 2"><img :src="'../../images/rankingImg0' + (index+1)+'a.png'"></div>
<div class="col-25">{{info.region}}</div>
<div class="col-33">{{info.avgPrice}}元/㎡</div>
<div class="col-25" v-if="info.oneMonthUpDownRange > 0"><em class="up">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-red"></i></em></div>
<div class="col-25" v-if="info.oneMonthUpDownRange < 0"><em class="down">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-green"></i></em></div>
<div class="col-25" v-if="info.oneMonthUpDownRange>=0">
<em class="up">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-red"></i></em>
</div>
<div class="col-25" v-else-if="info.oneMonthUpDownRange<0">
<em class="down">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-green"></i></em>
</div>
<div class="col-25" v-else>
<em class="up">暂无</em>
</div>
</div>
</div>
</a>
+13 -17
View File
@@ -51,7 +51,7 @@
<!--<div class="pull-to-refresh-arrow"></div>-->
</div>
<div class="card cardPrice" id="baseInfo" v-cloak onclick="openRegionRank()">
<div class="card cardPrice" id="baseInfo" v-cloak>
<div class="card-header">
<span>{{topMonth}}月份均价</span>
<span>
@@ -77,7 +77,7 @@
<span>
<em id="regionRankId_noData">暂无数据
</em>
<em id="regionRankId"><strong>{{regionRank}}</strong></em>
<em id="regionRankId" onclick="openRegionRank()"><strong>{{regionRank}}</strong></em>
<label>区域均价排名</label>
</span>
<span>
@@ -118,7 +118,7 @@
<div class="content-block-title cardNearbyName" id="nearAddress"><i class="icon icon-address02"></i><span id="nearDistrictSpan"></span><i class="icon arrow-up"></i></div>
<div class="cardNearbyBox" id="nearDistricts">
</div>
<div class="content-block-title recommend dn" id="todayNews">今日推荐</div>
<div class="content-block-title recommend" id="todayNews">热门推荐</div>
<div id="newsList">
</div>
@@ -1270,7 +1270,7 @@ function getPosition(){
oriLng = p.coords.longitude;
oriLat = p.coords.latitude;
if(region.endWith("区")){
if(region.endWith("区") || region.endWith("市")){
region = region.substring(0, region.length-1);
}
oriRegion = region;
@@ -1604,17 +1604,13 @@ function initNews(page){
$('.infinite-scroll-preloader').hide();
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
if(page==1){
$("#todayNews").hide();
}
}
if(page==1){
todayDeployFlag = true;
$("#todayNews").hide();
}
for(var i in response.data.data.list){
dataObj.push(response.data.data.list[i])
if(dataObj[i].todayDeploy && todayDeployFlag){
todayDeployFlag = false;
$("#todayNews").show();
}
}
lastIndex = $('.cardInfo').length;
itemsPerLoad = response.data.data.list.length;
@@ -1831,7 +1827,7 @@ var itemsPerLoad2 = 5;
var dataObj = [];
var dataObj2 = [];
var page = 1;
var yesterDayDeployFlag = true;
//var yesterDayDeployFlag = true;
function addItems(number, lastIndex) {
// 生成新条目的HTML
@@ -1845,16 +1841,16 @@ function addItems(number, lastIndex) {
return;
}
var html = '';
if(lastIndex == 0){
/*if(lastIndex == 0){
yesterDayDeployFlag = true;
}
}*/
for(var i in dataObj){
if(i>=lastIndex){
if((dataObj.length<lastIndex + number) || (i < lastIndex + number)){
if(dataObj[i].yesterDayDeploy && yesterDayDeployFlag){
/*if(dataObj[i].yesterDayDeploy && yesterDayDeployFlag){
yesterDayDeployFlag = false;
html += '<div class="content-block-title recommend" style="border-top:solid 0.5rem #f3f3f3;">历史推荐</div>';
}
}*/
if(dataObj[i].type=="专题"){
html += '<div class="card cardInfo cardInfo01" onclick="openNewsView(\''+dataObj[i].id+'\',\''+dataObj[i].type+'\')">'+
'<div class="card-header">'+dataObj[i].title+'</div>'+