diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css
index 8067a11..fd42d82 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 647943c..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,13 +15,35 @@ 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(BASE_PATH+'/message/openView?url='+payload.url);
@@ -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,7 +94,26 @@ 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(){
@@ -63,4 +121,8 @@ document.addEventListener("plusready", function() {
});
}
}, 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/main.html b/fangija-zsyf/main.html
index 0724f32..5e42f54 100644
--- a/fangija-zsyf/main.html
+++ b/fangija-zsyf/main.html
@@ -29,7 +29,8 @@
-
+
+
+
+
+
+
+
+
+