From b996e95ae072246864e0f10eba8d2adc7e6d16e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 16 Oct 2024 14:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/carousel.vue | 68 +++++++++++++++++--------------------
 components/diy/search.vue   | 27 +++++++--------
 components/diy/seckill.vue  |  4 +--
 3 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/components/diy/carousel.vue b/components/diy/carousel.vue
index 9977d8dd..9771c2c4 100644
--- a/components/diy/carousel.vue
+++ b/components/diy/carousel.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="pr" :style="style_container">
         <view class="pr" :style="style_img_container">
-            <swiper v-if="hackReset" circular="true" :autoplay="form.is_roll == '1'" :interval="form.interval_time * 1000" :display-multiple-items="slides_per_group" :duration="500" :style="{ height: new_style.height * 2 + 'rpx' }" :previous-margin="previousMargin" :next-margin="nextMargin" @change="slideChange">
+            <swiper circular="true" :autoplay="form.is_roll == '1'" :interval="form.interval_time * 1000" :display-multiple-items="slides_per_group" :duration="500" :style="{ height: new_style.height * 2 + 'rpx' }" :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 }]">
@@ -105,7 +105,7 @@
                 previousMargin: '0rpx',
                 nextMargin: '0rpx',
                 slides_per_group: 1,
-                hackReset: true,
+                // hackReset: true,
             };
         },
         watch: {
@@ -134,22 +134,20 @@
                 } else if (new_form.img_fit == 'contain') {
                     fit = 'aspectFit';
                 }
-                this.$nextTick(() => {
-                    this.setData({
-                        form: this.propValue.content,
-                        new_style: this.propValue.style,
-                        seat_list: this.get_seat_list(new_form),
-                        new_list: new_form.carousel_type == 'inherit' ? new_form.carousel_list : new_form.carousel_list.concat(this.get_seat_list(new_form)),
-                        popup_width: block * 16 * 2 + 'rpx',
-                        popup_height: block * 9 * 2 + 'rpx',
-                        style_container: this.propIsCommon ? common_styles_computer(common_style) : '', // 用于样式显示
-                        style_img_container: this.propIsCommon ? common_img_computer(common_style) : '', // 用于样式显示
-                        img_style: radius_computer(new_style), // 图片的设置
-                        indicator_style: this.get_indicator_style(new_style), // 指示器的样式
-                        dot_style: `bottom: ${common_style.padding_bottom * 2 + 24}rpx;`, // 指示器位置
-                        img_fit: fit,
-                        video_style: this.get_video_style(new_style), // 视频播放按钮显示逻辑
-                    });
+                this.setData({
+                    form: this.propValue.content,
+                    new_style: this.propValue.style,
+                    seat_list: this.get_seat_list(new_form),
+                    new_list: new_form.carousel_list.concat(this.get_seat_list(new_form)),
+                    popup_width: block * 16 * 2 + 'rpx',
+                    popup_height: block * 9 * 2 + 'rpx',
+                    style_container: this.propIsCommon ? common_styles_computer(common_style) : '', // 用于样式显示
+                    style_img_container: this.propIsCommon ? common_img_computer(common_style) : '', // 用于样式显示
+                    img_style: radius_computer(new_style), // 图片的设置
+                    indicator_style: this.get_indicator_style(new_style), // 指示器的样式
+                    dot_style: `bottom: ${common_style.padding_bottom * 2 + 24}rpx;`, // 指示器位置
+                    img_fit: fit,
+                    video_style: this.get_video_style(new_style), // 视频播放按钮显示逻辑
                 });
                 if (new_form.carousel_type == 'card') {
                     this.$nextTick(() => {
@@ -167,14 +165,14 @@
                         });
                     });
                 }
-                this.setData({
-                    hackReset: false,
-                });
-                this.$nextTick(() => {
-                    this.setData({
-                        hackReset: true,
-                    });
-                });
+                // this.setData({
+                //     hackReset: false,
+                // });
+                // this.$nextTick(() => {
+                //     this.setData({
+                //         hackReset: true,
+                //     });
+                // });
             },
             get_indicator_style(new_style) {
                 const { indicator_radius, indicator_style, indicator_size, color } = new_style;
@@ -218,16 +216,14 @@
             },
             slideChange(e) {
                 let actived_index = e.target.current;
-                if (this.form.carousel_type != 'inherit') {
-                    if (e.target.current > this.form.carousel_list.length - 1) {
-                        const seat_length = this.seat_list.length;
-                        if (seat_length == 2 && e.target.current == 3) {
-                            actived_index = 1;
-                        } else if (seat_length == 3) {
-                            actived_index = 0;
-                        } else {
-                            actived_index = e.target.current - this.seat_list.length;
-                        }
+                if (e.target.current > this.form.carousel_list.length - 1) {
+                    const seat_length = this.seat_list.length;
+                    if (seat_length == 2 && e.target.current == 3) {
+                        actived_index = 1;
+                    } else if (seat_length == 3) {
+                        actived_index = 0;
+                    } else {
+                        actived_index = e.target.current - this.seat_list.length;
                     }
                 }
                 this.setData({
diff --git a/components/diy/search.vue b/components/diy/search.vue
index c89dd372..b2d1d1aa 100644
--- a/components/diy/search.vue
+++ b/components/diy/search.vue
@@ -3,23 +3,21 @@
         <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="search-icon" @tap.stop="search_icon_tap">
-                        <template v-if="form.is_icon_show == '1'">
-                            <template v-if="form.icon_img.length > 0">
-                                <view class="img-box">
-                                    <image :src="form.icon_img[0].url" class="img" mode="heightFix"></image>
-                                </view>
-                            </template>
-                            <template v-else>
-                                <view>
-                                    <iconfont :name="!isEmpty(form.icon_class) ? 'icon-' + form.icon_class : 'icon-index-search'" size="28rpx" :color="new_style.icon_color" propContainerDisplay="flex"></iconfont>
-                                </view>
-                            </template>
+                    <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">
+                                <image :src="form.icon_img[0].url" class="img" mode="heightFix"></image>
+                            </view>
+                        </template>
+                        <template v-else>
+                            <view>
+                                <iconfont :name="!isEmpty(form.icon_class) ? 'icon-' + form.icon_class : 'icon-index-search'" size="28rpx" :color="new_style.icon_color" propContainerDisplay="flex"></iconfont>
+                            </view>
                         </template>
                     </view>
                     <template v-if="!isEmpty(form.hot_word_list) && form.is_hot_word_show == '1'">
-                        <swiper circular="true" :autoplay="form.is_roll == '1'" :interval="form.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(new_style.hot_words_color) ? new_style.hot_words_color : item.color }" :data-value="item.value" @tap.stop="serch_event">{{ item.value }}</swiper-item>
+                        <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>
                     </template>
                     <template v-else>
@@ -41,7 +39,6 @@
                         </template>
                     </view>
                 </view>
-                
             </view>
         </view>
     </view>
diff --git a/components/diy/seckill.vue b/components/diy/seckill.vue
index fe0def5e..d8681942 100644
--- a/components/diy/seckill.vue
+++ b/components/diy/seckill.vue
@@ -387,8 +387,8 @@
                     if (this.seckill_time.status === 0) {
                         this.setData({
                             seckill_time: {
-                                end_time: this.seckill_time.current.time_end,
-                                start_time: this.seckill_time.current.time_start,
+                                end_time: this.seckill_time.time_end,
+                                start_time: this.seckill_time.time_start,
                                 status: 1,
                                 time_first_text: '距结束',
                             },