diff --git a/src/components/common/custom-module/model-text/model-text-style.vue b/src/components/common/custom-module/model-text/model-text-style.vue
index 7384f782..e62bb4b1 100644
--- a/src/components/common/custom-module/model-text/model-text-style.vue
+++ b/src/components/common/custom-module/model-text/model-text-style.vue
@@ -4,7 +4,7 @@
             <card-container>
                 <div class="mb-12">文本设置</div>
                 <el-form-item label="文本内容">
-                    <el-input v-model="form.text_title" placeholder="请输入文本内容" type="textarea" :rows="3" @input="text_change('1')"></el-input>
+                    <el-input v-model="form.text_title" placeholder="请输入文本内容" type="textarea" clearable :rows="3" @input="text_change('1')"></el-input>
                 </el-form-item>
                 <el-form-item label="数据字段">
                     <el-select v-model="form.data_source_id" value-key="id" clearable filterable placeholder="请选择图片数据字段" size="default" class="flex-1" @change="text_change('2')">
diff --git a/src/components/common/drag-group/index.vue b/src/components/common/drag-group/index.vue
index b503aa2d..d464ea73 100644
--- a/src/components/common/drag-group/index.vue
+++ b/src/components/common/drag-group/index.vue
@@ -10,7 +10,7 @@
                 </template>
             </el-image>
             <template v-if="index === edit_index">
-                <el-input v-model="row.new_title" placeholder="请输入链接" type="textarea" class="flex-1 do-not-trigger" :rows="2"></el-input>
+                <el-input v-model="row.new_title" placeholder="请输入链接" type="textarea" class="flex-1 do-not-trigger" clearable :rows="2"></el-input>
             </template>
             <template v-else>
                 <div class="flex-1 flex-width text-line-2 size-12 self-s do-not-trigger" @dblclick="double_click(index)">{{ !isEmpty(row.new_title) ? row.new_title : row.data.title }}</div>
diff --git a/src/components/common/hot/index.vue b/src/components/common/hot/index.vue
index 180aa4ea..b3382919 100644
--- a/src/components/common/hot/index.vue
+++ b/src/components/common/hot/index.vue
@@ -41,7 +41,7 @@
                     <div class="size-16 fw mb-10">图片热区</div>
                     <div class="flex-col gap-20 item">
                         <div v-for="(item, index) in hot_list.data" :key="index" class="flex-row align-c gap-10">
-                            <el-input v-model="item.name" class="name" placeholder="名称"></el-input>
+                            <el-input v-model="item.name" class="name" placeholder="名称" clearable></el-input>
                             <url-value v-model="item.link"></url-value>
                             <icon name="del" size="20" @click="del_event(index)"></icon>
                         </div>
@@ -66,7 +66,7 @@
         <div class="content">
             <el-form ref="formRef" :model="form" label-width="85px" class="pa-20 mt-16">
                 <el-form-item label="名称">
-                    <el-input v-model="form.name" placeholder="请输入名称"></el-input>
+                    <el-input v-model="form.name" placeholder="请输入名称" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="热区跳转链接">
                     <url-value v-model="form.link"></url-value>
diff --git a/src/components/common/product-show-config/index.vue b/src/components/common/product-show-config/index.vue
index 06ae78ce..10b0bd06 100644
--- a/src/components/common/product-show-config/index.vue
+++ b/src/components/common/product-show-config/index.vue
@@ -22,7 +22,7 @@
                     <el-radio v-for="item in base_list.shopping_button_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
                 </el-radio-group>
                 <template v-if="form.shop_type == 'text'">
-                    <el-input v-model="form.shop_button_text" placeholder="请输入按钮文字"></el-input>
+                    <el-input v-model="form.shop_button_text" placeholder="请输入按钮文字" clearable></el-input>
                 </template>
                 <template v-else>
                     <upload v-model:icon-value="form.shop_button_icon_class" is-icon type="icon" :limit="1" size="50"></upload>
diff --git a/src/components/common/upload/form-upload-category.vue b/src/components/common/upload/form-upload-category.vue
index a7c4546e..1c67af3f 100644
--- a/src/components/common/upload/form-upload-category.vue
+++ b/src/components/common/upload/form-upload-category.vue
@@ -8,13 +8,13 @@
         <div class="mt-16 pa-20">
             <el-form ref="ruleFormRef" :model="form" :rules="rules" label-width="60" status-icon>
                 <el-form-item label="名称" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入名称"></el-input>
+                    <el-input v-model="form.name" placeholder="请输入名称" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="路径" prop="path">
-                    <el-input v-model="form.path" placeholder="请输入路径"></el-input>
+                    <el-input v-model="form.path" placeholder="请输入路径" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="排序">
-                    <el-input v-model="form.sort" placeholder="请输入排序"></el-input>
+                    <el-input v-model="form.sort" placeholder="请输入排序" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="是否启用">
                     <el-switch v-model="form.is_enable" active-value="1" inactive-value="0"></el-switch>
diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue
index cf7500a2..57023162 100644
--- a/src/components/common/upload/index.vue
+++ b/src/components/common/upload/index.vue
@@ -16,7 +16,7 @@
             <div v-if="upload_type !== 'icon'" class="flex-row gap-40">
                 <div class="left-content">
                     <div class="flex-row align-c gap-10 mb-10">
-                        <el-input v-model="search_filter" placeholder="请输入分类名称">
+                        <el-input v-model="search_filter" placeholder="请输入分类名称" clearable>
                             <template #prefix>
                                 <icon name="search" size="18"></icon>
                             </template>
@@ -111,7 +111,7 @@
                                         </div>
                                         <div class="text-line-1 name" @click.stop>
                                             <template v-if="edit_index !== -1 && edit_index === index">
-                                                <el-input v-model="item.original" v-focus type="text" placeholder="请输入内容" size="small" @blur="edit_index = -1" @keydown="edit_input_keydown" @change="edit_input_change" />
+                                                <el-input v-model="item.original" v-focus type="text" placeholder="请输入内容" size="small" clearable @blur="edit_index = -1" @keydown="edit_input_keydown" @change="edit_input_change" />
                                             </template>
                                             <template v-else>
                                                 <div class="ptb-1 plr-7 c-pointer no-select" @dblclick.prevent="edit_index = index">
diff --git a/src/components/common/url-value/link-custom.vue b/src/components/common/url-value/link-custom.vue
index a8eb0147..63417a58 100644
--- a/src/components/common/url-value/link-custom.vue
+++ b/src/components/common/url-value/link-custom.vue
@@ -9,28 +9,28 @@
                 <el-form ref="ruleFormRef" :model="form" label-width="85px" status-icon>
                     <template v-if="custom_type_active == 0">
                         <el-form-item label="跳转路径" prop="link" :rules="link">
-                            <el-input v-model="form.link" class="link-input" placeholder="请输入跳转路径" />
+                            <el-input v-model="form.link" class="link-input" placeholder="请输入跳转路径" clearable />
                         </el-form-item>
                     </template>
                     <template v-if="custom_type_active == 1">
                         <el-form-item label="APPID" prop="app_id" :rules="app_id">
-                            <el-input v-model="form.app_id" class="link-input" placeholder="请输入小程序APPID" />
+                            <el-input v-model="form.app_id" class="link-input" placeholder="请输入小程序APPID" clearable />
                         </el-form-item>
                         <el-form-item label="小程序路径" prop="app_link" :rules="app_link">
-                            <el-input v-model="form.app_link" class="link-input" placeholder="请输入小程序路径" />
+                            <el-input v-model="form.app_link" class="link-input" placeholder="请输入小程序路径" clearable />
                         </el-form-item>
                     </template>
                     <template v-if="custom_type_active == 2">
                         <el-form-item label="电话号码" prop="phone" :rules="phone">
-                            <el-input v-model="form.phone" class="link-input" placeholder="请输入电话号码" />
+                            <el-input v-model="form.phone" class="link-input" placeholder="请输入电话号码" clearable />
                         </el-form-item>
                     </template>
                     <template v-if="custom_type_active == 3">
                         <el-form-item label="名称" prop="name" :rules="name">
-                            <el-input v-model="form.name" class="link-input" placeholder="请输入名称" />
+                            <el-input v-model="form.name" class="link-input" placeholder="请输入名称" clearable />
                         </el-form-item>
                         <el-form-item label="详细地址" prop="address" :rules="address">
-                            <el-input v-model="form.address" class="link-input" placeholder="请输入地址" type="1" @change="address_change" />
+                            <el-input v-model="form.address" class="link-input" placeholder="请输入地址" type="1" clearable @change="address_change" />
                         </el-form-item>
                         <el-form-item label="经纬度">
                             <maps v-model="map_address" :type="common_map_type" @point="map_point"></maps>
diff --git a/src/components/common/url-value/link-goods-search.vue b/src/components/common/url-value/link-goods-search.vue
index 20b7ed96..0f45c7e4 100644
--- a/src/components/common/url-value/link-goods-search.vue
+++ b/src/components/common/url-value/link-goods-search.vue
@@ -52,7 +52,7 @@
             <template v-if="custom_type_active === 2">
                 <el-form ref="ruleFormRef" :model="form" :rules="rules" label-width="85px" status-icon>
                     <el-form-item label="关键字" prop="key">
-                        <el-input v-model="form.key" class="link-input" placeholder="请输入关键字" />
+                        <el-input v-model="form.key" class="link-input" placeholder="请输入关键字" clearable />
                     </el-form-item>
                     <el-button type="primary" class="hide" @click="on_submit">Create</el-button>
                 </el-form>
diff --git a/src/components/model-coupon/model-coupon-content.vue b/src/components/model-coupon/model-coupon-content.vue
index 3b916f84..f5e92513 100644
--- a/src/components/model-coupon/model-coupon-content.vue
+++ b/src/components/model-coupon/model-coupon-content.vue
@@ -39,10 +39,10 @@
                 </template>
                 <template v-if="form.theme === '4'">
                     <el-form-item label="内容标题">
-                        <el-input v-model="form.title" placeholder="请输入内容"></el-input>
+                        <el-input v-model="form.title" placeholder="请输入内容" clearable></el-input>
                     </el-form-item>
                     <el-form-item label="内容描述">
-                        <el-input v-model="form.desc" type="textarea" :rows="4" placeholder="请输入内容"></el-input>
+                        <el-input v-model="form.desc" type="textarea" :rows="4" placeholder="请输入内容" clearable></el-input>
                     </el-form-item>
                 </template>
             </card-container>
diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue
index 3261c5df..75a3baf8 100644
--- a/src/components/model-custom/model-custom-content.vue
+++ b/src/components/model-custom/model-custom-content.vue
@@ -9,8 +9,8 @@
                     </el-select>
                     <div v-if="!isEmpty(form.data_source_content)" class="flex-row mt-20 gap-20">
                         <div class="re flex align-c">
-                            <image-empty v-model="form.data_source_content[form.img_key]" style="width: 10rem; height: 10rem"></image-empty>
-                            <div class="plr-15 bg-f abs replace-data size-14" @click="replace_data">替换数据</div>
+                            <image-empty v-model="form.data_source_content[form.img_key]" fit="contain" style="width: 10rem;height: 10rem" error-img-style="width: 3rem; height: 3rem;"></image-empty>
+                            <div class="plr-10 bg-f abs replace-data size-10 box-shadow-sm" @click="replace_data">替换数据</div>
                         </div>
                         <div class="flex-1 size-14 text-line-3">{{ form.data_source_content.title || form.data_source_content.name }}</div>
                     </div>
@@ -166,6 +166,7 @@ const changeDataSource = (key: string) => {
 const url_value_dialog_call_back = (item: any[]) => {
     if (item.length > 0) {
         form.data_source_content = item[0];
+        form.data_source_content_value = item[0].id;
     } else {
         form.data_source_content = {};
     }
@@ -226,9 +227,11 @@ const replace_data = () => {
     }
 }
 .replace-data {
-    bottom: 1rem;
-    left: 0.5rem;
+    height: 2.4rem;
+    bottom: 0.5rem;
+    left: 2.1rem;
+    line-height: 2.4rem;
     border-radius: 2rem;
-    border: 1px solid #ccc;
+    cursor: pointer;
 }
 </style>
diff --git a/src/components/model-data-magic/components/tabs-content.vue b/src/components/model-data-magic/components/tabs-content.vue
index a40637a4..cd5817d5 100644
--- a/src/components/model-data-magic/components/tabs-content.vue
+++ b/src/components/model-data-magic/components/tabs-content.vue
@@ -8,10 +8,10 @@
         </el-form-item>
         <template v-if="form.data_type === 'goods' && isShowTitle">
             <el-form-item label="主标题">
-                <el-input v-model="form.heading_title" placeholder="请输入主标题"></el-input>
+                <el-input v-model="form.heading_title" placeholder="请输入主标题" clearable></el-input>
             </el-form-item>
             <el-form-item label="副标题">
-                <el-input v-model="form.subtitle" placeholder="请输入副标题"></el-input>
+                <el-input v-model="form.subtitle" placeholder="请输入副标题" clearable></el-input>
             </el-form-item>
         </template>
     </card-container>
diff --git a/src/components/model-data-magic/model-data-magic-content.vue b/src/components/model-data-magic/model-data-magic-content.vue
index 4938861a..51d7d53c 100644
--- a/src/components/model-data-magic/model-data-magic-content.vue
+++ b/src/components/model-data-magic/model-data-magic-content.vue
@@ -3,7 +3,7 @@
         <el-form :model="form" label-width="80">
             <card-container>
                 <div class="mb-12">展示风格</div>
-                <el-form-item label="选择风格">
+                <el-form-item label="选择风格" label-width="60">
                     <div class="flex align-c flex-wrap gap-10">
                         <div v-for="(item, index) in style_list" :key="index" :class="['flex-item', {'flex-item-actived': form.style_actived === index }]" @click="style_click(index)">
                             <icon :name="item" :color="`${ form.style_actived === index ? '#E1EEF9' : '#EDEDED'}`" size="30"></icon>
diff --git a/src/components/model-nav-group/model-nav-group-content.vue b/src/components/model-nav-group/model-nav-group-content.vue
index 106854a3..850fb99b 100644
--- a/src/components/model-nav-group/model-nav-group-content.vue
+++ b/src/components/model-nav-group/model-nav-group-content.vue
@@ -38,11 +38,11 @@
                 <div class="tips mt-10 mb-20 size-12">最多添加{{ form.nav_content_list.length }}张图片，建议尺寸90*90px</div>
                 <drag :data="form.nav_content_list" type="card" :space-col="27" @remove="remove" @on-sort="on_sort">
                     <template #default="scoped">
-                        <div class="flex-row align-c jc-c">
+                        <div class="flex-row align-c jc-c w h">
                             <upload v-model="scoped.row.img" :limit="1" size="72"></upload>
-                            <div class="flex-col align-c jc-c gap-20">
+                            <div class="flex-col flex-1 jc-c gap-20">
                                 <el-form-item label="标题" class="mb-0" label-width="50">
-                                    <el-input v-model="scoped.row.title" placeholder="请输入标题" maxlength="4" show-word-limit></el-input>
+                                    <el-input v-model="scoped.row.title" placeholder="请输入标题" maxlength="4" show-word-limit clearable></el-input>
                                 </el-form-item>
                                 <el-form-item label="链接" class="w mb-0" label-width="50">
                                     <url-value v-model="scoped.row.link"></url-value>
diff --git a/src/components/model-notice/model-notice-content.vue b/src/components/model-notice/model-notice-content.vue
index 1c579f09..4409087e 100644
--- a/src/components/model-notice/model-notice-content.vue
+++ b/src/components/model-notice/model-notice-content.vue
@@ -23,7 +23,7 @@
                     <upload v-model="form.img_src" v-model:icon-value="form.icon_class" is-icon :limit="1" size="50"></upload>
                 </el-form-item>
                 <el-form-item v-if="is_text" label="标题文字">
-                    <el-input v-model="form.title" placeholder="请输入标题" maxlength="4" show-word-limit></el-input>
+                    <el-input v-model="form.title" placeholder="请输入标题" maxlength="4" show-word-limit clearable></el-input>
                 </el-form-item>
                 <template v-if="!is_card">
                     <el-form-item label="滚动方式">
@@ -57,7 +57,7 @@
                     <template #default="scoped">
                         <div class="flex-col align-c jc-s gap-20 flex-1">
                             <el-form-item label="标题" class="w mb-0" label-width="40">
-                                <el-input v-model="scoped.row.notice_title" placeholder="请输入标题" maxlength="20" show-word-limit></el-input>
+                                <el-input v-model="scoped.row.notice_title" placeholder="请输入标题" maxlength="20" show-word-limit clearable></el-input>
                             </el-form-item>
                             <el-form-item label="链接" class="w mb-0" label-width="40">
                                 <url-value v-model="scoped.row.notice_link"></url-value>
diff --git a/src/components/model-search/model-search-content.vue b/src/components/model-search/model-search-content.vue
index ccae3515..8283610f 100644
--- a/src/components/model-search/model-search-content.vue
+++ b/src/components/model-search/model-search-content.vue
@@ -19,7 +19,7 @@
                     </el-row>
                     <el-row v-if="form.is_tips_show == '1'" class="mt-10 w">
                         <el-col :span="24">
-                            <el-input v-model="form.tips" placeholder="请输入提示文字"></el-input>
+                            <el-input v-model="form.tips" placeholder="请输入提示文字" clearable></el-input>
                         </el-col>
                     </el-row>
                 </el-form-item>
@@ -40,7 +40,7 @@
                                 <upload v-model="form.search_botton_img" v-model:icon-value="form.search_botton_icon" is-icon :limit="1" size="50"></upload>
                             </template>
                             <template v-else>
-                                <el-input v-model="form.search_tips" placeholder="请输入文字内容"></el-input>
+                                <el-input v-model="form.search_tips" placeholder="请输入文字内容" clearable></el-input>
                             </template>
                         </el-col>
                     </el-row>
@@ -51,7 +51,7 @@
                 <div class="mb-12">搜索热词</div>
                 <drag :data="form.hot_word_list" @remove="remove" @on-sort="on_sort">
                     <template #default="scoped">
-                        <el-input v-model="scoped.row.value" placeholder="请输入搜索热词" />
+                        <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>
                     </template>
                 </drag>
diff --git a/src/components/model-seckill/model-seckill-content.vue b/src/components/model-seckill/model-seckill-content.vue
index 8bea6998..4152bc54 100644
--- a/src/components/model-seckill/model-seckill-content.vue
+++ b/src/components/model-seckill/model-seckill-content.vue
@@ -4,9 +4,7 @@
             <card-container>
                 <div class="mb-12">头部设置</div>
                 <el-form-item label="头部状态">
-                    <el-radio-group v-model="form.head_state">
-                        <el-radio v-for="item in base_list.state_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                    </el-radio-group>
+                    <el-switch v-model="form.head_state" active-value="1" inactive-value="0"></el-switch>
                 </el-form-item>
                 <template v-if="form.head_state == '1'">
                     <el-form-item label="选择风格">
@@ -25,17 +23,15 @@
                     </template>
                     <template v-else>
                         <el-form-item label="标题文字">
-                            <el-input v-model="form.topic_text" placeholder="请输入标题文字"></el-input>
+                            <el-input v-model="form.topic_text" placeholder="请输入标题文字" clearable></el-input>
                         </el-form-item>
                     </template>
                     <template v-if="form.theme != '2'">
                         <el-form-item label="按钮状态">
-                            <el-radio-group v-model="form.button_status">
-                                <el-radio v-for="item in base_list.state_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                            </el-radio-group>
+                            <el-switch v-model="form.button_status" active-value="1" inactive-value="0"></el-switch>
                         </el-form-item>
                         <el-form-item v-if="form.button_status == '1'" label="按钮文字">
-                            <el-input v-model="form.button_text" placeholder="请输入按钮文字"></el-input>
+                            <el-input v-model="form.button_text" placeholder="请输入按钮文字" clearable></el-input>
                         </el-form-item>
                     </template>
                 </template>
@@ -69,10 +65,12 @@
                     </el-checkbox-group>
                 </el-form-item>
                 <el-form-item label="秒杀按钮">
-                    <div class="flex-col gap-10 w">
-                        <el-switch v-model="form.is_shop_show" active-value="1" inactive-value="0"></el-switch>
-                        <template v-if="form.is_shop_show == '1'">
-                            <el-radio-group v-model="form.shop_type" @change="change_shop_type">
+                    <el-row class="w">
+                        <el-col :span="24"><el-switch v-model="form.is_shop_show" active-value="1" inactive-value="0"></el-switch></el-col>
+                    </el-row>
+                    <el-row v-if="form.is_shop_show == '1'" class="mt-10 w">
+                        <el-col :span="24">
+                            <el-radio-group v-model="form.shop_type" class="mb-10" @change="change_shop_type">
                                 <el-radio v-for="item in base_list.shopping_button_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
                             </el-radio-group>
                             <template v-if="form.shop_type == 'text'">
@@ -81,18 +79,16 @@
                             <template v-else>
                                 <upload v-model:icon-value="form.shop_button_icon_class" is-icon type="icon" :limit="1" size="50"></upload>
                             </template>
-                        </template>
-                    </div>
+                        </el-col>
+                    </el-row>
                 </el-form-item>
                 <el-form-item label="秒杀角标">
-                    <div class="flex-col gap-10 w">
-                        <el-radio-group v-model="form.seckill_subscript_show">
-                            <el-radio v-for="item in base_list.state_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                        </el-radio-group>
-                        <template v-if="form.seckill_subscript_show == '1'">
-                            <el-input v-model="form.subscript_text" placeholder="请输入秒杀文字"></el-input>
-                        </template>
-                    </div>
+                    <el-row class="w">
+                        <el-col :span="24"><el-switch v-model="form.seckill_subscript_show" active-value="1" inactive-value="0"></el-switch></el-col>
+                    </el-row>
+                    <el-row v-if="form.seckill_subscript_show == '1'" class="mt-10 w">
+                        <el-col :span="24"><el-input v-model="form.subscript_text" placeholder="请输入秒杀文字" clearable></el-input></el-col>
+                    </el-row>
                 </el-form-item>
             </card-container>
         </el-form>
@@ -128,10 +124,6 @@ watchEffect(() => {
 });
 
 const base_list = {
-    state_list: [
-        { name: '显示', value: '1' },
-        { name: '隐藏', value: '0' },
-    ],
     themeList: [
         { id: '1', name: '风格1', url: new URL(`../../assets/images/components/model-seckill/theme-1.png`, import.meta.url).href },
         { id: '2', name: '风格2', url: new URL(`../../assets/images/components/model-seckill/theme-2.png`, import.meta.url).href },
diff --git a/src/components/model-seckill/model-seckill-styles.vue b/src/components/model-seckill/model-seckill-styles.vue
index 5067b844..72145088 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="数字背景">
+                    <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>
@@ -114,7 +115,7 @@
                 </card-container>
             </template>
             <!-- 进度条设置 -->
-            <template v-if="data.shop_style_type == '1'">
+            <!-- <template v-if="data.shop_style_type == '1'">
                 <div class="divider-line"></div>
                 <card-container>
                     <div class="mb-12">进度条设置</div>
@@ -134,7 +135,7 @@
                         <color-picker v-model="form.progress_text_color"></color-picker>
                     </el-form-item>
                 </card-container>
-            </template>
+            </template> -->
             <!-- 轮播设置 -->
             <template v-if="data.shop_style_type == '3'">
                 <div class="divider-line"></div>
diff --git a/src/components/model-tabs/model-tabs-content.vue b/src/components/model-tabs/model-tabs-content.vue
index 722ed2c0..cb9c517a 100644
--- a/src/components/model-tabs/model-tabs-content.vue
+++ b/src/components/model-tabs/model-tabs-content.vue
@@ -24,7 +24,7 @@
                     <template #default="scoped">
                         <div class="flex-col align-c jc-s gap-20 flex-1 w">
                             <el-form-item label="显示文字" class="w mb-0">
-                                <el-input v-model="scoped.row.title" placeholder="请输入标题文字" />
+                                <el-input v-model="scoped.row.title" placeholder="请输入标题文字" clearable />
                             </el-form-item>
                             <el-form-item label="数据类型" class="w mb-0">
                                 <el-radio-group v-model="scoped.row.data_type">
@@ -33,7 +33,6 @@
                                 </el-radio-group>
                             </el-form-item>
                             <el-form-item :label="scoped.row.data_type == 'micro_page' ? '微页面' : '商品分类'" class="w mb-0">
-                                <!-- <el-input v-model="scoped.row.classify" placeholder="请选择页面" /> -->
                                 <template v-if="scoped.row.data_type == 'micro_page'">
                                     <url-value v-model="scoped.row.micro_page_list"></url-value>
                                 </template>
diff --git a/src/components/model-text-title/model-text-title-content.vue b/src/components/model-text-title/model-text-title-content.vue
index 2ab8c8bf..ad062378 100644
--- a/src/components/model-text-title/model-text-title-content.vue
+++ b/src/components/model-text-title/model-text-title-content.vue
@@ -4,7 +4,7 @@
             <card-container>
                 <div class="mb-12">标题设置</div>
                 <el-form-item label="标题名字">
-                    <el-input v-model="form.title" placeholder="请输入标题"></el-input>
+                    <el-input v-model="form.title" placeholder="请输入标题" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="标题链接">
                     <url-value v-model="form.title_link"></url-value>
@@ -30,7 +30,7 @@
                         <template #default="scoped">
                             <div class="flex-col align-c jc-s gap-20 flex-1">
                                 <el-form-item label="名称" label-width="40" class="w mb-0">
-                                    <el-input v-model="scoped.row.title" placeholder="请输入标题"></el-input>
+                                    <el-input v-model="scoped.row.title" placeholder="请输入标题" clearable></el-input>
                                 </el-form-item>
                                 <el-form-item label="链接" label-width="40" class="w mb-0">
                                     <url-value v-model="scoped.row.link"></url-value>
@@ -55,7 +55,7 @@
                 </el-form-item>
                 <template v-if="form.right_show == '1'">
                     <el-form-item label="右侧文字">
-                        <el-input v-model="form.right_title" placeholder="请输入标题"></el-input>
+                        <el-input v-model="form.right_title" placeholder="请输入标题" clearable></el-input>
                     </el-form-item>
                     <el-form-item label="链接">
                         <url-value v-model="form.right_link"></url-value>
diff --git a/src/components/page-settings/page-content.vue b/src/components/page-settings/page-content.vue
index aaaee2c3..29291b46 100644
--- a/src/components/page-settings/page-content.vue
+++ b/src/components/page-settings/page-content.vue
@@ -14,7 +14,7 @@
                     </el-form-item>
                     <template v-if="['1', '2'].includes(form.theme)">
                         <el-form-item label="页面标题">
-                            <el-input v-model="form.title" placeholder="请输入标题名称"></el-input>
+                            <el-input v-model="form.title" placeholder="请输入标题名称" clearable></el-input>
                         </el-form-item>
                         <el-form-item label="链接地址">
                             <url-value v-model="form.link"></url-value>
@@ -42,7 +42,7 @@
                 </template>
                 <template v-if="['4', '5'].includes(form.theme)">
                     <el-form-item label="定位名称">
-                        <el-input v-model="form.positioning_name" placeholder="请输入默认定位名称"></el-input>
+                        <el-input v-model="form.positioning_name" placeholder="请输入默认定位名称" clearable></el-input>
                     </el-form-item>
                     <el-form-item label="箭头按钮">
                         <el-radio-group v-model="form.is_arrows_show">
diff --git a/src/views/layout/components/main/default/custom.ts b/src/views/layout/components/main/default/custom.ts
index edc2de52..17da1ec3 100644
--- a/src/views/layout/components/main/default/custom.ts
+++ b/src/views/layout/components/main/default/custom.ts
@@ -5,7 +5,8 @@ interface defaultSearch {
         height: number;
         img_key: string;
         data_source: string;
-        data_source_content: string[];
+        data_source_content_value: string;
+        data_source_content: object;
         custom_list: string[];
     };
     style: {
@@ -16,7 +17,8 @@ const defaultSearch: defaultSearch = {
     content: {
         height: 390,
         img_key: '',
-        data_source_content: [],
+        data_source_content_value: '',
+        data_source_content: {},
         data_source:'',
         custom_list: []
     },
diff --git a/src/views/layout/components/main/index.scss b/src/views/layout/components/main/index.scss
index 54801ac0..6ce5c43b 100644
--- a/src/views/layout/components/main/index.scss
+++ b/src/views/layout/components/main/index.scss
@@ -39,14 +39,6 @@
         display: none;
     }
 }
-@media screen and (max-width: 1560px) {
-    .siderbar {
-        width: 32rem;
-    }
-    .drawer-container {
-        display: none;
-    }
-}
 .main {
     flex: 1;
     position: relative;
@@ -272,6 +264,19 @@
         }
     }
 }
+@media screen and (max-width: 1680px) {
+    .main .acticons .el-button {
+        width: 10rem;
+    }
+}
+@media screen and (max-width: 1560px) {
+    .siderbar {
+        width: 32rem;
+    }
+    .drawer-container {
+        display: none;
+    }
+}
 .seat {
     background: transparent;
     height: 0.2rem;
diff --git a/src/views/layout/components/main/index.vue b/src/views/layout/components/main/index.vue
index 0059c1a7..ec22ed69 100644
--- a/src/views/layout/components/main/index.vue
+++ b/src/views/layout/components/main/index.vue
@@ -58,14 +58,14 @@
                             <VueDraggable v-model="diy_data" :animation="500" :touch-start-threshold="2" group="people" class="drag-area re" ghost-class="ghost" :on-sort="on_sort" :on-start="on_start" :on-end="on_end">
                                 <div v-for="(item, index) in diy_data" :key="item.id" :class="model_class(item)" :style="model_style(item)" @click="on_choose(index, item.show_tabs)">
                                     <div v-if="item.show_tabs == '1'" class="plug-in-right" chosenClass="close">
-                                        <el-icon :class="`iconfont ${item.is_enable ? 'icon-eye' : 'icon-eye-close'}`" @click.stop="set_enable(index)" />
+                                        <el-icon :class="`iconfont ${item.is_enable == '1' ? 'icon-eye' : 'icon-eye-close'}`" @click.stop="set_enable(index)" />
                                         <el-icon class="iconfont icon-del" @click.stop="del(index)" />
                                         <el-icon class="iconfont icon-copy" @click.stop="copy(index)" />
                                         <el-icon :class="['iconfont', 'icon-arrow-top', icon_arrow_disable(item.key, index, 'moveUp')]" @click.stop="moveUp(index, arrow_disable_method(item.key, index, 'moveUp'))" />
                                         <el-icon :class="['iconfont', 'icon-arrow-bottom', icon_arrow_disable(item.key, index, 'moveDown')]" @click.stop="moveDown(index, arrow_disable_method(item.key, index, 'moveDown'))" />
                                     </div>
                                     <div class="plug-in-name">{{ item.name }}</div>
-                                    <div class="main-content" :class="{ 'plug-in-close': !item.is_enable }" :style="main_content_style">
+                                    <div class="main-content" :class="{ 'plug-in-close': item.is_enable != '1' }" :style="main_content_style">
                                         <!-- 基础组件 -->
                                         <!-- 视频 -->
                                         <template v-if="item.key == 'video'">
@@ -281,19 +281,33 @@ const url_computer = (name: string) => {
 
 // 模块的class
 const model_class = computed(() => {
-    return (item: { show_tabs: string; key: string; is_enable: boolean; id: string }) => {
+    return (item: { show_tabs: string; key: string; id: string }) => {
         return ['plug-in-table', { 'plug-in-border': item.show_tabs == '1', 'float-window': item.key == 'float-window', 'plug-in-animation': item.show_tabs != '1' && show_model_border }];
     };
 });
 
 const model_style = computed(() => {
     return (item: { id: string; key: string }) => {
-        // window.innerHeight(当前页面高度) - 60(顶部高度) - 846(中间高度)
-        const height = (window.innerHeight - 906) / 2;
-        let bottom = parseInt(float_bottom[item.id]) + height;
-        // 容器自身高度是60 846-60 =  786
-        if (parseInt(float_bottom[item.id]) > 786) {
-            bottom = 786 + height;
+        // 40是容器的上下间距， 60是顶部的高度
+        const container_height = window.innerHeight - 100;
+        let bottom = 0;
+        // 上下有除了padding间距时的处理逻辑
+        if (container_height > 844) {
+            // 上下高度
+            const height = (window.innerHeight - 906) / 2;
+            bottom = parseInt(float_bottom[item.id]) + height;
+            // 容器自身高度是60 846-60 =  786
+            if (parseInt(float_bottom[item.id]) > 786) {
+                bottom = 786 + height;
+            }
+        } else {
+            // 一半的上下间距
+            const height = 20;
+            bottom = parseInt(float_bottom[item.id]) + height;
+            // 容器自身高度是60 container_height-60
+            if (parseInt(float_bottom[item.id]) > container_height - 60) {
+                bottom = container_height - 60 + height;
+            }
         }
         return item.key == 'float-window' ? `bottom: ${((bottom / window.innerHeight) * 100).toFixed(4) + '%'};` : '';
     };
@@ -394,7 +408,7 @@ const on_end = () => {
 // 是否启用
 const set_enable = (index: number) => {
     const old_data = get_diy_index_data(index);
-    old_data.is_enable = !old_data.is_enable;
+    old_data.is_enable = old_data.is_enable == '1' ? '0' : '1';
 };
 // 向上移动
 const moveUp = (index: number, flag: boolean) => {
@@ -569,6 +583,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/components/navbar/index.vue b/src/views/layout/components/navbar/index.vue
index 0ec9a29f..61eac9d8 100644
--- a/src/views/layout/components/navbar/index.vue
+++ b/src/views/layout/components/navbar/index.vue
@@ -32,10 +32,10 @@
                     <upload v-model="form.logo" :limit="1"></upload>
                 </el-form-item>
                 <el-form-item label="名称" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入名称" />
+                    <el-input v-model="form.name" placeholder="请输入名称" clearable />
                 </el-form-item>
                 <el-form-item label="描述">
-                    <el-input v-model="form.describe" placeholder="请输入描述" :rows="4" type="textarea" />
+                    <el-input v-model="form.describe" placeholder="请输入描述" :rows="4" type="textarea" clearable />
                 </el-form-item>
                 <el-form-item label="开关">
                     <el-switch v-model="form.is_enable" active-value="1" inactive-value="0"></el-switch>
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 37f89269..52ec8b6d 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -49,7 +49,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: '底部导航',
@@ -172,7 +172,9 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false) =>
         //         item1.goods_ids = item.goods_list.map((item2: any) => item2.data.id).join(',') || '';
         //         item1.goods_list = [];
         //     });
-        // }
+        // } else if (item.key == 'custom') {
+        //    item.com_data.content.data_source_content = {};
+        //}
         return {
             ...item,
             show_tabs: '0',