From e38532a11f3684b9066490de7d6dc092aa1b9fa1 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 13 Sep 2018 17:40:33 +0800 Subject: [PATCH 1/2] no message Former-commit-id: e38ae2a500eb5e6e940012c7bcdce36ceb290830 [formerly e38ae2a500eb5e6e940012c7bcdce36ceb290830 [formerly e38ae2a500eb5e6e940012c7bcdce36ceb290830 [formerly e38ae2a500eb5e6e940012c7bcdce36ceb290830 [formerly 665c7f37b7865f504602011c015e0c63be0c9cf1 [formerly 9ae5b6f8ebe3c42dfde2c3762ad69204003e27a5]]]]] Former-commit-id: 8aff3018b430d7ddca293ce9f9dbdeb5e3ea56e9 Former-commit-id: 62b9ff3353f96e3e136ced0657e7776b10973767 Former-commit-id: 6c2467d43ce3a3c62bd59f927e731f50b9da8f2c [formerly ddd4945cb07ec830065d7ae9893b6badbe1e47d5] Former-commit-id: ef6262239d352fb2c0bdd84f82a2bae873a94546 Former-commit-id: 7e8b514df9a6722e469578a98ba2bdf027cafae6 Former-commit-id: 2b17e81ea572402951fd8a181500d215368c9fe1 Former-commit-id: 70a34fdf619b2e9277787b2d1c7b7da4fd28da99 Former-commit-id: e7524fc7b102a4451ae39580b7339048eea8a3a7 --- src/pages/login/page.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ - 登录 + 登录 - + 快速选择用户（测试功能） From d1538e8d81baef600f30634adee6c0695025d940 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 13 Sep 2018 18:01:39 +0800 Subject: [PATCH 2/2] no message Former-commit-id: cd89f4a565e078725bfbd91b082aa5e70400b0a1 [formerly cd89f4a565e078725bfbd91b082aa5e70400b0a1 [formerly cd89f4a565e078725bfbd91b082aa5e70400b0a1 [formerly cd89f4a565e078725bfbd91b082aa5e70400b0a1 [formerly 8a60801dff62431fc70f2dd3643ce5a38dcbdc5b [formerly 01dc98df70e5c404eab788af71aec07995049448]]]]] Former-commit-id: 5d84dacd8579e8d61631190e38cb4ca3eafe5903 Former-commit-id: 0255984689f52d0bf5122aea607a11a8c826307c Former-commit-id: fe33e58cf784eca69d69667eb9c740cefd3e0f5a [formerly 9578eba16aa9c7d0e64a6a994bc7bf32d99b667d] Former-commit-id: 36d2d56ea83f674f5e1fdb6ea8172dfede4fd362 Former-commit-id: 8827e37559395abd10af36d941cc49d59a182ba0 Former-commit-id: d121162a3c2a978e137a2dd233801a06aa464d2e Former-commit-id: 6be2bcf3359c7dc1a5df3ad79101a14d26447c67 Former-commit-id: f5f4c8b7dcd1a246eef5a7df725815c777810c75 --- .env | 2 +- .env.travis | 1 + .travis.yml | 2 +- package.json | 1 + vue.config.js | 4 +++- 5 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .env.travis 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/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, // 根据你的实际情况更改这里