Merge branch 'dev' of github.com:jumpserver/lina into dev

2026-01-29 21:28:52 +00:00 · 2020-06-09 16:14:22 +08:00
parent 2b9d682dd9 fb58557d93
commit cd4da8409b
12 changed files with 100 additions and 24 deletions
--- a/src/layout/components/NavBar/Logo.vue
+++ b/src/layout/components/NavBar/Logo.vue
@@ -38,7 +38,11 @@ export default {
    ]),
    // eslint-disable-next-line vue/return-in-computed-property
    logoSrc() {
-      return this.publicSettings.LOGO_URLS.logo_index
+      if (this.publicSettings.LOGO_URLS.logo_index !== '/static/img/logo_text.png') {
+        return this.publicSettings.LOGO_URLS.logo_index
+      } else {
+        return this.logoText
+      }
    }
  },
  created() {