Merge branch 'feature/打包调整'

build/webpack.dev.conf.js

@@ -38,7 +38,12 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     quiet: true, // necessary for FriendlyErrorsPlugin
     watchOptions: {
       poll: config.dev.poll
-    }
+    },
+    before(app) {
+      app.get('/', (req, res) => {
+        res.redirect(config.dev.assetsPublicPath);
+      })
+    },
   },
   plugins: [
     new webpack.DefinePlugin({
@@ -79,7 +84,7 @@ module.exports = new Promise((resolve, reject) => {
       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() : undefined
         })

config/index.js

@@ -8,7 +8,7 @@ module.exports = {
   dev: {
     // Paths
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/marketing',
+    assetsPublicPath: '/marketing/',
     proxyTable: {
       '/dmApi/': {
         target: 'http://gicdev.demogic.com',

package-lock.json

@@ -4129,7 +4129,7 @@
     },
     "de-indent": {
       "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz",
+      "resolved": "https://registry.nlark.com/de-indent/download/de-indent-1.0.2.tgz",
       "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
       "dev": true
     },
@@ -14736,9 +14736,9 @@
       "dev": true
     },
     "vue": {
-      "version": "2.6.14",
-      "resolved": "https://registry.nlark.com/vue/download/vue-2.6.14.tgz?cache=0&sync_timestamp=1629824307643&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue%2Fdownload%2Fvue-2.6.14.tgz",
-      "integrity": "sha1-5RqlJQJQ1Wmj+606ilpofWA24jU="
+      "version": "2.6.6",
+      "resolved": "https://registry.npmmirror.com/vue/download/vue-2.6.6.tgz",
+      "integrity": "sha1-3eQeSDwRxGp79SOQn08vgWq2DSU="
     },
     "vue-axios": {
       "version": "2.1.5",
@@ -14896,9 +14896,9 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.6.14",
-      "resolved": "https://registry.nlark.com/vue-template-compiler/download/vue-template-compiler-2.6.14.tgz",
-      "integrity": "sha1-ovDn2YVnDULJye4NBE/tdpD092M=",
+      "version": "2.6.6",
+      "resolved": "https://registry.nlark.com/vue-template-compiler/download/vue-template-compiler-2.6.6.tgz",
+      "integrity": "sha1-qAesvz1Rlx03IddeyxuSe1F8GgI=",
       "dev": true,
       "requires": {
         "de-indent": "^1.0.2",

package.json

@@ -19,7 +19,7 @@
     "animated-vue": "^0.5.3",
     "axios": "^0.18.0",
     "echarts": "^4.8.0",
-    "element-ui": "^2.14.1",
+    "element-ui": "^2.15.6",
     "packele": "^1.0.5",
     "scriptjs": "^2.5.8",
     "tinymce": "^4.9.11",
@@ -27,6 +27,7 @@
     "v-charts": "^1.17.8",
     "v-viewer": "^1.6.4",
     "viser-vue": "^2.2.5",
+    "vue": "2.6.6",
     "vue-axios": "^2.1.1",
     "vue-qr": "^1.3.8",
     "vue-router": "^3.3.4",
@@ -90,7 +91,7 @@
     "vue-lazyload": "^1.2.6",
     "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.6.12",
+    "vue-template-compiler": "2.6.6",
     "webpack": "^3.6.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.11.3",