diff --git a/app/models/laboratory_setting.rb b/app/models/laboratory_setting.rb index dc7679514..32848dca2 100644 --- a/app/models/laboratory_setting.rb +++ b/app/models/laboratory_setting.rb @@ -34,7 +34,7 @@ class LaboratorySetting < ApplicationRecord def logo_url(type) return nil unless Util::FileManage.exists?(self, type) - Util::FileManage.source_disk_file_url(self, type)[1..-1] # 前端不兼容带 / 的 + Util::FileManage.source_disk_file_url(self, type) end def self.default_config diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index 0765e303b..1fce12b77 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -2,9 +2,9 @@ json.setting do setting = @laboratory.laboratory_setting json.name setting.name || default_setting.name - json.nav_logo_url setting.nav_logo_url || default_setting.nav_logo_url - json.login_logo_url setting.login_logo_url || default_setting.login_logo_url - json.tab_logo_url setting.tab_logo_url || default_setting.tab_logo_url + json.nav_logo_url (setting.nav_logo_url || default_setting.nav_logo_url)&.[](1..-1) + json.login_logo_url (setting.login_logo_url || default_setting.login_logo_url)&.[](1..-1) + json.tab_logo_url (setting.tab_logo_url || default_setting.tab_logo_url)&.[](1..-1) json.navbar setting.navbar || default_setting.navbar