Merge remote-tracking branch 'origin/master' into dev

gaoluyang

4 天以前 ed066dc0bdfa9a7c3a3d55b8b4f70cd07e2e8d8a

 src/store/modules/settings.js

@@ -14,7 +14,7 @@
  {
    state: () => ({
      title: '',
      theme: storageSetting.theme || '#409EFF',
      theme: storageSetting.theme || '#165DFF',
      sideTheme: storageSetting.sideTheme || sideTheme,
      showSettings: showSettings,
      topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,