Merge branch 'hotfix/travis_setting_remove' into develop

Former-commit-id: 93b1f323921a9cad8377ae6ca59ba54d33651fe2 [formerly 93b1f323921a9cad8377ae6ca59ba54d33651fe2 [formerly 93b1f323921a9cad8377ae6ca59ba54d33651fe2 [formerly 93b1f323921a9cad8377ae6ca59ba54d33651fe2 [formerly 99c5df1e3b78c9fd2bdb16f43b72b4200b52c6f9 [formerly c50a2658c80b3f1158124eca0c0dbb39ab72e2c7]]]]]
Former-commit-id: 4817c592906cc881ad76683840ea417b766d021b
Former-commit-id: 2d6531b669fd47fc49c8d81d2a98037a2dcf415f
Former-commit-id: 51ae737061d4b71200e19e4b522e5a55c13d497c [formerly 606dd8c6cc1e996defe5a9ade7835b1603549f4c]
Former-commit-id: 47622907631fc4925e6d19555995f871769896b1
Former-commit-id: 69f5d4b5077a1e38e10a843a317153951443944d
Former-commit-id: 47dbcc4e5571afacd21f00183d44c94db77d99bf
Former-commit-id: 9065e99b5ccdd8a6c79cfa0f70d24a5a6264f14e
Former-commit-id: abd886464513ea88f151a582d1c29eb522e3fda8
This commit is contained in:
liyang
2018-10-27 18:48:42 +08:00
2 changed files with 7 additions and 8 deletions

View File

@@ -1,5 +1,10 @@
# travis
# 指定构建模式
NODE_ENV=production
VUE_APP_TRAVIS=TRUE
# 标记当前是 CI 自动构建
VUE_APP_BUILD_MODE=TRAVIS
# 页面 title 前缀
VUE_APP_TITLE=D2Admin Preview

View File

@@ -1,14 +1,8 @@
const path = require('path')
// 拼接路径
function resolve (dir) {
return path.join(__dirname, dir)
}
const resolve = dir => require('path').join(__dirname, dir)
// 基础路径 注意发布之前要先修改这里
let baseUrl = '/'
// 演示项目自动构建使用
if (process.env.VUE_APP_TRAVIS === 'TRUE') baseUrl = '/'
module.exports = {
baseUrl: baseUrl, // 根据你的实际情况更改这里