From 0c107a1c45c64d48e9fb45fe5db082415fb63620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Thu, 5 Sep 2024 11:34:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AE=BE=E7=BD=AE=E5=92=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2true=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/model-search/index.vue | 12 ++++---- .../model-search/model-search-content.vue | 18 +++++------ src/components/page-settings/index.vue | 4 +-- src/components/page-settings/page-content.vue | 4 +-- src/components/page-settings/page-setting.vue | 12 ++++---- src/components/page-settings/page-styles.vue | 8 ++--- .../components/main/default/header-nav.ts | 30 +++++++++---------- .../layout/components/main/default/search.ts | 16 +++++----- src/views/layout/components/main/index.vue | 4 +-- 9 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/components/model-search/index.vue b/src/components/model-search/index.vue index 9e01d525..da583d4b 100644 --- a/src/components/model-search/index.vue +++ b/src/components/model-search/index.vue @@ -3,7 +3,7 @@
-
-
{{ form.positioning_name }}
+
{{ form.positioning_name }}
diff --git a/src/components/page-settings/page-setting.vue b/src/components/page-settings/page-setting.vue index bf192cdb..437cbcc2 100644 --- a/src/components/page-settings/page-setting.vue +++ b/src/components/page-settings/page-setting.vue @@ -28,14 +28,14 @@ const default_data = { header_background_title_typeface: '500', header_background_title_size: 16, function_buttons_type: 'black', - immersive_style: false, - up_slide_display: true, + immersive_style: '0', + up_slide_display: '1', icon_color: '#ccc', button_inner_color: '#fff', - color_list: [{ color: '#FF973D', color_percentage: undefined }, { color: '#FF3131', color_percentage: undefined }], - direction: '90deg', - background_img_style: '', - background_img: [], + search_botton_color_list: [{ color: '#FF973D', color_percentage: undefined }, { color: '#FF3131', color_percentage: undefined }], + search_botton_direction: '90deg', + search_botton_background_img_style: '', + search_botton_background_img: [], search_button_radius: { radius: 16, radius_top_left: 16, diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue index 1334c36b..78abbfe6 100644 --- a/src/components/page-settings/page-styles.vue +++ b/src/components/page-settings/page-styles.vue @@ -43,14 +43,14 @@ - 开启 - 关闭 + 开启 + 关闭 - 保留 - 关闭 + 保留 + 关闭 diff --git a/src/views/layout/components/main/default/header-nav.ts b/src/views/layout/components/main/default/header-nav.ts index cf6f9112..ce9cbc86 100644 --- a/src/views/layout/components/main/default/header-nav.ts +++ b/src/views/layout/components/main/default/header-nav.ts @@ -14,17 +14,17 @@ interface DefaultFooterNav { indicator_location: string; bottom_navigation_show: string; positioning_name: string; - is_arrows_show: boolean; - is_center: boolean; - is_icon_show: boolean; + is_arrows_show: string; + is_center: string; + is_icon_show: string; icon_src: string; icon_img: uploadList[]; icon_class: string; search_botton_img: uploadList[]; search_botton_icon: string; - is_tips_show: boolean; + is_tips_show: string; tips: string; - is_search_show: boolean; + is_search_show: string; search_type: string; search_tips: string; hot_word_list: hot_word_list[]; @@ -39,8 +39,8 @@ interface DefaultFooterNav { header_background_title_typeface: string, header_background_title_size: number, function_buttons_type: string, - immersive_style: boolean, - up_slide_display: boolean, + immersive_style: string, + up_slide_display: string, icon_color: string; button_inner_color: string; search_botton_color_list: color_list[]; @@ -63,17 +63,17 @@ const defaultFooterNav: DefaultFooterNav = { link: {}, indicator_location: 'center', positioning_name: '默认定位名称', - is_arrows_show: true, - is_center: false, - is_icon_show: true, + is_arrows_show: '1', + is_center: '0', + is_icon_show: '1', icon_src: '', icon_img: [], icon_class: '', search_botton_img: [], search_botton_icon: '', - is_tips_show: true, + is_tips_show: '1', tips: '请输入搜索内容', - is_search_show: false, + is_search_show: '0', search_type: 'text', search_tips: '搜索', hot_word_list: [ @@ -95,8 +95,8 @@ const defaultFooterNav: DefaultFooterNav = { header_background_title_typeface: '500', header_background_title_size: 16, function_buttons_type: 'black', - immersive_style: false, - up_slide_display: true, + immersive_style: '0', + up_slide_display: '1', icon_color: '#ccc', button_inner_color: '#fff', search_botton_color_list: [{ color: '#FF973D', color_percentage: undefined }, { color: '#FF3131', color_percentage: undefined }], @@ -112,7 +112,7 @@ const defaultFooterNav: DefaultFooterNav = { }, tips_color: '#ccc', hot_words_color: '#000', - search_border: '#fff', + search_border: '#E4E4E4', search_border_radius: { radius: 16, radius_top_left: 16, diff --git a/src/views/layout/components/main/default/search.ts b/src/views/layout/components/main/default/search.ts index 7e4b6d31..e4ce630a 100644 --- a/src/views/layout/components/main/default/search.ts +++ b/src/views/layout/components/main/default/search.ts @@ -7,16 +7,16 @@ interface hot_word_list { } interface defaultSearch { content: { - is_center: boolean; - is_icon_show: boolean; + is_center: string; + is_icon_show: string; icon_src: string; icon_img: uploadList[]; icon_class: string; search_botton_img: uploadList[]; search_botton_icon: string; - is_tips_show: boolean; + is_tips_show: string; tips: string; - is_search_show: boolean; + is_search_show: string; search_type: string; search_tips: string; hot_word_list: hot_word_list[]; @@ -38,16 +38,16 @@ interface defaultSearch { } const defaultSearch: defaultSearch = { content: { - is_center: false, - is_icon_show: true, + is_center: '0', + is_icon_show: '1', icon_src: '', icon_img: [], icon_class: '', search_botton_img: [], search_botton_icon: '', - is_tips_show: true, + is_tips_show: '1', tips: '请输入搜索内容', - is_search_show: false, + is_search_show: '0', search_type: 'text', search_tips: '搜索', hot_word_list: [ diff --git a/src/views/layout/components/main/index.vue b/src/views/layout/components/main/index.vue index 1faa3267..5b15037d 100644 --- a/src/views/layout/components/main/index.vue +++ b/src/views/layout/components/main/index.vue @@ -223,13 +223,13 @@ watchEffect(() => { const { immersive_style, up_slide_display } = new_style; // 不开启沉浸式 和 上滑显示 - if (immersive_style || !up_slide_display) { + if (immersive_style == '1' || up_slide_display != '1') { top_padding.value = 0; } else { top_padding.value = 90; } // 开启沉浸式并且没有开通上滑显示 - if (immersive_style && !up_slide_display) { + if (immersive_style == '1' && up_slide_display != '1') { top_margin.value = -90; } else { top_margin.value = 0;