Merge branch 'dev-sws' into dev-yxl

v1.0.0
于肖磊 2024-08-27 10:53:53 +08:00
commit c88024924d
2 changed files with 9 additions and 3 deletions

View File

@ -85,7 +85,7 @@ const article_style = ref({});
const default_data_list: ArticleList = {
id: 0,
data: {},
new_title: '测试标题',
new_title: '测试文章标题',
new_cover: [],
};
watch(
@ -129,6 +129,8 @@ watch(
} else if (article_theme.value == '1') {
article_spacing_children.value = `width: calc(50% - ${new_style.article_spacing / 2}px);`;
article_style.value += article_spacing_children.value + content_radius.value;
} else if (article_theme.value == '2') {
article_style.value += content_radius.value;
} else if (article_theme.value == '3') {
style.value = `padding: 0 ${new_style.content_spacing}px;background:#fff;` + content_radius.value;
} else if (article_theme.value == '4') {

View File

@ -1,8 +1,12 @@
<template>
<div :style="style_container">
<div class="video re" :style="style">
<image-empty v-if="!video_img" v-model="video_img" error-img-style="width:60px;height:60px;"></image-empty>
<video :src="video" :poster="video_img" class="w h"></video>
<template v-if="video && !video_img">
<video :src="video" class="w h"></video>
</template>
<template v-else>
<image-empty v-model="video_img" error-img-style="width:60px;height:60px;"></image-empty>
</template>
<img src="@/assets/images/components/model-video/video.png" class="middle box-shadow-sm round" width="60" height="60" />
</div>
</div>