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-06 18:42:22 +08:00
parent 1c28ed6347 ec9ec46ceb
commit d4a701cd7f
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@
<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>
<div v-if="form.is_right_button == 'show'" class="size-12"><el-icon class="iconfont icon-arrow-right" :color="new_style.button_color || '#999'"></el-icon></div>
<div v-if="form.is_right_button == '1'" class="size-12"><el-icon class="iconfont icon-arrow-right" :color="new_style.button_color || '#999'"></el-icon></div>
</div>
</template>
<template v-else>
@ -33,7 +33,7 @@
<template v-else>
<div :style="topic_style" class="pl-6 pr-6 radius-sm">{{ form.title || '公告' }}</div>
</template>
<div v-if="form.is_right_button == 'show'" class="size-12" :style="`color: ${ new_style.button_color || '#999'}`">更多<el-icon class="iconfont icon-arrow-right" :color="new_style.button_color || '#999'"></el-icon></div>
<div v-if="form.is_right_button == '1'" class="size-12" :style="`color: ${ new_style.button_color || '#999'}`">更多<el-icon class="iconfont icon-arrow-right" :color="new_style.button_color || '#999'"></el-icon></div>
</div>
<div v-for="(item, index) in notice_list" :key="index" class="flex" :style="news_style"><span :class="`num one${ index + 1 }`">{{ index + 1 }}</span><div class="break" :style="`color: ${ new_style.news_color }`">{{ item.notice_title }}</div></div>
</div>

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

@ -41,12 +41,9 @@
<card-container>
<div class="mb-12">按钮设置</div>
<el-form-item label="右侧按钮">
<el-radio-group v-model="form.is_right_button">
<el-radio value="show">显示</el-radio>
<el-radio value="hidden">隐藏</el-radio>
</el-radio-group>
<el-switch v-model="form.is_right_button" active-value="1" inactive-value="0"></el-switch>
</el-form-item>
<el-form-item v-if="is_card && form.is_right_button != 'hidden'" label="链接">
<el-form-item v-if="is_card && form.is_right_button != '0'" label="链接">
<url-value v-model="form.more_link"></url-value>
</el-form-item>
</card-container>

2
src/views/layout/components/main/default/notice.ts
View File

@ -50,7 +50,7 @@ const defaultSearch: defaultSearch = {
title: '测试标题',
img_src: [],
icon_class: '',
is_right_button: 'show',
is_right_button: '1',
interval_time: 2,
more_link: {},
notice_list: [

11
src/views/layout/components/main/index.scss
View File

@ -366,11 +366,20 @@
}
}
@media screen and (max-width: 1640px) {
.main .acticons .el-button {
width: 8rem;
}
}
@media screen and (max-width: 1560px) {
.siderbar {
width: 32rem;
}
.drawer-container, .layout-toggle-bar {
.drawer-container {
width: 0 !important;
}
.layout-toggle-bar {
display: none;
}
}