From c1fa0fbb71b5a6217299a0229abeff232b4d7136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 22 Aug 2024 17:58:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=9D=97?=
=?UTF-8?q?=E7=9A=84=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/model-shop-list/index.vue | 8 +++++---
.../model-shop-list/model-shop-list-styles.vue | 11 ++++++++---
.../model-shop-tabs/model-shop-tabs-styles.vue | 11 ++++++++---
src/layout/components/main/default/shop-list.ts | 2 ++
src/layout/components/main/default/shop-tabs.ts | 2 ++
5 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/components/model-shop-list/index.vue b/src/components/model-shop-list/index.vue
index a056e0c7..a31df204 100644
--- a/src/components/model-shop-list/index.vue
+++ b/src/components/model-shop-list/index.vue
@@ -212,7 +212,8 @@ const two_columns = computed(() => content_outer_spacing.value + 'px');
// 三列风格
const three_columns = computed(() => content_outer_spacing.value * 2 + 'px');
// 不换行显示
-const multicolumn_columns = computed(() => new_style.value.content_outer_width + 'px');
+const multicolumn_columns_width = computed(() => new_style.value.content_outer_width + 'px');
+const multicolumn_columns_height = computed(() => new_style.value.content_outer_height + 'px');
// 最外层不同风格下的显示
const outer_class = computed(() => {
@@ -379,8 +380,9 @@ const style_container = computed(() => {
width: calc((100% - v-bind(three_columns)) / 3);
}
.multicolumn-columns {
- width: v-bind(multicolumn_columns);
- min-width: v-bind(multicolumn_columns);
+ width: v-bind(multicolumn_columns_width);
+ min-width: v-bind(multicolumn_columns_width);
+ height: v-bind(multicolumn_columns_height);
}
.flex-img0 {
height: auto;
diff --git a/src/components/model-shop-list/model-shop-list-styles.vue b/src/components/model-shop-list/model-shop-list-styles.vue
index 93bdcfc9..21e312ad 100644
--- a/src/components/model-shop-list/model-shop-list-styles.vue
+++ b/src/components/model-shop-list/model-shop-list-styles.vue
@@ -42,9 +42,14 @@
-
-
-
+
+
+
+
+
+
+
+
购物车按钮
diff --git a/src/components/model-shop-tabs/model-shop-tabs-styles.vue b/src/components/model-shop-tabs/model-shop-tabs-styles.vue
index a8f9e9b8..2017849b 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-styles.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-styles.vue
@@ -37,9 +37,14 @@
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/layout/components/main/default/shop-list.ts b/src/layout/components/main/default/shop-list.ts
index 9749ef7b..6f38782f 100644
--- a/src/layout/components/main/default/shop-list.ts
+++ b/src/layout/components/main/default/shop-list.ts
@@ -23,6 +23,7 @@ interface DefaultProductList {
shop_radius: radiusStyle;
content_outer_spacing: number;
content_outer_width: number;
+ content_outer_height: number;
content_spacing: number;
shop_title_typeface: string;
shop_title_size: number;
@@ -85,6 +86,7 @@ const defaultProductList: DefaultProductList = {
content_outer_spacing: 10, // 商品间距
content_spacing: 10,
content_outer_width: 104,
+ content_outer_height: 189,
shop_title_typeface: 'normal',
shop_title_size: 12,
shop_title_color: "#000",
diff --git a/src/layout/components/main/default/shop-tabs.ts b/src/layout/components/main/default/shop-tabs.ts
index c14225ee..9fbcd728 100644
--- a/src/layout/components/main/default/shop-tabs.ts
+++ b/src/layout/components/main/default/shop-tabs.ts
@@ -39,6 +39,7 @@ interface DefaultProductList {
shop_radius: radiusStyle;
content_outer_spacing: number;
content_outer_width: number;
+ content_outer_height: number;
content_spacing: number;
shop_title_typeface: string;
shop_title_size: number;
@@ -108,6 +109,7 @@ const defaultProductList: DefaultProductList = {
content_outer_spacing: 10,
content_spacing: 10,
content_outer_width: 104,
+ content_outer_height: 189,
shop_title_typeface: 'normal',
shop_title_size: 12,
shop_title_color: "#000",