From: qiaowei Date: Fri, 15 Nov 2019 02:27:57 +0000 (+0800) Subject: 大理需求：绑定银行卡时银行卡号和身份证号去空格，60s之后重复发，注意：安卓版本使用的是platforms/android目录下代码，不能覆盖，里面做了特殊代码修改 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=5f8f92fe5cdd19bef017794ff147355ad6c3b622;p=dali_platform%2Fmobile.git 大理需求：绑定银行卡时银行卡号和身份证号去空格，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 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 --- 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 --- 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 --- 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 --- a/platforms/android/app/src/main/assets/www/main.html +++ b/platforms/android/app/src/main/assets/www/main.html @@ -189,7 +189,7 @@ -
+
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 --- a/platforms/android/app/src/main/assets/www/security.html +++ b/platforms/android/app/src/main/assets/www/security.html @@ -50,9 +50,7 @@ -
- 退出登录 -
+
diff --git a/platforms/browser/config.xml b/platforms/browser/config.xml index b0a0bfa..429c4a8 100644 --- a/platforms/browser/config.xml +++ b/platforms/browser/config.xml @@ -1,5 +1,5 @@ - + dlapp A sample Apache Cordova application that responds to the deviceready event. @@ -34,4 +34,5 @@ + diff --git a/platforms/ios/dlapp.xcarchive/Info.plist b/platforms/ios/dlapp.xcarchive/Info.plist index 6a13a29..6dfc268 100644 --- a/platforms/ios/dlapp.xcarchive/Info.plist +++ b/platforms/ios/dlapp.xcarchive/Info.plist @@ -20,7 +20,7 @@ ArchiveVersion 2 CreationDate - 2019-09-26T03:33:22Z + 2019-10-15T06:27:42Z Name dlapp SchemeName 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 --- 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 @@ Assets.car - g8zkpxmqkYLNeSWR12e1gNQYWTY= + MI34mk5EtOkVCHYwJBxmd39rUbk= Frameworks/libswiftAVFoundation.dylib - 8Qj0lW0Ymvy5KyAWLJHwYSk6u+U= + BBuJ8uNJrWrURIdexWl4e+vXAvA= Frameworks/libswiftCore.dylib - 2uXteUPyAvfHG476W5U8cUjZHx0= + pTbPSHWWYG/yscK8pmh9JLGa/gU= Frameworks/libswiftCoreAudio.dylib - v6VcOdQFWvRkIl4ot9I3OPjYVH0= + DsyD0FTqKYXHdKQ8o342ImVv/7Q= Frameworks/libswiftCoreFoundation.dylib - Zi64xPHRsx39JoIsd+FL0ZQu81o= + m6o/BG4l4chH3kGhzkxMA8Lh4fs= Frameworks/libswiftCoreGraphics.dylib - m7c9XriI9UvRELbZP7K+j+ypGsE= + peI1hRvkz/2wJYUVhxcjJ5AZJ/w= Frameworks/libswiftCoreImage.dylib - /JAWw3eLhtYii8EaproxWv4OZ/M= + v4j+K3FiRAz0UoIhS/aE9kwxpHc= Frameworks/libswiftCoreMedia.dylib - VBxFpSMpOnOyxdhr7fFmNfYltYY= + BPp/U4KnUvs/EIcuSuyjUEiCunM= Frameworks/libswiftDarwin.dylib - TzQzDoWlyGOG+LxX/bq5utRJs/s= + Rl5le1b8dTOLgzeejpIkLEFsgfM= Frameworks/libswiftDispatch.dylib - CPl5Gsoy+SEzLF4TP5caS627GWY= + ZwVOe6/BFZQXWdo7M3VhyJC3TM8= Frameworks/libswiftFoundation.dylib - aXmoTPmqDfxQp/HFMCdCG4/5COk= + QprHd55Ei5gjTxPmBVMkw0JfYAo= Frameworks/libswiftMetal.dylib - xPaIpCnJ+DSZwkJceploiwt6Pq8= + 6pTO4txXfyz4hfKC7qOe2ZdJ1dg= Frameworks/libswiftObjectiveC.dylib - fVmGxWQRRqnOcfdNBoZByuBlVgc= + Vfj4ZqWFmvVgPHMkJXGsKnjVkig= Frameworks/libswiftQuartzCore.dylib - v81eB3IUtC9er+KovxdS1KLgDxw= + vC9jL88UMDMhknN4r/y6P4p8IIU= Frameworks/libswiftSwiftOnoneSupport.dylib - uk8eGXXRu+UEjRYEHuNBxqEElfo= + 3Rz7pIIRUUs4BJrkfMth2M8Z9K0= Frameworks/libswiftUIKit.dylib - 7g0O3uLYgaPNe2b0FPLlcfJsLMU= + 0tEY9Ldxj6zceqZg2JXlDnHhDS8= Frameworks/libswiftos.dylib - wjhieac5H3WQl8RMgjJm/Q6sinM= + A1vyKE/09WJVYoo7x0E3+ZVXeBM= Frameworks/libswiftsimd.dylib - 8JFWbSQfhpLwLvQIw/1WuTICIGs= + Q9gxSQV8yq+0XtSjd4c3qCNqghU= Info.plist @@ -198,7 +198,7 @@ MainViewController.nib - cjvTFQXfZRdmAYsSW398uuCbmBA= + h27QShEEqp2YliUGmzbvowlsX9I= PkgInfo @@ -332,6 +332,10 @@ vCr7vtkPuVHx3XBpJF0QrFYmg48= + www/img/icon_door.png + + E6FWxSYsDIGsPRaxE+kIGDk9DJQ= + www/img/icon_header.png 4drNX8zyyrek1c2JXqfXQR2KfZI= @@ -526,7 +530,7 @@ www/js/main.js - QSdOeA6BefLzgiGbSEou4rGjHqo= + 0GJu73OFCX3YlRcB4DWzCmggX94= www/js/mobile.js @@ -562,7 +566,7 @@ www/js/server.js - jp9NlgHW1O72GXbxGb4cmcCVw+w= + 7hP5JogQrZX3Y7gz7anbjekAU1k= www/js/signxy.js @@ -586,7 +590,7 @@ www/main.html - sV+PofATUmBIxpJeRyO928SNbfc= + PEdyDAoIJ4z2Zwdw7nZQKul7P9M= www/main1.html @@ -1273,198 +1277,198 @@ hash - g8zkpxmqkYLNeSWR12e1gNQYWTY= + MI34mk5EtOkVCHYwJBxmd39rUbk= hash2 - hGZP6DsKlLJF9P4lCwrh3qAYrMMrR0Occ4xRUmvB0Ck= + uO+oqQYOdNiKEekqzK4ijCuCF/a4db6Mq2/LLL5vdf0= Frameworks/libswiftAVFoundation.dylib hash - 8Qj0lW0Ymvy5KyAWLJHwYSk6u+U= + BBuJ8uNJrWrURIdexWl4e+vXAvA= hash2 - v2O6O1GGrVVAsfEYjnL8E1hQXMzlFHfpzFUMk8BTeTQ= + d7GBGJ88UJXlcjpidc9UpdiVDowkgZKRfhEp6wUJ3Ns= Frameworks/libswiftCore.dylib hash - 2uXteUPyAvfHG476W5U8cUjZHx0= + pTbPSHWWYG/yscK8pmh9JLGa/gU= hash2 - TWGfJk+0MT16isdzShKr59MX6DvSCRXWxIg3MPqOP7w= + jblnNK1CWUwV17+/SUKyUv4Fmb4siTscmDzLy2PzalQ= Frameworks/libswiftCoreAudio.dylib hash - v6VcOdQFWvRkIl4ot9I3OPjYVH0= + DsyD0FTqKYXHdKQ8o342ImVv/7Q= hash2 - dtxhnx2+ZA57b0cQnwC7KIRzcwf2GTJnSJArY/BKcKQ= + asjY2hknIzUab1BxkSMdcSn3ee03/69poDXj6hLXwmE= Frameworks/libswiftCoreFoundation.dylib hash - Zi64xPHRsx39JoIsd+FL0ZQu81o= + m6o/BG4l4chH3kGhzkxMA8Lh4fs= hash2 - Z5gGPTEtndo0LQprh2y2G//esdzINHviqwJILb8a6vk= + pZBaz9EW7u38t7hqTe0TDFsNFrdQBKnGW/+ZXMBMhss= Frameworks/libswiftCoreGraphics.dylib hash - m7c9XriI9UvRELbZP7K+j+ypGsE= + peI1hRvkz/2wJYUVhxcjJ5AZJ/w= hash2 - l/HNmRQFWzUXzRv4xBDeHKvePCEiO7hExLq0d9fe9mI= + kBO8Kl3ds8wsnUOYL32g9BUEwELWNjAXAhpGA21+HKA= Frameworks/libswiftCoreImage.dylib hash - /JAWw3eLhtYii8EaproxWv4OZ/M= + v4j+K3FiRAz0UoIhS/aE9kwxpHc= hash2 - /BonXWVlfvAGk4ofEjuuwtKZcXo2pHILvim59W3JTs8= + nac0nVGh8w40GNw+4tWE//3bl9iYMIFzW4vmI/j0xJM= Frameworks/libswiftCoreMedia.dylib hash - VBxFpSMpOnOyxdhr7fFmNfYltYY= + BPp/U4KnUvs/EIcuSuyjUEiCunM= hash2 - jWDKTymB6McXNkHsz6ltHJOaDX1LrVOlyRPh+JsqAew= + U3QuWNbGqePs/LgfOxB9hU/lNooMogZWgnvRpcbgftM= Frameworks/libswiftDarwin.dylib hash - TzQzDoWlyGOG+LxX/bq5utRJs/s= + Rl5le1b8dTOLgzeejpIkLEFsgfM= hash2 - OHAb3OyhZOJSvH5/FtuU3rQh7Gztifi3DqqDec5jMnw= + aFXxvzO47QW6Yuw8F31XrkEAPIZ518pYm3HajzW0hJ4= Frameworks/libswiftDispatch.dylib hash - CPl5Gsoy+SEzLF4TP5caS627GWY= + ZwVOe6/BFZQXWdo7M3VhyJC3TM8= hash2 - u3kJECdKSg4eKbhDS+QmU6GBs/jQdHm1rBEqzLgQfxs= + HPX9eGXjnf04VcRF9oQpnCh/tDfurqRzU9TJaSpY4pU= Frameworks/libswiftFoundation.dylib hash - aXmoTPmqDfxQp/HFMCdCG4/5COk= + QprHd55Ei5gjTxPmBVMkw0JfYAo= hash2 - XRG6C/d3ESRa2YIxg2ludYWLFJZjbJXxns4rBXNEE6c= + qBHE5OUugUs5FnLR7A6gKW4VwCHYHMhAU+DrKQnNlQE= Frameworks/libswiftMetal.dylib hash - xPaIpCnJ+DSZwkJceploiwt6Pq8= + 6pTO4txXfyz4hfKC7qOe2ZdJ1dg= hash2 - JxZNz3OOkQ85DZGfZdarb++dRNNPjsIMbKuYuegX3bA= + EhdUiIrVd7iF8MhxoNg0fQtL8y07sba269/5Lc8VLFA= Frameworks/libswiftObjectiveC.dylib hash - fVmGxWQRRqnOcfdNBoZByuBlVgc= + Vfj4ZqWFmvVgPHMkJXGsKnjVkig= hash2 - SlDXeFJtdcw5OU0mSxtr24SWrJk7DhHoqH2Kc1wPn/Q= + xd8CDu0sjqbrupXDENHFR4DZj7gc6YGcEstyRUa9iOg= Frameworks/libswiftQuartzCore.dylib hash - v81eB3IUtC9er+KovxdS1KLgDxw= + vC9jL88UMDMhknN4r/y6P4p8IIU= hash2 - fELviAuzeIrdBNyow1tenv/lTjpcnZxZ+f22ABeKzE8= + LVpsrClPMhwoCxYgGdvl6oFT/d4TK2wDp5icwZyD+8g= Frameworks/libswiftSwiftOnoneSupport.dylib hash - uk8eGXXRu+UEjRYEHuNBxqEElfo= + 3Rz7pIIRUUs4BJrkfMth2M8Z9K0= hash2 - z18X0FoF4w+dBoXxWnl7EqOTUy/j2pj/V8AC0N07emY= + MsKil6JqwHfu4+8fStyHf3RpXOBPSs0JdyxrAQxBWuw= Frameworks/libswiftUIKit.dylib hash - 7g0O3uLYgaPNe2b0FPLlcfJsLMU= + 0tEY9Ldxj6zceqZg2JXlDnHhDS8= hash2 - yncCZEKhCnGN/35HMO1XzmBeMnlWe7DoFxSyBe2hH2k= + klDw4B7e7ynMPKIJ1GhZpBFjE5WEJ2h71dkIGj0GraE= Frameworks/libswiftos.dylib hash - wjhieac5H3WQl8RMgjJm/Q6sinM= + A1vyKE/09WJVYoo7x0E3+ZVXeBM= hash2 - mneq7YCMTdC9JxEwrugMQw/2d6nDckL8vAarcPrPnZM= + xY7vJEHoJdTu/o0ZpKxTJSllUToMl6Ad6eCSfkhQN6k= Frameworks/libswiftsimd.dylib hash - 8JFWbSQfhpLwLvQIw/1WuTICIGs= + Q9gxSQV8yq+0XtSjd4c3qCNqghU= hash2 - nmCbJjUc3G0t1bp2bf9qNCoS7J0Cj1aQ7W0j+uKJ5hg= + JjSEYizqevaXQNra2PZx9+82xduqZlc+vVRIfuSSzWA= JPushConfig.plist @@ -1592,11 +1596,11 @@ hash - cjvTFQXfZRdmAYsSW398uuCbmBA= + h27QShEEqp2YliUGmzbvowlsX9I= hash2 - 5ztrKpbIHJlcfYR5qM4ZanQy00wZABi1MFbtuiwXcDU= + QDd8NaAdWQLfXjj1XMvoaqVfhmYvLf9OwrQ0CPKsob4= config.xml @@ -1951,6 +1955,17 @@ hPSk5dHQm6MvF2+feqJSsDTJQNYGGQ3l11IWBmS4agA= + www/img/icon_door.png + + hash + + E6FWxSYsDIGsPRaxE+kIGDk9DJQ= + + hash2 + + eEjCqJA0jSeRHXkI3aSwKtj3lsZgfKuAiEbxqaJhGgg= + + www/img/icon_header.png hash @@ -2483,11 +2498,11 @@ hash - QSdOeA6BefLzgiGbSEou4rGjHqo= + 0GJu73OFCX3YlRcB4DWzCmggX94= hash2 - 1nAaMqlGuQgqChazP2EJpnb7aP34936TRvAuddhZZFw= + yGpzeGfw2KACSa3Hu+tA/5uXUpfDEj2LubnWxDqJxFs= www/js/mobile.js @@ -2582,11 +2597,11 @@ hash - jp9NlgHW1O72GXbxGb4cmcCVw+w= + 7hP5JogQrZX3Y7gz7anbjekAU1k= hash2 - xkxp3hfX0I2FABTvDz6d8u4ZnwK6XUy2IrW6YX4VK14= + 2ffigLo1Xa+Z/rgoGad55by5Ug4RwJz4mZ2lOkasD/c= www/js/signxy.js @@ -2648,11 +2663,11 @@ hash - sV+PofATUmBIxpJeRyO928SNbfc= + PEdyDAoIJ4z2Zwdw7nZQKul7P9M= hash2 - Ut8U/hTR51RvrtpZGoxPvr8RETQF1NBBDg11JqYeuzY= + 8D/UG2CsfJAhOus4F7r4s3uOZI76ibYPcwpvMMIZv0c= www/main1.html 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 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 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 --- 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 --- 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 --- 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 @@
账户安全
+
+
+
远程开门
+
diff --git a/platforms/ios/dlapp/dlapp-Info.plist b/platforms/ios/dlapp/dlapp-Info.plist index 6fbc115..2804c2d 100644 --- a/platforms/ios/dlapp/dlapp-Info.plist +++ b/platforms/ios/dlapp/dlapp-Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.4 + 1.0.5 CFBundleSignature ???? CFBundleVersion @@ -40,11 +40,11 @@ NSCameraUsageDescription APP需要使用您的相机权限，没有该权限将无法完成扫一扫功能 NSFaceIDUsageDescription - + NSMainNibFile - + NSMainNibFile~ipad - + NSPhotoLibraryUsageDescription APP需要使用您的相册权限，没有该权限将无法完成扫一扫功能 UIBackgroundModes @@ -70,4 +70,4 @@ UIInterfaceOrientationPortraitUpsideDown - + \ No newline at end of file diff --git a/www/bindcheck.html b/www/bindcheck.html index 51e13e9..9e2560a 100644 --- a/www/bindcheck.html +++ b/www/bindcheck.html @@ -30,6 +30,9 @@
+
+ +
diff --git a/www/img/icon_door.png b/www/img/icon_door.png new file mode 100644 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/www/main.html +++ b/www/main.html @@ -44,6 +44,10 @@
账户安全
+
+
+
远程开门
+
diff --git a/www/signxycheck.html b/www/signxycheck.html index ece02b5..17a1989 100644 --- a/www/signxycheck.html +++ b/www/signxycheck.html @@ -33,7 +33,7 @@
-
签约代扣协议
+
签约代扣协议