From 8b2e33ba2414c1420c548bb3bd09afd9cf823897 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 23 Sep 2024 13:39:26 +0800
Subject: [PATCH] =?UTF-8?q?1.diy---=E9=80=89=E9=A1=B9=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/article-list.vue | 2 +-
 components/diy/article-tabs.vue | 2 ++
 components/diy/goods-list.vue   | 6 +-----
 components/diy/goods-tabs.vue   | 2 ++
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/diy/article-list.vue b/components/diy/article-list.vue
index 8e30cd03..40a6859d 100644
--- a/components/diy/article-list.vue
+++ b/components/diy/article-list.vue
@@ -3,7 +3,7 @@
     <view class="oh" :style="style_container">
         <view class="pr oh" :style="style">
             <view v-if="!['4'].includes(article_theme)" class="flex-wrap" :class="article_theme_class" :style="article_theme !== '3' ? article_spacing : ''">
-                <view v-for="(item, index) in data_list" class="item bg-white oh" :class="article_theme == '0' ? 'flex-row' : 'flex-col'" :key="index" :style="article_style" :data-value="item.data.url" @tap="url_event">
+                <view v-for="(item, index) in data_list" :key="index" class="item bg-white oh" :class="article_theme == '0' ? 'flex-row' : 'flex-col'" :style="article_style" :data-value="item.data.url" @tap="url_event">
                     <template v-if="article_theme !== '3'">
                         <template v-if="item.new_cover.length > 0">
                             <image :src="item.new_cover[0].url" class="img" :style="img_radius" mode="aspectFill" />
diff --git a/components/diy/article-tabs.vue b/components/diy/article-tabs.vue
index 47539350..54bdc08a 100644
--- a/components/diy/article-tabs.vue
+++ b/components/diy/article-tabs.vue
@@ -47,6 +47,7 @@
                 new_data.content.category = new_data.content.tabs_list[0].category;
                 new_data.content.carousel_col = new_data.content.article_carousel_col;
                 new_data.content.data_list = new_data.content.tabs_list[0].data_list;
+                new_data.content.data_auto_list = new_data.content.tabs_list[0].data_auto_list;
                 new_data.content.data_ids = new_data.content.tabs_list[0].data_ids;
                 new_data.content.number = new_data.content.tabs_list[0].number;
                 new_data.content.sort = new_data.content.tabs_list[0].sort;
@@ -65,6 +66,7 @@
                 new_data.content.category = new_data.content.tabs_list[index].category;
                 new_data.content.carousel_col = new_data.content.article_carousel_col;
                 new_data.content.data_list = new_data.content.tabs_list[index].data_list;
+                new_data.content.data_auto_list = new_data.content.tabs_list[index].data_auto_list;
                 new_data.content.data_ids = new_data.content.tabs_list[index].data_ids;
                 new_data.content.number = new_data.content.tabs_list[index].number;
                 new_data.content.sort = new_data.content.tabs_list[index].sort;
diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue
index 49899b5d..011f1f9f 100644
--- a/components/diy/goods-list.vue
+++ b/components/diy/goods-list.vue
@@ -252,11 +252,7 @@
                     }));
                 } else if (!isEmpty(this.form.data_auto_list) && this.form.data_type == '1') {
                     // 筛选商品并且筛选商品数组不为空
-                    new_list = this.form.data_auto_list.map((item) => ({
-                        ...item.data,
-                        title: !isEmpty(item.new_title) ? item.new_title : item.data.title,
-                        new_cover: item.new_cover,
-                    }));
+                    new_list = this.form.data_auto_list
                 } else {
                     // 为空的时候走默认数据
                     new_list = Array(4).fill(this.default_list);
diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue
index e93431f0..4750466b 100644
--- a/components/diy/goods-tabs.vue
+++ b/components/diy/goods-tabs.vue
@@ -46,6 +46,7 @@
                 new_data.content.sort = new_data.content.tabs_list[0].sort;
                 new_data.content.sort_rules = new_data.content.tabs_list[0].sort_rules;
                 new_data.content.data_list = new_data.content.tabs_list[0].data_list;
+                new_data.content.data_auto_list = new_data.content.tabs_list[0].data_auto_list;
                 this.setData({
                     goods_tabs: new_data,
                     style_container: common_styles_computer(new_style.common_style),
@@ -60,6 +61,7 @@
                 new_data.content.sort = new_data.content.tabs_list[index].sort;
                 new_data.content.sort_rules = new_data.content.tabs_list[index].sort_rules;
                 new_data.content.data_list = new_data.content.tabs_list[index].data_list;
+                new_data.content.data_auto_list = new_data.content.tabs_list[index].data_auto_list;
                 this.setData({
                     goods_tabs: new_data,
                     key: get_math(),