From f2433cc0adcf5c9216d0e10d89f9e953e1196c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Sat, 14 Sep 2024 18:42:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-goods-list/index.vue     | 2 --
 src/components/page-settings/page-setting.vue | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/model-goods-list/index.vue b/src/components/model-goods-list/index.vue
index 6d54e359..d7709531 100644
--- a/src/components/model-goods-list/index.vue
+++ b/src/components/model-goods-list/index.vue
@@ -254,8 +254,6 @@ const get_products = () => {
     };
     // 获取商品列表
     ShopAPI.getShopLists(params).then((res: any) => {
-        form.value.data_auto_list = res.data;
-        console.log(form.value);
         if (!isEmpty(res.data)) {
             list.value = res.data;
         } else {
diff --git a/src/components/page-settings/page-setting.vue b/src/components/page-settings/page-setting.vue
index c38ba60a..4dcb7dcf 100644
--- a/src/components/page-settings/page-setting.vue
+++ b/src/components/page-settings/page-setting.vue
@@ -91,7 +91,8 @@ const default_config = {
 const form = ref(props.value);
 const change_theme = (val: string) => {
     if (val) {
-        form.value.style = Object.assign({}, form.value.style, cloneDeep(default_data), (<arrayIndex>default_config.style)[`theme_${Number(val)}`]);
+        form.value.style = Object.assign({}, form.value.style, cloneDeep(default_data), cloneDeep((<arrayIndex>default_config.style)[`theme_${Number(val)}`].style));
+        form.value.content = Object.assign({}, form.value.content, cloneDeep((<arrayIndex>default_config.style)[`theme_${Number(val)}`].content));
     }
 };
 </script>

From accc0f59d274908e01253afad24ab6afd53d3bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Sat, 14 Sep 2024 19:01:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E9=80=92?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-article-tabs/index.vue | 44 ++++++++++-----------
 src/components/model-goods-tabs/index.vue   | 10 +++--
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/components/model-article-tabs/index.vue b/src/components/model-article-tabs/index.vue
index 0fe3bd68..774b778c 100644
--- a/src/components/model-article-tabs/index.vue
+++ b/src/components/model-article-tabs/index.vue
@@ -8,6 +8,8 @@
 </template>
 <script setup lang="ts">
 import { common_styles_computer } from '@/utils';
+import { cloneDeep } from 'lodash';
+
 const props = defineProps({
     value: {
         type: Object,
@@ -15,27 +17,25 @@ const props = defineProps({
     },
 });
 const style_container = ref('');
-const article_tabs = ref(props.value);
-watch(
-    article_tabs.value,
-    (newVal, oldValue) => {
-        const new_style = newVal?.style;
-        let new_data = newVal;
-        new_data.content.theme = new_data.content.article_theme;
-        new_data.content.data_type = new_data.content.tabs_list[0].data_type;
-        new_data.content.category_ids = new_data.content.tabs_list[0].category_ids;
-        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_ids = new_data.content.tabs_list[0].data_ids;
-        new_data.content.number = new_data.content.tabs_list[0].number;
-        new_data.content.order_by_type = new_data.content.tabs_list[0].order_by_type;
-        new_data.content.order_by_rule = new_data.content.tabs_list[0].order_by_rule;
-        new_data.content.field_show = new_data.content.field_show;
-        new_data.content.is_cover = new_data.content.tabs_list[0].is_cover;
-        article_tabs.value = new_data;
-        style_container.value += common_styles_computer(new_style.common_style);
-    },
-    { immediate: true, deep: true }
-);
+const article_tabs = ref({});
+watch(() => props.value, (val) => {
+    const newVal = cloneDeep(val);
+    const new_style = newVal?.style;
+    let new_data = newVal;
+    new_data.content.theme = new_data.content.article_theme;
+    new_data.content.data_type = new_data.content.tabs_list[0].data_type;
+    new_data.content.category_ids = new_data.content.tabs_list[0].category_ids;
+    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_ids = new_data.content.tabs_list[0].data_ids;
+    new_data.content.number = new_data.content.tabs_list[0].number;
+    new_data.content.order_by_type = new_data.content.tabs_list[0].order_by_type;
+    new_data.content.order_by_rule = new_data.content.tabs_list[0].order_by_rule;
+    new_data.content.field_show = new_data.content.field_show;
+    new_data.content.is_cover = new_data.content.tabs_list[0].is_cover;
+    article_tabs.value = new_data;
+    
+    style_container.value += common_styles_computer(new_style.common_style);
+}, { immediate: true, deep: true });
 </script>
 <style lang="scss" scoped></style>
diff --git a/src/components/model-goods-tabs/index.vue b/src/components/model-goods-tabs/index.vue
index 88b90284..c1cf8d45 100644
--- a/src/components/model-goods-tabs/index.vue
+++ b/src/components/model-goods-tabs/index.vue
@@ -8,6 +8,7 @@
 </template>
 <script setup lang="ts">
 import { common_styles_computer } from '@/utils';
+import { cloneDeep } from 'lodash';
 
 const props = defineProps({
     value: {
@@ -19,11 +20,12 @@ const props = defineProps({
 });
 
 const style_container = ref('');
-const tabs_list = ref(props.value);
+const tabs_list = ref({});
 
-watch(tabs_list.value, (val) => {
-    const new_style = val?.style;
-    let new_data = val;
+watch(() => props.value, (val) => {
+    const new_val = cloneDeep(val);
+    const new_style = new_val?.style;
+    let new_data = new_val;
     // 产品的值
     new_data.content.data_type = new_data.content.tabs_list[0].data_type;
     new_data.content.category_ids = new_data.content.tabs_list[0].category_ids;