Merge branch 'hotfix/build'

Former-commit-id: ec740da164085a3d58181b1a8bb84148f058a551 [formerly 4788e46750a0919eeaf7d7037ec93e40d4307eb3] [formerly ec740da164085a3d58181b1a8bb84148f058a551 [formerly 4788e46750a0919eeaf7d7037ec93e40d4307eb3] [formerly ec740da164085a3d58181b1a8bb84148f058a551 [formerly 4788e46750a0919eeaf7d7037ec93e40d4307eb3] [formerly 4788e46750a0919eeaf7d7037ec93e40d4307eb3 [formerly 74c5a5249075fe2d19f867afd2d174afae2240cf [formerly 92cfbedbebbf3d81172f56879b5bbdb53fa01b8e]]]]]
Former-commit-id: c2e2e7d2f2e2488d298840dbc4501f2af4e60701
Former-commit-id: 9c5f9e6b73bcac9b6c4bbb82c371d83f4201c443
Former-commit-id: 98716aba1303fda78c22ded47c1380055e221e02 [formerly 3901a7e6eb43c9b13e4335fd5e1e6fd50a8fcb8e]
Former-commit-id: 5bfe303ec4c1735d6b09a73d03207572f4c6432a
Former-commit-id: 449a8a97729c825da075cddcc1d39fa4d355673a
Former-commit-id: 731608e80040bc21720d29b4035be0c7eefc19ab
Former-commit-id: af0cee810dc9099c0d021e8eebb58b20ba24f88a
Former-commit-id: 96c924defe68510ce1afc82572c7553be47647c8
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 # travis
NODE_ENV=travis NODE_ENV=production
VUE_APP_TRAVIS=TRUE

View File

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