From 6d807f4d9b19c88ff494863f36aae082cac05cd5 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, 23 Nov 2024 16:09:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=92=8C?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/carousel/product-list-show.vue               | 6 +-----
 src/components/model-goods-list/index.vue                   | 1 +
 src/views/layout/index.vue                                  | 6 ++++--
 3 files changed, 6 insertions(+), 7 deletions(-)

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 @@
                             <template v-else>
                                 <image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
                             </template>
-                            <div v-if="isShow.includes('price')" class="abs bottom-0 text-line-1" :style="props.goodStyle.goods_price_style + float_pirce_style(props.goodStyle)">
+                            <div v-if="isShow.includes('price')" class="abs bottom-0" :style="props.goodStyle.goods_price_style + float_pirce_style(props.goodStyle)">
                                 <span :style="props.goodStyle.goods_price_symbol_style">{{ item.show_price_symbol }}</span>{{ item.min_price }}
                                 <template v-if="isShow.includes('price_unit')">
                                     <span :style="props.goodStyle.goods_price_unit_style">{{ item.show_price_unit }}</span>
@@ -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);
                 // 判断默认数据是否开启沉浸式