Merge remote-tracking branch 'origin/dev-yxl' into dev-sws
commit
d5622d16d4
|
|
@ -48,7 +48,7 @@
|
|||
<template v-else>
|
||||
<magic-carousel :value="item" :content-img-radius="content_img_radius" type="img" :actived="form.style_actived" @carousel_change="carousel_change($event, index)"></magic-carousel>
|
||||
</template>
|
||||
<div v-if="item.data_style.is_show == '1' && item.data_content.list.length > 1" :class="{'dot-center': item.data_style?.indicator_location == 'center', 'dot-right': item.data_style?.indicator_location == 'flex-end' }" class="dot flex abs" :style="`bottom: ${new_style.indicator_bottom}px;`">
|
||||
<div v-if="item.data_style.is_show == '1' && item.data_content.list.length > 1" :class="{'dot-center': item.data_style?.indicator_location == 'center', 'dot-right': item.data_style?.indicator_location == 'flex-end' }" class="dot flex abs" :style="`bottom: ${item.data_style?.indicator_bottom}px;`">
|
||||
<template v-if="item.data_style.indicator_style == 'num'">
|
||||
<div :style="item.data_style.indicator_styles" class="dot-item">
|
||||
<span class="num-active" :style="`color: ${ item.data_style.actived_color }`">{{ item.actived_index + 1 }}</span><span>/{{ item.data_content.list.length }}</span>
|
||||
|
|
@ -340,7 +340,7 @@ const style_container = computed(() => common_styles_computer(new_style.value.co
|
|||
overflow: hidden;
|
||||
}
|
||||
.style9-bottom {
|
||||
width: calc(33% - v-bind(outer_spacing));
|
||||
width: calc((100% / 3) - v-bind(outer_spacing));
|
||||
height: calc(50% - v-bind(outer_spacing));
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
|
|
|
|||
Loading…
Reference in New Issue