From 450d88f391e4e63dd6ff303df6baec8154f8d0c9 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:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/product-show-config/index.vue           | 14 --------------
 src/components/model-shop-list/index.vue           |  2 +-
 .../model-shop-list/model-shop-list-content.vue    |  2 +-
 .../model-shop-tabs/model-shop-tabs-content.vue    |  3 ++-
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/components/common/product-show-config/index.vue b/src/components/common/product-show-config/index.vue
index 09b33d68..80f9d653 100644
--- a/src/components/common/product-show-config/index.vue
+++ b/src/components/common/product-show-config/index.vue
@@ -69,20 +69,6 @@ const base_list = {
         { name: '商品加购', value: '1' }
     ]
 };
-
-const shop_type = computed(() => {
-    return (item: { value: string; }) => {
-        return item.value == form.value.shop_type;
-    };
-});
-
-const shopping_button_click = (item: { value: string; }) => {
-    if (['3','4','5'].includes(form.value.theme) && ['0', '1'].includes(item.value)) {
-        return;
-    } else {
-        form.value.shop_type = item.value;
-    }
-};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/model-shop-list/index.vue b/src/components/model-shop-list/index.vue
index 19a54e4f..acb59259 100644
--- a/src/components/model-shop-list/index.vue
+++ b/src/components/model-shop-list/index.vue
@@ -5,7 +5,7 @@
                 <template v-if="theme == '6'">
                     <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}`">
+                        <div v-if="is_show('price')" class="num nowrap" :style="`color: ${new_style.shop_price_color}`">
                             <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>
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 3646a4e5..7f11cab1 100644
--- a/src/components/model-shop-list/model-shop-list-content.vue
+++ b/src/components/model-shop-list/model-shop-list-content.vue
@@ -154,7 +154,7 @@ const change_style = (val: any): void => {
     form.value.theme = val;
     if (['3', '4', '5'].includes(val) && form.value.shop_type == 'text') {
         form.value.shop_type = 'icon';
-    } else {
+    } else if (['0', '1', '2'].includes(val) && form.value.shop_type == 'icon') {
         form.value.shop_type = 'text';
     }
 };
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 17b53352..cd9f49f9 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-content.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-content.vue
@@ -228,10 +228,11 @@ const tabs_theme_change = (val: string | number | boolean | undefined):void => {
 };
 // 选择某些风格时， 切换到对应的按钮
 const change_style = (val: any): void => {
+    form.value.theme = val;
     form.value.theme = val;
     if (['3', '4', '5'].includes(val) && form.value.shop_type == 'text') {
         form.value.shop_type = 'icon';
-    } else {
+    } else if (['0', '1', '2'].includes(val) && form.value.shop_type == 'icon') {
         form.value.shop_type = 'text';
     }
 };