From cc6facb11d915d0acad71bad787b50acc1f7442f 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, 20 Jan 2025 15:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=8D=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/data-magic.vue                 | 14 +++++-----
 components/diy/goods-list.vue                 |  2 +-
 .../diy/modules/data-magic/magic-carousel.vue |  4 +--
 .../modules/data-magic/product-list-show.vue  | 28 +++++++++----------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/components/diy/data-magic.vue b/components/diy/data-magic.vue
index 90b6bcad..5074a0f6 100644
--- a/components/diy/data-magic.vue
+++ b/components/diy/data-magic.vue
@@ -12,8 +12,8 @@
                                         <view class="w h flex-col" :style="'gap:'+ item.data_style.title_data_gap * 2 + 'rpx;'">
                                             <view v-if="(!isEmpty(item.data_content.heading_title) || !isEmpty(item.data_content.subtitle)) && [0, 1].includes(index)" :class="'tl' + (item.data_style.title_line == '1' ? ' flex-row align-c' : ' flex-col')" :style="'gap:' + item.data_style.title_gap * 2 + 'rpx;'">
                                                 <template v-if="item.data_content.heading_title_type && item.data_content.heading_title_type == 'image'">
-                                                    <view v-if="item.data_content.heading_title_img.length > 0" class="re" :style="'height:' + (!isEmpty(item.data_style.heading_img_height) ? item.data_style.heading_img_height : 0) * 2 + 'rpx'">
-                                                        <image :src="item.data_content.heading_title_img[0].url" mode="aspectFit" />
+                                                    <view v-if="item.data_content.heading_title_img.length > 0" class="re oh" :style="'width:100%;height:' + (!isEmpty(item.data_style.heading_img_height) ? item.data_style.heading_img_height : 0) * 2 + 'rpx'">
+                                                        <image :src="item.data_content.heading_title_img[0].url" class="wh-auto ht-auto" mode="aspectFit" />
                                                     </view>
                                                 </template>
                                                 <template v-else>
@@ -61,8 +61,8 @@
                                     <view class="w h flex-col" :style="'gap:'+ item.data_style.title_data_gap * 2 + 'rpx;'">
                                         <view v-if="!isEmpty(item.data_content.heading_title) || !isEmpty(item.data_content.subtitle)" :class="'tl' + (item.data_style.title_line == '1' ? ' flex-row align-c' : ' flex-col')" :style="'gap:' + item.data_style.title_gap * 2 + 'rpx;'">
                                             <template v-if="item.data_content.heading_title_type && item.data_content.heading_title_type == 'image'">
-                                                <view v-if="item.data_content.heading_title_img.length > 0" class="re" :style="'height:' + (!isEmpty(item.data_style.heading_img_height) ? item.data_style.heading_img_height : 0) * 2 + 'rpx'">
-                                                    <image :src="item.data_content.heading_title_img[0].url" mode="aspectFit" />
+                                                <view v-if="item.data_content.heading_title_img.length > 0" class="re oh" :style="'width:100%;height:' + (!isEmpty(item.data_style.heading_img_height) ? item.data_style.heading_img_height : 0) * 2 + 'rpx'">
+                                                    <image :src="item.data_content.heading_title_img[0].url" class="wh-auto ht-auto" mode="aspectFit" />
                                                 </view>
                                             </template>
                                             <template v-else>
@@ -71,7 +71,7 @@
                                             <view class="ma-0 w text-word-break text-line-1 flex-basis-shrink" :style="item.data_style.subtitle_style">{{ item.data_content.subtitle || '' }}</view>
                                         </view>
                                         <view class="w h oh flex-row">
-                                            <magic-carousel :propKey="propKey + index" :propValue="item" :propGoodStyle="item.data_style" propType="product" :propActived="form.style_actived" :propDataIndex="index"  @onCarouselChange="carousel_change"></magic-carousel>
+                                            <magic-carousel class="flex-1" :propKey="propKey + index" :propValue="item" :propGoodStyle="item.data_style" propType="product" :propActived="form.style_actived" :propDataIndex="index"  @onCarouselChange="carousel_change"></magic-carousel>
                                         </view>
                                     </view>
                                 </template>
@@ -237,8 +237,8 @@
                     } 
                     data_content.fit = fit;
                     // 商品名称和价格样式
-                    data_style.goods_title_style = this.goods_trends_config(data_style, 'title') + `line-height: ${ (item.data_style.goods_title_size + 3) * 2 }rpx;`;
-                    data_style.goods_price_style = this.goods_trends_config(data_style, 'price') + `line-height: ${ item.data_style.goods_price_size * 2 }rpx;`;
+                    data_style.goods_title_style = this.goods_trends_config(data_style, 'title') + `line-height: ${ (item.data_style.goods_title_size + 3) * 2 }rpx;height: ${ (item.data_style.goods_title_size + 3) * 2 }rpx;`;
+                    data_style.goods_price_style = this.goods_trends_config(data_style, 'price') + `line-height: ${ item.data_style.goods_price_size * 2 }rpx;height: ${ (item.data_style.goods_title_size + 3) * 2 }rpx;`;
                     const radius = !isEmpty(data_style.img_radius) ? data_style.img_radius : { radius: 4, radius_top_left: 4, radius_top_right: 4, radius_bottom_left: 4, radius_bottom_right: 4 };
                     data_style.get_img_radius = radius_computer(radius);
 
diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue
index 662ec285..ab53540f 100644
--- a/components/diy/goods-list.vue
+++ b/components/diy/goods-list.vue
@@ -58,7 +58,7 @@
                                         <view class="flex-row jc-sb align-e">
                                             <view>
                                                 <view v-if="show_content" class="flex-row align-c text-size-xss">
-                                                    <view v-if="is_show('sales_count')" class="pr-5" :style="sold_number_style">已售{{ item.sales_count }}件</view>
+                                                    <view v-if="is_show('sales_count') && !isEmpty(item.sales_count)" class="pr-5" :style="sold_number_style">已售{{ item.sales_count || 0 }}件</view>
                                                     <!-- <view v-if="is_show('sales_count')" :class="['pr-5', {'br-r-e': is_show('sales_count') && is_show('4')}]" :style="sold_number_style>已售{{ item.sales_count }}件</view> -->
                                                     <!-- <view v-if="is_show('4')" class="pl-5" :style="score_style">评分0</view> -->
                                                 </view>
diff --git a/components/diy/modules/data-magic/magic-carousel.vue b/components/diy/modules/data-magic/magic-carousel.vue
index b6f9bd4e..059976d8 100644
--- a/components/diy/modules/data-magic/magic-carousel.vue
+++ b/components/diy/modules/data-magic/magic-carousel.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="flex-1 oh" :style="style_container">
+    <view class="wh-auto ht-auto oh" :style="style_container">
         <view class="pr oh wh-auto ht-auto" :style="style_img_container">
             <swiper circular="true" :autoplay="propValue.data_style.is_roll == '1'" :interval="propValue.data_style.interval_time * 1000" :duration="500" :vertical="propValue.data_style.rotation_direction == 'vertical'" :next-margin="next_margin" :display-multiple-items="slides_per_view" class="swiper" style="height: 100%" @change="carousel_change">
                 <swiper-item v-for="(item1, index1) in propValue.data_content.list" :key="index1">
@@ -9,7 +9,7 @@
                         </view>
                     </template>
                     <template v-else>
-                        <view class="ht-auto" :style="shop_spacing">
+                        <view class="wh-auto ht-auto" :style="shop_spacing">
                             <product-list-show :propKey="propKey" :propOuterflex="propValue.data_content.goods_outerflex" :propFlex="propValue.data_content.goods_flex" :propNum="show_num" :propActived="propActived" :propIsShow="propValue.data_content.is_show" :propChunkPadding="propValue.data_style.chunk_padding" :propValue="item1.split_list" :propGoodStyle="propGoodStyle" :propContentImgRadius="propValue.data_style.get_img_radius" @url_event="url_event"></product-list-show>
                         </view>
                     </template>
diff --git a/components/diy/modules/data-magic/product-list-show.vue b/components/diy/modules/data-magic/product-list-show.vue
index 8e098a67..279cbff4 100644
--- a/components/diy/modules/data-magic/product-list-show.vue
+++ b/components/diy/modules/data-magic/product-list-show.vue
@@ -1,7 +1,7 @@
 <template>
-    <view :class="['align-c w h', (propOuterflex == 'row' ? 'flex-row' : 'flex-col')]" :style="'gap:' + propGoodStyle.data_goods_gap + 'px;'">
+    <view :class="['align-c flex-1 w h', (propOuterflex == 'row' ? 'flex-row' : 'flex-col')]" :style="'gap:' + propGoodStyle.data_goods_gap + 'px;'">
         <template v-if="propFlex === 'row'">
-            <view v-for="(item, index) in propValue" :key="index" :style="block_size">
+            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h">
                 <view class="w h oh" :style="style_container">
                     <view class="w h flex-row gap-10" :style="style_img_container" :data-index="index" :data-value="item.goods_url" @tap="url_event">
                         <template v-if="!isEmpty(item.new_cover)">
@@ -15,12 +15,12 @@
                             </view>
                         </template>
                         <view v-if="!isEmpty(propIsShow)" class="flex-col w h tl jc-sb">
-                            <view v-if="propIsShow.includes('title')" class="text-line-2" :style="propGoodStyle.goods_title_style + 'height:'+ ((propGoodStyle.goods_title_size + 3) * 4) + 'rpx;'">{{ item.title }}</view>
+                            <view v-if="propIsShow.includes('title')" class="text-line-2" :style="propGoodStyle.goods_title_style + 'height:'+ ((propGoodStyle.goods_title_size + 3) * 4) + 'rpx;'">{{ item.title || '' }}</view>
                             <view v-if="propIsShow.includes('price')" :style="propGoodStyle.goods_price_style">
-                                <text :style="propGoodStyle.goods_price_symbol_style">{{ item.show_price_symbol }}</text>
-                                {{ item.min_price }}
+                                <text :style="propGoodStyle.goods_price_symbol_style">{{ item.show_price_symbol || '' }}</text>
+                                {{ item.min_price || '' }}
                                 <template v-if="propIsShow.includes('price_unit')">
-                                    <text :style="propGoodStyle.goods_price_unit_style">{{ item.show_price_unit }}</text>
+                                    <text :style="propGoodStyle.goods_price_unit_style">{{ item.show_price_unit || '' }}</text>
                                 </template>
                             </view>
                         </view>
@@ -29,7 +29,7 @@
             </view>
         </template>
         <template v-else-if="propFlex === 'col_price_float'">
-            <view v-for="(item, index) in propValue" :key="index" :style="block_size">
+            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h">
                 <view class="w h oh" :style="style_container">
                     <view class="w h flex-col gap-10" :style="style_img_container" :data-index="index" :data-value="item.goods_url" @tap="url_event">
                         <view class="w h flex-1 pr oh">
@@ -44,19 +44,19 @@
                                 </view>
                             </template>
                             <view v-if="propIsShow.includes('price')" class="pa" :style="propGoodStyle.goods_price_style + float_pirce_style">
-                                <text :style="propGoodStyle.goods_price_symbol_style">{{ item.show_price_symbol }}</text>{{ item.min_price }}
+                                <text :style="propGoodStyle.goods_price_symbol_style">{{ item.show_price_symbol || ''}}</text>{{ item.min_price  || ''}}
                                 <template v-if="propIsShow.includes('price_unit')">
-                                    <text :style="propGoodStyle.goods_price_unit_style">{{ item.show_price_unit }}</text>
+                                    <text :style="propGoodStyle.goods_price_unit_style">{{ item.show_price_unit || ''}}</text>
                                 </template>
                             </view>
                         </view>
-                        <view v-if="propIsShow.includes('title')" class="text-line-1 tl w" :style="propGoodStyle.goods_title_style + 'height:'+ ((propGoodStyle.goods_title_size + 3) * 2) + 'rpx;'">{{ item.title }}</view>
+                        <view v-if="propIsShow.includes('title')" class="text-line-1 tl w" :style="propGoodStyle.goods_title_style + 'height:'+ ((propGoodStyle.goods_title_size + 3) * 2) + 'rpx;'">{{ item.title || '' }}</view>
                     </view>
                 </view>
             </view>
         </template>
         <template v-else>
-            <view v-for="(item, index) in propValue" :key="index" :style="block_size">
+            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h">
                 <view class="w h oh" :style="style_container">
                     <view class="w h flex-col" :style="style_img_container" :data-index="index" :data-value="item.goods_url" @tap="url_event">
                         <template v-if="!isEmpty(item.new_cover)">
@@ -70,11 +70,11 @@
                             </view>
                         </template>
                         <view v-if="!isEmpty(propIsShow)" class="flex-col w h tl jc-sb">
-                            <view v-if="propIsShow.includes('title')" class="text-line-2" :style="propGoodStyle.goods_title_style + 'height:'+ ((propGoodStyle.goods_title_size + 3) * 4) + 'rpx;'">{{ item.title }}</view>
+                            <view v-if="propIsShow.includes('title')" class="text-line-2" :style="propGoodStyle.goods_title_style + 'height:'+ ((propGoodStyle.goods_title_size + 3) * 4) + 'rpx;'">{{ item.title || '' }}</view>
                             <view v-if="propIsShow.includes('price')" :style="propGoodStyle.goods_price_style">
-                                <text :style="propGoodStyle.goods_price_symbol_style">{{ item.show_price_symbol }}</text>{{ item.min_price }}
+                                <text :style="propGoodStyle.goods_price_symbol_style">{{ item.show_price_symbol || ''}}</text>{{ item.min_price || '' }}
                                 <template v-if="propIsShow.includes('price_unit')">
-                                    <text :style="propGoodStyle.goods_price_unit_style">{{ item.show_price_unit }}</text>
+                                    <text :style="propGoodStyle.goods_price_unit_style">{{ item.show_price_unit || ''}}</text>
                                 </template>
                             </view>
                         </view>