diff --git a/fangija-zsyf/js/push-common.js b/fangija-zsyf/js/push-common.js index f67f1be..5dab9c5 100644 --- a/fangija-zsyf/js/push-common.js +++ b/fangija-zsyf/js/push-common.js @@ -32,96 +32,118 @@ document.addEventListener("plusready", function() { if (payload.type == "0") { plus.ui.alert(title+"\n"+content); } else if (payload.type == "1") { - plus.ui.alert(title+"\n"+content,function(){ - if(plus.webview.getWebviewById('H5693FF3D')==null){ - plus.webview.show(plus.webview.getWebviewById("HBuilder")); - }else{ - plus.webview.show(plus.webview.getWebviewById("H5693FF3D")); - } - var targetTab = payload.url+".html"; - var defaultTab = document.getElementById(targetTab); - //模拟首页点击 - 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.confirm(content, function(e){ + if (e.index==0) { + if(plus.webview.getWebviewById('H5693FF3D')==null){ + plus.webview.show(plus.webview.getWebviewById("HBuilder")); + }else{ + plus.webview.show(plus.webview.getWebviewById("H5693FF3D")); + } + var targetTab = payload.url+".html"; + var defaultTab = document.getElementById(targetTab); + //模拟首页点击 + 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'); + } } - }); + }, title, ["查看","忽略"] ); + + } else if (payload.type == "2") { if (payload.url.startWith("http")) { - plus.ui.alert(title+"\n"+content,function(){ - clicked('views/webview_embed.html', true,false,{},{url:payload.url}) - }); + + plus.nativeUI.confirm(content, function(e){ + if (e.index==0) { + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) + } + }, title, ["查看","忽略"] ); + } 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]; + 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]; + } } } + clicked(openUrl,true,false,{},jsonData) } - clicked(openUrl,true,false,{},jsonData) - }); + }, title, ["查看","忽略"] ); + } } } else { if (payload.type == "0") { plus.ui.alert(content); } else if (payload.type == "1") { - plus.ui.alert(title+"\n"+content,function(){ - if(plus.webview.getWebviewById('H5693FF3D')==null){ - plus.webview.show(plus.webview.getWebviewById("HBuilder")); - }else{ - plus.webview.show(plus.webview.getWebviewById("H5693FF3D")); - } - var targetTab = payload.url+".html"; - var defaultTab = document.getElementById(targetTab); - //模拟首页点击 - 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.confirm(content, function(e){ + if (e.index==0) { + if(plus.webview.getWebviewById('H5693FF3D')==null){ + plus.webview.show(plus.webview.getWebviewById("HBuilder")); + }else{ + plus.webview.show(plus.webview.getWebviewById("H5693FF3D")); + } + var targetTab = payload.url+".html"; + var defaultTab = document.getElementById(targetTab); + //模拟首页点击 + 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'); + } } - }); + }, title, ["查看","忽略"] ); + } else if (payload.type == "2") { if (payload.url.startWith("http")) { - plus.ui.alert(content,function(){ - clicked('views/webview_embed.html', true,false,{},{url:payload.url}) - }); + + plus.nativeUI.confirm(content, function(e){ + if (e.index==0) { + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) + } + }, title, ["查看","忽略"] ); + } 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]; + 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]; + } } } + clicked(openUrl,true,false,{},jsonData) } - clicked(openUrl,true,false,{},jsonData) - }); + }, title, ["查看","忽略"] ); + } } @@ -143,38 +165,36 @@ document.addEventListener("plusready", function() { if (payload.type == "0") { plus.ui.alert(title+"\n"+content); } else if (payload.type == "1") { - plus.ui.alert(title+"\n"+content,function(){ - if (payload.url == '/house/index') { - plus.webview.show('yfindex.html'); - } else { - plus.webview.show(BASE_PATH + payload.url); - } - //切换选项卡高亮 - var defaultTab = document.getElementById("defaultTab"); - var quotations = document.getElementById("quotations"); - var selfInfo = document.getElementById("selfInfo"); - defaultTab.classList.remove("mui-active"); - quotations.classList.remove("mui-active"); - selfInfo.classList.remove("mui-active"); - if (payload.url == '/quotations/index') { - quotations.classList.add("mui-active"); - } else if(payload.url == '/selfInfo/index') { - selfInfo.classList.add("mui-active"); - } else { - defaultTab.classList.add("mui-active"); - } - }); + plus.nativeUI.confirm(content, function(e){ + if (e.index==0) { + if (payload.url == '/house/index') { + plus.webview.show('yfindex.html'); + } else { + plus.webview.show(BASE_PATH + payload.url); + } + + //切换选项卡高亮 + var defaultTab = document.getElementById("defaultTab"); + var quotations = document.getElementById("quotations"); + var selfInfo = document.getElementById("selfInfo"); + defaultTab.classList.remove("mui-active"); + quotations.classList.remove("mui-active"); + selfInfo.classList.remove("mui-active"); + if (payload.url == '/quotations/index') { + quotations.classList.add("mui-active"); + } else if(payload.url == '/selfInfo/index') { + selfInfo.classList.add("mui-active"); + } else { + defaultTab.classList.add("mui-active"); + } + } + }, title, ["查看","忽略"] ); + } else if (payload.type == "2") { - 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; + 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); @@ -189,8 +209,9 @@ document.addEventListener("plusready", function() { } } clicked(openUrl,true,false,{},jsonData) - }); - } + } + }, title, ["查看","忽略"] ); + } }, false); }, false); diff --git a/fangija-zsyf/js/updateVersion/updateVersion.js b/fangija-zsyf/js/updateVersion/updateVersion.js index 179a24f..99b57a0 100644 --- a/fangija-zsyf/js/updateVersion/updateVersion.js +++ b/fangija-zsyf/js/updateVersion/updateVersion.js @@ -57,7 +57,7 @@ var versionInfo = function(){ //下载后安装 var downApp = function(){ var url="http://app.fangjia.com/download/youfang.apk"; //下载文件地址 - plus.nativeUI.showWaiting("下载apk文件..."); + plus.nativeUI.showWaiting("版本更新中..."); var dtask = plus.downloader.createDownload( url, {}, function ( d, status ) { if (status == 200) { //下载成功