sileya-ai
/
vr-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改内容显示

v1.0.0
于肖磊 2024-10-17 16:59:41 +08:00
parent e361e314c6
commit 3140e214a9
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/page-settings/index.vue
View File

@ -27,7 +27,7 @@
</div> </div>
</div> </div>
<div v-else-if="['4', '5'].includes(form.theme)" class="flex-1 flex-row align-c h gap-10"> <div v-else-if="['4', '5'].includes(form.theme)" class="flex-1 flex-row align-c h gap-10">
<div class="flex-1 flex-row gap-2" :style="'color:' + new_style.position_color"> <div class="flex-row gap-2 align-c" :style="'color:' + new_style.position_color">
<template v-if="form.is_location_left_icon_show == '1'"> <template v-if="form.is_location_left_icon_show == '1'">
<image-empty v-if="form.location_left_img.length > 0" v-model="form.location_left_img[0]" fit="contain" :error-img-style="'width: 12px; height:12px'"></image-empty> <image-empty v-if="form.location_left_img.length > 0" v-model="form.location_left_img[0]" fit="contain" :error-img-style="'width: 12px; height:12px'"></image-empty>
<icon v-else :name="form.location_left_icon" size="12"></icon> <icon v-else :name="form.location_left_icon" size="12"></icon>
@ -170,10 +170,15 @@ const position_class = computed(() => (form.value?.indicator_location == 'center
.location-name { .location-name {
line-height: 3.2rem; line-height: 3.2rem;
max-width: 15rem; max-width: 15rem;
width: 100%;
flex-basis: content;
flex-shrink: 1;
} }
:deep(.el-image) { :deep(.el-image) {
width: 100%; width: 100%;
max-height: 3.2rem; height: 2.8rem;
flex-basis: content;
flex-shrink: 1;
} }
} }
} }

10
src/views/layout/components/main/index.vue
View File

@ -167,16 +167,22 @@ watchEffect(() => {
main_content_style.value = padding_computer(new_style.common_style); main_content_style.value = padding_computer(new_style.common_style);
const { immersive_style, up_slide_display } = new_style; const { immersive_style, up_slide_display, data_alone_row_space } = new_style;
// 不开启沉浸式 和 上滑显示 // 不开启沉浸式 和 上滑显示
if (immersive_style == '1' || up_slide_display != '1') { if (immersive_style == '1' || up_slide_display != '1') {
top_padding.value = 0; top_padding.value = 0;
} else if (content.data_alone_row_value.length > 0) {
top_padding.value = 90 + 32 + data_alone_row_space;
} else { } else {
top_padding.value = 90; top_padding.value = 90;
} }
// 开启沉浸式并且没有开通上滑显示 // 开启沉浸式并且没有开通上滑显示
if (immersive_style == '1' && up_slide_display != '1') { if (immersive_style == '1' && up_slide_display != '1') {
top_margin.value = -90; if (content.data_alone_row_value.length > 0) {
top_margin.value = -90 - 32 - data_alone_row_space;
} else {
top_margin.value = -90;
}
} else { } else {
top_margin.value = 0; top_margin.value = 0;
} }