Merge branch 'develop' into gitlab-ci

.env.development

 NODE_ENV = 'development'
 VUE_APP_ENV = 'development'
-VUE_APP_BASEURL = '/webapi'
+VUE_APP_BASEURL = '/devapi'

.env.passports

@@ -2,4 +2,4 @@
 NODE_ENV = 'passports'
 VUE_APP_ENV = 'passports'
 VUE_APP_API = 'https://test2.laihua.com/'
-VUE_APP_BASEURL = '/webapi'
+VUE_APP_BASEURL = '/uatapi'

.env.production

 NODE_ENV = 'production'
 VUE_APP_ENV = 'production'
 VUE_APP_API = 'https://webapi4.laihua.com/'
-VUE_APP_BASEURL = '/webapi'
+VUE_APP_BASEURL = '/prodapi'

src/config/proxy.config.js

@@ -7,7 +7,7 @@ module.exports = {
     webapi: {
         target: 'https://test2.laihua.com/',
         changeOrigin: true,
-        pathRewrite: { '^/webapi': '/' }
+        pathRewrite: { '^/devapi': '/' }
     },
     mockapi16: {
         target: 'http://y-api.laihua.com/mock/16/',