|
@@ -20,8 +20,13 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
|
|
|
// let target = 'http://192.168.3.139:8000' // 箭河
|
|
|
// let target = 'http://192.168.3.38:8000' //邹璇
|
|
|
// let target = 'http://192.168.3.57:8000' //勇哥
|
|
|
+<<<<<<< HEAD
|
|
|
let target = 'http://dev.dayaedu.com' // 开发环境
|
|
|
// let target = 'https://test.dayaedu.com' //测试环境
|
|
|
+=======
|
|
|
+// let target = 'http://dev.dayaedu.com' // 测试服
|
|
|
+let target = 'http://dev.dayaedu.com' //开发环境
|
|
|
+>>>>>>> contentManagerTemp
|
|
|
// let target = 'http://192.168.3.134' // 乔
|
|
|
// All configuration item explanations can be find in https://cli.vuejs.org/config/
|
|
|
module.exports = {
|
|
@@ -55,7 +60,7 @@ module.exports = {
|
|
|
// warnings: false,
|
|
|
// errors: true
|
|
|
// },
|
|
|
- https: true,
|
|
|
+ https: false,
|
|
|
proxy: {
|
|
|
// change xxx-api/login => mock/login
|
|
|
// detail: https://cli.vuejs.org/config/#devserver-proxy
|
|
@@ -65,7 +70,7 @@ module.exports = {
|
|
|
// http://47.114.176.40:8000
|
|
|
// let target = 'http://dev.dayaedu.com'
|
|
|
'/api-auth': {
|
|
|
- target: 'https://test.dayaedu.com',
|
|
|
+ target: 'http://dev.dayaedu.com',
|
|
|
changeOrigin: true,
|
|
|
pathRewrite: {
|
|
|
'^api-auth': ''
|