From: qiaowei <jov123@163.com>
Date: Sun, 28 Jun 2020 09:41:21 +0000 (+0800)
Subject: 包名问题
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=98635db0eb006c7df03bbb712d2fbd54cacb3cf2;p=dali_platform%2Fmobile.git

包名问题
---

diff --git a/config.xml b/config.xml
index 9b650e6..409322b 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.dalicitycard.app" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.dalipolice.app" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name short="大理智警">dlapp</name>
     <description>
         A sample Apache Cordova application that responds to the deviceready event.
diff --git a/package.json b/package.json
index 5d65b05..e39792b 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "com.dalicitycard.app",
+  "name": "com.dalipolice.app",
   "displayName": "大理市民卡",
   "version": "1.0.3",
   "description": "A sample Apache Cordova application that responds to the deviceready event.",
@@ -49,7 +49,7 @@
       "cordova-plugin-device": {},
       "cordova-plugin-themeablebrowser": {},
       "jpush-phonegap-plugin": {
-        "APP_KEY": "d644d997f2cab0551ff704a3",
+        "APP_KEY": "1fc62c8c6204ec4b0ae65ee2",
         "CHANNEL": "developer-default"
       },
       "cordova-plugin-app-version": {},
diff --git a/platforms/android/android.json b/platforms/android/android.json
index f684e89..eb6d7bb 100644
--- a/platforms/android/android.json
+++ b/platforms/android/android.json
@@ -101,11 +101,11 @@
               "count": 2
             },
             {
-              "xml": "<permission android:name=\"com.dalicitycard.app.permission.JPUSH_MESSAGE\" android:protectionLevel=\"signature\" />",
+              "xml": "<permission android:name=\"com.dalipolice.app.permission.JPUSH_MESSAGE\" android:protectionLevel=\"signature\" />",
               "count": 1
             },
             {
-              "xml": "<uses-permission android:name=\"com.dalicitycard.app.permission.JPUSH_MESSAGE\" />",
+              "xml": "<uses-permission android:name=\"com.dalipolice.app.permission.JPUSH_MESSAGE\" />",
               "count": 1
             },
             {
@@ -185,7 +185,7 @@
               "count": 1
             },
             {
-              "xml": "<activity android:configChanges=\"orientation|keyboardHidden\" android:exported=\"false\" android:name=\"cn.jpush.android.ui.PushActivity\" android:theme=\"@android:style/Theme.NoTitleBar\"><intent-filter><action android:name=\"cn.jpush.android.ui.PushActivity\" /><category android:name=\"android.intent.category.DEFAULT\" /><category android:name=\"com.dalicitycard.app\" /></intent-filter></activity>",
+              "xml": "<activity android:configChanges=\"orientation|keyboardHidden\" android:exported=\"false\" android:name=\"cn.jpush.android.ui.PushActivity\" android:theme=\"@android:style/Theme.NoTitleBar\"><intent-filter><action android:name=\"cn.jpush.android.ui.PushActivity\" /><category android:name=\"android.intent.category.DEFAULT\" /><category android:name=\"com.dalipolice.app\" /></intent-filter></activity>",
               "count": 1
             },
             {
@@ -193,19 +193,19 @@
               "count": 1
             },
             {
-              "xml": "<provider android:authorities=\"com.dalicitycard.app.DataProvider\" android:exported=\"false\" android:name=\"cn.jpush.android.service.DataProvider\" android:process=\":pushcore\" />",
+              "xml": "<provider android:authorities=\"com.dalipolice.app.DataProvider\" android:exported=\"false\" android:name=\"cn.jpush.android.service.DataProvider\" android:process=\":pushcore\" />",
               "count": 1
             },
             {
-              "xml": "<service android:enabled=\"true\" android:exported=\"true\" android:name=\"cn.jpush.android.service.DaemonService\"><intent-filter><action android:name=\"cn.jpush.android.intent.DaemonService\" /><category android:name=\"com.dalicitycard.app\" /></intent-filter></service>",
+              "xml": "<service android:enabled=\"true\" android:exported=\"true\" android:name=\"cn.jpush.android.service.DaemonService\"><intent-filter><action android:name=\"cn.jpush.android.intent.DaemonService\" /><category android:name=\"com.dalipolice.app\" /></intent-filter></service>",
               "count": 1
             },
             {
-              "xml": "<provider android:authorities=\"com.dalicitycard.app.DownloadProvider\" android:exported=\"true\" android:name=\"cn.jpush.android.service.DownloadProvider\" />",
+              "xml": "<provider android:authorities=\"com.dalipolice.app.DownloadProvider\" android:exported=\"true\" android:name=\"cn.jpush.android.service.DownloadProvider\" />",
               "count": 1
             },
             {
-              "xml": "<receiver android:enabled=\"true\" android:exported=\"false\" android:name=\"cn.jpush.android.service.PushReceiver\"><intent-filter android:priority=\"1000\"><action android:name=\"cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY\" /><category android:name=\"com.dalicitycard.app\" /></intent-filter><intent-filter><action android:name=\"android.intent.action.USER_PRESENT\" /><action android:name=\"android.net.conn.CONNECTIVITY_CHANGE\" /></intent-filter><intent-filter><action android:name=\"android.intent.action.PACKAGE_ADDED\" /><action android:name=\"android.intent.action.PACKAGE_REMOVED\" /><data android:scheme=\"package\" /></intent-filter></receiver>",
+              "xml": "<receiver android:enabled=\"true\" android:exported=\"false\" android:name=\"cn.jpush.android.service.PushReceiver\"><intent-filter android:priority=\"1000\"><action android:name=\"cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY\" /><category android:name=\"com.dalipolice.app\" /></intent-filter><intent-filter><action android:name=\"android.intent.action.USER_PRESENT\" /><action android:name=\"android.net.conn.CONNECTIVITY_CHANGE\" /></intent-filter><intent-filter><action android:name=\"android.intent.action.PACKAGE_ADDED\" /><action android:name=\"android.intent.action.PACKAGE_REMOVED\" /><data android:scheme=\"package\" /></intent-filter></receiver>",
               "count": 1
             },
             {
@@ -213,11 +213,11 @@
               "count": 1
             },
             {
-              "xml": "<receiver android:name=\"cn.jiguang.cordova.push.JPushEventReceiver\"><intent-filter><action android:name=\"cn.jpush.android.intent.RECEIVE_MESSAGE\" /><category android:name=\"com.dalicitycard.app\" /></intent-filter></receiver>",
+              "xml": "<receiver android:name=\"cn.jiguang.cordova.push.JPushEventReceiver\"><intent-filter><action android:name=\"cn.jpush.android.intent.RECEIVE_MESSAGE\" /><category android:name=\"com.dalipolice.app\" /></intent-filter></receiver>",
               "count": 1
             },
             {
-              "xml": "<activity android:exported=\"true\" android:name=\"cn.jpush.android.service.JNotifyActivity\" android:taskAffinity=\"jpush.custom\" android:theme=\"@android:style/Theme.Translucent.NoTitleBar\"><intent-filter><action android:name=\"cn.jpush.android.intent.JNotifyActivity\" /><category android:name=\"com.dalicitycard.app\" /></intent-filter></activity>",
+              "xml": "<activity android:exported=\"true\" android:name=\"cn.jpush.android.service.JNotifyActivity\" android:taskAffinity=\"jpush.custom\" android:theme=\"@android:style/Theme.Translucent.NoTitleBar\"><intent-filter><action android:name=\"cn.jpush.android.intent.JNotifyActivity\" /><category android:name=\"com.dalipolice.app\" /></intent-filter></activity>",
               "count": 1
             },
             {
@@ -225,7 +225,7 @@
               "count": 1
             },
             {
-              "xml": "<receiver android:enabled=\"true\" android:exported=\"false\" android:name=\"cn.jiguang.cordova.push.JPushReceiver\"><intent-filter><action android:name=\"cn.jpush.android.intent.REGISTRATION\" /><action android:name=\"cn.jpush.android.intent.MESSAGE_RECEIVED\" /><action android:name=\"cn.jpush.android.intent.NOTIFICATION_RECEIVED\" /><action android:name=\"cn.jpush.android.intent.NOTIFICATION_OPENED\" /><action android:name=\"cn.jpush.android.intent.CONNECTION\" /><category android:name=\"com.dalicitycard.app\" /></intent-filter></receiver>",
+              "xml": "<receiver android:enabled=\"true\" android:exported=\"false\" android:name=\"cn.jiguang.cordova.push.JPushReceiver\"><intent-filter><action android:name=\"cn.jpush.android.intent.REGISTRATION\" /><action android:name=\"cn.jpush.android.intent.MESSAGE_RECEIVED\" /><action android:name=\"cn.jpush.android.intent.NOTIFICATION_RECEIVED\" /><action android:name=\"cn.jpush.android.intent.NOTIFICATION_OPENED\" /><action android:name=\"cn.jpush.android.intent.CONNECTION\" /><category android:name=\"com.dalipolice.app\" /></intent-filter></receiver>",
               "count": 1
             },
             {
@@ -233,7 +233,7 @@
               "count": 1
             },
             {
-              "xml": "<meta-data android:name=\"JPUSH_APPKEY\" android:value=\"d644d997f2cab0551ff704a3\" />",
+              "xml": "<meta-data android:name=\"JPUSH_APPKEY\" android:value=\"1fc62c8c6204ec4b0ae65ee2\" />",
               "count": 1
             },
             {
@@ -267,61 +267,61 @@
   },
   "installed_plugins": {
     "cordova-plugin-add-swift-support": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-touch-id": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-whitelist": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-file": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-advanced-http": {
       "OKHTTP_VERSION": "3.10.0",
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-statusbar": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-disable-ios11-statusbar": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-qrscanner": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-camera": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-inappbrowser": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-device": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-themeablebrowser": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-jcore": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "jpush-phonegap-plugin": {
-      "APP_KEY": "d644d997f2cab0551ff704a3",
+      "APP_KEY": "1fc62c8c6204ec4b0ae65ee2",
       "CHANNEL": "developer-default",
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-app-version": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-wkwebview-engine": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-brightness": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     },
     "cordova-plugin-fingerprint-aio": {
-      "PACKAGE_NAME": "com.dalicitycard.app"
+      "PACKAGE_NAME": "com.dalipolice.app"
     }
   },
   "dependent_plugins": {},
diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle
index e4b404a..31d4b5c 100644
--- a/platforms/android/app/build.gradle
+++ b/platforms/android/app/build.gradle
@@ -166,7 +166,7 @@ task cdvPrintProps {
 
 android {
     defaultConfig {
-        applicationId 'com.dalicitycard.app'
+        applicationId 'com.dalipolice.app'
         if (cdvMinSdkVersion != null) {
             minSdkVersion cdvMinSdkVersion
         }
@@ -174,8 +174,8 @@ android {
         ndk {
             abiFilters "armeabi"
         }
-        versionCode 13
-        versionName '1.4.0'
+        versionCode 14
+        versionName '1.4.1'
         targetSdkVersion 28
     }
     lintOptions {
diff --git a/platforms/android/app/src/main/AndroidManifest.xml b/platforms/android/app/src/main/AndroidManifest.xml
index 3238e12..b7ece77 100644
--- a/platforms/android/app/src/main/AndroidManifest.xml
+++ b/platforms/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="10006" android:versionName="1.0.6" package="com.dalicitycard.app" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="10006" android:versionName="1.0.6" package="com.dalipolice.app" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <application android:hardwareAccelerated="true" android:icon="@mipmap/ic_launcher" android:label="@string/launcher_name" android:supportsRtl="true" android:usesCleartextTraffic="true">
         <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">
@@ -16,7 +16,7 @@
             <intent-filter>
                 <action android:name="cn.jpush.android.ui.PushActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.app" />
             </intent-filter>
         </activity>
         <service android:exported="false" android:name="cn.jpush.android.service.PushService" android:process=":pushcore">
@@ -27,18 +27,18 @@
                 <action android:name="cn.jpush.android.intent.PUSH_TIME" />
             </intent-filter>
         </service>
-        <provider android:authorities="com.dalicitycard.app.DataProvider" android:exported="false" android:name="cn.jpush.android.service.DataProvider" android:process=":pushcore" />
+        <provider android:authorities="com.dalipolice.app.DataProvider" android:exported="false" android:name="cn.jpush.android.service.DataProvider" android:process=":pushcore" />
         <service android:enabled="true" android:exported="true" android:name="cn.jpush.android.service.DaemonService">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.DaemonService" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.app" />
             </intent-filter>
         </service>
-        <provider android:authorities="com.dalicitycard.app.DownloadProvider" android:exported="true" android:name="cn.jpush.android.service.DownloadProvider" />
+        <provider android:authorities="com.dalipolice.app.DownloadProvider" android:exported="true" android:name="cn.jpush.android.service.DownloadProvider" />
         <receiver android:enabled="true" android:exported="false" android:name="cn.jpush.android.service.PushReceiver">
             <intent-filter android:priority="1000">
                 <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.app" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.USER_PRESENT" />
@@ -54,13 +54,13 @@
         <receiver android:name="cn.jiguang.cordova.push.JPushEventReceiver">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.app" />
             </intent-filter>
         </receiver>
         <activity android:exported="true" android:name="cn.jpush.android.service.JNotifyActivity" android:taskAffinity="jpush.custom" android:theme="@android:style/Theme.Translucent.NoTitleBar">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.JNotifyActivity" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.app" />
             </intent-filter>
         </activity>
         <service android:name="cn.jiguang.cordova.push.PushService" android:process=":pushcore">
@@ -75,11 +75,11 @@
                 <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
                 <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" />
                 <action android:name="cn.jpush.android.intent.CONNECTION" />
-                <category android:name="com.dalicitycard.app" />
+                <category android:name="com.dalipolice.app" />
             </intent-filter>
         </receiver>
         <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
-        <meta-data android:name="JPUSH_APPKEY" android:value="d644d997f2cab0551ff704a3" />
+        <meta-data android:name="JPUSH_APPKEY" android:value="1fc62c8c6204ec4b0ae65ee2" />
         <activity android:exported="true" android:name="de.niklasmerz.cordova.biometric.BiometricActivity" android:theme="@style/TransparentTheme" />
     </application>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -87,8 +87,8 @@
     <uses-feature android:name="android.hardware.camera" android:required="false" />
     <uses-feature android:name="android.hardware.camera.front" android:required="false" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <permission android:name="com.dalicitycard.app.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
-    <uses-permission android:name="com.dalicitycard.app.permission.JPUSH_MESSAGE" />
+    <permission android:name="com.dalipolice.app.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
+    <uses-permission android:name="com.dalipolice.app.permission.JPUSH_MESSAGE" />
     <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java b/platforms/android/app/src/main/java/com/dalipolice/app/MainActivity.java
similarity index 97%
rename from platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java
rename to platforms/android/app/src/main/java/com/dalipolice/app/MainActivity.java
index 7b7fe6b..9682df9 100644
--- a/platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java
+++ b/platforms/android/app/src/main/java/com/dalipolice/app/MainActivity.java
@@ -17,7 +17,7 @@
        under the License.
  */
 
-package com.dalicitycard.app;
+package com.dalipolice.app;
 
 import android.os.Bundle;
 import org.apache.cordova.*;
diff --git a/platforms/android/app/src/main/res/xml/config.xml b/platforms/android/app/src/main/res/xml/config.xml
index 1cae32d..ca7b3a0 100644
--- a/platforms/android/app/src/main/res/xml/config.xml
+++ b/platforms/android/app/src/main/res/xml/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.dalicitycard.app" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.dalipolice.app" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="Whitelist">
         <param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
         <param name="onload" value="true" />
diff --git a/www/img/icon_more5.png b/www/img/icon_more5.png
new file mode 100644
index 0000000..2d13b94
Binary files /dev/null and b/www/img/icon_more5.png differ
diff --git a/www/img/icon_more6.png b/www/img/icon_more6.png
new file mode 100644
index 0000000..04b56f2
Binary files /dev/null and b/www/img/icon_more6.png differ
diff --git a/www/img/icon_more7.png b/www/img/icon_more7.png
new file mode 100644
index 0000000..eb900f0
Binary files /dev/null and b/www/img/icon_more7.png differ
diff --git a/www/img/icon_reauth.png b/www/img/icon_reauth.png
deleted file mode 100644
index 5b18a42..0000000
Binary files a/www/img/icon_reauth.png and /dev/null differ
diff --git a/www/js/main.js b/www/js/main.js
index 78b896f..9009475 100644
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -44,6 +44,7 @@ var app = {
           }
          });
         var uid = window.localStorage.getItem("uid");
+
         window.JPush.setAlias({ sequence: 1, alias: uid },
           (result) => {
             var sequence = result.sequence
@@ -58,6 +59,7 @@ var app = {
 
     onDeviceReady: function() {
         var uid = window.localStorage.getItem("token");
+        console.log("1."+window.localStorage.getItem("uid"))
         this.initJpush();
         $('#scanBtn').click(function() {
             //window.location = "scan.html";
diff --git a/www/js/mainmenu.js b/www/js/mainmenu.js
index eacec44..7a98ae0 100644
--- a/www/js/mainmenu.js
+++ b/www/js/mainmenu.js
@@ -58,6 +58,7 @@ var app = {
 
     onDeviceReady: function() {
         var uid = window.localStorage.getItem("token");
+        console.log("1."+window.localStorage.getItem("uid"))
         this.initJpush();
         $('#scanBtn').click(function() {
             //window.location = "scan.html";
diff --git a/www/js/more.js b/www/js/more.js
index 0251b0d..bd4cc2a 100644
--- a/www/js/more.js
+++ b/www/js/more.js
@@ -12,23 +12,39 @@ var app = {
         });
         $("#moreBtn1").click(function(){
             //window.location = "more.html";
-            showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/atte/addindex?custid="+userid);
         })
-        $("#moreBtn2").click(function(){
+        $("#moreBtn4").click(function(){
             //window.location = "more.html";
             //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
-            alert("暂未开通");
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/atte/clockindex?custid="+userid);
         })
-        $("#moreBtn4").click(function(){
+        $("#moreBtn5").click(function(){
             //window.location = "more.html";
             //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
-            showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/atte/reviewindex?custid="+userid);
         })
-        $("#moreBtn5").click(function(){
+        $("#moreBtn6").click(function(){
+            //window.location = "more.html";
+            //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/atte/reviewClock?custid="+userid);
+        })
+        $("#moreBtn7").click(function(){
             //window.location = "more.html";
             //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
-            showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/doordtl?custid="+userid);
         })
+        $("#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);
+        })
+        $("#moreBtn2").click(function(){
+            //window.location = "more.html";
+            //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
+            showRet("https://yy.dlsmk.cn/wisdompolice/app/conference/attendconference?custid="+userid);
+        })
+
     },
    
 };
diff --git a/www/more.html b/www/more.html
index a3bf7a7..72f6702 100644
--- a/www/more.html
+++ b/www/more.html
@@ -24,26 +24,38 @@
     <section class="aui-grid aui-margin-b-15">
         <p style="padding:10px;color:#000;font-size: 0.8rem">考勤</p>
         <div class="aui-row">
-            <div class="aui-col-xs-4" id="moreBtn1">
+            <div class="aui-col-xs-3" id="moreBtn1">
                <div class="center-in"><img src="img/icon_qj.png" style="width:28px;height: 28px"></div>
                <div class="aui-grid-label" style="margin-top:10px;">报备</div>
             </div>
-            <div class="aui-col-xs-4" id="moreBtn4">
-               <div class="center-in"><img src="img/icon_meeting.png" style="width:28px;height: 28px"></div>
+            <div class="aui-col-xs-3" id="moreBtn4">
+               <div class="center-in"><img src="img/icon_redo.png" style="width:28px;height: 28px"></div>
                <div class="aui-grid-label" style="margin-top:10px;">补签</div>
             </div>
-            <div class="aui-col-xs-4" id="moreBtn5">
-               <div class="center-in"><img src="img/icon_meeting.png" style="width:28px;height: 28px"></div>
-               <div class="aui-grid-label" style="margin-top:10px;">审批</div>
+            <div class="aui-col-xs-3" id="moreBtn5">
+               <div class="center-in"><img src="img/icon_more5.png" style="width:28px;height: 28px"></div>
+               <div class="aui-grid-label" style="margin-top:10px;">报备审批</div>
+            </div>
+             <div class="aui-col-xs-3" id="moreBtn6">
+               <div class="center-in"><img src="img/icon_more6.png" style="width:28px;height: 28px"></div>
+               <div class="aui-grid-label" style="margin-top:10px;">补签审批</div>
             </div>
         </div>
     </section>
-    <section class="aui-grid">
+    <section class="aui-grid aui-margin-b-15">
         <p style="padding:10px;color:#000;font-size: 0.8rem">查询</p>
         <div class="aui-row">
-            <div class="aui-col-xs-4" id="moreBtn3">
+            <div class="aui-col-xs-3" id="moreBtn3">
                <div class="center-in"><img src="img/icon_bill.png" style="width:28px;height: 28px"></div>
-               <div class="aui-grid-label" style="margin-top:10px;">记录</div>
+               <div class="aui-grid-label" style="margin-top:10px;">交易记录</div>
+            </div>
+             <div class="aui-col-xs-3" id="moreBtn7">
+               <div class="center-in"><img src="img/icon_more7.png" style="width:28px;height: 28px"></div>
+               <div class="aui-grid-label" style="margin-top:10px;">其他记录</div>
+            </div>
+            <div class="aui-col-xs-3" id="moreBtn8" style="display: none">
+               <div class="center-in"><img src="img/icon_bill.png" style="width:28px;height: 28px"></div>
+               <div class="aui-grid-label" style="margin-top:10px;">考勤记录</div>
             </div>
         </div>
     </section>
@@ -51,8 +63,8 @@
     <section class="aui-grid">
         <p style="padding:10px;color:#000;font-size: 0.8rem">其他</p>
         <div class="aui-row">
-            <div class="aui-col-xs-4" id="moreBtn2">
-               <div class="center-in"><img src="img/icon_bill.png" style="width:28px;height: 28px"></div>
+            <div class="aui-col-xs-3" id="moreBtn2">
+               <div class="center-in"><img src="img/icon_meeting.png" style="width:28px;height: 28px"></div>
                <div class="aui-grid-label" style="margin-top:10px;">会议</div>
             </div>
         </div>