From f9cbb3057d2db4d5863bb0fc9cadaf0cca19a212 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, 27 Sep 2024 17:01:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-search/index.vue         | 50 +++++++++----------
 .../model-search/model-search-content.vue     | 15 ++++--
 .../model-search/model-search-styles.vue      |  2 +-
 .../layout/components/main/default/search.ts  |  4 +-
 4 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/components/model-search/index.vue b/src/components/model-search/index.vue
index da583d4b..61fb2982 100644
--- a/src/components/model-search/index.vue
+++ b/src/components/model-search/index.vue
@@ -1,33 +1,31 @@
 <template>
     <div :style="style_container">
-        <div :style="style" class="flex-row align-c">
-            <div class="search w re">
-                <div class="box h oh flex align-c gap-10 bg-f" :style="box_style">
-                    <template v-if="form.is_icon_show == '1'">
-                        <template v-if="form.icon_img.length > 0">
-                            <div class="img-box">
-                                <image-empty v-model="form.icon_img[0]" class="img" error-img-style="width: 4rem;height: 2.5rem;" />
-                            </div>
-                        </template>
-                        <template v-else>
-                            <el-icon :class="`iconfont ${ !isEmpty(form.icon_class) ? 'icon-' + form.icon_class : 'icon-search' } size-14`" :style="`color:${new_style.icon_color};`" />
-                        </template>
-                    </template>
-                    <span v-if="form.is_tips_show == '1'" :class="[props.isPageSettings ? 'size-12 text-line-1' : 'size-14 text-line-1']" :style="`color: ${ new_style.tips_color }`">{{ form.tips }}</span>
-                </div>
-                <div v-if="form.is_search_show == '1'" class="abs search-botton h flex align-c jc-c" :style="search_button">
-                    <template v-if="form.search_type === 'text'">
-                        <div :class="['ptb-3 size-12', props.isPageSettings ? 'plr-12' : 'plr-16']">{{ form.search_tips }}</div>
-                    </template>
-                    <template v-else-if="!isEmpty(form.search_botton_img) && form.search_botton_img.length > 0">
-                        <image-empty v-model="form.search_botton_img[0]" class="img" :style="search_button_radius" error-img-style="width: 4rem;height: 2.8rem;" />
-                    </template>
-                    <template v-else>
-                        <div :class="['ptb-3 size-12', props.isPageSettings ? 'plr-12' : 'plr-16']">
-                            <el-icon :class="`iconfont ${ !isEmpty(form.search_botton_icon) ? 'icon-' + form.search_botton_icon : '' } size-14`" />
+        <div class="search w re" :style="style">
+            <div class="box h oh flex align-c gap-10 bg-f" :style="box_style">
+                <template v-if="form.is_icon_show == '1'">
+                    <template v-if="form.icon_img.length > 0">
+                        <div class="img-box">
+                            <image-empty v-model="form.icon_img[0]" class="img" error-img-style="width: 4rem;height: 2.5rem;" />
                         </div>
                     </template>
-                </div>
+                    <template v-else>
+                        <el-icon :class="`iconfont ${ !isEmpty(form.icon_class) ? 'icon-' + form.icon_class : 'icon-search' } size-14`" :style="`color:${new_style.icon_color};`" />
+                    </template>
+                </template>
+                <span v-if="form.is_tips_show == '1'" :class="[props.isPageSettings ? 'size-12 text-line-1' : 'size-14 text-line-1']" :style="`color: ${ new_style.tips_color }`">{{ form.tips }}</span>
+            </div>
+            <div v-if="form.is_search_show == '1'" class="abs search-botton h flex align-c jc-c" :style="search_button">
+                <template v-if="form.search_type === 'text'">
+                    <div :class="['ptb-3 size-12', props.isPageSettings ? 'plr-12' : 'plr-16']">{{ form.search_tips }}</div>
+                </template>
+                <template v-else-if="!isEmpty(form.search_botton_img) && form.search_botton_img.length > 0">
+                    <image-empty v-model="form.search_botton_img[0]" class="img" :style="search_button_radius" error-img-style="width: 4rem;height: 2.8rem;" />
+                </template>
+                <template v-else>
+                    <div :class="['ptb-3 size-12', props.isPageSettings ? 'plr-12' : 'plr-16']">
+                        <el-icon :class="`iconfont ${ !isEmpty(form.search_botton_icon) ? 'icon-' + form.search_botton_icon : '' } size-14`" />
+                    </div>
+                </template>
             </div>
         </div>
     </div>
diff --git a/src/components/model-search/model-search-content.vue b/src/components/model-search/model-search-content.vue
index 5434aead..b088cfcc 100644
--- a/src/components/model-search/model-search-content.vue
+++ b/src/components/model-search/model-search-content.vue
@@ -7,11 +7,16 @@
                     <el-row class="w">
                         <el-col :span="24"><el-switch v-model="form.is_icon_show" active-value="1" inactive-value="0"></el-switch></el-col>
                     </el-row>
-                    <el-row v-if="form.is_icon_show == '1'" class="mt-10 w">
-                        <el-col :span="24">
-                            <upload v-model="form.icon_img" v-model:icon-value="form.icon_class" is-icon :limit="1" size="50"></upload>
-                        </el-col>
-                    </el-row>
+                    <template v-if="form.is_icon_show == '1'">
+                        <el-row  class="mt-10 w">
+                            <el-col :span="24">
+                                <upload v-model="form.icon_img" v-model:icon-value="form.icon_class" is-icon :limit="1" size="50"></upload>
+                            </el-col>
+                        </el-row>
+                        <el-row class="mt-10 w">
+                            <el-col :span="24"><url-value v-model="form.icon_src"></url-value></el-col>
+                        </el-row>
+                    </template>
                 </el-form-item>
                 <el-form-item label="提示文字">
                     <el-row class="w">
diff --git a/src/components/model-search/model-search-styles.vue b/src/components/model-search/model-search-styles.vue
index 23c819fc..78223bec 100644
--- a/src/components/model-search/model-search-styles.vue
+++ b/src/components/model-search/model-search-styles.vue
@@ -49,7 +49,7 @@
                     <color-picker v-model="form.tips_color" default-color="#CCCCCC"></color-picker>
                 </el-form-item>
                 <el-form-item label="热词文字">
-                    <color-picker v-model="form.hot_words_color" default-color="#000"></color-picker>
+                    <color-picker v-model="form.hot_words_color"></color-picker>
                 </el-form-item>
                 <el-form-item label="搜索框线">
                     <color-picker v-model="form.search_border" default-color="#fff"></color-picker>
diff --git a/src/views/layout/components/main/default/search.ts b/src/views/layout/components/main/default/search.ts
index d79c6d15..f6eea94a 100644
--- a/src/views/layout/components/main/default/search.ts
+++ b/src/views/layout/components/main/default/search.ts
@@ -9,7 +9,7 @@ interface defaultSearch {
     content: {
         is_center: string;
         is_icon_show: string;
-        icon_src: string;
+        icon_src: object;
         icon_img: uploadList[];
         icon_class: string;
         search_botton_img: uploadList[];
@@ -40,7 +40,7 @@ const defaultSearch: defaultSearch = {
     content: {
         is_center: '0',
         is_icon_show: '1',
-        icon_src: '',
+        icon_src: {},
         icon_img: [],
         icon_class: '',
         search_botton_img: [],