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

Merge branch 'dev-sws' into dev-yxl

v1.0.0
于肖磊 2024-10-11 15:28:27 +08:00
parent 1b98824470 8b5f55d5a2
commit 53fbbd1edd
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,9 +26,10 @@
</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-row gap-2"> <div class="flex-row gap-2" :style="'color:' + new_style.position_color">
<icon name="location" size="12" color="0"></icon><span class="size-14 cr-3 text-line-1">{{ form.positioning_name }}</span> <icon name="location" size="12"></icon>
<icon v-if="form.is_arrows_show == '1'" name="arrow-bottom" size="12" color="0"></icon> <span class="size-14 text-line-1">{{ form.positioning_name }}</span>
<icon v-if="form.is_arrows_show == '1'" name="arrow-bottom" size="12"></icon>
</div> </div>
<template v-if="['5'].includes(form.theme)"> <template v-if="['5'].includes(form.theme)">
<div class="flex-1"> <div class="flex-1">
@ -95,18 +96,18 @@ const roll_img_style = computed(() => {
const up_slide_style = computed(() => { const up_slide_style = computed(() => {
let style = ``; let style = ``;
if (props.scollTop > 0) { if (props.scollTop > 20) {
const { up_slide_background_color_list, up_slide_background_direction } = new_style.value; const { up_slide_background_color_list, up_slide_background_direction } = new_style.value;
// 渐变 // 渐变
const gradient = { color_list: up_slide_background_color_list, direction: up_slide_background_direction }; const gradient = { color_list: up_slide_background_color_list, direction: up_slide_background_direction };
style += gradient_computer(gradient) + `opacity: ${props.scollTop / 90 > 1 ? 1 : (props.scollTop / 90).toFixed(2)};`; style += gradient_computer(gradient) + `opacity: ${(props.scollTop - 20) / 90 > 1 ? 1 : ((props.scollTop - 20) / 90).toFixed(2)};`;
} }
return style; return style;
}); });
const up_slide_img_style = computed(() => { const up_slide_img_style = computed(() => {
let style = ``; let style = ``;
if (props.scollTop > 0) { if (props.scollTop > 20) {
const { up_slide_background_img = '', up_slide_background_img_style = '' } = new_style.value; const { up_slide_background_img = '', up_slide_background_img_style = '' } = new_style.value;
// 背景图 // 背景图
const back = { background_img: up_slide_background_img, background_img_style: up_slide_background_img_style }; const back = { background_img: up_slide_background_img, background_img_style: up_slide_background_img_style };

3
src/components/page-settings/page-styles.vue
View File

@ -28,6 +28,9 @@
<el-form-item v-if="['1', '2'].includes(search_content.theme)" label="标题名称"> <el-form-item v-if="['1', '2'].includes(search_content.theme)" label="标题名称">
<color-text-size-group v-model:color="form.header_background_title_color" v-model:typeface="form.header_background_title_typeface" v-model:size="form.header_background_title_size" default-color="#000000"></color-text-size-group> <color-text-size-group v-model:color="form.header_background_title_color" v-model:typeface="form.header_background_title_typeface" v-model:size="form.header_background_title_size" default-color="#000000"></color-text-size-group>
</el-form-item> </el-form-item>
<el-form-item v-if="['4', '5'].includes(search_content.theme)" label="定位颜色">
<color-picker v-model="form.position_color" default-color="#333"></color-picker>
</el-form-item>
<el-form-item v-if="form.header_background_type == 'transparent'" label="沉浸样式"> <el-form-item v-if="form.header_background_type == 'transparent'" label="沉浸样式">
<div class="flex-row align-c gap-10"> <div class="flex-row align-c gap-10">
<el-switch v-model="form.immersive_style" active-value="1" inactive-value="0" :disabled="is_have_tabs" @change="change_immersive_style"></el-switch> <el-switch v-model="form.immersive_style" active-value="1" inactive-value="0" :disabled="is_have_tabs" @change="change_immersive_style"></el-switch>

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

@ -53,6 +53,7 @@ interface DefaultFooterNav {
search_botton_background_img_style: string; search_botton_background_img_style: string;
search_botton_background_img: uploadList[]; search_botton_background_img: uploadList[];
search_button_radius: object; search_button_radius: object;
position_color: string;
img_size: string; img_size: string;
img_space: string; img_space: string;
img_color: string; img_color: string;
@ -120,6 +121,7 @@ const defaultFooterNav: DefaultFooterNav = {
radius_bottom_left: 16, radius_bottom_left: 16,
radius_bottom_right: 16, radius_bottom_right: 16,
}, },
position_color: '#333',
img_size: '23', img_size: '23',
img_space: '15', img_space: '15',
img_color: '#666', img_color: '#666',