修改图标
diff --git a/config.xml b/config.xml
index 409322b..9b650e6 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<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">
+<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">
<name short="大理智警">dlapp</name>
<description>
A sample Apache Cordova application that responds to the deviceready event.
diff --git a/icon.png b/icon.png
deleted file mode 100644
index bea2a75..0000000
--- a/icon.png
+++ /dev/null
Binary files differ
diff --git a/package-lock.json b/package-lock.json
index 937680e..0083d84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "com.dalipolice.app",
+ "name": "com.dalicitycard.app",
"version": "1.0.3",
"lockfileVersion": 1,
"requires": true,
diff --git a/package.json b/package.json
index e94d001..5d65b05 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "com.dalipolice.app",
+ "name": "com.dalicitycard.app",
"displayName": "大理市民卡",
"version": "1.0.3",
"description": "A sample Apache Cordova application that responds to the deviceready event.",
diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle
index 9bb1444..e4b404a 100644
--- a/platforms/android/app/build.gradle
+++ b/platforms/android/app/build.gradle
@@ -166,7 +166,7 @@
android {
defaultConfig {
- applicationId 'com.dalipolice.app'
+ applicationId 'com.dalicitycard.app'
if (cdvMinSdkVersion != null) {
minSdkVersion cdvMinSdkVersion
}
diff --git a/platforms/android/app/src/main/AndroidManifest.xml b/platforms/android/app/src/main/AndroidManifest.xml
index 4eb48c9..3238e12 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.dalipolice.app" xmlns:android="http://schemas.android.com/apk/res/android">
+<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">
<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">
diff --git a/platforms/android/app/src/main/assets/www/bill.html b/platforms/android/app/src/main/assets/www/bill.html
index e2b99b1..7d6fc2d 100644
--- a/platforms/android/app/src/main/assets/www/bill.html
+++ b/platforms/android/app/src/main/assets/www/bill.html
@@ -11,7 +11,7 @@
<link rel="stylesheet" type="text/css" href="css/aui.css">
<link rel="stylesheet" type="text/css" href="css/weui.min.css">
<link rel="stylesheet" type="text/css" href="css/jquery-weui.min.css">
- <title>账单</title>
+ <title>记录</title>
</head>
<body>
@@ -19,7 +19,7 @@
<a class="aui-pull-left" href="javascript:window.history.go(-1)">
<span class="aui-iconfont aui-icon-left"></span>
</a>
- <div class="aui-title">账单</div>
+ <div class="aui-title">记录</div>
</header>
<div style="overflow: scroll;position: absolute;top:74px;bottom:0px;left: 0;right: 0">
<div class="aui-card-list" id="billcontent">
diff --git a/platforms/android/app/src/main/assets/www/js/qrcode.js b/platforms/android/app/src/main/assets/www/js/qrcode.js
index 51b2aa1..2b06b32 100644
--- a/platforms/android/app/src/main/assets/www/js/qrcode.js
+++ b/platforms/android/app/src/main/assets/www/js/qrcode.js
@@ -12,7 +12,7 @@
app.loadQrcode();
setInterval(function () {
window.location.reload();
- },100000);
+ },15000);
brightness = cordova.plugins.brightness;
if(brightness){
diff --git a/platforms/android/app/src/main/java/com/dalipolice/app/MainActivity.java b/platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java
similarity index 97%
rename from platforms/android/app/src/main/java/com/dalipolice/app/MainActivity.java
rename to platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java
index 9682df9..7b7fe6b 100644
--- a/platforms/android/app/src/main/java/com/dalipolice/app/MainActivity.java
+++ b/platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java
@@ -17,7 +17,7 @@
under the License.
*/
-package com.dalipolice.app;
+package com.dalicitycard.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 ca7b3a0..1cae32d 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.dalipolice.app" version="1.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<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">
<feature name="Whitelist">
<param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
<param name="onload" value="true" />
diff --git a/www/bill.html b/www/bill.html
index e2b99b1..7d6fc2d 100644
--- a/www/bill.html
+++ b/www/bill.html
@@ -11,7 +11,7 @@
<link rel="stylesheet" type="text/css" href="css/aui.css">
<link rel="stylesheet" type="text/css" href="css/weui.min.css">
<link rel="stylesheet" type="text/css" href="css/jquery-weui.min.css">
- <title>账单</title>
+ <title>记录</title>
</head>
<body>
@@ -19,7 +19,7 @@
<a class="aui-pull-left" href="javascript:window.history.go(-1)">
<span class="aui-iconfont aui-icon-left"></span>
</a>
- <div class="aui-title">账单</div>
+ <div class="aui-title">记录</div>
</header>
<div style="overflow: scroll;position: absolute;top:74px;bottom:0px;left: 0;right: 0">
<div class="aui-card-list" id="billcontent">
diff --git a/www/img/icon_reauth.png b/www/img/icon_reauth.png
new file mode 100644
index 0000000..5b18a42
--- /dev/null
+++ b/www/img/icon_reauth.png
Binary files differ
diff --git a/www/img/icon_redo.png b/www/img/icon_redo.png
new file mode 100644
index 0000000..de4e5a1
--- /dev/null
+++ b/www/img/icon_redo.png
Binary files differ
diff --git a/www/js/more.js b/www/js/more.js
index 26b18f2..0251b0d 100644
--- a/www/js/more.js
+++ b/www/js/more.js
@@ -19,6 +19,16 @@
//showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
alert("暂未开通");
})
+ $("#moreBtn4").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);
+ })
+ $("#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);
+ })
},
};
diff --git a/www/js/qrcode.js b/www/js/qrcode.js
index 51b2aa1..2b06b32 100644
--- a/www/js/qrcode.js
+++ b/www/js/qrcode.js
@@ -12,7 +12,7 @@
app.loadQrcode();
setInterval(function () {
window.location.reload();
- },100000);
+ },15000);
brightness = cordova.plugins.brightness;
if(brightness){
diff --git a/www/more.html b/www/more.html
index daecace..a3bf7a7 100644
--- a/www/more.html
+++ b/www/more.html
@@ -22,15 +22,19 @@
<div class="aui-title">更多</div>
</header>
<section class="aui-grid aui-margin-b-15">
- <p style="padding:10px;color:#000;font-size: 0.8rem">办公</p>
+ <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="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 class="aui-grid-label" style="margin-top:10px;">报备</div>
</div>
- <div class="aui-col-xs-4" id="moreBtn2">
+ <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-grid-label" style="margin-top:10px;">会议</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>
</div>
</section>
@@ -39,7 +43,17 @@
<div class="aui-row">
<div class="aui-col-xs-4" 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>
+ </section>
+
+ <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-grid-label" style="margin-top:10px;">会议</div>
</div>
</div>
</section>
