Merge branch 'zm' of https://git.oa00.com/mengfucius/wkcrm_web

# Conflicts:
#	config/index.js

.gitignore

@@ -1 +1,2 @@
 /node_modules/
+dist

config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
     NODE_ENV: '"development"',
-    BASE_API: '"/api/"',
+    BASE_API: '"http://localhost/index.php/"',
-})
+})

config/index.js

@@ -12,6 +12,7 @@ module.exports = {
         proxyTable: {
             '/api': {
                 target: 'http://192.168.50.39:8088',
+
                 changeOrigin: true,
                 pathRewrite: {
                     '^/api': ''
@@ -28,7 +29,7 @@ module.exports = {
 
         // Various Dev Server settings
         host: '0.0.0.0', // can be overwritten by process.env.HOST
-        port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+        port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
         autoOpenBrowser: false,
         errorOverlay: true,
         notifyOnErrors: false,
@@ -98,4 +99,4 @@ module.exports = {
         // `npm run build:prod --generate_report`
         generateAnalyzerReport: process.env.npm_config_generate_report || false
     }
-}
+}