From 9a9438f8bec9163370ec46ab0158115e6eb9d8e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 25 Jun 2018 15:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/cardInfoPlaceholderImg.png | Bin 3430 -> 3004 bytes fangija-zsyf/js/log/log_stat.js | 8 +- fangija-zsyf/js/push-common.js | 146 ++++++++++-------------- 3 files changed, 62 insertions(+), 92 deletions(-) diff --git a/fangija-zsyf/cardInfoPlaceholderImg.png b/fangija-zsyf/cardInfoPlaceholderImg.png index 8b65c49531e07d66a0612c636660b5e7ee89385e..bf8a3e2c3a5a36f357e583a492b822184fc1627b 100644 GIT binary patch literal 3004 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 IM6N<$f^#vNVgLXD diff --git a/fangija-zsyf/js/log/log_stat.js b/fangija-zsyf/js/log/log_stat.js index d4e7d16..d306cc5 100644 --- a/fangija-zsyf/js/log/log_stat.js +++ b/fangija-zsyf/js/log/log_stat.js @@ -26,9 +26,9 @@ function savePageLog() { baidu_lng = p.coords.longitude; baidu_lat = p.coords.latitude; baidu_address = p.address.street; - doSavePageLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model, pushClientId:pushClientId}); + doSavePageLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL}); }, function(e){ - doSavePageLog({page:page, device:device, model:model, pushClientId:pushClientId}); + doSavePageLog({page:page, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL}); }, { provider:'baidu', @@ -61,9 +61,9 @@ function saveBehaviorLog(event,dataMap) { baidu_lng = p.coords.longitude; baidu_lat = p.coords.latitude; baidu_address = p.address.street; - doSaveBehaviorLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model,event:event,businessData:dataMap}); + doSaveBehaviorLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model,event:event,businessData:dataMap,channel:YOUFANG_CHANNEL}); }, function(e){ - doSaveBehaviorLog({page:page, device:device, model:model,event:event,businessData:dataMap}); + doSaveBehaviorLog({page:page, device:device, model:model,event:event,businessData:dataMap,channel:YOUFANG_CHANNEL}); }, { provider:'baidu', diff --git a/fangija-zsyf/js/push-common.js b/fangija-zsyf/js/push-common.js index 5dab9c5..f671e82 100644 --- a/fangija-zsyf/js/push-common.js +++ b/fangija-zsyf/js/push-common.js @@ -32,59 +32,43 @@ document.addEventListener("plusready", function() { if (payload.type == "0") { plus.ui.alert(title+"\n"+content); } else if (payload.type == "1") { - - 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, ["查看","忽略"] ); - + 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'); + } } else if (payload.type == "2") { if (payload.url.startWith("http")) { - - plus.nativeUI.confirm(content, function(e){ - if (e.index==0) { - clicked('views/webview_embed.html', true,false,{},{url:payload.url}) - } - }, title, ["查看","忽略"] ); - + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) } else { // 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面 // 否则就是打开app内部页面 - 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]; - } - } + 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) } - }, title, ["查看","忽略"] ); + } + clicked(openUrl,true,false,{},jsonData) } } @@ -92,57 +76,43 @@ document.addEventListener("plusready", function() { if (payload.type == "0") { plus.ui.alert(content); } else if (payload.type == "1") { - 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, ["查看","忽略"] ); + 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'); + } } else if (payload.type == "2") { if (payload.url.startWith("http")) { - - plus.nativeUI.confirm(content, function(e){ - if (e.index==0) { - clicked('views/webview_embed.html', true,false,{},{url:payload.url}) - } - }, title, ["查看","忽略"] ); - + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) } else { // 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面 // 否则就是打开app内部页面 - 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]; - } - } + 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) } - }, title, ["查看","忽略"] ); + } + clicked(openUrl,true,false,{},jsonData) }