diff --git a/src/assets/images/components/page-settings/theme_1.png b/src/assets/images/components/page-settings/theme_1.png deleted file mode 100644 index f730d1d4..00000000 Binary files a/src/assets/images/components/page-settings/theme_1.png and /dev/null differ diff --git a/src/assets/images/components/page-settings/theme_2.png b/src/assets/images/components/page-settings/theme_2.png deleted file mode 100644 index a21fe464..00000000 Binary files a/src/assets/images/components/page-settings/theme_2.png and /dev/null differ diff --git a/src/assets/images/components/page-settings/theme_3.png b/src/assets/images/components/page-settings/theme_3.png deleted file mode 100644 index 59bb3c61..00000000 Binary files a/src/assets/images/components/page-settings/theme_3.png and /dev/null differ diff --git a/src/assets/images/components/page-settings/theme_4.png b/src/assets/images/components/page-settings/theme_4.png deleted file mode 100644 index 1e518303..00000000 Binary files a/src/assets/images/components/page-settings/theme_4.png and /dev/null differ diff --git a/src/assets/images/components/page-settings/theme_5.png b/src/assets/images/components/page-settings/theme_5.png deleted file mode 100644 index bc4762a0..00000000 Binary files a/src/assets/images/components/page-settings/theme_5.png and /dev/null differ diff --git a/src/assets/images/components/page-settings/theme_6.png b/src/assets/images/components/page-settings/theme_6.png deleted file mode 100644 index efc1aae6..00000000 Binary files a/src/assets/images/components/page-settings/theme_6.png and /dev/null differ diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue index bd90dab9..6a420f9e 100644 --- a/src/components/common/upload/index.vue +++ b/src/components/common/upload/index.vue @@ -204,14 +204,14 @@ -
+
{{ tipsText }}
diff --git a/src/components/page-settings/index.ts b/src/components/page-settings/index.ts deleted file mode 100644 index a1b7c357..00000000 --- a/src/components/page-settings/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -type page_content = { - title: string; - color_list: color_list[]; - direction: string; - background_img_style: string; - background_img_url: uploadList[]; -} - -// type keys = 'title'; -// type content = { -// [key in keys] : string; -// } \ No newline at end of file diff --git a/src/components/page-settings/page-content.vue b/src/components/page-settings/page-content.vue index 55aee0a2..c129aca4 100644 --- a/src/components/page-settings/page-content.vue +++ b/src/components/page-settings/page-content.vue @@ -1,46 +1,55 @@ diff --git a/src/layout/components/main/default/header-nav.ts b/src/layout/components/main/default/header-nav.ts index 92d43058..37881555 100644 --- a/src/layout/components/main/default/header-nav.ts +++ b/src/layout/components/main/default/header-nav.ts @@ -2,8 +2,9 @@ import defaultCommon from './index'; interface DefaultFooterNav { content: { - color_list: color_list[]; + theme: string; title: string; + bottom_navigation_show: string; }; style: { background_type: string; @@ -22,8 +23,9 @@ interface DefaultFooterNav { } const defaultFooterNav: DefaultFooterNav = { content: { - color_list: [{ color: '#f5f5f5', color_percentage: '' }], + theme: '1', title: '', + bottom_navigation_show: '1' }, style: { background_type: 'color_image', diff --git a/src/layout/components/main/index.vue b/src/layout/components/main/index.vue index fcd07ebf..232247b7 100644 --- a/src/layout/components/main/index.vue +++ b/src/layout/components/main/index.vue @@ -30,7 +30,7 @@
-
+
@@ -137,7 +137,7 @@
-
+
@@ -189,9 +189,15 @@ const top_padding = ref(90); const top_margin = ref(0); const content_style = ref(''); const main_content_style = ref(''); +const bottom_navigation_show = ref(true); watchEffect(() => { - if (page_data.value.com_data) { - const new_style = page_data.value.com_data.style; + const data = page_data.value.com_data; + if (data) { + // 底部按钮显示 + const content = data.content; + bottom_navigation_show.value = content.bottom_navigation_show == '1' ? true: false; + // 通用样式设置 + const new_style = data.style; content_style.value = gradient_computer(new_style.common_style) + background_computer(new_style.common_style); main_content_style.value = padding_computer(new_style.common_style);