柳香萍 6 years ago
parent
commit
78c7bdd26e
4 changed files with 229 additions and 196 deletions
  1. 4 0
      build/webpack.base.conf.js
  2. 2 2
      config/dev.env.js
  3. 219 190
      package-lock.json
  4. 4 4
      package.json

+ 4 - 0
build/webpack.base.conf.js View File

76
           limit: 10000,
76
           limit: 10000,
77
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
77
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
78
         }
78
         }
79
+      },
80
+      {
81
+        test: /\.sass$/,
82
+        loaders: ['style', 'css', 'sass']
79
       }
83
       }
80
     ]
84
     ]
81
   },
85
   },

+ 2 - 2
config/dev.env.js View File

4
 
4
 
5
 module.exports = merge(prodEnv, {
5
 module.exports = merge(prodEnv, {
6
   NODE_ENV: '"development"',
6
   NODE_ENV: '"development"',
7
-  BASE_API: '"http://localhost:9529"',
7
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
8
    //http://api.xt.test.sgjyun.com http://localhost:9529
8
    //http://api.xt.test.sgjyun.com http://localhost:9529
9
-  // BASE_API: '"http://localhost:9529"'
9
+   // BASE_API: '"http://localhost:9529"'
10
 })
10
 })

+ 219 - 190
package-lock.json View File

5
   "requires": true,
5
   "requires": true,
6
   "dependencies": {
6
   "dependencies": {
7
     "@antv/adjust": {
7
     "@antv/adjust": {
8
-      "version": "0.0.7",
9
-      "resolved": "http://registry.npm.taobao.org/@antv/adjust/download/@antv/adjust-0.0.7.tgz",
10
-      "integrity": "sha1-Aeg8NrKMUO7LmPrZ3GYhdrQDarc=",
8
+      "version": "0.1.1",
9
+      "resolved": "https://registry.npmjs.org/@antv/adjust/-/adjust-0.1.1.tgz",
10
+      "integrity": "sha512-9FaMOyBlM4AgoRL0b5o0VhEKAYkexBNUrxV8XmpHU/9NBPJONBOB/NZUlQDqxtLItrt91tCfbAuMQmF529UX2Q==",
11
       "requires": {
11
       "requires": {
12
-        "@antv/util": "~1.2.5"
12
+        "@antv/util": "~1.3.1"
13
+      },
14
+      "dependencies": {
15
+        "@antv/util": {
16
+          "version": "1.3.1",
17
+          "resolved": "https://registry.npmjs.org/@antv/util/-/util-1.3.1.tgz",
18
+          "integrity": "sha512-cbUta0hIJrKEaW3eKoGarz3Ita+9qUPF2YzTj8A6wds/nNiy20G26ztIWHU+5ThLc13B1n5Ik52LbaCaeg9enA==",
19
+          "requires": {
20
+            "@antv/gl-matrix": "^2.7.1"
21
+          }
22
+        }
13
       }
23
       }
14
     },
24
     },
15
     "@antv/attr": {
25
     "@antv/attr": {
16
-      "version": "0.0.7",
17
-      "resolved": "http://registry.npm.taobao.org/@antv/attr/download/@antv/attr-0.0.7.tgz",
18
-      "integrity": "sha1-Mz8lLONfw+/fitSARsJjpr4tfQQ=",
26
+      "version": "0.1.2",
27
+      "resolved": "https://registry.npmjs.org/@antv/attr/-/attr-0.1.2.tgz",
28
+      "integrity": "sha512-QXjP+T2I+pJQcwZx1oCA4tipG43vgeCeKcGGKahlcxb71OBAzjJZm1QbF4frKXcnOqRkxVXtCr70X9TRair3Ew==",
19
       "requires": {
29
       "requires": {
20
-        "@antv/util": "~1.2.5"
30
+        "@antv/util": "~1.3.1"
31
+      },
32
+      "dependencies": {
33
+        "@antv/util": {
34
+          "version": "1.3.1",
35
+          "resolved": "https://registry.npmjs.org/@antv/util/-/util-1.3.1.tgz",
36
+          "integrity": "sha512-cbUta0hIJrKEaW3eKoGarz3Ita+9qUPF2YzTj8A6wds/nNiy20G26ztIWHU+5ThLc13B1n5Ik52LbaCaeg9enA==",
37
+          "requires": {
38
+            "@antv/gl-matrix": "^2.7.1"
39
+          }
40
+        }
21
       }
41
       }
22
     },
42
     },
23
     "@antv/f2": {
43
     "@antv/f2": {
24
-      "version": "3.2.3",
25
-      "resolved": "http://registry.npm.taobao.org/@antv/f2/download/@antv/f2-3.2.3.tgz",
26
-      "integrity": "sha1-VYSNlYGVU+swpt182pIbqSTQZPI=",
44
+      "version": "3.3.9",
45
+      "resolved": "https://registry.npmjs.org/@antv/f2/-/f2-3.3.9.tgz",
46
+      "integrity": "sha512-MOVhfAt5Hh8Z70sqd8zZT/Xj3FM7ow0SCCK81NKXQP2u2sJCHrZcWK9K8guz7vDQ8w5xqI7fXuaaXHwgY+ZO4g==",
27
       "requires": {
47
       "requires": {
28
-        "@antv/adjust": "~0.0.3",
29
-        "@antv/attr": "~0.0.3",
30
-        "@antv/scale": "~0.0.6",
48
+        "@antv/adjust": "~0.1.1",
49
+        "@antv/attr": "~0.1.0",
50
+        "@antv/scale": "~0.1.2",
31
         "@antv/util": "~1.2.5",
51
         "@antv/util": "~1.2.5",
32
         "hammerjs": "^2.0.8"
52
         "hammerjs": "^2.0.8"
33
       }
53
       }
34
     },
54
     },
35
     "@antv/gl-matrix": {
55
     "@antv/gl-matrix": {
36
       "version": "2.7.1",
56
       "version": "2.7.1",
37
-      "resolved": "http://registry.npm.taobao.org/@antv/gl-matrix/download/@antv/gl-matrix-2.7.1.tgz",
38
-      "integrity": "sha1-rLjjf3qz3wE0WrpDcteUK+QuuhQ="
57
+      "resolved": "https://registry.npmjs.org/@antv/gl-matrix/-/gl-matrix-2.7.1.tgz",
58
+      "integrity": "sha512-oOWcVNlpELIKi9x+Mm1Vwbz8pXfkbJKykoCIOJ/dNK79hSIANbpXJ5d3Rra9/wZqK6MC961B7sybFhPlLraT3Q=="
39
     },
59
     },
40
     "@antv/scale": {
60
     "@antv/scale": {
41
-      "version": "0.0.9",
42
-      "resolved": "http://registry.npm.taobao.org/@antv/scale/download/@antv/scale-0.0.9.tgz",
43
-      "integrity": "sha1-JKltPDpKUHMVqaM15aQ1vk1szUU=",
61
+      "version": "0.1.2",
62
+      "resolved": "https://registry.npmjs.org/@antv/scale/-/scale-0.1.2.tgz",
63
+      "integrity": "sha512-lAJJUDiQIgoBSnlJDlMjbuaO2K71/e85hNtsjuv22os6QPqJZE/Q56JXLAgT5L5vXo9d4DFnxzwOBjdonHJXoA==",
44
       "requires": {
64
       "requires": {
45
-        "@antv/util": "~1.2.5",
65
+        "@antv/util": "~1.3.1",
46
         "fecha": "~2.3.3"
66
         "fecha": "~2.3.3"
67
+      },
68
+      "dependencies": {
69
+        "@antv/util": {
70
+          "version": "1.3.1",
71
+          "resolved": "https://registry.npmjs.org/@antv/util/-/util-1.3.1.tgz",
72
+          "integrity": "sha512-cbUta0hIJrKEaW3eKoGarz3Ita+9qUPF2YzTj8A6wds/nNiy20G26ztIWHU+5ThLc13B1n5Ik52LbaCaeg9enA==",
73
+          "requires": {
74
+            "@antv/gl-matrix": "^2.7.1"
75
+          }
76
+        }
47
       }
77
       }
48
     },
78
     },
49
     "@antv/util": {
79
     "@antv/util": {
50
       "version": "1.2.5",
80
       "version": "1.2.5",
51
-      "resolved": "http://registry.npm.taobao.org/@antv/util/download/@antv/util-1.2.5.tgz",
52
-      "integrity": "sha1-iJbFBV7Cnko0S12ql7+CkF99QM0=",
81
+      "resolved": "https://registry.npmjs.org/@antv/util/-/util-1.2.5.tgz",
82
+      "integrity": "sha512-yz1AjXSEjNu9O5kK9pqKq69f/Iliu/IA3XXljUcfrlbUtmUJ0CH1tB5I60vPqfaKaUPhz+/35K+56yqaCsGmqA==",
53
       "requires": {
83
       "requires": {
54
         "@antv/gl-matrix": "^2.7.1"
84
         "@antv/gl-matrix": "^2.7.1"
55
       }
85
       }
898
       }
928
       }
899
     },
929
     },
900
     "assert": {
930
     "assert": {
901
-      "version": "1.4.1",
902
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
903
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
931
+      "version": "1.5.0",
932
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
933
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
904
       "dev": true,
934
       "dev": true,
905
       "requires": {
935
       "requires": {
936
+        "object-assign": "^4.1.1",
906
         "util": "0.10.3"
937
         "util": "0.10.3"
907
       },
938
       },
908
       "dependencies": {
939
       "dependencies": {
1032
       "dev": true
1063
       "dev": true
1033
     },
1064
     },
1034
     "axios": {
1065
     "axios": {
1035
-      "version": "0.18.0",
1036
-      "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
1037
-      "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=",
1066
+      "version": "0.19.0",
1067
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
1068
+      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
1038
       "requires": {
1069
       "requires": {
1039
-        "follow-redirects": "^1.3.0",
1040
-        "is-buffer": "^1.1.5"
1070
+        "follow-redirects": "1.5.10",
1071
+        "is-buffer": "^2.0.2"
1072
+      },
1073
+      "dependencies": {
1074
+        "debug": {
1075
+          "version": "3.1.0",
1076
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
1077
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
1078
+          "requires": {
1079
+            "ms": "2.0.0"
1080
+          }
1081
+        },
1082
+        "follow-redirects": {
1083
+          "version": "1.5.10",
1084
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
1085
+          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
1086
+          "requires": {
1087
+            "debug": "=3.1.0"
1088
+          }
1089
+        },
1090
+        "is-buffer": {
1091
+          "version": "2.0.3",
1092
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
1093
+          "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
1094
+        }
1041
       }
1095
       }
1042
     },
1096
     },
1043
     "babel-code-frame": {
1097
     "babel-code-frame": {
2135
     },
2189
     },
2136
     "blueimp-md5": {
2190
     "blueimp-md5": {
2137
       "version": "2.10.0",
2191
       "version": "2.10.0",
2138
-      "resolved": "http://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.10.0.tgz",
2139
-      "integrity": "sha1-AvCEOSH5DcoU9biSCjhZMgHWlk0="
2192
+      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz",
2193
+      "integrity": "sha512-EkNUOi7tpV68TqjpiUz9D9NcT8um2+qtgntmMbi5UKssVX2m/2PLqotcric0RE63pB3HPN/fjf3cKHN2ufGSUQ=="
2140
     },
2194
     },
2141
     "bn.js": {
2195
     "bn.js": {
2142
       "version": "4.11.8",
2196
       "version": "4.11.8",
4293
       "dev": true
4347
       "dev": true
4294
     },
4348
     },
4295
     "element-ui": {
4349
     "element-ui": {
4296
-      "version": "2.4.6",
4297
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.4.6.tgz",
4298
-      "integrity": "sha512-VYqKckWIyshGun707WedZeqHoRQkadR0QSuJjEwCzWQC/ofued4wCOoSXWdBwWAUPcdhaPJWMVZfwPuE29zB+w==",
4350
+      "version": "2.9.1",
4351
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.9.1.tgz",
4352
+      "integrity": "sha512-w8vrCW5Q+2gfDzs19MUrFdnCy5IjF98rs7DBsKnJQKFfZJZiZ2O+YAsSp/EuPrCm3P/2o/N3MtvZ34VANel13g==",
4299
       "requires": {
4353
       "requires": {
4300
         "async-validator": "~1.8.1",
4354
         "async-validator": "~1.8.1",
4301
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
4355
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
4411
       }
4465
       }
4412
     },
4466
     },
4413
     "es5-ext": {
4467
     "es5-ext": {
4414
-      "version": "0.10.46",
4415
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.46.tgz",
4416
-      "integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==",
4468
+      "version": "0.10.50",
4469
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz",
4470
+      "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
4417
       "dev": true,
4471
       "dev": true,
4418
       "requires": {
4472
       "requires": {
4419
         "es6-iterator": "~2.0.3",
4473
         "es6-iterator": "~2.0.3",
4420
         "es6-symbol": "~3.1.1",
4474
         "es6-symbol": "~3.1.1",
4421
-        "next-tick": "1"
4475
+        "next-tick": "^1.0.0"
4422
       }
4476
       }
4423
     },
4477
     },
4424
     "es6-iterator": {
4478
     "es6-iterator": {
4600
           "dev": true
4654
           "dev": true
4601
         },
4655
         },
4602
         "js-yaml": {
4656
         "js-yaml": {
4603
-          "version": "3.12.0",
4604
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
4605
-          "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
4657
+          "version": "3.13.1",
4658
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
4659
+          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
4606
           "dev": true,
4660
           "dev": true,
4607
           "requires": {
4661
           "requires": {
4608
             "argparse": "^1.0.7",
4662
             "argparse": "^1.0.7",
4948
       "dev": true
5002
       "dev": true
4949
     },
5003
     },
4950
     "events": {
5004
     "events": {
4951
-      "version": "1.1.1",
4952
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
4953
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
5005
+      "version": "3.0.0",
5006
+      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
5007
+      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
4954
       "dev": true
5008
       "dev": true
4955
     },
5009
     },
4956
     "eventsource": {
5010
     "eventsource": {
5259
     },
5313
     },
5260
     "fecha": {
5314
     "fecha": {
5261
       "version": "2.3.3",
5315
       "version": "2.3.3",
5262
-      "resolved": "http://registry.npm.taobao.org/fecha/download/fecha-2.3.3.tgz",
5263
-      "integrity": "sha1-lI50FX3xoy/RsSw6PDzctuydls0="
5316
+      "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
5317
+      "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
5264
     },
5318
     },
5265
     "figures": {
5319
     "figures": {
5266
       "version": "2.0.0",
5320
       "version": "2.0.0",
5490
       "version": "1.5.7",
5544
       "version": "1.5.7",
5491
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.7.tgz",
5545
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.7.tgz",
5492
       "integrity": "sha512-NONJVIFiX7Z8k2WxfqBjtwqMifx7X42ORLFrOZ2LTKGj71G3C0kfdyTqGqr8fx5zSX6Foo/D95dgGWbPUiwnew==",
5546
       "integrity": "sha512-NONJVIFiX7Z8k2WxfqBjtwqMifx7X42ORLFrOZ2LTKGj71G3C0kfdyTqGqr8fx5zSX6Foo/D95dgGWbPUiwnew==",
5547
+      "dev": true,
5493
       "requires": {
5548
       "requires": {
5494
         "debug": "^3.1.0"
5549
         "debug": "^3.1.0"
5495
       },
5550
       },
5498
           "version": "3.1.0",
5553
           "version": "3.1.0",
5499
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
5554
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
5500
           "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
5555
           "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
5556
+          "dev": true,
5501
           "requires": {
5557
           "requires": {
5502
             "ms": "2.0.0"
5558
             "ms": "2.0.0"
5503
           }
5559
           }
5624
       "dev": true
5680
       "dev": true
5625
     },
5681
     },
5626
     "fsevents": {
5682
     "fsevents": {
5627
-      "version": "1.2.4",
5628
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
5629
-      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
5683
+      "version": "1.2.9",
5684
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
5685
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
5630
       "dev": true,
5686
       "dev": true,
5631
       "optional": true,
5687
       "optional": true,
5632
       "requires": {
5688
       "requires": {
5633
-        "nan": "^2.9.2",
5634
-        "node-pre-gyp": "^0.10.0"
5689
+        "nan": "^2.12.1",
5690
+        "node-pre-gyp": "^0.12.0"
5635
       },
5691
       },
5636
       "dependencies": {
5692
       "dependencies": {
5637
         "abbrev": {
5693
         "abbrev": {
5652
           "optional": true
5708
           "optional": true
5653
         },
5709
         },
5654
         "are-we-there-yet": {
5710
         "are-we-there-yet": {
5655
-          "version": "1.1.4",
5711
+          "version": "1.1.5",
5656
           "bundled": true,
5712
           "bundled": true,
5657
           "dev": true,
5713
           "dev": true,
5658
           "optional": true,
5714
           "optional": true,
5676
           }
5732
           }
5677
         },
5733
         },
5678
         "chownr": {
5734
         "chownr": {
5679
-          "version": "1.0.1",
5735
+          "version": "1.1.1",
5680
           "bundled": true,
5736
           "bundled": true,
5681
           "dev": true,
5737
           "dev": true,
5682
           "optional": true
5738
           "optional": true
5703
           "optional": true
5759
           "optional": true
5704
         },
5760
         },
5705
         "debug": {
5761
         "debug": {
5706
-          "version": "2.6.9",
5762
+          "version": "4.1.1",
5707
           "bundled": true,
5763
           "bundled": true,
5708
           "dev": true,
5764
           "dev": true,
5709
           "optional": true,
5765
           "optional": true,
5710
           "requires": {
5766
           "requires": {
5711
-            "ms": "2.0.0"
5767
+            "ms": "^2.1.1"
5712
           }
5768
           }
5713
         },
5769
         },
5714
         "deep-extend": {
5770
         "deep-extend": {
5715
-          "version": "0.5.1",
5771
+          "version": "0.6.0",
5716
           "bundled": true,
5772
           "bundled": true,
5717
           "dev": true,
5773
           "dev": true,
5718
           "optional": true
5774
           "optional": true
5761
           }
5817
           }
5762
         },
5818
         },
5763
         "glob": {
5819
         "glob": {
5764
-          "version": "7.1.2",
5820
+          "version": "7.1.3",
5765
           "bundled": true,
5821
           "bundled": true,
5766
           "dev": true,
5822
           "dev": true,
5767
           "optional": true,
5823
           "optional": true,
5781
           "optional": true
5837
           "optional": true
5782
         },
5838
         },
5783
         "iconv-lite": {
5839
         "iconv-lite": {
5784
-          "version": "0.4.21",
5840
+          "version": "0.4.24",
5785
           "bundled": true,
5841
           "bundled": true,
5786
           "dev": true,
5842
           "dev": true,
5787
           "optional": true,
5843
           "optional": true,
5788
           "requires": {
5844
           "requires": {
5789
-            "safer-buffer": "^2.1.0"
5845
+            "safer-buffer": ">= 2.1.2 < 3"
5790
           }
5846
           }
5791
         },
5847
         },
5792
         "ignore-walk": {
5848
         "ignore-walk": {
5847
           "dev": true
5903
           "dev": true
5848
         },
5904
         },
5849
         "minipass": {
5905
         "minipass": {
5850
-          "version": "2.2.4",
5906
+          "version": "2.3.5",
5851
           "bundled": true,
5907
           "bundled": true,
5852
           "dev": true,
5908
           "dev": true,
5853
           "requires": {
5909
           "requires": {
5854
-            "safe-buffer": "^5.1.1",
5910
+            "safe-buffer": "^5.1.2",
5855
             "yallist": "^3.0.0"
5911
             "yallist": "^3.0.0"
5856
           }
5912
           }
5857
         },
5913
         },
5858
         "minizlib": {
5914
         "minizlib": {
5859
-          "version": "1.1.0",
5915
+          "version": "1.2.1",
5860
           "bundled": true,
5916
           "bundled": true,
5861
           "dev": true,
5917
           "dev": true,
5862
           "optional": true,
5918
           "optional": true,
5873
           }
5929
           }
5874
         },
5930
         },
5875
         "ms": {
5931
         "ms": {
5876
-          "version": "2.0.0",
5932
+          "version": "2.1.1",
5877
           "bundled": true,
5933
           "bundled": true,
5878
           "dev": true,
5934
           "dev": true,
5879
           "optional": true
5935
           "optional": true
5880
         },
5936
         },
5937
+        "nan": {
5938
+          "version": "2.14.0",
5939
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
5940
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
5941
+          "dev": true,
5942
+          "optional": true
5943
+        },
5881
         "needle": {
5944
         "needle": {
5882
-          "version": "2.2.0",
5945
+          "version": "2.3.0",
5883
           "bundled": true,
5946
           "bundled": true,
5884
           "dev": true,
5947
           "dev": true,
5885
           "optional": true,
5948
           "optional": true,
5886
           "requires": {
5949
           "requires": {
5887
-            "debug": "^2.1.2",
5950
+            "debug": "^4.1.0",
5888
             "iconv-lite": "^0.4.4",
5951
             "iconv-lite": "^0.4.4",
5889
             "sax": "^1.2.4"
5952
             "sax": "^1.2.4"
5890
           }
5953
           }
5891
         },
5954
         },
5892
         "node-pre-gyp": {
5955
         "node-pre-gyp": {
5893
-          "version": "0.10.0",
5956
+          "version": "0.12.0",
5894
           "bundled": true,
5957
           "bundled": true,
5895
           "dev": true,
5958
           "dev": true,
5896
           "optional": true,
5959
           "optional": true,
5897
           "requires": {
5960
           "requires": {
5898
             "detect-libc": "^1.0.2",
5961
             "detect-libc": "^1.0.2",
5899
             "mkdirp": "^0.5.1",
5962
             "mkdirp": "^0.5.1",
5900
-            "needle": "^2.2.0",
5963
+            "needle": "^2.2.1",
5901
             "nopt": "^4.0.1",
5964
             "nopt": "^4.0.1",
5902
             "npm-packlist": "^1.1.6",
5965
             "npm-packlist": "^1.1.6",
5903
             "npmlog": "^4.0.2",
5966
             "npmlog": "^4.0.2",
5904
-            "rc": "^1.1.7",
5967
+            "rc": "^1.2.7",
5905
             "rimraf": "^2.6.1",
5968
             "rimraf": "^2.6.1",
5906
             "semver": "^5.3.0",
5969
             "semver": "^5.3.0",
5907
             "tar": "^4"
5970
             "tar": "^4"
5918
           }
5981
           }
5919
         },
5982
         },
5920
         "npm-bundled": {
5983
         "npm-bundled": {
5921
-          "version": "1.0.3",
5984
+          "version": "1.0.6",
5922
           "bundled": true,
5985
           "bundled": true,
5923
           "dev": true,
5986
           "dev": true,
5924
           "optional": true
5987
           "optional": true
5925
         },
5988
         },
5926
         "npm-packlist": {
5989
         "npm-packlist": {
5927
-          "version": "1.1.10",
5990
+          "version": "1.4.1",
5928
           "bundled": true,
5991
           "bundled": true,
5929
           "dev": true,
5992
           "dev": true,
5930
           "optional": true,
5993
           "optional": true,
5999
           "optional": true
6062
           "optional": true
6000
         },
6063
         },
6001
         "rc": {
6064
         "rc": {
6002
-          "version": "1.2.7",
6065
+          "version": "1.2.8",
6003
           "bundled": true,
6066
           "bundled": true,
6004
           "dev": true,
6067
           "dev": true,
6005
           "optional": true,
6068
           "optional": true,
6006
           "requires": {
6069
           "requires": {
6007
-            "deep-extend": "^0.5.1",
6070
+            "deep-extend": "^0.6.0",
6008
             "ini": "~1.3.0",
6071
             "ini": "~1.3.0",
6009
             "minimist": "^1.2.0",
6072
             "minimist": "^1.2.0",
6010
             "strip-json-comments": "~2.0.1"
6073
             "strip-json-comments": "~2.0.1"
6034
           }
6097
           }
6035
         },
6098
         },
6036
         "rimraf": {
6099
         "rimraf": {
6037
-          "version": "2.6.2",
6100
+          "version": "2.6.3",
6038
           "bundled": true,
6101
           "bundled": true,
6039
           "dev": true,
6102
           "dev": true,
6040
           "optional": true,
6103
           "optional": true,
6041
           "requires": {
6104
           "requires": {
6042
-            "glob": "^7.0.5"
6105
+            "glob": "^7.1.3"
6043
           }
6106
           }
6044
         },
6107
         },
6045
         "safe-buffer": {
6108
         "safe-buffer": {
6046
-          "version": "5.1.1",
6109
+          "version": "5.1.2",
6047
           "bundled": true,
6110
           "bundled": true,
6048
           "dev": true
6111
           "dev": true
6049
         },
6112
         },
6060
           "optional": true
6123
           "optional": true
6061
         },
6124
         },
6062
         "semver": {
6125
         "semver": {
6063
-          "version": "5.5.0",
6126
+          "version": "5.7.0",
6064
           "bundled": true,
6127
           "bundled": true,
6065
           "dev": true,
6128
           "dev": true,
6066
           "optional": true
6129
           "optional": true
6111
           "optional": true
6174
           "optional": true
6112
         },
6175
         },
6113
         "tar": {
6176
         "tar": {
6114
-          "version": "4.4.1",
6177
+          "version": "4.4.8",
6115
           "bundled": true,
6178
           "bundled": true,
6116
           "dev": true,
6179
           "dev": true,
6117
           "optional": true,
6180
           "optional": true,
6118
           "requires": {
6181
           "requires": {
6119
-            "chownr": "^1.0.1",
6182
+            "chownr": "^1.1.1",
6120
             "fs-minipass": "^1.2.5",
6183
             "fs-minipass": "^1.2.5",
6121
-            "minipass": "^2.2.4",
6122
-            "minizlib": "^1.1.0",
6184
+            "minipass": "^2.3.4",
6185
+            "minizlib": "^1.1.1",
6123
             "mkdirp": "^0.5.0",
6186
             "mkdirp": "^0.5.0",
6124
-            "safe-buffer": "^5.1.1",
6187
+            "safe-buffer": "^5.1.2",
6125
             "yallist": "^3.0.2"
6188
             "yallist": "^3.0.2"
6126
           }
6189
           }
6127
         },
6190
         },
6132
           "optional": true
6195
           "optional": true
6133
         },
6196
         },
6134
         "wide-align": {
6197
         "wide-align": {
6135
-          "version": "1.1.2",
6198
+          "version": "1.1.3",
6136
           "bundled": true,
6199
           "bundled": true,
6137
           "dev": true,
6200
           "dev": true,
6138
           "optional": true,
6201
           "optional": true,
6139
           "requires": {
6202
           "requires": {
6140
-            "string-width": "^1.0.2"
6203
+            "string-width": "^1.0.2 || 2"
6141
           }
6204
           }
6142
         },
6205
         },
6143
         "wrappy": {
6206
         "wrappy": {
6146
           "dev": true
6209
           "dev": true
6147
         },
6210
         },
6148
         "yallist": {
6211
         "yallist": {
6149
-          "version": "3.0.2",
6212
+          "version": "3.0.3",
6150
           "bundled": true,
6213
           "bundled": true,
6151
           "dev": true
6214
           "dev": true
6152
         }
6215
         }
6563
       "dev": true
6626
       "dev": true
6564
     },
6627
     },
6565
     "hash.js": {
6628
     "hash.js": {
6566
-      "version": "1.1.5",
6567
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz",
6568
-      "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
6629
+      "version": "1.1.7",
6630
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
6631
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
6569
       "dev": true,
6632
       "dev": true,
6570
       "requires": {
6633
       "requires": {
6571
         "inherits": "^2.0.3",
6634
         "inherits": "^2.0.3",
6881
       }
6944
       }
6882
     },
6945
     },
6883
     "ieee754": {
6946
     "ieee754": {
6884
-      "version": "1.1.12",
6885
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
6886
-      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
6947
+      "version": "1.1.13",
6948
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
6949
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
6887
       "dev": true
6950
       "dev": true
6888
     },
6951
     },
6889
     "iferr": {
6952
     "iferr": {
7125
     "is-buffer": {
7188
     "is-buffer": {
7126
       "version": "1.1.6",
7189
       "version": "1.1.6",
7127
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
7190
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
7128
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
7191
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
7192
+      "dev": true
7129
     },
7193
     },
7130
     "is-builtin-module": {
7194
     "is-builtin-module": {
7131
       "version": "1.0.0",
7195
       "version": "1.0.0",
8317
       }
8381
       }
8318
     },
8382
     },
8319
     "loader-runner": {
8383
     "loader-runner": {
8320
-      "version": "2.3.0",
8321
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz",
8322
-      "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=",
8384
+      "version": "2.4.0",
8385
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
8386
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
8323
       "dev": true
8387
       "dev": true
8324
     },
8388
     },
8325
     "loader-utils": {
8389
     "loader-utils": {
8704
       "dev": true
8768
       "dev": true
8705
     },
8769
     },
8706
     "md5.js": {
8770
     "md5.js": {
8707
-      "version": "1.3.4",
8708
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
8709
-      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
8771
+      "version": "1.3.5",
8772
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
8773
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
8710
       "dev": true,
8774
       "dev": true,
8711
       "requires": {
8775
       "requires": {
8712
         "hash-base": "^3.0.0",
8776
         "hash-base": "^3.0.0",
8713
-        "inherits": "^2.0.1"
8777
+        "inherits": "^2.0.1",
8778
+        "safe-buffer": "^5.1.2"
8714
       }
8779
       }
8715
     },
8780
     },
8716
     "media-typer": {
8781
     "media-typer": {
9080
       "dev": true
9145
       "dev": true
9081
     },
9146
     },
9082
     "nan": {
9147
     "nan": {
9083
-      "version": "2.11.0",
9084
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
9085
-<<<<<<< .mine
9086
-      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
9087
-      "optional": true
9088
-=======
9089
-      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
9148
+      "version": "2.14.0",
9149
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
9150
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
9090
       "dev": true
9151
       "dev": true
9091
->>>>>>> .theirs
9092
     },
9152
     },
9093
     "nanomatch": {
9153
     "nanomatch": {
9094
       "version": "1.2.13",
9154
       "version": "1.2.13",
9142
       "dev": true
9202
       "dev": true
9143
     },
9203
     },
9144
     "neo-async": {
9204
     "neo-async": {
9145
-      "version": "2.5.2",
9146
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.2.tgz",
9147
-      "integrity": "sha512-vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw==",
9205
+      "version": "2.6.1",
9206
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
9207
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
9148
       "dev": true
9208
       "dev": true
9149
     },
9209
     },
9150
     "netmask": {
9210
     "netmask": {
9283
       "dev": true
9343
       "dev": true
9284
     },
9344
     },
9285
     "node-libs-browser": {
9345
     "node-libs-browser": {
9286
-      "version": "2.1.0",
9287
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
9288
-      "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
9346
+      "version": "2.2.0",
9347
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
9348
+      "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
9289
       "dev": true,
9349
       "dev": true,
9290
       "requires": {
9350
       "requires": {
9291
         "assert": "^1.1.1",
9351
         "assert": "^1.1.1",
9295
         "constants-browserify": "^1.0.0",
9355
         "constants-browserify": "^1.0.0",
9296
         "crypto-browserify": "^3.11.0",
9356
         "crypto-browserify": "^3.11.0",
9297
         "domain-browser": "^1.1.1",
9357
         "domain-browser": "^1.1.1",
9298
-        "events": "^1.0.0",
9358
+        "events": "^3.0.0",
9299
         "https-browserify": "^1.0.0",
9359
         "https-browserify": "^1.0.0",
9300
         "os-browserify": "^0.3.0",
9360
         "os-browserify": "^0.3.0",
9301
         "path-browserify": "0.0.0",
9361
         "path-browserify": "0.0.0",
9309
         "timers-browserify": "^2.0.4",
9369
         "timers-browserify": "^2.0.4",
9310
         "tty-browserify": "0.0.0",
9370
         "tty-browserify": "0.0.0",
9311
         "url": "^0.11.0",
9371
         "url": "^0.11.0",
9312
-        "util": "^0.10.3",
9372
+        "util": "^0.11.0",
9313
         "vm-browserify": "0.0.4"
9373
         "vm-browserify": "0.0.4"
9314
       }
9374
       }
9315
     },
9375
     },
9326
       }
9386
       }
9327
     },
9387
     },
9328
     "node-sass": {
9388
     "node-sass": {
9329
-<<<<<<< .mine
9330
       "version": "4.12.0",
9389
       "version": "4.12.0",
9331
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
9390
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
9332
       "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
9391
       "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
9333
-=======
9334
-      "version": "4.11.0",
9335
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
9336
-      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
9337
->>>>>>> .theirs
9338
       "dev": true,
9392
       "dev": true,
9339
       "requires": {
9393
       "requires": {
9340
         "async-foreach": "^0.1.3",
9394
         "async-foreach": "^0.1.3",
9385
             "which": "^1.2.9"
9439
             "which": "^1.2.9"
9386
           }
9440
           }
9387
         },
9441
         },
9388
-<<<<<<< .mine
9389
-        "lodash": {
9390
-          "version": "4.17.11",
9391
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
9392
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
9393
-          "dev": true
9394
-        },
9395
-        "nan": {
9396
-          "version": "2.14.0",
9397
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
9398
-          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
9399
-          "dev": true
9400
-        },
9401
-=======
9402
-
9403
-
9404
-
9405
-
9406
-
9407
-
9408
-
9409
-
9410
-
9411
-
9412
-
9413
-
9414
->>>>>>> .theirs
9415
         "supports-color": {
9442
         "supports-color": {
9416
           "version": "2.0.0",
9443
           "version": "2.0.0",
9417
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
9444
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
9864
       }
9891
       }
9865
     },
9892
     },
9866
     "pako": {
9893
     "pako": {
9867
-      "version": "1.0.6",
9868
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
9869
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
9894
+      "version": "1.0.10",
9895
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
9896
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
9870
       "dev": true
9897
       "dev": true
9871
     },
9898
     },
9872
     "parallel-transform": {
9899
     "parallel-transform": {
9890
       }
9917
       }
9891
     },
9918
     },
9892
     "parse-asn1": {
9919
     "parse-asn1": {
9893
-      "version": "5.1.1",
9894
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
9895
-      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
9920
+      "version": "5.1.4",
9921
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
9922
+      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
9896
       "dev": true,
9923
       "dev": true,
9897
       "requires": {
9924
       "requires": {
9898
         "asn1.js": "^4.0.0",
9925
         "asn1.js": "^4.0.0",
9899
         "browserify-aes": "^1.0.0",
9926
         "browserify-aes": "^1.0.0",
9900
         "create-hash": "^1.1.0",
9927
         "create-hash": "^1.1.0",
9901
         "evp_bytestokey": "^1.0.0",
9928
         "evp_bytestokey": "^1.0.0",
9902
-        "pbkdf2": "^3.0.3"
9929
+        "pbkdf2": "^3.0.3",
9930
+        "safe-buffer": "^5.1.1"
9903
       }
9931
       }
9904
     },
9932
     },
9905
     "parse-code-context": {
9933
     "parse-code-context": {
10007
       }
10035
       }
10008
     },
10036
     },
10009
     "pbkdf2": {
10037
     "pbkdf2": {
10010
-      "version": "3.0.16",
10011
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
10012
-      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
10038
+      "version": "3.0.17",
10039
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
10040
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
10013
       "dev": true,
10041
       "dev": true,
10014
       "requires": {
10042
       "requires": {
10015
         "create-hash": "^1.1.2",
10043
         "create-hash": "^1.1.2",
12380
       "dev": true
12408
       "dev": true
12381
     },
12409
     },
12382
     "public-encrypt": {
12410
     "public-encrypt": {
12383
-      "version": "4.0.2",
12384
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
12385
-      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
12411
+      "version": "4.0.3",
12412
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
12413
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
12386
       "dev": true,
12414
       "dev": true,
12387
       "requires": {
12415
       "requires": {
12388
         "bn.js": "^4.1.0",
12416
         "bn.js": "^4.1.0",
12389
         "browserify-rsa": "^4.0.0",
12417
         "browserify-rsa": "^4.0.0",
12390
         "create-hash": "^1.1.0",
12418
         "create-hash": "^1.1.0",
12391
         "parse-asn1": "^5.0.0",
12419
         "parse-asn1": "^5.0.0",
12392
-        "randombytes": "^2.0.1"
12420
+        "randombytes": "^2.0.1",
12421
+        "safe-buffer": "^5.1.2"
12393
       }
12422
       }
12394
     },
12423
     },
12395
     "pump": {
12424
     "pump": {
12495
       }
12524
       }
12496
     },
12525
     },
12497
     "randombytes": {
12526
     "randombytes": {
12498
-      "version": "2.0.6",
12499
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
12500
-      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
12527
+      "version": "2.1.0",
12528
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
12529
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
12501
       "dev": true,
12530
       "dev": true,
12502
       "requires": {
12531
       "requires": {
12503
         "safe-buffer": "^5.1.0"
12532
         "safe-buffer": "^5.1.0"
12902
       "dev": true
12931
       "dev": true
12903
     },
12932
     },
12904
     "resize-observer-polyfill": {
12933
     "resize-observer-polyfill": {
12905
-      "version": "1.5.0",
12906
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz",
12907
-      "integrity": "sha512-M2AelyJDVR/oLnToJLtuDJRBBWUGUvvGigj1411hXhAdyFWqMaqHp7TixW3FpiLuVaikIcR1QL+zqoJoZlOgpg=="
12934
+      "version": "1.5.1",
12935
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
12936
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
12908
     },
12937
     },
12909
     "resolve": {
12938
     "resolve": {
12910
       "version": "1.8.1",
12939
       "version": "1.8.1",
14189
       "dev": true
14218
       "dev": true
14190
     },
14219
     },
14191
     "stream-browserify": {
14220
     "stream-browserify": {
14192
-      "version": "2.0.1",
14193
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
14194
-      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
14221
+      "version": "2.0.2",
14222
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
14223
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
14195
       "dev": true,
14224
       "dev": true,
14196
       "requires": {
14225
       "requires": {
14197
         "inherits": "~2.0.1",
14226
         "inherits": "~2.0.1",
14435
       }
14464
       }
14436
     },
14465
     },
14437
     "tapable": {
14466
     "tapable": {
14438
-      "version": "0.2.8",
14439
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
14440
-      "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
14467
+      "version": "0.2.9",
14468
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
14469
+      "integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
14441
       "dev": true
14470
       "dev": true
14442
     },
14471
     },
14443
     "tar": {
14472
     "tar": {
15075
       "dev": true
15104
       "dev": true
15076
     },
15105
     },
15077
     "util": {
15106
     "util": {
15078
-      "version": "0.10.4",
15079
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
15080
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
15107
+      "version": "0.11.1",
15108
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
15109
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
15081
       "dev": true,
15110
       "dev": true,
15082
       "requires": {
15111
       "requires": {
15083
         "inherits": "2.0.3"
15112
         "inherits": "2.0.3"
15129
     },
15158
     },
15130
     "validator": {
15159
     "validator": {
15131
       "version": "9.4.1",
15160
       "version": "9.4.1",
15132
-      "resolved": "http://registry.npm.taobao.org/validator/download/validator-9.4.1.tgz",
15133
-      "integrity": "sha1-q/Rm05i1Yc0kMFARLG/x3mzBJmM="
15161
+      "resolved": "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz",
15162
+      "integrity": "sha512-YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA=="
15134
     },
15163
     },
15135
     "vanilla-masker": {
15164
     "vanilla-masker": {
15136
       "version": "1.2.0",
15165
       "version": "1.2.0",
15384
       "integrity": "sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w=="
15413
       "integrity": "sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w=="
15385
     },
15414
     },
15386
     "vux": {
15415
     "vux": {
15387
-      "version": "2.9.2",
15388
-      "resolved": "http://registry.npm.taobao.org/vux/download/vux-2.9.2.tgz",
15389
-      "integrity": "sha1-nGZkEGtX0zplZsaPdW+aiLG8Gkc=",
15416
+      "version": "2.9.4",
15417
+      "resolved": "https://registry.npmjs.org/vux/-/vux-2.9.4.tgz",
15418
+      "integrity": "sha512-KSqrK8f1gBJjxb0wvltFfc6Bjs8N4OoIlo3RS6qrN5uZV/ouosrcXgmLpXe2vesDalLG3bVHX08/WTJhZ/qbdA==",
15390
       "requires": {
15419
       "requires": {
15391
         "@antv/f2": "^3.1.4-beta.2",
15420
         "@antv/f2": "^3.1.4-beta.2",
15392
         "array-filter": "^1.0.0",
15421
         "array-filter": "^1.0.0",
15764
       },
15793
       },
15765
       "dependencies": {
15794
       "dependencies": {
15766
         "ajv": {
15795
         "ajv": {
15767
-          "version": "6.5.3",
15768
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
15769
-          "integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
15796
+          "version": "6.10.0",
15797
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
15798
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
15770
           "dev": true,
15799
           "dev": true,
15771
           "requires": {
15800
           "requires": {
15772
             "fast-deep-equal": "^2.0.1",
15801
             "fast-deep-equal": "^2.0.1",
15776
           }
15805
           }
15777
         },
15806
         },
15778
         "ajv-keywords": {
15807
         "ajv-keywords": {
15779
-          "version": "3.2.0",
15780
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
15781
-          "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
15808
+          "version": "3.4.0",
15809
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
15810
+          "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
15782
           "dev": true
15811
           "dev": true
15783
         },
15812
         },
15784
         "camelcase": {
15813
         "camelcase": {
16385
     },
16414
     },
16386
     "x-photoswipe": {
16415
     "x-photoswipe": {
16387
       "version": "4.1.3-rc.1",
16416
       "version": "4.1.3-rc.1",
16388
-      "resolved": "http://registry.npm.taobao.org/x-photoswipe/download/x-photoswipe-4.1.3-rc.1.tgz",
16389
-      "integrity": "sha1-52GQF1LdPdH3GOU4UUtgm13199s="
16417
+      "resolved": "https://registry.npmjs.org/x-photoswipe/-/x-photoswipe-4.1.3-rc.1.tgz",
16418
+      "integrity": "sha512-ok+x+1ufLuBT9dfM5P2FcRefwNniQoVwwfBhGa5gLn8NrSTzNah2p4IElMLwzXuKLtyH4yb+z3IsdDef3FOL5A=="
16390
     },
16419
     },
16391
     "xml-name-validator": {
16420
     "xml-name-validator": {
16392
       "version": "3.0.0",
16421
       "version": "3.0.0",

+ 4 - 4
package.json View File

16
     "fiximg": "xcopy %cd%\\dist\\static\\img %cd%\\dist\\static\\css\\static\\img /s /y /d /e /i"
16
     "fiximg": "xcopy %cd%\\dist\\static\\img %cd%\\dist\\static\\css\\static\\img /s /y /d /e /i"
17
   },
17
   },
18
   "dependencies": {
18
   "dependencies": {
19
-    "axios": "^0.18.0",
19
+    "axios": "^0.19.0",
20
     "cropperjs": "^1.4.3",
20
     "cropperjs": "^1.4.3",
21
-    "element-ui": "^2.4.6",
21
+    "element-ui": "^2.9.1",
22
     "lib-flexible": "^0.3.2",
22
     "lib-flexible": "^0.3.2",
23
     "mint-ui": "^2.2.13",
23
     "mint-ui": "^2.2.13",
24
     "print-js": "^1.0.54",
24
     "print-js": "^1.0.54",
29
     "vue-pickers": "^1.1.5",
29
     "vue-pickers": "^1.1.5",
30
     "vue-router": "^3.0.1",
30
     "vue-router": "^3.0.1",
31
     "vuex": "^3.0.1",
31
     "vuex": "^3.0.1",
32
-    "vux": "^2.9.2"
32
+    "vux": "^2.9.4"
33
   },
33
   },
34
   "devDependencies": {
34
   "devDependencies": {
35
     "autoprefixer": "^7.1.2",
35
     "autoprefixer": "^7.1.2",
94
     "vue-style-loader": "^3.0.1",
94
     "vue-style-loader": "^3.0.1",
95
     "vue-template-compiler": "^2.5.2",
95
     "vue-template-compiler": "^2.5.2",
96
     "vux-loader": "^1.2.9",
96
     "vux-loader": "^1.2.9",
97
-    "webpack": "^3.6.0",
97
+    "webpack": "^3.12.0",
98
     "webpack-bundle-analyzer": "^2.9.0",
98
     "webpack-bundle-analyzer": "^2.9.0",
99
     "webpack-dev-server": "^2.9.1",
99
     "webpack-dev-server": "^2.9.1",
100
     "webpack-merge": "^4.1.0",
100
     "webpack-merge": "^4.1.0",