diff --git a/src/components/common/product-show-config/index.vue b/src/components/common/product-show-config/index.vue index 481a96d6..42882b3b 100644 --- a/src/components/common/product-show-config/index.vue +++ b/src/components/common/product-show-config/index.vue @@ -6,6 +6,11 @@ {{ item.name }} + + + {{ item.name }} + + @@ -69,6 +74,10 @@ const base_list = { shopping_cart_list: [ { name: '进入商品详情页', value: '0' }, { name: '商品加购', value: '1' } + ], + shopping_simple_desc_row: [ + { name: '一行', value: '1' }, + { name: '两行', value: '2' } ] }; const emit = defineEmits(['change_shop_type']); diff --git a/src/components/model-article-list/index.vue b/src/components/model-article-list/index.vue index 104dea45..7b3c5319 100644 --- a/src/components/model-article-list/index.vue +++ b/src/components/model-article-list/index.vue @@ -20,7 +20,7 @@
{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}
-
{{ item.data.describe || '' }}
+
{{ item.data.describe || '' }}
{{ field_show.includes('0') ? (!is_obj_empty(item.data) ? item.data.add_time : '2020-06-05 15:20') : '' }}
@@ -55,7 +55,7 @@
{{ !isEmpty(item.new_title) ? item.new_title : item.data.title }}
-
{{ item.data.describe || '' }}
+
{{ item.data.describe || '' }}
{{ field_show.includes('0') ? (!is_obj_empty(item.data) ? item.data.add_time : '2020-06-05 15:20') : '' }}
@@ -299,6 +299,7 @@ const float_name_style = computed(() => { let location = 'position:absolute;bottom:0;left:0;right:0;' return gradient_computer(data) + radius_computer(name_bg_radius) + padding_computer(name_bg_padding) + margin_computer(name_bg_margin) + location; }); +const field_desc_row = ref('1'); // 监听value数据变化 watch( () => props.value, @@ -309,7 +310,14 @@ 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;line-height:' + new_style.desc_size + 'px;height:'+ new_style.desc_size + 'px;color:' + new_style.desc_color + ';'; + // 文章描述 + const desc_size = new_style.desc_size; + field_desc_row.value = new_content.field_desc_row; + if (new_content.field_desc_row == '2') { + article_desc.value = 'font-size:' + desc_size + 'px;line-height:' + (desc_size > 0 ? desc_size + 3 : 0 ) + 'px;height:'+ (desc_size > 0 ? (desc_size + 3) * 2 : 0) + 'px;color:' + new_style.desc_color + ';'; + } else { + article_desc.value = 'font-size:' + desc_size + 'px;line-height:' + desc_size + 'px;height:'+ 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 ed020b56..d6b6c69d 100644 --- a/src/components/model-article-list/model-article-list-content.vue +++ b/src/components/model-article-list/model-article-list-content.vue @@ -28,6 +28,11 @@ {{ item.name }} + + + {{ item.name }} + +