Merge branch 'fix_yjw' into debug

src/views/Home.vue

@@ -505,7 +505,7 @@ export default {
     },
 
     logoLarge() {
-      return require('@/assets/img/login_icon.png')
+      return this.$store.state.baseInfo.logoCh || this.$setting.g_logo
     }
   },
   data() {