From 0d9c0cd9875517e1ee5bfe521f6264108e74f15c Mon Sep 17 00:00:00 2001
From: qiaowei <jov123@163.com>
Date: Wed, 24 Jun 2020 16:27:18 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 config.xml                                    |   2 +-
 icon.png                                      | Bin 13256 -> 0 bytes
 package-lock.json                             |   2 +-
 package.json                                  |   2 +-
 platforms/android/app/build.gradle            |   2 +-
 .../android/app/src/main/AndroidManifest.xml  |   2 +-
 .../android/app/src/main/assets/www/bill.html |   4 +--
 .../app/src/main/assets/www/js/qrcode.js      |   2 +-
 .../app/MainActivity.java                     |   2 +-
 .../android/app/src/main/res/xml/config.xml   |   2 +-
 www/bill.html                                 |   4 +--
 www/img/icon_reauth.png                       | Bin 0 -> 965 bytes
 www/img/icon_redo.png                         | Bin 0 -> 1477 bytes
 www/js/more.js                                |  10 ++++++++
 www/js/qrcode.js                              |   2 +-
 www/more.html                                 |  24 ++++++++++++++----
 16 files changed, 42 insertions(+), 18 deletions(-)
 delete mode 100644 icon.png
 rename platforms/android/app/src/main/java/com/{dalipolice => dalicitycard}/app/MainActivity.java (97%)
 create mode 100644 www/img/icon_reauth.png
 create mode 100644 www/img/icon_redo.png

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 bea2a750fe146d9e6acbbc9a1985c637d5724386..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13256
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

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 @@ task cdvPrintProps {
 
 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 @@ var app = {
         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 0000000000000000000000000000000000000000..5b18a4287bc8cbeec4bbab477b8c4654f08eca56
GIT binary patch
literal 965
zcmV;$13LVPP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk000AwNkl<ZXhZFp
zOQ=mz7{`A%B`Ibik0=RwM?{2yf#gwSBF_N>k4z*JuaQg;<ryLaN#0Th6k<Rk$}{AV
zGNY7I^mX^C-EQCW|JFWxpL6a#dkydUf8Y9k>%Z>0dwsW!78`9X#!Cs@)g3P#E*-9Y
z2YLeYfKejVOW+3ZyY?kJ&QSD`9t2zgCO9FU0t<o9PJOVfXyAjuhQO*00UHBj-14G<
z&8dOzYTAWg06Q6ljG}?R0{sIk{{{>QjB(3Dfp-Fffgxgr+0pz}V7|MWcHuQ(K@?-_
z&8!mt5%>g{&NV`S?*OwLS>FM}V!9WO8@eL5n|gFC_9igbvF2T%vdLBDUf|WhNyow!
z$t2)OOusC#32CX`0_S2A6M@G8YpwxKDZLl?88B8Qi_ISc)&=O(q(_0Z0Xd!n<CNYD
z{7)rHnZF3^2VMg|obi2t;lO5Ku`?zvlRQ!oWy=Dbq28K9B##u7z%`ptXaZ@V6qF7Z
zYEaF|rGZjVI$W~}g(i>&N<ryxp$65QTpB0^4RqL=2lgni*VZcMR!ANxXb|v9;7kni
zgX2kRa>*kF4FKK->`6GfFZ#Y#MoS(ks57t~<4q}4*4!JfXgiz3_PSb<0<{I$>wxW4
zNBUvZvG|h!v&%|8>SHnT#7aROj<ofptUY5FQ+!zS-g?^IobEQ%;nTohU<xp%O2MYF
zKG}nWW-?$6z`g;n4FjGEJc<gn4(H)2jku-2g#?tvTu(Ifyxj7{N<rX}eg%w7RM#D_
z+c(*tvNq0vgtiA@ok~{+GG!Mej}!y~n|wsn$4b^?z2hCx5AD|7no{t2z+BHdB##ti
z0KN>^m(tIas;!eb9ax?+Xa7@LpOrL<lRQ$80oX#UpKO0ptg-GH+ksskq0mSkDaZ(H
zVc!93;NKEOn(Ie$fVC8oM+#~Ht}xhTb-V+hMZl$;V4DWm3fUdIuqu4hBKLcBMPOsH
zPegkKy@@_HP5?u5gl#H^<6QQr_xu+!%U;M|Q7OpbcQ{MoSz{!R6qLYO_r5-H(m*LF
z9j=d4Syzz;N<phSY!87vKM=AySS{`s&|4+;I(#pB<*0m(oWBpuPz88_?Ku~3jH|qj
zm|p>$RSSE8El+3%QLUZlyuHe-k0wV5uqB%legF28nd>94C+K_Nws*NuU~k^0)s?_a
nYfVmtl@8~$kxiSX<sAMGJ|KoYd)Y>D00000NkvXXu0mjf!??7e

literal 0
HcmV?d00001

diff --git a/www/img/icon_redo.png b/www/img/icon_redo.png
new file mode 100644
index 0000000000000000000000000000000000000000..de4e5a189282e2e26a5f526c7a8d01fb14cdfa89
GIT binary patch
literal 1477
zcmV;$1v>hPP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk000GyNkl<ZXhZE<
zZBSHI7=F%*#!!G_AdoN;#-I{lX%lFKsgpzrG(p7lK`|3e{HbglLs)SkYAhQ6XkSA^
zj+s#ti)J*FDT4yjAo8gu;#aG?in7W|45IC6j(8V#*?aeL_bwlC&&>YVbKdtn&vV}Q
z-22{p55W{`WQys9BKZFvaV5f1BJ7`B5PwNqP%Xt*tdCq6PDMCyt!6zXGz%bM0PP@@
zl<N1Ww}=%X#!hYw$$|rt3(G-i>Il+={AkeTr->2c$i@{Ik_7v&-JD7YDd!_hfDiPQ
z>W>`>5*iOo(rlo>M{;8b3JyrtJW4=f&1Um#TVO)Srn`N;k<YB@Z2k4O`2g;_+t)@Z
z{n;78gplU}JUki<l}go3LF)`!b)&#SjT{P0DOyg=W)`7kjz~{;cW;i%%8aflEo;8j
z-yiMBUdp%xj9Q{nZO~Wb9Uc)V+YZ0v!q91ES`PwWG2|qW5i_lojU)_;EB~rUOqVwQ
z^zg|>q;z1CW*Y_G7Rzduk5}g-FJ;U>`u(oXYeo}GYuTGr3<7M|SE_Ra1qUQ)x&inw
zqjl+VNP8*@L4Gr>M3hw>LGG7TmcFR)V6^=8x8;9ITm-hgm*SN0oX;vyQPa+gQJkHC
z%!DOY7`m?OC_m7GlHE02ztK>swz~dUMVQ^(2~{2Bto7P_yQB}boW+ZqcJd0^k(Z8D
zOCEAc@ctvG@M_U+-Z_5Q{4$=13b8vLm|SS-r^LKscu^!tFq>^}?Qv|`RgKdZSwal9
z&<AE?eMUT<Tei?Cv7ED143`LIq>QFM?5jJ0%EQNyw0sc~V;8{3%R?5imYkG;;WELp
zDwA<CMewi(8^JyNM&i<QGA{g>P4&&bhIt&=s4iM##?Xa8is0dkYkMDd;lhvE)T4?p
zU*R!kY$XCYca`pG2iR{iH17z&I|9xNZqJ(xa)F2<MeykNFiU48!V@&Zm6QgYPU+nJ
z!Pt9p7P|Y~?1nilq8nQitSi!zx&Z7w>4T1|?sk1*gKi)u_y*R+8mz{%_dIw9%U%oe
z9zbH)HK^k+3=PX2;mf_#vH0^yhxxp2ncj;03%kQmr}Gr_3%kD`)vq73*sw(^sSR|9
z_2-*yVB+sIxdnIqGab>}9Sh$0<VEB>cF96^&5i|Vy)68kY%5q(Jr`dz%yB5V@vT+_
zc;0f2U^eSJRr65ZKH@dCg;=OhKMrLLMT!lGiI#0vFu%l|;b=14%PV@s_K`cn9I~!w
z26U!-c=sb8L%y_Tdw8@yL0&h9Qkiphm0*W?HeLpbU>R;p;}twnxJrbT2wR`xvHRs=
zsy{rGHTk0EycbOU)9h}mr0{EaCHjih7%LC|IOB~AJu~e3u(C38P9Ii>_K4c5yhd{G
z;ogC1SXs6Z>^>~iSS`(p0<Pu!5`u~ocfQZ@Hg+%mDZOK23GOtyBd&CjLsA)$SMll7
z=Ph=u{$_Q!P@C;>8*Mo)4(Ap$kUPQ*?Ah<aaa7M=?lGG)?>52R&1~Ve=|B*^ZuAr6
znz{H2idPMNa+Rdq6@nQNR!i$l_S4$-5sxFz%F22jcLc;*PE1fQgvv|N;$0<JG=Z@;
zR0K;YJXn+_(@Q*H6z`=|i+#z!?Jh18zulOQ)k~c_x-iyR{d>bHy!PSHQ3(pSMVBgb
zk8?cioZ>00r=X8B15XckQ%JxpU9kU5t4cye2Hnh*O47smOL7))I%hEYoi$vad!w)4
zi!-}9VD>gv6`1%14<1T8BsZCHnU5gbpjCf09NX^EL;obr`vmx8Tu90TdL0Ct4O;b9
z+v#}ES`MDGL<|L1fDWG9n(&RlNPvR`=EE1Y1<m&ON;*wD;e`tjR0L1v=!xO3L|Du!
fO=g=Z7vcW^a9X2ki+Dy(00000NkvXXu0mjfFQLbC

literal 0
HcmV?d00001

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 @@ var app = {
             //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 @@ var app = {
         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>
-- 
2.17.1