From bcbcf16f3804cd851d964a62e679d41dd107f722 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, 16 Jan 2025 17:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=80=BB=E8=BE=91=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../custom-module/animation-config/index.vue | 4 +--
src/components/model-search/index.vue | 34 +++++++++++++------
.../model-search/model-search-content.vue | 15 ++++++++
.../model-search/model-search-styles.vue | 9 +++++
src/config/const/header-nav.ts | 11 ++++++
src/config/const/search.ts | 11 ++++++
6 files changed, 71 insertions(+), 13 deletions(-)
diff --git a/src/components/common/custom-module/animation-config/index.vue b/src/components/common/custom-module/animation-config/index.vue
index 42b84ab0..ed004df2 100644
--- a/src/components/common/custom-module/animation-config/index.vue
+++ b/src/components/common/custom-module/animation-config/index.vue
@@ -49,8 +49,8 @@ const animation_option = [
];
// 动画类型次数
const animation_number_option = [
- { name: '单次', value: 'default' },
- { name: '无限', value: 'infinite' }
+ { name: '单次显示', value: 'default' },
+ { name: '无限循环', value: 'infinite' }
]
// 操作结束
diff --git a/src/components/model-search/index.vue b/src/components/model-search/index.vue
index 7ca13207..61e1c353 100644
--- a/src/components/model-search/index.vue
+++ b/src/components/model-search/index.vue
@@ -37,18 +37,30 @@
-
-
- {{ form.search_tips }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.search_tips }}
+
+
+
+
+
+
+
+
+
+
左侧图标
+
+
+
+
+
+
搜索按钮
diff --git a/src/config/const/header-nav.ts b/src/config/const/header-nav.ts
index 1d777671..e8f94e23 100644
--- a/src/config/const/header-nav.ts
+++ b/src/config/const/header-nav.ts
@@ -43,6 +43,10 @@ interface DefaultFooterNav {
search_botton_icon: string;
is_tips_show: string;
tips: string;
+ is_right_icon_show: string,
+ right_icon_link: object,
+ right_icon_img: uploadList[],
+ right_icon_class: string,
is_search_show: string;
search_type: string;
search_tips: string;
@@ -69,6 +73,7 @@ interface DefaultFooterNav {
up_slide_background_img: uploadList[];
left_back_btn_color: string;
icon_color: string;
+ right_icon_color: string,
button_inner_color: string;
search_botton_color_list: color_list[];
search_botton_direction: string;
@@ -139,6 +144,11 @@ const defaultFooterNav: DefaultFooterNav = {
icon_class: 'search',
// 搜索提示信息
tips: '请输入搜索内容',
+ // 是否显示右侧icon
+ is_right_icon_show: '1',
+ right_icon_link: {},
+ right_icon_img: [],
+ right_icon_class: '',
// 搜索按钮右侧搜索内容
is_search_show: '0',
search_botton_img: [],
@@ -179,6 +189,7 @@ const defaultFooterNav: DefaultFooterNav = {
// 左侧返回按钮颜色
left_back_btn_color: '#333',
icon_color: '#ccc',
+ right_icon_color: '#ccc',
// 定位设置
location_direction: '90deg',
location_color_list: [{ color: '', color_percentage: undefined }],
diff --git a/src/config/const/search.ts b/src/config/const/search.ts
index d2ed4660..0fa904a2 100644
--- a/src/config/const/search.ts
+++ b/src/config/const/search.ts
@@ -18,6 +18,10 @@ interface defaultSearch {
search_botton_icon: string;
is_tips_show: string;
tips: string;
+ is_right_icon_show: string,
+ right_icon_link: object,
+ right_icon_img: uploadList[],
+ right_icon_class: string,
is_search_show: string;
search_type: string;
search_tips: string;
@@ -26,6 +30,7 @@ interface defaultSearch {
};
style: {
icon_color: string;
+ right_icon_color: string;
button_inner_color: string;
search_botton_color_list: color_list[];
search_botton_direction: string;
@@ -58,6 +63,11 @@ const defaultSearch: defaultSearch = {
// 搜索提示信息
is_tips_show: '1',
tips: '请输入搜索内容',
+ // 是否显示右侧icon
+ is_right_icon_show: '1',
+ right_icon_link: {},
+ right_icon_img: [],
+ right_icon_class: '',
// 搜索按钮显示逻辑
search_botton_img: [],
search_botton_icon: '',
@@ -72,6 +82,7 @@ const defaultSearch: defaultSearch = {
style: {
// 搜索图标颜色
icon_color: '#ccc',
+ right_icon_color: '#ccc',
// 搜索按钮显示样式
button_inner_color: '#fff',
search_botton_color_list: [{ color: '#FF973D', color_percentage: undefined }, { color: '#FF3131', color_percentage: undefined }],