diff --git a/src/api/cms/website/field/model/index.ts b/src/api/cms/website/field/model/index.ts index 1fe6ad1..785f3c4 100644 --- a/src/api/cms/website/field/model/index.ts +++ b/src/api/cms/website/field/model/index.ts @@ -61,5 +61,6 @@ export interface Config { kefu1?: string; email?: string; loginTitle?: string; + sysName?: string; sysLogo?: string; } diff --git a/src/api/system/website/field/model/index.ts b/src/api/system/website/field/model/index.ts index cf32e49..94f92cc 100644 --- a/src/api/system/website/field/model/index.ts +++ b/src/api/system/website/field/model/index.ts @@ -60,4 +60,5 @@ export interface Config { email?: string; loginTitle?: string; sysLogo?: string; + sysName?: string; } diff --git a/src/layout/index.vue b/src/layout/index.vue index 510eb25..66b0be6 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -128,10 +128,16 @@ const themeStore = useThemeStore(); // 租户信息 const { company } = storeToRefs(tenantStore); - // 当前用户信息 - const loginUser = computed(() => userStore.info ?? {}); + // 菜单数据 + const { menus, config } = storeToRefs(userStore); // 网站名称 - const projectName = company.value?.shortName || 'WEBSOFT'; + const projectName = ref('控制台'); + // 当前用户信息 + // const loginUser = computed(() => userStore.info ?? {}); + if (localStorage.getItem('TenantName')) { + projectName.value = `${localStorage.getItem('TenantName')}`; + } + // 网站LOGO const logoPath = company.value?.companyLogo || 'https://www.gxwebsoft.com/ws-logo.svg'; @@ -139,9 +145,6 @@ // 是否全屏 const fullscreen = ref(false); - // 菜单数据 - const { menus } = storeToRefs(userStore); - // 布局风格 const { tabs, diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 3e86b78..abc34e2 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -8,11 +8,14 @@ import type { User } from '@/api/system/user/model'; import { TOKEN_STORE_NAME, USER_MENUS } from '@/config/setting'; import { getUserInfo } from '@/api/layout'; import { initialization } from '@/api/system/tenant'; +import { Config } from '@/api/system/website/field/model'; +import { configWebsiteField } from '@/api/system/website/field'; // import { isExternalLink } from 'ele-admin-pro'; // import { message } from 'ant-design-vue'; const EXTRA_MENUS: any = []; export interface UserState { + config: Config | null; info: User | null; menus: MenuItemType[] | null | undefined; authorities: (string | undefined)[]; @@ -22,6 +25,7 @@ export interface UserState { export const useUserStore = defineStore({ id: 'user', state: (): UserState => ({ + config: null, // 当前登录用户的信息 info: null, // 当前登录用户的菜单 @@ -37,6 +41,11 @@ export const useUserStore = defineStore({ * 请求用户信息、权限、角色、菜单 */ async fetchUserInfo() { + this.config = await configWebsiteField({}); + // await configWebsiteField({}).then((data) => { + // console.log(data, 'data'); + // this.config = data; + // }); const result = await getUserInfo().catch(() => {}); if (!result) { return {}; diff --git a/src/views/cms/field/components/website-field-edit.vue b/src/views/cms/field/components/website-field-edit.vue index 76480b7..3715fe4 100644 --- a/src/views/cms/field/components/website-field-edit.vue +++ b/src/views/cms/field/components/website-field-edit.vue @@ -42,12 +42,11 @@ /> - @@ -175,6 +174,7 @@ assignFields(data); form.value = data.defaultValue; form.template = data.defaultValue; + form.comments = data.comments; if (data.type == 1) { images.value.push({ uid: `${data.id}`, diff --git a/src/views/cms/field/index.vue b/src/views/cms/field/index.vue index 19bbd13..2ed9127 100644 --- a/src/views/cms/field/index.vue +++ b/src/views/cms/field/index.vue @@ -124,9 +124,9 @@ // 表格列配置 const columns = ref([ { - title: '参数名', - dataIndex: 'comments', - key: 'comments', + title: '参数', + dataIndex: 'name', + key: 'name', width: 250, ellipsis: true }, @@ -136,6 +136,13 @@ key: 'value', ellipsis: true }, + { + title: '描述', + dataIndex: 'comments', + key: 'comments', + width: 250, + ellipsis: true + }, { title: '排序', dataIndex: 'sortNumber', diff --git a/src/views/passport/login/index.vue b/src/views/passport/login/index.vue index 0a3a6dd..aea9ded 100644 --- a/src/views/passport/login/index.vue +++ b/src/views/passport/login/index.vue @@ -18,9 +18,9 @@ />

{{ config.siteName }}

-
{{ - config?.loginTitle - }}
+
{{ config?.loginTitle }} +
- +
@@ -502,6 +502,7 @@ background: rgba(0, 0, 0, 0.2); } } + .company-name { position: absolute; top: 17%; @@ -510,6 +511,7 @@ font-size: 24px; color: #ffffff; } + /* 卡片 */ .login-form { width: 380px; @@ -526,18 +528,22 @@ padding: 22px 0; text-align: center; } + .title-btn { cursor: pointer; } + .login-title { display: flex; justify-content: space-around; line-height: 50px; + .active { color: #007dff; } } } + .login-form-right .login-form { margin: 0 15% 0 auto; } @@ -578,6 +584,7 @@ border-radius: 50%; cursor: pointer; } + .work-icon { width: 50px; height: 50px; @@ -637,9 +644,11 @@ transform: translateX(-50%); } } + .wwLogin_qrcode_head { padding: 10px 0 40px 0 !important; } + .logo-login { position: absolute; top: 20px; @@ -647,11 +656,13 @@ display: flex; align-items: center; cursor: pointer; + img { width: 28px; height: 28px; border-radius: 4px; } + h4 { margin-left: 6px; color: #ffffff;