diff --git a/config/dev.env.js b/config/dev.env.js index 8eb8d0e..72471e3 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,9 @@ 'use strict' const merge = require('webpack-merge') const prodEnv = require('./prod.env') +const testEnv = require('./test.env') -module.exports = merge(prodEnv, { +module.exports = merge(prodEnv, testEnv, { NODE_ENV: '"development"', BASE_API: '"http://localhost:8000"', // BASE_API: '"http://139.224.54.200:8888"' diff --git a/config/index.js b/config/index.js index 0f7d628..9482250 100644 --- a/config/index.js +++ b/config/index.js @@ -2,8 +2,8 @@ // Template version: 1.2.6 const devEnv = require('./dev.env') // 获取接口地址 -const base_url = devEnv.BASE_API.replace(/"/g,'') -console.log(base_url ) +const base_url = devEnv.BASE_API.replace(/"/g, '') +console.log(base_url) const path = require('path') module.exports = { dev: { diff --git a/config/prod.env.js b/config/prod.env.js index 6f179e7..55cf0ff 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,7 +1,8 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://139.224.54.200:8000"', -BASE_API: '"http://139.224.54.200:8888"', + // BASE_API: '"http://139.224.54.200:8000"', + BASE_API: '"http://139.224.54.200:8888"', + NAME: '"生产"' // BASE_API: '"http://139.224.57.82:8015"' } diff --git a/config/test.env.js b/config/test.env.js index eebc91a..8e70ec4 100644 --- a/config/test.env.js +++ b/config/test.env.js @@ -3,5 +3,6 @@ module.exports = { NODE_ENV: '"production"', // BASE_API: '"http://139.224.54.200:8000"', // BASE_API: '"http://139.224.54.200:8888"', - BASE_API: '"http://139.224.57.82:8015"' + BASE_API: '"http://139.224.57.82:8015"', + NAME: '"测试"' } diff --git a/src/store/getters.js b/src/store/getters.js index d9b10a8..d92fa1f 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -12,6 +12,7 @@ const getters = { socketApi: state => state.api.socketApi, imagesUploadApi: state => state.api.imagesUploadApi, baseApi: state => state.api.baseApi, + name: state => state.api.name, fileUploadApi: state => state.api.fileUploadApi, updateAvatarApi: state => state.api.updateAvatarApi, qiNiuUploadApi: state => state.api.qiNiuUploadApi, diff --git a/src/store/modules/api.js b/src/store/modules/api.js index 3ec1aa1..7fbf581 100644 --- a/src/store/modules/api.js +++ b/src/store/modules/api.js @@ -1,4 +1,5 @@ const baseUrl = process.env.BASE_API +const name = process.env.NAME const api = { state: { // 实时控制台 @@ -16,7 +17,8 @@ const api = { // 文件上传 fileUploadApi: baseUrl + '/api/localStorage', // baseUrl, - baseApi: baseUrl + baseApi: baseUrl, + name: name } } diff --git a/src/views/login.vue b/src/views/login.vue index 99d4a84..77211e4 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,20 +1,23 @@