大理需求：绑定银行卡时银行卡号和身份证号去空格，60s之后重复发，注意：安卓版本使用的是platforms/android目录下代码，不能覆盖，里面做了特殊代码修改

diff --git a/platforms/android/app/release/app-release.apk b/platforms/android/app/release/app-release.apk
index 9058c6b..db6bf3c 100644 (file)
Binary files a/platforms/android/app/release/app-release.apk and b/platforms/android/app/release/app-release.apk differ

diff --git a/platforms/android/app/src/main/assets/www/js/bindcard.js b/platforms/android/app/src/main/assets/www/js/bindcard.js
index e9cb86c..27a0817 100644 (file)
--- a/platforms/android/app/src/main/assets/www/js/bindcard.js
+++ b/platforms/android/app/src/main/assets/www/js/bindcard.js
@@ -19,17 +19,20 @@ var app = {
                     dict = ret.idtypes;
                     let keys = Object.keys(dict);
                     let vals = Object.values(dict);
-                    console.log(keys, vals)
                     var items=[];
+                    var selectItem=items[0];
                     for(var key of keys){
                         var bean = {
                             "title":dict[key],
                             "value":key
                         }
+                        if(key == 'idcard'){
+                            selectItem=bean;
+                         }
                         items.push(bean)
                     }
-                    $("#idtype").val(items[0].title)
-                    $("#idtype").attr("data-values",items[0].value)
+                    $("#idtype").val(selectItem.title)
+                    $("#idtype").attr("data-values",selectItem.value)
                     $("#idtype").select({
                       title: "请选择证件类型",
                       items: items
@@ -55,11 +58,9 @@ var app = {
             $.alert("请选择证件类型", "错误");
             return;
         }
-        /*var agree = $("input[type=checkbox]:checked").val();
-        if(isEmpty(agree)){
-            $.alert("请同意用户协议与隐私条款", "提示");
-            return;
-        }*/
+        cardnum = cardnum.trim();
+        name = name.trim();
+        idno = idno.trim();
         $.showLoading("正在处理");
         var param = {
             "cardno": cardnum,
@@ -72,8 +73,12 @@ var app = {
                 $.hideLoading();
                 console.log(ret)
                 if (ret.code == 200) {
-                    window.localStorage.setItem("phoneX",ret.phonex);
                     window.localStorage.setItem("name", name);
+                    window.localStorage.setItem("cardno", cardnum);
+                    window.localStorage.setItem("idtype", idtype);
+                    window.localStorage.setItem("idno", idno);
+
+                    window.localStorage.setItem("phoneX",ret.phonex);
                     window.localStorage.setItem("personid", ret.personid);
                     window.localStorage.setItem("signed", ret.signed);
                     window.localStorage.setItem("paypwdset", ret.paypwdset);

diff --git a/platforms/android/app/src/main/assets/www/js/main.js b/platforms/android/app/src/main/assets/www/js/main.js
index 8d7e506..c5ba03b 100644 (file)
--- a/platforms/android/app/src/main/assets/www/js/main.js
+++ b/platforms/android/app/src/main/assets/www/js/main.js
@@ -108,7 +108,14 @@ var app = {
             })
         });
         this.initData();
+        this.backBtn();
     },
+    backBtn: function(){
+            document.addEventListener("backbutton", function(e){
+                   e.preventDefault();
+                   navigator.app.exitApp();
+                }, false);
+        },
     initTab: function() {
         $("#maincontent").css("top", $("#maintop").height())
         var tab = new auiTab({
@@ -317,6 +324,11 @@ var app = {
         } else {
             window.location = 'cardinfor.html'
         }
+    },
+    logout:function(){
+        window.localStorage.removeItem("token");
+        window.location = "login.html";
     }
+
 };
 app.initialize();

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 4664a9b..1b5a036 100644 (file)
--- a/platforms/android/app/src/main/assets/www/js/qrcode.js
+++ b/platforms/android/app/src/main/assets/www/js/qrcode.js
@@ -21,8 +21,8 @@ var app = {
                     $.hideLoading();
                     var qrcode = new QRCode(document.getElementById("qrcode"), {
                       text: ret.qrcode,
-                      width: 150,
-                      height: 150,
+                      width: 200,
+                      height: 200,
                       colorDark: "#000000",
                       colorLight: "#ffffff",
                       correctLevel: QRCode.CorrectLevel.L

diff --git a/platforms/android/app/src/main/assets/www/main.html b/platforms/android/app/src/main/assets/www/main.html
index b6a2d8c..6d43efa 100644 (file)
--- a/platforms/android/app/src/main/assets/www/main.html
+++ b/platforms/android/app/src/main/assets/www/main.html
@@ -189,7 +189,7 @@
                     </div>
                 </div>
             </div>
-            <section class="aui-content aui-grid ">
+            <section class="aui-content aui-grid " style="display:none;">
                 <div class="aui-row aui-margin-t-10">
                     <div class="aui-col-xs-4 aui-border-r">
                         <big class="aui-text-warning" id="user-amount">0.00</big>
@@ -238,6 +238,9 @@
                     </div>
                 </li>
             </ul>
+            <div style="padding: 20px;margin-top: 40px;">
+                <a href="javascript:app.logout();" class="weui-btn weui-btn_warn">退出登录</a>
+            </div>
         </section>
     </div>
     <footer class="aui-bar aui-bar-tab aui-border-t" id="footer">

diff --git a/platforms/android/app/src/main/assets/www/security.html b/platforms/android/app/src/main/assets/www/security.html
index 39a40ca..f6ddd43 100644 (file)
--- a/platforms/android/app/src/main/assets/www/security.html
+++ b/platforms/android/app/src/main/assets/www/security.html
@@ -50,9 +50,7 @@
                 </div>
             </li>
         </ul>
-        <div style="padding: 20px;margin-top: 40px;">
-            <a href="javascript:app.logout();" class="weui-btn weui-btn_warn">退出登录</a>
-        </div>
+
     </section>
 </body>
 

diff --git a/platforms/browser/config.xml b/platforms/browser/config.xml
index b0a0bfa..429c4a8 100644 (file)
--- a/platforms/browser/config.xml
+++ b/platforms/browser/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.dalicitycard.app" version="1.0.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.dalicitycard.app" version="1.0.5" 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.
@@ -34,4 +34,5 @@
     <preference name="DisallowOverscroll" value="true" />
     <preference name="UIWebViewBounce" value="false" />
     <preference name="BackupWebStorage" value="local" />
+    <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
 </widget>

diff --git a/platforms/ios/dlapp.xcarchive/Info.plist b/platforms/ios/dlapp.xcarchive/Info.plist
index 6a13a29..6dfc268 100644 (file)
--- a/platforms/ios/dlapp.xcarchive/Info.plist
+++ b/platforms/ios/dlapp.xcarchive/Info.plist
@@ -20,7 +20,7 @@
        <key>ArchiveVersion</key>
        <integer>2</integer>
        <key>CreationDate</key>
-       <date>2019-09-26T03:33:22Z</date>
+       <date>2019-10-15T06:27:42Z</date>
        <key>Name</key>
        <string>dlapp</string>
        <key>SchemeName</key>

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car
index 439ef35..469f982 100644 (file)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib
index 99f1d2f..f847568 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib
index a96530b..f92050a 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib
index 45c19f9..b47d26d 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib
index 0810743..9e69faf 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib
index 3ca564c..bb04266 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib
index d661792..52a6c7b 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib
index 118a9bf..8b84edc 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib
index 760620c..6f48cc7 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib
index 033731f..94f285a 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib
index fc192b8..d08c753 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib
index 56eb771..32022d1 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib
index 296e9d2..d864b8a 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib
index b3c8e50..65a6924 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib
index 262e625..8ce3457 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib
index 6ec56c3..40be0c4 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib
index c14107f..b4d2a6c 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib
index 7efc1cc..d4d32c5 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib
index 3e9ca35..45fc475 100644 (file)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources
index b5429c7..297e03c 100644 (file)
--- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources
+++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources
@@ -78,75 +78,75 @@
                </data>
                <key>Assets.car</key>
                <data>
-               g8zkpxmqkYLNeSWR12e1gNQYWTY=
+               MI34mk5EtOkVCHYwJBxmd39rUbk=
                </data>
                <key>Frameworks/libswiftAVFoundation.dylib</key>
                <data>
-               8Qj0lW0Ymvy5KyAWLJHwYSk6u+U=
+               BBuJ8uNJrWrURIdexWl4e+vXAvA=
                </data>
                <key>Frameworks/libswiftCore.dylib</key>
                <data>
-               2uXteUPyAvfHG476W5U8cUjZHx0=
+               pTbPSHWWYG/yscK8pmh9JLGa/gU=
                </data>
                <key>Frameworks/libswiftCoreAudio.dylib</key>
                <data>
-               v6VcOdQFWvRkIl4ot9I3OPjYVH0=
+               DsyD0FTqKYXHdKQ8o342ImVv/7Q=
                </data>
                <key>Frameworks/libswiftCoreFoundation.dylib</key>
                <data>
-               Zi64xPHRsx39JoIsd+FL0ZQu81o=
+               m6o/BG4l4chH3kGhzkxMA8Lh4fs=
                </data>
                <key>Frameworks/libswiftCoreGraphics.dylib</key>
                <data>
-               m7c9XriI9UvRELbZP7K+j+ypGsE=
+               peI1hRvkz/2wJYUVhxcjJ5AZJ/w=
                </data>
                <key>Frameworks/libswiftCoreImage.dylib</key>
                <data>
-               /JAWw3eLhtYii8EaproxWv4OZ/M=
+               v4j+K3FiRAz0UoIhS/aE9kwxpHc=
                </data>
                <key>Frameworks/libswiftCoreMedia.dylib</key>
                <data>
-               VBxFpSMpOnOyxdhr7fFmNfYltYY=
+               BPp/U4KnUvs/EIcuSuyjUEiCunM=
                </data>
                <key>Frameworks/libswiftDarwin.dylib</key>
                <data>
-               TzQzDoWlyGOG+LxX/bq5utRJs/s=
+               Rl5le1b8dTOLgzeejpIkLEFsgfM=
                </data>
                <key>Frameworks/libswiftDispatch.dylib</key>
                <data>
-               CPl5Gsoy+SEzLF4TP5caS627GWY=
+               ZwVOe6/BFZQXWdo7M3VhyJC3TM8=
                </data>
                <key>Frameworks/libswiftFoundation.dylib</key>
                <data>
-               aXmoTPmqDfxQp/HFMCdCG4/5COk=
+               QprHd55Ei5gjTxPmBVMkw0JfYAo=
                </data>
                <key>Frameworks/libswiftMetal.dylib</key>
                <data>
-               xPaIpCnJ+DSZwkJceploiwt6Pq8=
+               6pTO4txXfyz4hfKC7qOe2ZdJ1dg=
                </data>
                <key>Frameworks/libswiftObjectiveC.dylib</key>
                <data>
-               fVmGxWQRRqnOcfdNBoZByuBlVgc=
+               Vfj4ZqWFmvVgPHMkJXGsKnjVkig=
                </data>
                <key>Frameworks/libswiftQuartzCore.dylib</key>
                <data>
-               v81eB3IUtC9er+KovxdS1KLgDxw=
+               vC9jL88UMDMhknN4r/y6P4p8IIU=
                </data>
                <key>Frameworks/libswiftSwiftOnoneSupport.dylib</key>
                <data>
-               uk8eGXXRu+UEjRYEHuNBxqEElfo=
+               3Rz7pIIRUUs4BJrkfMth2M8Z9K0=
                </data>
                <key>Frameworks/libswiftUIKit.dylib</key>
                <data>
-               7g0O3uLYgaPNe2b0FPLlcfJsLMU=
+               0tEY9Ldxj6zceqZg2JXlDnHhDS8=
                </data>
                <key>Frameworks/libswiftos.dylib</key>
                <data>
-               wjhieac5H3WQl8RMgjJm/Q6sinM=
+               A1vyKE/09WJVYoo7x0E3+ZVXeBM=
                </data>
                <key>Frameworks/libswiftsimd.dylib</key>
                <data>
-               8JFWbSQfhpLwLvQIw/1WuTICIGs=
+               Q9gxSQV8yq+0XtSjd4c3qCNqghU=
                </data>
                <key>Info.plist</key>
                <data>
@@ -198,7 +198,7 @@
                </data>
                <key>MainViewController.nib</key>
                <data>
-               cjvTFQXfZRdmAYsSW398uuCbmBA=
+               h27QShEEqp2YliUGmzbvowlsX9I=
                </data>
                <key>PkgInfo</key>
                <data>
@@ -332,6 +332,10 @@
                <data>
                vCr7vtkPuVHx3XBpJF0QrFYmg48=
                </data>
+               <key>www/img/icon_door.png</key>
+               <data>
+               E6FWxSYsDIGsPRaxE+kIGDk9DJQ=
+               </data>
                <key>www/img/icon_header.png</key>
                <data>
                4drNX8zyyrek1c2JXqfXQR2KfZI=
@@ -526,7 +530,7 @@
                </data>
                <key>www/js/main.js</key>
                <data>
-               QSdOeA6BefLzgiGbSEou4rGjHqo=
+               0GJu73OFCX3YlRcB4DWzCmggX94=
                </data>
                <key>www/js/mobile.js</key>
                <data>
@@ -562,7 +566,7 @@
                </data>
                <key>www/js/server.js</key>
                <data>
-               jp9NlgHW1O72GXbxGb4cmcCVw+w=
+               7hP5JogQrZX3Y7gz7anbjekAU1k=
                </data>
                <key>www/js/signxy.js</key>
                <data>
@@ -586,7 +590,7 @@
                </data>
                <key>www/main.html</key>
                <data>
-               sV+PofATUmBIxpJeRyO928SNbfc=
+               PEdyDAoIJ4z2Zwdw7nZQKul7P9M=
                </data>
                <key>www/main1.html</key>
                <data>
@@ -1273,198 +1277,198 @@
                <dict>
                        <key>hash</key>
                        <data>
-                       g8zkpxmqkYLNeSWR12e1gNQYWTY=
+                       MI34mk5EtOkVCHYwJBxmd39rUbk=
                        </data>
                        <key>hash2</key>
                        <data>
-                       hGZP6DsKlLJF9P4lCwrh3qAYrMMrR0Occ4xRUmvB0Ck=
+                       uO+oqQYOdNiKEekqzK4ijCuCF/a4db6Mq2/LLL5vdf0=
                        </data>
                </dict>
                <key>Frameworks/libswiftAVFoundation.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       8Qj0lW0Ymvy5KyAWLJHwYSk6u+U=
+                       BBuJ8uNJrWrURIdexWl4e+vXAvA=
                        </data>
                        <key>hash2</key>
                        <data>
-                       v2O6O1GGrVVAsfEYjnL8E1hQXMzlFHfpzFUMk8BTeTQ=
+                       d7GBGJ88UJXlcjpidc9UpdiVDowkgZKRfhEp6wUJ3Ns=
                        </data>
                </dict>
                <key>Frameworks/libswiftCore.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       2uXteUPyAvfHG476W5U8cUjZHx0=
+                       pTbPSHWWYG/yscK8pmh9JLGa/gU=
                        </data>
                        <key>hash2</key>
                        <data>
-                       TWGfJk+0MT16isdzShKr59MX6DvSCRXWxIg3MPqOP7w=
+                       jblnNK1CWUwV17+/SUKyUv4Fmb4siTscmDzLy2PzalQ=
                        </data>
                </dict>
                <key>Frameworks/libswiftCoreAudio.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       v6VcOdQFWvRkIl4ot9I3OPjYVH0=
+                       DsyD0FTqKYXHdKQ8o342ImVv/7Q=
                        </data>
                        <key>hash2</key>
                        <data>
-                       dtxhnx2+ZA57b0cQnwC7KIRzcwf2GTJnSJArY/BKcKQ=
+                       asjY2hknIzUab1BxkSMdcSn3ee03/69poDXj6hLXwmE=
                        </data>
                </dict>
                <key>Frameworks/libswiftCoreFoundation.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       Zi64xPHRsx39JoIsd+FL0ZQu81o=
+                       m6o/BG4l4chH3kGhzkxMA8Lh4fs=
                        </data>
                        <key>hash2</key>
                        <data>
-                       Z5gGPTEtndo0LQprh2y2G//esdzINHviqwJILb8a6vk=
+                       pZBaz9EW7u38t7hqTe0TDFsNFrdQBKnGW/+ZXMBMhss=
                        </data>
                </dict>
                <key>Frameworks/libswiftCoreGraphics.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       m7c9XriI9UvRELbZP7K+j+ypGsE=
+                       peI1hRvkz/2wJYUVhxcjJ5AZJ/w=
                        </data>
                        <key>hash2</key>
                        <data>
-                       l/HNmRQFWzUXzRv4xBDeHKvePCEiO7hExLq0d9fe9mI=
+                       kBO8Kl3ds8wsnUOYL32g9BUEwELWNjAXAhpGA21+HKA=
                        </data>
                </dict>
                <key>Frameworks/libswiftCoreImage.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       /JAWw3eLhtYii8EaproxWv4OZ/M=
+                       v4j+K3FiRAz0UoIhS/aE9kwxpHc=
                        </data>
                        <key>hash2</key>
                        <data>
-                       /BonXWVlfvAGk4ofEjuuwtKZcXo2pHILvim59W3JTs8=
+                       nac0nVGh8w40GNw+4tWE//3bl9iYMIFzW4vmI/j0xJM=
                        </data>
                </dict>
                <key>Frameworks/libswiftCoreMedia.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       VBxFpSMpOnOyxdhr7fFmNfYltYY=
+                       BPp/U4KnUvs/EIcuSuyjUEiCunM=
                        </data>
                        <key>hash2</key>
                        <data>
-                       jWDKTymB6McXNkHsz6ltHJOaDX1LrVOlyRPh+JsqAew=
+                       U3QuWNbGqePs/LgfOxB9hU/lNooMogZWgnvRpcbgftM=
                        </data>
                </dict>
                <key>Frameworks/libswiftDarwin.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       TzQzDoWlyGOG+LxX/bq5utRJs/s=
+                       Rl5le1b8dTOLgzeejpIkLEFsgfM=
                        </data>
                        <key>hash2</key>
                        <data>
-                       OHAb3OyhZOJSvH5/FtuU3rQh7Gztifi3DqqDec5jMnw=
+                       aFXxvzO47QW6Yuw8F31XrkEAPIZ518pYm3HajzW0hJ4=
                        </data>
                </dict>
                <key>Frameworks/libswiftDispatch.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       CPl5Gsoy+SEzLF4TP5caS627GWY=
+                       ZwVOe6/BFZQXWdo7M3VhyJC3TM8=
                        </data>
                        <key>hash2</key>
                        <data>
-                       u3kJECdKSg4eKbhDS+QmU6GBs/jQdHm1rBEqzLgQfxs=
+                       HPX9eGXjnf04VcRF9oQpnCh/tDfurqRzU9TJaSpY4pU=
                        </data>
                </dict>
                <key>Frameworks/libswiftFoundation.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       aXmoTPmqDfxQp/HFMCdCG4/5COk=
+                       QprHd55Ei5gjTxPmBVMkw0JfYAo=
                        </data>
                        <key>hash2</key>
                        <data>
-                       XRG6C/d3ESRa2YIxg2ludYWLFJZjbJXxns4rBXNEE6c=
+                       qBHE5OUugUs5FnLR7A6gKW4VwCHYHMhAU+DrKQnNlQE=
                        </data>
                </dict>
                <key>Frameworks/libswiftMetal.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       xPaIpCnJ+DSZwkJceploiwt6Pq8=
+                       6pTO4txXfyz4hfKC7qOe2ZdJ1dg=
                        </data>
                        <key>hash2</key>
                        <data>
-                       JxZNz3OOkQ85DZGfZdarb++dRNNPjsIMbKuYuegX3bA=
+                       EhdUiIrVd7iF8MhxoNg0fQtL8y07sba269/5Lc8VLFA=
                        </data>
                </dict>
                <key>Frameworks/libswiftObjectiveC.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       fVmGxWQRRqnOcfdNBoZByuBlVgc=
+                       Vfj4ZqWFmvVgPHMkJXGsKnjVkig=
                        </data>
                        <key>hash2</key>
                        <data>
-                       SlDXeFJtdcw5OU0mSxtr24SWrJk7DhHoqH2Kc1wPn/Q=
+                       xd8CDu0sjqbrupXDENHFR4DZj7gc6YGcEstyRUa9iOg=
                        </data>
                </dict>
                <key>Frameworks/libswiftQuartzCore.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       v81eB3IUtC9er+KovxdS1KLgDxw=
+                       vC9jL88UMDMhknN4r/y6P4p8IIU=
                        </data>
                        <key>hash2</key>
                        <data>
-                       fELviAuzeIrdBNyow1tenv/lTjpcnZxZ+f22ABeKzE8=
+                       LVpsrClPMhwoCxYgGdvl6oFT/d4TK2wDp5icwZyD+8g=
                        </data>
                </dict>
                <key>Frameworks/libswiftSwiftOnoneSupport.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       uk8eGXXRu+UEjRYEHuNBxqEElfo=
+                       3Rz7pIIRUUs4BJrkfMth2M8Z9K0=
                        </data>
                        <key>hash2</key>
                        <data>
-                       z18X0FoF4w+dBoXxWnl7EqOTUy/j2pj/V8AC0N07emY=
+                       MsKil6JqwHfu4+8fStyHf3RpXOBPSs0JdyxrAQxBWuw=
                        </data>
                </dict>
                <key>Frameworks/libswiftUIKit.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       7g0O3uLYgaPNe2b0FPLlcfJsLMU=
+                       0tEY9Ldxj6zceqZg2JXlDnHhDS8=
                        </data>
                        <key>hash2</key>
                        <data>
-                       yncCZEKhCnGN/35HMO1XzmBeMnlWe7DoFxSyBe2hH2k=
+                       klDw4B7e7ynMPKIJ1GhZpBFjE5WEJ2h71dkIGj0GraE=
                        </data>
                </dict>
                <key>Frameworks/libswiftos.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       wjhieac5H3WQl8RMgjJm/Q6sinM=
+                       A1vyKE/09WJVYoo7x0E3+ZVXeBM=
                        </data>
                        <key>hash2</key>
                        <data>
-                       mneq7YCMTdC9JxEwrugMQw/2d6nDckL8vAarcPrPnZM=
+                       xY7vJEHoJdTu/o0ZpKxTJSllUToMl6Ad6eCSfkhQN6k=
                        </data>
                </dict>
                <key>Frameworks/libswiftsimd.dylib</key>
                <dict>
                        <key>hash</key>
                        <data>
-                       8JFWbSQfhpLwLvQIw/1WuTICIGs=
+                       Q9gxSQV8yq+0XtSjd4c3qCNqghU=
                        </data>
                        <key>hash2</key>
                        <data>
-                       nmCbJjUc3G0t1bp2bf9qNCoS7J0Cj1aQ7W0j+uKJ5hg=
+                       JjSEYizqevaXQNra2PZx9+82xduqZlc+vVRIfuSSzWA=
                        </data>
                </dict>
                <key>JPushConfig.plist</key>
@@ -1592,11 +1596,11 @@
                <dict>
                        <key>hash</key>
                        <data>
-                       cjvTFQXfZRdmAYsSW398uuCbmBA=
+                       h27QShEEqp2YliUGmzbvowlsX9I=
                        </data>
                        <key>hash2</key>
                        <data>
-                       5ztrKpbIHJlcfYR5qM4ZanQy00wZABi1MFbtuiwXcDU=
+                       QDd8NaAdWQLfXjj1XMvoaqVfhmYvLf9OwrQ0CPKsob4=
                        </data>
                </dict>
                <key>config.xml</key>
@@ -1951,6 +1955,17 @@
                        hPSk5dHQm6MvF2+feqJSsDTJQNYGGQ3l11IWBmS4agA=
                        </data>
                </dict>
+               <key>www/img/icon_door.png</key>
+               <dict>
+                       <key>hash</key>
+                       <data>
+                       E6FWxSYsDIGsPRaxE+kIGDk9DJQ=
+                       </data>
+                       <key>hash2</key>
+                       <data>
+                       eEjCqJA0jSeRHXkI3aSwKtj3lsZgfKuAiEbxqaJhGgg=
+                       </data>
+               </dict>
                <key>www/img/icon_header.png</key>
                <dict>
                        <key>hash</key>
@@ -2483,11 +2498,11 @@
                <dict>
                        <key>hash</key>
                        <data>
-                       QSdOeA6BefLzgiGbSEou4rGjHqo=
+                       0GJu73OFCX3YlRcB4DWzCmggX94=
                        </data>
                        <key>hash2</key>
                        <data>
-                       1nAaMqlGuQgqChazP2EJpnb7aP34936TRvAuddhZZFw=
+                       yGpzeGfw2KACSa3Hu+tA/5uXUpfDEj2LubnWxDqJxFs=
                        </data>
                </dict>
                <key>www/js/mobile.js</key>
@@ -2582,11 +2597,11 @@
                <dict>
                        <key>hash</key>
                        <data>
-                       jp9NlgHW1O72GXbxGb4cmcCVw+w=
+                       7hP5JogQrZX3Y7gz7anbjekAU1k=
                        </data>
                        <key>hash2</key>
                        <data>
-                       xkxp3hfX0I2FABTvDz6d8u4ZnwK6XUy2IrW6YX4VK14=
+                       2ffigLo1Xa+Z/rgoGad55by5Ug4RwJz4mZ2lOkasD/c=
                        </data>
                </dict>
                <key>www/js/signxy.js</key>
@@ -2648,11 +2663,11 @@
                <dict>
                        <key>hash</key>
                        <data>
-                       sV+PofATUmBIxpJeRyO928SNbfc=
+                       PEdyDAoIJ4z2Zwdw7nZQKul7P9M=
                        </data>
                        <key>hash2</key>
                        <data>
-                       Ut8U/hTR51RvrtpZGoxPvr8RETQF1NBBDg11JqYeuzY=
+                       8D/UG2CsfJAhOus4F7r4s3uOZI76ibYPcwpvMMIZv0c=
                        </data>
                </dict>
                <key>www/main1.html</key>

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp
index 8ff51f5..916cc72 100755 (executable)
Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/img/icon_door.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/img/icon_door.png
new file mode 100644 (file)
index 0000000..b539064
Binary files /dev/null and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/img/icon_door.png differ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/main.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/main.js
index 90977da..43938a2 100644 (file)
--- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/main.js
+++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/main.js
@@ -99,6 +99,11 @@ var app = {
                 })
             })*/
         });
+        $("#doorBtn").click(function(){
+            app.checkBefore(function() {
+                showRet(DOOR_URl);
+            })
+        })
         $('#usersec').click(function() {
             app.checkBefore(function() {
                 app.checkOther(function() {
@@ -319,3 +324,47 @@ var app = {
     }
 };
 app.initialize();
+
+function showRet(url) {
+        if(isEmpty(url)){
+            return;
+        }
+        var userid = window.localStorage.getItem("userid"); 
+        //if (url.indexOf("yy.dlsmk.cn")>=0) {
+            if(url.indexOf("?")>0){
+                url=url+'&userid='+userid;
+            }else{
+                url=url+'?userid='+userid;
+            }
+        //}
+        console.log(url)
+        var inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', {
+            statusbar: {
+                color: '#03a9f4ff'
+            },
+            toolbar: {
+                height: 44,
+                color: '#03a9f4ff'
+            },
+            title: {
+                color: '#ffffffff',
+                showPageTitle: true
+            },
+            backButton: {
+                image: 'back.png',
+                imagePressed: 'back.png',
+                align: 'left',
+                event: 'backPressed'
+            },
+            closeButton: {
+                image: 'close.png',
+                imagePressed: 'close.png',
+                align: 'left',
+                event: 'closePressed'
+            },
+            backButtonCanClose: true
+        }).addEventListener('closePressed', function(params){
+            inAppBrowserRef.close();
+            //window.location = "main.html"
+         });
+    }

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/server.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/server.js
index c8eb688..b5ec388 100644 (file)
--- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/server.js
+++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/server.js
@@ -1,5 +1,6 @@
 var dev = false;
 var SERVER = "https://yy.dlsmk.cn/payapi/mobileapi";
+var DOOR_URl = "http://172.28.43.8:8099/door/app/appMintUIindex";//门禁服务地址
 var GLOBAL_TODAY="";
 var GLOBAL_YESTERDAY="";
 var CURRENT_INDEX=1;

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/main.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/main.html
index b6a2d8c..e788ea0 100644 (file)
--- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/main.html
+++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/main.html
@@ -44,6 +44,10 @@
                             <div class="center-in"><img src="img/icon_securty.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="doorBtn">
+                            <div class="center-in"><img src="img/icon_door.png" style="width:28px;height: 28px"></div>
+                            <div class="aui-grid-label" style="margin-top:10px;">远程开门</div>
+                        </div>
                     </div>
                 </div>
             </section>

diff --git a/platforms/ios/dlapp/dlapp-Info.plist b/platforms/ios/dlapp/dlapp-Info.plist
index 6fbc115..2804c2d 100644 (file)
--- a/platforms/ios/dlapp/dlapp-Info.plist
+++ b/platforms/ios/dlapp/dlapp-Info.plist
@@ -17,7 +17,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.0.4</string>
+       <string>1.0.5</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
@@ -40,11 +40,11 @@
        <key>NSCameraUsageDescription</key>
        <string>APP需要使用您的相机权限，没有该权限将无法完成扫一扫功能</string>
        <key>NSFaceIDUsageDescription</key>
-       <string></string>
+       <string/>
        <key>NSMainNibFile</key>
-       <string></string>
+       <string/>
        <key>NSMainNibFile~ipad</key>
-       <string></string>
+       <string/>
        <key>NSPhotoLibraryUsageDescription</key>
        <string>APP需要使用您的相册权限，没有该权限将无法完成扫一扫功能</string>
        <key>UIBackgroundModes</key>
@@ -70,4 +70,4 @@
                <string>UIInterfaceOrientationPortraitUpsideDown</string>
        </array>
 </dict>
-</plist>
+</plist>
\ No newline at end of file

diff --git a/www/bindcheck.html b/www/bindcheck.html
index 51e13e9..9e2560a 100644 (file)
--- a/www/bindcheck.html
+++ b/www/bindcheck.html
@@ -30,6 +30,9 @@
                 <div class="weui-cell__bd">
                     <input class="weui-input" type="tel" id="code" style="font-size: 14px;" placeholder="请输入验证码" maxlength="6">
                 </div>
+                <div class="weui-cell__ft">
+                    <button class="weui-vcode-btn" onclick="app.getCode()" id="codebtn" style="width: 100px;height: 1rem;font-size: 14px;">获取验证码</button>
+                </div>
             </div>
         </div>
         <section class="aui-content-padded" style="margin-top: 30px;">

diff --git a/www/img/icon_door.png b/www/img/icon_door.png
new file mode 100644 (file)
index 0000000..b539064
Binary files /dev/null and b/www/img/icon_door.png differ

diff --git a/www/js/bindcard.js b/www/js/bindcard.js
index e9cb86c..f7e91a2 100644 (file)
--- a/www/js/bindcard.js
+++ b/www/js/bindcard.js
@@ -21,15 +21,19 @@ var app = {
                     let vals = Object.values(dict);
                     console.log(keys, vals)
                     var items=[];
+                    var selectItem=items[0];
                     for(var key of keys){
                         var bean = {
                             "title":dict[key],
                             "value":key
                         }
+                        if(key == 'idcard'){
+                            selectItem=bean;
+                        }
                         items.push(bean)
                     }
-                    $("#idtype").val(items[0].title)
-                    $("#idtype").attr("data-values",items[0].value)
+                    $("#idtype").val(selectItem.title)
+                    $("#idtype").attr("data-values",selectItem.value)
                     $("#idtype").select({
                       title: "请选择证件类型",
                       items: items
@@ -55,11 +59,10 @@ var app = {
             $.alert("请选择证件类型", "错误");
             return;
         }
-        /*var agree = $("input[type=checkbox]:checked").val();
-        if(isEmpty(agree)){
-            $.alert("请同意用户协议与隐私条款", "提示");
-            return;
-        }*/
+        cardnum = cardnum.trim();
+        name = name.trim();
+        idno = idno.trim();
+        
         $.showLoading("正在处理");
         var param = {
             "cardno": cardnum,
@@ -72,8 +75,11 @@ var app = {
                 $.hideLoading();
                 console.log(ret)
                 if (ret.code == 200) {
-                    window.localStorage.setItem("phoneX",ret.phonex);
                     window.localStorage.setItem("name", name);
+                    window.localStorage.setItem("cardno", cardnum);
+                    window.localStorage.setItem("idtype", idtype);
+                    window.localStorage.setItem("idno", idno);
+                    window.localStorage.setItem("phoneX",ret.phonex);
                     window.localStorage.setItem("personid", ret.personid);
                     window.localStorage.setItem("signed", ret.signed);
                     window.localStorage.setItem("paypwdset", ret.paypwdset);

diff --git a/www/js/bindcheck.js b/www/js/bindcheck.js
index a4214fc..32dba4c 100644 (file)
--- a/www/js/bindcheck.js
+++ b/www/js/bindcheck.js
@@ -13,6 +13,44 @@ var app = {
             phone =  window.localStorage.getItem("phone");
             $("#phone").text(phone)
         }
+        $("#codebtn").attr("disabled","disabled")
+        $("#codebtn").addClass("vcodedisabled")
+        btnTime('codebtn');
+    },
+    getCode: function() {
+        var name = window.localStorage.getItem("name");
+        var cardno = window.localStorage.getItem("cardno");
+        var idtype = window.localStorage.getItem("idtype");
+        var idno = window.localStorage.getItem("idno");
+
+        $.showLoading("正在请求");
+        var param = {
+            "cardno": cardno,
+            "idtype": idtype,
+            "name": name,
+            "idno": idno
+        }
+        V1Bindcard(param, function(ok, ret) {
+            if (ok) {
+                $.hideLoading();
+                if (ret.code == 200) {
+                   $("#codebtn").attr("disabled","disabled")
+                   $("#codebtn").addClass("vcodedisabled")
+                   btnTime('codebtn');
+                } else {
+                    if (ret.code == -1) {
+                        $.alert(ret.msg, "提示", function() {
+                            window.location = "main.html"
+                        });
+                    } else {
+                        $.alert(ret.msg, "错误");
+                    }
+                }
+            } else {
+                $.hideLoading();
+                $.alert("请求失败了 " + ret.status + "，请稍后再试", "错误");
+            }
+        })
     },
     doNext: function() {
         var code =  $("#code").val();

diff --git a/www/js/main.js b/www/js/main.js
index 90977da..4d55357 100644 (file)
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -99,6 +99,11 @@ var app = {
                 })
             })*/
         });
+        $("#doorBtn").click(function(){
+            app.checkBefore(function() {
+                showRet(DOOR_URl);
+            })
+        })
         $('#usersec').click(function() {
             app.checkBefore(function() {
                 app.checkOther(function() {
@@ -107,6 +112,13 @@ var app = {
             })
         });
         this.initData();
+        this.backBtn();
+    },
+    backBtn: function(){
+        document.addEventListener("backbutton", function(e){
+               e.preventDefault();
+               navigator.app.exitApp();
+            }, false);
     },
     initTab: function() {
         $("#maincontent").css("top", $("#maintop").height())
@@ -319,3 +331,47 @@ var app = {
     }
 };
 app.initialize();
+
+function showRet(url) {
+        if(isEmpty(url)){
+            return;
+        }
+        var userid = window.localStorage.getItem("userid"); 
+        //if (url.indexOf("yy.dlsmk.cn")>=0) {
+            if(url.indexOf("?")>0){
+                url=url+'&userid='+userid;
+            }else{
+                url=url+'?userid='+userid;
+            }
+        //}
+        console.log(url)
+        var inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', {
+            statusbar: {
+                color: '#03a9f4ff'
+            },
+            toolbar: {
+                height: 44,
+                color: '#03a9f4ff'
+            },
+            title: {
+                color: '#ffffffff',
+                showPageTitle: true
+            },
+            backButton: {
+                image: 'back.png',
+                imagePressed: 'back.png',
+                align: 'left',
+                event: 'backPressed'
+            },
+            closeButton: {
+                image: 'close.png',
+                imagePressed: 'close.png',
+                align: 'left',
+                event: 'closePressed'
+            },
+            backButtonCanClose: true
+        }).addEventListener('closePressed', function(params){
+            inAppBrowserRef.close();
+            //window.location = "main.html"
+         });
+    }

diff --git a/www/js/qrcode.js b/www/js/qrcode.js
index 4664a9b..1b5a036 100644 (file)
--- a/www/js/qrcode.js
+++ b/www/js/qrcode.js
@@ -21,8 +21,8 @@ var app = {
                     $.hideLoading();
                     var qrcode = new QRCode(document.getElementById("qrcode"), {
                       text: ret.qrcode,
-                      width: 150,
-                      height: 150,
+                      width: 200,
+                      height: 200,
                       colorDark: "#000000",
                       colorLight: "#ffffff",
                       correctLevel: QRCode.CorrectLevel.L

diff --git a/www/js/register.js b/www/js/register.js
index d10558e..f53220a 100644 (file)
--- a/www/js/register.js
+++ b/www/js/register.js
@@ -27,7 +27,6 @@ var app = {
             "platform":device.name+","+device.platform+","+device.version,
             "uuid":device.uuid
         }
-        console.log(param)
         ICheckCode(param,function(ok,ret){
             if(ok){
                 $.hideLoading();

diff --git a/www/js/server.js b/www/js/server.js
index c8eb688..64a6da6 100644 (file)
--- a/www/js/server.js
+++ b/www/js/server.js
@@ -1,10 +1,11 @@
 var dev = false;
 var SERVER = "https://yy.dlsmk.cn/payapi/mobileapi";
+var DOOR_URl = "http://172.28.43.8:8099/door/app/appMintUIindex";//门禁服务地址
 var GLOBAL_TODAY="";
 var GLOBAL_YESTERDAY="";
 var CURRENT_INDEX=1;
 if (dev) {
-    SERVER = "http://172.28.201.70:10010/payapi/mobileapi";
+    SERVER = "http://172.28.43.7:8099/payapi/mobileapi";
 }
 
 function V1Qrcode(callback) {

diff --git a/www/js/signxycheck.js b/www/js/signxycheck.js
index 4e52298..dedeb88 100644 (file)
--- a/www/js/signxycheck.js
+++ b/www/js/signxycheck.js
@@ -1,11 +1,13 @@
 var db = null;
+var canCheck = false;
+var wait = 5;
 var app = {
-
     // Application Constructor
     initialize: function() {
         document.addEventListener('deviceready', this.onDeviceReady.bind(this), false);
+        canCheck = false;
+        wait=5;
     },
-
     onDeviceReady: function() {
         $.showLoading("加载中");
         V1Bxy(function(ok, ret, err) {
@@ -15,6 +17,7 @@ var app = {
                     $("#content").html(ret.page);
                     if (isEmpty(ret.signed) || ret.signed != 'yes') {
                         $("#btn").show();
+                        app.checkTime();
                         $("#content").css("bottom", "135px");
                     } else {
                         $("#content").css("bottom", "10px");
@@ -35,6 +38,9 @@ var app = {
         })
     },
     agreeXY: function() {
+        if(!canCheck){
+            return;
+        }
         var agree = $("input[type=checkbox]:checked").val();
         if (isEmpty(agree)) {
             $.alert("请同意签约代扣协议", "提示");
@@ -58,6 +64,20 @@ var app = {
                 $.alert("请求失败了:" + ret.status + "请稍后再试", "错误");
             }
         })
+    },
+    checkTime: function(){
+      if (wait == 0) {
+        $("#signBtn").text("签约代扣协议");
+        $("#signBtn").addClass("aui-btn-info");
+        canCheck = true;
+      }else{
+        $("#signBtn").text(wait+"s 签约代扣协议");
+        wait--;
+         setTimeout(function() {
+              app.checkTime();
+            },1000)
+      }
     }
+
 };
 app.initialize();
\ No newline at end of file

diff --git a/www/main.html b/www/main.html
index b6a2d8c..e788ea0 100644 (file)
--- a/www/main.html
+++ b/www/main.html
@@ -44,6 +44,10 @@
                             <div class="center-in"><img src="img/icon_securty.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="doorBtn">
+                            <div class="center-in"><img src="img/icon_door.png" style="width:28px;height: 28px"></div>
+                            <div class="aui-grid-label" style="margin-top:10px;">远程开门</div>
+                        </div>
                     </div>
                 </div>
             </section>

diff --git a/www/signxycheck.html b/www/signxycheck.html
index ece02b5..17a1989 100644 (file)
--- a/www/signxycheck.html
+++ b/www/signxycheck.html
@@ -33,7 +33,7 @@
                 </label>
             </div>
             <section class="aui-content-padded" style="margin-top: 20px;">
-                <div class="aui-btn aui-btn-block aui-btn-info"  tapmode onclick="app.agreeXY()">签约代扣协议</div>
+                <div class="aui-btn aui-btn-block "  tapmode onclick="app.agreeXY()" id="signBtn">签约代扣协议</div>
             </section>
     </div>
 </body>