Merge remote-tracking branch 'origin/develop'

Former-commit-id: 280fc839cbf6a173fceef1947a5d6e9c5e3cb0a2 [formerly 946b574ce837e58176065242b2229d252b8ff622] [formerly 280fc839cbf6a173fceef1947a5d6e9c5e3cb0a2 [formerly 946b574ce837e58176065242b2229d252b8ff622] [formerly 280fc839cbf6a173fceef1947a5d6e9c5e3cb0a2 [formerly 946b574ce837e58176065242b2229d252b8ff622] [formerly 946b574ce837e58176065242b2229d252b8ff622 [formerly 997ae5f885eceaebbc5e830b3d4c7d1293cdf7bb [formerly 9d0c8e38d141e08c8b9b8f76923a8b39b050e5fb]]]]]
Former-commit-id: ce52a438b96cb23b0eaaaf721d1902a3f745b31f
Former-commit-id: 5333503e71d92b91fb3559ba6460b4c40b64d4e8
Former-commit-id: 05eca44e3708330f691128bd385eac54de79b40f [formerly fa227d907026734f599536ed97922783bd3c58ce]
Former-commit-id: 1a70dc5eb91f0092748a3fac1f1bcb8d7dfb081e
Former-commit-id: f074d49c4360e2bc57b837fb9229e9f4d3c466c3
Former-commit-id: c0c58edf0376b8b8a9f88a4df372a9dbc359b591
Former-commit-id: 3571f43f9cad8020253f368f9cc0cfdfa4982912
Former-commit-id: 84ded9a0716e5727c2a8930fae29e5f2cb19481b

.env

@@ -1,4 +1,4 @@
-# 所有环境
+# 所有环境默认
 
 # 页面 title 前缀
 VUE_APP_TITLE=D2Admin

.env.travis

@@ -0,0 +1 @@
+# travis

.travis.yml

@@ -9,7 +9,7 @@ branches:
   - master
 
 script:
-  - npm run build
+  - npm run build:travis
 
 deploy:
   provider: pages

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"
   },

src/pages/login/page.vue

@@ -28,12 +28,12 @@
                 </template>
               </el-input>
             </el-form-item>
-            <el-button @click="submit" type="primary" class="button-login">登录</el-button>
+            <el-button size="default" @click="submit" type="primary" class="button-login">登录</el-button>
           </el-form>
         </el-card>
       </div>
       <!-- 快速登录按钮 -->
-      <el-button type="info" class="button-help" @click="dialogVisible = true">
+      <el-button size="default" type="info" class="button-help" @click="dialogVisible = true">
         快速选择用户（测试功能）
       </el-button>
     </div>

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, // 根据你的实际情况更改这里