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

Merge remote-tracking branch 'origin/dev-yxl' into dev-sws

v1.0.0
sws 2024-09-20 12:07:11 +08:00
parent 6bb537df66 fdbd754f4a
commit cff69545dd
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/common/div-content/index.vue
View File

@ -126,7 +126,7 @@ watch(() => props.diyData, (val) => {
// 模块的class
const model_class = computed(() => {
return (item: { show_tabs: string; key: string; id: string }) => {
return ['plug-in-table', { 'plug-in-border': item.show_tabs == '1', 'float-window': item.key == 'float-window', 'plug-in-animation': item.show_tabs != '1' && props.showModelBorder }];
return ['plug-in-table', { 'plug-in-border': item.show_tabs == '1', 'tabs-view': item.key == 'tabs', 'float-window': item.key == 'float-window', 'plug-in-animation': item.show_tabs != '1' && props.showModelBorder }];
};
});
@ -381,4 +381,7 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri
max-width: 39rem;
overflow: hidden;
}
.tabs-view {
z-index: 4;
}
</style>

5
src/components/model-data-magic/index.vue
View File

@ -19,7 +19,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>
@ -240,11 +240,12 @@ const old_list = ref<any>({});
const data_magic_list = ref<data_magic[]>([]);
watch(props.value.content, (val) => {
const data = cloneDeep(val.data_magic_list);
data.actived_index = 0;
data.forEach((item: data_magic) => {
const data_content = item.data_content;
const data_style = item.data_style;
const key = data_style.carouselKey;
// 指示器设置为0
item.actived_index = 0;
// 指示器样式
data_style.indicator_styles = indicator_style(data_style);
data_style.background_style = background_style(data_style);

4
src/components/model-seckill/index.vue
View File

@ -52,7 +52,7 @@
<div class="flex-col gap-10 w flex-1 jc-sb" :style="content_style">
<div class="flex-col gap-10 w">
<!-- 标题 -->
<div :style="trends_config('title')" class="text-line-2">{{ item.title }}</div>
<div v-if="is_show('title')" :style="trends_config('title')" class="text-line-2">{{ item.title }}</div>
<!-- 进度条 -->
<!-- <div v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
<div class="re flex-1">
@ -113,7 +113,7 @@
<div class="flex-col gap-10 w flex-1 jc-sb" :style="content_style">
<div class="flex-col gap-10 w">
<!-- 标题 -->
<div :style="trends_config('title')" class="text-line-2">{{ item.title }}</div>
<div v-if="is_show('title')" :style="trends_config('title')" class="text-line-2">{{ item.title }}</div>
<!-- 进度条 -->
<div v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
<div class="re flex-1">

2
src/components/model-tabs/model-tabs-styles.vue
View File

@ -31,7 +31,7 @@
</card-container>
</el-form>
<div class="divider-line"></div>
<common-styles :value="form.common_style" @update:value="common_styles_update" />
<common-styles :value="form.common_style" :is-floating-up="false" @update:value="common_styles_update" />
</div>
</template>
<script setup lang="ts">