From 0c713ad4f0da9a027efc10d6fc0c36f026ace370 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, 22 Oct 2024 13:37:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AE=E6=92=AD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/carousel.vue   | 60 +++++++++++-----------
 components/diy/goods-list.vue | 93 ++++++++++++++++++-----------------
 pages/index/index.vue         |  4 +-
 3 files changed, 83 insertions(+), 74 deletions(-)

diff --git a/components/diy/carousel.vue b/components/diy/carousel.vue
index d2dec3d6..2abb4e95 100644
--- a/components/diy/carousel.vue
+++ b/components/diy/carousel.vue
@@ -3,38 +3,42 @@
         <view class="pr" :style="style_img_container">
             <swiper circular="true" :autoplay="form.is_roll == '1'" :interval="form.interval_time * 1000" :display-multiple-items="slides_per_group" :duration="500" :style="{ height: swiper_height }" :previous-margin="previousMargin" :next-margin="nextMargin" @change="slideChange">
                 <block v-if="form.carousel_type == 'card'">
-                    <swiper-item v-for="(item, index) in new_list" :key="index" class="flex-row align-c" :data-value="item.carousel_link.page" @tap="url_open">
-                        <view class="swiper-item" :style="img_style" :class="['scale-defalt', { 'scale-1': animationData === index }]">
-                            <imageEmpty :propImageSrc="item.carousel_img[0]" :propStyle="img_style" :propImgFit="img_fit" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
-                        </view>
-                        <view v-if="new_style.video_is_show == '1' && item.carousel_video.length > 0" :class="{ 'x-middle': new_style.video_location == 'center', 'right-0': new_style.video_location == 'flex-end' }" class="video-class flex-row pa gap-10 align-c oh" :style="video_style" :data-value="item.carousel_video" @tap.stop="video_play">
-                            <block v-if="new_style.video_type == 'img'">
-                                <view class="video_img">
-                                    <imageEmpty :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></imageEmpty>
-                                </view>
-                            </block>
-                            <block v-else>
-                                <iconfont :name="!isEmpty(new_style.video_icon_class) ? 'icon-' + new_style.video_icon_class : 'icon-bofang'" size="'28rpx'" :color="new_style.video_icon_color" propContainerDisplay="flex"></iconfont>
-                            </block>
-                            <text v-if="!isEmpty(item.video_title)" :style="{ color: new_style.video_title_color, 'font-size': new_style.video_title_size * 2 + 'rpx', 'text-wrap': 'nowrap' }">{{ item.video_title }}</text>
+                    <swiper-item v-for="(item, index) in new_list" :key="index">
+                        <view class="flex-row align-c" :data-value="item.carousel_link.page" @tap="url_open">
+                            <view class="swiper-item" :style="img_style" :class="['scale-defalt', { 'scale-1': animationData === index }]">
+                                <imageEmpty :propImageSrc="item.carousel_img[0]" :propStyle="img_style" :propImgFit="img_fit" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
+                            </view>
+                            <view v-if="new_style.video_is_show == '1' && item.carousel_video.length > 0" :class="{ 'x-middle': new_style.video_location == 'center', 'right-0': new_style.video_location == 'flex-end' }" class="video-class flex-row pa gap-10 align-c oh" :style="video_style" :data-value="item.carousel_video" @tap.stop="video_play">
+                                <block v-if="new_style.video_type == 'img'">
+                                    <view class="video_img">
+                                        <imageEmpty :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></imageEmpty>
+                                    </view>
+                                </block>
+                                <block v-else>
+                                    <iconfont :name="!isEmpty(new_style.video_icon_class) ? 'icon-' + new_style.video_icon_class : 'icon-bofang'" size="'28rpx'" :color="new_style.video_icon_color" propContainerDisplay="flex"></iconfont>
+                                </block>
+                                <text v-if="!isEmpty(item.video_title)" :style="{ color: new_style.video_title_color, 'font-size': new_style.video_title_size * 2 + 'rpx', 'text-wrap': 'nowrap' }">{{ item.video_title }}</text>
+                            </view>
                         </view>
                     </swiper-item>
                 </block>
                 <block v-else>
-                    <swiper-item v-for="(item, index) in new_list" :key="index" :style="['oneDragOne', 'twoDragOne'].includes(form.carousel_type) ? 'padding-right:' + new_style.image_spacing * 2 + 'rpx;' : ''" :data-value="item.carousel_link.page" @tap="url_open">
-                        <view class="wh-auto ht-auto pr" :style="img_style">
-                            <imageEmpty :propImageSrc="item.carousel_img[0]" :propStyle="img_style" :propImgFit="img_fit" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
-                        </view>
-                        <view v-if="new_style.video_is_show == '1' && item.carousel_video.length > 0" :class="{ 'x-middle': new_style.video_location == 'center', 'right-0': new_style.video_location == 'flex-end' }" class="video-class flex-row pa gap-10 align-c oh" :style="video_style" :data-value="item.carousel_video" @tap.stop="video_play">
-                            <block v-if="new_style.video_type == 'img'">
-                                <view class="video_img">
-                                    <imageEmpty :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></imageEmpty>
-                                </view>
-                            </block>
-                            <block v-else>
-                                <iconfont :name="!isEmpty(new_style.video_icon_class) ? 'icon-' + new_style.video_icon_class : 'icon-bofang'" size="'28rpx'" :color="new_style.video_icon_color" propContainerDisplay="flex"></iconfont>
-                            </block>
-                            <text v-if="!isEmpty(item.video_title)" :style="{ color: new_style.video_title_color, 'font-size': new_style.video_title_size * 2 + 'rpx', 'text-wrap': 'nowrap' }">{{ item.video_title }}</text>
+                    <swiper-item v-for="(item, index) in new_list" :key="index">
+                        <view :style="['oneDragOne', 'twoDragOne'].includes(form.carousel_type) ? 'padding-right:' + new_style.image_spacing * 2 + 'rpx;' : ''" :data-value="item.carousel_link.page" @tap="url_open">
+                            <view class="wh-auto ht-auto pr" :style="img_style">
+                                <imageEmpty :propImageSrc="item.carousel_img[0]" :propStyle="img_style" :propImgFit="img_fit" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
+                            </view>
+                            <view v-if="new_style.video_is_show == '1' && item.carousel_video.length > 0" :class="{ 'x-middle': new_style.video_location == 'center', 'right-0': new_style.video_location == 'flex-end' }" class="video-class flex-row pa gap-10 align-c oh" :style="video_style" :data-value="item.carousel_video" @tap.stop="video_play">
+                                <block v-if="new_style.video_type == 'img'">
+                                    <view class="video_img">
+                                        <imageEmpty :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></imageEmpty>
+                                    </view>
+                                </block>
+                                <block v-else>
+                                    <iconfont :name="!isEmpty(new_style.video_icon_class) ? 'icon-' + new_style.video_icon_class : 'icon-bofang'" size="'28rpx'" :color="new_style.video_icon_color" propContainerDisplay="flex"></iconfont>
+                                </block>
+                                <text v-if="!isEmpty(item.video_title)" :style="{ color: new_style.video_title_color, 'font-size': new_style.video_title_size * 2 + 'rpx', 'text-wrap': 'nowrap' }">{{ item.video_title }}</text>
+                            </view>
                         </view>
                     </swiper-item>
                 </block>
diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue
index 038ebf06..9418a6ac 100644
--- a/components/diy/goods-list.vue
+++ b/components/diy/goods-list.vue
@@ -1,9 +1,9 @@
 <template>
-    <view v-if="!isEmpty(list)" class="oh" :style="style_container">
+    <view v-if="!isEmpty(list)" class="oh" :style="style_container" @tap.stop="onTap">
         <view class="oh" :style="style_img_container">
             <view :class="outer_class" :style="onter_style">
                 <block v-if="!['5'].includes(theme)">
-                    <view v-for="(item, index) in list" :key="index" class="pr" :class="layout_type" :style="layout_style" :data-index="index" :data-value="item.goods_url" @tap="url_event">
+                    <view v-for="(item, index) in list" :key="index" class="pr" :class="layout_type" :style="layout_style" :data-index="index" :data-value="item.goods_url" @tap.stop="url_event_1">
                         <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>
@@ -106,57 +106,60 @@
                 </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" :data-index="index1" :data-split-index="index" :data-value="item.goods_url" @tap="url_event">
-                                <block v-if="!isEmpty(item)">
-                                    <view v-if="!isEmpty(item.new_cover)" :class="'flex-img' + theme">
-                                        <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
-                                    </view>
-                                    <view v-else :class="'flex-img' + theme">
-                                        <imageEmpty :propImageSrc="item.images" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
-                                    </view>
-                                </block>
-                                <view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('plugins_view_icon') || is_show('original_price') || form.is_shop_show == '1'" 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') || (['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc'))" class="flex-col" :style="{ gap: new_style.title_simple_desc_spacing * 2 + 'rpx' }">
-                                            <view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
-                                            <view v-if="['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc')" class="text-line-1" :style="simple_desc">{{ item.simple_desc }}</view>
+                        <swiper-item v-for="(item1, index1) in shop_content_list" :key="index1">
+                            <view 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" :data-index="index1" :data-split-index="index" :data-value="item.goods_url" @tap.stop="url_event_1">
+                                    <block v-if="!isEmpty(item)">
+                                        <view v-if="!isEmpty(item.new_cover)" :class="'flex-img' + theme">
+                                            <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
                                         </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 v-else :class="'flex-img' + theme">
+                                            <imageEmpty :propImageSrc="item.images" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
                                         </view>
-                                    </view>
-                                    <view class="flex-row align-c jc-sb">
-                                        <view class="flex-row align-c nowrap">
-                                            <view v-if="is_show('price') && !isEmpty(item.min_price)" class="num" :style="'color:' + new_style.shop_price_color">
-                                                <text class="identifying">{{ item.show_price_symbol }}</text>
-                                                <text :style="price_style">{{ item.min_price }}</text>
-                                                <text v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</text>
+                                    </block>
+                                    <view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('plugins_view_icon') || is_show('original_price') || form.is_shop_show == '1'" 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') || (['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc'))" class="flex-col" :style="{ gap: new_style.title_simple_desc_spacing * 2 + 'rpx' }">
+                                                <view v-if="is_show('title')" :class="text_line" :style="title_style">{{ item.title }}</view>
+                                                <view v-if="['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc')" class="text-line-1" :style="simple_desc">{{ item.simple_desc }}</view>
                                             </view>
-                                            <view v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="text-size-xss flex">
-                                                <image v-if="form.static_img.length > 0" class="original-price-left" :src="form.static_img[0].url" model="widthFix"></image>
-                                                <text :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>
-                                                </text>
+                                            <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="form.is_shop_show == '1'" class="pr" :data-index="index1" :data-split-index="index" @tap.stop="goods_button_event">
-                                            <block v-if="form.shop_type == 'text'">
-                                                <view class="plr-11 padding-vertical-xs round" :style="button_style + ('color:' + new_style.shop_button_text_color)">{{ form.shop_button_text }}</view>
-                                            </block>
-                                            <view v-else class="round padding-horizontal-sm ptb-5" :style="button_gradient">
-                                                <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'" propContainerDisplay="flex"></iconfont>
+                                        <view class="flex-row align-c jc-sb">
+                                            <view class="flex-row align-c nowrap">
+                                                <view v-if="is_show('price') && !isEmpty(item.min_price)" class="num" :style="'color:' + new_style.shop_price_color">
+                                                    <text class="identifying">{{ item.show_price_symbol }}</text>
+                                                    <text :style="price_style">{{ item.min_price }}</text>
+                                                    <text v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</text>
+                                                </view>
+                                                <view v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="text-size-xss flex">
+                                                    <image v-if="form.static_img.length > 0" class="original-price-left" :src="form.static_img[0].url" model="widthFix"></image>
+                                                    <text :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>
+                                                    </text>
+                                                </view>
                                             </view>
-                                            <view v-if="form.shop_button_effect == '1'" class="cart-badge-icon pa badge-style">
-                                                <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
+                                            <view v-if="form.is_shop_show == '1'" class="pr" :data-index="index1" :data-split-index="index" @tap.stop="goods_button_event">
+                                                <block v-if="form.shop_type == 'text'">
+                                                    <view class="plr-11 padding-vertical-xs round" :style="button_style + ('color:' + new_style.shop_button_text_color)">{{ form.shop_button_text }}</view>
+                                                </block>
+                                                <view v-else class="round padding-horizontal-sm ptb-5" :style="button_gradient">
+                                                    <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'" propContainerDisplay="flex"></iconfont>
+                                                </view>
+                                                <view v-if="form.shop_button_effect == '1'" class="cart-badge-icon pa badge-style">
+                                                    <component-badge :propNumber="item.user_cart_count || 0"></component-badge>
+                                                </view>
                                             </view>
                                         </view>
                                     </view>
                                 </view>
                             </view>
+                            
                         </swiper-item>
                     </swiper>
                 </block>
@@ -422,7 +425,8 @@
                 }
                 return style;
             },
-            url_event(e) {
+            url_event_1(e) {
+                console.log('跳转', e);
                 let index = e.currentTarget.dataset.index || 0;
                 let goods = this.list[index];
                 let split_index = 0;
@@ -431,7 +435,8 @@
                     goods = this.shop_content_list[index].split_list[split_index];
                 }
                 app.globalData.goods_data_cache_handle(goods.id, goods);
-
+                console.log('跳转', e);
+                console.log('商品信息', goods);
                 app.globalData.url_event(e);
             },
             goods_button_event(e) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5fc3c753..714a81b7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,9 +13,9 @@
                             <component-copyright></component-copyright>
                         </template>
                         <!-- 底部公共 -->
-                        <template slot="diy-bottom-common">
+                        <!-- <template slot="diy-bottom-common">
                             <component-common ref="common" :propIsGrayscale="plugins_mourning_data_is_app"></component-common>
-                        </template>
+                        </template> -->
                     </componentDiy>
                 </block>
                 <block v-else>