From 2134860e13ff0a718592c0c4eaf7cec86791f38a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 27 Aug 2024 18:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/product-show-config/index.vue        | 2 +-
 src/components/model-shop-list/index.vue                   | 4 +++-
 src/components/model-shop-list/model-shop-list-content.vue | 6 ++++--
 src/components/model-shop-list/model-shop-list-styles.vue  | 2 +-
 src/components/model-shop-tabs/model-shop-tabs-content.vue | 6 ++++--
 src/components/model-shop-tabs/model-shop-tabs-styles.vue  | 2 +-
 src/layout/components/main/default/shop-list.ts            | 4 ++--
 src/layout/components/main/default/shop-tabs.ts            | 4 ++--
 8 files changed, 18 insertions(+), 12 deletions(-)

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 @@
                     <div :class="['flex-row align-c jc-sb ptb-15 mlr-10 gap-20', { 'br-b-e': index != list.length - 1 }]">
                         <div v-if="is_show('title')" :class="text_line" :style="trends_config('title')">{{ item.title }}</div>
                         <div v-if="is_show('price')" class="num" :style="`color: ${new_style.shop_price_color}`">
-                            <span class="identifying">￥</span><span :style="trends_config('price')">{{ item.min_price }}</span>
+                            <span class="identifying">{{ item.show_price_symbol }}</span
+                            ><span :style="trends_config('price')">{{ item.min_price }}</span>
+                            <span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
                         </div>
                     </div>
                 </template>
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';
     }
 };
 </script>
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 @@
                     </el-form-item>
                 </template>
                 <template v-else>
-                    <el-form-item label="icon设置">
+                    <el-form-item label="图标设置">
                         <color-text-size-group v-model:color="form.shop_icon_color" v-model:size="form.shop_icon_size" default-color="#fff" :type-list="['color', 'size']"></color-text-size-group>
                     </el-form-item>
                 </template>
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';
     }
 };
 </script>
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 @@
                     </el-form-item>
                 </template>
                 <template v-else>
-                    <el-form-item label="icon设置">
+                    <el-form-item label="图标设置">
                         <color-text-size-group v-model:color="form.shop_icon_color" v-model:size="form.shop_icon_size" default-color="#fff" :type-list="['color', 'size']"></color-text-size-group>
                     </el-form-item>
                 </template>
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",