diff --git a/package-lock.json b/package-lock.json
index abe096763..03838d1a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8972,7 +8972,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -8981,7 +8980,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -8993,7 +8991,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -9002,7 +8999,6 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9015,7 +9011,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9024,7 +9019,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9037,7 +9031,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
       "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -9046,7 +9039,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9058,7 +9050,6 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9067,7 +9058,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -9076,7 +9066,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9085,7 +9074,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
       "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9097,7 +9085,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9109,7 +9096,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9118,7 +9104,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
       "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
-      "dev": true,
       "inBundle": true,
       "license": "Apache-2.0",
       "optional": true,
@@ -9133,7 +9118,6 @@
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
       "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9145,7 +9129,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -9154,7 +9137,6 @@
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9173,7 +9155,6 @@
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
       "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9193,7 +9174,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -9202,7 +9182,6 @@
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9217,7 +9196,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
       "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9229,7 +9207,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9242,7 +9219,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -9251,7 +9227,6 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9263,7 +9238,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9278,7 +9252,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9287,7 +9260,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9302,7 +9274,6 @@
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9311,7 +9282,6 @@
       "version": "2.3.5",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
       "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9324,7 +9294,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
       "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9336,7 +9305,6 @@
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9351,7 +9319,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
       "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9360,7 +9327,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
       "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9380,7 +9346,6 @@
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz",
       "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
-      "dev": true,
       "inBundle": true,
       "license": "BSD-3-Clause",
       "optional": true,
@@ -9404,7 +9369,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
       "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9420,7 +9384,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
       "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -9429,7 +9392,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
       "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9442,7 +9404,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9457,7 +9418,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9469,7 +9429,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9481,7 +9440,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9493,7 +9451,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9505,7 +9462,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9517,7 +9473,6 @@
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9530,7 +9485,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9542,7 +9496,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
       "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9551,7 +9504,6 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
       "inBundle": true,
       "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
       "optional": true,
@@ -9569,7 +9521,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9578,7 +9529,6 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9596,7 +9546,6 @@
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
       "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9611,7 +9560,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9620,7 +9568,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9629,7 +9576,6 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -9638,7 +9584,6 @@
       "version": "5.7.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
       "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9650,7 +9595,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -9659,7 +9603,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -9668,7 +9611,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9680,7 +9622,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9697,7 +9638,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9712,7 +9652,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true,
@@ -9724,7 +9663,6 @@
       "version": "4.4.8",
       "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
       "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9745,7 +9683,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "optional": true
@@ -9754,7 +9691,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true,
@@ -9766,7 +9702,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -9775,7 +9710,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
       "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-      "dev": true,
       "inBundle": true,
       "license": "ISC",
       "optional": true
@@ -31234,7 +31168,6 @@
           "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
           "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "ansi-regex": {
@@ -31242,7 +31175,6 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "aproba": {
@@ -31250,7 +31182,6 @@
           "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
           "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "are-we-there-yet": {
@@ -31258,7 +31189,6 @@
           "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
           "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "delegates": "^1.0.0",
@@ -31270,7 +31200,6 @@
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "brace-expansion": {
@@ -31278,7 +31207,6 @@
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
@@ -31290,7 +31218,6 @@
           "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
           "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "code-point-at": {
@@ -31298,7 +31225,6 @@
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "concat-map": {
@@ -31306,7 +31232,6 @@
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "console-control-strings": {
@@ -31314,7 +31239,6 @@
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "core-util-is": {
@@ -31322,7 +31246,6 @@
           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
           "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "debug": {
@@ -31330,7 +31253,6 @@
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "ms": "^2.1.1"
@@ -31341,7 +31263,6 @@
           "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
           "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "delegates": {
@@ -31349,7 +31270,6 @@
           "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
           "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "detect-libc": {
@@ -31357,7 +31277,6 @@
           "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
           "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "fs-minipass": {
@@ -31365,7 +31284,6 @@
           "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
           "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "minipass": "^2.2.1"
@@ -31376,7 +31294,6 @@
           "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
           "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "gauge": {
@@ -31384,7 +31301,6 @@
           "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
           "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "aproba": "^1.0.3",
@@ -31402,7 +31318,6 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -31418,7 +31333,6 @@
           "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
           "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "iconv-lite": {
@@ -31426,7 +31340,6 @@
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
           "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3"
@@ -31437,7 +31350,6 @@
           "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
           "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "minimatch": "^3.0.4"
@@ -31448,7 +31360,6 @@
           "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
           "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "once": "^1.3.0",
@@ -31460,7 +31371,6 @@
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "ini": {
@@ -31468,7 +31378,6 @@
           "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
           "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "is-fullwidth-code-point": {
@@ -31476,7 +31385,6 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
@@ -31487,7 +31395,6 @@
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "minimatch": {
@@ -31495,7 +31402,6 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
@@ -31506,7 +31412,6 @@
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "minipass": {
@@ -31514,7 +31419,6 @@
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
@@ -31526,7 +31430,6 @@
           "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
           "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "minipass": "^2.2.1"
@@ -31537,7 +31440,6 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "minimist": "0.0.8"
@@ -31548,7 +31450,6 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "needle": {
@@ -31556,7 +31457,6 @@
           "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
           "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "debug": "^4.1.0",
@@ -31569,7 +31469,6 @@
           "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz",
           "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "detect-libc": "^1.0.2",
@@ -31589,7 +31488,6 @@
           "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
           "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "abbrev": "1",
@@ -31601,7 +31499,6 @@
           "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
           "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "npm-packlist": {
@@ -31609,7 +31506,6 @@
           "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
           "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "ignore-walk": "^3.0.1",
@@ -31621,7 +31517,6 @@
           "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
           "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "are-we-there-yet": "~1.1.2",
@@ -31635,7 +31530,6 @@
           "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "object-assign": {
@@ -31643,7 +31537,6 @@
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "once": {
@@ -31651,7 +31544,6 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "wrappy": "1"
@@ -31662,7 +31554,6 @@
           "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
           "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "os-tmpdir": {
@@ -31670,7 +31561,6 @@
           "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
           "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "osenv": {
@@ -31678,7 +31568,6 @@
           "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
           "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "os-homedir": "^1.0.0",
@@ -31690,7 +31579,6 @@
           "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
           "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "process-nextick-args": {
@@ -31698,7 +31586,6 @@
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
           "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "rc": {
@@ -31706,7 +31593,6 @@
           "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
           "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "deep-extend": "^0.6.0",
@@ -31720,7 +31606,6 @@
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
               "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
               "bundled": true,
-              "dev": true,
               "optional": true
             }
           }
@@ -31730,7 +31615,6 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -31747,7 +31631,6 @@
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
           "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "glob": "^7.1.3"
@@ -31758,7 +31641,6 @@
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
           "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "safer-buffer": {
@@ -31766,7 +31648,6 @@
           "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
           "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "sax": {
@@ -31774,7 +31655,6 @@
           "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
           "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "semver": {
@@ -31782,7 +31662,6 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
           "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "set-blocking": {
@@ -31790,7 +31669,6 @@
           "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
           "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "signal-exit": {
@@ -31798,7 +31676,6 @@
           "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
           "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "string_decoder": {
@@ -31806,7 +31683,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -31817,7 +31693,6 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
@@ -31830,7 +31705,6 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -31841,7 +31715,6 @@
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
           "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "tar": {
@@ -31849,7 +31722,6 @@
           "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
           "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "chownr": "^1.1.1",
@@ -31866,7 +31738,6 @@
           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "wide-align": {
@@ -31874,7 +31745,6 @@
           "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
           "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
           "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
             "string-width": "^1.0.2 || 2"
@@ -31885,7 +31755,6 @@
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
           "bundled": true,
-          "dev": true,
           "optional": true
         },
         "yallist": {
@@ -31893,7 +31762,6 @@
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
           "bundled": true,
-          "dev": true,
           "optional": true
         }
       }
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index dcef80ea8..d286fee3e 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -189,9 +189,7 @@
           <el-button type="primary" size="mini">查询</el-button>
         </el-col> -->
         <el-col :span="24">
-          <el-button type="primary" size="mini" @click="handleSearch"
-            >查询</el-button
-          >
+          <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
         </el-col>
       </el-row>
       <div class="resi-down" @click="handleOpenSearch">
@@ -578,7 +576,7 @@ export default {
   margin-bottom: 20px;
 }
 .resi-search {
-  padding-right: 20px;
+  // padding-right: 20px;
   .el-col {
     text-align: right;
   }
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index fa3f8d81e..73289a9fc 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -43,6 +43,7 @@
           :prop="item.columnName"
           :label="item.label"
           align="center"
+          :show-overflow-tooltip="true"
           :width="item.itemType === 'radio' ? computedWidth(item.label) : 180"
         >
           <template slot-scope="scope">
@@ -823,9 +824,9 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .tabs-other-info {
-  .el-tabs__item {
+  ::v-deep .el-tabs__item {
     // width: 50px;
     height: 20px;
     box-sizing: border-box;
@@ -838,12 +839,12 @@ export default {
     background: #ebecf1;
     border-radius: 2px;
   }
-  .el-tabs__nav-wrap::after,
-  .el-tabs__active-bar {
+  ::v-deep .el-tabs__nav-wrap::after,
+  ::v-deep .el-tabs__active-bar {
     display: none;
   }
-  .el-tabs__nav-next,
-  .el-tabs__nav-prev {
+  ::v-deep .el-tabs__nav-next,
+  ::v-deep .el-tabs__nav-prev {
     // width: 12px;
     // height: 12px;
     color: rgba(30, 122, 254, 1);
@@ -851,32 +852,27 @@ export default {
     background: rgba(30, 122, 254, .2);
     // border-radius: 50%;
   }
-  .el-tabs__item.is-active {
+  ::v-deep .el-tabs__item.is-active {
     color: #fff;
     background: linear-gradient(90deg, #1A5AFD, #26C4FF);
   }
 }
 .resi-container .resi-card-table {
-  .el-table th {
+  ::v-deep .el-table th {
     color: #fff;
     background-color: rgba(33, 149, 254, 1);
     border-right: 1px solid rgba(33, 149, 254, 1);;
   }
 }
 .resi-table {
-  // .el-table__header-wrapper .el-table__header th {
-  //   color: #fff;
-  //   background-color: rgba(33, 149, 254, 1);
-  //   border-right: 1px solid rgba(33, 149, 254, 1);;
-  // }
-  .el-button--text {
+  ::v-deep .el-button--text {
     text-decoration: underline;
   }
-  .btn-color-del {
+  ::v-deep .btn-color-del {
     margin-left: 10px;
     color: rgba(213, 16, 16, 1);
   }
-  .btn-color-edit {
+  ::v-deep .btn-color-edit {
     color: rgba(0, 167, 169, 1);
   }
 }
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
new file mode 100644
index 000000000..4eb670df9
--- /dev/null
+++ b/src/views/modules/workSys/resiCate.vue
@@ -0,0 +1,551 @@
+<template>
+  <div v-if="pageLoading" class="resi-container">
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-select
+        v-model="value"
+          placeholder="请选择"
+          size="small"
+          clearable
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+        v-model="value"
+          placeholder="请选择"
+          size="small"
+          clearable
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
+      </div>
+      <el-table
+        :data="tableData"
+        row-key="id"
+        v-loading="tableLoading"
+        border
+        style="width: 100%"
+        class="resi-table"
+      >
+        <el-table-column label="序号" type="index" align="center" width="50">
+        </el-table-column>
+        <el-table-column
+          v-for="item in tableHeader"
+          :key="item.columnName"
+          :prop="item.columnName"
+          :label="item.label"
+          align="center"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <el-image
+            v-if="filterImage(item.columnName)"
+            style="width: 70px; height: 70px"
+            :src="handleFilterSpan(scope.row, item) "
+            fit="fill"></el-image>
+            <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" align="center" width="120">
+          <template slot-scope="scope">
+            <el-button
+              @click="handleLook(scope.row)"
+              type="text"
+              size="small"
+              class="btn-color-look"
+              >{{(scope.row.status === 'show'&&'隐藏') || '显示'}}</el-button
+            >
+            <el-button
+                @click="handleEdit(scope.row)"
+                type="text"
+                size="small"
+                class="btn-color-edit"
+                >编辑</el-button
+              >
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="currentPage"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="pageSize"
+          layout="sizes, prev, pager, next"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+
+    <el-dialog
+      title="居民类别配置"
+      :visible.sync="dialogVisible"
+      width="40%"
+      append-to-body
+      :close-on-click-modal="false"
+      :before-close="handlerCancle"
+    >
+      <el-form label-width="100px" :model="form" :rules="rules" ref="ruleForm">
+        <el-form-item label="类别名称">
+          <el-input v-model="form.label" size="small" style="width: 180px;" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="管理平台图标" prop="managementIcon">
+          <el-upload class="avatar-uploader"
+            :action="uploadUlr"
+            :data="{customerId:customerId}"
+            :show-file-list="false"
+            :on-success="(response, file, fileList) => handleImgSuccess('managementIcon', response, file, fileList)"
+            :before-upload="beforeImgUpload">
+            <img v-if="form.managementIcon"
+              :src="form.managementIcon"
+              style="width:70px;height:70px"
+              class="function-icon">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="数据平台图标" prop="dataIcon">
+          <el-upload class="avatar-uploader"
+            :action="uploadUlr"
+            :data="{customerId:customerId}"
+            :show-file-list="false"
+            :on-success="(response, file, fileList) => handleImgSuccess('dataIcon', response, file, fileList)"
+            :before-upload="beforeImgUpload">
+            <img v-if="form.dataIcon"
+              :src="form.dataIcon"
+              style="width:70px;height:70px"
+              class="function-icon">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="房屋显示图标" prop="houseShowIcon">
+          <el-upload class="avatar-uploader"
+            :action="uploadUlr"
+            :data="{customerId:customerId}"
+            :show-file-list="false"
+            :on-success="(response, file, fileList) => handleImgSuccess('houseShowIcon', response, file, fileList)"
+            :before-upload="beforeImgUpload">
+            <img v-if="form.houseShowIcon"
+              :src="form.houseShowIcon"
+              style="width:70px;height:70px"
+              class="function-icon">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="是否预警">
+          <el-switch v-model="form.warn"></el-switch>
+        </el-form-item>
+        <el-form-item label="黄色预警">
+          <el-input-number v-model="form.level1" :min="0" size="small" label="描述文字"></el-input-number> 人/楼宇
+        </el-form-item>
+        <el-form-item label="红色预警">
+          <el-input-number v-model="form.level2" :min="0" size="small" label="描述文字"></el-input-number> 人/楼宇
+        </el-form-item>
+      </el-form>
+      <div class="resi-btns">
+        <el-button size="small" @click="handlerCancle">取消</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="btnLoading"
+          @click="handleSUbmit"
+          >提交</el-button
+        >
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import Sortable from 'sortablejs'
+export default {
+  data() {
+    return {
+      tableLoading: false,
+      btnLoading: false,
+      disabled: false,
+      pageLoading: false,
+      dialogVisible: false,
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+      currentPage: 1,
+      pageSize: 20,
+      total: null,
+      conditions: [],
+      tableData: [],
+      value: '',
+      options: [
+        {
+          label: '是',
+          value: 1
+        },{
+          label: '否',
+          value: 2
+        }
+      ],
+      tableHeader: [
+        {
+          label: '类别名称',
+          columnName: 'label'
+        }, {
+          label: '管理平台图标',
+          columnName: 'managementIcon'
+        }, {
+          label: '数据平台图标',
+          columnName: 'dataIcon'
+        }, {
+          label: '房屋显示图标',
+          columnName: 'houseShowIcon'
+        }, {
+          label: '状态',
+          columnName: 'status',
+          options: [{
+            value: 'show',
+            label: '显示'
+          }, {
+            value: 'hidden',
+            label: '隐藏'
+          }]
+        }, {
+          label: '是否预警',
+          columnName: 'warn',
+          options: [{
+            value: '1',
+            label: '是'
+          }, {
+            value: '0',
+            label: '否'
+          }]
+        }, {
+          label: '黄色预警',
+          columnName: 'level1'
+        }, {
+          label: '红色预警',
+          columnName: 'level2'
+        }
+      ],
+      customerId: '',
+      form: {
+        label: '',
+        dataIcon: '',
+        managementIcon: '',
+        houseShowIcon: '',
+        warn: '',
+        level1: '',
+        level2: ''
+      },
+      rules: {
+        managementIcon: [{ required: true, message: '管理平台图标不能为空', trigger: 'blur' }],
+        dataIcon: [{ required: true, message: '数据平台图标不能为空', trigger: 'blur' }],
+        houseShowIcon: [{ required: true, message: '房屋显示图标不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  async created() {
+    this.customerId = localStorage.getItem('customerId')
+    this.getTableData()
+    this.pageLoading = true
+  },
+  mounted() {
+    this.rowDrop()
+  },
+  methods: {
+    rowDrop() {
+      const tbody = document.querySelector('.el-table__body-wrapper tbody')
+      const _this = this
+      Sortable.create(tbody, {
+        onEnd({ newIndex, oldIndex }) {
+          const currRow = _this.tableData.splice(oldIndex, 1)[0]
+          _this.tableData.splice(newIndex, 0, currRow)
+          console.log('rowdrap', newIndex, oldIndex)
+          if (newIndex || newIndex === 0) _this.sortData()
+          // 
+        }
+      })
+    },
+    computedWidth(label) {
+      const wd = 20 * label.length
+      return wd > 80 ? wd : 80
+    },
+    filterImage(item) {
+      const arr = ['managementIcon', 'dataIcon', 'houseShowIcon']
+      return arr.includes(item)
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getTableData()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.currentPage = val
+      this.getTableData()
+    },
+    handleFilterSpan(row, item) {
+      let _val = ''
+      if (item.options && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label
+        })
+      }
+      return _val || row[item.columnName]
+    },
+    handleSearch(val) {
+      console.log('searchhh--', val)
+      this.currentPage = 1
+      this.conditions = val
+      this.getTableData()
+    },
+    
+    handlerCancle() {
+      this.dialogVisible = false
+    },
+    beforeImgUpload (file) {
+      const isPNG = (file.type === 'image/png') || (file.type === 'image/jpeg')
+      const isLt1M = file.size / 1024 / 1024 < 1
+
+      if (!isPNG) {
+        this.$message.error('上传图片只能是 PNG 格式!')
+      }
+      if (!isLt1M) {
+        this.$message.error('上传图片大小不能超过 1MB!')
+      }
+      return isPNG && isLt1M
+    },
+    handleImgSuccess (type, res, file) {
+      if (res.code === 0 && res.msg === 'success') {
+
+        console.log('type', type)
+        console.log('res.data.url', res.data.url)
+        this.form[type] = res.data.url
+
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    async handleLook(row) {
+      const _show = {
+        show: 'hidden',
+        hidden: 'show'
+      }
+      const params = {
+        id: row.id,
+        status: _show[row.status]
+      }
+      this.$http
+        .post('/oper/customize/resicategorystatsconfig/updatestatus', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.getTableData()
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async handleEdit(row) {
+      
+      this.form = { ...row }
+      this.dialogVisible = true
+    },
+    async handleSUbmit() {
+      this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.btnLoading = true
+          const _form = {
+            ...this.form,
+            warn: (this.form.warn && 1) || 0
+          }
+          await this.$http
+            .post('/oper/customize/resicategorystatsconfig/update', _form)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg)
+              } else {
+                this.dialogVisible = false
+                this.getTableData()
+              } 
+            })
+            .catch(() => {
+              return this.$message.error('网络错误')
+            })
+            this.btnLoading = false
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+      
+    },
+    handleDel(row) {
+      let params = {
+        formCode: 'resi_base_info',
+        icResiUserId: row.icResiUserId
+      }
+      console.log('row1', row)
+      this.$http
+        .post('/epmetuser/icresiuser/delete', params)
+        .then(({ data: res }) => {
+          console.log('row2', row)
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('row3', row)
+            this.$message.success('删除成功')
+            this.getTableData()
+          }
+        })
+        .catch((err) => {
+          console.log('row4', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    sortData() {
+      const _data = this.tableData.map((item, index)=> {
+        return {
+          id: item.id,
+          sort: index
+        }
+      })
+      this.$http
+        .post('/oper/customize/resicategorystatsconfig/updatesort', _data)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            // this.getTableData()
+          }
+        })
+        .catch((err) => {
+          console.log('row4', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    getTableHeader() {
+      this.$http
+        .post('/oper/customize/icform/tableheaders', {
+          formCode: 'resi_base_info'
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.tableHeader = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async getTableData() {
+      this.tableLoading = true
+      let params = {
+        // formCode: 'resi_base_info',
+        pageNo: this.currentPage,
+        pageSize: this.pageSize
+      }
+      await this.$http
+        .post('/oper/customize/resicategorystatsconfig/list', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.tableData = res.data
+            this.total = res.data.total
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.tableLoading = false
+    }
+    
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    border-right: 1px solid rgba(33, 149, 254, 1);;
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.resi-row-btn {
+  display: flex;
+  margin-bottom: 13px;
+  ::v-deep .el-button {
+    // margin-left: 10px;
+    border: 0;
+  }
+  ::v-deep .el-select {
+    margin-right: 10px;
+  }
+}
+.avatar-uploader {
+  ::v-deep
+  .el-upload {
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    width: 70px;
+    height: 70px;
+    display: block;
+  }
+  .avatar-uploader-icon {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    font-size: 28px;
+    color: #8c939d;
+    width: 70px;
+    height: 70px;
+    line-height: 70px;
+    text-align: center;
+  }
+}
+  
+  
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+</style>