diff --git a/src/components/common/product-show-config/index.vue b/src/components/common/product-show-config/index.vue
index 901d0a39..0f083f91 100644
--- a/src/components/common/product-show-config/index.vue
+++ b/src/components/common/product-show-config/index.vue
@@ -63,7 +63,7 @@ const base_list = {
],
shopping_button_list: [
{ name: '文字', value: 'text' },
- { name: 'icon', value: 'icon' },
+ { name: '图标', value: 'icon' },
],
shopping_cart_list: [
{ name: '进入商品详情页', value: '0' },
diff --git a/src/components/model-shop-list/index.vue b/src/components/model-shop-list/index.vue
index 44eb9f95..19a54e4f 100644
--- a/src/components/model-shop-list/index.vue
+++ b/src/components/model-shop-list/index.vue
@@ -6,7 +6,9 @@
{{ item.title }}
- ¥{{ item.min_price }}
+ {{ item.show_price_symbol }}{{ item.min_price }}
+ {{ item.show_price_unit }}
diff --git a/src/components/model-shop-list/model-shop-list-content.vue b/src/components/model-shop-list/model-shop-list-content.vue
index 0fcab93d..3646a4e5 100644
--- a/src/components/model-shop-list/model-shop-list-content.vue
+++ b/src/components/model-shop-list/model-shop-list-content.vue
@@ -152,8 +152,10 @@ const goods_list_sort = (new_list: any) => {
// 选择某些风格时, 切换到对应的按钮
const change_style = (val: any): void => {
form.value.theme = val;
- if (['3', '4', '5'].includes(val) && ['0', '1'].includes(form.value.shop_type)) {
- form.value.shop_type = '2';
+ if (['3', '4', '5'].includes(val) && form.value.shop_type == 'text') {
+ form.value.shop_type = 'icon';
+ } else {
+ form.value.shop_type = 'text';
}
};
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 c2704878..1d1a8967 100644
--- a/src/components/model-shop-list/model-shop-list-styles.vue
+++ b/src/components/model-shop-list/model-shop-list-styles.vue
@@ -57,7 +57,7 @@
-
+
diff --git a/src/components/model-shop-tabs/model-shop-tabs-content.vue b/src/components/model-shop-tabs/model-shop-tabs-content.vue
index afd2f40c..17b53352 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-content.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-content.vue
@@ -229,8 +229,10 @@ const tabs_theme_change = (val: string | number | boolean | undefined):void => {
// 选择某些风格时, 切换到对应的按钮
const change_style = (val: any): void => {
form.value.theme = val;
- if (['3', '4', '5'].includes(val) && ['0', '1'].includes(form.value.shop_type)) {
- form.value.shop_type = '2';
+ if (['3', '4', '5'].includes(val) && form.value.shop_type == 'text') {
+ form.value.shop_type = 'icon';
+ } else {
+ form.value.shop_type = 'text';
}
};
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 e3be4d5d..37f93194 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-styles.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-styles.vue
@@ -69,7 +69,7 @@
-
+
diff --git a/src/layout/components/main/default/shop-list.ts b/src/layout/components/main/default/shop-list.ts
index a6c747fb..1f303703 100644
--- a/src/layout/components/main/default/shop-list.ts
+++ b/src/layout/components/main/default/shop-list.ts
@@ -92,8 +92,8 @@ const defaultProductList: DefaultProductList = {
},
content_outer_spacing: 10, // 商品间距
content_spacing: 10,
- content_outer_width: 104,
- content_outer_height: 189,
+ content_outer_width: 140,
+ content_outer_height: 232,
shop_title_typeface: '500',
shop_title_size: 14,
shop_title_color: "#333333",
diff --git a/src/layout/components/main/default/shop-tabs.ts b/src/layout/components/main/default/shop-tabs.ts
index 4b3c19ea..572e4461 100644
--- a/src/layout/components/main/default/shop-tabs.ts
+++ b/src/layout/components/main/default/shop-tabs.ts
@@ -116,8 +116,8 @@ const defaultProductList: DefaultProductList = {
},
content_outer_spacing: 10,
content_spacing: 10,
- content_outer_width: 104,
- content_outer_height: 189,
+ content_outer_width: 140,
+ content_outer_height: 232,
shop_title_typeface: '500',
shop_title_size: 14,
shop_title_color: "#333333",