From 2653ca4ccb2a6197eb0cdb68c77a19095f9fe5e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 10 Mar 2025 18:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E9=A1=B9=E5=8D=A1?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-binding/components/goods-index.vue  |  2 +-
 src/components/model-binding/index.vue        | 28 +++++++++++--------
 .../model-binding/model-binding-content.vue   |  6 ++--
 .../model-binding/model-binding-styles.vue    |  2 +-
 src/config/const/binding.ts                   |  4 +--
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/components/model-binding/components/goods-index.vue b/src/components/model-binding/components/goods-index.vue
index cb198f65..6c9580e9 100644
--- a/src/components/model-binding/components/goods-index.vue
+++ b/src/components/model-binding/components/goods-index.vue
@@ -40,7 +40,7 @@
             </el-form-item>
         </template>
         <template v-else>
-            <el-form-item v-if="data.theme == '0'" label="图片宽度">
+            <el-form-item v-if="['0', '2'].includes(data.theme)" label="图片宽度">
                 <slider v-model="form.goods_content_img_width" :max="1000"></slider>
             </el-form-item>
             <el-form-item label="图片高度">
diff --git a/src/components/model-binding/index.vue b/src/components/model-binding/index.vue
index 2eec12c9..46bee3c6 100644
--- a/src/components/model-binding/index.vue
+++ b/src/components/model-binding/index.vue
@@ -51,21 +51,21 @@
                                             <template v-if="!['3'].includes(theme)">
                                                 <div v-for="(item, index) in match_item.good_list" :key="index" class="re oh" :class="layout_type" :style="layout_style">
                                                     <div :class="['oh w h', ['0' , '2'].includes(theme) ? 'flex-row' : 'flex-col' ]" :style="layout_img_style">
-                                                        <template v-if="!isEmpty(item)">
+                                                        <template v-if="!isEmpty(item) && is_show('goods_img')">
                                                             <div class="oh re" :class="`flex-img${theme}`">
                                                                 <image-empty v-model="item.images" :class="`flex-img${theme}`" :style="goods_content_img_radius"></image-empty>
                                                             </div>
                                                         </template>
-                                                        <div class="flex-1 flex-row jc-sb" :style="content_style">
+                                                        <div v-if="is_show('title') || is_show('price') || is_show('save_price')" class="flex-1 flex-row jc-sb" :style="content_style">
                                                             <div class="flex-1 flex-col jc-sb">
-                                                                <div :class="theme == '0' ? 'text-line-2' : 'text-line-1'" :style="trends_config('title', 'goods')">
+                                                                <div v-if="is_show('title')" :class="theme == '0' ? 'text-line-2' : 'text-line-1'" :style="trends_config('title', 'goods')">
                                                                     {{ item.title }}
                                                                 </div>
-                                                                <div class="flex-row align-c text-line-1">
+                                                                <div v-if="is_show('price')" class="flex-row align-c text-line-1">
                                                                     <span :style="trends_config('price_symbol', 'goods')">{{ match_item.price_symbol }}</span>
                                                                     <span :style="trends_config('price', 'goods')">{{ match_item.price }}</span>
                                                                 </div>
-                                                                <div class="flex-row align-c gap-3">
+                                                                <div v-if="is_show('save_price')" class="flex-row align-c gap-3">
                                                                     <img-or-icon-or-text :value="props.value" type="goods_discounts" />
                                                                     <div class="flex-1 text-line-1">
                                                                         <span :style="trends_config('save_price_symbol', 'goods')">{{ match_item.price_symbol }}</span>
@@ -82,21 +82,21 @@
                                                     <swiper-slide v-for="(item, index) in match_item.good_list" :key="index">
                                                         <div :class="layout_type" :style="layout_style">
                                                             <div :class="['oh w h', ['0', '2'].includes(theme) ? 'flex-row' : 'flex-col' ]" :style="layout_img_style">
-                                                                <template v-if="!isEmpty(item)">
+                                                                <template v-if="!isEmpty(item) && is_show('goods_img')">
                                                                     <div class="oh re" :class="`flex-img${theme}`">
                                                                         <image-empty v-model="item.images" :class="`flex-img${theme}`" :style="goods_content_img_radius"></image-empty>
                                                                     </div>
                                                                 </template>
-                                                                <div class="flex-1 flex-row jc-sb" :style="content_style">
+                                                                <div v-if="is_show('title') || is_show('price') || is_show('save_price')" class="flex-1 flex-row jc-sb" :style="content_style">
                                                                     <div class="flex-1 flex-col jc-sb">
-                                                                        <div :class="theme == '0' ? 'text-line-2' : 'text-line-1'" :style="trends_config('title', 'goods')">
+                                                                        <div v-if="is_show('title')" :class="theme == '0' ? 'text-line-2' : 'text-line-1'" :style="trends_config('title', 'goods')">
                                                                             {{ item.title }}
                                                                         </div>
-                                                                        <div class="flex-row align-c text-line-1">
+                                                                        <div v-if="is_show('price')" class="flex-row align-c text-line-1">
                                                                             <span :style="trends_config('price_symbol', 'goods')">{{ match_item.price_symbol }}</span>
                                                                             <span :style="trends_config('price', 'goods')">{{ match_item.price }}</span>
                                                                         </div>
-                                                                        <div class="flex-row align-c gap-3">
+                                                                        <div v-if="is_show('save_price')" class="flex-row align-c gap-3">
                                                                             <img-or-icon-or-text :value="props.value" type="goods_discounts" />
                                                                             <div class="flex-1 text-line-1">
                                                                                 <span :style="trends_config('save_price_symbol', 'goods')">{{ match_item.price_symbol }}</span>
@@ -365,6 +365,10 @@ const layout_type = computed(() => {
     }
     return class_type;
 });
+// 判断是否显示对应的内容
+const is_show = (index: string) => {
+    return form.value.is_goods_show.includes(index);
+};
 // 容器样式
 const layout_style = computed(() => {
     const radius = theme.value == '6' ? '' : goods_content_radius.value;
@@ -413,8 +417,8 @@ const goods_img_height = computed(() => {
     return size_handle('goods', 'height');
 });
 const size_handle = (type: string, location: 'width' | 'height') => {
-    if (typeof new_style.value[`${ type }_content_${ location }`] == 'number') {
-        return new_style.value[`${ type }_content_${ location }`] + 'px';
+    if (typeof new_style.value[`${ type }_content_img_${ location }`] == 'number') {
+        return new_style.value[`${ type }_content_img_${ location }`] + 'px';
     } else {
         const list = type == 'goods' ? goods_style_list.filter(item => item.value == theme.value) : data_style_list.filter(item => item.value == host_graph_theme.value);
         if (list.length > 0) {
diff --git a/src/components/model-binding/model-binding-content.vue b/src/components/model-binding/model-binding-content.vue
index 553f8b09..37af1d93 100644
--- a/src/components/model-binding/model-binding-content.vue
+++ b/src/components/model-binding/model-binding-content.vue
@@ -137,10 +137,10 @@ onMounted(() => {
 });
 const host_graph_theme_change = () => {
     // 切换风格时，将对应图片的默认值宽度和高度赋值
-    const list = base_list.host_graph_theme_list.filter(item => item.value == form.value.theme);
+    const list = base_list.host_graph_theme_list.filter(item => item.value == form.value.host_graph_theme);
     if (list.length > 0) {
-        data.value.host_graph_img_width = list[0].width;
-        data.value.host_graph_img_height = list[0].height;
+        data.value.data_content_img_width = list[0].width;
+        data.value.data_content_img_height = list[0].height;
     }
 }
 // 主题改变
diff --git a/src/components/model-binding/model-binding-styles.vue b/src/components/model-binding/model-binding-styles.vue
index 59cd5456..dc19ab8f 100644
--- a/src/components/model-binding/model-binding-styles.vue
+++ b/src/components/model-binding/model-binding-styles.vue
@@ -38,7 +38,7 @@
                         <el-form-item label="组合间距">
                             <slider v-model="form.data_content_outer_spacing" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item v-if="data.theme == '0'" label="图片宽度">
+                        <el-form-item v-if="data.host_graph_theme == '0'" label="图片宽度">
                             <slider v-model="form.data_content_img_width" :max="1000"></slider>
                         </el-form-item>
                         <el-form-item label="图片高度">
diff --git a/src/config/const/binding.ts b/src/config/const/binding.ts
index 53cfaf10..0085a957 100644
--- a/src/config/const/binding.ts
+++ b/src/config/const/binding.ts
@@ -182,8 +182,8 @@ const defaultRealstore: defaultRealstore = {
         goods_discounts_text: '节省',
     },
     style: {
-        data_content_img_width: 50,
-        data_content_img_height: 50,
+        data_content_img_width: 128,
+        data_content_img_height: 128,
         data_content_spacing: 10,
         data_content_outer_spacing: 10,
         data_color_list: [{ color: '#fff', color_percentage: undefined }],