修改显示图片及签约流程

diff --git a/.gitignore b/.gitignore
index 77b125f..d360db4 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 = {

Code Review / dali_platform / mobile.git / commitdiff



500 - Internal Server Error


Unknown encoding 'gb18030' at /usr/local/share/gitweb/gitweb.cgi line 1539



大理市民卡手机端
RSS
Atom