{{ icon_data.name }}
@@ -424,7 +424,11 @@ const style_config = (typeface: string, size: number, color: string | object, ty
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};`;
+ if (form.value.simple_desc_row == '2') {
+ style += `line-height: ${size > 0 ? size + 3 : 0}px;height: ${size > 0 ? (size + 3) * 2 : 0}px;color: ${color};`;
+ } else {
+ style += `line-height: ${size}px;height: ${size}px;color: ${color};`;
+ }
} else {
style += `color: ${color};`;
}
diff --git a/src/components/model-goods-list/model-goods-list-content.vue b/src/components/model-goods-list/model-goods-list-content.vue
index 294e1f8c..84232b66 100644
--- a/src/components/model-goods-list/model-goods-list-content.vue
+++ b/src/components/model-goods-list/model-goods-list-content.vue
@@ -81,32 +81,9 @@ const base_list = reactive({
{ name: '指定商品', value: '0' },
{ name: '筛选商品', value: '1' },
],
- // product_category_list: [] as select_1[],
- // product_brand_list: [] as select_1[],
- // sort_list: [
- // { name: '综合', value: '0' },
- // { name: '销量', value: '1' },
- // { name: '热度', value: '2' },
- // { name: '价格', value: '3' },
- // { name: '最新', value: '4' },
- // ],
- // order_by_rule_list: [
- // { name: '降序(desc)', value: '0' },
- // { name: '升序(asc)', value: '1' },
- // ],
});
const emits = defineEmits(['theme_change']);
onBeforeMount(() => {
- // nextTick(() => {
- // // 定时获取common_store.common.article_category的数据，直到拿到值或者关闭页面为止
- // const interval = setInterval(() => {
- // if (common_store.common.goods_category.length > 0 || common_store.common.brand_list.length > 0) {
- // base_list.product_category_list = common_store.common.goods_category;
- // base_list.product_brand_list = common_store.common.brand_list;
- // clearInterval(interval);
- // }
- // }, 1000);
- // });
// 如果历史数据没有操作，则修改默认值
const { content_img_width = '', content_img_height = '' } = data.value;
// 宽度和高度为空的时候，并且不是无图模式和左右滑动模式的时候，修改默认值
diff --git a/src/config/const/article-list.ts b/src/config/const/article-list.ts
index fdbc2f00..9a6f70d9 100644
--- a/src/config/const/article-list.ts
+++ b/src/config/const/article-list.ts
@@ -23,6 +23,7 @@ interface DefaultArticleList {
order_by_type: number;
order_by_rule: number;
field_show: string[];
+ field_desc_row: string,
is_cover: string;
seckill_subscript_show: string;
subscript_type: string;
@@ -82,6 +83,7 @@ const defaultArticleList: DefaultArticleList = {
order_by_type: defaultSetting.order_by_type,
order_by_rule: defaultSetting.order_by_rule,
field_show: ['0', '1', '3'],
+ field_desc_row: '1',
is_cover: defaultSetting.is_cover,
// 角标配置
seckill_subscript_show: '0',
diff --git a/src/config/const/article-tabs.ts b/src/config/const/article-tabs.ts
index 2b0a7969..b63c809e 100644
--- a/src/config/const/article-tabs.ts
+++ b/src/config/const/article-tabs.ts
@@ -34,6 +34,7 @@ interface DefaultArticleTabs {
tabs_list: articleTabsList[];
tabs_active_index: number;
field_show: string[];
+ field_desc_row: string;
seckill_subscript_show: string;
subscript_type: string;
subscript_img_src: uploadList[];
@@ -126,6 +127,7 @@ const defaultArticleTabs: DefaultArticleTabs = {
],
tabs_active_index: 0,
field_show: ['0', '1', '3'],
+ field_desc_row: '1',
// 角标配置
seckill_subscript_show: '0',
subscript_type: 'text',
diff --git a/src/config/const/goods-list.ts b/src/config/const/goods-list.ts
index b28f8bd2..efb90973 100644
--- a/src/config/const/goods-list.ts
+++ b/src/config/const/goods-list.ts
@@ -20,6 +20,7 @@ interface DefaultProductList {
order_by_type: number;
order_by_rule: number;
is_show: string[];
+ simple_desc_row: string;
static_img: uploadList[];
is_shop_show: string;
shop_type: string;
@@ -107,6 +108,7 @@ const defaultProductList: DefaultProductList = {
order_by_rule: defaultSetting.order_by_rule,
// 显示内容
is_show: ['title', 'plugins_view_icon', 'price', 'sales_count', 'original_price'],
+ simple_desc_row: '1',
// 价格图标地址
static_img: [{ id: 2, url: new_url + 'price.png', original: '角标', title: '角标', ext: '.png', type: 'img' }],
// 是否显示购买按钮
diff --git a/src/config/const/goods-tabs.ts b/src/config/const/goods-tabs.ts
index bc58ef85..a999a29d 100644
--- a/src/config/const/goods-tabs.ts
+++ b/src/config/const/goods-tabs.ts
@@ -32,6 +32,7 @@ interface DefaultProductList {
tabs_active_index: number;
static_img: uploadList[];
is_show: string[];
+ simple_desc_row: string;
is_shop_show: string;
is_price_solo: string;
shop_type: string;
@@ -148,6 +149,8 @@ const defaultProductList: DefaultProductList = {
static_img: [{ id: 2, url: new_url + 'price.png', original: '角标', title: '角标', ext: '.png', type: 'img' }],
// 显示内容
is_show: ['title', 'plugins_view_icon', 'price', 'sales_count', 'original_price'],
+ // 显示简介行数
+ simple_desc_row: '1',
// 是否显示购买按钮
is_shop_show: '1',
// 价格是否独行