diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index fc576e7..c9c019c 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,2 +1,6 @@ /**服务端地址**/ -var BASE_PATH = "http://192.168.10.53:8084"; \ No newline at end of file +var BASE_PATH = "http://192.168.10.128:8084"; +//var BASE_PATH = "http://192.168.10.53:8084"; +//var BASE_PATH = "http://192.168.10.170:8084"; +/**是否显示过启动页面**/ +var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 3d449db..f644e82 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -693,7 +693,7 @@ input::-webkit-input-placeholder{ .topic .topicContent .topicContent_center div .icon.icon-menu04a{background:url(../images/icon-menu04a.png) no-repeat center center;background-size:100%;} .topic .topicContent .topicContent_center div .icon.icon-menu05a{background:url(../images/icon-menu05a.png) no-repeat center center;background-size:100%;} -.topic .topicContent .topicContent_center.home div{width:25%;border-left:none;} +.topic .topicContent .topicContent_center.home div{width:33%;border-left:none;} .topic .topicContent .topicContent_center.home div .icon{width:45px;height:45px;display:block;margin:0 auto;} .topic .topicContent .topicContent_center.home div .icon.icon-home01{background:url(../images/icon-home01.png) no-repeat center center;background-size:100%;} diff --git a/fangija-zsyf/images/icon-eye.png b/fangija-zsyf/images/icon-eye.png new file mode 100644 index 0000000..8d00c3a Binary files /dev/null and b/fangija-zsyf/images/icon-eye.png differ diff --git a/fangija-zsyf/js/push-common.js b/fangija-zsyf/js/push-common.js index fcdcdc4..1c9eb7d 100644 --- a/fangija-zsyf/js/push-common.js +++ b/fangija-zsyf/js/push-common.js @@ -3,7 +3,6 @@ * yinjihuan */ document.addEventListener("plusready", function() { - message = document.getElementById("message"); // 监听点击消息事件 plus.push.addEventListener("click", function(msg) { // 判断是从本地创建还是离线推送的消息 @@ -16,16 +15,38 @@ document.addEventListener("plusready", function() { break; default: if (plus.os.name == "Android"){ - payload = JSON.parse(payload); + try { + payload = JSON.parse(payload); + } catch(err) { + + } if (payload.type == "0") { plus.ui.alert(title+"\n"+content); } else if (payload.type == "1") { - plus.ui.alert(title+"\n"+content,function(){ - window.location.href = payload.url; - }); + 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"); + } + }); } else if (payload.type == "2") { plus.ui.alert(title+"\n"+content,function(){ - openUrl(basePath+'/message/openView?url='+payload.url); + openUrl(BASE_PATH+'/message/openView?url='+payload.url); }); } } else { @@ -33,11 +54,29 @@ document.addEventListener("plusready", function() { plus.ui.alert(content); } else if (payload.type == "1") { plus.ui.alert(content,function(){ - window.location.href = payload.url; - }); + 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"); + } + }); } else if (payload.type == "2") { plus.ui.alert(content,function(){ - openUrl(basePath+'/message/openView?url='+payload.url); + openUrl(BASE_PATH+'/message/openView?url='+payload.url); }); } } @@ -55,12 +94,35 @@ document.addEventListener("plusready", function() { plus.ui.alert(title+"\n"+content); } else if (payload.type == "1") { plus.ui.alert(title+"\n"+content,function(){ - window.location.href = payload.url; + 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"); + } }); } else if (payload.type == "2") { plus.ui.alert(title+"\n"+content,function(){ - openUrl(basePath+'/message/openView?url='+payload.url); + openUrl(BASE_PATH+'/message/openView?url='+payload.url); }); } }, false); -}, false); \ No newline at end of file +}, false); + +function openUrl(url){ + clicked(url,true); +} \ No newline at end of file diff --git a/fangija-zsyf/js/updateVersion/updateVersion.js b/fangija-zsyf/js/updateVersion/updateVersion.js new file mode 100644 index 0000000..69cfb64 --- /dev/null +++ b/fangija-zsyf/js/updateVersion/updateVersion.js @@ -0,0 +1,80 @@ +var versionUpdate = function(){ + var isAndroid = isAndroidUser(); + plus.runtime.getProperty(plus.runtime.appid, function(inf) { + var localVersion =inf.version; + var curVersion = versionInfo(); + if(parseFloat(localVersion) + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/start.html b/fangija-zsyf/start.html new file mode 100644 index 0000000..8361135 --- /dev/null +++ b/fangija-zsyf/start.html @@ -0,0 +1,71 @@ + + + + + + 掌上有房 + + + + + + + + + + + + + + +
+
+
+ 跳过 5 + + +
+
+
+ + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index f89782f..5295e2e 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -48,6 +48,7 @@ + @@ -93,10 +94,10 @@ 房价查询 -
+
@@ -105,7 +106,10 @@
{{todayDate}}
-
+
+ +
+ + +
+
+
@@ -1418,11 +1425,13 @@ $.config = {router: false} + +