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), (default_config.style)[`theme_${Number(val)}`]); + form.value.style = Object.assign({}, form.value.style, cloneDeep(default_data), cloneDeep((default_config.style)[`theme_${Number(val)}`].style)); + form.value.content = Object.assign({}, form.value.content, cloneDeep((default_config.style)[`theme_${Number(val)}`].content)); } };