diff --git a/package-lock.json b/package-lock.json
index aeb26c9..7df6906 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19402,7 +19402,6 @@
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
       "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/helper-module-context": "1.8.5",
         "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
@@ -19441,7 +19440,6 @@
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
       "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "mamacro": "^0.0.3"
@@ -19450,14 +19448,12 @@
     "@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
-      "dev": true
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ=="
     },
     "@webassemblyjs/helper-wasm-section": {
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
       "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "@webassemblyjs/helper-buffer": "1.8.5",
@@ -19469,7 +19465,6 @@
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
       "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
-      "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -19478,7 +19473,6 @@
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
       "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
-      "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
@@ -19486,14 +19480,12 @@
     "@webassemblyjs/utf8": {
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
-      "dev": true
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw=="
     },
     "@webassemblyjs/wasm-edit": {
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
       "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "@webassemblyjs/helper-buffer": "1.8.5",
@@ -19509,7 +19501,6 @@
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
       "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
@@ -19522,7 +19513,6 @@
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
       "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "@webassemblyjs/helper-buffer": "1.8.5",
@@ -19534,7 +19524,6 @@
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
       "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "@webassemblyjs/helper-api-error": "1.8.5",
@@ -19548,7 +19537,6 @@
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
       "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "@webassemblyjs/floating-point-hex-parser": "1.8.5",
@@ -19562,7 +19550,6 @@
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
       "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "@webassemblyjs/wast-parser": "1.8.5",
@@ -19572,14 +19559,12 @@
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
     },
     "@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "abbrev": {
       "version": "1.1.1",
@@ -19599,8 +19584,7 @@
     "acorn": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-      "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
-      "dev": true
+      "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw=="
     },
     "acorn-node": {
       "version": "1.8.2",
@@ -19734,7 +19718,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
       "requires": {
         "micromatch": "^3.1.4",
         "normalize-path": "^2.1.1"
@@ -19744,7 +19727,6 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
           "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
           "requires": {
             "remove-trailing-separator": "^1.0.1"
           }
@@ -19862,7 +19844,6 @@
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-      "dev": true,
       "requires": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
@@ -19873,7 +19854,6 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
       "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
       "requires": {
         "object-assign": "^4.1.1",
         "util": "0.10.3"
@@ -19882,14 +19862,12 @@
         "inherits": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
         },
         "util": {
           "version": "0.10.3",
           "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
           "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
           "requires": {
             "inherits": "2.0.1"
           }
@@ -19918,8 +19896,7 @@
     "async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
     },
     "async-foreach": {
       "version": "0.1.3",
@@ -21275,7 +21252,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-      "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
         "elliptic": "^6.0.0"
@@ -21285,7 +21261,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
       "requires": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -21298,7 +21273,6 @@
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
       "requires": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -21330,7 +21304,6 @@
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
       "requires": {
         "browserify-cipher": "^1.0.0",
         "browserify-sign": "^4.0.0",
@@ -22432,7 +22405,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
       "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
@@ -22998,7 +22970,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "readable-stream": "^2.0.0"
@@ -23043,21 +23014,25 @@
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
+          "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
           "bundled": true,
           "optional": true
         },
         "ansi-regex": {
           "version": "2.1.1",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "bundled": true,
           "optional": true
         },
         "aproba": {
           "version": "1.2.0",
+          "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
           "bundled": true,
           "optional": true
         },
         "are-we-there-yet": {
           "version": "1.1.5",
+          "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23067,11 +23042,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
           "bundled": true,
           "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
+          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23081,31 +23058,37 @@
         },
         "chownr": {
           "version": "1.1.1",
+          "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
           "bundled": true,
           "optional": true
         },
         "code-point-at": {
           "version": "1.1.0",
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
           "bundled": true,
           "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "bundled": true,
           "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
           "bundled": true,
           "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
           "bundled": true,
           "optional": true
         },
         "debug": {
           "version": "4.1.1",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23114,21 +23097,25 @@
         },
         "deep-extend": {
           "version": "0.6.0",
+          "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
           "bundled": true,
           "optional": true
         },
         "delegates": {
           "version": "1.0.0",
+          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
           "bundled": true,
           "optional": true
         },
         "detect-libc": {
           "version": "1.0.3",
+          "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
           "bundled": true,
           "optional": true
         },
         "fs-minipass": {
           "version": "1.2.5",
+          "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23137,11 +23124,13 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "bundled": true,
           "optional": true
         },
         "gauge": {
           "version": "2.7.4",
+          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23157,6 +23146,7 @@
         },
         "glob": {
           "version": "7.1.3",
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23170,11 +23160,13 @@
         },
         "has-unicode": {
           "version": "2.0.1",
+          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
           "bundled": true,
           "optional": true
         },
         "iconv-lite": {
           "version": "0.4.24",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23183,6 +23175,7 @@
         },
         "ignore-walk": {
           "version": "3.0.1",
+          "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23191,8 +23184,8 @@
         },
         "inflight": {
           "version": "1.0.6",
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "once": "^1.3.0",
@@ -23201,20 +23194,20 @@
         },
         "inherits": {
           "version": "2.0.3",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "ini": {
           "version": "1.3.5",
+          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
@@ -23222,14 +23215,14 @@
         },
         "isarray": {
           "version": "1.0.0",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "minimatch": {
           "version": "3.0.4",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
@@ -23237,14 +23230,14 @@
         },
         "minimist": {
           "version": "0.0.8",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "minipass": {
           "version": "2.3.5",
+          "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
@@ -23253,8 +23246,8 @@
         },
         "minizlib": {
           "version": "1.2.1",
+          "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "minipass": "^2.2.1"
@@ -23262,8 +23255,8 @@
         },
         "mkdirp": {
           "version": "0.5.1",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "minimist": "0.0.8"
@@ -23271,14 +23264,14 @@
         },
         "ms": {
           "version": "2.1.1",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "needle": {
           "version": "2.3.0",
+          "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "debug": "^4.1.0",
@@ -23288,8 +23281,8 @@
         },
         "node-pre-gyp": {
           "version": "0.12.0",
+          "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "detect-libc": "^1.0.2",
@@ -23306,8 +23299,8 @@
         },
         "nopt": {
           "version": "4.0.1",
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "abbrev": "1",
@@ -23316,14 +23309,14 @@
         },
         "npm-bundled": {
           "version": "1.0.6",
+          "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "npm-packlist": {
           "version": "1.4.1",
+          "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "ignore-walk": "^3.0.1",
@@ -23332,8 +23325,8 @@
         },
         "npmlog": {
           "version": "4.1.2",
+          "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "are-we-there-yet": "~1.1.2",
@@ -23344,20 +23337,20 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "once": {
           "version": "1.4.0",
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "wrappy": "1"
@@ -23365,20 +23358,20 @@
         },
         "os-homedir": {
           "version": "1.0.2",
+          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
+          "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "osenv": {
           "version": "0.1.5",
+          "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "os-homedir": "^1.0.0",
@@ -23387,20 +23380,20 @@
         },
         "path-is-absolute": {
           "version": "1.0.1",
+          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "rc": {
           "version": "1.2.8",
+          "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "deep-extend": "^0.6.0",
@@ -23411,16 +23404,16 @@
           "dependencies": {
             "minimist": {
               "version": "1.2.0",
+              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
               "bundled": true,
-              "dev": true,
               "optional": true
             }
           }
         },
         "readable-stream": {
           "version": "2.3.6",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -23434,8 +23427,8 @@
         },
         "rimraf": {
           "version": "2.6.3",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "glob": "^7.1.3"
@@ -23443,42 +23436,43 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
+          "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "sax": {
           "version": "1.2.4",
+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "semver": {
           "version": "5.7.0",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "set-blocking": {
           "version": "2.0.0",
+          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "signal-exit": {
           "version": "3.0.2",
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "string_decoder": {
           "version": "1.1.1",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23487,6 +23481,7 @@
         },
         "string-width": {
           "version": "1.0.2",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23497,6 +23492,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23505,11 +23501,13 @@
         },
         "strip-json-comments": {
           "version": "2.0.1",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
           "bundled": true,
           "optional": true
         },
         "tar": {
           "version": "4.4.8",
+          "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -23524,14 +23522,14 @@
         },
         "util-deprecate": {
           "version": "1.0.2",
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "wide-align": {
           "version": "1.1.3",
+          "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "string-width": "^1.0.2 || 2"
@@ -23539,14 +23537,14 @@
         },
         "wrappy": {
           "version": "1.0.2",
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "yallist": {
           "version": "3.0.3",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
           "bundled": true,
-          "dev": true,
           "optional": true
         }
       }
@@ -23672,7 +23670,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
       "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
       "requires": {
         "is-glob": "^3.1.0",
         "path-dirname": "^1.0.0"
@@ -23682,7 +23679,6 @@
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
           "requires": {
             "is-extglob": "^2.1.0"
           }
@@ -24626,7 +24622,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -24642,7 +24637,6 @@
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
       "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.3",
         "minimalistic-assert": "^1.0.1"
@@ -24673,7 +24667,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
       "requires": {
         "hash.js": "^1.0.3",
         "minimalistic-assert": "^1.0.0",
@@ -25178,7 +25171,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
       "requires": {
         "binary-extensions": "^1.0.0"
       }
@@ -26010,7 +26002,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
       "requires": {
         "yallist": "^3.0.2"
       }
@@ -26019,7 +26010,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
       "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
       "requires": {
         "pify": "^4.0.1",
         "semver": "^5.6.0"
@@ -26083,7 +26073,6 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
       "requires": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1",
@@ -26125,7 +26114,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
       "requires": {
         "errno": "^0.1.3",
         "readable-stream": "^2.0.1"
@@ -26212,7 +26200,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
       "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
       "requires": {
         "bn.js": "^4.0.0",
         "brorand": "^1.0.1"
@@ -26296,7 +26283,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
       "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
       "requires": {
         "concat-stream": "^1.5.0",
         "duplexify": "^3.4.2",
@@ -26353,7 +26339,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": true,
       "requires": {
         "aproba": "^1.1.1",
         "copy-concurrently": "^1.0.0",
@@ -26524,7 +26509,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
       "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
       "requires": {
         "assert": "^1.1.1",
         "browserify-zlib": "^0.2.0",
@@ -27091,7 +27075,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
       "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-      "dev": true,
       "requires": {
         "cyclist": "^1.0.1",
         "inherits": "^2.0.3",
@@ -27131,7 +27114,6 @@
       "version": "5.1.5",
       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
       "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
-      "dev": true,
       "requires": {
         "asn1.js": "^4.0.0",
         "browserify-aes": "^1.0.0",
@@ -27274,7 +27256,6 @@
       "version": "3.0.17",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
       "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
-      "dev": true,
       "requires": {
         "create-hash": "^1.1.2",
         "create-hmac": "^1.1.4",
@@ -27320,7 +27301,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
       "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
       "requires": {
         "find-up": "^3.0.0"
       },
@@ -27329,7 +27309,6 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
           "requires": {
             "locate-path": "^3.0.0"
           }
@@ -27338,7 +27317,6 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
           "requires": {
             "p-locate": "^3.0.0",
             "path-exists": "^3.0.0"
@@ -27348,7 +27326,6 @@
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
           "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "dev": true,
           "requires": {
             "p-try": "^2.0.0"
           }
@@ -27357,7 +27334,6 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
           "requires": {
             "p-limit": "^2.0.0"
           }
@@ -28174,7 +28150,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
       "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
         "browserify-rsa": "^4.0.0",
@@ -28188,7 +28163,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -28198,7 +28172,6 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
       "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
       "requires": {
         "duplexify": "^3.6.0",
         "inherits": "^2.0.3",
@@ -28209,7 +28182,6 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
           "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
           "requires": {
             "end-of-stream": "^1.1.0",
             "once": "^1.3.1"
@@ -28443,7 +28415,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.1.0"
       }
@@ -28452,7 +28423,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
       "requires": {
         "randombytes": "^2.0.5",
         "safe-buffer": "^5.1.0"
@@ -28644,7 +28614,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.11",
         "micromatch": "^3.1.10",
@@ -29011,7 +28980,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
       "requires": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
@@ -29029,7 +28997,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dev": true,
       "requires": {
         "aproba": "^1.1.1"
       }
@@ -29199,7 +29166,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
       "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
       "requires": {
         "ajv": "^6.1.0",
         "ajv-errors": "^1.0.0",
@@ -29410,7 +29376,6 @@
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -29682,7 +29647,6 @@
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
       "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
-      "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -29839,7 +29803,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
       "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dev": true,
       "requires": {
         "figgy-pudding": "^3.5.1"
       }
@@ -29899,7 +29862,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
       "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
       "requires": {
         "inherits": "~2.0.1",
         "readable-stream": "^2.0.2"
@@ -29914,7 +29876,6 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
       "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "stream-shift": "^1.0.0"
@@ -29924,7 +29885,6 @@
       "version": "2.8.3",
       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
       "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
       "requires": {
         "builtin-status-codes": "^3.0.0",
         "inherits": "^2.0.1",
@@ -30549,7 +30509,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.1.tgz",
       "integrity": "sha512-e05giplw+8sIYh50qXYHZmr0b76O5dOSm9JwSDebGFLri4ItYzxsnumiAK+yuI56R+H7uIjT9KbVEKNkrprzHw==",
-      "dev": true,
       "requires": {
         "commander": "^2.20.0",
         "source-map": "~0.6.1",
@@ -30567,7 +30526,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
       "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
-      "dev": true,
       "requires": {
         "cacache": "^12.0.2",
         "find-cache-dir": "^2.1.0",
@@ -30658,7 +30616,6 @@
       "version": "2.0.11",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
       "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
-      "dev": true,
       "requires": {
         "setimmediate": "^1.0.4"
       }
@@ -30916,7 +30873,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
       "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
       "requires": {
         "unique-slug": "^2.0.0"
       }
@@ -30925,7 +30881,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
       "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4"
       }
@@ -31017,7 +30972,6 @@
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
       "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
       "requires": {
         "punycode": "1.3.2",
         "querystring": "0.2.0"
@@ -31065,7 +31019,6 @@
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
       "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
       "requires": {
         "inherits": "2.0.3"
       },
@@ -31403,7 +31356,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
       "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-      "dev": true,
       "requires": {
         "chokidar": "^2.0.2",
         "graceful-fs": "^4.1.2",
@@ -31432,7 +31384,6 @@
       "version": "4.41.2",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz",
       "integrity": "sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "@webassemblyjs/helper-module-context": "1.8.5",
@@ -31765,7 +31716,6 @@
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
       "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
       "requires": {
         "source-list-map": "^2.0.0",
         "source-map": "~0.6.1"
@@ -31820,7 +31770,6 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
       "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
       "requires": {
         "errno": "~0.1.7"
       }
diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index ddc0fbc..7683520 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -36,7 +36,7 @@
                        @click="reload" :disabled="popContainer && (assessmentId!='' && assessmentId!='null' && assessmentId!=null)">
                 重新开始
             </el-button>
-            <el-button class="submit-btn" style="margin-right:7px" @click="Submit()" :disabled="popContainer">提交</el-button>
+            <el-button class="submit-btn" style="margin-right:7px" @click="Submit()" :disabled="popContainer || requires.length == 0">提交</el-button>
           </div>
         </div>
       </el-header>
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 074324b..39c092b 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -1399,7 +1399,7 @@ export default {
                         sessionStorage.setItem('nomClientIdentity', JSON.stringify(this.receptionList))
                     }
                     console.log(sessionStorage.getItem('nomClientIdentity'))
-                }else if (this.$store.state.system.id == '34'){
+                }else if (this.$store.state.system.id == '34' && this.popText === '身份证扫描仪' ){
                     this.nbm = 34
                     // this.goodsShelfTotalData = this.auditGoodsShelf
                     if (this.receptionList.length >0){
diff --git a/src/pages/manage/index/index.vue b/src/pages/manage/index/index.vue
index 111fd0a..ede57c9 100644
--- a/src/pages/manage/index/index.vue
+++ b/src/pages/manage/index/index.vue
@@ -47,10 +47,13 @@ export default {
         }
     },
     created() {
-
+        if(sessionStorage.getItem('computerPath')) {
+            this.$router.push(sessionStorage.getItem('computerPath'))
+        }
     },
     methods: {
         close(){
+            sessionStorage.setItem('computerPath', this.$route.fullPath)
             this.$router.push('/counter/list/')
         },
         handleFullscreen(){
@@ -61,7 +64,7 @@ export default {
             this.fullscreen = false
             this.$store.commit('system/changeFullscreen',false)
         },
-    }
+    },
 };
 </script>
 
diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue
index 67bd87a..077babf 100644
--- a/src/pages/manage/list/client/corporateClient.vue
+++ b/src/pages/manage/list/client/corporateClient.vue
@@ -18,9 +18,12 @@
                             <el-input v-model="form.registeredCapital" ref="registeredCapital"></el-input>
                         </el-form-item>
                         <el-form-item label="法人证件号码" required>
-                            <div class="idCard" @click="popUp">
+                            <div class="idCard" @click="popUp1('身份证扫描仪')" v-if='!form.idNumberJudge'>
                                 <p>请刷身份证</p>
                             </div>
+                            <div v-else>
+                                <el-input :value="form.idNumber" disabled ref="idNumber"></el-input>
+                            </div>
                         </el-form-item>
                         <el-form-item label="联系电话" :rules="rules.phone" prop="phone">
                             <el-input :value="form.phone" @input="(val) => phoneListen(val, form, 'phone')"  maxlength="12" ref='phone'></el-input>
@@ -47,40 +50,7 @@
             <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
         </div>
         
-
-        <!-- <el-dialog
-            style="margin-top:10vh"
-            :visible.sync="visible"
-            :modal="false"
-            width="40%"
-            :close-on-click-modal="false" 
-            :show-close="false" 
-            custom-class="data-dia"
-        >
-            <div slot="title" class="dia-header">
-                <div class="data-title" @click="success = true">提交</div>
-            </div>
-            <div class="popBody" v-if="!authorization&&!success">
-                <h2>本业务需要授权</h2>
-            </div>
-            <div class="popBody" v-if="authorization&&!success">
-                <el-form ref="form2" :model="disForm" label-width="80px">
-                     <el-form-item label="授权柜员">
-                        <el-input disabled v-model="disForm.name"></el-input>
-                    </el-form-item>
-                    <el-form-item label="授权柜员">
-                        <el-input type="password" disabled v-model="disForm.pass"></el-input>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <div class="popBody" v-if="success">
-                <h2>完成表单form</h2>
-            </div>
-            <div class="popBtns">
-                <el-button class="close btn" @click="[visible = false,authorization=false,success=false]">取 消</el-button>
-                <el-button class="sure btn" type="primary" @click="popSure">确 定</el-button>
-            </div>
-        </el-dialog> -->
+        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
     </div>
 
     <need-before v-else :moduleName='needBefore' :unNeed="unNeed" class="wrap" />
@@ -93,24 +63,27 @@ import { addOperation, getOperation } from '@/api/http';
 import { phoneListen, checkRequired, myValidate, checkHanzi, checkName } from '@/utils/utilFunction.js'
 import MyTitle from '@/components/myTitle'
 import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
 
 const moduleName = 'corporateClient'
 export default {
     name: 'index',
     components: {
         MyTitle,
-        NeedBefore
+        NeedBefore,
+        MyDialog
     },
     data() {
         return {
             unNeed: false,
             isNeedBefore: '',
             needBefore: '',
-
+            idNumberJudge: false,
             visible:false,// 表单
             authorization:false,// 切授权
             success:false,// 切成功
             form:{
+                idNumber: '',
                 name: '',
                 phone: '',
                 documentType: '',
@@ -120,6 +93,17 @@ export default {
                 companyAddress: '',
                 certificateType: ''
             },
+            formName:{
+                idNumber: '法人证件号码',
+                name: '法人姓名',
+                phone: '联系电话',
+                documentType: '证件类型',
+                companyName: '公司名称',
+                registeredCapital: '注册资本',
+                codeNumber: '代码证号',
+                companyAddress: '公司地址',
+                certificateType: '法人证件类型'
+            },
             rules: {
                 companyName: [
                     { 
@@ -158,7 +142,10 @@ export default {
         // firmClientIdentity
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
-                
+                this.getFormData()
+            }else {
+                this.isNeedBefore = true
+                this.needBefore = this.needsModule(moduleName)
             }
         }else {
             this.isNeedBefore = true
@@ -178,21 +165,29 @@ export default {
                     var list = data.data.judgmentRuleReqs
                     for (var i = 0; i < list.length; i++) {
                         if (list[i].answerId == '48') {this.form.documentType = list[i].emptyTwo} //证件类型
-                        if (list[i].answerId == '49') {this.form.codeNumber = list[i].emptyTwo} //代码证号
-                        if (list[i].answerId == '50') {this.form.companyName = list[i].emptyTwo} //公司名称
-                        if (list[i].answerId == '51') {this.form.companyAddress = list[i].emptyTwo} //公司地址
-                        if (list[i].answerId == '52') {this.form.registeredCapital = list[i].emptyTwo} //注册资本
-                        if (list[i].answerId == '53') {this.form.certificateType = list[i].emptyTwo} //法人证件类型
-                        if (list[i].answerId == '54') {sessionStorage.setItem('firmClientIdentity', list[i].emptyTwo)} //法人证件号码
-                        if (list[i].answerId == '55') {this.form.name = list[i].emptyTwo} //法人姓名
-                        if (list[i].answerId == '56') {this.form.phone = list[i].emptyTwo} //联系电话
+                        else if (list[i].answerId == '49') {this.form.codeNumber = list[i].emptyTwo} //代码证号
+                        else if (list[i].answerId == '50') {this.form.companyName = list[i].emptyTwo} //公司名称
+                        else if (list[i].answerId == '51') {this.form.companyAddress = list[i].emptyTwo} //公司地址
+                        else if (list[i].answerId == '52') {this.form.registeredCapital = list[i].emptyTwo} //注册资本
+                        else if (list[i].answerId == '53') {this.form.certificateType = list[i].emptyTwo} //法人证件类型
+                        // else if (list[i].answerId == '54') {sessionStorage.setItem('firmClientIdentity', list[i].emptyTwo)} //法人证件号码
+                        else if (list[i].answerId == '54') {
+                            console.log('54id')
+                            console.log(list[i].emptyTwo)
+                            this.idNumberJudge = true
+                            this.form.idNumber = list[i].emptyTwo
+                        }
+                        else if (list[i].answerId == '55') {this.form.name = list[i].emptyTwo} //法人姓名
+                        else if (list[i].answerId == '56') {this.form.phone = list[i].emptyTwo} //联系电话
                     }
                 }
             }).catch((error)=>{
             })
         },
         ...mapMutations({
-            changeShowGoods: 'system/changeShowGoods'
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule'
         }),
         popUp(){// 唤起弹窗
             this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'34'})
@@ -201,56 +196,63 @@ export default {
 
         },
         submitForm() {
-            let projectId = sessionStorage.getItem('projectId')
-            let startTime = sessionStorage.getItem('startTime')
+            
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = true;
-                let formList = [];
-                let firmClientIdentity = sessionStorage.getItem('firmClientIdentity')
-                let firmClientIdentitys = JSON.parse(firmClientIdentity);
-                if (firmClientIdentitys && firmClientIdentitys.length > 0){
-                    for (var i=0;i<firmClientIdentitys.length;i++){
-                        formList.push({"answerId":54,"emptyOne": "", "emptyTwo": firmClientIdentity, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,54","type": ""})// 法人证件号码
-                    }
-                    if(this.form.documentType){
-                        formList.push({ "answerId":'48', "emptyOne": "19", "emptyTwo": this.form.documentType, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,48","type": "1"})//证件类型
-                    }
-                    if(this.form.companyAddress){
-                        formList.push({ "answerId":'51', "emptyOne": "22", "emptyTwo": this.form.companyAddress, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,51", "type": "3" })//公司地址
-                    }
-                    if(this.form.registeredCapital){
-                        formList.push({ "answerId":'52', "emptyOne": "23", "emptyTwo": this.form.registeredCapital, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,52", "type": "3" })//注册资本
-                    }
-                    if(this.form.name){
-                        formList.push( {"answerId":'55',"emptyOne": "25", "emptyTwo": this.form.name, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,55", "type": "3"})//法人姓名
-                    }
-                    if(this.form.phone){
-                        formList.push({"answerId":'56',"emptyOne": "5", "emptyTwo": this.form.phone, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,56", "type": "3"})//联系电话
-                    }
-                    formList.push(
-                        { "answerId":'49', "emptyOne": "20", "emptyTwo": this.form.codeNumber, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,49", "type": "3" },//代码证号
-                        { "answerId":'50', "emptyOne": "21", "emptyTwo": this.form.companyName, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,50", "type": "3" },//公司名称
-                        {"answerId":'53',"emptyOne": "24", "emptyTwo": this.form.certificateType, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,53", "type": "1"},//法人证件类型
-                    );
-                    let params= {
-                        parentId:this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,25,34',
-                        lcJudgmentRuleReq:formList,
-                        projectId:+projectId,
-                        startTime:startTime,
-                    }
-                    addOperation(params).then((data)=>{
-                        // this.$message({
-                        //     message: '提交成功',
-                        //     type: 'success'
-                        // });
-                    }).catch((error)=>{
-                    })
-                }else {
-                    this.$message.error('有必填项未填哦~');
-                }
             }, this.$refs));
         },
+        submitForm2() {
+            let projectId = sessionStorage.getItem('projectId')
+            let startTime = sessionStorage.getItem('startTime')
+            let formList = [];
+            let firmClientIdentity = sessionStorage.getItem('firmClientIdentity')
+            let firmClientIdentitys = JSON.parse(firmClientIdentity);
+            if (firmClientIdentitys && firmClientIdentitys.length > 0){
+                // for (var i=0;i<firmClientIdentitys.length;i++){
+                //     formList.push({"answerId":54,"emptyOne": "", "emptyTwo": firmClientIdentity, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,54","type": ""})// 法人证件号码
+                // }
+                formList.push({"answerId":54,"emptyOne": "", "emptyTwo": this.form.idNumber, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,54","type": ""})// 法人证件号码
+                if(this.form.documentType){
+                    formList.push({ "answerId":'48', "emptyOne": "19", "emptyTwo": this.form.documentType, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,48","type": "1"})//证件类型
+                }
+                if(this.form.companyAddress){
+                    formList.push({ "answerId":'51', "emptyOne": "22", "emptyTwo": this.form.companyAddress, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,51", "type": "3" })//公司地址
+                }
+                if(this.form.registeredCapital){
+                    formList.push({ "answerId":'52', "emptyOne": "23", "emptyTwo": this.form.registeredCapital, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,52", "type": "3" })//注册资本
+                }
+                if(this.form.name){
+                    formList.push( {"answerId":'55',"emptyOne": "25", "emptyTwo": this.form.name, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,55", "type": "3"})//法人姓名
+                }
+                if(this.form.phone){
+                    formList.push({"answerId":'56',"emptyOne": "5", "emptyTwo": this.form.phone, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,56", "type": "3"})//联系电话
+                }
+                formList.push(
+                    { "answerId":'49', "emptyOne": "20", "emptyTwo": this.form.codeNumber, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,49", "type": "3" },//代码证号
+                    { "answerId":'50', "emptyOne": "21", "emptyTwo": this.form.companyName, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,50", "type": "3" },//公司名称
+                    {"answerId":'53',"emptyOne": "24", "emptyTwo": this.form.certificateType, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,53", "type": "1"},//法人证件类型
+                );
+                let params= {
+                    parentId:this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,25,34',
+                    lcJudgmentRuleReq:formList,
+                    projectId:+projectId,
+                    startTime:startTime,
+                }
+                addOperation(params).then((data)=>{
+                    // this.$message({
+                    //     message: '提交成功',
+                    //     type: 'success'
+                    // });
+
+                    // this.setDataFlow({ ...this.form })
+                    this.setNeedsModule(moduleName)
+                }).catch((error)=>{
+                })
+            }else {
+                this.$message.error('有必填项未填哦~');
+            }
+        },
         phoneListen: phoneListen,
         checkHanzi: checkHanzi,
         checkName: checkName
diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
index 3dbd93c..613f160 100644
--- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue
+++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
@@ -204,16 +204,10 @@ export default{
                 ]
             },
             myTable: {
-                // clientName: '', // 客户姓名
-                // currencyMark: '钞户', // 钞汇标识
-                // depositNumber: '', // 定存编号
-                // capital: '', // 本金
-                // interestRate: '', // 利率
-                // depositDate: '', // 存期
-                // interest: '', // 利息
-                // totalMoney: '', // 总金额
-                // certificateType: '', //证件类型
-                // breathDate: '', // 起息日期
+                302: {
+                    prop: 'voucherNumber',
+                    prop: '3'
+                },
                 303: {
                     prop: 'voucherType',
                     type: '1',
@@ -280,6 +274,14 @@ export default{
                     prop: 'certificateType',//
                     type: '1',
                       "subjectId": 19,
+                },
+                392: {
+                    prop: 'idNumber',
+                    type: '3'
+                },
+                394: {
+                    prop: 'drawPassword',
+                    type: '3'
                 }
             },
             myTable2: {
diff --git a/src/pages/manage/list/personal/callDeposits/callDeposits.vue b/src/pages/manage/list/personal/callDeposits/callDeposits.vue
index b88c30c..624dacf 100644
--- a/src/pages/manage/list/personal/callDeposits/callDeposits.vue
+++ b/src/pages/manage/list/personal/callDeposits/callDeposits.vue
@@ -53,6 +53,7 @@ export default {
     data() {
         return {
             text:'',/* 顶部文字 */
+            cacheVal: '',
             textObj:{
                 '1':'开户',
                 '2':'支取销户',
@@ -68,15 +69,21 @@ export default {
         }
     },
     created() {
-        this.handleSelect('1')
+        if(sessionStorage.getItem('callDepositsIndex')) {
+            this.handleSelect(sessionStorage.getItem('callDepositsIndex'))
+        }else {
+            this.handleSelect('1')
+        }
     },
     methods: {
         handleSelect(val){
             this.text = this.textObj[val]
             this.activeIndex = val
+            this.cacheVal = val
         },
-        
-
+    },
+    destroyed() {
+        sessionStorage.setItem('callDepositsIndex', this.cacheVal)
     }
 };
 </script>
diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue
index 2ca4a03..6a5fd23 100644
--- a/src/pages/manage/list/personal/callDeposits/openAccount.vue
+++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue
@@ -192,6 +192,14 @@ export default{
                 
             },
             myTable2: {
+                291: {
+                    prop: 'idNumber',// 身份证号码
+                    type: '3',
+                },
+                297: {
+                    prop: 'voucherNumber', // 银行卡号
+                    type: '3'
+                },
                 293: {
                     prop: 'customerName',//客户姓名
                     type: '3',
@@ -227,6 +235,10 @@ export default{
                     type: '1',
                     "subjectId": 48,
                 },
+                301: {
+                    prop: 'drawPassword',
+                    type: '3'
+                },
                 // : {
                 //     prop: 'noticeType',//通知类型 后台没有这个
                 //     type: '1'
diff --git a/src/pages/manage/list/personal/currentAccount/index.vue b/src/pages/manage/list/personal/currentAccount/index.vue
index 9a6005c..5a9fb7e 100644
--- a/src/pages/manage/list/personal/currentAccount/index.vue
+++ b/src/pages/manage/list/personal/currentAccount/index.vue
@@ -82,6 +82,7 @@ export default {
             text:'',/* 顶部文字 */
             // 存款完才能取款，否则会提示
             depositFinish: false,
+            cacheVal: '',
             textObj:{
                 '1':'开户',
                 '2':'存款',
@@ -105,16 +106,20 @@ export default {
         }
     },
     created() {
-        this.handleSelect('1')
+        if(sessionStorage.getItem('currentAccountIndex')) {
+            this.handleSelect(sessionStorage.getItem('currentAccountIndex'))
+        }else {
+            this.handleSelect('1')
+        }
     },
     destroyed() {
-        // sessionStorage.setItem('currentAccountIndex', )
+        sessionStorage.setItem('currentAccountIndex', this.cacheVal)
     },
     methods: {
         handleSelect(val){
-            console.log(typeof(val),this.activeIndex,'xuanze');
             this.text = this.textObj[val]
             this.activeIndex = val
+            this.cacheVal  = val
         },
         setDepositFinish() {
             this.depositFinish = true;
diff --git a/src/pages/manage/list/personal/timeDeposit/timeDeposit.vue b/src/pages/manage/list/personal/timeDeposit/timeDeposit.vue
index b454299..a48cfce 100644
--- a/src/pages/manage/list/personal/timeDeposit/timeDeposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/timeDeposit.vue
@@ -65,6 +65,7 @@ export default {
     data() {
         return {
             text:'',/* 顶部文字 */
+            cacheVal: '',
             textObj:{
                 '1':'开户',
                 '2':'存款',
@@ -82,17 +83,21 @@ export default {
         }
     },
     created() {
-        this.handleSelect('1')
+        if(sessionStorage.getItem('timeDepositIndex')) {
+            this.handleSelect(sessionStorage.getItem('timeDepositIndex'))
+        }else {
+            this.handleSelect('1')
+        }
     },
     methods: {
         handleSelect(val){
-            console.log(typeof(val),this.activeIndex,'xuanze');
-            
             this.text = this.textObj[val]
             this.activeIndex = val
+            this.cacheVal = val
         },
-        
-
+    },
+    destroyed() {
+        sessionStorage.setItem('timeDepositIndex', this.cacheVal)
     }
 };
 </script>
diff --git a/src/pages/manage/list/personal/usefulPhrases/usefulPhrases.vue b/src/pages/manage/list/personal/usefulPhrases/usefulPhrases.vue
index 58e96e1..3ecdc6a 100644
--- a/src/pages/manage/list/personal/usefulPhrases/usefulPhrases.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/usefulPhrases.vue
@@ -64,6 +64,7 @@ export default {
     data() {
         return {
             text:'',/* 顶部文字 */
+            cacheVal: '',
             textObj:{
                 '1':'开户',
                 '2':'续存',
@@ -81,15 +82,21 @@ export default {
         }
     },
     created() {
-        this.handleSelect('1')
+        if(sessionStorage.getItem('usefulPhrasesIndex')) {
+            this.handleSelect(sessionStorage.getItem('usefulPhrasesIndex'))
+        }else {
+            this.handleSelect('1')
+        }
     },
     methods: {
         handleSelect(val){
             this.text = this.textObj[val]
             this.activeIndex = val
+            this.cacheVal = val
         },
-        
-
+    },
+    destroyed() {
+        sessionStorage.setItem('usefulPhrasesIndex', this.cacheVal)
     }
 };
 </script>
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index fc543ce..303ddfd 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -1144,6 +1144,24 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+
+                needsModule: {
+                    'corporateClient': false
+                },
+                dataFlow: {
+                    // 凭证类型（存单）、客户号（根据案例展示）、客户姓名、币种（CNY人民币）、钞汇标识（钞户）、通知类型（根据案例展示）、定存编号（根据开户时的定存编号展示）、本金（开户时存的金额）、利息（2.8）、、总金额（利息+本金）、支取类别（现金）、支取金额（等于总金额）证件类型（身份证）
+                    // 身份证号码、客户号（根据案例展示）、客户姓名、币种（人民币）、钞汇标识（钞户）
+                    
+                    // depositNumber: '0816',
+                    
+                    // capital: 100,
+                    // interestRate: 1.85,
+                    // depositTerm: '1年',
+                    // interest: 1.6,
+                    // totalMoney: 101.6,
+                    // signDate: '2001-03-01',
+                    // voucherNumber
+                }
             },
             '项目十二': {
                 id: '',