diff --git a/src/assets/images/layout/main/main-top.png b/src/assets/images/layout/main/main-top.png index fc26fe93..8443a8ca 100644 Binary files a/src/assets/images/layout/main/main-top.png and b/src/assets/images/layout/main/main-top.png differ diff --git a/src/components/page-settings/index.vue b/src/components/page-settings/index.vue index ae70fef2..0237ed39 100644 --- a/src/components/page-settings/index.vue +++ b/src/components/page-settings/index.vue @@ -1,8 +1,8 @@ diff --git a/src/components/page-settings/page-setting.vue b/src/components/page-settings/page-setting.vue new file mode 100644 index 00000000..4489b1e8 --- /dev/null +++ b/src/components/page-settings/page-setting.vue @@ -0,0 +1,22 @@ + + diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue new file mode 100644 index 00000000..b461ce5d --- /dev/null +++ b/src/components/page-settings/page-styles.vue @@ -0,0 +1,75 @@ + + + diff --git a/src/layout/components/main/default/header-nav.ts b/src/layout/components/main/default/header-nav.ts index ee7197e0..e443e1e8 100644 --- a/src/layout/components/main/default/header-nav.ts +++ b/src/layout/components/main/default/header-nav.ts @@ -1,19 +1,41 @@ +import defaultCommon from './index'; + interface DefaultFooterNav { content: { color_list: color_list[]; title: string; - direction: string; - background_img_style: number; - background_img_url: uploadList[]; }; + style: { + background_type: string; + background_color_list: color_list[]; + background_direction: string; + background_img_url: uploadList[]; + background_title_color: string, + background_title_typeface: string, + background_title_size: number, + function_buttons_type: string, + immersive_style: boolean, + up_slide_display: boolean, + common_style: object; + } } const defaultFooterNav: DefaultFooterNav = { content: { color_list: [{ color: '#f5f5f5', color_percentage: '' }], title: '', - direction: '180deg', - background_img_style: 2, + }, + style: { + background_type: 'color', + background_color_list: [{ color: '#fff', color_percentage: '' }], + background_direction: '180deg', background_img_url: [], + background_title_color: '#000', + background_title_typeface: '500', + background_title_size: 14, + function_buttons_type: 'black', + immersive_style: false, + up_slide_display: true, + common_style: defaultCommon, }, }; diff --git a/src/layout/components/main/index.vue b/src/layout/components/main/index.vue index c2bf16c8..08a2fb21 100644 --- a/src/layout/components/main/index.vue +++ b/src/layout/components/main/index.vue @@ -17,21 +17,20 @@
-
- 页面设置 - 导出 - 导入 - 清空 -
+
+ 页面设置 + 导出 + 导入 + 清空 +
-
- +
-
+
@@ -182,11 +181,23 @@ watch( page_settings(); } ); +const top_padding = ref(90); +const top_margin = ref(0); watchEffect(() => { - if (props.header.com_data?.content) { - const content = props.header.com_data?.content; - const container_common_styles = gradient_computer(content) + background_computer(content); - content_style.value = container_common_styles; + if (page_data.value.com_data) { + const { immersive_style, up_slide_display } = page_data.value.com_data.style; + // 不开启沉浸式 和 上滑显示 + if (immersive_style || !up_slide_display) { + top_padding.value = 2; + } else { + top_padding.value = 90; + } + // 开启沉浸式并且没有开通上滑显示 + if (immersive_style && !up_slide_display) { + top_margin.value = -90; + } else { + top_margin.value = 0; + } } }); watch( @@ -575,7 +586,7 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri position: absolute; left: 50%; margin-left: 26rem; - top: 4.7rem; + top: 0; display: flex; flex-direction: column; gap: 2rem; @@ -595,7 +606,7 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri height: 100%; .model-content { position: relative; - height: 84.4rem; + height: 84.6rem; .model-bottom { position: absolute; bottom: 0; @@ -613,6 +624,7 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri .model-drag { overflow-y: auto; + padding-top: 0.2rem; max-height: 84.4rem; &::-webkit-scrollbar { display: none; @@ -622,7 +634,7 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri background: #f5f5f5; margin: 0 auto; .drag-area { - min-height: 75.5rem; + min-height: 68.1rem; } .drag-area .float-window { position: fixed; diff --git a/src/layout/components/settings/index.vue b/src/layout/components/settings/index.vue index 331f6519..6ad99be2 100644 --- a/src/layout/components/settings/index.vue +++ b/src/layout/components/settings/index.vue @@ -3,17 +3,15 @@
{{ value.name }}
- + + 内容 + 样式 +