From 215ce036faa0b505a3d34ca85974be29cbd4f6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 16 Oct 2024 14:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=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

---
 src/components/model-search/index.vue         |  2 +-
 .../model-search/model-search-content.vue     |  4 +--
 .../model-search/model-search-styles.vue      | 28 +++++++++----------
 src/components/page-settings/page-setting.vue |  1 +
 src/config/const/header-nav.ts                |  4 ++-
 src/config/const/search.ts                    |  2 +-
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/components/model-search/index.vue b/src/components/model-search/index.vue
index 451e8c44..b95097cb 100644
--- a/src/components/model-search/index.vue
+++ b/src/components/model-search/index.vue
@@ -15,7 +15,7 @@
                     </template>
                     <template v-if="!isEmpty(form.hot_word_list) && form.is_hot_word_show == '1'">
                         <el-carousel :key="carouselKey" class="flex-1" indicator-position="none" :interval="interval_list.time" arrow="never" height="32px" direction="vertical" :autoplay="interval_list.is_roll == '1'">
-                            <el-carousel-item v-for="(item, index) in form.hot_word_list" :key="index" class="flex align-c" :style="{ 'color': !isEmpty(new_style.hot_words_color) ? new_style.hot_words_color : item.color }">{{ item.value }}</el-carousel-item>
+                            <el-carousel-item v-for="(item, index) in form.hot_word_list" :key="index" class="flex align-c" :style="{ 'color': !isEmpty(item.color) ? item.color : !isEmpty(new_style.hot_words_color) ? new_style.hot_words_color : '#999' }">{{ item.value }}</el-carousel-item>
                         </el-carousel>
                     </template>
                     <template v-else>
diff --git a/src/components/model-search/model-search-content.vue b/src/components/model-search/model-search-content.vue
index f3eab040..21d6a3b2 100644
--- a/src/components/model-search/model-search-content.vue
+++ b/src/components/model-search/model-search-content.vue
@@ -60,7 +60,7 @@
                 <drag :data="form.hot_word_list" @remove="remove" @on-sort="on_sort">
                     <template #default="scoped">
                         <el-input v-model="scoped.row.value" placeholder="请输入搜索热词" clearable />
-                        <color-picker v-model="scoped.row.color" :default-color="'#000000'" @update:value="search_color_change($event, scoped.row)"></color-picker>
+                        <color-picker v-model="scoped.row.color" @update:value="search_color_change($event, scoped.row)"></color-picker>
                     </template>
                 </drag>
                 <el-button class="mt-20 mb-20 w" @click="add">+添加</el-button>
@@ -87,7 +87,7 @@ const add = () => {
     form.value.hot_word_list.push({
         id: get_math(),
         value: '',
-        color: '#000000',
+        color: '',
     });
 };
 const remove = (index: number) => {
diff --git a/src/components/model-search/model-search-styles.vue b/src/components/model-search/model-search-styles.vue
index c3287fba..8258f918 100644
--- a/src/components/model-search/model-search-styles.vue
+++ b/src/components/model-search/model-search-styles.vue
@@ -38,9 +38,6 @@
                 <el-form-item v-if="search_content.is_tips_show" label="提示文字">
                     <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"></color-picker>
-                </el-form-item>
                 <el-form-item label="搜索框线">
                     <color-picker v-model="form.search_border" default-color="#fff"></color-picker>
                 </el-form-item>
@@ -51,18 +48,19 @@
                     <radius :value="form.search_border_radius" @update:value="border_radius_change"></radius>
                 </el-form-item>
             </card-container>
-            <template v-if="search_content.is_hot_word_show == '1'">
-                <div class="bg-f5 divider-line" />
-                <card-container>
-                    <div class="mb-12">轮播设置</div>
-                    <el-form-item label="自动轮播">
-                        <el-switch v-model="form.is_roll" active-value="1" inactive-value="0" />
-                    </el-form-item>
-                    <el-form-item label="间隔时间">
-                        <slider v-model="form.interval_time" :min="1" :max="100"></slider>
-                    </el-form-item>
-                </card-container>
-            </template>
+            <div class="bg-f5 divider-line" />
+            <card-container>
+                <div class="mb-12">热词设置</div>
+                <el-form-item label="热词文字">
+                    <color-picker v-model="form.hot_words_color"></color-picker>
+                </el-form-item>
+                <el-form-item label="自动轮播">
+                    <el-switch v-model="form.is_roll" active-value="1" inactive-value="0" />
+                </el-form-item>
+                <el-form-item label="间隔时间">
+                    <slider v-model="form.interval_time" :min="1" :max="100"></slider>
+                </el-form-item>
+            </card-container>
         </el-form>
         <template v-if="isShowCommon">
             <div class="bg-f5 divider-line" />
diff --git a/src/components/page-settings/page-setting.vue b/src/components/page-settings/page-setting.vue
index 4c95ef54..10665cee 100644
--- a/src/components/page-settings/page-setting.vue
+++ b/src/components/page-settings/page-setting.vue
@@ -61,6 +61,7 @@ const default_data = {
         tips_color: '#ccc',
         hot_words_color: '#000',
         search_border: '#E4E4E4',
+        search_bg_color: '#fff',
         search_border_radius: {
             radius: 16,
             radius_top_left: 16,
diff --git a/src/config/const/header-nav.ts b/src/config/const/header-nav.ts
index 39bea701..c509329a 100644
--- a/src/config/const/header-nav.ts
+++ b/src/config/const/header-nav.ts
@@ -61,6 +61,7 @@ interface DefaultFooterNav {
         tips_color: string;
         hot_words_color: string;
         search_border: string;
+        search_bg_color: string;
         search_border_radius: object;
         common_style: object;
     };
@@ -128,8 +129,9 @@ const defaultFooterNav: DefaultFooterNav = {
         img_space: '15',
         img_color: '#666',
         tips_color: '#ccc',
-        hot_words_color: '#000',
+        hot_words_color: '#999',
         search_border: '#E4E4E4',
+        search_bg_color: '#fff',
         search_border_radius: {
             radius: 16,
             radius_top_left: 16,
diff --git a/src/config/const/search.ts b/src/config/const/search.ts
index 37777535..2ba73cce 100644
--- a/src/config/const/search.ts
+++ b/src/config/const/search.ts
@@ -72,7 +72,7 @@ const defaultSearch: defaultSearch = {
             radius_bottom_right: 16,
         },
         tips_color: '#ccc',
-        hot_words_color: '#000',
+        hot_words_color: '#999',
         search_border: '#fff',
         search_bg_color: '#fff',
         search_border_radius: {