合并master

src/settings.js

@@ -7,10 +7,10 @@ module.exports = {
    */
   showSettings: true,
 
-    /**
-   * 是否显示顶部导航
-   */
-    topNav: true,
+  /**
+ * 是否显示顶部导航
+ */
+  topNav: true,
 
   /**
    * @type {boolean} true | false

src/views/forgetpass/index.vue

@@ -244,7 +244,7 @@ export default {
 .row {
   width: 100%;
   height: 100vh;
-  background: #fff no-repeat;
+  background: url('../../assets/bg.png') no-repeat;
   background-attachment: fixed;
   box-sizing: border-box;
   background-size: 100% 100%;