Merge branch 'feature/打包调整'

build/webpack.dev.conf.js

@@ -43,9 +43,9 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     watchOptions: {
       poll: config.dev.poll,
     },
-    before(app, server) {
-      app.get(/^(?!\/haoban-3).*$/, (req, res) => {
-        res.redirect('/haoban-3/');
+    before(app) {
+      app.get('/', (req, res) => {
+        res.redirect(config.dev.assetsPublicPath);
       })
     },
   },
@@ -87,7 +87,7 @@ module.exports = new Promise((resolve, reject) => {
       // Add FriendlyErrorsPlugin
       devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
         compilationSuccessInfo: {
-          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}${config.dev.assetsPublicPath}`],
         },
         onErrors: config.dev.notifyOnErrors
         ? utils.createNotifierCallback()

config/index.js

@@ -17,7 +17,7 @@ module.exports = {
 
     // Paths
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/haoban-3',
+    assetsPublicPath: '/haoban-3/',
     // proxyTable: proxyConfig.proxyList,
 
     // Various Dev Server settings

package.json

@@ -24,7 +24,7 @@
     "awesome-phonenumber": "^2.27.0",
     "babel-polyfill": "^6.26.0",
     "draggable": "^4.2.0",
-    "element-ui": "^2.13.2",
+    "element-ui": "^2.15.6",
     "exif-js": "^2.3.0",
     "file-saver": "^1.3.8",
     "html2canvas": "^1.0.0-alpha.12",