From 2e5536e67b1cc443c86ff2d0325cd464d932d679 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 14:07:24 +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

---
 components/diy/article-list.vue      |  40 ++++++-----
 components/diy/header.vue            |   2 +-
 components/diy/modules/tabs-view.vue |   1 -
 components/diy/nav-group.vue         |  16 +++--
 components/diy/search.vue            |  12 +++-
 components/diy/seckill.vue           | 104 ++++++++++++++-------------
 6 files changed, 94 insertions(+), 81 deletions(-)

diff --git a/components/diy/article-list.vue b/components/diy/article-list.vue
index 164ec610..d6fdb706 100644
--- a/components/diy/article-list.vue
+++ b/components/diy/article-list.vue
@@ -32,25 +32,27 @@
                 </view>
                 <view v-else class="oh" :class="article_theme_class">
                     <swiper class="swiper" circular :autoplay="is_roll ? true : false" :interval="interval_time" :style="'height:' + carousel_height_computer">
-                        <swiper-item v-for="(item1, index1) in article_carousel_list" :key="index1" class="flex-row" :style="article_spacing">
-                            <view v-for="(item, index) in item1.carousel_list" :key="index" class="item bg-white oh flex-col" :style="article_style" :data-value="item.data.url" @tap="url_event">
-                                <template v-if="item.new_cover.length > 0">
-                                    <image :src="item.new_cover[0].url" class="img" :style="img_radius + article_item_height" mode="aspectFill" />
-                                </template>
-                                <template v-else>
-                                    <image :src="item.data.cover" class="img" :style="img_radius + article_item_height" mode="aspectFill" />
-                                </template>
-                                <view class="jc-sb flex-1 flex-col" :style="article_theme !== '0' ? content_padding : ''">
-                                    <div class="flex-col" :style="'gap:' + name_desc_space + 'px;'">
-                                        <div class="title text-line-2" :style="article_name + article_name_height_computer">{{ item.new_title ? item.new_title : item.data.title }}</div>
-                                        <div v-if="field_show.includes('2')" class="desc text-line-1" :style="article_desc">{{ item.data.describe || '' }}</div>
-                                    </div>
-                                    <view class="flex-row jc-sb gap-8 align-e margin-top">
-                                        <view :style="article_date">{{ field_show.includes('0') ? item.data.add_time : '' }}</view>
-                                        <view v-show="field_show.includes('1')" class="flex-row align-c gap-3" :style="article_page_view">
-                                            <iconfont name="icon-eye" propContainerDisplay="flex"></iconfont>
-                                            <view>
-                                                {{ item.data.access_count ? item.data.access_count : '' }}
+                        <swiper-item v-for="(item1, index1) in article_carousel_list" :key="index1">
+                            <view class="flex-row" :style="article_spacing">
+                                <view v-for="(item, index) in item1.carousel_list" :key="index" class="item bg-white oh flex-col" :style="article_style" :data-value="item.data.url" @tap="url_event">
+                                    <template v-if="item.new_cover.length > 0">
+                                        <image :src="item.new_cover[0].url" class="img" :style="img_radius + article_item_height" mode="aspectFill" />
+                                    </template>
+                                    <template v-else>
+                                        <image :src="item.data.cover" class="img" :style="img_radius + article_item_height" mode="aspectFill" />
+                                    </template>
+                                    <view class="jc-sb flex-1 flex-col" :style="article_theme !== '0' ? content_padding : ''">
+                                        <div class="flex-col" :style="'gap:' + name_desc_space + 'px;'">
+                                            <div class="title text-line-2" :style="article_name + article_name_height_computer">{{ item.new_title ? item.new_title : item.data.title }}</div>
+                                            <div v-if="field_show.includes('2')" class="desc text-line-1" :style="article_desc">{{ item.data.describe || '' }}</div>
+                                        </div>
+                                        <view class="flex-row jc-sb gap-8 align-e margin-top">
+                                            <view :style="article_date">{{ field_show.includes('0') ? item.data.add_time : '' }}</view>
+                                            <view v-show="field_show.includes('1')" class="flex-row align-c gap-3" :style="article_page_view">
+                                                <iconfont name="icon-eye" propContainerDisplay="flex"></iconfont>
+                                                <view>
+                                                    {{ item.data.access_count ? item.data.access_count : '' }}
+                                                </view>
                                             </view>
                                         </view>
                                     </view>
diff --git a/components/diy/header.vue b/components/diy/header.vue
index 31f8ac08..83d9a9ff 100644
--- a/components/diy/header.vue
+++ b/components/diy/header.vue
@@ -23,7 +23,7 @@
                                                         </view>
                                                     </template>
                                                     <view v-if="['1', '2'].includes(form.content.theme)">{{ form.content.title }}</view>
-                                                    <template v-if="['3', '5'].includes(form.content.theme) && !is_search_alone_row">
+                                                    <template v-if="['3'].includes(form.content.theme) && !is_search_alone_row">
                                                         <view class="flex-1">
                                                             <componentDiySearch :propValue="form" :propIsPageSettings="true"></componentDiySearch>
                                                         </view>
diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue
index 6696943f..cc55b9f1 100644
--- a/components/diy/modules/tabs-view.vue
+++ b/components/diy/modules/tabs-view.vue
@@ -3,7 +3,6 @@
     <uv-sticky :disabled="!propIsTop" :offset-top="propTop" :zIndex="propZIndex" :customNavHeight="propCustomNavHeight">
         <view class="tabs-view flex-row gap-10 jc-sb align-c" :style="propStyle + propTabsBackground">
             <view class="tabs flex-1 flex-width">
-            {{ tabs_list }}
                 <scroll-view :scroll-x="true" :show-scrollbar="false" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-' + active_index" class="wh-auto">
                     <view class="flex-row">
                         <view v-for="(item, index) in tabs_list" :key="index" :id="'one-nav-item-' + index" class="item nowrap flex-col jc-c align-c gap-4" :class="tabs_theme + (index == active_index ? ' active' : '') + ((tabs_theme_index == '0' && tabs_theme_1_style) || tabs_theme_index == '1' || tabs_theme_index == '2' ? ' pb-0' : '')" :style="'margin-left:' + (index == 0 ? '0' : tabs_spacing) + 'rpx;margin-right:' + (index - 1 == tabs_list ? '0' : tabs_spacing) + 'rpx;'" :data-index="index" @tap="handle_event">
diff --git a/components/diy/nav-group.vue b/components/diy/nav-group.vue
index 73d29316..b40bd023 100644
--- a/components/diy/nav-group.vue
+++ b/components/diy/nav-group.vue
@@ -2,15 +2,17 @@
     <view :style="style_container">
         <view :style="style_img_container">
             <swiper circular="true" :autoplay="new_style.is_roll == '1'" :interval="new_style.interval_time * 1000" :duration="500" :style="{ height: new_height }" @change="slideChange">
-                <swiper-item v-for="(item, index) in nav_content_list" :key="index" class="flex-row align-c">
-                    <view class="banner-img flex-row flex-wrap wh-auto" :class="'banner-img-' + propKey" :style="space">
-                        <view v-for="(item1, index1) in item.split_list" :key="index1" class="flex-col gap-10 align-c" :style="group_width + nav_title_space" :data-value="item1.link.page" @tap="url_open_event">
-                            <view v-if="['image_with_text', 'image'].includes(nav_style)" class="flex-row align-c jc-c">
-                                <view class="top-img" :style="img_size">
-                                    <imageEmpty :propImageSrc="item1.img[0]" :propStyle="img_style" propErrorStyle="width: 60rpx;height: 60rpx;"></imageEmpty>
+                <swiper-item v-for="(item, index) in nav_content_list" :key="index">
+                    <view  class="flex-row align-c">
+                        <view class="banner-img flex-row flex-wrap wh-auto" :class="'banner-img-' + propKey" :style="space">
+                            <view v-for="(item1, index1) in item.split_list" :key="index1" class="flex-col gap-10 align-c" :style="group_width + nav_title_space" :data-value="item1.link.page" @tap="url_open_event">
+                                <view v-if="['image_with_text', 'image'].includes(nav_style)" class="flex-row align-c jc-c">
+                                    <view class="top-img" :style="img_size">
+                                        <imageEmpty :propImageSrc="item1.img[0]" :propStyle="img_style" propErrorStyle="width: 60rpx;height: 60rpx;"></imageEmpty>
+                                    </view>
                                 </view>
+                                <view v-if="['image_with_text', 'text'].includes(nav_style)" class="wh-auto size-12 ma-0 nowrap oh tc" :style="text_style">{{ item1.title }}</view>
                             </view>
-                            <view v-if="['image_with_text', 'text'].includes(nav_style)" class="wh-auto size-12 ma-0 nowrap oh tc" :style="text_style">{{ item1.title }}</view>
                         </view>
                     </view>
                 </swiper-item>
diff --git a/components/diy/search.vue b/components/diy/search.vue
index cfcc9e7a..bae2a260 100644
--- a/components/diy/search.vue
+++ b/components/diy/search.vue
@@ -2,7 +2,7 @@
     <view :style="style_container">
         <view :style="style_img_container">
             <view class="search wh-auto pr" :style="style">
-                <view class="box oh flex-row align-c gap-10" :style="box_style" @tap="search_tap">
+                <view class="box oh flex-row align-c gap-10" :style="box_style" @tap.stop="search_tap">
                     <view v-if="form.is_icon_show == '1'" class="search-icon" @tap.stop="search_icon_tap">
                         <template v-if="form.icon_img.length > 0">
                             <view class="img-box">
@@ -17,7 +17,11 @@
                     </view>
                     <template v-if="!isEmpty(form.hot_word_list) && form.is_hot_word_show == '1'">
                         <swiper circular="true" :autoplay="new_style.is_roll == '1'" :interval="new_style.interval_time * 1000" :vertical="true" :duration="500" class="swiper_style" @change="slideChange">
-                            <swiper-item v-for="(item, index) in form.hot_word_list" :key="index" class="flex-row align-c" :style="{ color: !isEmpty(item.color) ? item.color : !isEmpty(new_style.hot_words_color) ? new_style.hot_words_color : '#999' }" :data-value="item.value" @tap.stop="serch_event">{{ item.value }}</swiper-item>
+                            <swiper-item v-for="(item, index) in form.hot_word_list" :key="index">
+                                <view class="flex-row align-c ht-auto" :style="{ color: !isEmpty(item.color) ? item.color : !isEmpty(new_style.hot_words_color) ? new_style.hot_words_color : '#999' }" :data-value="item.value" @tap.stop="serch_event">
+                                    {{ item.value }}
+                                </view>
+                            </swiper-item>
                         </swiper>
                     </template>
                     <template v-else>
@@ -127,12 +131,15 @@ export default {
             return style;
         },
         search_tap() {
+            console.log('111');
             app.globalData.url_open('/pages/goods-search-start/goods-search-start?keywords=' + this.keywords);
         },
         serch_event() {
+            console.log('222');
             app.globalData.url_open('/pages/goods-search-start/goods-search-start?keywords=' + this.keywords);
         },
         serch_button_event() {
+            console.log('333');
             if (!isEmpty(this.keywords)) {
                 app.globalData.url_open('pages/goods-search/goods-search?keywords=' + this.keywords);
             }
@@ -153,6 +160,7 @@ export default {
             return style;
         },
         search_icon_tap() {
+            console.log('search_icon_tap');
             if (isEmpty(this.form.icon_link)) {
                 this.search_tap();
                 return;
diff --git a/components/diy/seckill.vue b/components/diy/seckill.vue
index e4b2689c..1cbfbe32 100644
--- a/components/diy/seckill.vue
+++ b/components/diy/seckill.vue
@@ -102,62 +102,64 @@
                 </template>
                 <template v-else>
                     <swiper circular="false" :autoplay="new_style.is_roll == '1'" :next-margin="new_style.rolling_fashion == 'translation' ? '-' + content_outer_spacing_magin : '0rpx'" :interval="new_style.interval_time * 1000" :duration="500" :display-multiple-items="slides_per_group" :style="{ height: new_style.content_outer_height * 2 + 'rpx' }">
-                        <swiper-item v-for="(item1, index1) in list" :key="index1" :class="{ 'flex-row': new_style.rolling_fashion != 'translation' }" :style="new_style.rolling_fashion != 'translation' ? 'gap:' + content_outer_spacing_magin : ''">
-                            <view v-for="(item, index) in item1.split_list" :key="index" :class="layout_type" :style="content_radius + (form.shop_style_type == '1' ? content_padding : '') + (new_style.rolling_fashion != 'translation' ? layout_type_style : 'margin-right:' + content_outer_spacing_magin + ';height: 100%;whith: 100%')" :data-value="item.goods_url" @tap="url_event">
-                                <template v-if="!isEmpty(item)">
-                                    <view class="oh pr wh-auto ht-auto">
-                                        <view v-if="!isEmpty(item.new_cover)" :class="'flex-img' + form.shop_style_type">
-                                            <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="content_img_radius" propErrorStyle="width:100rpx; height: 100rpx;"></imageEmpty>
-                                        </view>
-                                        <view v-else :class="'flex-img' + form.shop_style_type">
-                                            <imageEmpty :propImageSrc="item.images" :propStyle="content_img_radius" propErrorStyle="width:100rpx; height: 100rpx;"></imageEmpty>
-                                        </view>
-                                        <view v-if="form.seckill_subscript_show == '1'" class="text-size-xs nowrap corner-marker" :style="corner_marker">
-                                            <text class="text-line-1">{{ form.subscript_text }}</text>
-                                        </view>
-                                    </view>
-                                </template>
-                                <view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('original_price') || form.is_shop_show == '1'"  class="flex-col gap-10 wh-auto flex-1 jc-sb" :style="content_style">
-                                    <view class="flex-col gap-10 wh-auto">
-                                        <!-- 标题 -->
-                                        <view v-if="is_show('title') || is_show('simple_desc')" class="flex-col" :style="{'gap': new_style.title_simple_desc_spacing * 2 + 'rpx'  }">
-                                            <view v-if="is_show('title')" :style="title_style" class="text-line-2">{{ item.title }}</view>
-                                            <view v-if="is_show('simple_desc')" class="text-line-1" :style="simple_desc">{{ item.simple_desc }}</view>
-                                        </view>
-                                        <!-- 进度条 -->
-                                        <!-- <view v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
-                                        <view class="re flex-1">
-                                            <view class="slide-bottom" :style="{ 'background': new_style.progress_bg_color }"></view>
-                                            <view class="slide-top" :style="'width: 51%;' + slide_active_color ">
-                                                <view class="slide-top-icon round" :style="{ 'background': new_style.progress_button_color}"><icon name="a-miaosha" :color="new_style.progress_button_icon_color" size="9"></icon></view>
+                        <swiper-item v-for="(item1, index1) in list" :key="index1">
+                            <view :class="{ 'flex-row': new_style.rolling_fashion != 'translation' }" :style="new_style.rolling_fashion != 'translation' ? 'gap:' + content_outer_spacing_magin : ''">
+                                <view v-for="(item, index) in item1.split_list" :key="index" :class="layout_type" :style="content_radius + (form.shop_style_type == '1' ? content_padding : '') + (new_style.rolling_fashion != 'translation' ? layout_type_style : 'margin-right:' + content_outer_spacing_magin + ';height: 100%;whith: 100%')" :data-value="item.goods_url" @tap="url_event">
+                                    <template v-if="!isEmpty(item)">
+                                        <view class="oh pr wh-auto ht-auto">
+                                            <view v-if="!isEmpty(item.new_cover)" :class="'flex-img' + form.shop_style_type">
+                                                <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="content_img_radius" propErrorStyle="width:100rpx; height: 100rpx;"></imageEmpty>
+                                            </view>
+                                            <view v-else :class="'flex-img' + form.shop_style_type">
+                                                <imageEmpty :propImageSrc="item.images" :propStyle="content_img_radius" propErrorStyle="width:100rpx; height: 100rpx;"></imageEmpty>
+                                            </view>
+                                            <view v-if="form.seckill_subscript_show == '1'" class="text-size-xs nowrap corner-marker" :style="corner_marker">
+                                                <text class="text-line-1">{{ form.subscript_text }}</text>
                                             </view>
                                         </view>
-                                        <text class="text-size-xss" :style="{ 'color': new_style.progress_text_color }">已抢51%</text>
-                                    </view> -->
-                                    </view>
-                                    <view class="flex-row align-e gap-10 jc-sb">
-                                        <view class="flex-col gap-5">
-                                            <view v-if="is_show('price') && !isEmpty(item.min_price)" class="num" :style="{ color: new_style.shop_price_color }">
-                                                <text v-if="form.shop_style_type == '1'" class="text-size-xss pr-4">秒杀价</text>
-                                                <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>
+                                    </template>
+                                    <view v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('original_price') || form.is_shop_show == '1'"  class="flex-col gap-10 wh-auto flex-1 jc-sb" :style="content_style">
+                                        <view class="flex-col gap-10 wh-auto">
+                                            <!-- 标题 -->
+                                            <view v-if="is_show('title') || is_show('simple_desc')" class="flex-col" :style="{'gap': new_style.title_simple_desc_spacing * 2 + 'rpx'  }">
+                                                <view v-if="is_show('title')" :style="title_style" class="text-line-2">{{ item.title }}</view>
+                                                <view v-if="is_show('simple_desc')" class="text-line-1" :style="simple_desc">{{ item.simple_desc }}</view>
                                             </view>
-                                            <view v-if="is_show('original_price') && !isEmpty(item.min_original_price)" class="size-11 flex" :style="{ color: new_style.original_price_color }">
-                                                <text class="original-price text-line-1 flex-1">
-                                                    {{ item.show_original_price_symbol }}{{ item.min_original_price }}
-                                                    <template v-if="is_show('original_price_unit')">
-                                                        {{ item.show_original_price_unit }}
-                                                    </template>
-                                                </text>
+                                            <!-- 进度条 -->
+                                            <!-- <view v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
+                                            <view class="re flex-1">
+                                                <view class="slide-bottom" :style="{ 'background': new_style.progress_bg_color }"></view>
+                                                <view class="slide-top" :style="'width: 51%;' + slide_active_color ">
+                                                    <view class="slide-top-icon round" :style="{ 'background': new_style.progress_button_color}"><icon name="a-miaosha" :color="new_style.progress_button_icon_color" size="9"></icon></view>
+                                                </view>
                                             </view>
+                                            <text class="text-size-xss" :style="{ 'color': new_style.progress_text_color }">已抢51%</text>
+                                        </view> -->
                                         </view>
-                                        <view v-if="form.is_shop_show == '1'">
-                                            <template v-if="form.shop_type == 'text'">
-                                                <view class="plr-11 padding-vertical-xs round cr-white" :style="button_style + 'color:' + new_style.shop_button_text_color">{{ form.shop_button_text }}</view>
-                                            </template>
-                                            <view v-else class="round padding-horizontal-sm ptb-5" :styles="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-e gap-10 jc-sb">
+                                            <view class="flex-col gap-5">
+                                                <view v-if="is_show('price') && !isEmpty(item.min_price)" class="num" :style="{ color: new_style.shop_price_color }">
+                                                    <text v-if="form.shop_style_type == '1'" class="text-size-xss pr-4">秒杀价</text>
+                                                    <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="is_show('original_price') && !isEmpty(item.min_original_price)" class="size-11 flex" :style="{ color: new_style.original_price_color }">
+                                                    <text class="original-price text-line-1 flex-1">
+                                                        {{ item.show_original_price_symbol }}{{ item.min_original_price }}
+                                                        <template v-if="is_show('original_price_unit')">
+                                                            {{ item.show_original_price_unit }}
+                                                        </template>
+                                                    </text>
+                                                </view>
+                                            </view>
+                                            <view v-if="form.is_shop_show == '1'">
+                                                <template v-if="form.shop_type == 'text'">
+                                                    <view class="plr-11 padding-vertical-xs round cr-white" :style="button_style + 'color:' + new_style.shop_button_text_color">{{ form.shop_button_text }}</view>
+                                                </template>
+                                                <view v-else class="round padding-horizontal-sm ptb-5" :styles="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>
                                         </view>
                                     </view>