From: qiaowei Date: Thu, 11 Jul 2019 08:43:54 +0000 (+0800) Subject: 修改绑定功能 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=60c27e437b90b44e8883645469406334698b8521;p=dali_platform%2Fmobile.git 修改绑定功能 --- diff --git a/.gitignore b/.gitignore index edf24b6..77b125f 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ platforms/android/CordovaLib/build platforms/android/CordovaLib/gen platforms/android/CordovaLib/local.properties platforms/android/app/src/main/assets/www + # wp8 platforms/wp8/bin platforms/wp8/obj diff --git a/build.json b/build.json new file mode 100644 index 0000000..3d10d93 --- /dev/null +++ b/build.json @@ -0,0 +1,18 @@ +{ + "android": { + "debug": { + "keystore": "release-key.keystore", + "storePassword": "kingstar", + "alias": "dlapp-supwisdom", + "password" : "kingstar", + "keystoreType": "" + }, + "release": { + "keystore": "release-key.keystore", + "storePassword": "kingstar", + "alias": "dlapp-supwisdom", + "password" : "kingstar", + "keystoreType": "" + } + } +} \ No newline at end of file diff --git a/config.xml b/config.xml index af731f8..a20cd9e 100644 --- a/config.xml +++ b/config.xml @@ -7,8 +7,9 @@ Apache Cordova Team - + + diff --git a/platforms/android/CordovaLib/CordovaLib.iml b/platforms/android/CordovaLib/CordovaLib.iml new file mode 100644 index 0000000..b80b08f --- /dev/null +++ b/platforms/android/CordovaLib/CordovaLib.iml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platforms/android/android.iml b/platforms/android/android.iml new file mode 100644 index 0000000..f0a5ac2 --- /dev/null +++ b/platforms/android/android.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platforms/android/app/app.iml b/platforms/android/app/app.iml new file mode 100644 index 0000000..2f4beb8 --- /dev/null +++ b/platforms/android/app/app.iml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle index 871aabb..3ce2e04 100644 --- a/platforms/android/app/build.gradle +++ b/platforms/android/app/build.gradle @@ -177,8 +177,8 @@ android { abortOnError false; } - compileSdkVersion cdvCompileSdkVersion - buildToolsVersion cdvBuildToolsVersion + compileSdkVersion 24 + buildToolsVersion '28.0.3' // This code exists for Crosswalk and other Native APIs. // By default, we multiply the existing version code in the @@ -264,7 +264,7 @@ android { dependencies { - implementation fileTree(dir: 'libs', include: '*.jar') + implementation fileTree(include: '*.jar', dir: 'libs') // SUB-PROJECT DEPENDENCIES START implementation(project(path: ":CordovaLib")) implementation "com.squareup.okhttp3:okhttp-urlconnection:3.10.0" diff --git a/platforms/android/app/src/main/assets/www/bill.html b/platforms/android/app/src/main/assets/www/bill.html index e70285f..e2b99b1 100644 --- a/platforms/android/app/src/main/assets/www/bill.html +++ b/platforms/android/app/src/main/assets/www/bill.html @@ -16,7 +16,7 @@
- +
账单
diff --git a/platforms/android/app/src/main/assets/www/billdetail.html b/platforms/android/app/src/main/assets/www/billdetail.html index 8bbde06..e419a98 100644 --- a/platforms/android/app/src/main/assets/www/billdetail.html +++ b/platforms/android/app/src/main/assets/www/billdetail.html @@ -16,7 +16,7 @@
- +
账单详情
diff --git a/platforms/android/app/src/main/assets/www/index.html b/platforms/android/app/src/main/assets/www/index.html index 4afb0bf..576b5e9 100644 --- a/platforms/android/app/src/main/assets/www/index.html +++ b/platforms/android/app/src/main/assets/www/index.html @@ -26,4 +26,5 @@ \ No newline at end of file diff --git a/platforms/android/app/src/main/assets/www/js/bill.js b/platforms/android/app/src/main/assets/www/js/bill.js index 4b0bca5..c0af3fd 100644 --- a/platforms/android/app/src/main/assets/www/js/bill.js +++ b/platforms/android/app/src/main/assets/www/js/bill.js @@ -9,6 +9,9 @@ var app = { curpage = 1; this.loadBill(curpage) }, + toBack: function (){ + window.history.back(); + }, loadBill:function(pageno){ $.showLoading("加载中"); var param={ diff --git a/platforms/android/app/src/main/assets/www/js/billdetail.js b/platforms/android/app/src/main/assets/www/js/billdetail.js index 057b106..3615234 100644 --- a/platforms/android/app/src/main/assets/www/js/billdetail.js +++ b/platforms/android/app/src/main/assets/www/js/billdetail.js @@ -8,6 +8,9 @@ var app = { onDeviceReady: function() { this.loadBill() }, + toBack: function (){ + window.history.back(); + }, loadBill: function() { var refno = window.localStorage.getItem("currentrefno"); if (isEmpty(refno)) { 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 53ac0cf..649098d 100644 --- a/platforms/android/app/src/main/assets/www/js/bindcard.js +++ b/platforms/android/app/src/main/assets/www/js/bindcard.js @@ -29,7 +29,7 @@ var app = { }*/ $.showLoading("正在处理"); var param={ - "card":cardnum, + "cardno":cardnum, "code":code, "name":name } diff --git a/platforms/android/app/src/main/assets/www/js/card.js b/platforms/android/app/src/main/assets/www/js/card.js index 0c0a91e..8dc9675 100644 --- a/platforms/android/app/src/main/assets/www/js/card.js +++ b/platforms/android/app/src/main/assets/www/js/card.js @@ -4,17 +4,17 @@ var app = { initialize: function() { document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); }, - + onDeviceReady: function() { var uid = window.localStorage.getItem("uid"); - + }, doNext: function() { - var pwd = $("#pwd").val(); - if(isEmpty(pwd)){ + var pwd = $("#pwd").val(); + if (isEmpty(pwd)) { return; } - if(pwd.length!=6){ + if (pwd.length != 6) { $.alert("支付密码为6位数字", "提示"); return; } @@ -26,24 +26,26 @@ var app = { }, function(ret) { if (ret.buttonIndex == 2) { $.showLoading("正在处理"); - var param={ - "paypwd":pwd + var param = { + "paypwd": pwd } - V1CardLost(param,function(ok,ret){ - if(ok){ + V1CardLost(param, function(ok, ret) { + if (ok) { $.hideLoading(); - if(ret.code==200){ - $.alert("卡片挂失成功", "提示"); - }else{ + if (ret.code == 200) { + $.alert("卡片挂失成功", "提示", function() { + window.location = "main.html" + }); + } else { $.alert(ret.msg, "错误"); - } - }else{ + } + } else { $.hideLoading(); - $.alert("请求失败了"+ret.status+"，请稍后再试", "错误"); + $.alert("请求失败了" + ret.status + "，请稍后再试", "错误"); } }) } }) } }; -app.initialize(); +app.initialize(); \ No newline at end of file diff --git a/platforms/android/app/src/main/assets/www/js/login.js b/platforms/android/app/src/main/assets/www/js/login.js index 77b8b2a..ab55032 100644 --- a/platforms/android/app/src/main/assets/www/js/login.js +++ b/platforms/android/app/src/main/assets/www/js/login.js @@ -23,6 +23,7 @@ var app = { window.location = "findpwd.html"; }, login: function(){ + window.location = "main.html"; //loading("正在处理"); var phone = $("#phone").val() var pwd = $("#pwd").val() 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 87d6f53..3b01a2a 100644 --- a/platforms/android/app/src/main/assets/www/js/main.js +++ b/platforms/android/app/src/main/assets/www/js/main.js @@ -2,6 +2,7 @@ var app = { // Application Constructor initialize: function() { + this.initTab(); document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); }, @@ -42,19 +43,47 @@ var app = { }); $('#secBtn').click(function() { app.checkBefore(function() { - window.location = "security.html"; + app.checkOther(function() { + window.location = "security.html"; + }) }) }); $('#usersec').click(function() { app.checkBefore(function() { - window.location = "security.html"; + app.checkOther(function() { + window.location = "security.html"; + }) }) }); this.initData(); }, + initTab:function(){ + $("#maincontent").css("top", $("#maintop").height()) + var tab = new auiTab({ + element: document.getElementById("footer"), + }, function(ret) { + window.localStorage.setItem("tabindex",ret.index); + + changeTab(ret.index); + }); + var tabindex = window.localStorage.getItem("tabindex"); + if(!tabindex||tabindex==0){ + tabindex = 1 + } + changeTab(tabindex); + tab.setActive(tabindex) + function changeTab(index){ + if (index == 1) { + $("#main1").show(); + $("#main2").hide(); + } else if (index == 2) { + $("#main1").hide(); + $("#main2").show(); + } + } + }, initData: function() { this.loadBill() - }, loadBill: function() { $("#loaddata").show() @@ -122,7 +151,7 @@ var app = { $("#loaddata").hide() $("#nodata").hide(); $("#billcontent").show(); - + }, initView: function() { var userid = window.localStorage.getItem("userid"); @@ -210,18 +239,18 @@ var app = { } } }, - toSign:function(){ + toSign: function() { window.location = 'signxycheck.html' }, toBillDetail: function(refno) { window.localStorage.setItem("currentrefno", refno); window.location = 'billdetail.html'; }, - toCard:function(){ + toCard: function() { var userid = window.localStorage.getItem("userid"); if (isEmpty(userid)) { window.location = 'bindcard.html' - }else{ + } else { window.location = 'cardinfor.html' } } diff --git a/platforms/android/app/src/main/assets/www/main.html b/platforms/android/app/src/main/assets/www/main.html index 57c416c..b6a2d8c 100644 --- a/platforms/android/app/src/main/assets/www/main.html +++ b/platforms/android/app/src/main/assets/www/main.html @@ -258,18 +258,6 @@ + \ No newline at end of file diff --git a/platforms/android/app/src/main/assets/www/register.html b/platforms/android/app/src/main/assets/www/register.html index 34e5998..640b3ee 100644 --- a/platforms/android/app/src/main/assets/www/register.html +++ b/platforms/android/app/src/main/assets/www/register.html @@ -15,7 +15,7 @@
- +
注册
diff --git a/platforms/android/app/src/main/assets/www/security.html b/platforms/android/app/src/main/assets/www/security.html index d9811ec..6994b22 100644 --- a/platforms/android/app/src/main/assets/www/security.html +++ b/platforms/android/app/src/main/assets/www/security.html @@ -15,7 +15,7 @@
- +
账户安全
diff --git a/platforms/android/app/src/main/java/org/apache/cordova/statusbar/StatusBar.java b/platforms/android/app/src/main/java/org/apache/cordova/statusbar/StatusBar.java index 714c30e..09a38b9 100644 --- a/platforms/android/app/src/main/java/org/apache/cordova/statusbar/StatusBar.java +++ b/platforms/android/app/src/main/java/org/apache/cordova/statusbar/StatusBar.java @@ -60,10 +60,23 @@ public class StatusBar extends CordovaPlugin { window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); // Read 'StatusBarBackgroundColor' from config.xml, default is #000000. - setStatusBarBackgroundColor(preferences.getString("StatusBarBackgroundColor", "#000000")); + //setStatusBarBackgroundColor(preferences.getString("StatusBarBackgroundColor", "#000000")); // Read 'StatusBarStyle' from config.xml, default is 'lightcontent'. - setStatusBarStyle(preferences.getString("StatusBarStyle", "lightcontent")); + //setStatusBarStyle(preferences.getString("StatusBarStyle", "lightcontent")); + //window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); // 添加半透明状态栏 + + // window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUND); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { + window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); + window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); + window.setStatusBarColor(Color.TRANSPARENT); + window.getDecorView().setFitsSystemWindows(true); + } } }); } diff --git a/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png index 5384261..4edb4c6 100644 Binary files a/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 5384261..4edb4c6 100644 Binary files a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-hdpi/icon.png b/platforms/android/app/src/main/res/mipmap-hdpi/icon.png deleted file mode 100644 index 4edb4c6..0000000 Binary files a/platforms/android/app/src/main/res/mipmap-hdpi/icon.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png index 203223a..0508de6 100644 Binary files a/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png index c5fcaeb..0508de6 100644 Binary files a/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-ldpi/icon.png b/platforms/android/app/src/main/res/mipmap-ldpi/icon.png deleted file mode 100644 index 0508de6..0000000 Binary files a/platforms/android/app/src/main/res/mipmap-ldpi/icon.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png index 8ca658e..ed81661 100644 Binary files a/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index a18167b..ed81661 100644 Binary files a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-mdpi/icon.png b/platforms/android/app/src/main/res/mipmap-mdpi/icon.png deleted file mode 100644 index ed81661..0000000 Binary files a/platforms/android/app/src/main/res/mipmap-mdpi/icon.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png index ae324f2..b764a7e 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 9e3eec3..b764a7e 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xhdpi/icon.png b/platforms/android/app/src/main/res/mipmap-xhdpi/icon.png deleted file mode 100644 index b764a7e..0000000 Binary files a/platforms/android/app/src/main/res/mipmap-xhdpi/icon.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png index 7983ef4..3c7efa4 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index a569289..3c7efa4 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xxhdpi/icon.png b/platforms/android/app/src/main/res/mipmap-xxhdpi/icon.png deleted file mode 100644 index 3c7efa4..0000000 Binary files a/platforms/android/app/src/main/res/mipmap-xxhdpi/icon.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png b/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png index 6857bef..8c027a7 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png and b/platforms/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher_foreground.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 3c322f2..8c027a7 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xxxhdpi/icon.png b/platforms/android/app/src/main/res/mipmap-xxxhdpi/icon.png deleted file mode 100644 index 8c027a7..0000000 Binary files a/platforms/android/app/src/main/res/mipmap-xxxhdpi/icon.png and /dev/null differ diff --git a/platforms/android/app/src/main/res/values/strings.xml b/platforms/android/app/src/main/res/values/strings.xml index e68e2c4..04fccc7 100644 --- a/platforms/android/app/src/main/res/values/strings.xml +++ b/platforms/android/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ dlapp - 大理APP + 大理市民卡 @string/launcher_name diff --git a/platforms/android/app/src/main/res/xml/config.xml b/platforms/android/app/src/main/res/xml/config.xml index 0bff711..e81ee23 100644 --- a/platforms/android/app/src/main/res/xml/config.xml +++ b/platforms/android/app/src/main/res/xml/config.xml @@ -34,7 +34,7 @@ - dlapp + dlapp A sample Apache Cordova application that responds to the deviceready event. diff --git a/platforms/android/debug-signing.properties b/platforms/android/debug-signing.properties new file mode 100644 index 0000000..7fc2a24 --- /dev/null +++ b/platforms/android/debug-signing.properties @@ -0,0 +1,6 @@ +# This file is automatically generated. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +key.store=/Users/shuwei/works2/cordova/dlapp/release-key.keystore +key.alias=dlapp-supwisdom +key.store.password=kingstar +key.alias.password=kingstar diff --git a/platforms/android/release-signing.properties b/platforms/android/release-signing.properties new file mode 100644 index 0000000..7fc2a24 --- /dev/null +++ b/platforms/android/release-signing.properties @@ -0,0 +1,6 @@ +# This file is automatically generated. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +key.store=/Users/shuwei/works2/cordova/dlapp/release-key.keystore +key.alias=dlapp-supwisdom +key.store.password=kingstar +key.alias.password=kingstar diff --git a/platforms/browser/config.xml b/platforms/browser/config.xml index df4c7f6..05a30f1 100644 --- a/platforms/browser/config.xml +++ b/platforms/browser/config.xml @@ -1,6 +1,6 @@ - dlapp + dlapp A sample Apache Cordova application that responds to the deviceready event. diff --git a/platforms/ios/dlapp.xcarchive/Info.plist b/platforms/ios/dlapp.xcarchive/Info.plist index 1ea4592..ab546c0 100644 --- a/platforms/ios/dlapp.xcarchive/Info.plist +++ b/platforms/ios/dlapp.xcarchive/Info.plist @@ -20,7 +20,7 @@ ArchiveVersion 2 CreationDate - 2019-07-10T08:13:18Z + 2019-07-11T08:13:54Z 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 4dcb824..9f9c06d 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/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib deleted file mode 100644 index 4265641..0000000 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib and /dev/null differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/CDVLaunchScreen.storyboardc/Info.plist b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/CDVLaunchScreen.storyboardc/Info.plist deleted file mode 100644 index 32288e8..0000000 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/CDVLaunchScreen.storyboardc/Info.plist and /dev/null differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib deleted file mode 100644 index 450a882..0000000 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib and /dev/null 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 7bc9f2f..5d8f51d 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 672e105..5a7b766 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 8827440..55ed0e1 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 f2a71e5..57c9a54 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 4d86670..452a7cf 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 60cd94f..faacd33 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 8728cf9..84a3a0e 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 2c674dd..5faef15 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 1847643..58e5afd 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 229b24b..16d173a 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 2506dfc..2cf513d 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 4df4261..86e778f 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 0ac42bb..1915c46 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 3234957..b3f01a3 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 c884ecf..e2393fb 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 d331ee9..b0a7156 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 cfdce4f..cfe8be5 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/Info.plist b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Info.plist index ff3d497..ecc0335 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Info.plist and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Info.plist 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 1ab9c60..7a6b496 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 35f4677..f1694b6 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources @@ -102,91 +102,79 @@ Assets.car - M9y4B5f85UdyeyDoa4mw7YNN6Bk= - - CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - - DpfAvIjL3kCSfefgV671itSU7Z4= - - CDVLaunchScreen.storyboardc/Info.plist - - n2t8gsDpfE6XkhG31p7IQJRxTxU= - - CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - - iq85hsiCVgzh8ud0xUY8MMrk/so= + 1wtgF/ExOGL1W/mA4wnDp5cHy2E= Frameworks/libswiftAVFoundation.dylib - MyWbgH+LclNwvYiky83lqJD2UnI= + bFhFecgMtM74RuBXDVR2qtNEzdE= Frameworks/libswiftCore.dylib - 4zn76y1y9gHtnbnA9xAJN3gTjfc= + 3hgQ/rk02s2dnMvPe6o7fK+MPyA= Frameworks/libswiftCoreAudio.dylib - k5MV4RdAF+U9IPs23qAxEkQ1zSY= + xIW++NG4WQ2AqZl87LaxzU51MrA= Frameworks/libswiftCoreFoundation.dylib - 1M+6tKeVk9K8z4pcj76/nX0Orp4= + Qk0gKMeM+NqBiiCpvjR/AjBeJrI= Frameworks/libswiftCoreGraphics.dylib - uqFMn/wUXGsLEyNEkJDsUvqV+1Y= + aAHvmYFzdspKiWtBVwI1+5L2gYE= Frameworks/libswiftCoreImage.dylib - pSXJcUvGBwZSSzpqxgZO9fYQpSQ= + AcxQUQItoQMqR8A/LBZeJogLNns= Frameworks/libswiftCoreMedia.dylib - 1bCvwJsFxbLj3ouPYWb1vBRiF2s= + 7X8eMN4JSjb6fH1bdFWatqIIZRQ= Frameworks/libswiftDarwin.dylib - 0eedFvcTWdCm0JCdXXbYsjbQu2k= + mdDRWQektqz4DAGLWBnCTdnSfv8= Frameworks/libswiftDispatch.dylib - nEKmyjjqaE/4KcHgQ94WgKlVbaU= + cl3JWbY6uCuYce/Pe7/O60+RjSQ= Frameworks/libswiftFoundation.dylib - cmNqhtGBh6e4ZTYjiJLbhuHRdc0= + uw2IWbZstGSgudTbIAmCz6qTkYY= Frameworks/libswiftMetal.dylib - PAm/ukk7wQ4Z7Ys9ul+Hq4PJP+E= + EQb0L/gN7hCeLHhMgc4/b6oiSWw= Frameworks/libswiftObjectiveC.dylib - 3E9JJ2xzHu8f2j5JZYfoZ+x1jMU= + FFBiWOfRpbuPMKXSaTWem9dUaiY= Frameworks/libswiftQuartzCore.dylib - gU++xPxoA7pH+w+RtHN0v1dAmqw= + +9+ghkyJl1XgWZEjfr/PHuAWa6U= Frameworks/libswiftSwiftOnoneSupport.dylib - LGWUYmpGsrLP9agzpGxQh2sK3O8= + D6TDd70LujXe+TVih2L/BcWgrCA= Frameworks/libswiftUIKit.dylib - 9LyLZC3F/xaRK32VipuXkcFiy4A= + zdFg7002veyn+u8AMRXUzg5m40I= Frameworks/libswiftos.dylib - z2KM6mxXHkBs94Ln+AnUxg3KoDo= + PMOxdcpMwmMnYQ734wG+ID3XAyA= Frameworks/libswiftsimd.dylib - qDj17iVa9j3JsBh2vsfJcrvT19g= + kIz+jWC70pLIua66e2E5iQk37v0= Info.plist - Ec2xR2CoDXFQNiK5N3/3pfMREdY= + xCcMK6i5qsOv40GndCWSWjMi70w= LaunchImage-1100-Landscape-2436h@3x.png @@ -230,7 +218,7 @@ MainViewController.nib - C9CLtoiVDlYPacBkIs+hN8qWL2w= + 0YdqkbfI8H2NNtKRO5dBoBtUB6Q= PkgInfo @@ -238,7 +226,7 @@ config.xml - AjI+ESkl36HBKYsk8ULo6f9LwCw= + O33IIDUH183cwlV6v9zaOFqmJ1o= embedded.mobileprovision @@ -246,15 +234,19 @@ www/bill.html - 1Q6bs+kjPSyg+Yl2MrIlAdkCDEM= + b3QBi0fz3wb78XRoWYnvDwcDvOY= www/billdetail.html - y/BRy2p3Q5Cx9yIIKJSruC5hdVU= + cqHtFm0XLXtu3pFFlRV0wqo3bLo= www/bindcard.html - 9PZ9wKXqzkXFm00p7Y0R3qjtldY= + tNpfSnkH292JpxhwxUczhqxxsJM= + + www/bindcheck.html + + jGx5uAhkm+a3PdC0Z5ENLMfZa+M= www/card.html @@ -398,23 +390,27 @@ www/index.html - 5T2zYcDtNLEO0qcTZGgyv5wCdsQ= + Zda9OWa9Ge/2z3SHFqU/i+MJ/Gs= www/js/bill.js - PtiPisUNF3iV9vPSlzdIpHwidUg= + ldkYDTIUC9PYeLqrzP/QCXJ/fFw= www/js/billdetail.js - Df3zwuOjyxYT1atvBcZGR3EVdh4= + ICgW8NAQBBEJmmNYuELt2HMjRtk= www/js/bindcard.js - QcQm/WcOXL3pjL8WUEBsXTDLCmQ= + 0B7mevzLJOBg0VXTUpHtZ//18PQ= + + www/js/bindcheck.js + + 5RfLHKNNVVwPSEOzS8TfUZ0lpJQ= www/js/card.js - pIuWD/nNiuDsXe2wowI2s9+3FQE= + 7aKpuRYAUQzufAe0mT4dSCySRqE= www/js/cardinfor.js @@ -442,7 +438,7 @@ www/js/index.js - 7VB6kBtU0FQ+JUAh0cbyy2dfHak= + asyakUNRxlJpE4P7WMiyTJTY97Y= www/js/lib/aui-actionsheet.js @@ -550,7 +546,7 @@ www/js/main.js - 0LqnXw5oToAfNnPBWMOt3Pj41y4= + I2Jj7RTovo4kH11m8CRuakKi3nk= www/js/mobile.js @@ -586,7 +582,7 @@ www/js/server.js - 8l2vn+ra5zayhEwQQpy1806GZX8= + 6JlWzinRBn6MsREucfIEiCvn5oA= www/js/signxy.js @@ -594,7 +590,7 @@ www/js/signxycheck.js - gDocQNgzvA/TxPmLCDCjG8iRQGQ= + OQxn/Q3V2ODyeXPO0htt940uIyM= www/js/uxy.js @@ -610,7 +606,7 @@ www/main.html - gOippmPYY80xg/JnHqP8Kpg59H8= + sV+PofATUmBIxpJeRyO928SNbfc= www/main1.html @@ -1054,7 +1050,7 @@ www/register.html - j0E17LezraXxL2i9s0tnnWrl9vw= + q/NP40bBQOZfbeq+nId2UNahWqk= www/scan.html @@ -1062,7 +1058,7 @@ www/security.html - WAAOaAVzFhUpl9ay3iHsxkW83wo= + LQqkVW0wcKOsVTN4GeoIHaLFmHA= www/signxy.html @@ -1347,231 +1343,198 @@ hash - M9y4B5f85UdyeyDoa4mw7YNN6Bk= - - hash2 - - duad8nu5wyFRXbyfel2nmGPHnx+Llq1pcjbhdANANHw= - - - CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - - hash - - DpfAvIjL3kCSfefgV671itSU7Z4= - - hash2 - - 9WZh89T9f9Hw1Fl+v0/Uob2o7H9VJAhl9TTos0k6oHo= - - - CDVLaunchScreen.storyboardc/Info.plist - - hash - - n2t8gsDpfE6XkhG31p7IQJRxTxU= + 1wtgF/ExOGL1W/mA4wnDp5cHy2E= hash2 - HyVdXMU7Ux4/KalAao30mpWOK/lEPT4gvYN09wf31cg= - - - CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - - hash - - iq85hsiCVgzh8ud0xUY8MMrk/so= - - hash2 - - ew0r9e3KiNvhfbon3lG36Fsog5H6JlAavyDmCe+DJJ0= + 9OxWSnf3xL4RNzSZKWnkIthR38wz5TwFc0KyK2fGf2g= Frameworks/libswiftAVFoundation.dylib hash - MyWbgH+LclNwvYiky83lqJD2UnI= + bFhFecgMtM74RuBXDVR2qtNEzdE= hash2 - IjpjjsSxhJkjtYt0IACD6PCrlMEsP/rFQrn+PeDRmkw= + QwcRT95IpTIMKQDFPiCcByGKzObuV+pmj2Id3bdqpE0= Frameworks/libswiftCore.dylib hash - 4zn76y1y9gHtnbnA9xAJN3gTjfc= + 3hgQ/rk02s2dnMvPe6o7fK+MPyA= hash2 - YjP5QRTvdgBOHnMpa1v378XXpHheFq7Q00dUT3ElKDU= + 9ttrw8kFAeUSnSy5qJhPcRz27NsHAZr1B0/mfwd1ASc= Frameworks/libswiftCoreAudio.dylib hash - k5MV4RdAF+U9IPs23qAxEkQ1zSY= + xIW++NG4WQ2AqZl87LaxzU51MrA= hash2 - Qn8QRhMEyKPpSFi4fpzdxS0xvCD0RDRWzOnPCOWleJw= + p+z9s2WquW8PBpoicJ5RT1O5rFm00CeAFxVBGTBRi9o= Frameworks/libswiftCoreFoundation.dylib hash - 1M+6tKeVk9K8z4pcj76/nX0Orp4= + Qk0gKMeM+NqBiiCpvjR/AjBeJrI= hash2 - WS7J8/3xUQcFUG9uPnDgeO6LRJSEubOpxNWSKXjs7jQ= + 4s9Ks0mYFnKRxOjNrEUw7EG3M0+2mStedXwqt3WEdNE= Frameworks/libswiftCoreGraphics.dylib hash - uqFMn/wUXGsLEyNEkJDsUvqV+1Y= + aAHvmYFzdspKiWtBVwI1+5L2gYE= hash2 - 8v8NzWtjlYaEngfnhNCrwis/t4uy1D/hKL9Mi0iALDA= + Z4tWoZgN/tOWnlFRwlKI0LicqJV/V43f8j/nHfT2Eow= Frameworks/libswiftCoreImage.dylib hash - pSXJcUvGBwZSSzpqxgZO9fYQpSQ= + AcxQUQItoQMqR8A/LBZeJogLNns= hash2 - EUtBS7YKQL4IFn0mPxgDgFClheyYPTa6FlklEQEbmHc= + PqMpyk3R2oowT5bGOcfb3yvMJm4GTH36YqFbmJ49MJc= Frameworks/libswiftCoreMedia.dylib hash - 1bCvwJsFxbLj3ouPYWb1vBRiF2s= + 7X8eMN4JSjb6fH1bdFWatqIIZRQ= hash2 - I/QwtpQQe3B2xT4C21p7IcQZzn4myAoQKZI850YdzHg= + gyeQw6Jm1jhba+V5UXc92OWQ0nsCdqiioRbv0uSpleQ= Frameworks/libswiftDarwin.dylib hash - 0eedFvcTWdCm0JCdXXbYsjbQu2k= + mdDRWQektqz4DAGLWBnCTdnSfv8= hash2 - y1h93Tcj4VDDnFboKwtqtUpFg8b/YzdZ4sXKQyyth4U= + S7PolSzfo9RRkDhDrSiPo2YEAfYEmm3XK0NQRFJ3zcI= Frameworks/libswiftDispatch.dylib hash - nEKmyjjqaE/4KcHgQ94WgKlVbaU= + cl3JWbY6uCuYce/Pe7/O60+RjSQ= hash2 - cRqD5x6M2KFowR26/9icxu6/UtjQxwNzP5GgUwhuiio= + 3dAtGpDTtgA2GcAANIMcpkZBa5aez+asZu+BFsa4eqk= Frameworks/libswiftFoundation.dylib hash - cmNqhtGBh6e4ZTYjiJLbhuHRdc0= + uw2IWbZstGSgudTbIAmCz6qTkYY= hash2 - /KLnMtHKigpKDNCEnguM8XW6EDo6d3+EbQTFUrw6b9Y= + dpgzlYheuxiOuytRGAnPWd4sTIlW5H9wETEDsKuOLZY= Frameworks/libswiftMetal.dylib hash - PAm/ukk7wQ4Z7Ys9ul+Hq4PJP+E= + EQb0L/gN7hCeLHhMgc4/b6oiSWw= hash2 - in88VUVfQfFw8ZOJ3lMU7LMj647arDJ6QnScyuNTtRk= + +sNCybBv1NCTK8Lpu1V4p91z8FxnpnMIrAzbpuzbVEI= Frameworks/libswiftObjectiveC.dylib hash - 3E9JJ2xzHu8f2j5JZYfoZ+x1jMU= + FFBiWOfRpbuPMKXSaTWem9dUaiY= hash2 - dfLWycynWL8swTWdAClrjvFpPyJJ5VJAtLlp4iQz5O8= + C4ja8DjlPjssQgsovQ6P9NKqw91sEhu4Bu2+XT0KSUg= Frameworks/libswiftQuartzCore.dylib hash - gU++xPxoA7pH+w+RtHN0v1dAmqw= + +9+ghkyJl1XgWZEjfr/PHuAWa6U= hash2 - R3JOsJBdYqRk1xUD3R07fNtwfqcVX6Cosrn0kNtHcOQ= + mzolCUUtouZep3PAJzf4yGgdWgHfqh1itMS/m0MF4LA= Frameworks/libswiftSwiftOnoneSupport.dylib hash - LGWUYmpGsrLP9agzpGxQh2sK3O8= + D6TDd70LujXe+TVih2L/BcWgrCA= hash2 - eE52l8payczU7l0Hpo32LG6NrMEKFNBhwOGjdRUjF0M= + LZzscOQ4Ac7xoiHWif9kzR47K8jENX/iwQA3noutxbo= Frameworks/libswiftUIKit.dylib hash - 9LyLZC3F/xaRK32VipuXkcFiy4A= + zdFg7002veyn+u8AMRXUzg5m40I= hash2 - ISC/W9w0RKMj1oo/csCey/4SY4JU2WRuBoleGbYMZmg= + DDFLfdGCgpwMjZQtLOmJjYGvNQDDZJHvXt0haIOs7hc= Frameworks/libswiftos.dylib hash - z2KM6mxXHkBs94Ln+AnUxg3KoDo= + PMOxdcpMwmMnYQ734wG+ID3XAyA= hash2 - zTvBd7YDqAgmq7JggNFuubZcYcnl70BadnOjxBUB1lM= + rQkhc+oJnh/WWfjiCeABN0t4e7iYS6eEb2S1rVFWTfE= Frameworks/libswiftsimd.dylib hash - qDj17iVa9j3JsBh2vsfJcrvT19g= + kIz+jWC70pLIua66e2E5iQk37v0= hash2 - UR+OfsV43DVSPDtQBVFoEJ9tuvOvvpfPu019PBw+0hk= + SRiywNfLGVV76m2x4Lo4lPgsXlCs+oCdr19tw07TUeM= LaunchImage-1100-Landscape-2436h@3x.png @@ -1688,22 +1651,22 @@ hash - C9CLtoiVDlYPacBkIs+hN8qWL2w= + 0YdqkbfI8H2NNtKRO5dBoBtUB6Q= hash2 - BPamdQ+XBxFRB1ecGx7xsTVexVgU6cCqM/3nSx/SDxo= + 0N2gtbHH4drQLWL34Fb9eFw5f6o+ysLy6LSeYA/f+hY= config.xml hash - AjI+ESkl36HBKYsk8ULo6f9LwCw= + O33IIDUH183cwlV6v9zaOFqmJ1o= hash2 - UdpfViruJpsDGJAY8b/SX38vV8TW44PF28Nf62U+iRg= + ExbxvWR+hO0yJrjtxpQRzs4QKpPR2lD4ssUd6lHa2DU= embedded.mobileprovision @@ -1721,33 +1684,44 @@ hash - 1Q6bs+kjPSyg+Yl2MrIlAdkCDEM= + b3QBi0fz3wb78XRoWYnvDwcDvOY= hash2 - aQ18IOK1WD+xB0HoL1rOKcacc0APEyZB0ZArD4e0ZHA= + V5904egADuCN+qIoCAJ8Wgq+zmNUYitizRQWYh49at4= www/billdetail.html hash - y/BRy2p3Q5Cx9yIIKJSruC5hdVU= + cqHtFm0XLXtu3pFFlRV0wqo3bLo= hash2 - 0RTbZ8J/3k5IrHFIcDKDK/s36izM/vPn38xQ6QQBc7A= + eBgSw3AJ1XGN6ICOgI4lpS0w5l9Rt4WghqVHpJoWORY= www/bindcard.html hash - 9PZ9wKXqzkXFm00p7Y0R3qjtldY= + tNpfSnkH292JpxhwxUczhqxxsJM= + + hash2 + + 3o4+6ntUJiLGHeu796ZgXSMtyq/NhekN2MNIUk2LR0w= + + + www/bindcheck.html + + hash + + jGx5uAhkm+a3PdC0Z5ENLMfZa+M= hash2 - zo8Ha9qzyk1B/L5POHRECSQv7lA0GI70kpuOSkDOxrQ= + xlAGhILXieaQ+He/c01QmmUhffREXODF7o31Lf64ah8= www/card.html @@ -2139,55 +2113,66 @@ hash - 5T2zYcDtNLEO0qcTZGgyv5wCdsQ= + Zda9OWa9Ge/2z3SHFqU/i+MJ/Gs= hash2 - bbbTW+ZzNRuI2n8ez38NzoUEiSfP0QKFk7A+8LLG3u8= + wCqsKKeq61a3ZMKr75zXjtFuH3SUpeRVo2AqoVo1wOE= www/js/bill.js hash - PtiPisUNF3iV9vPSlzdIpHwidUg= + ldkYDTIUC9PYeLqrzP/QCXJ/fFw= hash2 - EVNRbGJRHseLA3axCbgGcz29IGU6xOmdGFdvWIugfnE= + 06ZruQrpjAyNi+N2MNqKm3lNrw9qicpuSfr+FHlD2EQ= www/js/billdetail.js hash - Df3zwuOjyxYT1atvBcZGR3EVdh4= + ICgW8NAQBBEJmmNYuELt2HMjRtk= hash2 - FyGdQXizxc01cqVOn0QqA1F59oAIlgBekP0GYYGdBn0= + PNjIMH7Xh1rt0BEaJDkghE6nzhKQ1LeXA9vvohMWl0E= www/js/bindcard.js hash - QcQm/WcOXL3pjL8WUEBsXTDLCmQ= + 0B7mevzLJOBg0VXTUpHtZ//18PQ= hash2 - 6w5TbEgi58X6ax41nX5HNkseAndhXsBoDdMbkC5ZN0s= + RTbz/7lGwjEFRysFNUCFqZu0zLr5jrz4hYhhqEhW6co= + + + www/js/bindcheck.js + + hash + + 5RfLHKNNVVwPSEOzS8TfUZ0lpJQ= + + hash2 + + iIc+Xy+koHZAAKkSK4SrrTOz6KoHuiM/du4yk7IV3xI= www/js/card.js hash - pIuWD/nNiuDsXe2wowI2s9+3FQE= + 7aKpuRYAUQzufAe0mT4dSCySRqE= hash2 - 0uPvlo+ps3yiA4Nr0TxLLLqbo7L/kbBlTasufVbwIBo= + dHaUqiUT0kifFeKQluaSwEJROmdMQ1HJXH9pFExxSYM= www/js/cardinfor.js @@ -2260,11 +2245,11 @@ hash - 7VB6kBtU0FQ+JUAh0cbyy2dfHak= + asyakUNRxlJpE4P7WMiyTJTY97Y= hash2 - 3NRfVaJToNjIzE5ZaKN6wU1XoXox/FthPuwx1DZcyTQ= + /E23wKzs+L6w6sRklGOiQqSAtMN20zBHMCvJDzaTtA4= www/js/lib/aui-actionsheet.js @@ -2557,11 +2542,11 @@ hash - 0LqnXw5oToAfNnPBWMOt3Pj41y4= + I2Jj7RTovo4kH11m8CRuakKi3nk= hash2 - Ax5z71inU53ze1vUxVRhaQ3jST+ysuyVQ6ft9GOkIp0= + +3DiCEwGQX3VJAAfi0B9bkRsfSwDHXtcmO6S/jaoZFs= www/js/mobile.js @@ -2656,11 +2641,11 @@ hash - 8l2vn+ra5zayhEwQQpy1806GZX8= + 6JlWzinRBn6MsREucfIEiCvn5oA= hash2 - 7xi+g6PEIs8+EcyXCCGlOwVJF4gL3Opbbe7Oj9KK08g= + 9BIwn+Du4nx0VxOUv39nWFXNeN9k5+QoZyWWWetbBIA= www/js/signxy.js @@ -2678,11 +2663,11 @@ hash - gDocQNgzvA/TxPmLCDCjG8iRQGQ= + OQxn/Q3V2ODyeXPO0htt940uIyM= hash2 - Vh4NcgQQik+8mAFenFg/ixdjbZqqruikr/1UpMF7Lt0= + eW7ouno0m+7r/ecUWfaUCLB8d/xGdvBMxK+RmBI3bYQ= www/js/uxy.js @@ -2722,11 +2707,11 @@ hash - gOippmPYY80xg/JnHqP8Kpg59H8= + sV+PofATUmBIxpJeRyO928SNbfc= hash2 - FI8NhTNqHdUwCEkp/A4flZiB2KiUb7zmd9e95nWeBFM= + Ut8U/hTR51RvrtpZGoxPvr8RETQF1NBBDg11JqYeuzY= www/main1.html @@ -3943,11 +3928,11 @@ hash - j0E17LezraXxL2i9s0tnnWrl9vw= + q/NP40bBQOZfbeq+nId2UNahWqk= hash2 - Iu5z6Xp9qSJxhhkhGheMQI9Ns2tMH0hhOpULa3eMjek= + WsYPx/6kDCp5gr/e4lMTJvGzW/VDXMwvnHlWa3MjS5w= www/scan.html @@ -3965,11 +3950,11 @@ hash - WAAOaAVzFhUpl9ay3iHsxkW83wo= + LQqkVW0wcKOsVTN4GeoIHaLFmHA= hash2 - PQQQEnclRlF/NWm1k2k7h+03o0vELPqdci0FJbjkxHE= + xzEaRg38D+hgjxJoKsj3oFwfrqsYIm4s4H7MDEAsXNY= www/signxy.html diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml index 4096c07..ed6c95a 100755 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml @@ -55,7 +55,7 @@ - dlapp + dlapp A sample Apache Cordova application that responds to the deviceready event. @@ -97,6 +97,7 @@ + diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp index 1d04bf9..f844f95 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/bill.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/bill.html index e70285f..e2b99b1 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/bill.html +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/bill.html @@ -16,7 +16,7 @@
- +
账单
diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/billdetail.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/billdetail.html index 8bbde06..e419a98 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/billdetail.html +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/billdetail.html @@ -16,7 +16,7 @@
- +
账单详情
diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/bindcard.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/bindcard.html index 3ec9d26..8d2ee2f 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/bindcard.html +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/bindcard.html @@ -30,34 +30,24 @@
-
+
- +
- - -
短信验证市民卡预留的手机号
-
-
+
- +
-
-
- -
+
+
- -
-
- +
-
下一步
diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/bindcheck.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/bindcheck.html new file mode 100644 index 0000000..51e13e9 --- /dev/null +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/bindcheck.html @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + 手机验证码 + + +
+ + + +
手机验证码
+
+
+
已发送验证码到您的手机：
+
+
+
+ +
+
+ +
+
+
+
+
验证
+
+
+ + + + + + + \ No newline at end of file diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/index.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/index.html index 4afb0bf..576b5e9 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/index.html +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/index.html @@ -26,4 +26,5 @@ \ No newline at end of file diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/bill.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/bill.js index 4b0bca5..c0af3fd 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/bill.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/bill.js @@ -9,6 +9,9 @@ var app = { curpage = 1; this.loadBill(curpage) }, + toBack: function (){ + window.history.back(); + }, loadBill:function(pageno){ $.showLoading("加载中"); var param={ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/billdetail.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/billdetail.js index 057b106..3615234 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/billdetail.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/billdetail.js @@ -8,6 +8,9 @@ var app = { onDeviceReady: function() { this.loadBill() }, + toBack: function (){ + window.history.back(); + }, loadBill: function() { var refno = window.localStorage.getItem("currentrefno"); if (isEmpty(refno)) { diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/bindcard.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/bindcard.js index 53ac0cf..e9cb86c 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/bindcard.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/bindcard.js @@ -1,25 +1,58 @@ +var dict; var app = { // Application Constructor initialize: function() { document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); }, - + onDeviceReady: function() { var uid = window.localStorage.getItem("uid"); - var phone = window.localStorage.getItem("phoneX"); - if(!isEmpty(phone)){ - $("#phone").val(phone) - }else{ - phone = window.localStorage.getItem("phone"); - $("#phone").val(phone) - } + this.loadData(); + }, + loadData: function() { + $.showLoading("正在加载"); + V1Idtypes(function(ok, ret) { + if (ok) { + $.hideLoading(); + if (ret.code == 200) { + dict = ret.idtypes; + let keys = Object.keys(dict); + let vals = Object.values(dict); + console.log(keys, vals) + var items=[]; + for(var key of keys){ + var bean = { + "title":dict[key], + "value":key + } + items.push(bean) + } + $("#idtype").val(items[0].title) + $("#idtype").attr("data-values",items[0].value) + $("#idtype").select({ + title: "请选择证件类型", + items: items + }); + } else { + $.alert(ret.msg, "错误"); + } + } else { + $.hideLoading(); + $.alert("请求失败了 " + ret.status + "，请稍后再试", "错误"); + } + }) }, doNext: function() { - var code = $("#code").val(); - var cardnum = $("#cardnum").val(); - var name = $("#name").val(); - if(isEmpty(name)||isEmpty(code)||isEmpty(cardnum)){ + var cardnum = $("#cardnum").val(); + var name = $("#name").val(); + var idno = $("#idno").val(); + if (isEmpty(name) || isEmpty(cardnum)||isEmpty(idno)) { + return; + } + var idtype = $("#idtype").attr("data-values") + if(isEmpty(idtype)){ + $.alert("请选择证件类型", "错误"); return; } /*var agree = $("input[type=checkbox]:checked").val(); @@ -28,62 +61,37 @@ var app = { return; }*/ $.showLoading("正在处理"); - var param={ - "card":cardnum, - "code":code, - "name":name + var param = { + "cardno": cardnum, + "idtype": idtype, + "name": name, + "idno": idno } - V1Bindcard(param,function(ok,ret){ - if(ok){ + V1Bindcard(param, function(ok, ret) { + if (ok) { $.hideLoading(); console.log(ret) - if(ret.code==200){ - window.localStorage.setItem("paypwdtype","new"); - window.localStorage.setItem("userid",ret.userid); - window.localStorage.setItem("signed",ret.signed); - window.localStorage.setItem("name",name); - window.localStorage.setItem("paypwdset",ret.paypwdset); - if(ret.paypwdset){ - if(!isEmpty(ret.signed)&&signed=='yes'){ - window.location='main.html' - }else{ - window.location='signxy.html' - } - }else{ - window.location="paypwdset.html"; - } - }else{ - if(ret.code==-1){ - $.alert(ret.msg, "提示",function(){ - window.location="main.html" + if (ret.code == 200) { + window.localStorage.setItem("phoneX",ret.phonex); + window.localStorage.setItem("name", name); + window.localStorage.setItem("personid", ret.personid); + window.localStorage.setItem("signed", ret.signed); + window.localStorage.setItem("paypwdset", ret.paypwdset); + window.location = "bindcheck.html"; + } else { + if (ret.code == -1) { + $.alert(ret.msg, "提示", function() { + window.location = "main.html" }); - }else{ - $.alert(ret.msg, "错误"); + } else { + $.alert(ret.msg, "错误"); } - } - }else{ - $.hideLoading(); - $.alert("请求失败了 "+ret.status+"，请稍后再试", "错误"); - } - }) - }, - getCode :function(){ - $.showLoading("请求中"); - V1Code(function(ok,ret){ - if(ok){ - $.hideLoading(); - if(ret.code==200){ - $("#codebtn").attr("disabled","disabled") - $("#codebtn").addClass("vcodedisabled") - btnTime('codebtn'); - }else{ - $.alert(ret.msg, "错误"); - } - }else{ + } + } else { $.hideLoading(); - $.alert("请求失败了"+ret.status+"，请稍后再试", "错误"); + $.alert("请求失败了 " + ret.status + "，请稍后再试", "错误"); } }) } }; -app.initialize(); +app.initialize(); \ No newline at end of file diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/bindcheck.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/bindcheck.js new file mode 100644 index 0000000..a4214fc --- /dev/null +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/bindcheck.js @@ -0,0 +1,57 @@ +var dict; +var app = { + + // Application Constructor + initialize: function() { + document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); + }, + onDeviceReady: function() { + var phone = window.localStorage.getItem("phoneX"); + if(!isEmpty(phone)){ + $("#phone").text(phone) + }else{ + phone = window.localStorage.getItem("phone"); + $("#phone").text(phone) + } + }, + doNext: function() { + var code = $("#code").val(); + if(isEmpty(code)){ + return; + } + var personid = window.localStorage.getItem("personid"); + $.showLoading("正在处理"); + var param={ + "personid":personid, + "code":code, + } + V1Checkcode(param,function(ok,ret){ + if(ok){ + $.hideLoading(); + console.log(ret) + if(ret.code==200){ + window.localStorage.setItem("paypwdtype", "new"); + window.localStorage.setItem("userid", personid); + var signed = window.localStorage.getItem("signed"); + var paypwdset = window.localStorage.getItem("paypwdset"); + console.log(paypwdset) + if (!paypwdset||'false'==paypwdset) { + window.location = "paypwdset.html"; + } else { + if (!isEmpty(signed) && signed == 'yes') { + window.location = 'main.html' + } else { + window.location = 'signxy.html' + } + } + }else{ + $.alert(ret.msg, "错误"); + } + }else{ + $.hideLoading(); + $.alert("请求失败了"+ret.status+"，请稍后再试", "错误"); + } + }) + } +}; +app.initialize(); \ No newline at end of file diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/card.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/card.js index 0c0a91e..8dc9675 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/card.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/card.js @@ -4,17 +4,17 @@ var app = { initialize: function() { document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); }, - + onDeviceReady: function() { var uid = window.localStorage.getItem("uid"); - + }, doNext: function() { - var pwd = $("#pwd").val(); - if(isEmpty(pwd)){ + var pwd = $("#pwd").val(); + if (isEmpty(pwd)) { return; } - if(pwd.length!=6){ + if (pwd.length != 6) { $.alert("支付密码为6位数字", "提示"); return; } @@ -26,24 +26,26 @@ var app = { }, function(ret) { if (ret.buttonIndex == 2) { $.showLoading("正在处理"); - var param={ - "paypwd":pwd + var param = { + "paypwd": pwd } - V1CardLost(param,function(ok,ret){ - if(ok){ + V1CardLost(param, function(ok, ret) { + if (ok) { $.hideLoading(); - if(ret.code==200){ - $.alert("卡片挂失成功", "提示"); - }else{ + if (ret.code == 200) { + $.alert("卡片挂失成功", "提示", function() { + window.location = "main.html" + }); + } else { $.alert(ret.msg, "错误"); - } - }else{ + } + } else { $.hideLoading(); - $.alert("请求失败了"+ret.status+"，请稍后再试", "错误"); + $.alert("请求失败了" + ret.status + "，请稍后再试", "错误"); } }) } }) } }; -app.initialize(); +app.initialize(); \ No newline at end of file diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/index.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/index.js index ba4ea86..112a927 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/index.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/index.js @@ -41,9 +41,10 @@ var app = { if(ret.now-t>1000*60*10){ window.location = "login.html"; }else{ - window.location = "main.html"; } + }else{ + window.location = "login.html"; } } else { //alert('无法请求到服务器，请检查网络并稍后再试'); 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 87d6f53..3b01a2a 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 @@ -2,6 +2,7 @@ var app = { // Application Constructor initialize: function() { + this.initTab(); document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); }, @@ -42,19 +43,47 @@ var app = { }); $('#secBtn').click(function() { app.checkBefore(function() { - window.location = "security.html"; + app.checkOther(function() { + window.location = "security.html"; + }) }) }); $('#usersec').click(function() { app.checkBefore(function() { - window.location = "security.html"; + app.checkOther(function() { + window.location = "security.html"; + }) }) }); this.initData(); }, + initTab:function(){ + $("#maincontent").css("top", $("#maintop").height()) + var tab = new auiTab({ + element: document.getElementById("footer"), + }, function(ret) { + window.localStorage.setItem("tabindex",ret.index); + + changeTab(ret.index); + }); + var tabindex = window.localStorage.getItem("tabindex"); + if(!tabindex||tabindex==0){ + tabindex = 1 + } + changeTab(tabindex); + tab.setActive(tabindex) + function changeTab(index){ + if (index == 1) { + $("#main1").show(); + $("#main2").hide(); + } else if (index == 2) { + $("#main1").hide(); + $("#main2").show(); + } + } + }, initData: function() { this.loadBill() - }, loadBill: function() { $("#loaddata").show() @@ -122,7 +151,7 @@ var app = { $("#loaddata").hide() $("#nodata").hide(); $("#billcontent").show(); - + }, initView: function() { var userid = window.localStorage.getItem("userid"); @@ -210,18 +239,18 @@ var app = { } } }, - toSign:function(){ + toSign: function() { window.location = 'signxycheck.html' }, toBillDetail: function(refno) { window.localStorage.setItem("currentrefno", refno); window.location = 'billdetail.html'; }, - toCard:function(){ + toCard: function() { var userid = window.localStorage.getItem("userid"); if (isEmpty(userid)) { window.location = 'bindcard.html' - }else{ + } else { window.location = 'cardinfor.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 3194de9..94f7c65 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 @@ -6,6 +6,9 @@ var CURRENT_INDEX=1; if (dev) { SERVER = "http://172.28.43.3:8099/payapi/mobileapi"; } +function V1Idtypes(callback) { + ajaxPost("/v1/idtypes", {}, callback) +} function V1Cardinfor(callback) { ajaxPost("/v1/cardinfor", {}, callback) } diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/signxycheck.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/signxycheck.js index f97f3d4..4e52298 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/signxycheck.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/signxycheck.js @@ -10,17 +10,23 @@ var app = { $.showLoading("加载中"); V1Bxy(function(ok, ret, err) { if (ok) { - $.hideLoading(); - if(ret.code==200){ + $.hideLoading(); + if (ret.code == 200) { $("#content").html(ret.page); - if(isEmpty(ret.signed)||ret.signed!='yes'){ - $("#btn").show(); - $("#content").css("bottom","135px"); - }else{ - $("#content").css("bottom","10px"); + if (isEmpty(ret.signed) || ret.signed != 'yes') { + $("#btn").show(); + $("#content").css("bottom", "135px"); + } else { + $("#content").css("bottom", "10px"); + } + } else { + if (ret.code == -1) { + $.alert(ret.msg, "提示", function() { + window.location = 'bindcard.html' + }); + } else { + $.alert(ret.msg, "错误"); } - }else{ - $.alert(ret.msg, "错误"); } } else { $.hideLoading(); @@ -28,28 +34,28 @@ var app = { } }) }, - agreeXY:function(){ + agreeXY: function() { var agree = $("input[type=checkbox]:checked").val(); - if(isEmpty(agree)){ + if (isEmpty(agree)) { $.alert("请同意签约代扣协议", "提示"); return; } $.showLoading("正在请求"); - var param={ - "agree":agree + var param = { + "agree": agree } - V1Signbxy(param,function(ok, ret, err) { + V1Signbxy(param, function(ok, ret, err) { if (ok) { - $.hideLoading(); - if(ret.code==200){ - window.localStorage.setItem("signed",ret.signed); - window.location="main.html"; - }else{ + $.hideLoading(); + if (ret.code == 200) { + window.localStorage.setItem("signed", ret.signed); + window.location = "main.html"; + } else { $.alert(ret.msg, "错误"); } } else { $.hideLoading(); - $.alert("请求失败了:" + ret.status+"请稍后再试", "错误"); + $.alert("请求失败了:" + ret.status + "请稍后再试", "错误"); } }) } 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 57c416c..b6a2d8c 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 @@ -258,18 +258,6 @@ + \ No newline at end of file diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/register.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/register.html index 34e5998..640b3ee 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/register.html +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/register.html @@ -15,7 +15,7 @@
- +
注册
diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/security.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/security.html index d9811ec..6994b22 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/security.html +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/security.html @@ -15,7 +15,7 @@
- +
账户安全
diff --git a/platforms/ios/dlapp.xcodeproj/project.pbxproj b/platforms/ios/dlapp.xcodeproj/project.pbxproj index 70728ef..f9c0c1b 100755 --- a/platforms/ios/dlapp.xcodeproj/project.pbxproj +++ b/platforms/ios/dlapp.xcodeproj/project.pbxproj @@ -5,6 +5,7 @@ }; objectVersion = 46; objects = { + /* Begin PBXBuildFile section */ 0207DA581B56EA530066E2B4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0207DA571B56EA530066E2B4 /* Images.xcassets */; }; 0FBFC45D12B44FF79785B959 /* UIImage+CropScaleOrientation.m in Sources */ = {isa = PBXBuildFile; fileRef = 281DF600F6B747808087E4FC /* UIImage+CropScaleOrientation.m */; }; @@ -15,11 +16,11 @@ 302D95F114D2391D003F00A1 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 302D95EF14D2391D003F00A1 /* MainViewController.m */; }; 302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 302D95F014D2391D003F00A1 /* MainViewController.xib */; }; 3772C27945674D8D9D6BA455 /* AFURLRequestSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF1AE7251084FD2876E0BF5 /* AFURLRequestSerialization.m */; }; + 4F83621E48F143429B20FB3A /* CDVThemeableBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 28B91F31B6FD410AAF87BBDC /* CDVThemeableBrowser.m */; }; 5E2BDB8CFE4E41F39241956C /* CordovaHttpPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B9D06BD3024E0FBFF74967 /* CordovaHttpPlugin.m */; }; 5F67F2BDBB534EF4A4F1F319 /* BinaryResponseSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F753C8AE424EAE851FA1FD /* BinaryResponseSerializer.m */; }; 5F8969599D7F41909F597D14 /* AFNetworkReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FEED8E986814AC1AC60FC28 /* AFNetworkReachabilityManager.m */; }; 6561A2871EB1420892CDE701 /* AFHTTPSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 04B5E1A8BB504B8FB8CE9627 /* AFHTTPSessionManager.m */; }; - 6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */; }; 6F6B3ADF72094BF58EF5C4AC /* CDVJpegHeaderWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1836D178C8A74923B944A79E /* CDVJpegHeaderWriter.m */; }; 6FB343627AC8409CB2AA79B7 /* CDVInAppBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 607F51FCFC7C4062A93BD011 /* CDVInAppBrowser.m */; }; 74A56CC7F6724870ABD136F2 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11A34CB026314A2AA98A0044 /* AVFoundation.framework */; }; @@ -44,7 +45,6 @@ F46AE1B50D8B4A81B05D4100 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A673D8D8920E4086A9152FC4 /* Security.framework */; }; F939AD8D22BB769B006B371B /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F939AD8C22BB769B006B371B /* libsqlite3.0.tbd */; }; FDE92C386167415E8040F8AB /* AFURLResponseSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = FDEE8379D7A34C55A616F700 /* AFURLResponseSerialization.m */; }; - 4F83621E48F143429B20FB3A /* CDVThemeableBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 28B91F31B6FD410AAF87BBDC /* CDVThemeableBrowser.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -92,6 +92,7 @@ 2625E3AABA8145E6901F06D3 /* SystemConfiguration.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 265BE52D975B49ACA2F7B3FE /* CDVDevice.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVDevice.h; path = "cordova-plugin-device/CDVDevice.h"; sourceTree = ""; }; 281DF600F6B747808087E4FC /* UIImage+CropScaleOrientation.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = "UIImage+CropScaleOrientation.m"; path = "cordova-plugin-camera/UIImage+CropScaleOrientation.m"; sourceTree = ""; }; + 28B91F31B6FD410AAF87BBDC /* CDVThemeableBrowser.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVThemeableBrowser.m; path = "cordova-plugin-themeablebrowser/CDVThemeableBrowser.m"; sourceTree = ""; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 2F977C7D2E4448098AA27AE8 /* CDVAssetLibraryFilesystem.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVAssetLibraryFilesystem.h; path = "cordova-plugin-file/CDVAssetLibraryFilesystem.h"; sourceTree = ""; }; 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = CordovaLib/CordovaLib.xcodeproj; sourceTree = ""; }; @@ -114,7 +115,6 @@ 61106E22F1D348DDBDC4DC0B /* DisableStatusbar.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = DisableStatusbar.m; path = "cordova-plugin-disable-ios11-statusbar/DisableStatusbar.m"; sourceTree = ""; }; 62C24B1E8F294AC587C6D051 /* UIImage+CropScaleOrientation.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "UIImage+CropScaleOrientation.h"; path = "cordova-plugin-camera/UIImage+CropScaleOrientation.h"; sourceTree = ""; }; 683645F69456461BB8712924 /* AFNetworkReachabilityManager.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AFNetworkReachabilityManager.h; path = "cordova-plugin-advanced-http/AFNetworkReachabilityManager.h"; sourceTree = ""; }; - 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CDVLaunchScreen.storyboard; path = dlapp/CDVLaunchScreen.storyboard; sourceTree = SOURCE_ROOT; }; 6DC53FCFEEFD4EC89C2073E0 /* TextRequestSerializer.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = TextRequestSerializer.h; path = "cordova-plugin-advanced-http/TextRequestSerializer.h"; sourceTree = ""; }; 6FEED8E986814AC1AC60FC28 /* AFNetworkReachabilityManager.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFNetworkReachabilityManager.m; path = "cordova-plugin-advanced-http/AFNetworkReachabilityManager.m"; sourceTree = ""; }; 7601E9450D7240078C98ED9D /* CordovaHttpPlugin.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CordovaHttpPlugin.h; path = "cordova-plugin-advanced-http/CordovaHttpPlugin.h"; sourceTree = ""; }; @@ -142,13 +142,12 @@ EB87FDF31871DA8E0020F90C /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../../www; sourceTree = ""; }; EB87FDF41871DAF40020F90C /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = ../../config.xml; sourceTree = ""; }; ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = ""; }; + EF1A4FA720C24397A32AF09C /* CDVThemeableBrowser.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVThemeableBrowser.h; path = "cordova-plugin-themeablebrowser/CDVThemeableBrowser.h"; sourceTree = ""; }; F3A85B8119074F699E1A15CD /* LocalAuthentication.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = LocalAuthentication.framework; path = System/Library/Frameworks/LocalAuthentication.framework; sourceTree = SDKROOT; }; F840E1F0165FE0F500CFE078 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = dlapp/config.xml; sourceTree = ""; }; F939AD8C22BB769B006B371B /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; }; FCC7E279D80D4FB9BCF2530A /* Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "cordova-plugin-fingerprint-aio/Bridging-Header.h"; sourceTree = ""; }; FDEE8379D7A34C55A616F700 /* AFURLResponseSerialization.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFURLResponseSerialization.m; path = "cordova-plugin-advanced-http/AFURLResponseSerialization.m"; sourceTree = ""; }; - 28B91F31B6FD410AAF87BBDC /* CDVThemeableBrowser.m */ = {isa = PBXFileReference; name = "CDVThemeableBrowser.m"; path = "cordova-plugin-themeablebrowser/CDVThemeableBrowser.m"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; }; - EF1A4FA720C24397A32AF09C /* CDVThemeableBrowser.h */ = {isa = PBXFileReference; name = "CDVThemeableBrowser.h"; path = "cordova-plugin-themeablebrowser/CDVThemeableBrowser.h"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -225,7 +224,6 @@ 0207DA571B56EA530066E2B4 /* Images.xcassets */, 3047A50E1AB8057F00498E2A /* config */, 8D1107310486CEB800E47090 /* dlapp-Info.plist */, - 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */, ); name = Resources; path = dlapp/Resources; @@ -414,7 +412,6 @@ files = ( 302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */, 0207DA581B56EA530066E2B4 /* Images.xcassets in Resources */, - 6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -547,6 +544,7 @@ baseConfigurationReference = 3047A5111AB8059700498E2A /* build.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; @@ -585,7 +583,6 @@ SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/$(PROJECT_NAME)/Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.0; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; }; name = Debug; }; @@ -594,6 +591,7 @@ baseConfigurationReference = 3047A5111AB8059700498E2A /* build.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; @@ -629,7 +627,6 @@ SKIP_INSTALL = NO; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/$(PROJECT_NAME)/Bridging-Header.h"; SWIFT_VERSION = 4.0; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; }; name = Release; }; diff --git a/platforms/ios/dlapp/CDVLaunchScreen.storyboard b/platforms/ios/dlapp/CDVLaunchScreen.storyboard deleted file mode 100644 index 9f21416..0000000 --- a/platforms/ios/dlapp/CDVLaunchScreen.storyboard +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platforms/ios/dlapp/config.xml b/platforms/ios/dlapp/config.xml index 4096c07..ed6c95a 100755 --- a/platforms/ios/dlapp/config.xml +++ b/platforms/ios/dlapp/config.xml @@ -55,7 +55,7 @@ - dlapp + dlapp A sample Apache Cordova application that responds to the deviceready event. @@ -97,6 +97,7 @@ + diff --git a/platforms/ios/dlapp/dlapp-Info.plist b/platforms/ios/dlapp/dlapp-Info.plist index 8035b4b..1e0b815 100644 --- a/platforms/ios/dlapp/dlapp-Info.plist +++ b/platforms/ios/dlapp/dlapp-Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en_US CFBundleDisplayName - 大理APP + 大理市民卡 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/release-key.keystore b/release-key.keystore new file mode 100644 index 0000000..f6af059 Binary files /dev/null and b/release-key.keystore differ diff --git a/www/bill.html b/www/bill.html index e70285f..e2b99b1 100644 --- a/www/bill.html +++ b/www/bill.html @@ -16,7 +16,7 @@
- +
账单
diff --git a/www/billdetail.html b/www/billdetail.html index 8bbde06..e419a98 100644 --- a/www/billdetail.html +++ b/www/billdetail.html @@ -16,7 +16,7 @@
- +
账单详情
diff --git a/www/bindcard.html b/www/bindcard.html index 3ec9d26..8d2ee2f 100644 --- a/www/bindcard.html +++ b/www/bindcard.html @@ -30,34 +30,24 @@
-
+
- +
- - -
短信验证市民卡预留的手机号
-
-
+
- +
-
-
- -
+
+
- -
-
- +
-
下一步
diff --git a/www/bindcheck.html b/www/bindcheck.html new file mode 100644 index 0000000..51e13e9 --- /dev/null +++ b/www/bindcheck.html @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + 手机验证码 + + +
+ + + +
手机验证码
+
+
+
已发送验证码到您的手机：
+
+
+
+ +
+
+ +
+
+
+
+
验证
+
+
+ + + + + + + \ No newline at end of file diff --git a/www/index.html b/www/index.html index 4afb0bf..576b5e9 100644 --- a/www/index.html +++ b/www/index.html @@ -26,4 +26,5 @@ \ No newline at end of file diff --git a/www/js/bill.js b/www/js/bill.js index 4b0bca5..c0af3fd 100644 --- a/www/js/bill.js +++ b/www/js/bill.js @@ -9,6 +9,9 @@ var app = { curpage = 1; this.loadBill(curpage) }, + toBack: function (){ + window.history.back(); + }, loadBill:function(pageno){ $.showLoading("加载中"); var param={ diff --git a/www/js/billdetail.js b/www/js/billdetail.js index 057b106..3615234 100644 --- a/www/js/billdetail.js +++ b/www/js/billdetail.js @@ -8,6 +8,9 @@ var app = { onDeviceReady: function() { this.loadBill() }, + toBack: function (){ + window.history.back(); + }, loadBill: function() { var refno = window.localStorage.getItem("currentrefno"); if (isEmpty(refno)) { diff --git a/www/js/bindcard.js b/www/js/bindcard.js index 53ac0cf..e9cb86c 100644 --- a/www/js/bindcard.js +++ b/www/js/bindcard.js @@ -1,25 +1,58 @@ +var dict; var app = { // Application Constructor initialize: function() { document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); }, - + onDeviceReady: function() { var uid = window.localStorage.getItem("uid"); - var phone = window.localStorage.getItem("phoneX"); - if(!isEmpty(phone)){ - $("#phone").val(phone) - }else{ - phone = window.localStorage.getItem("phone"); - $("#phone").val(phone) - } + this.loadData(); + }, + loadData: function() { + $.showLoading("正在加载"); + V1Idtypes(function(ok, ret) { + if (ok) { + $.hideLoading(); + if (ret.code == 200) { + dict = ret.idtypes; + let keys = Object.keys(dict); + let vals = Object.values(dict); + console.log(keys, vals) + var items=[]; + for(var key of keys){ + var bean = { + "title":dict[key], + "value":key + } + items.push(bean) + } + $("#idtype").val(items[0].title) + $("#idtype").attr("data-values",items[0].value) + $("#idtype").select({ + title: "请选择证件类型", + items: items + }); + } else { + $.alert(ret.msg, "错误"); + } + } else { + $.hideLoading(); + $.alert("请求失败了 " + ret.status + "，请稍后再试", "错误"); + } + }) }, doNext: function() { - var code = $("#code").val(); - var cardnum = $("#cardnum").val(); - var name = $("#name").val(); - if(isEmpty(name)||isEmpty(code)||isEmpty(cardnum)){ + var cardnum = $("#cardnum").val(); + var name = $("#name").val(); + var idno = $("#idno").val(); + if (isEmpty(name) || isEmpty(cardnum)||isEmpty(idno)) { + return; + } + var idtype = $("#idtype").attr("data-values") + if(isEmpty(idtype)){ + $.alert("请选择证件类型", "错误"); return; } /*var agree = $("input[type=checkbox]:checked").val(); @@ -28,62 +61,37 @@ var app = { return; }*/ $.showLoading("正在处理"); - var param={ - "card":cardnum, - "code":code, - "name":name + var param = { + "cardno": cardnum, + "idtype": idtype, + "name": name, + "idno": idno } - V1Bindcard(param,function(ok,ret){ - if(ok){ + V1Bindcard(param, function(ok, ret) { + if (ok) { $.hideLoading(); console.log(ret) - if(ret.code==200){ - window.localStorage.setItem("paypwdtype","new"); - window.localStorage.setItem("userid",ret.userid); - window.localStorage.setItem("signed",ret.signed); - window.localStorage.setItem("name",name); - window.localStorage.setItem("paypwdset",ret.paypwdset); - if(ret.paypwdset){ - if(!isEmpty(ret.signed)&&signed=='yes'){ - window.location='main.html' - }else{ - window.location='signxy.html' - } - }else{ - window.location="paypwdset.html"; - } - }else{ - if(ret.code==-1){ - $.alert(ret.msg, "提示",function(){ - window.location="main.html" + if (ret.code == 200) { + window.localStorage.setItem("phoneX",ret.phonex); + window.localStorage.setItem("name", name); + window.localStorage.setItem("personid", ret.personid); + window.localStorage.setItem("signed", ret.signed); + window.localStorage.setItem("paypwdset", ret.paypwdset); + window.location = "bindcheck.html"; + } else { + if (ret.code == -1) { + $.alert(ret.msg, "提示", function() { + window.location = "main.html" }); - }else{ - $.alert(ret.msg, "错误"); + } else { + $.alert(ret.msg, "错误"); } - } - }else{ - $.hideLoading(); - $.alert("请求失败了 "+ret.status+"，请稍后再试", "错误"); - } - }) - }, - getCode :function(){ - $.showLoading("请求中"); - V1Code(function(ok,ret){ - if(ok){ - $.hideLoading(); - if(ret.code==200){ - $("#codebtn").attr("disabled","disabled") - $("#codebtn").addClass("vcodedisabled") - btnTime('codebtn'); - }else{ - $.alert(ret.msg, "错误"); - } - }else{ + } + } else { $.hideLoading(); - $.alert("请求失败了"+ret.status+"，请稍后再试", "错误"); + $.alert("请求失败了 " + ret.status + "，请稍后再试", "错误"); } }) } }; -app.initialize(); +app.initialize(); \ No newline at end of file diff --git a/www/js/bindcheck.js b/www/js/bindcheck.js new file mode 100644 index 0000000..a4214fc --- /dev/null +++ b/www/js/bindcheck.js @@ -0,0 +1,57 @@ +var dict; +var app = { + + // Application Constructor + initialize: function() { + document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); + }, + onDeviceReady: function() { + var phone = window.localStorage.getItem("phoneX"); + if(!isEmpty(phone)){ + $("#phone").text(phone) + }else{ + phone = window.localStorage.getItem("phone"); + $("#phone").text(phone) + } + }, + doNext: function() { + var code = $("#code").val(); + if(isEmpty(code)){ + return; + } + var personid = window.localStorage.getItem("personid"); + $.showLoading("正在处理"); + var param={ + "personid":personid, + "code":code, + } + V1Checkcode(param,function(ok,ret){ + if(ok){ + $.hideLoading(); + console.log(ret) + if(ret.code==200){ + window.localStorage.setItem("paypwdtype", "new"); + window.localStorage.setItem("userid", personid); + var signed = window.localStorage.getItem("signed"); + var paypwdset = window.localStorage.getItem("paypwdset"); + console.log(paypwdset) + if (!paypwdset||'false'==paypwdset) { + window.location = "paypwdset.html"; + } else { + if (!isEmpty(signed) && signed == 'yes') { + window.location = 'main.html' + } else { + window.location = 'signxy.html' + } + } + }else{ + $.alert(ret.msg, "错误"); + } + }else{ + $.hideLoading(); + $.alert("请求失败了"+ret.status+"，请稍后再试", "错误"); + } + }) + } +}; +app.initialize(); \ No newline at end of file diff --git a/www/js/card.js b/www/js/card.js index 0c0a91e..8dc9675 100644 --- a/www/js/card.js +++ b/www/js/card.js @@ -4,17 +4,17 @@ var app = { initialize: function() { document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); }, - + onDeviceReady: function() { var uid = window.localStorage.getItem("uid"); - + }, doNext: function() { - var pwd = $("#pwd").val(); - if(isEmpty(pwd)){ + var pwd = $("#pwd").val(); + if (isEmpty(pwd)) { return; } - if(pwd.length!=6){ + if (pwd.length != 6) { $.alert("支付密码为6位数字", "提示"); return; } @@ -26,24 +26,26 @@ var app = { }, function(ret) { if (ret.buttonIndex == 2) { $.showLoading("正在处理"); - var param={ - "paypwd":pwd + var param = { + "paypwd": pwd } - V1CardLost(param,function(ok,ret){ - if(ok){ + V1CardLost(param, function(ok, ret) { + if (ok) { $.hideLoading(); - if(ret.code==200){ - $.alert("卡片挂失成功", "提示"); - }else{ + if (ret.code == 200) { + $.alert("卡片挂失成功", "提示", function() { + window.location = "main.html" + }); + } else { $.alert(ret.msg, "错误"); - } - }else{ + } + } else { $.hideLoading(); - $.alert("请求失败了"+ret.status+"，请稍后再试", "错误"); + $.alert("请求失败了" + ret.status + "，请稍后再试", "错误"); } }) } }) } }; -app.initialize(); +app.initialize(); \ No newline at end of file diff --git a/www/js/index.js b/www/js/index.js index ba4ea86..112a927 100644 --- a/www/js/index.js +++ b/www/js/index.js @@ -41,9 +41,10 @@ var app = { if(ret.now-t>1000*60*10){ window.location = "login.html"; }else{ - window.location = "main.html"; } + }else{ + window.location = "login.html"; } } else { //alert('无法请求到服务器，请检查网络并稍后再试'); diff --git a/www/js/main.js b/www/js/main.js index 87d6f53..3b01a2a 100644 --- a/www/js/main.js +++ b/www/js/main.js @@ -2,6 +2,7 @@ var app = { // Application Constructor initialize: function() { + this.initTab(); document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); }, @@ -42,19 +43,47 @@ var app = { }); $('#secBtn').click(function() { app.checkBefore(function() { - window.location = "security.html"; + app.checkOther(function() { + window.location = "security.html"; + }) }) }); $('#usersec').click(function() { app.checkBefore(function() { - window.location = "security.html"; + app.checkOther(function() { + window.location = "security.html"; + }) }) }); this.initData(); }, + initTab:function(){ + $("#maincontent").css("top", $("#maintop").height()) + var tab = new auiTab({ + element: document.getElementById("footer"), + }, function(ret) { + window.localStorage.setItem("tabindex",ret.index); + + changeTab(ret.index); + }); + var tabindex = window.localStorage.getItem("tabindex"); + if(!tabindex||tabindex==0){ + tabindex = 1 + } + changeTab(tabindex); + tab.setActive(tabindex) + function changeTab(index){ + if (index == 1) { + $("#main1").show(); + $("#main2").hide(); + } else if (index == 2) { + $("#main1").hide(); + $("#main2").show(); + } + } + }, initData: function() { this.loadBill() - }, loadBill: function() { $("#loaddata").show() @@ -122,7 +151,7 @@ var app = { $("#loaddata").hide() $("#nodata").hide(); $("#billcontent").show(); - + }, initView: function() { var userid = window.localStorage.getItem("userid"); @@ -210,18 +239,18 @@ var app = { } } }, - toSign:function(){ + toSign: function() { window.location = 'signxycheck.html' }, toBillDetail: function(refno) { window.localStorage.setItem("currentrefno", refno); window.location = 'billdetail.html'; }, - toCard:function(){ + toCard: function() { var userid = window.localStorage.getItem("userid"); if (isEmpty(userid)) { window.location = 'bindcard.html' - }else{ + } else { window.location = 'cardinfor.html' } } diff --git a/www/js/server.js b/www/js/server.js index 3194de9..94f7c65 100644 --- a/www/js/server.js +++ b/www/js/server.js @@ -6,6 +6,9 @@ var CURRENT_INDEX=1; if (dev) { SERVER = "http://172.28.43.3:8099/payapi/mobileapi"; } +function V1Idtypes(callback) { + ajaxPost("/v1/idtypes", {}, callback) +} function V1Cardinfor(callback) { ajaxPost("/v1/cardinfor", {}, callback) } diff --git a/www/js/signxycheck.js b/www/js/signxycheck.js index f97f3d4..4e52298 100644 --- a/www/js/signxycheck.js +++ b/www/js/signxycheck.js @@ -10,17 +10,23 @@ var app = { $.showLoading("加载中"); V1Bxy(function(ok, ret, err) { if (ok) { - $.hideLoading(); - if(ret.code==200){ + $.hideLoading(); + if (ret.code == 200) { $("#content").html(ret.page); - if(isEmpty(ret.signed)||ret.signed!='yes'){ - $("#btn").show(); - $("#content").css("bottom","135px"); - }else{ - $("#content").css("bottom","10px"); + if (isEmpty(ret.signed) || ret.signed != 'yes') { + $("#btn").show(); + $("#content").css("bottom", "135px"); + } else { + $("#content").css("bottom", "10px"); + } + } else { + if (ret.code == -1) { + $.alert(ret.msg, "提示", function() { + window.location = 'bindcard.html' + }); + } else { + $.alert(ret.msg, "错误"); } - }else{ - $.alert(ret.msg, "错误"); } } else { $.hideLoading(); @@ -28,28 +34,28 @@ var app = { } }) }, - agreeXY:function(){ + agreeXY: function() { var agree = $("input[type=checkbox]:checked").val(); - if(isEmpty(agree)){ + if (isEmpty(agree)) { $.alert("请同意签约代扣协议", "提示"); return; } $.showLoading("正在请求"); - var param={ - "agree":agree + var param = { + "agree": agree } - V1Signbxy(param,function(ok, ret, err) { + V1Signbxy(param, function(ok, ret, err) { if (ok) { - $.hideLoading(); - if(ret.code==200){ - window.localStorage.setItem("signed",ret.signed); - window.location="main.html"; - }else{ + $.hideLoading(); + if (ret.code == 200) { + window.localStorage.setItem("signed", ret.signed); + window.location = "main.html"; + } else { $.alert(ret.msg, "错误"); } } else { $.hideLoading(); - $.alert("请求失败了:" + ret.status+"请稍后再试", "错误"); + $.alert("请求失败了:" + ret.status + "请稍后再试", "错误"); } }) } diff --git a/www/main.html b/www/main.html index 57c416c..b6a2d8c 100644 --- a/www/main.html +++ b/www/main.html @@ -258,18 +258,6 @@ + \ No newline at end of file diff --git a/www/register.html b/www/register.html index 34e5998..640b3ee 100644 --- a/www/register.html +++ b/www/register.html @@ -15,7 +15,7 @@
- +
注册
diff --git a/www/security.html b/www/security.html index d9811ec..6994b22 100644 --- a/www/security.html +++ b/www/security.html @@ -15,7 +15,7 @@
- +
账户安全