Merge branch 'YOUFANGAPP1.1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.1
This commit is contained in:
@@ -5,7 +5,7 @@ var mf_maxItems = 100;
|
||||
//上次加载的序号小区
|
||||
var mf_lastIndex = 0;
|
||||
//每次加载添加多少条目
|
||||
var mf_itemsPerLoad = 8;
|
||||
var mf_itemsPerLoad = 10;
|
||||
var mf_curpage = 1;
|
||||
var mf_totalCount = 0;
|
||||
|
||||
@@ -16,7 +16,7 @@ function addEstate(number, lastIndex) {
|
||||
//data = eval( '(' + data + ')' );
|
||||
if(data['results']==null || data['results'].length==0) {
|
||||
$('#loadTip2').remove();
|
||||
$('.infinite-scroll-bottom #tab1').html("<div class='noData'><img src='../images/noData.png'><p>您还没有关注小区</p></div>");
|
||||
//$('.infinite-scroll-bottom #tab1').html("<div class='noData'><img src='../images/noData.png'><p>您还没有关注小区</p></div>");
|
||||
return;
|
||||
}
|
||||
mf_totalCount = data.totalCount;
|
||||
@@ -80,6 +80,10 @@ function addEstate(number, lastIndex) {
|
||||
// $.detachInfiniteScroll($('.infinite-scroll'));
|
||||
// 删除加载提示符
|
||||
$('#loadTip2').remove();
|
||||
}
|
||||
if(data.results.length<mf_itemsPerLoad){
|
||||
$('#loadTip2').remove();
|
||||
return;
|
||||
}
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
|
||||
@@ -1342,10 +1342,7 @@ function onPlusReady() {
|
||||
var self = plus.webview.currentWebview();
|
||||
hsId = self.hsId
|
||||
houseId = self.houseId
|
||||
if(hsId){
|
||||
//如果是修改置换建议,则默认将值填入
|
||||
updateChangeSubtation(hsId);
|
||||
}
|
||||
|
||||
|
||||
if(houseId){
|
||||
//小区报告页带入
|
||||
@@ -1359,15 +1356,25 @@ function onPlusReady() {
|
||||
var formatCity = formatBaiduCity(city);
|
||||
if(formatCity){
|
||||
step2Vue.defaultCity = formatCity
|
||||
loadingRegion(formatCity);
|
||||
}else{
|
||||
step2Vue.defaultCity = dCity
|
||||
loadingRegion(dCity);
|
||||
}
|
||||
|
||||
if(hsId){
|
||||
//如果是修改置换建议,则默认将值填入
|
||||
updateChangeSubtation(hsId);
|
||||
}else{
|
||||
loadingRegion(step2Vue.defaultCity);
|
||||
}
|
||||
|
||||
}, function(e){
|
||||
step2Vue.defaultCity = dCity
|
||||
loadingRegion(dCity);
|
||||
if(hsId){
|
||||
//如果是修改置换建议,则默认将值填入
|
||||
updateChangeSubtation(hsId);
|
||||
}else{
|
||||
loadingRegion(step2Vue.defaultCity);
|
||||
}
|
||||
},
|
||||
{
|
||||
provider:'baidu',
|
||||
@@ -1375,6 +1382,8 @@ function onPlusReady() {
|
||||
coordsType:'bd09ll'
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user