From 5e945627e8b500f70c3bba90652b43ec3c724607 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, 5 Sep 2024 18:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-seckill/model-seckill-styles.vue | 11 ++++++-----
 src/views/layout/components/main/index.vue            |  2 ++
 src/views/layout/index.vue                            |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/model-seckill/model-seckill-styles.vue b/src/components/model-seckill/model-seckill-styles.vue
index 5067b844..8ee82b51 100644
--- a/src/components/model-seckill/model-seckill-styles.vue
+++ b/src/components/model-seckill/model-seckill-styles.vue
@@ -7,20 +7,21 @@
                     <el-form-item v-if="data.topic_type == 'text'" label="标题设置">
                         <color-text-size-group v-model:color="form.title_color" v-model:size="form.title_size" :default-color="clone_form.title_color" :type-list="['color', 'size']"></color-text-size-group>
                     </el-form-item>
-                    <el-form-item v-if="data.button_status == '1'" label="按钮设置">
-                        <color-text-size-group v-model:color="form.head_button_color" v-model:size="form.head_button_size" :default-color="clone_form.head_button_color" :type-list="['color', 'size']"></color-text-size-group>
-                    </el-form-item>
                     <el-form-item label="秒杀提示">
                         <color-picker v-model="form.end_text_color" :default-color="clone_form.end_text_color"></color-picker>
                     </el-form-item>
                     <el-form-item label="数字背景">
                         <mult-color-picker :value="form.countdown_bg_color_list" :type="form.countdown_direction" @update:value="countdown_color_picker_event"></mult-color-picker>
                     </el-form-item>
-                    <el-form-item label="数字">
+                    <el-form-item label="数字颜色">
                         <color-picker v-model="form.countdown_color" :default-color="clone_form.countdown_color"></color-picker>
                     </el-form-item>
-                    <el-form-item label="顶部背景">
+                    <el-form-item v-if="data.button_status == '1'" label="按钮设置">
+                        <color-text-size-group v-model:color="form.head_button_color" v-model:size="form.head_button_size" :default-color="clone_form.head_button_color" :type-list="['color', 'size']"></color-text-size-group>
+                    </el-form-item>
+                    <el-form-item label="头部背景">
                         <div class="flex-col gap-10">
+                            <div class="size-12">背景色</div>
                             <mult-color-picker :value="form.header_background_color_list" :type="form.header_background_direction" @update:value="mult_color_picker_event"></mult-color-picker>
                             <div class="flex-row jc-sb align-c">
                                 <div class="size-12">背景图</div>
diff --git a/src/views/layout/components/main/index.vue b/src/views/layout/components/main/index.vue
index 5174250b..e0d929ab 100644
--- a/src/views/layout/components/main/index.vue
+++ b/src/views/layout/components/main/index.vue
@@ -569,6 +569,8 @@ const upload_change = async (uploadFile: UploadFile) => {
 // 清空列表
 const clear_click = () => {
     app?.appContext.config.globalProperties.$common.message_box('清空后不可恢复，确定继续吗?', 'warning').then(() => {
+        page_data.value.com_data = cloneDeep(defaultSettings.header_nav);
+        footer_nav.value.com_data = cloneDeep(defaultSettings.footer_nav);
         diy_data.value = [];
         page_settings();
     });
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index f86f4a75..0404a894 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -52,7 +52,7 @@ const form = ref<diy_data_item>({
         name: '页面设置',
         show_tabs: '1',
         key: 'page-settings',
-        com_data: defaultSettings.header_nav,
+        com_data: cloneDeep(defaultSettings.header_nav),
     },
     footer: {
         name: '底部导航',