diff --git a/src/components/common/tabs-view/index.vue b/src/components/common/tabs-view/index.vue index bf1b7074..cd1925eb 100644 --- a/src/components/common/tabs-view/index.vue +++ b/src/components/common/tabs-view/index.vue @@ -16,7 +16,7 @@ - + diff --git a/src/components/model-article-list/index.vue b/src/components/model-article-list/index.vue index 1d30ea00..b3d39677 100644 --- a/src/components/model-article-list/index.vue +++ b/src/components/model-article-list/index.vue @@ -11,7 +11,10 @@
-
{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}
+
+
{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}
+
{{ item.data.describe || '' }}
+
{{ field_show.includes('0') ? (!is_obj_empty(item.data) ? item.data.add_time : '2020-06-05 15:20') : '' }}
@@ -33,7 +36,10 @@
-
{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}
+
+
{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}
+
{{ item.data.describe || '' }}
+
{{ field_show.includes('0') ? (!is_obj_empty(item.data) ? item.data.add_time : '2020-06-05 15:20') : '' }}
@@ -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); diff --git a/src/components/model-article-list/model-article-list-content.vue b/src/components/model-article-list/model-article-list-content.vue index eb6b9a78..92d7b762 100644 --- a/src/components/model-article-list/model-article-list-content.vue +++ b/src/components/model-article-list/model-article-list-content.vue @@ -131,6 +131,7 @@ const base_list = reactive({ field_show_list: [ { name: '日期时间', value: '0' }, { name: '浏览量', value: '1' }, + { name: '描述', value: '2' }, ], }); onMounted(() => { diff --git a/src/components/model-article-list/model-article-list-styles.vue b/src/components/model-article-list/model-article-list-styles.vue index 56ec1107..928cb10c 100644 --- a/src/components/model-article-list/model-article-list-styles.vue +++ b/src/components/model-article-list/model-article-list-styles.vue @@ -6,6 +6,13 @@ + + + + + + + diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue index e6888c23..c6949df7 100644 --- a/src/components/model-article-tabs/model-article-tabs-content.vue +++ b/src/components/model-article-tabs/model-article-tabs-content.vue @@ -156,6 +156,7 @@ const base_list = reactive({ field_show_list: [ { name: '日期时间', value: '0' }, { name: '浏览量', value: '1' }, + { name: '描述', value: '2' }, ], }); onMounted(() => { diff --git a/src/components/model-article-tabs/model-article-tabs-styles.vue b/src/components/model-article-tabs/model-article-tabs-styles.vue index 227d954d..d1f73381 100644 --- a/src/components/model-article-tabs/model-article-tabs-styles.vue +++ b/src/components/model-article-tabs/model-article-tabs-styles.vue @@ -26,6 +26,13 @@ + + + + + + + diff --git a/src/config/const/article-list.ts b/src/config/const/article-list.ts index 649fe866..c6421ae8 100644 --- a/src/config/const/article-list.ts +++ b/src/config/const/article-list.ts @@ -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)', diff --git a/src/config/const/article-tabs.ts b/src/config/const/article-tabs.ts index 1227c01f..6311e4e9 100644 --- a/src/config/const/article-tabs.ts +++ b/src/config/const/article-tabs.ts @@ -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)', diff --git a/src/config/const/tabs.ts b/src/config/const/tabs.ts index cbbf6f6e..8e1f0a67 100644 --- a/src/config/const/tabs.ts +++ b/src/config/const/tabs.ts @@ -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: {