From 09bd57a280d7d04d20c2075116e1e7eddd0457fc Mon Sep 17 00:00:00 2001 From: "sijun.li" Date: Tue, 21 Apr 2020 18:52:28 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E5=9B=BE?= =?utf8?q?=E7=89=87=E5=8F=8A=E7=AD=BE=E7=BA=A6=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 + package-lock.json | 47 +++++++++++++-- package.json | 3 +- .../app/src/main/assets/www/js/bindcard.js | 2 +- .../app/src/main/assets/www/js/main.js | 8 +-- .../android/app/src/main/assets/www/main.html | 27 +++++---- .../Applications/dlapp.app/JPushConfig.plist | Bin 146 -> 392 bytes platforms/ios/dlapp.xcodeproj/project.pbxproj | 8 +-- platforms/ios/dlapp/config.xml | 4 +- platforms/ios/dlapp/dlapp-Info.plist | 10 ++-- www/cardinfor.html | 2 +- www/img/p2.png | Bin 0 -> 84675 bytes www/img/p3.png | Bin 0 -> 111223 bytes www/img/p4.png | Bin 0 -> 95563 bytes www/img/s1.jpg | Bin 822340 -> 1361602 bytes www/img/s2.jpg | Bin 779213 -> 1337524 bytes www/img/s3.jpg | Bin 559210 -> 1140083 bytes www/img/splashscreen.png | Bin 182236 -> 60112 bytes www/js/mainmenu.js | 10 ++-- www/main.html | 27 +++++---- www/signsfp.html | 54 ++++++++++++++++++ www/startload.html | 5 +- 22 files changed, 157 insertions(+), 53 deletions(-) create mode 100644 www/img/p2.png create mode 100644 www/img/p3.png create mode 100644 www/img/p4.png create mode 100644 www/signsfp.html diff --git a/.gitignore b/.gitignore index 77b125f..d360db4 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,6 @@ typings/ .fusebox/ .dynamodb/ +# ide +.idea/* + diff --git a/package-lock.json b/package-lock.json index ab7c5fd..937680e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "com.dalicitycard.app", + "name": "com.dalipolice.app", "version": "1.0.3", "lockfileVersion": 1, "requires": true, @@ -205,6 +205,13 @@ "properties-parser": "^0.3.1", "q": "^1.4.1", "shelljs": "^0.5.3" + }, + "dependencies": { + "shelljs": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz", + "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=" + } } }, "cordova-browser": { @@ -216,6 +223,13 @@ "cordova-serve": "^3.0.0", "nopt": "^4.0.1", "shelljs": "^0.5.3" + }, + "dependencies": { + "shelljs": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz", + "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=" + } } }, "cordova-common": { @@ -252,6 +266,13 @@ "unorm": "^1.4.1", "xcode": "^2.0.0", "xml-escape": "^1.1.0" + }, + "dependencies": { + "shelljs": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz", + "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=" + } } }, "cordova-plugin-add-swift-support": { @@ -654,6 +675,11 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, + "interpret": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", + "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==" + }, "ios-sim": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ios-sim/-/ios-sim-8.0.1.tgz", @@ -960,6 +986,14 @@ } } }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "requires": { + "resolve": "^1.1.6" + } + }, "resolve": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz", @@ -1058,9 +1092,14 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, "shelljs": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz", - "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=" + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz", + "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", + "requires": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + } }, "simctl": { "version": "2.0.0", diff --git a/package.json b/package.json index d267972..e94d001 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,8 @@ "cordova-plugin-themeablebrowser": "^0.2.18", "cordova-plugin-touch-id": "^3.4.0", "cordova-plugin-wkwebview-engine": "^1.2.1", - "jpush-phonegap-plugin": "^3.7.2" + "jpush-phonegap-plugin": "^3.7.2", + "shelljs": "^0.8.3" }, "cordova": { "plugins": { 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 7af7d38..0ee9d01 100644 --- a/platforms/android/app/src/main/assets/www/js/bindcard.js +++ b/platforms/android/app/src/main/assets/www/js/bindcard.js @@ -85,7 +85,7 @@ var app = { window.localStorage.setItem("signed", ret.signed); window.localStorage.setItem("paypwdset", ret.paypwdset); if(ret.signed=='yes'){ - window.location = "main.html" + window.location = "signsfp.html"; }else{ window.location = "bindcheck.html"; } 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 78b896f..066334a 100644 --- a/platforms/android/app/src/main/assets/www/js/main.js +++ b/platforms/android/app/src/main/assets/www/js/main.js @@ -260,10 +260,10 @@ var app = { var userid = window.localStorage.getItem("userid"); var signed = window.localStorage.getItem("signed"); if (isEmpty(userid)) { - $("#userbank").text("未绑定"); + $("#userbank").text("未签约"); $("#userbank").css("color", "red") } else { - $("#userbank").text("已绑定"); + $("#userbank").text("已签约"); $("userbank").css("color", "#757575"); } if (isEmpty(signed) || signed != 'yes') { @@ -295,8 +295,8 @@ var app = { var cum = new auiDialog({}); var confirm = cum.alert({ title: "提示", - msg: '为了不影响您正常使用相关功能，请先绑定银行卡', - buttons: ['取消', '去绑卡'] + msg: '为了不影响您正常使用相关功能，请先进行市民卡签约', + buttons: ['取消', '去签约'] }, function(ret) { if (ret.buttonIndex == 2) { window.location = 'bindcard.html' diff --git a/platforms/android/app/src/main/assets/www/main.html b/platforms/android/app/src/main/assets/www/main.html index d57a15a..e21d691 100644 --- a/platforms/android/app/src/main/assets/www/main.html +++ b/platforms/android/app/src/main/assets/www/main.html @@ -25,10 +25,13 @@
- +
- + +
+
+
@@ -108,19 +111,19 @@
-
银行卡
+
市民卡签约
-
  • -
    - -
    -
    -
    签约代扣免密付
    -
    -
    -
    • + + + + + + + + +