From 7f5200e6b5f542419284774220bb2e210ce0961e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 25 八月 2026 10:42:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/layouts/auth.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/layouts/auth.vue b/src/layouts/auth.vue
index 8ba66e8..7b6ab12 100644
--- a/src/layouts/auth.vue
+++ b/src/layouts/auth.vue
@@ -1,14 +1,32 @@
<script lang="ts" setup>
-import { computed } from 'vue';
+import { computed, onMounted } from 'vue';
import { AuthPageLayout } from '@vben/layouts';
import { preferences } from '@vben/preferences';
import { $t } from '#/locales';
+import { useCompanyConfigStore } from '#/store/company-config';
-const appName = computed(() => preferences.app.name);
-const logo = computed(() => preferences.logo.source);
+declare const __APP_LOGO__: string;
+
+const companyConfigStore = useCompanyConfigStore();
+
+onMounted(() => {
+ // 鐧诲綍椤靛睍绀� loginTitle锛氬惎鍔ㄥ姞杞借蛋鐨勬槸绾嚱鏁帮紙涓嶅～ store锛夛紝杩涘叆鐧诲綍椤垫椂鎷夊彇涓�娆�
+ companyConfigStore.loadFromServer();
+});
+
+const appName = computed(() => preferences.copyright.companyName);
+// 鐧诲綍椤� logo 浼樺厛鍙栨暟鎹簱閰嶇疆锛坧references.logo.source锛夛紝鏈厤缃椂鍥為��缂栬瘧鏈熼粯璁� __APP_LOGO__
+const logo = computed(() => preferences.logo.source || __APP_LOGO__);
const logoDark = computed(() => preferences.logo.sourceDark);
+// 鐧诲綍椤垫爣棰�/鎻忚堪浼樺厛鍙栧悗绔厤缃紝鏈厤缃椂鍥為��鍒� i18n 榛樿
+const pageTitle = computed(
+ () => companyConfigStore.loginTitle || $t('authentication.pageTitle'),
+);
+const pageDescription = computed(
+ () => companyConfigStore.loginDescription || $t('authentication.pageDesc'),
+);
</script>
<template>
@@ -16,8 +34,8 @@
:app-name="appName"
:logo="logo"
:logo-dark="logoDark"
- :page-description="$t('authentication.pageDesc')"
- :page-title="$t('authentication.pageTitle')"
+ :page-description="pageDescription"
+ :page-title="pageTitle"
>
<!-- 鑷畾涔夊伐鍏锋爮 -->
<!-- <template #toolbar></template> -->
--
Gitblit v1.9.3