Merge remote-tracking branch 'origin/master'

nuxt.config.js

@@ -64,6 +64,13 @@ export default {
   env: {
     baseUrl: 'http://localhost:3000'
   },
+  /**
+   * loading 进度条样式
+   */
+  loading: {
+    color: '#2B5CFD',
+    height: '1px'
+  },
   /*
   ** Nuxt.js modules
   */