diff --git a/fangija-zsyf/js/axiosPlugin.js b/fangija-zsyf/js/axiosPlugin.js index 531b3ee..bf0c8cc 100644 --- a/fangija-zsyf/js/axiosPlugin.js +++ b/fangija-zsyf/js/axiosPlugin.js @@ -1,6 +1,6 @@ axios.defaults.baseURL = BASE_PATH; axios.defaults.headers.post['Content-Type'] = 'application/json'; -axios.defaults.timeout = 15000; +axios.defaults.timeout = 120000; // 添加请求拦截器 axios.interceptors.request.use(function (config) { diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index e40e594..dab296b 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -12,6 +12,9 @@ var mapLoadCount = 0; function doAddCollect(){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); doAddCollect(); }) return; @@ -29,10 +32,9 @@ function addCollect(){ $(".collection01").hide(); $(".collection02").show(); $.toast("随时掌握小区动态"); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); } - plus.webview.getWebviewById('views/user/userInfo.html').reload(); - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + }) .catch(function (error) { console.log(error); @@ -47,6 +49,7 @@ function doRemoveCollect(){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ doRemoveCollect(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); }) return; } else { @@ -311,6 +314,8 @@ function showTrends(v){ clicked('../user/codeSms.html',true,false,{},{},function(){ showTrends(v); plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); }) return; } else { diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index bca5fe0..3fb27b6 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -198,6 +198,9 @@ function clickTrend(city, type){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ clickTrend(city, type); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); }) return; } else { @@ -542,6 +545,7 @@ function collectCity(city, type){ collectCity(city, type) plus.webview.getWebviewById('views/house/houseManageList.html').reload(); plus.webview.getWebviewById('views/user/userInfo.html').reload(); + //plus.webview.getWebviewById('views/house/houseDetail.html').reload(); }) return; } else { diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index 52a9a8f..09e3987 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -50,7 +50,7 @@ Vue.component('city_increase_ranking',{ follow:function(city,event, type){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ - clicked('/views/user/passLogin.html',true,false,{},{},function(){ + clicked('/views/user/codeSms.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ }else{ $.confirm('您确定要关注'+city+"?", function () { diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 342aa2f..5643018 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1845,7 +1845,9 @@ function checkIsLogin(){ }else{ addEvaluation(); - + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); } }) }else{ diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 130a8a0..75d3004 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -1280,7 +1280,6 @@ $.config = {router: false} loadMyCollectCity(); }, function(e){ - loadAllCityData(); loadMyCollectCity(); }, diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index 99d598f..a0c37fd 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -504,6 +504,9 @@ $(".collection").on("click", function () { function doCollect() { if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload() + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); doCollect(); }) return; @@ -533,7 +536,7 @@ function collect(){ $(".collection").removeClass("collection02") $(".collection i").removeClass("icon-collection02") } - plus.webview.getWebviewById('views/user/userInfo.html').reload() + } $.toast(msg); diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index ce512cf..69be1ef 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -1546,6 +1546,9 @@ function initNews(page){ } }) .then(function (response) { + if(page == 1){ + dataObj = [] + } //合并数组 if(response.data.data.list.length == 0){ //隐藏加载框 @@ -2226,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=="上海"){ @@ -2271,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(); @@ -2288,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'))