From e5ef616c8b02d477123de28ed53007ac28906775 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 11 Aug 2025 18:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=8D=A1=E6=A7=BDdebug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                           | 14 +++++---------
 pages/diy/components/diy/diy.vue     |  2 ++
 pages/diy/diy.vue                    |  4 ++++
 pages/plugins/shop/detail/detail.vue | 11 +++++++++--
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pages.json b/pages.json
index 2ca52cdf..b5e37503 100644
--- a/pages.json
+++ b/pages.json
@@ -704,13 +704,7 @@
                     "path": "detail/detail",
                     "style": {
                         "enablePullDownRefresh": true,
-                        "navigationBarTitleText": "",
-                        "usingComponents": {
-                            "component-diy": "/pages/diy/components/diy/diy"
-                        },
-                        "componentPlaceholder": {
-                            "component-diy": "view"
-                        }
+                        "navigationBarTitleText": ""
                     }
                 },
                 {
@@ -1262,10 +1256,12 @@
                     "style": {
                         "navigationBarTitleText": "",
                         "usingComponents": {
-                            "component-layout": "/pages/design/components/layout/layout"
+                            "component-layout": "/pages/design/components/layout/layout",
+                            "component-diy": "/pages/diy/components/diy/diy"
                         },
                         "componentPlaceholder": {
-                            "component-layout": "view"
+                            "component-layout": "view",
+                            "component-diy": "view"
                         }
                     }
                 },
diff --git a/pages/diy/components/diy/diy.vue b/pages/diy/components/diy/diy.vue
index 2d97d78b..3820559c 100644
--- a/pages/diy/components/diy/diy.vue
+++ b/pages/diy/components/diy/diy.vue
@@ -2,6 +2,8 @@
     <view :style="page_style">
         <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>
diff --git a/pages/diy/diy.vue b/pages/diy/diy.vue
index 3d7d5617..fc3b3481 100644
--- a/pages/diy/diy.vue
+++ b/pages/diy/diy.vue
@@ -3,6 +3,10 @@
         <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 558df3d6..83d27456 100644
--- a/pages/plugins/shop/detail/detail.vue
+++ b/pages/plugins/shop/detail/detail.vue
@@ -3,8 +3,15 @@
         <view v-if="(shop || null) != null" class="pr" :class="is_single_page == 1 ? 'single-page-top' : ''">
             <!-- diy模式 -->
             <block v-if="shop.data_model == 3">
-                <block v-if="(data || null) != null && (data.config || null) != null">
-                    <component-diy :propValue="data.config" :propDataId="data.id" :propKey="random_value" @onLocationBack="user_back_choice_location">
+                <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">
                         <!-- 由于diy组件异步加载、默认先加载骨架屏展示 -->
                         <component-no-data propStatus="1" :propLoadingUseSkeleton="true" propPage="home"></component-no-data>
                         <!-- 底部内容 -->