diff --git a/components/choice-location/choice-location.vue b/components/choice-location/choice-location.vue
index 3cc19207..4ffbcbd6 100644
--- a/components/choice-location/choice-location.vue
+++ b/components/choice-location/choice-location.vue
@@ -1,12 +1,22 @@
 <template>
     <view :class="theme_view">
-        <view v-if="propIsShowAddressChoice" class="choice-location pr" @tap="choose_user_location">
-            <view class="dis-inline-block va-m lh">
-                <iconfont name="icon-location" :size="propIconLocationSize" propClass="lh" :color="propIconLocationColor || propBaseColor"></iconfont>
+        <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 }]">
+                <block v-if="propLeftImgValue.length > 0">
+                    <image :src="propLeftImgValue[0].url" class="dis-block wh-auto" mode="aspectFit"></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="propIsIconArrow" class="va-m lh dis-inline-block margin-left-xs">
-                <iconfont name="icon-arrow-bottom" :size="propIconArrowSize" propClass="lh-xs" :color="propIconArrowColor || propBaseColor"></iconfont>
+            <view v-if="propIsRightIconArrow" :class="['va-m lh dis-inline-block margin-left-xs', { 'wh-auto': propRightImgValue.length }]">
+                <block v-if="propRightImgValue.length > 0">
+                    <image :src="propRightImgValue[0].url" class="dis-block wh-auto" mode="aspectFit"></image>
+                </block>
+                <block v-else>
+                    <iconfont :name="propRightIconValue" :size="propIconArrowSize" propClass="lh-xs" :color="propIconArrowColor || propBaseColor"></iconfont>
+                </block>
             </view>
         </view>
     </view>
@@ -58,10 +68,30 @@
                 type: String,
                 default: '24rpx',
             },
-            propIsIconArrow: {
+            propIsLeftIconArrow: {
                 type: Boolean,
                 default: true,
             },
+            propLeftImgValue: {
+                type: Array,
+                default: [],
+            },
+            propLeftIconValue: {
+                type: String,
+                default: 'icon-location',
+            },
+            propIsRightIconArrow: {
+                type: Boolean,
+                default: true,
+            },
+            propRightImgValue: {
+                type: Array,
+                default: [],
+            },
+            propRightIconValue: {
+                type: String,
+                default: 'icon-arrow-bottom',
+            },
         },
         // 页面被展示
         created: function () {
@@ -114,4 +144,7 @@
         height: 56rpx;
         line-height: 56rpx;
     }
+    .dis-block {
+        height: 56rpx;
+    }
 </style>
diff --git a/components/diy/header.vue b/components/diy/header.vue
index cad9e60a..fc577c33 100644
--- a/components/diy/header.vue
+++ b/components/diy/header.vue
@@ -9,46 +9,60 @@
                     <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 flex-col" :style="'height:' + (is_search_alone_row ? '132rpx' : '66rpx') + ';' + header_style">
-                                    <view class="model-head-content flex-row align-c jc-sb gap-16 wh-auto pr padding-left-main">
-                                        <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>
-                                        <view v-if="['1', '2', '3'].includes(form.content.theme)" class="flex-1">
-                                            <view class="flex-row align-c jc-c ht-auto gap-16" :class="position_class" :style="text_style + 'justify-content:' + form.content.indicator_location || 'center'">
-                                                <template v-if="['2', '3'].includes(form.content.theme)">
-                                                    <view v-if="form.content.logo.length > 0" class="logo-outer-style">
-                                                        <image class="logo-style" :src="form.content.logo[0].url" mode="heightFix" />
+                                <view class="model-head pr padding-left-main padding-right-main" :style="header_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 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>
+                                            <view v-if="['1', '2', '3'].includes(form.content.theme)" class="flex-1">
+                                                <view class="flex-row align-c jc-c ht-auto gap-16" :class="position_class" :style="text_style + 'justify-content:' + form.content.indicator_location || 'center'">
+                                                    <template v-if="['2', '3'].includes(form.content.theme)">
+                                                        <view v-if="form.content.logo.length > 0" class="logo-outer-style">
+                                                            <image class="logo-style" :src="form.content.logo[0].url" mode="heightFix" />
+                                                        </view>
+                                                    </template>
+                                                    <view v-if="['1', '2'].includes(form.content.theme)">{{ form.content.title }}</view>
+                                                    <template v-if="['3', '5'].includes(form.content.theme) && !is_search_alone_row">
+                                                        <view class="flex-1">
+                                                            <componentDiySearch :propValue="form" :propIsPageSettings="true"></componentDiySearch>
+                                                        </view>
+                                                    </template>
+                                                </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-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>
                                                     </view>
-                                                </template>
-                                                <view v-if="['1', '2'].includes(form.content.theme)">{{ form.content.title }}</view>
-                                                <template v-if="['3', '5'].includes(form.content.theme) && !is_search_alone_row">
+                                                </view>
+                                                <template v-if="['5'].includes(form.content.theme) && !is_search_alone_row">
                                                     <view class="flex-1">
                                                         <componentDiySearch :propValue="form" :propIsPageSettings="true"></componentDiySearch>
                                                     </view>
                                                 </template>
                                             </view>
-                                        </view>
-                                        <view v-else-if="['4', '5'].includes(form.content.theme)" class="flex-1 flex-row align-c h gap-10">
-                                            <view class="flex-row align-c gap-2">
-                                                <component-choice-location :propBaseColor="form.style.position_color" :propTextDefaultName="form.content.positioning_name" :propIsIconArrow="form.content.is_arrows_show == '1'" :propTextMaxWidth="['4'].includes(form.content.theme) ? '300rpx' : '150rpx'" @onback="user_back_choice_location"></component-choice-location>
+                                            <view v-if="!isEmpty(form.content.icon_setting) && !is_icon_alone_row" class="flex-row align-c z-i" :class="['1'].includes(form.content.theme) ? 'right-0' : ''" :style="{ gap: form.style.img_space * 2 + 'rpx' }">
+                                                <view v-for="(item, index) in form.content.icon_setting" :key="index" :style="{ width: form.style.img_size * 2 + 'rpx', height: form.style.img_size * 2 + 'rpx' }" :data-value="item.link.page" @tap="url_event">
+                                                    <imageEmpty v-if="item.img.length > 0" :propImageSrc="item.img[0].url" :propErrorStyle="'width: ' + Number(form.style.img_size) * 2 + 'rpx;height:' + Number(form.style.img_size) * 2 + 'rpx;'"></imageEmpty>
+                                                    <iconfont v-else :name="'icon-' + item.icon" :size="form.style.img_size * 2 + 'rpx'" :color="form.style.img_color" propContainerDisplay="flex"></iconfont>
+                                                </view>
                                             </view>
-                                            <template v-if="['5'].includes(form.content.theme) && !is_search_alone_row">
+                                        </view>
+                                        <view v-if="is_search_alone_row || is_icon_alone_row" class="model-head-content flex-row align-c gap-16">
+                                            <template v-if="['3', '5'].includes(form.content.theme) && is_search_alone_row">
                                                 <view class="flex-1">
                                                     <componentDiySearch :propValue="form" :propIsPageSettings="true"></componentDiySearch>
                                                 </view>
                                             </template>
-                                        </view>
-                                        <view v-if="!isEmpty(form.content.icon_setting)" class="flex-row align-c padding-right-main z-i" :class="['1'].includes(form.content.theme) ? 'right-0' : ''" :style="{ gap: form.style.img_space * 2 + 'rpx' }">
-                                            <view v-for="(item, index) in form.content.icon_setting" :key="index" :style="{ width: form.style.img_size * 2 + 'rpx', height: form.style.img_size * 2 + 'rpx' }" :data-value="item.link.page" @tap="url_event">
-                                                <imageEmpty v-if="item.img.length > 0" :propImageSrc="item.img[0].url" :propErrorStyle="'width: ' + Number(form.style.img_size) * 2 + 'rpx;height:' + Number(form.style.img_size) * 2 + 'rpx;'"></imageEmpty>
-                                                <iconfont v-else :name="'icon-' + item.icon" :size="form.style.img_size * 2 + 'rpx'" :color="form.style.img_color" propContainerDisplay="flex"></iconfont>
+                                            <view v-if="!isEmpty(form.content.icon_setting) && is_icon_alone_row" class="flex-row align-c z-i" :class="['1'].includes(form.content.theme) ? 'right-0' : ''" :style="{ gap: form.style.img_space * 2 + 'rpx' }">
+                                                <view v-for="(item, index) in form.content.icon_setting" :key="index" :style="{ width: form.style.img_size * 2 + 'rpx', height: form.style.img_size * 2 + 'rpx' }" :data-value="item.link.page" @tap="url_event">
+                                                    <imageEmpty v-if="item.img.length > 0" :propImageSrc="item.img[0].url" :propErrorStyle="'width: ' + Number(form.style.img_size) * 2 + 'rpx;height:' + Number(form.style.img_size) * 2 + 'rpx;'"></imageEmpty>
+                                                    <iconfont v-else :name="'icon-' + item.icon" :size="form.style.img_size * 2 + 'rpx'" :color="form.style.img_color" propContainerDisplay="flex"></iconfont>
+                                                </view>
                                             </view>
                                         </view>
                                     </view>
-                                    <view class="padding-horizontal-main">
-                                        <componentDiySearch :propValue="form" :propIsPageSettings="true"></componentDiySearch>
-                                    </view>
                                 </view>
                             </view>
                         </view>
@@ -140,6 +154,7 @@
                 is_tabbar_pages: app.globalData.is_tabbar_pages(),
                 // 判断header的查询是否独行
                 is_search_alone_row: false,
+                is_icon_alone_row: false,
             };
         },
         watch: {
@@ -203,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.is_search_alone_row == '1',
-                    is_search_alone_row: true,
+                    is_search_alone_row: new_content.data_alone_row_value.includes('search'),
+                    is_icon_alone_row: new_content.data_alone_row_value.includes('icon')
                 });
                 this.$emit('immersion-model-call-back', this.is_immersion_model);
             },
@@ -255,10 +270,11 @@
             }
         }
         .model-head {
-            height: 66rpx;
+            // height: 66rpx;/
             overflow: hidden;
             .model-head-content {
                 height: 66rpx;
+                overflow: hidden;
                 top: -1rpx;
             }
         }