Merge branch 'master' into zm

# Conflicts:
#	config/index.js

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

@@ -11,15 +11,14 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/api': {
-                target: 'http://192.168.50.40:8088',
-
+              target: 'http://127.0.0.1/',
               changeOrigin: true,
                 pathRewrite: {
                     '^/api': ''
                 }
             },
             '/file': {
-                target: 'http://192.168.50.40:8088/',
+              target: 'http://127.0.0.1/',
               changeOrigin: true,
                 pathRewrite: {
                     '^/file': ''