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-18 15:17:57 +08:00
parent 0cacc341fc 2ee47d7b93
commit 34926ce1b9
9 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/common/tabs-view/index.vue
View File

@ -16,7 +16,7 @@
</div>
</template>
</div>
<icon v-if="isTabs" :name="new_style.more_icon_class || 'fenlei-more'" :size="new_style.more_icon_size + '' || '14'" :color="new_style.more_icon_color || '#000'"></icon>
<icon v-if="isTabs" :name="new_style.more_icon_class || 'category-more'" :size="new_style.more_icon_size + '' || '14'" :color="new_style.more_icon_color || '#000'"></icon>
</div>
</template>

23
src/components/model-article-list/index.vue
View File

@ -11,7 +11,10 @@
<template v-else> <image-empty v-model="item.data.cover" class="img" :style="img_radius" :error-img-style="error_img"></image-empty> </template>
</template>
<div class="jc-sb flex-1" :class="article_theme == '3' ? 'flex-row align-c' : 'flex-col'" :style="article_theme != '0' ? content_padding : ''">
<div class="title" :class="article_theme == '3' ? 'text-line-1 flex-1 flex-width' : 'text-line-2'" :style="article_name">{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}</div>
<div class="flex-col" :class="article_theme == '3' ? 'flex-1 flex-width' : ''" :style="'gap:' + new_style.name_desc_space + 'px;'">
<div class="title" :class="article_theme == '3' ? 'text-line-1' : 'text-line-2'" :style="article_name">{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}</div>
<div v-if="field_show.includes('2')" class="desc text-line-1" :style="article_desc">{{ item.data.describe || '' }}</div>
</div>
<div class="flex-row jc-sb gap-8" :class="article_theme == '3' ? 'ml-10' : 'align-e mt-10'">
<div :style="article_date">{{ field_show.includes('0') ? (!is_obj_empty(item.data) ? item.data.add_time : '2020-06-05 15:20') : '' }}</div>
<div v-show="field_show.includes('1')" class="flex-row align-c gap-3" :style="article_page_view">
@ -33,7 +36,10 @@
</template>
<template v-else> <image-empty v-model="item.data.cover" class="img" :style="img_radius" :error-img-style="error_img"></image-empty> </template>
<div class="jc-sb flex-1 flex-col" :style="article_theme != '0' ? content_padding : ''">
<div class="title text-line-2" :style="article_name">{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}</div>
<div class="flex-col" :style="'gap:' + new_style.name_desc_space + 'px;'">
<div class="title text-line-2" :style="article_name">{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}</div>
<div v-if="field_show.includes('2')" class="desc text-line-1" :style="article_desc">{{ item.data.describe || '' }}</div>
</div>
<div class="flex-row jc-sb gap-8 align-e mt-10">
<div :style="article_date">{{ field_show.includes('0') ? (!is_obj_empty(item.data) ? item.data.add_time : '2020-06-05 15:20') : '' }}</div>
<div v-show="field_show.includes('1')" class="flex-row align-c gap-3" :style="article_page_view">
@ -80,6 +86,7 @@ interface dataObj {
add_time?: string;
access_count?: string;
title?: string;
describe?: string;
}
interface ArticleList {
id: number | string;
@ -95,6 +102,8 @@ const article_theme = ref('0');
const field_show = ref(['0', '1']);
// 文章
const article_name = ref('');
// 文章描述
const article_desc = ref('');
// 日期
const article_date = ref('');
// 浏览量
@ -126,6 +135,11 @@ const carousel_key = ref('0');
const interval_time = ref(2000);
// 轮播图是否滚动
const is_roll = ref(1);
// 内容
const new_content = computed(() => props.value?.content || {});
// 样式
const new_style = computed(() => props.value?.style || {});
// 获取自动数据
const get_auto_data_list = async () => {
const { category_ids, number, order_by_type, order_by_rule, is_cover } = new_content.value;
@ -159,10 +173,6 @@ const get_auto_data_list = async () => {
data_list.value = Array(4).fill(default_data_list);
}
};
// 内容
const new_content = computed(() => props.value?.content || {});
// 样式
const new_style = computed(() => props.value?.style || {});
onMounted(() => {
// 判断数据类型是选择文章且数据不为空
if (new_content.value.data_type == '0' && !isEmpty(new_content.value.data_list)) {
@ -233,6 +243,7 @@ watch(
field_show.value = new_content.field_show;
// 样式
article_name.value = 'font-size:' + new_style.name_size + 'px;' + 'font-weight:' + new_style.name_weight + ';' + 'color:' + new_style.name_color + ';';
article_desc.value = 'font-size:' + new_style.desc_size + 'px;' + 'color:' + new_style.desc_color + ';';
article_date.value = 'font-size:' + new_style.time_size + 'px;' + 'font-weight:' + new_style.time_weight + ';' + 'color:' + new_style.time_color + ';';
article_page_view.value = 'font-size:' + new_style.page_view_size + 'px;' + 'font-weight:' + new_style.page_view_weight + ';' + 'color:' + new_style.page_view_color + ';';
content_radius.value = radius_computer(new_style.content_radius);

1
src/components/model-article-list/model-article-list-content.vue
View File

@ -131,6 +131,7 @@ const base_list = reactive({
field_show_list: [
{ name: '日期时间', value: '0' },
{ name: '浏览量', value: '1' },
{ name: '描述', value: '2' },
],
});
onMounted(() => {

7
src/components/model-article-list/model-article-list-styles.vue
View File

@ -6,6 +6,13 @@
<el-form-item label="文章名称">
<color-text-size-group v-model:color="form.name_color" v-model:typeface="form.name_weight" v-model:size="form.name_size"></color-text-size-group>
</el-form-item>
<el-form-item label="文章描述">
<color-text-size-group v-model:color="form.desc_color" v-model:size="form.desc_size" :type-list="['color', 'size']">
<el-form-item label="间距" label-width="40" class="mb-0 w form-item-child-label">
<slider v-model="form.name_desc_space" :max="100"></slider>
</el-form-item>
</color-text-size-group>
</el-form-item>
<el-form-item label="日期时间">
<color-text-size-group v-model:color="form.time_color" v-model:typeface="form.time_weight" v-model:size="form.time_size"></color-text-size-group>
</el-form-item>

1
src/components/model-article-tabs/model-article-tabs-content.vue
View File

@ -156,6 +156,7 @@ const base_list = reactive({
field_show_list: [
{ name: '日期时间', value: '0' },
{ name: '浏览量', value: '1' },
{ name: '描述', value: '2' },
],
});
onMounted(() => {

7
src/components/model-article-tabs/model-article-tabs-styles.vue
View File

@ -26,6 +26,13 @@
<el-form-item label="文章名称">
<color-text-size-group v-model:color="form.name_color" v-model:typeface="form.name_weight" v-model:size="form.name_size"></color-text-size-group>
</el-form-item>
<el-form-item label="文章描述">
<color-text-size-group v-model:color="form.desc_color" v-model:size="form.desc_size" :type-list="['color', 'size']">
<el-form-item label="间距" label-width="40" class="mb-0 w form-item-child-label">
<slider v-model="form.name_desc_space"></slider>
</el-form-item>
</color-text-size-group>
</el-form-item>
<el-form-item label="日期时间">
<color-text-size-group v-model:color="form.time_color" v-model:typeface="form.time_weight" v-model:size="form.time_size"></color-text-size-group>
</el-form-item>

6
src/config/const/article-list.ts
View File

@ -27,6 +27,9 @@ interface DefaultArticleList {
name_weight: string;
name_size: number;
name_color: string;
desc_color: string;
desc_size: number;
name_desc_space: number;
time_weight: string;
time_size: number;
time_color: string;
@ -63,6 +66,9 @@ const defaultArticleList: DefaultArticleList = {
name_weight: '500',
name_size: 14,
name_color: 'rgba(51, 51, 51, 1)',
desc_color: '#999',
desc_size: 12,
name_desc_space: 4,
time_weight: '400',
time_size: 12,
time_color: 'rgba(153, 153, 153, 1)',

6
src/config/const/article-tabs.ts
View File

@ -44,6 +44,9 @@ interface DefaultArticleTabs {
name_weight: string;
name_size: number;
name_color: string;
desc_color: string;
desc_size: number;
name_desc_space: number;
time_weight: string;
time_size: number;
time_color: string;
@ -95,6 +98,9 @@ const defaultArticleTabs: DefaultArticleTabs = {
name_weight: '500',
name_size: 14,
name_color: 'rgba(51, 51, 51, 1)',
desc_color: '#999',
desc_size: 12,
name_desc_space: 4,
time_weight: '400',
time_size: 12,
time_color: 'rgba(153, 153, 153, 1)',

2
src/config/const/tabs.ts
View File

@ -59,7 +59,7 @@ const defaultTabs: defaultTabs = {
tabs_size: 14,
tabs_color: 'rgba(51,51,51,1)',
tabs_spacing: 20,
more_icon_class: 'fenlei-more',
more_icon_class: 'category-more',
more_icon_color: '#000',
more_icon_size: 14,
common_style: {