Merge remote-tracking branch 'origin/develop' into develop

src/common/axios/index.js

@@ -7,11 +7,11 @@ import axios from 'axios'
 import router from '@/router'
 import store from '@/store'
 import {Message} from 'element-ui'
-import { baseUrl } from '@/sysConfig'
+import { serverUrl } from '@/sysConfig'
 export const CancelToken = axios.CancelToken
 // import 'element-ui/lib/theme-chalk/index.css'
 const _axios = axios.create({
-  baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/'
+  baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/'
 })
 
 /**

src/common/axiosV2/index.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 import router from '@/router'
 import store from '@/store'
 import {Message} from 'element-ui'
-import { baseUrl } from '@/sysConfig'
+import { serverUrl } from '@/sysConfig'
 // import 'element-ui/lib/theme-chalk/index.css'
 
 /**
@@ -19,7 +19,7 @@ let formData = (data) => {
 }
 
 const service = axios.create({
-  baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/'
+  baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/'
 })
 
 service.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999