From 55aa386c18ab20037bfc31de02cee471a4d7e327 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, 8 Oct 2024 18:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/carousel.vue   | 12 +++++-------
 components/diy/custom.vue     |  8 ++++----
 components/diy/goods-list.vue | 17 ++++++++++++-----
 components/diy/search.vue     |  4 ++--
 pages/index/index.vue         |  2 +-
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/components/diy/carousel.vue b/components/diy/carousel.vue
index 75b4d5ad..73d79945 100644
--- a/components/diy/carousel.vue
+++ b/components/diy/carousel.vue
@@ -1,15 +1,15 @@
 <template>
     <view class="pr" :style="style_container">
-        <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">
+        <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">
             <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 v-if="hackReset" :propImageSrc="item.carousel_img[0]" :propStyle="img_style" :propImgFit="img_fit" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
+                        <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" @tap.stop="video_play(item.carousel_video)">
                         <block v-if="new_style.video_type == 'img'">
                             <view class="video_img">
-                                <imageEmpty v-if="hackReset" :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></imageEmpty>
+                                <imageEmpty :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></imageEmpty>
                             </view>
                         </block>
                         <block v-else>
@@ -22,12 +22,12 @@
             <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 v-if="hackReset" :propImageSrc="item.carousel_img[0]" :propStyle="img_style" :propImgFit="img_fit" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
+                        <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" @tap.stop="video_play(item.carousel_video)">
                         <block v-if="new_style.video_type == 'img'">
                             <view class="video_img">
-                                <imageEmpty v-if="hackReset" :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></imageEmpty>
+                                <imageEmpty :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></imageEmpty>
                             </view>
                         </block>
                         <block v-else>
@@ -155,7 +155,6 @@
                         video_style: this.get_video_style(), // 视频播放按钮显示逻辑
                     });
                 });
-                console.log('carousel_style', this.form.carousel_list);
                 if (this.form.carousel_type == 'card') {
                     this.$nextTick(() => {
                         this.setData({
@@ -200,7 +199,6 @@
                 return styles;
             },
             get_seat_list() {
-                console.log('keysk', this.form.carousel_list);
                 if (this.form.carousel_list.length > 3) {
                     return [];
                 } else {
diff --git a/components/diy/custom.vue b/components/diy/custom.vue
index 5468ed8f..759d58b4 100644
--- a/components/diy/custom.vue
+++ b/components/diy/custom.vue
@@ -3,16 +3,16 @@
         <view class="wh-auto ht-auto pr">
             <view v-for="item in form.custom_list" :key="item.id" class="main-content" :style="{ left: get_percentage_count(item.location.x, div_width), top: get_percentage_count(item.location.y, div_height), width: get_percentage_count(item.com_data.com_width, div_width), height: get_percentage_count(item.com_data.com_height, div_height) }">
                 <template v-if="item.key == 'text'">
-                    <model-text :key="item.com_data" :propValue="item.com_data" :propSourceList="form.data_source_content" @url_event="url_event"></model-text>
+                    <model-text :propValue="item.com_data" :propSourceList="form.data_source_content" @url_event="url_event"></model-text>
                 </template>
                 <template v-else-if="item.key == 'img'">
-                    <model-image :key="item.com_data" :propValue="item.com_data" :propSourceList="form.data_source_content" @url_event="url_event"></model-image>
+                    <model-image :propValue="item.com_data" :propSourceList="form.data_source_content" @url_event="url_event"></model-image>
                 </template>
                 <template v-else-if="item.key == 'auxiliary-line'">
-                    <model-lines :key="item.com_data" :propValue="item.com_data" :propSourceList="form.data_source_content"></model-lines>
+                    <model-lines :propValue="item.com_data" :propSourceList="form.data_source_content"></model-lines>
                 </template>
                 <template v-else-if="item.key == 'icon'">
-                    <model-icon :key="item.com_data" :propValue="item.com_data" :propSourceList="form.data_source_content" @url_event="url_event"></model-icon>
+                    <model-icon :propValue="item.com_data" :propSourceList="form.data_source_content" @url_event="url_event"></model-icon>
                 </template>
             </view>
         </view>
diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue
index 720817bc..9bedddda 100644
--- a/components/diy/goods-list.vue
+++ b/components/diy/goods-list.vue
@@ -2,7 +2,7 @@
     <view v-if="!isEmpty(list)" class="oh" :style="style_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-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="url_event">
                     <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>
@@ -103,7 +103,7 @@
             <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-value="item.goods_url" @tap="url_event">
+                        <view v-for="(item, index) in item1.split_list" :key="index" class="pr" :class="layout_type" :style="layout_style" :data-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>
@@ -414,8 +414,16 @@
                 }
                 return style;
             },
-            url_event(link) {
-                app.globalData.url_event(link);
+            url_event(e) {
+                let index = e.currentTarget.dataset.index || 0;
+                let goods = this.list[index];
+                if (this.theme == '5') {
+                    split_index = e.currentTarget.dataset.split_index || 0;
+                    goods = this.shop_content_list[index][split_index];
+                }
+                app.globalData.goods_data_cache_handle(goods.id, goods);
+
+                app.globalData.url_event(e);
             },
             goods_button_event(e) {
                 this.goods_cart_event(e);
@@ -426,7 +434,6 @@
                 let split_index = 0;
                 let goods = this.list[index];
                 if (this.theme == '5') {
-                    index = e.currentTarget.dataset.index || 0;
                     split_index = e.currentTarget.dataset.split_index || 0;
                     goods = this.shop_content_list[index][split_index];
                 }
diff --git a/components/diy/search.vue b/components/diy/search.vue
index 92920a16..301ba882 100644
--- a/components/diy/search.vue
+++ b/components/diy/search.vue
@@ -36,7 +36,7 @@
             <template v-else>
                 <view class="search wh-auto pr">
                     <view class="box oh flex-row align-c gap-10 bg-white" :style="box_style + search_box_style">
-                        <input :focus="is_click" type="text" name="title" :class="[propIsPageSettings ? 'text-size-xs text-line-1' : 'text-size-md text-line-1']" :placeholder="form.tips" @input="search_input" />
+                        <input :focus="is_click" type="text" name="title" :class="[propIsPageSettings ? 'text-size-xs text-line-1' : 'text-size-md text-line-1']" :placeholder="form.tips" @input="search_input" @confirm="url_event"  />
                     </view>
                     <view v-if="form.is_search_show == '1'" class="pa search-botton flex-row align-c jc-c z-i" :style="search_button" @tap.stop="url_event">
                         <template v-if="form.search_type === 'text'">
@@ -54,7 +54,7 @@
                 </view>
             </template>
         </view>
-        <hotWordList v-if="is_click && !propIsPageSettings && form.content.hot_word_list.length > 0" :propValue="form.hot_word_list" :prophotWordsColor="new_style.hot_words_color" @search_hot_close="search_hot_close"></hotWordList>
+        <hotWordList v-if="is_click && !propIsPageSettings && form.hot_word_list.length > 0" :propValue="form.hot_word_list" :prophotWordsColor="new_style.hot_words_color" @search_hot_close="search_hot_close"></hotWordList>
     </view>
 </template>
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 063416d8..a34e83f3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -581,7 +581,7 @@
                         // 初始化返回公共处理
                         this.init_result_common_handle();
                         this.setData({
-                            diy_key: Math.random(),
+                            diy_key: Math.random().toString(),
                         });
                     },
                     fail: () => {