From 09dadd4578bf8fedc5ef8c8c7f8b42fb96cfe702 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Sat, 12 Oct 2024 10:35:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=E5=BA=95=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E2=80=94=E2=80=94=E2=80=94=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=88=B0=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../footer-nav/footer-nav-content.vue | 34 +++++++++++++++---- .../footer-nav/footer-nav-setting.vue | 2 +- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/components/footer-nav/footer-nav-content.vue b/src/components/footer-nav/footer-nav-content.vue index 99120500..478b3eae 100644 --- a/src/components/footer-nav/footer-nav-content.vue +++ b/src/components/footer-nav/footer-nav-content.vue @@ -21,7 +21,10 @@
导航内容
-
恢复默认
+
+
同步到系统
+
恢复默认
+
图片建议宽高80*80,鼠标拖拽左侧圆点可调整导航顺序
@@ -56,12 +59,18 @@ - + From 0966a3150b252a560e5ac6d2f45b73fc8601e5bb Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Sat, 12 Oct 2024 10:48:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?1.=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/const/header-nav.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/const/header-nav.ts b/src/config/const/header-nav.ts index 50c2ba8a..82a173d9 100644 --- a/src/config/const/header-nav.ts +++ b/src/config/const/header-nav.ts @@ -78,7 +78,7 @@ const defaultFooterNav: DefaultFooterNav = { is_icon_show: '1', icon_src: {}, icon_img: [], - icon_class: '', + icon_class: 'search', search_botton_img: [], search_botton_icon: '', is_tips_show: '1', From 399063d3b0e904b7eab4e157b552666f7dd839db Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Sat, 12 Oct 2024 11:51:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1.head=E8=A7=A3=E5=86=B3=E6=8A=96=E5=8A=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E8=A7=A3=E5=86=B3head=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=9B=96=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/div-content/index.vue | 29 ++++++++++++--------- src/components/page-settings/index.vue | 13 ++++++--- src/views/layout/components/main/index.scss | 13 +++++---- src/views/layout/components/main/index.vue | 6 ++--- 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/src/components/common/div-content/index.vue b/src/components/common/div-content/index.vue index 934d9c83..240b2628 100644 --- a/src/components/common/div-content/index.vue +++ b/src/components/common/div-content/index.vue @@ -3,7 +3,7 @@
- +
@@ -118,13 +118,17 @@ const props = withDefaults(defineProps(), { diyData: () => [], showModelBorder: false, isTabs: false, - mainContentStyle: '' + mainContentStyle: '', }); const diy_data = ref(props.diyData); -watch(() => props.diyData, (val) => { - diy_data.value = val; -}, {immediate: true, deep: true}); +watch( + () => props.diyData, + (val) => { + diy_data.value = val; + }, + { immediate: true, deep: true } +); // 模块的class const model_class = computed(() => { @@ -137,11 +141,11 @@ interface com_data { style: { common_style: { floating_up: number; - } - } + }; + }; } const model_style = computed(() => { - return (item: { id: string; key: string, com_data: com_data }) => { + return (item: { id: string; key: string; com_data: com_data }) => { // 40是容器的上下间距， 60是顶部的高度 const container_height = window.innerHeight - 100; let bottom = 0; @@ -167,7 +171,7 @@ const model_style = computed(() => { if (item.com_data.style.common_style?.floating_up != 0) { z_index = `z-index: 1`; } - return item.key == 'float-window' ? `bottom: ${((bottom / window.innerHeight) * 100).toFixed(4) + '%'};` : `margin-top: -${ item.com_data.style.common_style?.floating_up || 0 }px;${ z_index };`; + return item.key == 'float-window' ? `bottom: ${((bottom / window.innerHeight) * 100).toFixed(4) + '%'};` : `margin-top: -${item.com_data.style.common_style?.floating_up || 0}px;${z_index};`; }; }); @@ -278,11 +282,10 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri .plug-in-border::before { content: ''; width: calc(100% + 0.4rem); - height: calc(100% + 0.4rem); + height: 100%; position: absolute; - top: -0.2rem; + top: 0; left: -0.2rem; - // z-index: 1; border: 0.2rem solid $cr-main; } .plug-in-animation { @@ -387,4 +390,4 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri .tabs-view { z-index: 2; } - \ No newline at end of file + diff --git a/src/components/page-settings/index.vue b/src/components/page-settings/index.vue index 4d39cd0f..5203d4e2 100644 --- a/src/components/page-settings/index.vue +++ b/src/components/page-settings/index.vue @@ -128,7 +128,7 @@ const position_class = computed(() => (form.value?.indicator_location == 'center transform: translateX(-50%); width: 39rem; .roll { - padding-bottom: 0.9rem; + padding-bottom: 1rem; margin: 0 auto; cursor: pointer; z-index: 1; @@ -154,11 +154,18 @@ const position_class = computed(() => (form.value?.indicator_location == 'center } } .page-settings-border { - // border: 0.2rem solid $cr-main; position: relative; - box-shadow: 0px 0 0px 0.2rem $cr-main !important; z-index: 3; box-sizing: border-box; + &::before { + content: ''; + height: 100%; + width: calc(100% + 0.4rem); + position: absolute; + left: -0.2rem; + right: -0.2rem; + border: 0.2rem solid $cr-main; + } } .logo-outer-style { height: 2.8rem; diff --git a/src/views/layout/components/main/index.scss b/src/views/layout/components/main/index.scss index 346d12d3..98cdcc34 100644 --- a/src/views/layout/components/main/index.scss +++ b/src/views/layout/components/main/index.scss @@ -89,7 +89,7 @@ .model-drag { overflow-y: auto; - padding-top: 0.2rem; + // padding-top: 0.2rem; max-height: 84.4rem; height: 100%; &::-webkit-scrollbar { @@ -194,7 +194,8 @@ transform: translateY(-50%); left: 0; z-index: 3; - .layout-toggle-bar-top, .layout-toggle-bar-bottom { + .layout-toggle-bar-top, + .layout-toggle-bar-bottom { position: absolute; width: 0.2rem; border-radius: 0.2rem; @@ -208,7 +209,8 @@ } } .layout-toggle-bar-close:hover { - .layout-toggle-bar-top, .layout-toggle-bar-bottom { + .layout-toggle-bar-top, + .layout-toggle-bar-bottom { background: $cr-main; transition: 1s ease; } @@ -221,7 +223,8 @@ } .layout-toggle-bar-open:hover { - .layout-toggle-bar-top, .layout-toggle-bar-bottom { + .layout-toggle-bar-top, + .layout-toggle-bar-bottom { background: $cr-main; transition: 1s ease; } @@ -255,4 +258,4 @@ .layout-toggle-bar { display: none; } -} \ No newline at end of file +} diff --git a/src/views/layout/components/main/index.vue b/src/views/layout/components/main/index.vue index 1ae50ce3..51a91aa0 100644 --- a/src/views/layout/components/main/index.vue +++ b/src/views/layout/components/main/index.vue @@ -166,7 +166,7 @@ watchEffect(() => { const { immersive_style, up_slide_display } = new_style; // 不开启沉浸式 和 上滑显示 if (immersive_style == '1' || up_slide_display != '1') { - top_padding.value = 2; + top_padding.value = 0; } else { top_padding.value = 90; } @@ -214,7 +214,7 @@ const show_model_border = ref(true); // 点击添加tabs组件 const draggable_click = (item: componentsData) => { const type_data = ['tabs', 'tabs-carousel']; - + if (common_store.is_immersion_model) { ElMessage.error('开启沉浸样式下不可以添加该组件'); return; @@ -432,7 +432,7 @@ const scroll = () => { const scoll_top = ref(0); const on_scroll_event = (e: any) => { scoll_top.value = e.target.scrollTop; -} +}; //#endregion //#region 页面设置 导出 导入 // 在组件挂载时默认执行 From b137eef429f3a0ab0b24bf751f467dedf39b767e Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Sat, 12 Oct 2024 15:52:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E8=83=8C=E6=99=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/page-settings/index.vue | 1 + src/views/layout/components/main/index.scss | 11 ++++++++++- src/views/layout/components/main/index.vue | 8 ++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/components/page-settings/index.vue b/src/components/page-settings/index.vue index 5203d4e2..2442b486 100644 --- a/src/components/page-settings/index.vue +++ b/src/components/page-settings/index.vue @@ -165,6 +165,7 @@ const position_class = computed(() => (form.value?.indicator_location == 'center left: -0.2rem; right: -0.2rem; border: 0.2rem solid $cr-main; + z-index: 2; } } .logo-outer-style { diff --git a/src/views/layout/components/main/index.scss b/src/views/layout/components/main/index.scss index 98cdcc34..ee4c66cd 100644 --- a/src/views/layout/components/main/index.scss +++ b/src/views/layout/components/main/index.scss @@ -95,9 +95,18 @@ &::-webkit-scrollbar { display: none; } + .page-bg { + position: absolute; + left: 50; + background: #f5f5f5; + top: 0; + left: 50%; + transform: translateX(-50%); + width: 39rem; + min-height: 100%; + } .model-wall { width: 39rem; - background: #f5f5f5; margin: 0 auto; min-height: 100%; display: flex; diff --git a/src/views/layout/components/main/index.vue b/src/views/layout/components/main/index.vue index 51a91aa0..7611ee88 100644 --- a/src/views/layout/components/main/index.vue +++ b/src/views/layout/components/main/index.vue @@ -63,10 +63,13 @@
+
+
+
-
-
+
+
@@ -146,6 +149,7 @@ watch( ); const top_padding = ref(90); const top_margin = ref(0); +const model_wall_top = ref(0); const content_style = ref(''); const content_img_style = ref(''); const main_content_style = ref('');