From 11562048eabca61c52e911e943e9b8cc81fd385f Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 24 Sep 2024 16:24:16 +0800
Subject: [PATCH] 1.diy---header

---
 components/diy/header.vue | 9 ++++++++-
 components/diy/search.vue | 2 --
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/diy/header.vue b/components/diy/header.vue
index a10b6c00..785200e2 100644
--- a/components/diy/header.vue
+++ b/components/diy/header.vue
@@ -3,7 +3,7 @@
         <view class="header-content flex-row">
             <view class="model-top flex-1" :style="position">
                 <view class="roll pr z-i" :style="roll_style">
-                    <view class="model-head tc pr padding-horizontal-sm flex-row align-c">
+                    <view class="model-head tc pr padding-horizontal-sm flex-row align-c" :style="'max-width:' + header_width">
                         <view class="flex-row align-c jc-sb gap-16 wh-auto padding-horizontal-main pr">
                             <view v-if="['1', '2', '3'].includes(form.content.theme)" class="flex-1 flex-row align-c jc-c ht-auto gap-16" :style="text_style + 'justify-content:' + form.content.indicator_location || 'center'">
                                 <template v-if="['2', '3'].includes(form.content.theme)">
@@ -73,6 +73,7 @@
                 position: '',
                 roll_style: '',
                 text_style: '',
+                header_width: '100%',
             };
         },
         created() {
@@ -95,11 +96,17 @@
                 } else {
                     new_roll_style += `background: transparent;`;
                 }
+                // 小程序下，获取小程序胶囊的宽度
+                let menuButtonInfo = '100%';
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
+                menuButtonInfo = `calc(100% - ${uni.getMenuButtonBoundingClientRect().width + 130}rpx);`;
+                // #endif
                 this.setData({
                     form: this.value,
                     position: (new_style.up_slide_display == '1' ? 'position:absolute;' : 'position:relative;') + 'top:' + bar_height + 'rpx;',
                     roll_style: new_roll_style,
                     text_style: `font-weight:${new_style.header_background_title_typeface}; font-size: ${new_style.header_background_title_size * 2}rpx; color: ${new_style.header_background_title_color};`,
+                    header_width: menuButtonInfo,
                 });
             },
         },
diff --git a/components/diy/search.vue b/components/diy/search.vue
index 0876d9e0..916e55af 100644
--- a/components/diy/search.vue
+++ b/components/diy/search.vue
@@ -64,13 +64,11 @@
                 form: this.value.content,
                 new_style: this.value.style,
             });
-            console.log(this.value);
             this.init();
         },
         methods: {
             isEmpty,
             init() {
-                console.log(this.new_style);
                 const { search_button_radius, common_style } = this.new_style;
                 this.setData({
                     style: this.get_style(), // 内部样式