From 6798fca3625c2195d9292cdb4cf30454f1f57c22 Mon Sep 17 00:00:00 2001
From: H0nGzA1 <2505811377@qq.com>
Date: Thu, 4 Jan 2024 19:49:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E8=83=8C=E6=99=AFlogo=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/application/settings.py      |  2 +-
 web/.env.development                 |  2 +-
 web/package.json                     |  1 +
 web/src/layout/logo/index.vue        | 27 ++++++++++----
 web/src/views/system/login/index.vue | 56 +++++++++++++++++++---------
 5 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/backend/application/settings.py b/backend/application/settings.py
index 70446c1..7f8e7d5 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -404,7 +404,7 @@ PLUGINS_URL_PATTERNS = []
 # ********** 一键导入插件配置开始 **********
 # 例如:
 # from dvadmin_upgrade_center.settings import *    # 升级中心
-from dvadmin_celery.settings import *            # celery 异步任务
+# from dvadmin_celery.settings import *            # celery 异步任务
 # from dvadmin_third.settings import *            # 第三方用户管理
 # from dvadmin_ak_sk.settings import *            # 秘钥管理管理
 # from dvadmin_tenants.settings import *            # 租户管理
diff --git a/web/.env.development b/web/.env.development
index dc36b29..1c3ca5d 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://127.0.0.1:8001'
+VITE_API_URL = 'http://127.0.0.1:8000'
 
 # 是否启用按钮权限
 VITE_PM_ENABLED = true
diff --git a/web/package.json b/web/package.json
index 28b837f..8a3be3f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -14,6 +14,7 @@
 		"@fast-crud/fast-extends": "^1.19.2",
 		"@fast-crud/ui-element": "^1.19.2",
 		"@fast-crud/ui-interface": "^1.19.2",
+		"@types/lodash": "^4.14.202",
 		"@vitejs/plugin-vue-jsx": "^3.0.0",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
diff --git a/web/src/layout/logo/index.vue b/web/src/layout/logo/index.vue
index d71010c..99bf7da 100644
--- a/web/src/layout/logo/index.vue
+++ b/web/src/layout/logo/index.vue
@@ -1,10 +1,10 @@
 <template>
 	<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
-		<img :src="logoMini" class="layout-logo-medium-img" />
+		<img :src="siteLogo" class="layout-logo-medium-img" />
 		<span style="font-size: x-large">{{ getSystemConfig['login.site_title'] || themeConfig.globalTitle }}</span>
 	</div>
 	<div class="layout-logo-size" v-else @click="onThemeConfigChange">
-		<img :src="logoMini" class="layout-logo-size-img" />
+		<img :src="siteLogo" class="layout-logo-size-img" />
 	</div>
 </template>
 
@@ -13,8 +13,8 @@ import { computed } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import logoMini from '/@/assets/logo-mini.svg';
-import {SystemConfigStore} from "/@/stores/systemConfig";
-
+import { SystemConfigStore } from "/@/stores/systemConfig";
+import _ from "lodash";
 // 定义变量内容
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
@@ -31,11 +31,18 @@ const onThemeConfigChange = () => {
 };
 
 const systemConfigStore = SystemConfigStore()
-const {systemConfig} = storeToRefs(systemConfigStore)
-const getSystemConfig = computed(()=>{
-  return systemConfig.value
+const { systemConfig } = storeToRefs(systemConfigStore)
+const getSystemConfig = computed(() => {
+	return systemConfig.value
 })
 
+const siteLogo = computed(() => {
+	if (!_.isEmpty(getSystemConfig.value['login.site_logo'])) {
+		return getSystemConfig.value['login.site_logo']
+	}
+	return logoMini
+});
+
 </script>
 
 <style scoped lang="scss">
@@ -50,30 +57,36 @@ const getSystemConfig = computed(()=>{
 	font-size: 16px;
 	cursor: pointer;
 	animation: logoAnimation 0.3s ease-in-out;
+
 	span {
 		white-space: nowrap;
 		display: inline-block;
 	}
+
 	&:hover {
 		span {
 			color: var(--color-primary-light-2);
 		}
 	}
+
 	&-medium-img {
 		width: 40px;
 		margin-right: 5px;
 	}
 }
+
 .layout-logo-size {
 	width: 100%;
 	height: 50px;
 	display: flex;
 	cursor: pointer;
 	animation: logoAnimation 0.3s ease-in-out;
+
 	&-img {
 		width: 40px;
 		margin: auto;
 	}
+
 	&:hover {
 		img {
 			animation: logoAnimation 0.3s ease-in-out;
diff --git a/web/src/views/system/login/index.vue b/web/src/views/system/login/index.vue
index e57f316..7915b64 100644
--- a/web/src/views/system/login/index.vue
+++ b/web/src/views/system/login/index.vue
@@ -1,11 +1,12 @@
 <template>
-	<div class="login-container flex">
+	<div class="login-container flex z-10">
 		<div class="login-left">
 			<div class="login-left-logo">
-				<img :src="logoMini" />
+				<img :src="siteLogo" />
 				<div class="login-left-logo-text">
-					<span>{{ getSystemConfig['login.site_title']||getThemeConfig.globalViceTitle }}</span>
-					<span class="login-left-logo-text-msg">{{ getSystemConfig['login.site_name']||getThemeConfig.globalViceTitleMsg }}</span>
+					<span>{{ getSystemConfig['login.site_title'] || getThemeConfig.globalViceTitle }}</span>
+					<span class="login-left-logo-text-msg">{{
+						getSystemConfig['login.site_name'] || getThemeConfig.globalViceTitleMsg }}</span>
 				</div>
 			</div>
 			<div class="login-left-img">
@@ -13,12 +14,13 @@
 			</div>
 			<img :src="loginBg" class="login-left-waves" />
 		</div>
-		<div class="login-right flex">
+		<div class="login-right flex z-10">
 			<div class="login-right-warp flex-margin">
 				<span class="login-right-warp-one"></span>
 				<span class="login-right-warp-two"></span>
 				<div class="login-right-warp-mian">
-					<div class="login-right-warp-main-title">{{ getSystemConfig['login.site_title'] || getThemeConfig.globalTitle }} 欢迎您！</div>
+					<div class="login-right-warp-main-title">{{ getSystemConfig['login.site_title'] ||
+						getThemeConfig.globalTitle }} 欢迎您！</div>
 					<div class="login-right-warp-main-form">
 						<div v-if="!state.isScan">
 							<el-tabs v-model="state.tabsActiveName">
@@ -41,19 +43,26 @@
 			</div>
 		</div>
 
-		<div class="login-authorization">
-			<p>Copyright © {{getSystemConfig['login.copyright'] || '2021-2024 django-vue-admin.com'}} 版权所有</p>
+		<div class="login-authorization z-10">
+			<p>Copyright © {{ getSystemConfig['login.copyright'] || '2021-2024 django-vue-admin.com' }} 版权所有</p>
 			<p class="la-other">
-				<a href="https://beian.miit.gov.cn" target="_blank">{{getSystemConfig['login.keep_record'] || '晋ICP备18005113号-3'}}</a>
+				<a href="https://beian.miit.gov.cn" target="_blank">{{ getSystemConfig['login.keep_record'] ||
+					'晋ICP备18005113号-3' }}</a>
 				|
-				<a :href="getSystemConfig['login.help_url']?getSystemConfig['login.help_url']:'https://django-vue-admin.com'" target="_blank">帮助</a>
+				<a :href="getSystemConfig['login.help_url'] ? getSystemConfig['login.help_url'] : 'https://django-vue-admin.com'"
+					target="_blank">帮助</a>
 				|
-				<a :href="getSystemConfig['login.privacy_url']?getBaseURL(getSystemConfig['login.privacy_url']):'#'">隐私</a>
+				<a
+					:href="getSystemConfig['login.privacy_url'] ? getBaseURL(getSystemConfig['login.privacy_url']) : '#'">隐私</a>
 				|
-				<a :href="getSystemConfig['login.clause_url']?getBaseURL(getSystemConfig['login.clause_url']):'#'">条款</a>
+				<a
+					:href="getSystemConfig['login.clause_url'] ? getBaseURL(getSystemConfig['login.clause_url']) : '#'">条款</a>
 			</p>
 		</div>
 	</div>
+	<div v-if="siteBg">
+		<img :src="siteBg" class="fixed inset-0 z-1 w-full h-full" />
+	</div>
 </template>
 
 <script setup lang="ts" name="loginIndex">
@@ -64,12 +73,13 @@ import { NextLoading } from '/@/utils/loading';
 import logoMini from '/@/assets/logo-mini.svg';
 import loginMain from '/@/assets/login-main.svg';
 import loginBg from '/@/assets/login-bg.svg';
-import {SystemConfigStore} from '/@/stores/systemConfig'
-import {getBaseURL} from "/@/utils/baseUrl";
+import { SystemConfigStore } from '/@/stores/systemConfig'
+import { getBaseURL } from "/@/utils/baseUrl";
 // 引入组件
 const Account = defineAsyncComponent(() => import('/@/views/system/login/component/account.vue'));
 const Mobile = defineAsyncComponent(() => import('/@/views/system/login/component/mobile.vue'));
 const Scan = defineAsyncComponent(() => import('/@/views/system/login/component/scan.vue'));
+import _ from "lodash";
 
 // 定义变量内容
 const storesThemeConfig = useThemeConfig();
@@ -85,11 +95,23 @@ const getThemeConfig = computed(() => {
 });
 
 const systemConfigStore = SystemConfigStore()
-const {systemConfig} = storeToRefs(systemConfigStore)
-const getSystemConfig = computed(()=>{
-  return systemConfig.value
+const { systemConfig } = storeToRefs(systemConfigStore)
+const getSystemConfig = computed(() => {
+	return systemConfig.value
 })
 
+const siteLogo = computed(() => {
+	if (!_.isEmpty(getSystemConfig.value['login.site_logo'])) {
+		return getSystemConfig.value['login.site_logo']
+	}
+	return logoMini
+});
+
+const siteBg = computed(() => {
+	if (!_.isEmpty(getSystemConfig.value['login.login_background'])) {
+		return getSystemConfig.value['login.login_background']
+	}
+});
 
 // 页面加载时
 onMounted(() => {