diff --git a/backend/application/settings.py b/backend/application/settings.py index 3428ae4..8b2c8c2 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 d4e4679..956d682 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 @@ @@ -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 +}); +