Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1
This commit is contained in:
@@ -28,9 +28,14 @@ function selectHouseInfoList(){
|
||||
var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap;
|
||||
var xqPotentialIndexMap = resultsMap.xqPotentialIndexMap;
|
||||
var houseInfoTotalMap = resultsMap.houseInfoTotalMap;
|
||||
//调整统计num的顺序
|
||||
mh_totalRecords = resultsMap.houseInfoPageList.totalRecords;
|
||||
tab.mh_num = mh_totalRecords;
|
||||
|
||||
if(resultList != null && resultList.length == 0){
|
||||
// 删除加载提示符
|
||||
$('#loadTip1').remove();
|
||||
$('#loadTip1').hide();
|
||||
//$('#loadTip1').remove();
|
||||
//$('.infinite-scroll-preloader').remove();
|
||||
// 加载完毕,则注销无限加载事件,以防不必要的加载
|
||||
//$.detachInfiniteScroll($('.infinite-scroll'));
|
||||
@@ -39,7 +44,8 @@ function selectHouseInfoList(){
|
||||
if(resultsMap.houseInfoPageList.currentPage == resultsMap.houseInfoPageList.totalPages){
|
||||
//如果此次查询刚好是page = totalPages
|
||||
// 删除加载提示符
|
||||
$('#loadTip1').remove();
|
||||
$('#loadTip1').hide();
|
||||
//$('#loadTip1').remove();
|
||||
//$('.infinite-scroll-preloader').remove();
|
||||
// 加载完毕,则注销无限加载事件,以防不必要的加载
|
||||
//$.detachInfiniteScroll($('.infinite-scroll'));
|
||||
@@ -57,8 +63,6 @@ function selectHouseInfoList(){
|
||||
mh_page = resultsMap.houseInfoPageList.currentPage;
|
||||
mh_pageSize = resultsMap.houseInfoPageList.limit;
|
||||
mh_totalPages = resultsMap.houseInfoPageList.totalPages;
|
||||
mh_totalRecords = resultsMap.houseInfoPageList.totalRecords;
|
||||
tab.mh_num = mh_totalRecords;
|
||||
mhAddItems(mh_itemsPerLoad, mh_lastIndex, dataObj, xqOneMonthUpDownRangeMap, xqPotentialIndexMap, houseInfoTotalMap);
|
||||
}).catch(function (error) {
|
||||
console.log(error);
|
||||
|
||||
@@ -75,13 +75,13 @@ function messageGoto(_this,operation,operationPage,mid){
|
||||
clicked('/views/message/detail.html',true,false,{},{mid:mid},function(){})
|
||||
}
|
||||
if(operation==1){
|
||||
// var pages = operationPage+'.html';
|
||||
var pages = operationPage+'.html';
|
||||
// if(plus.webview.getWebviewById(pages)==null){
|
||||
// plus.webview.create(pages, pages, subpage_style);
|
||||
// }
|
||||
// plus.webview.show(pages);
|
||||
mui.fire(plus.webview.getWebviewById('HBuilder'),'switchView',{
|
||||
name:"views/house/houseDetail.html"
|
||||
name:pages
|
||||
});
|
||||
}
|
||||
if(operation==2){
|
||||
|
||||
+5
-13
@@ -30,7 +30,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<nav class="mui-bar mui-bar-tab">
|
||||
<a class="mui-tab-item mui-active" id="defaultTab" href="yfindex.html">
|
||||
<a class="mui-tab-item mui-active" id="yfindex.html" href="yfindex.html">
|
||||
<span class="mui-icon iconfont icon-tab01"></span>
|
||||
<span class="mui-tab-label">首页</span>
|
||||
</a>
|
||||
@@ -132,8 +132,10 @@
|
||||
var title = document.getElementById("title");
|
||||
//选项卡点击事件
|
||||
mui('.mui-bar-tab').on('tap', 'a', function(e) {
|
||||
plus.nativeUI.showWaiting();
|
||||
var targetTab = this.getAttribute('href');
|
||||
if (targetTab == activeTab) {
|
||||
plus.nativeUI.closeWaiting();
|
||||
return;
|
||||
}
|
||||
//更换标题
|
||||
@@ -156,18 +158,7 @@
|
||||
plus.webview.hide(activeTab);
|
||||
//更改当前活跃的选项卡
|
||||
activeTab = targetTab;
|
||||
});
|
||||
//自定义事件,模拟点击“首页选项卡”
|
||||
document.addEventListener('gohome', function() {
|
||||
var defaultTab = document.getElementById("defaultTab");
|
||||
//模拟首页点击
|
||||
mui.trigger(defaultTab, 'tap');
|
||||
//切换选项卡高亮
|
||||
var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active");
|
||||
if (defaultTab !== current) {
|
||||
current.classList.remove('mui-active');
|
||||
defaultTab.classList.add('mui-active');
|
||||
}
|
||||
plus.nativeUI.closeWaiting();
|
||||
});
|
||||
|
||||
// 加载启动页信息
|
||||
@@ -223,6 +214,7 @@
|
||||
plus.webview.show(plus.webview.getWebviewById("HBuilder"));
|
||||
var targetTab = event.detail.name;
|
||||
if (targetTab == activeTab) {
|
||||
plus.webview.show(targetTab);
|
||||
return;
|
||||
}
|
||||
//若为iOS平台或非首次显示,则直接显示
|
||||
|
||||
@@ -137,7 +137,7 @@ function run(){
|
||||
if(time.innerHTML == 0 && isShow == false) {
|
||||
isShow = true;
|
||||
|
||||
if (localStorage.getItem("yf_guide_page_status") == null && JSON.parse(localStorage.getItem("guidePageUrls")).length > 0) {
|
||||
if (localStorage.getItem("yf_guide_page_status") == null && localStorage.getItem("guidePageUrls") != null && JSON.parse(localStorage.getItem("guidePageUrls")).length > 0) {
|
||||
$(".swiper-container").removeClass("dn");
|
||||
$(".swiper-container").swiper();
|
||||
localStorage.setItem("yf_guide_page_status", 1)
|
||||
|
||||
@@ -337,7 +337,8 @@ $(document).on('infinite', '.infinite-scroll',function() {
|
||||
// 加载完毕,则注销无限加载事件,以防不必要的加载
|
||||
//$.detachInfiniteScroll($('.infinite-scroll'));
|
||||
// 删除加载提示符
|
||||
$('#loadTip1').remove();
|
||||
//$('#loadTip1').remove();
|
||||
$('#loadTip1').hide();
|
||||
return;
|
||||
}
|
||||
//控制查询下一页的数据
|
||||
@@ -453,7 +454,8 @@ $(document).on("click",".confirm-ok", function () {
|
||||
$.toast(response.data.data);
|
||||
//删除后,如果需要调用checkIsLogin,需要所有的参数初始化
|
||||
//checkIsLogin();
|
||||
window.location.reload();
|
||||
//window.location.reload();
|
||||
initMyHouseParams();
|
||||
//删除房产会影响个人中心房产列表, 刷新
|
||||
/*if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
@@ -469,6 +471,24 @@ $(document).on("click",".confirm-ok", function () {
|
||||
$(".modal-text").css("text-align","center");
|
||||
});
|
||||
|
||||
//初始化分页参数, 防止回调时候重新请求出错
|
||||
function initMyHouseParams(){
|
||||
mh_loading = false;
|
||||
mh_page = undefined;
|
||||
var mh_pageSize = undefined;
|
||||
var mh_totalPages = undefined;
|
||||
var mh_totalRecords = undefined;
|
||||
var mh_lastIndex = undefined;
|
||||
var mh_itemsPerLoad = undefined;
|
||||
var mh_maxItems = 100;
|
||||
//清空构造的container
|
||||
$('#myhouse').html('');
|
||||
// 删除加载提示符
|
||||
$('#loadTip1').show();
|
||||
//加载我的房产
|
||||
selectHouseInfoList();
|
||||
}
|
||||
|
||||
function openSettingPage() {
|
||||
clicked('../setting/setting.html',true,false,{},{},function(){})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user