From 7763f23f3224a0f609c4c483351edd656b0dfb26 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 16:49:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/layouts/auth.vue |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/layouts/auth.vue b/src/layouts/auth.vue
index 51dc083..9bf8bb3 100644
--- a/src/layouts/auth.vue
+++ b/src/layouts/auth.vue
@@ -18,11 +18,19 @@
 
 const appName = computed(() => preferences.copyright.companyName);
 // 鐧诲綍椤� logo 浼樺厛鍙栨暟鎹簱閰嶇疆锛坧references.logo.source锛夛紝鏈厤缃椂鍥為��缂栬瘧鏈熼粯璁� __APP_LOGO__
-const logo = computed(() => preferences.logo.source || __APP_LOGO__);
+const logo = computed(() => {
+  const source = preferences.logo.source || __APP_LOGO__;
+  // 鏈厤缃叕鍙告爣蹇楁椂涓嶅睍绀烘鏋舵紨绀� Logo銆�
+  return source?.includes('@vbenjs/static-source') ? '' : source;
+});
 const logoDark = computed(() => preferences.logo.sourceDark);
-// 鐧诲綍椤垫爣棰�/鎻忚堪浣跨敤 i18n 鍥哄畾鏂囨锛屼笉闅忓叕鍙搁厤缃彉鍖�
-const pageTitle = computed(() => $t('authentication.pageTitle'));
-const pageDescription = computed(() => $t('authentication.pageDesc'));
+// 鏍囬/鎻忚堪浼樺厛鍙栧叕鍙镐俊鎭厤缃紝鏈厤缃椂鍥為��鏍囧搧鏂囨
+const pageTitle = computed(
+  () => companyConfigStore.loginTitle || $t('authentication.pageTitle'),
+);
+const pageDescription = computed(
+  () => companyConfigStore.loginDescription || $t('authentication.pageDesc'),
+);
 </script>
 
 <template>

--
Gitblit v1.9.3