Merge branch 'hotfix/build' into develop

Former-commit-id: a37094980c933e3105a86851323b1619f58b38ca [formerly 452489a151b7a66765dba367f56db9d9742dd85c] [formerly a37094980c933e3105a86851323b1619f58b38ca [formerly 452489a151b7a66765dba367f56db9d9742dd85c] [formerly a37094980c933e3105a86851323b1619f58b38ca [formerly 452489a151b7a66765dba367f56db9d9742dd85c] [formerly 452489a151b7a66765dba367f56db9d9742dd85c [formerly 6bbb2f840f9c08c9d50998a6a54f5a2fb553b3d8 [formerly 36e3d5286f0df56bfb278d1b9b0741e355d07cc0]]]]]
Former-commit-id: eba0995118afc3685b20a3ee857cb2ca8c38b758
Former-commit-id: 552ea8139e0b5cc4668a471dd80ef63128bbbcc4
Former-commit-id: fbf8b6bf4397977831bb1d8c15d8569630c5b707 [formerly 87ca8ed132c161c34792abdaeecdd00bebc36d6b]
Former-commit-id: b6d7981c822b8df0fa9f4fa5969bea0444cbc314
Former-commit-id: b18673969b5a1e37d5b64491d067eac6885fa9e2
Former-commit-id: f1ead16566e17f9cc62b6a03c29137df072bb435
Former-commit-id: 560aa9ed54b45022bfb36a33954184a68b516c3b
Former-commit-id: 65735b007aaf95752e439e666cf4254bcab1769f
This commit is contained in:
liyang
2018-09-14 15:18:26 +08:00
2 changed files with 4 additions and 2 deletions

View File

@@ -1,3 +1,5 @@
# travis
NODE_ENV=travis
NODE_ENV=production
VUE_APP_TRAVIS=TRUE

View File

@@ -8,7 +8,7 @@ function resolve (dir) {
// 基础路径 注意发布之前要先修改这里
let baseUrl = '/'
// 演示项目自动构建使用
if (process.env.NODE_ENV === 'travis') baseUrl = '/d2-admin/'
if (process.env.VUE_APP_TRAVIS === 'TRUE') baseUrl = '/d2-admin/'
module.exports = {
baseUrl: baseUrl, // 根据你的实际情况更改这里