diff --git a/src/components/model-data-magic/components/carousel/product-list-show.vue b/src/components/model-data-magic/components/carousel/product-list-show.vue
index 0c8136ba..d0ad9358 100644
--- a/src/components/model-data-magic/components/carousel/product-list-show.vue
+++ b/src/components/model-data-magic/components/carousel/product-list-show.vue
@@ -36,7 +36,7 @@
-
+
{{ item.show_price_symbol }}{{ item.min_price }}
{{ item.show_price_unit }}
@@ -189,10 +189,6 @@ const split_list = computed(() => props.value || {});
width: 4rem !important;
}
}
-.identifying .num {
- font-size: 0.9rem;
- line-height: 0.9rem;
-}
.half-width {
width: 50%;
}
diff --git a/src/components/model-goods-list/index.vue b/src/components/model-goods-list/index.vue
index b0ee381f..13709911 100644
--- a/src/components/model-goods-list/index.vue
+++ b/src/components/model-goods-list/index.vue
@@ -545,6 +545,7 @@ watchEffect(() => {
.original-price {
// background-color: #ede2c5;
text-decoration: line-through;
+ padding: 0 1rem;
}
.two-columns {
width: calc((100% - v-bind(two_columns)) / 2);
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index e49d4019..762b2316 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -134,11 +134,13 @@ const is_empty = ref(false);
const init = () => {
if (get_id()) {
DiyAPI.getInit({ id: get_id() }).then((res: any) => {
- if (res.data) {
- let data = form_data_transfor_diy_data(res.data);
+ const new_data = res.data?.data || undefined;
+ if (new_data) {
+ let data = form_data_transfor_diy_data(new_data);
// 默认数据合并
data.header.com_data = default_merge(data.header.com_data, 'header_nav');
data.footer.com_data = default_merge(data.footer.com_data, 'footer_nav');
+
data.diy_data = data_merge(data.diy_data);
data.tabs_data = data_merge(data.tabs_data);
// 判断默认数据是否开启沉浸式