diff --git a/src/components/model-goods-list/index.vue b/src/components/model-goods-list/index.vue index 0f1aaae8..09f0dd83 100644 --- a/src/components/model-goods-list/index.vue +++ b/src/components/model-goods-list/index.vue @@ -6,7 +6,7 @@
-
+
-
+
+
{{ item.title }}
+
{{ item.simple_desc }}
-
{{ item.title }}
-
{{ item.simple_desc }}
{{ icon_data.name }}
@@ -110,10 +110,12 @@ -
+
-
{{ item.title }}
-
{{ item.simple_desc }}
+
+
{{ item.title }}
+
{{ item.simple_desc }}
+
{{ icon_data.name }}
@@ -125,7 +127,7 @@ >{{ item.min_price }} {{ item.show_price_unit }}
-
+
{{ item.show_original_price_symbol }}{{ item.min_original_price }} @@ -375,7 +377,7 @@ const text_line = computed(() => { if (['1', '6'].includes(theme.value)) { line = 'text-line-1'; } else if (['0', '2', '3', '4', '5'].includes(theme.value)) { - line = 'text-line-2 multi-text'; + line = 'text-line-2'; } return line; }); @@ -392,6 +394,14 @@ const style_config = (typeface: string, size: number, color: string | object, ty let style = `font-weight:${typeface}; font-size: ${size}px;`; if (type == 'gradient') { style += button_gradient(); + } else if (type == 'title') { + if (['1', '6'].includes(theme.value)) { + style += `line-height: ${size}px;height: ${size}px;color: ${color};`; + } else if (['0', '2', '3', '4', '5'].includes(theme.value)) { + style += `line-height: ${size > 0 ? size + 3 : 0}px;height: ${size > 0 ? (size + 3) * 2 : 0}px;color: ${color};`; + } + } else if (type == 'desc') { + style += `line-height: ${size}px;height: ${size}px;color: ${color};`; } else { style += `color: ${color};`; } @@ -532,7 +542,7 @@ watchEffect(() => { .flex-img0 { height: auto; min-height: 11rem; - max-height: 12rem; + // max-height: 12rem; width: 11rem; } .flex-img1 { diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue index 91a90797..8acec8e8 100644 --- a/src/components/model-seckill/index.vue +++ b/src/components/model-seckill/index.vue @@ -52,10 +52,13 @@
-
+
-
{{ item.title }}
+
+
{{ item.title }}
+
{{ item.simple_desc }}
+
-
{{ item.title }}
+
+
{{ item.title }}
+
{{ item.simple_desc }}
+
@@ -234,6 +240,7 @@ interface data_list { min_original_price: string; show_original_price_symbol: string; show_original_price_unit: string; + simple_desc: string; min_price: string; show_price_symbol: string; show_price_unit: string; @@ -400,6 +407,10 @@ const style_config = (typeface: string, size: number, color: string | object, ty let style = `font-weight:${typeface}; font-size: ${size}px;`; if (type == 'gradient') { style += button_gradient(); + } else if (type == 'title') { + style += `line-height: ${size > 0 ? size + 3 : 0}px;height: ${size > 0 ? (size + 3) * 2 : 0}px;color: ${color};`; + } else if (type == 'desc') { + style += `line-height: ${size}px;height: ${size}px;color: ${color};`; } else { style += `color: ${color};`; } diff --git a/src/components/model-seckill/model-seckill-content.vue b/src/components/model-seckill/model-seckill-content.vue index 3724838e..02337269 100644 --- a/src/components/model-seckill/model-seckill-content.vue +++ b/src/components/model-seckill/model-seckill-content.vue @@ -137,6 +137,7 @@ const base_list = { ], list_show_list: [ { name: '商品名称', value: 'title'}, + { name: '商品简述', value: 'simple_desc'}, { name: '商品售价', value: 'price'}, { name: '商品原价', value: 'original_price' }, { name: '售价单位', value: 'price_unit' }, diff --git a/src/components/model-seckill/model-seckill-styles.vue b/src/components/model-seckill/model-seckill-styles.vue index 9b37fd86..dee17605 100644 --- a/src/components/model-seckill/model-seckill-styles.vue +++ b/src/components/model-seckill/model-seckill-styles.vue @@ -4,7 +4,7 @@