From e69dd8d55f07b8d7114f091f1ed75a6bf7be2b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 17 Oct 2024 17:27:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/choice-location/choice-location.vue |  9 +++++----
 components/diy/carousel.vue                    |  3 +--
 components/diy/header.vue                      | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/components/choice-location/choice-location.vue b/components/choice-location/choice-location.vue
index 4ffbcbd6..bbc934b1 100644
--- a/components/choice-location/choice-location.vue
+++ b/components/choice-location/choice-location.vue
@@ -1,18 +1,18 @@
 <template>
     <view :class="theme_view">
         <view v-if="propIsShowAddressChoice" class="choice-location pr wh-auto flex-row gap-2 align-c" @tap="choose_user_location">
-            <view v-if="propIsLeftIconArrow" :class="['dis-inline-block va-m lh', { 'wh-auto': propLeftImgValue.length > 0 }]">
+            <view v-if="propIsLeftIconArrow" class="dis-inline-block va-m lh">
                 <block v-if="propLeftImgValue.length > 0">
-                    <image :src="propLeftImgValue[0].url" class="dis-block wh-auto" mode="aspectFit"></image>
+                    <image :src="propLeftImgValue[0].url" class="dis-block" mode="heightFix"></image>
                 </block>
                 <block v-else>
                     <iconfont :name="propLeftIconValue" :size="propIconLocationSize" propClass="lh" :color="propIconLocationColor || propBaseColor"></iconfont>
                 </block>
             </view>
             <view class="va-m dis-inline-block margin-left-xs text-size-md single-text text" :style="'max-width:' + propTextMaxWidth + ';color:' + (propTextColor || propBaseColor) + ';'">{{ location.text || '' }}</view>
-            <view v-if="propIsRightIconArrow" :class="['va-m lh dis-inline-block margin-left-xs', { 'wh-auto': propRightImgValue.length }]">
+            <view v-if="propIsRightIconArrow" class="va-m lh dis-inline-block margin-left-xs">
                 <block v-if="propRightImgValue.length > 0">
-                    <image :src="propRightImgValue[0].url" class="dis-block wh-auto" mode="aspectFit"></image>
+                    <image :src="propRightImgValue[0].url" class="dis-block" mode="heightFix"></image>
                 </block>
                 <block v-else>
                     <iconfont :name="propRightIconValue" :size="propIconArrowSize" propClass="lh-xs" :color="propIconArrowColor || propBaseColor"></iconfont>
@@ -145,6 +145,7 @@
         line-height: 56rpx;
     }
     .dis-block {
+        width: 100%;
         height: 56rpx;
     }
 </style>
diff --git a/components/diy/carousel.vue b/components/diy/carousel.vue
index 811e5cdc..ced8937c 100644
--- a/components/diy/carousel.vue
+++ b/components/diy/carousel.vue
@@ -141,7 +141,6 @@
                 } else if (new_form.img_fit == 'cover') {
                     fit = 'aspectFill';
                 }
-                console.log(common_style);
                 this.setData({
                     form: this.propValue.content,
                     new_style: this.propValue.style,
@@ -153,7 +152,7 @@
                     style_img_container: this.propIsCommon ? common_img_computer(common_style) : '', // 用于样式显示
                     img_style: radius_computer(new_style), // 图片的设置
                     indicator_style: this.get_indicator_style(new_style), // 指示器的样式
-                    dot_style: `bottom: ${common_style.padding_bottom * 2 + 24}rpx;`, // 指示器位置
+                    dot_style: `bottom: ${ new_style.indicator_bottom * 2 }rpx;`, // 指示器位置
                     img_fit: fit,
                     video_style: this.get_video_style(new_style), // 视频播放按钮显示逻辑
                     swiper_height: new_form.height * (sys_width / 390) * 2 + 'rpx',
diff --git a/components/diy/header.vue b/components/diy/header.vue
index fc577c33..2597bb98 100644
--- a/components/diy/header.vue
+++ b/components/diy/header.vue
@@ -9,9 +9,9 @@
                     <view class="header-content flex-row align-s">
                         <view class="model-top flex-1 mt-1">
                             <view class="roll pr z-i">
-                                <view class="model-head pr padding-left-main padding-right-main" :style="header_style + 'box-sizing:border-box;'">
+                                <view class="model-head pr padding-left-main padding-right-main" style="box-sizing:border-box;">
                                     <view class="flex-col" :style="'gap:' + form.style.data_alone_row_space * 2 + 'rpx;'">
-                                        <view class="model-head-content flex-row align-c jc-sb gap-16 wh-auto pr">
+                                        <view class="model-head-content flex-row align-c jc-sb gap-16 wh-auto pr" :style="header_style">
                                             <view v-if="!is_tabbar_pages" class="z-i dis-inline-block margin-top-xs" @tap="top_nav_left_back_event">
                                                 <iconfont name="icon-arrow-left" size="40rpx" propContainerDisplay="flex" :color="form.style.left_back_btn_color || '#333'"></iconfont>
                                             </view>
@@ -31,9 +31,9 @@
                                                 </view>
                                             </view>
                                             <view v-else-if="['4', '5'].includes(form.content.theme)" class="flex-1 flex-row align-c gap-10">
-                                                <view class="flex-1 flex-row align-c gap-2">
+                                                <view class="flex-row align-c gap-2">
                                                     <view class="flex-1">
-                                                        <component-choice-location :propBaseColor="form.style.position_color" :propTextDefaultName="form.content.positioning_name" :propIsLeftIconArrow="form.content.is_location_left_icon_show == '1'" :propLeftImgValue="form.content.location_left_img" :propLeftIconValue="'icon-' + form.content.location_left_icon" :propIsRightIconArrow="form.content.is_location_right_icon_show == '1'" :propRightImgValue="form.content.location_right_img" :propRightIconValue="'icon-' + form.content.location_right_icon" propTextMaxWidth="300rpx" @onback="user_back_choice_location"></component-choice-location>
+                                                        <component-choice-location :propBaseColor="form.style.position_color" :propTextDefaultName="form.content.positioning_name" :propIsLeftIconArrow="form.content.is_location_left_icon_show == '1'" :propLeftImgValue="form.content.location_left_img" :propLeftIconValue="'icon-' + form.content.location_left_icon" :propIsRightIconArrow="form.content.is_location_right_icon_show == '1'" :propRightImgValue="form.content.location_right_img" :propRightIconValue="'icon-' + form.content.location_right_icon" :propTextMaxWidth="['4'].includes(form.content.theme) ? '300rpx' : '150rpx'" @onback="user_back_choice_location"></component-choice-location>
                                                     </view>
                                                 </view>
                                                 <template v-if="['5'].includes(form.content.theme) && !is_search_alone_row">
@@ -218,8 +218,8 @@
                     header_style: menu_button_info,
                     header_background_type: header_background_type,
                     is_immersion_model: header_background_type !== 'color_image' && immersive_style == '1',
-                    is_search_alone_row: new_content.data_alone_row_value.includes('search'),
-                    is_icon_alone_row: new_content.data_alone_row_value.includes('icon')
+                    is_search_alone_row: new_content.data_alone_row_value && new_content.data_alone_row_value.includes('search'),
+                    is_icon_alone_row: new_content.data_alone_row_value && new_content.data_alone_row_value.includes('icon')
                 });
                 this.$emit('immersion-model-call-back', this.is_immersion_model);
             },