From f071982663bcec5c091cde5da5bfe37967ba863f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 10 Sep 2024 16:34:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BD=AE=E6=92=AD=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/auxiliary-blank.vue | 88 ++++++++++++++++--------------
 components/diy/diy.vue             |  5 +-
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/components/diy/auxiliary-blank.vue b/components/diy/auxiliary-blank.vue
index efa60338..ba3db34b 100644
--- a/components/diy/auxiliary-blank.vue
+++ b/components/diy/auxiliary-blank.vue
@@ -1,41 +1,47 @@
-<template>
-    <view :style="style_container">
-        <view :style="style"></view>
-    </view>
-</template>
-
-<script>
-const app = getApp();
-import { common_styles_computer } from '@/common/js/common/common.js';
-export default {
-    props: {
-        value: {
-            type: Object,
-            default: () => {
-                return {};
-            },
-        },
-    },
-    data() {
-        return {
-            style_container: '',
-            style: ''
-        };
-    },
-    created() {
-        const { height } = this.value.content;
-        const { line_color, common_style} = this.value.style;
-        this.style = `height: ${height}px;background: ${line_color || 'transparent'};`;
-        this.style_container = common_styles_computer(common_style);
-    },
-    methods: {
-    },
-};
-</script>
-
-<style scoped lang="scss">
-.right-0 {
-    top: 50%;
-    transform: translateY(-50%);
-}
-</style>
+<template>
+    <view :style="style_container">
+        <view :style="style"></view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import {
+        common_styles_computer
+    } from '@/common/js/common/common.js';
+    export default {
+        props: {
+            value: {
+                type: Object,
+                default: () => {
+                    return {};
+                },
+            },
+        },
+        data() {
+            return {
+                style_container: '',
+                style: ''
+            };
+        },
+        created() {
+            const {
+                height
+            } = this.value.content;
+            const {
+                line_color,
+                common_style
+            } = this.value.style;
+            this.style = `height: ${height * 2 }rpx;background: ${line_color || 'transparent'};`;
+            this.style_container = common_styles_computer(common_style);
+        },
+        methods: {},
+    };
+</script>
+
+<style scoped lang="scss">
+    .right-0 {
+        top: 50%;
+        transform: translateY(-50%);
+    }
+</style>
\ No newline at end of file
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index 21256cb0..e819fd48 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -4,10 +4,11 @@
         <view v-if="value.diy_data.length > 0" :style="diy_content_style">
             <view v-for="(item, index) in value.diy_data" :key="index">
                 <!-- 基础组件 -->
-                <componentDiySearch></componentDiySearch>
+                <!-- <componentDiySearch></componentDiySearch> -->
                 <componentDiyUserInfo v-if="item.key == 'user-info'" :value="item.com_data"></componentDiyUserInfo>
                 <componentDiyVideo v-else-if="item.key == 'video'" :value="item.com_data"></componentDiyVideo>
                 <componentDiyArticleList v-else-if="item.key == 'article-list'" :value="item.com_data"></componentDiyArticleList>
+                <componentCarousel v-if="item.key == 'carousel'" :value="item.com_data"></componentCarousel>
                 <!-- 工具组件 -->
                 <componentFloatWindow v-else-if="item.key == 'float-window'" :value="item.com_data"></componentFloatWindow>
                 <componentTextTitle v-else-if="item.key == 'text-title'" :value="item.com_data"></componentTextTitle>
@@ -32,6 +33,7 @@
     import componentDiyAuxiliaryLine from '@/components/diy/auxiliary-line';
     import componentDiyRichText from '@/components/diy/rich-text.vue';
     import componentAuxiliaryBlank from '@/components/diy/auxiliary-blank.vue';
+    import componentCarousel from '@/components/diy/carousel.vue';
     export default {
         name: 'diy',
         props: {
@@ -52,6 +54,7 @@
             componentFloatWindow,
             componentTextTitle,
             componentAuxiliaryBlank,
+            componentCarousel
         },
         data() {
             return {