From 09c3a58bb083a23f355ae9115c906a0cc2735785 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 29 Aug 2024 14:56:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E4=BC=98=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20sws=202024-08-28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-text/model-text-style.vue           | 11 +++----
 .../model-search/model-search-content.vue     | 30 ++++++++-----------
 .../model-user-info-content.vue               |  6 ++--
 .../model-video/model-video-content.vue       |  2 +-
 src/components/page-settings/page-content.vue | 12 +++-----
 src/styles/common.scss                        |  1 +
 6 files changed, 25 insertions(+), 37 deletions(-)

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 ceb9c7e8..cd2d0260 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
@@ -8,7 +8,7 @@
                 </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')">
-                        <el-option v-for="item in options.filter(item => item.type == 'text')" :key="item.field" :label="item.name" :value="item.field" />
+                        <el-option v-for="item in options.filter((item) => item.type == 'text')" :key="item.field" :label="item.name" :value="item.field" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="链接">
@@ -63,7 +63,7 @@
                     <el-switch v-model="form.bottom_up" />
                 </el-form-item>
             </card-container>
-            <div class="bg-f5 partition-line" />
+            <div class="bg-f5 divider-line" />
             <card-container>
                 <div class="mb-12">容器设置</div>
                 <el-form-item label="容器宽度">
@@ -79,7 +79,7 @@
                     <radius :value="form.bg_radius" @update:value="bg_radius_change"></radius>
                 </el-form-item>
             </card-container>
-            <div class="bg-f5 partition-line" />
+            <div class="bg-f5 divider-line" />
             <card-container>
                 <div class="mb-12">边框设置</div>
                 <el-form-item label="边框显示">
@@ -142,7 +142,7 @@ const text_change = (key: string) => {
     } else {
         form.value.data_source_id = '';
     }
-}
+};
 
 watch(
     diy_data,
@@ -168,7 +168,4 @@ watch(
     width: 3rem;
     height: 2rem;
 }
-.partition-line {
-    height: 0.8rem;
-}
 </style>
diff --git a/src/components/model-search/model-search-content.vue b/src/components/model-search/model-search-content.vue
index 6b88e9a3..75d81513 100644
--- a/src/components/model-search/model-search-content.vue
+++ b/src/components/model-search/model-search-content.vue
@@ -5,7 +5,7 @@
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="图标样式" class="align-s">
                     <div class="flex-col w h gap-10">
-                        <el-switch v-model="form.is_icon_show"/>
+                        <el-switch v-model="form.is_icon_show" />
                         <template v-if="form.is_icon_show">
                             <upload v-model="form.icon_img_src" v-model:icon-value="form.icon_class" is-icon :limit="1" size="50"></upload>
                         </template>
@@ -13,16 +13,16 @@
                 </el-form-item>
                 <el-form-item label="提示文字">
                     <div class="flex-col gap-10 w">
-                        <el-switch v-model="form.is_tips_show"/>
+                        <el-switch v-model="form.is_tips_show" />
                         <el-input v-if="form.is_tips_show" v-model="form.tips" placeholder="请输入提示文字"></el-input>
                     </div>
                 </el-form-item>
                 <el-form-item v-if="form.is_tips_show || form.is_icon_show" label="是否居中">
-                    <el-switch v-model="form.is_center"/>
+                    <el-switch v-model="form.is_center" />
                 </el-form-item>
                 <el-form-item label="搜索按钮" class="align-s">
                     <div class="flex-col w h gap-10">
-                        <el-switch v-model="form.is_search_show"/>
+                        <el-switch v-model="form.is_search_show" />
                         <template v-if="form.is_search_show">
                             <el-radio-group v-model="form.search_type" class="ml-4">
                                 <el-radio value="img-icon">图片/图标</el-radio>
@@ -38,7 +38,7 @@
                     </div>
                 </el-form-item>
             </card-container>
-            <div class="bg-f5 partition-line" />
+            <div class="bg-f5 divider-line" />
             <card-container>
                 <div class="mb-12">搜索热词</div>
                 <drag :data="form.hot_word_list" @remove="remove" @on-sort="on_sort">
@@ -53,7 +53,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { get_math } from "@/utils";
+import { get_math } from '@/utils';
 interface Props {
     value: search_content;
 }
@@ -76,13 +76,13 @@ const props = withDefaults(defineProps<Props>(), {
                 id: get_math(), // 唯一标识使用，避免使用index作为唯一标识导致渲染节点出现问题
                 value: '',
                 color: '#000000',
-            }
+            },
         ],
-    })
+    }),
 });
 
 const state = reactive({
-    form: props.value
+    form: props.value,
 });
 // 如果需要解构，确保使用toRefs
 const { form } = toRefs(state);
@@ -100,14 +100,10 @@ const remove = (index: number) => {
 // 拖拽更新之后，更新数据
 const on_sort = (new_list: hot_word_list[]) => {
     form.value.hot_word_list = new_list;
-}
+};
 const search_color_change = (color: string, old_hot_word: hot_word_list) => {
-    const index = form.value.hot_word_list.findIndex(item => item.id == old_hot_word.id);
+    const index = form.value.hot_word_list.findIndex((item) => item.id == old_hot_word.id);
     (<arrayIndex>form.value.hot_word_list)[index].color = color;
-}
+};
 </script>
-<style lang="scss" scoped>
-.partition-line {
-    height: 0.8rem;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/components/model-user-info/model-user-info-content.vue b/src/components/model-user-info/model-user-info-content.vue
index f71e73f4..ba0b181f 100644
--- a/src/components/model-user-info/model-user-info-content.vue
+++ b/src/components/model-user-info/model-user-info-content.vue
@@ -9,7 +9,8 @@
                     </el-checkbox-group>
                 </el-form-item>
             </card-container>
-            <card-container class="content-height">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">图标设置</div>
                 <div class="size-12 cr-c mb-20">图片建议宽高80*80；鼠标拖拽左侧圆点可调整导航顺序</div>
                 <div class="nav-list">
@@ -61,8 +62,5 @@ const add = () => {
 <style lang="scss" scoped>
 .content {
     width: 100%;
-    .content-height {
-        min-height: calc(100vh - 38.2rem);
-    }
 }
 </style>
diff --git a/src/components/model-video/model-video-content.vue b/src/components/model-video/model-video-content.vue
index 02079d93..50c7027b 100644
--- a/src/components/model-video/model-video-content.vue
+++ b/src/components/model-video/model-video-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="content">
         <el-form :model="form" label-width="70" class="m-h">
-            <card-container class="common-content-height">
+            <card-container>
                 <div class="mb-12">内容设置</div>
                 <el-form-item label="上传视频">
                     <upload v-model="form.video" :limit="1" type="video"></upload>
diff --git a/src/components/page-settings/page-content.vue b/src/components/page-settings/page-content.vue
index be167dc3..8452ced1 100644
--- a/src/components/page-settings/page-content.vue
+++ b/src/components/page-settings/page-content.vue
@@ -11,7 +11,7 @@
                     </el-form-item>
                 </template>
             </card-container>
-            <div class="bg-f5 partition-line" />
+            <div class="bg-f5 divider-line" />
             <card-container>
                 <el-form-item label="底部导航">
                     <el-radio-group v-model="form.bottom_navigation_show" class="ml-4">
@@ -27,7 +27,7 @@ const props = defineProps({
     value: {
         type: Object,
         default: () => ({}),
-    }
+    },
 });
 const form = reactive(props.value);
 const base_list = reactive({
@@ -46,10 +46,6 @@ const base_list = reactive({
 });
 const themeChange = (value: string) => {
     console.log(value);
-}    
+};
 </script>
-<style lang="scss" scoped>
-.partition-line {
-    height: 0.8rem;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/styles/common.scss b/src/styles/common.scss
index b346368f..575e4e4b 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -261,4 +261,5 @@
 // 分割线
 .divider-line {
     height: 0.8rem;
+    background-color: #f0f2f5;
 }