some fix

package-lock.json

@@ -9,7 +9,7 @@
             "resolved": "http://registry.npm.taobao.org/android-versions/download/android-versions-1.3.0.tgz",
             "integrity": "sha1-zm8+ri4WXOTtSbib62gBR0EJMEQ=",
             "requires": {
-                "semver": "^5.4.1"
+                "semver": "5.5.0"
             }
         },
         "cordova-android": {
@@ -17,13 +17,13 @@
             "resolved": "http://registry.npm.taobao.org/cordova-android/download/cordova-android-6.3.0.tgz",
             "integrity": "sha1-2lQYQz0lx1pZd7QoJEu+Q30BKNI=",
             "requires": {
-                "android-versions": "^1.2.0",
-                "cordova-common": "^2.1.0",
+                "android-versions": "1.3.0",
+                "cordova-common": "2.1.0",
                 "elementtree": "0.1.6",
-                "nopt": "^3.0.1",
-                "properties-parser": "^0.2.3",
-                "q": "^1.4.1",
-                "shelljs": "^0.5.3"
+                "nopt": "3.0.6",
+                "properties-parser": "0.2.3",
+                "q": "1.5.0",
+                "shelljs": "0.5.3"
             },
             "dependencies": {
                 "abbrev": {
@@ -50,14 +50,14 @@
                     "version": "0.1.1",
                     "bundled": true,
                     "requires": {
-                        "big-integer": "^1.6.7"
+                        "big-integer": "1.6.25"
                     }
                 },
                 "brace-expansion": {
                     "version": "1.1.8",
                     "bundled": true,
                     "requires": {
-                        "balanced-match": "^1.0.0",
+                        "balanced-match": "1.0.0",
                         "concat-map": "0.0.1"
                     }
                 },
@@ -69,19 +69,19 @@
                     "version": "2.1.0",
                     "bundled": true,
                     "requires": {
-                        "ansi": "^0.3.1",
-                        "bplist-parser": "^0.1.0",
-                        "cordova-registry-mapper": "^1.1.8",
+                        "ansi": "0.3.1",
+                        "bplist-parser": "0.1.1",
+                        "cordova-registry-mapper": "1.1.15",
                         "elementtree": "0.1.6",
-                        "glob": "^5.0.13",
-                        "minimatch": "^3.0.0",
-                        "osenv": "^0.1.3",
-                        "plist": "^1.2.0",
-                        "q": "^1.4.1",
-                        "semver": "^5.0.1",
-                        "shelljs": "^0.5.3",
-                        "underscore": "^1.8.3",
-                        "unorm": "^1.3.3"
+                        "glob": "5.0.15",
+                        "minimatch": "3.0.4",
+                        "osenv": "0.1.4",
+                        "plist": "1.2.0",
+                        "q": "1.5.0",
+                        "semver": "5.4.1",
+                        "shelljs": "0.5.3",
+                        "underscore": "1.8.3",
+                        "unorm": "1.4.1"
                     }
                 },
                 "cordova-registry-mapper": {
@@ -99,19 +99,19 @@
                     "version": "5.0.15",
                     "bundled": true,
                     "requires": {
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "2 || 3",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
+                        "inflight": "1.0.6",
+                        "inherits": "2.0.3",
+                        "minimatch": "3.0.4",
+                        "once": "1.4.0",
+                        "path-is-absolute": "1.0.1"
                     }
                 },
                 "inflight": {
                     "version": "1.0.6",
                     "bundled": true,
                     "requires": {
-                        "once": "^1.3.0",
-                        "wrappy": "1"
+                        "once": "1.4.0",
+                        "wrappy": "1.0.2"
                     }
                 },
                 "inherits": {
@@ -126,21 +126,21 @@
                     "version": "3.0.4",
                     "bundled": true,
                     "requires": {
-                        "brace-expansion": "^1.1.7"
+                        "brace-expansion": "1.1.8"
                     }
                 },
                 "nopt": {
                     "version": "3.0.6",
                     "bundled": true,
                     "requires": {
-                        "abbrev": "1"
+                        "abbrev": "1.1.0"
                     }
                 },
                 "once": {
                     "version": "1.4.0",
                     "bundled": true,
                     "requires": {
-                        "wrappy": "1"
+                        "wrappy": "1.0.2"
                     }
                 },
                 "os-homedir": {
@@ -155,8 +155,8 @@
                     "version": "0.1.4",
                     "bundled": true,
                     "requires": {
-                        "os-homedir": "^1.0.0",
-                        "os-tmpdir": "^1.0.0"
+                        "os-homedir": "1.0.2",
+                        "os-tmpdir": "1.0.2"
                     }
                 },
                 "path-is-absolute": {
@@ -170,7 +170,7 @@
                         "base64-js": "0.0.8",
                         "util-deprecate": "1.0.2",
                         "xmlbuilder": "4.0.0",
-                        "xmldom": "0.1.x"
+                        "xmldom": "0.1.27"
                     }
                 },
                 "properties-parser": {
@@ -213,7 +213,7 @@
                     "version": "4.0.0",
                     "bundled": true,
                     "requires": {
-                        "lodash": "^3.5.0"
+                        "lodash": "3.10.1"
                     }
                 },
                 "xmldom": {
@@ -228,8 +228,7 @@
             "integrity": "sha1-c3Olk4MYyGzP2E43E+I4LRD+B2s="
         },
         "cordova-plugin-crosswalk-webview": {
-            "version": "git+https://github.com/x1ongzhu/cordova-plugin-crosswalk-webview.git#b5a39a7956ab3643f28294d304db0b3c084e7876",
-            "from": "git+https://github.com/x1ongzhu/cordova-plugin-crosswalk-webview.git"
+            "version": "git+https://github.com/x1ongzhu/cordova-plugin-crosswalk-webview.git#b5a39a7956ab3643f28294d304db0b3c084e7876"
         },
         "cordova-plugin-device": {
             "version": "2.0.2",
@@ -242,8 +241,7 @@
             "integrity": "sha1-1K4A02Z2IQdRBXrSWK5K1KkWGto="
         },
         "cordova-plugin-qrcode-scanner": {
-            "version": "git+https://github.com/x1ongzhu/cordova-plugin-qrcode-scanner.git#b2c972249beed99288db9cf7ebd479a4ad1df32f",
-            "from": "git+https://github.com/x1ongzhu/cordova-plugin-qrcode-scanner.git"
+            "version": "git+https://github.com/x1ongzhu/cordova-plugin-qrcode-scanner.git#b2c972249beed99288db9cf7ebd479a4ad1df32f"
         },
         "cordova-plugin-remote-injection": {
             "version": "0.5.2",

platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/assets"/><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/build/generated/assets/shaders/debug"/></dataSet><dataSet config="debug"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/debug/assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\work\pumpApp\platforms\android\CordovaLib\assets"/><source path="D:\work\pumpApp\platforms\android\CordovaLib\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>

platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/main/jniLibs"/></dataSet><dataSet config="debug"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/debug/jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\main\jniLibs"/></dataSet><dataSet config="debug"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\debug\jniLibs"/></dataSet></merger>

platforms/android/CordovaLib/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/main/shaders"/></dataSet><dataSet config="debug"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/debug/shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\main\shaders"/></dataSet><dataSet config="debug"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\debug\shaders"/></dataSet></merger>

platforms/android/CordovaLib/build/intermediates/incremental/mergeReleaseAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/assets"/><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/build/generated/assets/shaders/release"/></dataSet><dataSet config="release"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/release/assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\work\pumpApp\platforms\android\CordovaLib\assets"/><source path="D:\work\pumpApp\platforms\android\CordovaLib\build\generated\assets\shaders\release"/></dataSet><dataSet config="release"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\release\assets"/></dataSet></merger>

platforms/android/CordovaLib/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/main/jniLibs"/></dataSet><dataSet config="release"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/release/jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\main\jniLibs"/></dataSet><dataSet config="release"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\release\jniLibs"/></dataSet></merger>

platforms/android/CordovaLib/build/intermediates/incremental/mergeReleaseShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/main/shaders"/></dataSet><dataSet config="release"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/release/shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\main\shaders"/></dataSet><dataSet config="release"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\release\shaders"/></dataSet></merger>

platforms/android/CordovaLib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1 +1 @@
-#Thu Jul 26 18:07:35 CST 2018
+#Thu Jul 26 18:44:45 CST 2018

platforms/android/CordovaLib/build/intermediates/incremental/packageDebugResources/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main$Generated" generated="true"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/res"/><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/build/generated/res/rs/debug"/><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/debug/res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/res"/><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/build/generated/res/rs/debug"/><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/debug/res"/></dataSet><mergedItems/></merger>
+<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\work\pumpApp\platforms\android\CordovaLib\res"/><source path="D:\work\pumpApp\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="D:\work\pumpApp\platforms\android\CordovaLib\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\debug\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\work\pumpApp\platforms\android\CordovaLib\res"/><source path="D:\work\pumpApp\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="D:\work\pumpApp\platforms\android\CordovaLib\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>

platforms/android/CordovaLib/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1 +1 @@
-#Thu Jul 26 18:07:35 CST 2018
+#Thu Jul 26 18:44:48 CST 2018

platforms/android/CordovaLib/build/intermediates/incremental/packageReleaseResources/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main$Generated" generated="true"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/res"/><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/build/generated/res/rs/release"/><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/build/generated/res/resValues/release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/release/res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/res"/><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/build/generated/res/rs/release"/><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/build/generated/res/resValues/release"/></dataSet><dataSet config="release" generated-set="release$Generated"><source path="/Users/drew/Projects/Cordova/pumpApp/platforms/android/CordovaLib/src/release/res"/></dataSet><mergedItems/></merger>
+<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\work\pumpApp\platforms\android\CordovaLib\res"/><source path="D:\work\pumpApp\platforms\android\CordovaLib\build\generated\res\rs\release"/><source path="D:\work\pumpApp\platforms\android\CordovaLib\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\release\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\work\pumpApp\platforms\android\CordovaLib\res"/><source path="D:\work\pumpApp\platforms\android\CordovaLib\build\generated\res\rs\release"/><source path="D:\work\pumpApp\platforms\android\CordovaLib\build\generated\res\resValues\release"/></dataSet><dataSet config="release" generated-set="release$Generated"><source path="D:\work\pumpApp\platforms\android\CordovaLib\src\release\res"/></dataSet><mergedItems/></merger>

platforms/android/android.json

@@ -72,35 +72,35 @@
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />",
-              "count": 26
+              "count": 30
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />",
-              "count": 26
+              "count": 30
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.INTERNET\" />",
-              "count": 50
+              "count": 58
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />",
-              "count": 25
+              "count": 29
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />",
-              "count": 25
+              "count": 29
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\" />",
-              "count": 25
+              "count": 29
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\" />",
-              "count": 25
+              "count": 29
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\" />",
-              "count": 25
+              "count": 29
             },
             {
               "xml": "<uses-permission android:name=\"android.permission.CAMERA\" />",

platforms/android/assets/www/index.html

@@ -1,3 +1,3 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><title>水泵</title><meta name=viewport content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><script src=cordova.js></script><link href=./static/css/app.bdbbf849a8c5db37ad3631afef2ca6c2.css rel=stylesheet></head><style>a {
+<!DOCTYPE html><html><head><meta charset=utf-8><title>水泵</title><meta name=viewport content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><script src=cordova.js></script><link href=./static/css/app.685c10f230da80e71826fb4e7ac9296c.css rel=stylesheet></head><style>a {
         text-decoration: none;
-    }</style><body><div id=app></div><script type=text/javascript src=./static/js/manifest.19f4740cc77c168ee709.js></script><script type=text/javascript src=./static/js/vendor.83bc9862f9225e9f11f1.js></script><script type=text/javascript src=./static/js/app.4ab066ba21cd7bc5d906.js></script></body></html>
+    }</style><body><div id=app></div><script type=text/javascript src=./static/js/manifest.e6efbc15e9c5098fa79a.js></script><script type=text/javascript src=./static/js/vendor.83bc9862f9225e9f11f1.js></script><script type=text/javascript src=./static/js/app.1e4ec0b74cfc26336d09.js></script></body></html>

platforms/android/assets/www/static/js/6.5857848190e3a2c4074a.js

@@ -1,2 +0,0 @@
-webpackJsonp([6],{HXef:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var a=n("Dd8w"),s=n.n(a),r=n("qkow"),i=n("NYxO"),c={data:function(){return{}},created:function(){},computed:s()({},Object(i.b)(["locationInfo"])),methods:{},components:{GmButton:r.a}},o={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{ref:"content",staticClass:"container"},[n("div",{staticClass:"title"},[t._v("产品")]),t._v(" "),n("div",{staticClass:"list"},[n("router-link",{staticClass:"item",attrs:{to:{name:"scan",query:{type:"packing"},params:{isNext:!0}}}},[t._v("\n            装箱扫描\n        ")]),t._v(" "),n("router-link",{staticClass:"item",attrs:{to:{name:"homeSe",query:{title:"完工确认"},params:{isNext:!0}}}},[t._v("\n            完工确认\n        ")]),t._v(" "),n("router-link",{staticClass:"item",attrs:{to:{name:"scan",query:{type:"testing"},params:{isNext:!0}}}},[t._v("\n            检测确认\n        ")]),t._v(" "),n("router-link",{staticClass:"item",attrs:{to:{name:"scan",query:{type:"treasury"},params:{isNext:!0}}}},[t._v("\n            缴库确认\n        ")])],1)])},staticRenderFns:[]};var u=n("VU/8")(c,o,!1,function(t){n("nHZY")},"data-v-1c3ed339",null);e.default=u.exports},nHZY:function(t,e){}});
-//# sourceMappingURL=6.5857848190e3a2c4074a.js.map

platforms/android/assets/www/static/js/6.bb74e20d63ed2143d5b8.js

@@ -0,0 +1,2 @@
+webpackJsonp([6],{"/u7a":function(t,e){},HXef:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=a("Dd8w"),s=a.n(n),r=a("qkow"),i=a("NYxO"),c={data:function(){return{}},created:function(){},computed:s()({},Object(i.b)(["locationInfo"])),methods:{},components:{GmButton:r.a}},o={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{ref:"content",staticClass:"container"},[a("div",{staticClass:"title"},[t._v("产品")]),t._v(" "),a("div",{staticClass:"list"},[a("router-link",{staticClass:"item",attrs:{to:{name:"scan",query:{type:"packing"},params:{isNext:!0}}}},[t._v("\n            装箱扫描\n        ")]),t._v(" "),a("router-link",{staticClass:"item",attrs:{to:{name:"homeSe",query:{title:"完工确认"},params:{isNext:!0}}}},[t._v("\n            完工确认\n        ")]),t._v(" "),a("router-link",{staticClass:"item",attrs:{to:{name:"scan",query:{type:"testing"},params:{isNext:!0}}}},[t._v("\n            检测确认\n        ")]),t._v(" "),a("router-link",{staticClass:"item",attrs:{to:{name:"scan",query:{type:"treasury"},params:{isNext:!0}}}},[t._v("\n            缴库确认\n        ")])],1)])},staticRenderFns:[]};var u=a("VU/8")(c,o,!1,function(t){a("/u7a")},"data-v-0608a0f7",null);e.default=u.exports}});
+//# sourceMappingURL=6.bb74e20d63ed2143d5b8.js.map

platforms/android/assets/www/static/js/manifest.19f4740cc77c168ee709.js

@@ -1,2 +0,0 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={9:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"d71ab57ad87434897902",1:"f2c11c9a36f2a9e49cf7",2:"f9519e45c46f618e3cfb",3:"b370dc84c17c03b10dc8",4:"a56cea3b8455e510f3ef",5:"cc5bd7421fcbd48e56e3",6:"5857848190e3a2c4074a"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.19f4740cc77c168ee709.js.map

platforms/android/assets/www/static/js/manifest.e6efbc15e9c5098fa79a.js

@@ -0,0 +1,2 @@
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var i,u,f,s=0,d=[];s<r.length;s++)u=r[s],t[u]&&d.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(n&&n(r,a,c);d.length;)d.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={9:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"d71ab57ad87434897902",1:"66612f3a2a9c38ef90a7",2:"668165ac3125f3f17f33",3:"b926ca61f5821c8849f3",4:"232ad01872ba07eb8a2e",5:"4e0f960efbc16d571d5b",6:"bb74e20d63ed2143d5b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.e6efbc15e9c5098fa79a.js.map

vue/src/pages/Login.vue

@@ -10,7 +10,7 @@
         </div>
         <div class="input">
             <img src="@/assets/bangding_icon_mima.png" class="icon" alt="">
-            <input type="text" @focus="onPassword=true" @blur="onPassword=false" v-model="psd" placeholder="输入密码">
+            <input type="password" @focus="onPassword=true" @blur="onPassword=false" v-model="psd" placeholder="输入密码">
             <img src="@/assets/list_icon_del.png" v-if="onPassword&&psd" @click="psd=''" class="del" alt="">
         </div>
         <div class="btn">

vue/src/pages/Scan.vue

@@ -20,7 +20,7 @@
 
             </div>
             <div v-if="hasResult" style="overflow:auto;flex-grow:1;">
-                <template v-if="title!='缴库确认'">
+                <template v-if="title=='装箱扫描'">
                     <div class="box-content">
                         <div class="box-title">
                             装箱信息
@@ -181,12 +181,12 @@ export default {
                     this.$alert({ showCancel: false, title: '提示', content: '二维码错误' }, () => { })
                     return
                 }
-                if (this.title != '缴库确认' && type == 'D') {
+                if (this.title == '装箱扫描' && type == 'D') {
                     this.$alert({ showCancel: false, title: '提示', content: '扫描二维码类别错误' }, () => { })
                     return
                 }
 
-                if (this.title == '缴库确认' && type == 'Z') {
+                if (this.title != '装箱扫描' && type == 'Z') {
                     this.$alert({ showCancel: false, title: '提示', content: '扫描二维码类别错误' }, () => { })
                     return
                 }
@@ -249,10 +249,10 @@ export default {
         },
         check(id) {
             return new Promise((resolve, reject) => {
-                var list = []
+                var list=[]
                 list.push(id)
                 if (this.title == '装箱扫描') {
-                    axios.post('/PackingScan/PackingScan', list).then(res => {
+                    axios.post('/Hold/PackingScan?packingid=' + id).then(res => {
 
                         if (res.data.data == 'yes') {
                             this.$modal.success({ msg: '扫描成功', duration: 1500 })
@@ -270,9 +270,68 @@ export default {
                     })
                 }
 
+                if (this.title == '装配完工') {
+                    axios.post('/Hold/AssemblyScan?tracedtlid=' + id).then(res => {
+
+                        if (res.data.data == 'yes') {
+                            this.$modal.success({ msg: '装配完工成功', duration: 1500 })
+                            resolve(true)
+                        }
+                        else {
+
+                            this.$alert({ showCancel: false, title: '提示', content: res.data.error }, () => { })
+                            resolve(false)
+
+                        }
+                    }).catch(res => {
+                        this.$alert({ showCancel: false, title: '提示', content: '已扫描或未到可以装配完工状态' }, () => { })
+                        resolve(false)
+                    })
+                }
+
+
+                if (this.title == '打压完工') {
+                    axios.post('/Hold/ScanSuppress?tracedtlid=' + id).then(res => {
+
+                        if (res.data.data == 'yes') {
+                            this.$modal.success({ msg: '打压完工成功', duration: 1500 })
+                            resolve(true)
+                        }
+                        else {
+
+                            this.$alert({ showCancel: false, title: '提示', content: res.data.error }, () => { })
+                            resolve(false)
+
+                        }
+                    }).catch(res => {
+                        this.$alert({ showCancel: false, title: '提示', content: '已扫描或未到可以打压完工状态' }, () => { })
+                        resolve(false)
+                    })
+                }
+
+
+                if (this.title == '喷漆完工') {
+                    axios.post('/SprayPaint?tracedtlid=' + id).then(res => {
+
+                        if (res.data.data == 'yes') {
+                            this.$modal.success({ msg: '喷漆完工', duration: 1500 })
+                            resolve(true)
+                        }
+                        else {
+
+                            this.$alert({ showCancel: false, title: '提示', content: res.data.error }, () => { })
+                            resolve(false)
+
+                        }
+                    }).catch(res => {
+                        this.$alert({ showCancel: false, title: '提示', content: '已扫描或未到可以喷漆完工状态' }, () => { })
+                        resolve(false)
+                    })
+                }
+
 
                 if (this.title == '检测扫描') {
-                    axios.post('/PackingTesting/PackingTestingScanning', list).then(res => {
+                    axios.post('/Hold/TestingScan?tracedtlid='+id, list).then(res => {
 
                         if (res.data.data == 'yes') {
                             this.$modal.success({ msg: '检测成功', duration: 1500 })
@@ -291,7 +350,7 @@ export default {
                 }
 
                 if (this.title == '缴库确认') {
-                    axios.post('/TreasuryManagement/TreasuryManagementScanning', list).then(res => {
+                    axios.post('/Hold/TreasuryScan?tracedtlid='+id, list).then(res => {
 
                         if (res.data.data == 'yes') {
                             this.$modal.success({ msg: '缴库成功', duration: 1500 })

www/index.html

@@ -1,3 +1,3 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><title>水泵</title><meta name=viewport content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><script src=cordova.js></script><link href=./static/css/app.bdbbf849a8c5db37ad3631afef2ca6c2.css rel=stylesheet></head><style>a {
+<!DOCTYPE html><html><head><meta charset=utf-8><title>水泵</title><meta name=viewport content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><script src=cordova.js></script><link href=./static/css/app.685c10f230da80e71826fb4e7ac9296c.css rel=stylesheet></head><style>a {
         text-decoration: none;
-    }</style><body><div id=app></div><script type=text/javascript src=./static/js/manifest.19f4740cc77c168ee709.js></script><script type=text/javascript src=./static/js/vendor.83bc9862f9225e9f11f1.js></script><script type=text/javascript src=./static/js/app.4ab066ba21cd7bc5d906.js></script></body></html>
+    }</style><body><div id=app></div><script type=text/javascript src=./static/js/manifest.e6efbc15e9c5098fa79a.js></script><script type=text/javascript src=./static/js/vendor.83bc9862f9225e9f11f1.js></script><script type=text/javascript src=./static/js/app.1e4ec0b74cfc26336d09.js></script></body></html>