From b6e86429d63a1d43b364d542bfc6f9ec1de44bc0 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 11 Aug 2025 18:21:30 +0800
Subject: [PATCH] debug

---
 pages/diy/components/diy/diy.vue     | 11 ++++++-----
 pages/diy/diy.vue                    |  4 ----
 pages/plugins/shop/detail/detail.vue | 12 ++++++------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pages/diy/components/diy/diy.vue b/pages/diy/components/diy/diy.vue
index 3820559c..2aee75e7 100644
--- a/pages/diy/components/diy/diy.vue
+++ b/pages/diy/components/diy/diy.vue
@@ -3,11 +3,12 @@
         <view :style="page_img_style">
             <scroll-view :scroll-top="scroll_num_top" :scroll-y="true" class="ht" @scroll="on_scroll_event" @scrolltolower="on_scroll_lower_event" @scrolltoupper="on_scroll_upper_event" lower-threshold="60" scroll-with-animation="true">
                 <!-- 头部卡槽 -->
-                <slot name="header"></slot>
-                <!-- 头部小程序兼容 -->
-                <view class="pr header">
-                    <component-diy-header :propKey="header_data.id" :propValue="header_data.com_data" :propScrollTop="head_scroll_top" @onLocationBack="choice_location_back"></component-diy-header>
-                </view>
+                <slot name="header">
+                    <!-- 头部小程序兼容 -->
+                    <view class="pr header">
+                        <component-diy-header :propKey="header_data.id" :propValue="header_data.com_data" :propScrollTop="head_scroll_top" @onLocationBack="choice_location_back"></component-diy-header>
+                    </view>
+                </slot>
                 <view :style="content_padding">
                     <view class="content flex-col" :style="'padding-top:calc(' + (temp_is_header_top ? temp_header_top + temp_sticky_top + 'px)' : '0px)')">
                         <view v-for="item in tabs_data" :key="item.key">
diff --git a/pages/diy/diy.vue b/pages/diy/diy.vue
index fc3b3481..3d7d5617 100644
--- a/pages/diy/diy.vue
+++ b/pages/diy/diy.vue
@@ -3,10 +3,6 @@
         <block v-if="(data || null) != null && (data.config || null) != null">
             <!-- diy模块 -->
             <component-diy :propValue="data.config" :propDataId="data.id" :propKey="random_value" @onLocationBack="user_back_choice_location">
-                <!-- 头部卡槽 -->
-                <slot name="diy-header-common">
-                    <template slot="header"></template>
-                </slot>
                 <!-- 底部内容 -->
                 <template slot="diy-bottom-content">
                     <!-- 结尾 -->
diff --git a/pages/plugins/shop/detail/detail.vue b/pages/plugins/shop/detail/detail.vue
index 83d27456..958dd3ff 100644
--- a/pages/plugins/shop/detail/detail.vue
+++ b/pages/plugins/shop/detail/detail.vue
@@ -4,14 +4,14 @@
             <!-- diy模式 -->
             <block v-if="shop.data_model == 3">
                 <block v-if="(data || null) != null && (data.diy_data || null) != null && (data.diy_data.config || null) != null">
-                    <!-- 头部 -->
-                    <block v-if="(data.is_header || 0) == 1">
-                        <template slot="diy-header-common">
-                            <component-shop-header :propBase="data_base" :propShop="shop" :propShopGoodsCategory="shop_goods_category" :propShopNavigation="shop_navigation" :propShopFavorUser="shop_favor_user"></component-shop-header>
-                        </template>
-                    </block>
                     <!-- diy组件 -->
                     <component-diy :propValue="data.diy_data.config" :propDataId="data.diy_data.id" :propKey="random_value" @onLocationBack="user_back_choice_location">
+                        <!-- 头部 -->
+                        <block v-if="(data.is_header || 0) == 1">
+                            <template slot="header">
+                                <component-shop-header :propBase="data_base" :propShop="shop" :propShopGoodsCategory="shop_goods_category" :propShopNavigation="shop_navigation" :propShopFavorUser="shop_favor_user"></component-shop-header>
+                            </template>
+                        </block>
                         <!-- 由于diy组件异步加载、默认先加载骨架屏展示 -->
                         <component-no-data propStatus="1" :propLoadingUseSkeleton="true" propPage="home"></component-no-data>
                         <!-- 底部内容 -->