diff --git a/pages.json b/pages.json
index 424ea808..e1ae0831 100644
--- a/pages.json
+++ b/pages.json
@@ -1270,6 +1270,26 @@
                         "navigationBarTitleText": ""
                     }
                 },
+                {
+                    "path": "diy/diy",
+                    "style": {
+                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                        "navigationStyle": "custom",
+                        // #endif
+                        // #ifdef MP-ALIPAY
+                        "transparentTitle": "always",
+                        "titlePenetrate": "YES",
+                        // #endif
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": "",
+                        "usingComponents": {
+                            "component-diy": "/pages/diy/components/diy/diy"
+                        },
+                        "componentPlaceholder": {
+                            "component-diy": "view"
+                        }
+                    }
+                },
                 {
                     "path": "design/design",
                     "style": {
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index d33c12a5..e10e4f50 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -244,10 +244,10 @@
                     </view>
                 </view>
                 
-                <view class="bg-white padding-sm border-radius-main spacing-mb">
+                <!-- <view class="bg-white padding-sm border-radius-main spacing-mb">
                     <view>form - input -data</view>
                     <component-form-input-base ref="form_input_base" :propConfig="order_goods_form_data_config" @onItemEvent="order_goods_form_back_item_event" @onSubmitEvent="order_goods_form_back_data_event"></component-form-input-base>
-                </view>
+                </view> -->
                 
             </view>
 
diff --git a/pages/plugins/shop/diy/diy.vue b/pages/plugins/shop/diy/diy.vue
new file mode 100644
index 00000000..b82b8c40
--- /dev/null
+++ b/pages/plugins/shop/diy/diy.vue
@@ -0,0 +1,203 @@
+<template>
+    <view :class="theme_view">
+        <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">
+                <!-- 底部内容 -->
+                <template slot="diy-bottom-content">
+                    <!-- 结尾 -->
+                    <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                </template>
+                <!-- 底部公共 -->
+                <template slot="diy-bottom-common">
+                    <component-common ref="common"></component-common>
+                </template>
+            </component-diy>
+        </block>
+        <block v-else>
+            <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
+        </block>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentCommon from '@/components/common/common';
+    import componentDiy from '@/pages/diy/components/diy/diy';
+    import componentNoData from '@/components/no-data/no-data';
+    import componentBottomLine from '@/components/bottom-line/bottom-line';
+    export default {
+        components: {
+            componentCommon,
+            componentDiy,
+            componentNoData,
+            componentBottomLine,
+        },
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                load_status: 0,
+                params: null,
+                data: null,
+                // 自定义分享信息
+                share_info: {},
+                // 增加随机数，避免无法监听数据列表内部数据更新
+                random_value: 0,
+            };
+        },
+
+        onLoad(params) {
+            // 调用公共事件方法
+            app.globalData.page_event_onload_handle(params);
+
+            // 设置参数
+            this.setData({
+                params: app.globalData.launch_params_handle(params),
+            });
+        },
+
+        onShow() {
+            // 调用公共事件方法
+            app.globalData.page_event_onshow_handle();
+
+            // 加载数据
+            this.get_data();
+
+            // 公共onshow事件
+            this.init_common();
+
+            // 设置顶部导航的默认颜色
+            this.set_navigation_bar_color();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        methods: {
+            // 初始化公共
+            init_common() {
+                // 公共onshow事件
+                if ((this.$refs.common || null) != null) {
+                    this.$refs.common.on_show();
+                }
+            },
+
+            // 获取数据
+            get_data(params = {}) {
+                // 还没有数据则读取缓存
+                var cache_key = app.globalData.data.cache_diy_page_data_key+'_shop_diy_' + (this.params.id || 0);
+                if (this.load_status == 0) {
+                    // 本地缓存数据
+                    var upd_data = uni.getStorageSync(cache_key) || null;
+                    if (upd_data != null) {
+                        // 先使用缓存数据展示
+                        this.setData(upd_data);
+
+                        // 已有本地缓存则直接取远程有效数据（默认首次取的是远程缓存数据）
+                        params['is_cache'] = 0;
+
+                        // 设置顶部导航的默认颜色
+                        this.set_navigation_bar_color();
+
+                        // 公共onshow事件
+                        this.init_common();
+                    }
+                } else {
+                    // 已有本地缓存则直接取远程有效数据（默认首次取的是远程缓存数据）
+                    params['is_cache'] = 0;
+                }
+                uni.request({
+                    url: app.globalData.get_request_url('index', 'diy', 'shop'),
+                    method: 'POST',
+                    data: { ...this.params, ...params },
+                    dataType: 'json',
+                    success: (res) => {
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var upd_data = {
+                                data: data.data || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true,
+                                random_value: Math.random(),
+                            };
+                            this.setData(upd_data);
+                            // 存储缓存
+                            uni.setStorageSync(cache_key, upd_data);
+
+                            // 是否需要重新加载数据
+                            if (parseInt(data.is_result_data_cache || 0) == 1) {
+                                this.get_data({ is_cache: 0 });
+                            }
+
+                            if ((this.data || null) != null) {
+                                // 基础自定义分享
+                                this.setData({
+                                    share_info: {
+                                        title: this.data.name,
+                                        desc: this.data.describe,
+                                        path: '/pages/plugins/shop/diy/diy',
+                                        query: 'id=' + this.data.id,
+                                        img: this.data.logo,
+                                    },
+                                });
+
+                                // 标题名称
+                                uni.setNavigationBarTitle({
+                                    title: this.data.name,
+                                });
+
+                                // 设置顶部导航的默认颜色
+                                this.set_navigation_bar_color();
+
+                                // 公共onshow事件
+                                this.init_common();
+                            }
+
+                            // 分享菜单处理
+                            app.globalData.page_share_handle(this.share_info);
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg,
+                            });
+                        }
+
+                        // 非首次状态
+                        this.setData({
+                            load_status: 1,
+                        });
+                    },
+                    fail: () => {
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            load_status: 1,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
+                        });
+                    },
+                });
+            },
+
+            // 状态栏设置
+            set_navigation_bar_color() {
+                app.globalData.set_navigation_bar_color(parseInt(app.globalData.get_key_data(this.data, 'config.header.com_data.style.function_buttons_type', 0)) == 1);
+            },
+
+            // 选择用户地理位置回调
+            user_back_choice_location(e) {
+                // 重新刷新数据
+                this.get_data();
+            },
+        },
+    };
+</script>
+<style scoped lang="scss">
+</style>
\ No newline at end of file