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

Merge branch 'dev-yxl' into dev-yxl250227

v1.3.0
于肖磊 2025-03-13 10:14:05 +08:00
parent a0254b5a8c ec1a015c3e
commit 98a2dc11e2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/model-carousel/index.vue
View File

@ -2,7 +2,7 @@
<div class="re" :style="style_container + swiper_bg_style">
<div class="abs top-0 w h" :style="swiper_bg_img_style"></div>
<div class="re" :style="style_img_container + (!isEmpty(swiper_bg_img_style) ? `background-image: url('');` : '')">
<div ref="swiperSize" class="swiper-container w h oh">
<div ref="swiperSize" class="swiper-container w h oh" :style="swiper_img_style">
<swiper
:key="carouselKey"
:class="[`swiper-right-${swiper_style.slidesPerView}`, {'swiper-card': interval_types}]"
@ -100,7 +100,8 @@ const style_img_container = computed(() => props.isCommon ? common_img_computer(
const autoplay = ref<boolean | object>(false)
// 图片的设置
const img_style = computed(() => radius_computer(new_style.value) );
const img_style = computed(() => form.value.carousel_type == 'inherit' ? '' : radius_computer(new_style.value) );
const swiper_img_style = computed(() => form.value.carousel_type == 'inherit' ? radius_computer(new_style.value) : '');
//#region 指示器处理
// 指示器选中样式
const actived_color = computed(() => new_style.value?.actived_color || '#2A94FF' );

6
src/components/page-settings/page-content.vue
View File

@ -57,6 +57,12 @@
<el-checkbox v-for="item in base_list.list_show_list.filter((item) => item.type.includes(form.theme))" :key="item.value" :value="item.value">{{ item.name }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="返回按钮">
<div class="flex-row align-c gap-10">
<el-switch v-model="form.is_left_back_btn_show" active-value="1" inactive-value="0"></el-switch>
<tooltip content="当从其他页面进入时有效"></tooltip>
</div>
</el-form-item>
</card-container>
<template v-if="['4', '5'].includes(form.theme)">
<div class="bg-f5 divider-line" />

2
src/config/const/header-nav.ts
View File

@ -23,6 +23,7 @@ interface DefaultFooterNav {
title: string;
link: object;
data_alone_row_value: string[];
is_left_back_btn_show: string;
indicator_location: string;
bottom_navigation_show: string;
positioning_name: string;
@ -126,6 +127,7 @@ const defaultFooterNav: DefaultFooterNav = {
link: {},
// 换行内容
data_alone_row_value: [],
is_left_back_btn_show: '1',
// 对齐方式
indicator_location: 'center',
// 右侧图标信息