diff --git a/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue b/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue index b1a288e3..0871321b 100644 --- a/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue +++ b/src/components/model-data-magic/components/magic-cube-settings/tabs-content.vue @@ -24,7 +24,18 @@ - +
+ + 文字 + 图片 + + + +
diff --git a/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue b/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue index b75c21e7..ad37d0dd 100644 --- a/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue +++ b/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue @@ -50,7 +50,14 @@ - + + diff --git a/src/components/model-data-magic/index.vue b/src/components/model-data-magic/index.vue index 56ab484f..eed6f185 100644 --- a/src/components/model-data-magic/index.vue +++ b/src/components/model-data-magic/index.vue @@ -19,7 +19,14 @@ -

{{ item.data_content.subtitle || '' }}

+ +
@@ -67,7 +74,14 @@ -

{{ item.data_content.subtitle || '' }}

+ +
diff --git a/src/components/model-data-magic/model-data-magic-content.vue b/src/components/model-data-magic/model-data-magic-content.vue index f3aee506..d02998f6 100644 --- a/src/components/model-data-magic/model-data-magic-content.vue +++ b/src/components/model-data-magic/model-data-magic-content.vue @@ -125,6 +125,7 @@ const data_style = { subtitle_color: '#FF852A', subtitle_typeface: '400', subtitle_size: 14, + subtitle_img_height: 28, goods_title_typeface: 'bold', goods_title_size: 14, goods_title_color: "#333333", @@ -320,7 +321,9 @@ const data_content = { heading_title_type: 'text', heading_title: '主标题', heading_title_img: [], + subtitle_title_type:'text', subtitle: '副标题', + subtitle_title_img: [], // 商品数据处理 goods_list:[], goods_ids: '',