From 8f0b69f6fca1cd6647058cb013efc0b8b97c928f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 21 May 2018 11:56:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=89=93=E5=BC=80app?= =?UTF-8?q?=E4=B8=AD=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/push-common.js | 65 +++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 9 deletions(-) diff --git a/fangija-zsyf/js/push-common.js b/fangija-zsyf/js/push-common.js index f56b582..f5a5c82 100644 --- a/fangija-zsyf/js/push-common.js +++ b/fangija-zsyf/js/push-common.js @@ -1,3 +1,8 @@ + String.prototype.startWith=function(str){ + var reg=new RegExp("^"+str); + return reg.test(this); +} + /** * 推送处理业务逻辑 * yinjihuan @@ -71,9 +76,32 @@ document.addEventListener("plusready", function() { } }); } else if (payload.type == "2") { - plus.ui.alert(content,function(){ - clicked('views/webview_embed.html', true,false,{},{url:payload.url}) - }); + if (payload.url.startWith("http")) { + plus.ui.alert(content,function(){ + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) + }); + } else { + // 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面 + // 否则就是打开app内部页面 + plus.ui.alert(content,function(){ + 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) + }); + } + } } @@ -116,13 +144,32 @@ document.addEventListener("plusready", function() { } }); } else if (payload.type == "2") { - plus.ui.alert(title+"\n"+content,function(){ - openUrl(BASE_PATH+'/message/openView?url='+payload.url); - }); + if (payload.url.startWith("http")) { + plus.ui.alert(content,function(){ + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) + }); + } else { + // 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面 + // 否则就是打开app内部页面 + plus.ui.alert(content,function(){ + 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) + }); + } } }, false); }, false); -function openUrl(url){ - clicked(url,true); -} \ No newline at end of file