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/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,鼠标拖拽左侧圆点可调整导航顺序
+
+
+
-
-
+
+
@@ -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(''); @@ -166,7 +170,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 +218,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 +436,7 @@ const scroll = () => { const scoll_top = ref(0); const on_scroll_event = (e: any) => { scoll_top.value = e.target.scrollTop; -} +}; //#endregion //#region 页面设置 导出 导入 // 在组件挂载时默认执行