diff --git a/components/diy/article-list.vue b/components/diy/article-list.vue index 5ed022a4..9a8d9255 100644 --- a/components/diy/article-list.vue +++ b/components/diy/article-list.vue @@ -5,9 +5,9 @@ - + - +
-
{{ item.new_title ? item.new_title : item.data.title }}
+
{{ item.new_title ? item.new_title : item.data.title }}
{{ item.data.describe || '' }}
@@ -42,7 +42,7 @@ - + @@ -52,9 +52,9 @@ - +
-
{{ item.new_title ? item.new_title : item.data.title }}
+
{{ item.new_title ? item.new_title : item.data.title }}
{{ item.data.describe || '' }}
@@ -294,7 +294,7 @@ // article_item_height: `height: ${new_style.article_height }px`, article_style: this.content_radius + multicolumn_columns_width + gradient, // 轮播高度 - carousel_height_computer: new_style.name_size * 2 + new_style.article_height + 'px', + carousel_height_computer: new_style.article_height + 'px', // 文章内容高度 article_name_height_computer: `height:${new_style.name_size * 2.4 * 2}rpx;line-height:${new_style.name_size * 1.2 * 2}rpx;`, article_img_style: background_computer(article_data) @@ -302,7 +302,6 @@ // 文章轮播数据 const cloneList = JSON.parse(JSON.stringify(this.data_list)); // 如果是分页滑动情况下,根据选择的行数和每行显示的个数来区分具体是显示多少个 - console.log(new_style.rolling_fashion); if (new_style.rolling_fashion != 'translation') { if (cloneList.length > 0) { // 每页显示的数量 diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue index 2a82be23..28b918d1 100644 --- a/components/diy/goods-list.vue +++ b/components/diy/goods-list.vue @@ -413,17 +413,18 @@ const radius = form.theme == '6' ? '' : radius_computer(new_style.shop_radius); const gradient = form.theme != '6' ? gradient_handle(new_style?.shop_color_list || [], new_style?.shop_direction || '') : ''; let size_style = ``; - // 如果不是平移的时候执行 - if (new_style.rolling_fashion != 'translation') { - if (['1', '4'].includes(form.theme)) { - size_style = `width: calc((100% - ${new_style.content_outer_spacing * 2 + 'rpx'}) / 2);`; - } else if (form.theme == '3') { - size_style = `width: calc((100% - ${new_style.content_outer_spacing * 4 + 'rpx'}) / 3);`; - } else if (form.theme == '5') { + if (['1', '4'].includes(form.theme)) { + size_style = `width: calc((100% - ${new_style.content_outer_spacing * 2 + 'rpx'}) / 2);`; + } else if (form.theme == '3') { + size_style = `width: calc((100% - ${new_style.content_outer_spacing * 4 + 'rpx'}) / 3);`; + } else if (form.theme == '5') { + // 如果不是平移的时候执行 + if (new_style.rolling_fashion != 'translation') { size_style = `width: ${this.get_multicolumn_columns_width(new_style, form)};min-width: ${this.get_multicolumn_columns_width(new_style, form)};height: ${new_style.content_outer_height * 2 + 'rpx'};`; + } else { + size_style = `margin-right: ${ new_style.content_outer_spacing * 2 }rpx;width: 100%;height: 100%;`; } - } else { - size_style = `margin-right: ${ new_style.content_outer_spacing * 2 }rpx;width: 100%;height: 100%;`; + } return `${radius} ${size_style} ${ gradient }`; },