From 8e3c6d892f08c2dfc7fe79e494f4e05e98f1c30d Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 10 Aug 2025 17:50:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=95=86=E6=88=B7=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81diy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/goods-buy/goods-buy.vue   |  15 ++-
 components/goods-list/goods-list.vue |  12 ++-
 pages.json                           |   8 +-
 pages/plugins/shop/design/design.vue |   2 +-
 pages/plugins/shop/detail/detail.vue | 143 ++++++++++++++++-----------
 5 files changed, 118 insertions(+), 62 deletions(-)

diff --git a/components/goods-buy/goods-buy.vue b/components/goods-buy/goods-buy.vue
index f8673866..110ceaf4 100644
--- a/components/goods-buy/goods-buy.vue
+++ b/components/goods-buy/goods-buy.vue
@@ -8,8 +8,8 @@
                     </view>
                 </view>
                 <!-- 规格基础信息 -->
-                <view class="goods-spec-base oh br-b pr">
-                    <image :src="goods_spec_base_images" mode="scaleToFill" class="spec-images radius br" @tap="goods_detail_images_view_event" :data-value="goods_spec_base_images"></image>
+                <view class="goods-spec-base oh br-b pr" :class="goods_cover_class">
+                    <image :src="goods_spec_base_images" mode="aspectFill" class="spec-images radius br" @tap="goods_detail_images_view_event" :data-value="goods_spec_base_images"></image>
                     <view class="goods-spec-base-content">
                         <view class="goods-price">
                             <view v-if="(goods.show_field_price_status || 0) == 1">
@@ -94,6 +94,7 @@
                 opt_button: [],
                 is_direct_cart: 0,
                 is_success_tips: 1,
+                goods_cover_class: '',
                 // 选中规格临时定时变量
                 spec_selected_timer: null,
                 spec_selected_timerout: null,
@@ -163,6 +164,9 @@
                         }
                     }
                 }
+                
+                // 商品封面尺寸类型
+                var goods_cover_size_type = app.globalData.get_config('config.common_goods_cover_size_type', 0);
 
                 // 设置数据
                 this.setData({
@@ -180,6 +184,7 @@
                     opt_button: opt_button,
                     is_direct_cart: is_direct_cart,
                     is_success_tips: is_success_tips,
+                    goods_cover_class: (goods_cover_size_type == 1) ? 'cover-tall' : '',
                 });
 
                 // 初始化不能选择规格处理
@@ -860,6 +865,12 @@
         left: 0;
         top: 0;
     }
+    .goods-spec-base.cover-tall {
+        height: 280rpx;
+    }
+    .goods-spec-base.cover-tall .spec-images {
+        height: 244rpx;
+    }
     .goods-spec-base-content {
         position: absolute;
         left: 220rpx;
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index c1ec6b16..f7a3f2c1 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -283,6 +283,7 @@
                 this.setData({
                     data: value,
                 });
+                this.goods_cover_size_type_handle();
             },
             propIsOpenGridBtnSet(newVal, oldVal) {
                 if (newVal !== oldVal) {
@@ -296,15 +297,22 @@
         created: function () {
             var is_app_mourning = app.globalData.is_app_mourning();
             var is_show_cart = app.globalData.data.is_goods_list_show_cart_opt == 1 ? (is_app_mourning && this.propSource == 'index' ? false : true) : false;
-            var goods_cover_size_type = app.globalData.get_config('config.common_goods_cover_size_type', 0);
             this.setData({
                 data: this.propData,
                 is_show_cart: is_show_cart,
                 grid_btn_config: Object.assign({}, this.grid_btn_config, this.propGridBtnConfig),
-                goods_cover_class: (goods_cover_size_type == 1) ? 'cover-tall' : '',
             });
+            this.goods_cover_size_type_handle();
         },
         methods: {
+            // 商品封面尺寸
+            goods_cover_size_type_handle() {
+                var goods_cover_size_type = app.globalData.get_config('config.common_goods_cover_size_type', 0);
+                this.setData({
+                    goods_cover_class: (goods_cover_size_type == 1) ? 'cover-tall' : '',
+                });
+            },
+
             // 加入购物车
             goods_cart_event(e) {
                 if ((this.$refs.goods_buy || null) != null) {
diff --git a/pages.json b/pages.json
index e1ae0831..2ca52cdf 100644
--- a/pages.json
+++ b/pages.json
@@ -704,7 +704,13 @@
                     "path": "detail/detail",
                     "style": {
                         "enablePullDownRefresh": true,
-                        "navigationBarTitleText": ""
+                        "navigationBarTitleText": "",
+                        "usingComponents": {
+                            "component-diy": "/pages/diy/components/diy/diy"
+                        },
+                        "componentPlaceholder": {
+                            "component-diy": "view"
+                        }
                     }
                 },
                 {
diff --git a/pages/plugins/shop/design/design.vue b/pages/plugins/shop/design/design.vue
index 2d87e2a3..d0283494 100644
--- a/pages/plugins/shop/design/design.vue
+++ b/pages/plugins/shop/design/design.vue
@@ -29,7 +29,7 @@
     import componentLayout from "@/pages/design/components/layout/layout";
     import componentNoData from "@/components/no-data/no-data";
     import componentBottomLine from "@/components/bottom-line/bottom-line";
-    import componentShopHeader from '../components/shop-header/shop-header';
+    import componentShopHeader from '@/pages/plugins/shop/components/shop-header/shop-header';
 
     var common_static_url = app.globalData.get_static_url('common');
     export default {
diff --git a/pages/plugins/shop/detail/detail.vue b/pages/plugins/shop/detail/detail.vue
index 22f3a8e8..558df3d6 100644
--- a/pages/plugins/shop/detail/detail.vue
+++ b/pages/plugins/shop/detail/detail.vue
@@ -1,66 +1,90 @@
 <template>
     <view :class="theme_view">
-        <view v-if="(shop || null) != null" class="pr">
-            <!-- 头部 -->
-            <component-shop-header :propBase="data_base" :propShop="shop" :propShopGoodsCategory="shop_goods_category" :propShopNavigation="shop_navigation" :propShopFavorUser="shop_favor_user"></component-shop-header>
+        <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">
+                        <!-- 由于diy组件异步加载、默认先加载骨架屏展示 -->
+                        <component-no-data propStatus="1" :propLoadingUseSkeleton="true" propPage="home"></component-no-data>
+                        <!-- 底部内容 -->
+                        <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="0" propPage="home"></component-no-data>
+                </block>
+            </block>
+            <!-- 自动和手动模式 -->
+            <block v-else>
+                <!-- 头部 -->
+                <component-shop-header :propBase="data_base" :propShop="shop" :propShopGoodsCategory="shop_goods_category" :propShopNavigation="shop_navigation" :propShopFavorUser="shop_favor_user"></component-shop-header>
 
-            <!-- 数据模式 -->
-            <!-- 自动模式 -->
-            <block v-if="(shop.data_model || 0) == 0">
-                <view v-if="(data || null) != null && data.length > 0" class="wh-auto">
-                    <view class="padding-main">
-                        <component-goods-list :propData="{ style_type: 1, goods_list: data }" :propCurrencySymbol="currency_symbol"></component-goods-list>
-                        <button class="bg-main br-main cr-white round dis-block margin-top-xl margin-bottom-xl margin-horizontal-main" @tap="url_event" :data-value="'/pages/plugins/shop/search/search?shop_id=' + shop.id" size="mini">查看更多商品 >></button>
-                    </view>
-                </view>
-                <block v-else>
-                    <component-no-data propStatus="0"></component-no-data>
-                </block>
-            </block>
-
-            <!-- 标准模式 -->
-            <block v-if="(shop.data_model || 0) == 1">
-                <block v-if="((slider || null) != null && slider.length > 0) || ((data || null) != null && data.length > 0)">
-                    <view class="data-list padding-horizontal-main oh">
-                        <!-- 轮播 -->
-                        <view v-if="slider.length > 0" class="margin-top-main">
-                            <component-banner :propData="slider"></component-banner>
-                        </view>
-
-                        <!-- 商品列表 -->
-                        <view v-if="data.length > 0" :class="((slider || null) == null || slider.length == 0) ? 'margin-top-main' : ''">
-                            <block v-for="(item, index) in data" :key="index">
-                                <component-goods-list :propData="item" :propKeywordsUrl="'/pages/plugins/shop/search/search?shop_id=' + shop.id + '&keywords='" :propIsAutoPlay="true" :propCurrencySymbol="currency_symbol"></component-goods-list>
-                            </block>
+                <!-- 数据模式 -->
+                <!-- 自动模式 -->
+                <block v-if="shop.data_model == 0">
+                    <view v-if="(data || null) != null && data.length > 0" class="wh-auto">
+                        <view class="padding-main">
+                            <component-goods-list :propData="{ style_type: 1, goods_list: data }" :propCurrencySymbol="currency_symbol"></component-goods-list>
+                            <button class="bg-main br-main cr-white round dis-block margin-top-xl margin-bottom-xl margin-horizontal-main" @tap="url_event" :data-value="'/pages/plugins/shop/search/search?shop_id=' + shop.id" size="mini">查看更多商品 >></button>
                         </view>
                     </view>
+                    <block v-else>
+                        <component-no-data propStatus="0"></component-no-data>
+                    </block>
                 </block>
-                <block v-else>
-                    <component-no-data propStatus="0"></component-no-data>
-                </block>
-            </block>
 
-            <!-- 拖拽模式 -->
-            <block v-if="(shop.data_model || 0) == 2">
-                <block v-if="(data || null) != null && data.length > 0">
-                    <!-- 拖拽模式、引入拖拽数据模块 -->
-                    <component-layout :propData="data"></component-layout>
-                </block>
-                <block v-else>
-                    <component-no-data propStatus="0"></component-no-data>
-                </block>
-            </block>
+                <!-- 标准模式 -->
+                <block v-else-if="shop.data_model == 1">
+                    <block v-if="((slider || null) != null && slider.length > 0) || ((data || null) != null && data.length > 0)">
+                        <view class="data-list padding-horizontal-main oh">
+                            <!-- 轮播 -->
+                            <view v-if="slider.length > 0" class="margin-top-main">
+                                <component-banner :propData="slider"></component-banner>
+                            </view>
 
-            <!-- 结尾 -->
-            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                            <!-- 商品列表 -->
+                            <view v-if="data.length > 0" :class="((slider || null) == null || slider.length == 0) ? 'margin-top-main' : ''">
+                                <block v-for="(item, index) in data" :key="index">
+                                    <component-goods-list :propData="item" :propKeywordsUrl="'/pages/plugins/shop/search/search?shop_id=' + shop.id + '&keywords='" :propIsAutoPlay="true" :propCurrencySymbol="currency_symbol"></component-goods-list>
+                                </block>
+                            </view>
+                        </view>
+                    </block>
+                    <block v-else>
+                        <component-no-data propStatus="0"></component-no-data>
+                    </block>
+                </block>
+
+                <!-- 拖拽模式 -->
+                <block v-else-if="shop.data_model == 2">
+                    <block v-if="(data || null) != null && data.length > 0">
+                        <!-- 拖拽模式、引入拖拽数据模块 -->
+                        <component-layout :propData="data"></component-layout>
+                    </block>
+                    <block v-else>
+                        <component-no-data propStatus="0"></component-no-data>
+                    </block>
+                </block>
+
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+
+                <!-- 公共 -->
+                <component-common ref="common"></component-common>
+            </block>
         </view>
         <block v-else>
             <!-- 提示信息 -->
             <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
         </block>
-
-        <!-- 公共 -->
-        <component-common ref="common"></component-common>
     </view>
 </template>
 <script>
@@ -71,7 +95,8 @@
     import componentBottomLine from '@/components/bottom-line/bottom-line';
     import componentBanner from '@/components/slider/slider';
     import componentGoodsList from '@/components/goods-list/goods-list';
-    import componentShopHeader from '../components/shop-header/shop-header';
+    import componentShopHeader from '@/pages/plugins/shop/components/shop-header/shop-header';
+    import componentDiy from '@/pages/diy/components/diy/diy';
     var common_static_url = app.globalData.get_static_url('common');
     export default {
         data() {
@@ -92,7 +117,11 @@
                 data: [],
                 search_keywords_value: '',
                 popup_service_status: false,
-                nav_category_status: false,
+                nav_category_status: false,
+                // 是否单页预览
+                is_single_page: app.globalData.is_current_single_page() || 0,
+                // 增加随机数，避免无法监听数据列表内部数据更新
+                random_value: 0,
                 // 自定义分享信息
                 share_info: {},
             };
@@ -104,7 +133,8 @@
             componentBottomLine,
             componentBanner,
             componentGoodsList,
-            componentShopHeader
+            componentShopHeader,
+            componentDiy
         },
         onLoad(params) {
             // 调用公共事件方法
@@ -180,8 +210,9 @@
                         if (res.data.code == 0) {
                             var data = res.data.data;
                             var base = data.base || null;
-                            var temp_data = data.data || [];
-                            this.setData({
+                            var temp_data = data.data || null;
+                            this.setData({
+                                random_value: Math.random(),
                                 data_base: base,
                                 shop: data.shop || null,
                                 shop_favor_user: data.shop_favor_user || [],
@@ -191,7 +222,7 @@
                                 slider: data.slider || [],
                                 data_list_loding_msg: '',
                                 data_list_loding_status: 0,
-                                data_bottom_line_status: temp_data.length > 0,
+                                data_bottom_line_status: temp_data != null,
                             });
                             if ((this.shop || null) != null) {
                                 // 基础自定义分享