历史推荐';
- }*/
if(dataObj[i].type=="专题"){
html += ''+
''+
@@ -2015,9 +1977,6 @@ function addItems(number, lastIndex) {
}
}
- /*if(dataObj.length<=(lastIndex + number)){
- $(".infinite-scroll-preloader").hide();
- }*/
// 添加新条目
if(lastIndex == 0){
$("#newsList").html(html);
@@ -2145,7 +2104,7 @@ $(document).on('infinite', '.infinite-scroll-bottom',function() {
setTimeout(function() {
// 重置加载flag
loading = false;
- if($("#input_city").text()=="上海"){
+ if(isHaveNews){
page += 1;
initNews(page);
// 添加新条目
@@ -2165,7 +2124,7 @@ $(document).on('infinite', '.infinite-scroll-bottom',function() {
// 添加'refresh'监听器
$(document).on('refresh', '.pull-to-refresh-content',function(e) {
- if($("#input_city").text()=="上海"){
+ if(isHaveNews){
$(".pull-to-refresh-layer").removeClass("dn");
page = 1;
dataObj = [];
@@ -2310,89 +2269,75 @@ $("body").delegate(".popup-about01 .cityGPS", "click", function () {
});
function changeCity(cityStr){
- $("#input_city").text(cityStr);
- $(".cityChoice a").text(cityStr);
- $(".popup-about01 p").removeClass("active");
- $(this).addClass("active");
- var sort = 1;
- city = cityStr
- console.log(oriCity + "==" + cityStr)
- if(oriCity== cityStr){
- lat = oriLat;
- lng = oriLng;
- if(cityStr=="上海"){
- $("#ShangHaiDiv").show();
- $("#otherCityDiv").hide();
- //initNearDistricts($(this).text(),lat,lng,"",0,0,0,"");
+ axios.get("/rest/index/isHaveNews", {
+ params: {
+ city: cityStr
+ }
+ })
+ .then(function (response) {
+ isHaveNews = response.data.data.isHaveNews;
+ //刷新下拉滚动加载事件
+ $.attachInfiniteScroll($('.infinite-scroll'))
+ $("#input_city").text(cityStr);
+ $(".cityChoice a").text(cityStr);
+ $(".popup-about01 p").removeClass("active");
+ $(this).addClass("active");
+ var sort = 1;
+ city = cityStr
+ console.log(oriCity + "==" + cityStr)
+ if(oriCity== cityStr){
+ lat = oriLat;
+ lng = oriLng;
}else{
- $("#ShangHaiDiv").hide();
- $("#otherCityDiv").show();
- $("#select_order").find("div").removeClass("active");
- $("#select_order").find("i").removeClass("icon-check");
- $(".order a").text("按距离近优先");
- $("#distanceOrder").addClass("active");
- $("#distanceOrder").find("i").addClass("icon-check");
+ lat = 0;
+ lng = 0;
}
- }else{
- lat = 0;
- lng = 0;
- if(cityStr=="上海"){
+
+ if(isHaveNews){
$.initPullToRefresh(".content")
$("#ShangHaiDiv").show();
$("#otherCityDiv").hide();
- //initNews()
}else{
- //$(".content").removeClass("pull-to-refresh-content");
+ $("#ShangHaiDiv").hide();
+ $("#otherCityDiv").show();
$.destroyPullToRefresh(".content")
$("#select_order").find("div").removeClass("active");
$("#select_order").find("i").removeClass("icon-check");
$(".order a").text("按潜力指数");
$("#indexOrder").addClass("active");
$("#indexOrder").find("i").addClass("icon-check");
+
+ lastIndex2 = 0;
+ dataObj2 = {};
+ $(".infinite-scroll-preloader").show();
+ $('.infinite-scroll-bottom .list-container').html('');
+ city = cityStr;
+ initRegionSelect(cityStr);
+ $(".region a").text('不限');
+ $("#select_price_div a").text('不限');
+ /*//不同城市查询价格区间
+ getCityPriceLevel(cityStr);
+ //加载列表
+ sort=6;
+ getDistrictList(cityStr,lat,lng,"",sort,0,0,"");*/
+
}
- }
-
- if(cityStr=="上海"){
- $("#ShangHaiDiv").show();
- $("#otherCityDiv").hide();
- //initNearDistricts($(this).text(),0,0,"",0,0,0,"");
- //initBaseInfo(cityStr,oriRegion,address,lat,lng);
- }else{
- $("#ShangHaiDiv").hide();
- $("#otherCityDiv").show();
- lastIndex2 = 0;
- dataObj2 = {};
- $(".infinite-scroll-preloader").show();
- $('.infinite-scroll-bottom .list-container').html('');
- city = cityStr;
- initRegionSelect(cityStr);
- $(".region a").text('不限');
- $("#select_price_div a").text('不限');
- //不同城市查询价格区间
- getCityPriceLevel(cityStr);
- //加载列表
- sort=6;
- getDistrictList(cityStr,lat,lng,"",sort,0,0,"");
- }
-
- if(oriCity== cityStr){
- if(oriRegion!=""){
- setTimeout(function(){
- //alert(oriRegion)
- baseInfo.region = oriRegion;
- //changeRegion();
- },1000)
+ if(oriCity== cityStr){
+ if(oriRegion!=""){
+ setTimeout(function(){
+ baseInfo.region = oriRegion;
+ },1000)
+ }
+ initBaseInfo(cityStr,oriRegion,address,lat,lng);
+ }else{
+ initBaseInfo(cityStr,"","",0,0);
}
- initBaseInfo(cityStr,oriRegion,address,lat,lng);
- }else{
- initBaseInfo(cityStr,"","",0,0);
- }
-
- $(".selectContent").hide();
- //刷新下拉滚动加载事件
- $.attachInfiniteScroll($('.infinite-scroll'))
- //potenialIndex($(this).text(),sort);
+ $(".selectContent").hide();
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
}
function req(cityStr){
city=cityStr.replace("","")
@@ -2787,11 +2732,6 @@ function getDistrictList(cityParam,latParam,lngParam,regionParam,order,minPrice,
dataObj2 = response.data.data.dtos;
lastIndex2 = 0;
addItems(itemsPerLoad2, 0)
- if(dataObj2.length == 0){
-
- }else{
-
- }
if(dataObj2.length>5){
$(".infinite-scroll-preloader").show();
}else{