From 16490edb66822a21a2737e6c092e527217aebe66 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 20 Apr 2018 20:23:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/district/districtDetail.js | 11 ++++++++--- fangija-zsyf/js/quotations/cityDetail.js | 4 ++++ .../views/component/cityIncreaseRankingComponent.js | 2 +- fangija-zsyf/views/house/add.html | 4 +++- fangija-zsyf/views/house/houseDetail.html | 1 - fangija-zsyf/views/news/newsDetail.html | 5 ++++- 6 files changed, 20 insertions(+), 7 deletions(-) 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); From 8b34bc123e361ff9e68700c4d84bfacfb5f1ce23 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 20 Apr 2018 21:27:28 +0800 Subject: [PATCH 2/6] update --- fangija-zsyf/yfindex.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index ce512cf..e5b0960 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){ //隐藏加载框 From 95689b14f108c6006780aaefbde213f021742643 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Fri, 20 Apr 2018 22:22:19 +0800 Subject: [PATCH 3/6] aa --- fangija-zsyf/yfindex.html | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index ce512cf..9b66d98 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -2226,13 +2226,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 +2264,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 +2281,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')) From 7739f455e7a6a5bb6d9a44bb698334e98dfcd75e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Fri, 20 Apr 2018 22:22:42 +0800 Subject: [PATCH 4/6] add --- fangija-zsyf/js/axiosPlugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/js/axiosPlugin.js b/fangija-zsyf/js/axiosPlugin.js index 531b3ee..88a94f1 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 = 60000; // 添加请求拦截器 axios.interceptors.request.use(function (config) { From c696ebab6ad3e7048804fcc1e46bff89b91020e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Fri, 20 Apr 2018 22:47:51 +0800 Subject: [PATCH 5/6] add --- fangija-zsyf/js/axiosPlugin.js | 2 +- fangija-zsyf/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/js/axiosPlugin.js b/fangija-zsyf/js/axiosPlugin.js index 88a94f1..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 = 60000; +axios.defaults.timeout = 120000; // 添加请求拦截器 axios.interceptors.request.use(function (config) { diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index b0ed8bd..f6a4eeb 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -7,7 +7,7 @@ "id": "H5693FF3D",/*应用的标识,创建应用时自动生成,勿手动修改*/ "name": "有房",/*应用名称,程序桌面图标名称*/ "version": { - "name": "1.1",/*应用版本名称*/ + "name": "1.1.1",/*应用版本名称*/ "code": "20109" }, "description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/ From 4979cd5dd9ec1ba389a0f6a7fe751063809bb9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Fri, 20 Apr 2018 22:58:53 +0800 Subject: [PATCH 6/6] add --- fangija-zsyf/manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index f6a4eeb..8cf9750 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -276,9 +276,9 @@ "android": { "mdpi": "", /*普通屏启动图片,分辨率:240x282*/ "ldpi": "", - "hdpi": "E:/房价网/201804/启动页尺寸/android/启动页android高分屏.png", - "xhdpi": "E:/房价网/201804/启动页尺寸/android/启动页android-720P高分屏.png", - "xxhdpi": "E:/房价网/201804/启动页尺寸/android/启动页android-1080高分屏.png" + "hdpi": "E:/房价网/201804/安卓启动页/启动页android高分屏1.png", + "xhdpi": "E:/房价网/201804/安卓启动页/启动页android-720P高分屏2.png", + "xxhdpi": "E:/房价网/201804/安卓启动页/启动页android-1080高分屏3.png" } }, "plugins": {