Commit b6a7d6a0 authored by yinxiaoling's avatar yinxiaoling

Merge branch 'hotfix/host-edit' into 'master'

修改域名

See merge request !1
parents 96694f33 9c8fd862
...@@ -3,5 +3,6 @@ ENV = 'production' ...@@ -3,5 +3,6 @@ ENV = 'production'
# base api # base api
#VUE_APP_BASE_API = '/prod-api' #VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API = 'https://aic.ciopaas.com:82' VUE_APP_BASE_API = 'https://test216.ciopaas.com:86'
#VUE_APP_BASE_API = 'https://aic.ciopaas.com:82'
#VUE_APP_BASE_API = 'https://test117.ciopaas.com:81/' #VUE_APP_BASE_API = 'https://test117.ciopaas.com:81/'
...@@ -31,10 +31,10 @@ Vue.use(publicTools) ...@@ -31,10 +31,10 @@ Vue.use(publicTools)
* Currently MockJs will be used in the production environment, * Currently MockJs will be used in the production environment,
* please remove it before going online ! ! ! * please remove it before going online ! ! !
*/ */
if (process.env.NODE_ENV === 'production') { // if (process.env.NODE_ENV === 'production') {
const { mockXHR } = require('../mock') // const { mockXHR } = require('../mock')
mockXHR() // mockXHR()
} // }
Vue.use(Element, { Vue.use(Element, {
size: Cookies.get('size') || 'medium' // set element-ui default size size: Cookies.get('size') || 'medium' // set element-ui default size
......
...@@ -36,8 +36,8 @@ module.exports = { ...@@ -36,8 +36,8 @@ module.exports = {
overlay: { overlay: {
warnings: false, warnings: false,
errors: true errors: true
}, }
before: require('./mock/mock-server.js') // before: require('./mock/mock-server.js')
}, },
configureWebpack: { configureWebpack: {
// provide the app's title in webpack's name field, so that // provide the app's title in webpack's name field, so that
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment