From 74c6ec651a63b4e4cc4936817cb272d38f09b52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 29 Nov 2024 17:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E9=83=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../choice-location/choice-location.vue       | 44 ++++++++++++-------
 components/diy/header.vue                     | 38 ++++++++++++++--
 components/diy/modules/custom/model-panel.vue | 12 ++++-
 components/diy/search.vue                     |  2 +
 4 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/components/choice-location/choice-location.vue b/components/choice-location/choice-location.vue
index 7ff3ee1f..c9332302 100644
--- a/components/choice-location/choice-location.vue
+++ b/components/choice-location/choice-location.vue
@@ -1,22 +1,24 @@
 <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">
-                <block v-if="propLeftImgValue.length > 0">
-                    <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">
-                <block v-if="propRightImgValue.length > 0">
-                    <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>
-                </block>
+        <view v-if="propIsShowAddressChoice" class="choice-location pr wh-auto oh" :style="propLocationContainerStyle" @tap="choose_user_location">
+            <view class="flex-row gap-2 align-c oh" :style="propLocationImgContainerStyle">
+                <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" 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">
+                    <block v-if="propRightImgValue.length > 0">
+                        <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>
+                    </block>
+                </view>
             </view>
         </view>
     </view>
@@ -92,6 +94,14 @@
                 type: String,
                 default: 'icon-arrow-bottom',
             },
+            propLocationContainerStyle: {
+                type: String,
+                default: '',
+            },
+            propLocationImgContainerStyle: {
+                type: String,
+                default: '',
+            },
         },
         // 页面被展示
         created: function () {
diff --git a/components/diy/header.vue b/components/diy/header.vue
index e939b7f1..afd96c95 100644
--- a/components/diy/header.vue
+++ b/components/diy/header.vue
@@ -49,9 +49,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-row align-c gap-2">
+                                                <view :class="'flex-row align-c gap-2 ' + (form.content.positioning_name_float == '1' ? 'pa z-i' : '')">
                                                     <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="['4'].includes(form.content.theme) ? '300rpx' : '150rpx'" @onBack="choice_location_back"></component-choice-location>
+                                                        <component-choice-location :propLocationContainerStyle="style_location_container" :propLocationImgContainerStyle="style_location_img_container" :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="choice_location_back"></component-choice-location>
                                                     </view>
                                                 </view>
                                                 <template v-if="['5'].includes(form.content.theme) && !is_search_alone_row">
@@ -115,7 +115,7 @@
     import imageEmpty from '@/components/diy/modules/image-empty';
     import componentChoiceLocation from '@/components/choice-location/choice-location';
     import componentBadge from '@/components/badge/badge';
-    import { isEmpty, background_computer, gradient_computer } from '@/common/js/common/common.js';
+    import { isEmpty, background_computer, gradient_computer, margin_computer, padding_computer, radius_computer } from '@/common/js/common/common.js';
     // 状态栏高度
     var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
     // #ifdef MP-TOUTIAO
@@ -186,6 +186,9 @@
                 is_search_alone_row: false,
                 is_icon_alone_row: false,
                 data_alone_row_space: '0rpx',
+                // 定位设置
+                style_location_container: '',
+                style_location_img_container: '',
             };
         },
         watch: {
@@ -264,9 +267,38 @@
                     data_alone_row_space: new_style.data_alone_row_space * 2 + 'rpx',
                     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'),
+                    style_location_container: this.get_style_location_container(new_style),
+                    style_location_img_container: this.get_style_location_img_container(new_style),
                 });
                 this.$emit('onImmersionModelCallBack', this.is_immersion_model);
             },
+            // 定位设置
+            get_style_location_container(new_style) {
+                const style = {
+                    color_list: new_style.location_color_list,
+                    direction: new_style.location_direction,
+                }
+                const height = 32 - new_style.location_margin.margin_top - new_style.location_margin.margin_bottom;
+                return gradient_computer(style) + margin_computer(new_style.location_margin) + radius_computer(new_style.location_radius) + `color: ${new_style.location_color};height: ${ height * 2}rpx;line-height: ${height * 2}rpx;`;
+            },
+            // 背景图片
+            get_style_location_img_container(new_style){
+                const { location_background_img, location_background_img_style, location_padding, location_border_direction, location_border_size, location_border_color } = new_style;
+                const style = {
+                    background_img: location_background_img,
+                    background_img_style: location_background_img_style,
+                }
+                let border = ``;
+                if (new_style.location_border_show == '1') {
+                    // 边框
+                    if (location_border_direction == 'all') {
+                        border += `border: ${location_border_size}px solid ${location_border_color};`;
+                    } else {
+                        border += `border-${location_border_direction}: ${location_border_size}px solid ${location_border_color};`;
+                    }
+                }
+                return background_computer(style) + padding_computer(location_padding) + border;
+            },
             // 获取顶部导航高度
             get_nav_height() {
                 const query = uni.createSelectorQuery().in(this);
diff --git a/components/diy/modules/custom/model-panel.vue b/components/diy/modules/custom/model-panel.vue
index 04260259..3379e8dd 100644
--- a/components/diy/modules/custom/model-panel.vue
+++ b/components/diy/modules/custom/model-panel.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="wh-auto ht-auto re oh" :style="com_style" :data-value="form.link && form.link.page" @tap="url_event">
+    <view class="wh-auto ht-auto re oh" :style="com_style" :data-value="panel_url" @tap="url_event">
         <div class="wh-auto ht-auto" :style="com_img_style"></div>
     </view>
 </template>
@@ -36,6 +36,7 @@
                 text_title: '',
                 text_style: '',
                 com_style: '',
+                panel_url: '',
             };
         },
         watch: {
@@ -48,10 +49,19 @@
         },
         methods: {
             init() {
+                let url = '';
+                if (!isEmpty(this.propValue.link)) {
+                    url = this.propValue.link?.page || '';
+                } else if (!isEmpty(this.propSourceList.data)) {
+                    url = this.propSourceList.data[this.propValue?.data_source_link] || '';
+                } else {
+                    url = this.propSourceList[this.propValue?.data_source_link] || '';
+                }
                 this.setData({
                     form: this.propValue,
                     com_style: this.get_com_style(this.propValue, this.propScale),
                     com_img_style: this.get_com_img_style(this.propValue),
+                    panel_url: url,
                 });
             },
             get_com_style(form, scale) {
diff --git a/components/diy/search.vue b/components/diy/search.vue
index f41d7474..ed1c3340 100644
--- a/components/diy/search.vue
+++ b/components/diy/search.vue
@@ -127,6 +127,8 @@ export default {
             let style = `background: ${ new_style?.search_bg_color || '' };border: 1px solid ${new_style.search_border}; ${radius_computer(new_style.search_border_radius)};box-sizing: border-box;`;
             if (form.is_center == '1') {
                 style += `justify-content: center;`;
+            } else {
+                style += `padding-left: ${ new_style.search_padding_left ? new_style.search_padding_left : 15 }px;`;
             }
             return style;
         },