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

This commit is contained in:
尹吉欢
2018-04-20 22:22:51 +08:00
+14 -9
View File
@@ -2229,13 +2229,6 @@ function changeCity(cityStr){
city = cityStr
console.log(oriCity + "==" + cityStr)
if(oriCity== cityStr){
if(oriRegion!=""){
//$("#region").text(oriRegion);
setTimeout(function(){
baseInfo.region = oriRegion;
},1000)
}
lat = oriLat;
lng = oriLng;
if(cityStr=="上海"){
@@ -2274,7 +2267,7 @@ function changeCity(cityStr){
$("#ShangHaiDiv").show();
$("#otherCityDiv").hide();
//initNearDistricts($(this).text(),0,0,"",0,0,0,"");
initBaseInfo(cityStr,"",address,lat,lng);
//initBaseInfo(cityStr,oriRegion,address,lat,lng);
}else{
$("#ShangHaiDiv").hide();
$("#otherCityDiv").show();
@@ -2291,9 +2284,21 @@ function changeCity(cityStr){
//加载列表
sort=6;
getDistrictList(cityStr,lat,lng,"",sort,0,0,"");
initBaseInfo(cityStr,"","",0,0);
}
if(oriCity== cityStr){
if(oriRegion!=""){
setTimeout(function(){
//alert(oriRegion)
baseInfo.region = oriRegion;
//changeRegion();
},1000)
}
initBaseInfo(cityStr,oriRegion,"",0,0);
}else{
initBaseInfo(cityStr,"","",0,0);
}
$(".selectContent").hide();
//刷新下拉滚动加载事件
$.attachInfiniteScroll($('.infinite-scroll'))