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/packages/effects/layouts/src/widgets/preferences/blocks/company/company.vue | 16 ++++++++--------
src/layouts/auth.vue | 3 ++-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/layouts/auth.vue b/src/layouts/auth.vue
index b3386c1..7b6ab12 100644
--- a/src/layouts/auth.vue
+++ b/src/layouts/auth.vue
@@ -17,7 +17,8 @@
});
const appName = computed(() => preferences.copyright.companyName);
-const logo = computed(() => __APP_LOGO__ || preferences.logo.source);
+// 鐧诲綍椤� logo 浼樺厛鍙栨暟鎹簱閰嶇疆锛坧references.logo.source锛夛紝鏈厤缃椂鍥為��缂栬瘧鏈熼粯璁� __APP_LOGO__
+const logo = computed(() => preferences.logo.source || __APP_LOGO__);
const logoDark = computed(() => preferences.logo.sourceDark);
// 鐧诲綍椤垫爣棰�/鎻忚堪浼樺厛鍙栧悗绔厤缃紝鏈厤缃椂鍥為��鍒� i18n 榛樿
const pageTitle = computed(
diff --git a/src/packages/effects/layouts/src/widgets/preferences/blocks/company/company.vue b/src/packages/effects/layouts/src/widgets/preferences/blocks/company/company.vue
index 24fcdf0..6a7d235 100644
--- a/src/packages/effects/layouts/src/widgets/preferences/blocks/company/company.vue
+++ b/src/packages/effects/layouts/src/widgets/preferences/blocks/company/company.vue
@@ -72,8 +72,8 @@
<template>
<div class="flex flex-col">
<!-- 鍏徃鍚嶇О -->
- <div class="my-1 flex w-full items-center justify-between rounded-md px-2 py-1">
- <span class="flex items-center text-sm">
+ <div class="my-2 flex w-full items-center justify-between gap-4 rounded-md px-2 py-2">
+ <span class="shrink-0 text-sm text-foreground/80">
{{ $t('preferences.company.companyName') }}
</span>
<Input
@@ -85,8 +85,8 @@
</div>
<!-- 鐧诲綍椤垫爣棰� -->
- <div class="my-1 flex w-full items-center justify-between rounded-md px-2 py-1">
- <span class="flex items-center text-sm">
+ <div class="my-2 flex w-full items-center justify-between gap-4 rounded-md px-2 py-2">
+ <span class="shrink-0 text-sm text-foreground/80">
{{ $t('preferences.company.loginTitle') }}
</span>
<Input
@@ -98,8 +98,8 @@
</div>
<!-- 鐧诲綍椤垫弿杩� -->
- <div class="my-1 flex w-full items-center justify-between rounded-md px-2 py-1">
- <span class="flex items-center text-sm">
+ <div class="my-2 flex w-full items-center justify-between gap-4 rounded-md px-2 py-2">
+ <span class="shrink-0 text-sm text-foreground/80">
{{ $t('preferences.company.loginDescription') }}
</span>
<Input
@@ -111,8 +111,8 @@
</div>
<!-- 鍏徃 Logo -->
- <div class="my-1 flex w-full items-center justify-between rounded-md px-2 py-1">
- <span class="flex items-center text-sm">
+ <div class="my-2 flex w-full items-center justify-between gap-4 rounded-md px-2 py-2">
+ <span class="shrink-0 text-sm text-foreground/80">
{{ $t('preferences.company.logo') }}
</span>
<div class="flex items-center gap-2">
--
Gitblit v1.9.3