资讯支持多城市

This commit is contained in:
xuhe@fangjia.com
2018-05-25 16:40:27 +08:00
parent aa3cb1d1a4
commit 5ed71f7144
+90 -150
View File
@@ -1236,6 +1236,7 @@ var lat = 0;
var lng = 0;
var address = "";
var cat;
var isHaveNews = false;
//var todayDeployFlag = true;
var timestamp1 = new Date().getTime();
document.addEventListener('plusready', onPlusReady, false);
@@ -1249,6 +1250,7 @@ function getPosition(){
plus.geolocation.getCurrentPosition(function(p){
if(p.address.city==undefined){
city = "上海";
oriCity = "上海";
initData();
}else{
city = p.address.city;
@@ -1316,6 +1318,7 @@ function getPosition(){
initData();*/
}, function(e){
city = "上海";
oriCity = "上海";
$("#input_city").text(city);
initRegionSelect(city);
localStorage.setItem("init_city", city);
@@ -1335,20 +1338,9 @@ function getPosition(){
function initData(){
$("#input_city").text(city);
localStorage.setItem("init_city", city);
//addLocation(lat,lng);
$(".nowCity").text(city);
initBaseInfo(city,region,address,lat,lng);
if(city!="上海"){
$.destroyPullToRefresh(".content")
initRegionSelect(city);
$("#ShangHaiDiv").hide();
$("#otherCityDiv").show();
}else{
$.initPullToRefresh(".content")
$("#ShangHaiDiv").show();
$("#otherCityDiv").hide();
}
initBaseInfo(city,region,address,lat,lng);
}
/* 获取#region字数,截取#region前4字,并添加... */
@@ -1422,20 +1414,11 @@ function initBaseInfo(city,region,address,lat,lng){
}else{
$("#priceRateId").show();
$("#priceRateId_noData").hide();
//baseInfo.dealCount = response.data.data.dealCount;
baseInfo.priceRate = response.data.data.priceRate;
baseInfo.priceRateType = response.data.data.priceRateType;
}
baseInfo.isLogin = response.data.data.isLogin;
/*if(response.data.data.isLogin){
$("#addHouseDiv").hide();
$("#detailHouseDiv").show();
}else{
$("#addHouseDiv").show();
$("#detailHouseDiv").hide();
}
localStorage.setItem("isLogin", response.data.data.isLogin);*/
if(response.data.data.momRateType>0){
$("#momRateTypeClass").removeClass("icon-arrow-green");
$("#momRateTypeClass").addClass("icon-arrow-red");
@@ -1452,12 +1435,31 @@ function initBaseInfo(city,region,address,lat,lng){
$("#priceRateTypeClass").addClass("icon-arrow-green");
$("#priceInfo").text("下跌概率");
}
regionChange(response.data.data.region);
regionList = response.data.data.regionList;
loadRegion();
$(".loadingBg").hide();
isHaveNews = response.data.data.isHaveNews;
if(response.data.data.isHaveNews){
$("#todayNews").show();
$.initPullToRefresh(".content")
$("#ShangHaiDiv").show();
$("#otherCityDiv").hide();
initNearDistricts(city,latParam,lngParam)
initNews(1);
}else{
$("#todayNews").hide();
$.destroyPullToRefresh(".content")
initRegionSelect(city);
$("#ShangHaiDiv").hide();
$("#otherCityDiv").show();
getCityPriceLevel(city);
//加载列表
sort=6;
getDistrictList(city,latParam,lngParam,"",sort,0,0,"");
}
})
.catch(function (error) {
setTimeout(function(){
@@ -1472,13 +1474,6 @@ function initBaseInfo(city,region,address,lat,lng){
},10000)
console.log(error);
});
initNearDistricts(cityParam,latParam,lngParam,regionParam,0,0,0,"");
if($("#input_city").text()=="上海"){
page = 1;
dataObj = [];
$("#newsList").html("");
initNews(page);
}
}
var regionList=[];
@@ -1545,27 +1540,19 @@ $("body").delegate("#regionStatusButton", "click", function (){
}
})
function initNearDistricts(cityParam,latParam,lngParam,regionParam,order,minPrice,maxPrice,tag){
axios.get("/rest/index/districtList", {
function initNearDistricts(cityParam,latParam,lngParam){
axios.get("/rest/index/nearDistricts", {
params: {
city: cityParam,
region:regionParam,
lat:latParam,
lng:lngParam,
minAvgPrice:minPrice,
maxAvgPrice:maxPrice,
poiTags:tag,
sort:order,
lng:lngParam
}
})
.then(function (response) {
if(cityParam=="上海"){
if(response.data.data.dtos.length==0){
if(response.data.data.dtos.length==0){
$("#nearAddress").hide();
$("#nearDistricts").hide();
}else{
$("#nearAddress").show();
$("#nearDistricts").show();
}
@@ -1587,9 +1574,6 @@ function initNearDistricts(cityParam,latParam,lngParam,regionParam,order,minPric
html += '</div>';
$("#nearDistricts").html(html);
$("#nearbyDistrictList").css("width",(7.5*response.data.data.dtos.length)+"rem");
}else{
getCityPriceLevel(cityParam);
}
})
.catch(function (error) {
@@ -1602,13 +1586,14 @@ function initNews(page){
axios.get("/rest/news/list", {
params: {
city: $("#input_city").text(),
page:page/*,
deviceId:plus.device.uuid*/
}
page:page,
deviceId:plus.device.uuid
}
})
.then(function (response) {
if(page == 1){
dataObj = []
$("#newsList").html("");
}
//合并数组
if(response.data.data.list.length == 0){
@@ -1617,28 +1602,14 @@ function initNews(page){
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
}
if(page==1 && response.data.data.list.length==0){
//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;
addItems(itemsPerLoad, lastIndex);
$(".pull-to-refresh-layer").addClass("dn");
/*if(dataObj.length>5){
$(".infinite-scroll-preloader").show();
}else{
$(".infinite-scroll-preloader").hide();
}*/
})
.catch(function (error) {
console.log(error);
@@ -1843,11 +1814,9 @@ var itemsPerLoad2 = 5;
var dataObj = [];
var dataObj2 = [];
var page = 1;
//var yesterDayDeployFlag = true;
function addItems(number, lastIndex) {
// 生成新条目的HTML
if($("#input_city").text()=="上海"){
if(isHaveNews){
if(dataObj.length == 0) {
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
@@ -1857,16 +1826,9 @@ function addItems(number, lastIndex) {
return;
}
var html = '';
/*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){
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>'+
@@ -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("<i></i>","")
@@ -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{