From 7e4b4f1e930dc003d2ef70dc4088e3790806150e Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 16 Oct 2024 14:54:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=97=AE=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/drag/index.vue           | 7 +++----
 src/components/page-settings/page-styles.vue | 7 +++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/base/drag/index.vue b/src/components/base/drag/index.vue
index 3d3e1c0f..b4b4442d 100644
--- a/src/components/base/drag/index.vue
+++ b/src/components/base/drag/index.vue
@@ -4,11 +4,10 @@
             <li v-for="(item, index) in from" :key="index" :class="className" class="flex gap-y-16 re" @click="on_click(item, index)">
                 <el-icon class="iconfont icon-drag size-16 cursor-move" />
                 <slot :row="item" :index="index" />
-                <el-icon v-if="type == 'card'" class="iconfont icon-close-fillup size-16 abs c-pointer cr-c top-de-5 right-de-5" @click.stop="remove(index)" />
-                <el-icon v-if="type == 'line'" class="iconfont icon-delete-o size-16 c-pointer do-not-trigger cr-6" @click.stop="remove(index)" />
-                <!-- <el-icon v-if="isShowEdit" class="iconfont size-16 cr-primary do-not-trigger two-click" @click.stop="edit(index)" /> -->
+                <el-icon v-if="type == 'card'" class="iconfont icon-close-fillup size-18 abs c-pointer cr-c top-de-5 right-de-5" @click.stop="remove(index)" />
+                <el-icon v-if="type == 'line'" class="iconfont icon-delete-o size-18 c-pointer do-not-trigger cr-6" @click.stop="remove(index)" />
                 <el-dropdown v-if="isShowEdit" placement="bottom">
-                    <icon name="more-o" size="16" class="icon-edit-o" color="primary"></icon>
+                    <icon name="more-o" size="18" class="icon-edit-o" color="primary"></icon>
                     <template #dropdown>
                         <el-dropdown-menu>
                             <el-dropdown-item @click.stop="edit(index)">编辑</el-dropdown-item>
diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue
index 8d804b9c..2eb05a75 100644
--- a/src/components/page-settings/page-styles.vue
+++ b/src/components/page-settings/page-styles.vue
@@ -34,7 +34,7 @@
                 <el-form-item v-if="form.header_background_type == 'transparent'" label="沉浸样式">
                     <div class="flex-row align-c gap-10">
                         <el-switch v-model="form.immersive_style" active-value="1" inactive-value="0" :disabled="is_have_tabs" @change="change_immersive_style"></el-switch>
-                        <el-tooltip effect="dark" :show-after="200" :hide-after="200" content="<span>开启沉浸样式时，不可添加选项卡和选项卡轮播。<br/>并且商品选项卡和文章选项卡的选项卡置顶功能禁用</span>" raw-content placement="top">
+                        <el-tooltip effect="light" :show-after="200" :hide-after="200" content="<span>开启沉浸样式时，不可添加选项卡和选项卡轮播。<br/>并且商品选项卡和文章选项卡的选项卡置顶功能禁用</span>" raw-content placement="top">
                             <icon name="miaosha-hdgz" size="12" color="#999"></icon>
                         </el-tooltip>
                     </div>
@@ -53,7 +53,10 @@
                     </div>
                 </el-form-item>
                 <el-form-item label="返回颜色">
-                    <color-picker v-model="form.left_back_btn_color" default-color="#333"></color-picker>
+                    <color-picker v-model="form.left_back_btn_color" class="mr-10" default-color="#333"></color-picker>
+                    <el-tooltip effect="light" :show-after="200" :hide-after="200" content="打开新页面才会出现返回按钮" raw-content placement="top">
+                        <icon name="miaosha-hdgz" size="12" color="#999"></icon>
+                    </el-tooltip>
                 </el-form-item>
             </card-container>
             <div class="bg-f5 divider-line" />