From: guangchao.xu Date: Thu, 16 Jul 2020 02:35:20 +0000 (+0800) Subject: 更多页面 图标增加 推送不同页面功能添加 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=5f13fea49d1890ac783df2420e9594fd7ee5c6cf;p=dali_platform%2Fmobile.git 更多页面 图标增加 推送不同页面功能添加 --- diff --git a/.gitignore b/.gitignore index d360db4..8551853 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,5 @@ typings/ # ide .idea/* + +!.idea/* \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..78c2369 Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..16dedfe --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e208459 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..fa7d7ab --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/mobile.iml b/.idea/modules/mobile.iml new file mode 100644 index 0000000..3ad4925 --- /dev/null +++ b/.idea/modules/mobile.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..bde36b6 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1594101478069 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/img/icon_attendance.png b/www/img/icon_attendance.png new file mode 100644 index 0000000..83f9f1d Binary files /dev/null and b/www/img/icon_attendance.png differ diff --git a/www/img/icon_conference.png b/www/img/icon_conference.png new file mode 100644 index 0000000..53cb52b Binary files /dev/null and b/www/img/icon_conference.png differ diff --git a/www/js/mainmenu.js b/www/js/mainmenu.js index eacec44..a8a5e2d 100644 --- a/www/js/mainmenu.js +++ b/www/js/mainmenu.js @@ -8,16 +8,32 @@ var app = { console.log(event.registrationId) }, false) document.addEventListener("jpush.openNotification", function (event) { - var refno + var refno,msgtype + var userid = window.localStorage.getItem("userid"); + var baseUrl = "https://yy.dlsmk.cn/wisdompolice/app" console.log("openNotify:"+event); if(device.platform == "Android") { - refno = event.extras.refno + msgtype = event.extras.msgtype + if (msgtype ==="conference"){ + window.location= baseUrl + "/conference/signupconference?custid="+userid; + }else if(msgtype ==="atte1"){ + window.location= baseUrl + "/atte/reviewindex?custid="+userid; + }else if(msgtype ==="atte2"){ + window.location= baseUrl + "/atte/searchindex?custid="+userid; + }else if(msgtype ==="atte3"){ + window.location= baseUrl + "/atte/reviewClock?custid="+userid; + }else if(msgtype ==="atte4"){ + window.location= baseUrl + "/atte/clockhisindex?custid="+userid; + }else{ + refno = event.extras.refno + app.openBill(refno); + } } else { refno = event.refno window.JPush.setApplicationIconBadgeNumber(0); + app.openBill(refno); } - app.openBill(refno); - console.log("openNotify:"+refno); + //console.log("openNotify:"+refno); }, false) }, openBill:function(billno){ diff --git a/www/js/more.js b/www/js/more.js index bd4cc2a..6c41713 100644 --- a/www/js/more.js +++ b/www/js/more.js @@ -34,11 +34,16 @@ var app = { //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid); showRet("https://yy.dlsmk.cn/wisdompolice/app/doordtl?custid="+userid); }) - $("#moreBtn8").click(function(){ + $("#moreBtn8").click(function(){ //考勤记录 //window.location = "more.html"; //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid); - showRet("https://yy.dlsmk.cn/wisdompolice/app/doordtl?custid="+userid); + showRet("https://yy.dlsmk.cn/wisdompolice/app/attedtl?custid="+userid); }) + $("#moreBtn9").click(function(){ //会议记录 + //window.location = "more.html"; + //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid); + showRet("https://yy.dlsmk.cn/wisdompolice/app/conference/conferencedtl?custid="+userid); + }) $("#moreBtn2").click(function(){ //window.location = "more.html"; //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid); diff --git a/www/more.html b/www/more.html index 72f6702..a97d9d6 100644 --- a/www/more.html +++ b/www/more.html @@ -51,12 +51,16 @@
-
其他记录
+
门禁记录
-