From d1bb6c37153e32dc60ec1df10675f3188eed565b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 13 Sep 2024 15:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=8D=A1=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/goods-tabs.vue        | 136 ---------------------------
 components/diy/modules/tabs-view.vue |   5 +-
 2 files changed, 3 insertions(+), 138 deletions(-)

diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue
index 4b222511..7c115f60 100644
--- a/components/diy/goods-tabs.vue
+++ b/components/diy/goods-tabs.vue
@@ -5,142 +5,6 @@
             <componentGoodsList :key="key" :value="goods_tabs" :is-common-style="false"></componentGoodsList>
         </view>
     </view>
-        <view :class="outer_class" :style="onter_style">
-            <block v-if="!['5'].includes(theme)">
-                <view v-for="(item, index) in list" :key="index" class="re" :class="layout_type" :style="layout_style">
-                    <block v-if="theme == '6'">
-                        <view :class="['flex-row align-c jc-sb ptb-15 mlr-10 gap-20', { 'br-b-e': index != list.length - 1 }]">
-                            <view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
-                            <view 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="price_style">{{ item.min_price }}</span>
-                                <span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
-                            </view>
-                        </view>
-                    </block>
-                    <block v-else>
-                        <block v-if="!isEmpty(item)">
-                            <block v-if="!isEmpty(item.new_cover)">
-                                <image-empty :image-src="item.new_cover[0]" :class="'flex-img' + theme" :style="content_img_radius" error-style="width: 100rpx;height: 100rpx;"></image-empty>
-                            </block>
-                            <block v-else>
-                                <image-empty :image-src="item.images" :class="'flex-img' + theme" :style="content_img_radius" error-style="width: 100rpx;height: 100rpx;"></image-empty>
-                            </block>
-                        </block>
-                        <view class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
-                            <view class="flex-col gap-10 top-title">
-                                <view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
-                                <view v-if="show_content && is_show('plugins_view_icon') && !isEmpty(item.plugins_view_icon_data)" class="flex-row gap-5 align-c">
-                                    <view v-for="(icon_data, icon_index) in item.plugins_view_icon_data" :key="icon_index" class="radius text-size-xsss padding-horizontal-xs" :style="{background: icon_data.bg_color, color: icon_data.color, border: '1rpx solid' + (!isEmpty(icon_data.br_color) ? icon_data.br_color : icon_data.bg_color)}">{{ icon_data.name }}</view>
-                                </view>
-                            </view>
-                            <view v-if="!['3', '4', '5'].includes(form.theme)" class="flex-col gap-5 oh">
-                                <view :class="[form.is_price_solo == '1' ? 'flex-row align-c nowrap' : 'flex-col gap-5']">
-                                    <view v-if="is_show('price')" class="num" :style="'color:' + new_style.shop_price_color">
-                                        <span class="identifying">{{ item.show_price_symbol }}</span><span :style="price_style">{{ item.min_price }}</span>
-                                        <span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
-                                    </view>
-                                    <view v-if="show_content && is_show('original_price')" class="text-size-xss flex-row">
-                                        <span class="original-price-left"></span><span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]">{{ item.show_original_price_symbol }}{{ item.min_original_price }}
-                                            <block v-if="is_show('original_price_unit')">
-                                                {{ item.show_original_price_unit }}
-                                            </block>
-                                        </span>
-                                    </view>
-                                </view>
-                                <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')" :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>
-                                    </view>
-                                    <view v-if="form.is_shop_show == '1'">
-                                        <block v-if="form.shop_type == 'text'">
-                                            <view class="plr-11 ptb-3 round" :style="button_style + ('color:' + new_style.shop_button_text_color)">{{ form.shop_button_text }}</view>
-                                        </block>
-                                        <block v-else>
-                                            <icon class="round plr-6 ptb-5" :name="!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart'" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size + ''" :styles="button_gradient()"></icon>
-                                        </block>
-                                    </view>
-                                </view>
-                            </view>
-                            <view v-else class="flex-row align-c jc-sb">
-                                <view class="flex-row align-c nowrap">
-                                    <view v-if="is_show('price')" class="num" :style="'color:' + new_style.shop_price_color">
-                                        <span class="identifying">{{ item.show_price_symbol }}</span><span :style="price_style">{{ item.min_price }}</span>
-                                        <span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
-                                    </view>
-                                    <view v-if="show_content && is_show('original_price')" class="text-size-xss flex-row">
-                                        <span class="original-price-left"></span><span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]">{{ item.show_original_price_symbol }}{{ item.min_original_price }}
-                                            <block v-if="is_show('original_price_unit')">
-                                                {{ item.show_original_price_unit }}
-                                            </block>
-                                        </span>
-                                    </view>
-                                </view>
-                                <view v-if="form.is_shop_show == '1'">
-                                    <block v-if="form.shop_type == 'text'">
-                                        <view class="plr-11 ptb-3 round" :style="button_style + ('color:' + new_style.shop_button_text_color)">{{ form.shop_button_text }}</view>
-                                    </block>
-                                    <block v-else>
-                                        <icon class="round plr-6 ptb-5" :name="!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart'" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size + ''" :styles="button_gradient()"></icon>
-                                    </block>
-                                </view>
-                            </view>
-                        </view>
-                    </block>
-                </view>
-            </block>
-            <block v-else>
-                <swiper circular="true" :autoplay="new_style.is_roll == '1'" :interval="new_style.interval_time * 1000" :duration="500" :style="{ width:'100%', height: new_style.content_outer_height * 2 + 'rpx' }">
-                    <swiper-item v-for="(item1, index1) in shop_content_list" :key="index1" class="flex-row" :style="onter_style">
-                        <view v-for="(item, index) in item1.split_list" :key="index" class="pr" :class="layout_type" :style="layout_style">
-                            <block v-if="!isEmpty(item)">
-                                <block v-if="!isEmpty(item.new_cover)">
-                                    <image-empty :image-src="item.new_cover[0]" :class="'flex-img' + theme" :style="content_img_radius" error-style="width: 100rpx;height: 100rpx;"></image-empty>
-                                </block>
-                                <block v-else>
-                                    <image-empty :image-src="item.images" :class="'flex-img' + theme" :style="content_img_radius" error-style="width: 100rpx;height: 100rpx;"></image-empty>
-                                </block>
-                            </block>
-                            <view class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
-                                <view class="flex-col gap-10 top-title">
-                                    <view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
-                                    <view v-if="show_content && is_show('plugins_view_icon') && !isEmpty(item.plugins_view_icon_data)" class="flex-row gap-5 align-c">
-                                        <view v-for="(icon_data, icon_index) in item.plugins_view_icon_data" :key="icon_index" class="radius text-size-xsss padding-horizontal-xs" :style="{background: icon_data.bg_color, color: icon_data.color, border: '1rpx solid' + (!isEmpty(icon_data.br_color) ? icon_data.br_color : icon_data.bg_color)}">{{ icon_data.name }}</view>
-                                    </view>
-                                </view>
-                                <view class="flex-row align-c jc-sb">
-                                    <view class="flex-row align-c nowrap">
-                                        <view v-if="is_show('price')" class="num" :style="'color:' + new_style.shop_price_color">
-                                            <span class="identifying">{{ item.show_price_symbol }}</span><span :style="price_style">{{ item.min_price }}</span>
-                                            <span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
-                                        </view>
-                                        <view v-if="show_content && is_show('original_price')" class="text-size-xss flex">
-                                            <span class="original-price-left"></span><span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]">{{ item.show_original_price_symbol }}{{ item.min_original_price }}
-                                                <block v-if="is_show('original_price_unit')">
-                                                    {{ item.show_original_price_unit }}
-                                                </block>
-                                            </span>
-                                        </view>
-                                    </view>
-                                    <view v-if="form.is_shop_show == '1'">
-                                        <block v-if="form.shop_type == 'text'">
-                                            <view class="plr-11 ptb-3 round" :style="button_style + ('color:' + new_style.shop_button_text_color)">{{ form.shop_button_text }}</view>
-                                        </block>
-                                        <block v-else>
-                                            <icon class="round plr-6 ptb-5" :name="!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart'" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size + ''" :styles="button_gradient()"></icon>
-                                        </block>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                    </swiper-item>
-                </swiper>
-            </block>
-        </view>
-    </view>
 </template>
 
 <script>
diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue
index 291a85e1..69353c33 100644
--- a/components/diy/modules/tabs-view.vue
+++ b/components/diy/modules/tabs-view.vue
@@ -2,7 +2,7 @@
     <!-- 文章列表 -->
     <view class="tabs flex-row oh" :style="'column-gap: ' + tabs_spacing + 'px;'">
         <view v-for="(item, index) in tabs_list" :key="index" class="item nowrap flex-col jc-c gap-4" :class="tabs_theme + (index == active_index ? ' active' : '')" :data-index="index" @tap="handle_event">
-            <image v-if="item.img" :src="item.img[0].url" class="img" mode="widthFix" />
+            <image v-if="!isEmpty(item.img)" :src="item.img[0].url" class="img" mode="widthFix" />
             <view class="title" :style="index == active_index ? tabs_theme_style.tabs_title_checked : tabs_theme_style.tabs_title">{{ item.title }}</view>
             <view class="desc" :style="tabs_theme_index == '1' && index == active_index ? tabs_check : ''">{{ item.desc }}</view>
             <iconfont name="icon-checked-1" class="icon" :style="tabs_theme_index == '3' ? icon_tabs_check : ''"></iconfont>
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-    import { gradient_computer } from '@/common/js/common/common.js';
+    import { gradient_computer, isEmpty } from '@/common/js/common/common.js';
     export default {
         props: {
             value: {
@@ -40,6 +40,7 @@
             this.init();
         },
         methods: {
+            isEmpty,
             init() {
                 const new_content = this.value.content || {};
                 const new_style = this.value.style || {};