From d931c74b71a94fd7d43c87f2973a4811cea93332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Thu, 5 Jul 2018 14:58:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/main.html | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index cb3d428..b136d2d 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -100,29 +100,11 @@ plus.navigator.setFullscreen(false); } else { - plus.geolocation.getCurrentPosition( - function(p){ - try { - city = p.address.city; - if(city){ - city = formatBaiduCity(city); - } - } catch(e){ - city = "上海"; - } - loadStartPage(city); - }, function(e){ - city = "上海"; - loadStartPage(city); - }, - { - provider:'baidu', - enableHighAccuracy:true, - coordsType:'bd09ll' - } - ); - - + var city = localStorage.getItem("init_city"); + if (city == null || city == "") { + city = "全国"; + } + loadStartPage(city); //显示启动导航 mui.openWindow({ id: 'guide', From 7821edafed1e3554db0ad83870130d69c8242b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Thu, 5 Jul 2018 16:36:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8E=A8=E9=80=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/push-common.js | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/fangija-zsyf/js/push-common.js b/fangija-zsyf/js/push-common.js index f671e82..6bc93d8 100644 --- a/fangija-zsyf/js/push-common.js +++ b/fangija-zsyf/js/push-common.js @@ -164,21 +164,26 @@ document.addEventListener("plusready", function() { } else if (payload.type == "2") { plus.nativeUI.confirm(content, function(e){ if (e.index==0) { - var url = payload.url; - var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?'); - var openUrl = url.substring(0, sindex); - var paramStr = url.substring(sindex+1); - var jsonData = {}; - var parray = paramStr.split('&') - for(var i=0;i 0) { - jsonData[subArray[0]] = subArray[1]; + if (payload.url.startWith("http")) { + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) + } else { + var url = payload.url; + var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?'); + var openUrl = url.substring(0, sindex); + var paramStr = url.substring(sindex+1); + var jsonData = {}; + var parray = paramStr.split('&') + for(var i=0;i 0) { + jsonData[subArray[0]] = subArray[1]; + } } } - } - clicked(openUrl,true,false,{},jsonData) + clicked(openUrl,true,false,{},jsonData) + } + } }, title, ["查看","忽略"] ); From 86c056ad7f2e4d26f5404b223e9d291e89a17cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Fri, 6 Jul 2018 11:33:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/ad_position_image.js | 4 ++++ fangija-zsyf/views/house/houseDetail.html | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/js/ad_position_image.js b/fangija-zsyf/js/ad_position_image.js index 755d4ac..3135ae4 100644 --- a/fangija-zsyf/js/ad_position_image.js +++ b/fangija-zsyf/js/ad_position_image.js @@ -4,6 +4,10 @@ function add_imgage(imageId,adPosition,device){ }).then(function(response){ if(response.data.status){ var h = response.data.data; + if (h == "" || h == null) { + return; + } + console.log(h); if(typeof(h.imgUrl)!="undefined"&&h.imgUrl!=null&&$.trim(h.imgUrl)!=""){ $("#"+imageId).attr("src",h.imgUrl); } diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 02bf3c8..ed4dfb9 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -1741,13 +1741,13 @@ function addFocus(city){ }else{ axios.get("/rest/quotations/collectCity",{params:{city:city,type:0}}).then(function(response){ - reloadMyFocus() - reloadCityIncreaseRanking() - reloadCityPotentialRanking() + if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) { plus.webview.getWebviewById('views/house/houseDetail.html').reload(); } - + /*reloadMyFocus() + reloadCityIncreaseRanking() + reloadCityPotentialRanking()*/ if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) { plus.webview.getWebviewById('views/house/houseManageList.html').reload(); } From 724e03b2e2e9a2e3d58b68091d3fb520727f4558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Fri, 6 Jul 2018 13:29:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/main.html | 1 - 1 file changed, 1 deletion(-) diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index b136d2d..f697965 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -316,7 +316,6 @@ }; } else { var imei = plus.device.imei; - alert(imei); data = { "account_id":8008196, "user_action_set_id":1106980650,