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-10-22 19:16:48 +08:00
parent d24693080f a7f6c50e7c
commit b93c385cc1
5 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/model-notice/index.vue
View File

@ -13,12 +13,12 @@
</div> </div>
</template> </template>
<template v-else> <template v-else>
<div :style="topic_style" class="pl-6 pr-6 radius-sm">{{ form.title || '公告' }}</div> <div :style="topic_style" class="pl-6 pr-6 radius-sm">{{ form.title }}</div>
</template> </template>
<el-carousel :key="carouselKey" class="flex-1" indicator-position="none" :interval="interval_time" arrow="never" :direction="direction_type" :autoplay="true"> <el-carousel :key="carouselKey" class="flex-1" indicator-position="none" :interval="interval_time" arrow="never" :direction="direction_type" :autoplay="true">
<el-carousel-item v-for="(item, index) in notice_list" :key="index" :style="`${news_style} color: ${new_style.news_color}`">{{ item.notice_title }}</el-carousel-item> <el-carousel-item v-for="(item, index) in notice_list" :key="index" class="text-line-1" :style="`${news_style} color: ${new_style.news_color}`">{{ item.notice_title }}</el-carousel-item>
</el-carousel> </el-carousel>
<div v-if="form.is_right_button == '1'" class="size-12"><icon name="arrow-right" :color="new_style.button_color || '#999'"></icon></div> <div v-if="form.is_right_button == '1'" :style="`color: ${new_style.right_button_color}; font-size: ${ new_style.right_button_size }px`">{{ form.right_title }}<icon name="arrow-right" :color="new_style.right_button_color || '#999'"></icon></div>
</div> </div>
</div> </div>
</template> </template>
@ -35,9 +35,9 @@
</template> </template>
</template> </template>
<template v-else> <template v-else>
<div :style="topic_style" class="pl-6 pr-6 radius-sm">{{ form.title || '公告' }}</div> <div :style="topic_style" class="pl-6 pr-6 radius-sm">{{ form.title }}</div>
</template> </template>
<div v-if="form.is_right_button == '1'" class="size-12" :style="`color: ${new_style.button_color || '#999'}`">更多<icon name="arrow-right" :color="new_style.button_color || '#999'"></icon></div> <div v-if="form.is_right_button == '1'" :style="`color: ${ new_style.right_button_color }; font-size: ${ new_style.right_button_size }px`">{{ form.right_title }}<icon name="arrow-right" :color="new_style.right_button_color || '#999'"></icon></div>
</div> </div>
<div v-for="(item, index) in notice_list" :key="index" class="flex align-c" :style="news_style"> <div v-for="(item, index) in notice_list" :key="index" class="flex align-c" :style="news_style">
<span :class="`num one${index + 1}`">{{ index + 1 }}</span> <span :class="`num one${index + 1}`">{{ index + 1 }}</span>
@ -182,7 +182,7 @@ watchEffect(() => {
line-height: 4.4rem; line-height: 4.4rem;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; // white-space: nowrap;
} }
} }
} }

11
src/components/model-notice/model-notice-content.vue
View File

@ -43,9 +43,14 @@
<el-form-item label="右侧按钮"> <el-form-item label="右侧按钮">
<el-switch v-model="form.is_right_button" active-value="1" inactive-value="0"></el-switch> <el-switch v-model="form.is_right_button" active-value="1" inactive-value="0"></el-switch>
</el-form-item> </el-form-item>
<el-form-item v-if="form.is_right_button != '0'" label="链接"> <template v-if="form.is_right_button != '0'">
<url-value v-model="form.more_link"></url-value> <el-form-item label="右侧文字">
</el-form-item> <el-input v-model="form.right_title" placeholder="请输入标题" clearable></el-input>
</el-form-item>
<el-form-item label="链接">
<url-value v-model="form.more_link"></url-value>
</el-form-item>
</template>
</card-container> </card-container>
<div class="bg-f5 divider-line" /> <div class="bg-f5 divider-line" />
<card-container> <card-container>

13
src/components/model-notice/model-notice-styles.vue
View File

@ -37,14 +37,21 @@
</el-form-item> </el-form-item>
</template> </template>
</template> </template>
<el-form-item label="右侧按钮">
<color-picker v-model="form.button_color" default-color="#999"></color-picker>
</el-form-item>
<el-form-item label="内容标题"> <el-form-item label="内容标题">
<color-text-size-group v-model:color="form.news_color" v-model:typeface="form.news_typeface" v-model:size="form.news_size" default-color="#000000"></color-text-size-group> <color-text-size-group v-model:color="form.news_color" v-model:typeface="form.news_typeface" v-model:size="form.news_size" default-color="#000000"></color-text-size-group>
</el-form-item> </el-form-item>
</card-container> </card-container>
<div class="bg-f5 divider-line" /> <div class="bg-f5 divider-line" />
<card-container>
<div class="mb-12">更多设置</div>
<el-form-item label="按钮颜色">
<color-picker v-model="form.right_button_color" default-color="#999"></color-picker>
</el-form-item>
<el-form-item label="按钮文字">
<slider v-model="form.right_button_size" :max="100"></slider>
</el-form-item>
</card-container>
<div class="bg-f5 divider-line" />
<card-container> <card-container>
<div class="mb-12">容器设置</div> <div class="mb-12">容器设置</div>
<template v-if="substance.notice_style === 'inherit'"> <template v-if="substance.notice_style === 'inherit'">

9
src/config/const/notice.ts
View File

@ -15,13 +15,15 @@ interface defaultSearch {
direction: string; direction: string;
img_src: uploadList[]; img_src: uploadList[];
icon_class: string; icon_class: string;
right_title: string;
more_link: object; more_link: object;
interval_time: number; interval_time: number;
is_right_button: string; is_right_button: string;
notice_list: carousel_list[]; notice_list: carousel_list[];
}; };
style: { style: {
button_color: string; right_button_color: string;
right_button_size: number;
news_color: string; news_color: string;
news_typeface: string; news_typeface: string;
news_size: number; news_size: number;
@ -50,12 +52,12 @@ const defaultSearch: defaultSearch = {
title_type: 'img-icon', title_type: 'img-icon',
title: '测试标题', title: '测试标题',
img_src: [], img_src: [],
// 滚动方式 // 滚动方式
direction: 'vertical', direction: 'vertical',
interval_time: 3, interval_time: 3,
// 更多配置 // 更多配置
is_right_button: '1', is_right_button: '1',
right_title: '',
more_link: {}, more_link: {},
icon_class: '', icon_class: '',
// 公告内容 // 公告内容
@ -92,7 +94,8 @@ const defaultSearch: defaultSearch = {
title_height: 24, title_height: 24,
icon_size: 12, icon_size: 12,
icon_color: '#999', icon_color: '#999',
button_color: '#999', right_button_color: '#999',
right_button_size: 12,
// 容器高度 // 容器高度
container_height: 44, container_height: 44,
// 容器信息 // 容器信息

2
src/views/layout/components/main/index.vue
View File

@ -165,7 +165,7 @@ const set_padding_top_value = () => {
} else { } else {
if (index === padding_top_index && item.key !== 'float-window') { if (index === padding_top_index && item.key !== 'float-window') {
item.com_data.style.common_style.padding_top_safe_value = common_store.header_height; item.com_data.style.common_style.padding_top_safe_value = common_store.header_height;
} else { } else if (item.key !== 'float-window') {
item.com_data.style.common_style.padding_top_safe_value = 0; item.com_data.style.common_style.padding_top_safe_value = 0;
} }
} }