diff --git a/.env b/.env index 701568fd..98f6dcf1 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -# 所有环境 +# 所有环境默认 # 页面 title 前缀 VUE_APP_TITLE=D2Admin diff --git a/.env.travis b/.env.travis new file mode 100644 index 00000000..1e6e1ffc --- /dev/null +++ b/.env.travis @@ -0,0 +1 @@ +# travis diff --git a/.travis.yml b/.travis.yml index c1f9b00e..4599448d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ branches: - master script: - - npm run build + - npm run build:travis deploy: provider: pages diff --git a/package.json b/package.json index 736f9ede..8f707e1d 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "start": "vue-cli-service serve --open", "dev": "vue-cli-service serve --open", "build": "vue-cli-service build", + "build:travis": "vue-cli-service build --mode travis", "lint": "vue-cli-service lint --fix", "test:unit": "vue-cli-service test:unit" }, diff --git a/src/pages/login/page.vue b/src/pages/login/page.vue index c0a08c96..ad2bdc7a 100644 --- a/src/pages/login/page.vue +++ b/src/pages/login/page.vue @@ -28,12 +28,12 @@ - 登录 + 登录 - + 快速选择用户(测试功能) diff --git a/vue.config.js b/vue.config.js index 8a0c6608..c730db60 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,7 +6,9 @@ function resolve (dir) { } // 基础路径 注意发布之前要先修改这里 -const baseUrl = '/d2-admin/' +let baseUrl = '/' +// 演示项目自动构建使用 +if (process.env.NODE_ENV === 'travis') baseUrl = '/d2-admin/' module.exports = { baseUrl: baseUrl, // 根据你的实际情况更改这里