From 1fb2ecf1a571155057b03f0f3e4899e91f666766 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 3 Sep 2024 14:27:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20sws=20?=
 =?UTF-8?q?2024-09-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-article-list/model-article-list-styles.vue  |  3 +--
 .../model-article-tabs/model-article-tabs-styles.vue  |  3 +--
 src/components/model-coupon/model-coupon-styles.vue   | 11 ++---------
 .../model-hot-zone/model-hot-zone-styles.vue          | 11 ++---------
 .../model-rich-text/model-rich-text-styles.vue        | 11 ++---------
 src/components/model-video/model-video-styles.vue     | 11 ++---------
 src/components/page-settings/page-styles.vue          |  4 ++--
 src/views/layout/components/navbar/index.vue          |  2 +-
 src/views/layout/components/settings/index.vue        |  2 +-
 src/views/layout/index.vue                            |  2 +-
 10 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/src/components/model-article-list/model-article-list-styles.vue b/src/components/model-article-list/model-article-list-styles.vue
index 063cfe82..451005fa 100644
--- a/src/components/model-article-list/model-article-list-styles.vue
+++ b/src/components/model-article-list/model-article-list-styles.vue
@@ -39,8 +39,8 @@
                     </el-form-item>
                 </template>
             </card-container>
-            <div class="divider-line"></div>
             <template v-if="theme == '4'">
+                <div class="divider-line"></div>
                 <card-container>
                     <div class="mb-12">轮播设置</div>
                     <el-form-item label="自动轮播">
@@ -50,7 +50,6 @@
                         <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                     </el-form-item>
                 </card-container>
-                <div class="divider-line"></div>
             </template>
         </el-form>
         <div class="divider-line"></div>
diff --git a/src/components/model-article-tabs/model-article-tabs-styles.vue b/src/components/model-article-tabs/model-article-tabs-styles.vue
index 394469dd..8110ae61 100644
--- a/src/components/model-article-tabs/model-article-tabs-styles.vue
+++ b/src/components/model-article-tabs/model-article-tabs-styles.vue
@@ -55,8 +55,8 @@
                     </el-form-item>
                 </template>
             </card-container>
-            <div class="divider-line"></div>
             <template v-if="theme == '4'">
+                <div class="divider-line"></div>
                 <card-container>
                     <div class="mb-12">轮播设置</div>
                     <el-form-item label="自动轮播">
@@ -66,7 +66,6 @@
                         <slider v-model="form.interval_time" :max="100"></slider>
                     </el-form-item>
                 </card-container>
-                <div class="divider-line"></div>
             </template>
         </el-form>
         <div class="divider-line"></div>
diff --git a/src/components/model-coupon/model-coupon-styles.vue b/src/components/model-coupon/model-coupon-styles.vue
index 3705f250..d7c6069b 100644
--- a/src/components/model-coupon/model-coupon-styles.vue
+++ b/src/components/model-coupon/model-coupon-styles.vue
@@ -56,7 +56,7 @@
             </card-container>
         </el-form>
         <div class="divider-line"></div>
-        <common-styles class="styles-height" :value="form.common_style" :is-mult-background="theme !== '7'" @update:value="common_styles_update" />
+        <common-styles :value="form.common_style" :is-mult-background="theme !== '7'" @update:value="common_styles_update" />
     </div>
 </template>
 <script setup lang="ts">
@@ -96,11 +96,4 @@ const common_styles_update = (val: Object) => {
     form.common_style = val;
 };
 </script>
-<style lang="scss" scoped>
-.styles {
-    width: 100%;
-    .styles-height {
-        min-height: calc(100vh - 16.8rem);
-    }
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/components/model-hot-zone/model-hot-zone-styles.vue b/src/components/model-hot-zone/model-hot-zone-styles.vue
index 690ae8f0..412cb369 100644
--- a/src/components/model-hot-zone/model-hot-zone-styles.vue
+++ b/src/components/model-hot-zone/model-hot-zone-styles.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="styles">
-        <common-styles class="styles-height" :value="form.common_style" @update:value="common_styles_update" />
+        <common-styles :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>
 <script setup lang="ts">
@@ -18,11 +18,4 @@ const common_styles_update = (val: Object) => {
     form.value.common_style = val;
 };
 </script>
-<style lang="scss" scoped>
-.styles {
-    width: 100%;
-    .styles-height {
-        min-height: calc(100vh - 16.8rem);
-    }
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/components/model-rich-text/model-rich-text-styles.vue b/src/components/model-rich-text/model-rich-text-styles.vue
index 314c3ea0..435c7adc 100644
--- a/src/components/model-rich-text/model-rich-text-styles.vue
+++ b/src/components/model-rich-text/model-rich-text-styles.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="styles">
-        <common-styles class="styles-height" :value="form.common_style" @update:value="common_styles_update" />
+        <common-styles :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>
 <script setup lang="ts">
@@ -19,11 +19,4 @@ const common_styles_update = (val: Object) => {
     form.common_style = val;
 };
 </script>
-<style lang="scss" scoped>
-.styles {
-    width: 100%;
-    .styles-height {
-        min-height: calc(100vh - 16.8rem);
-    }
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/components/model-video/model-video-styles.vue b/src/components/model-video/model-video-styles.vue
index 314c3ea0..435c7adc 100644
--- a/src/components/model-video/model-video-styles.vue
+++ b/src/components/model-video/model-video-styles.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="styles">
-        <common-styles class="styles-height" :value="form.common_style" @update:value="common_styles_update" />
+        <common-styles :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>
 <script setup lang="ts">
@@ -19,11 +19,4 @@ const common_styles_update = (val: Object) => {
     form.common_style = val;
 };
 </script>
-<style lang="scss" scoped>
-.styles {
-    width: 100%;
-    .styles-height {
-        min-height: calc(100vh - 16.8rem);
-    }
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue
index 85b4232a..9eafbb1d 100644
--- a/src/components/page-settings/page-styles.vue
+++ b/src/components/page-settings/page-styles.vue
@@ -58,8 +58,8 @@
                 </el-form-item>
             </card-container>
         </el-form>
-        <div class="bg-f5 divider-line" />
         <template v-if="['3', '5'].includes(content.theme)">
+            <div class="bg-f5 divider-line" />
             <model-search-styles :value="form" :content="props.content" :is-show-common="false"></model-search-styles>
         </template>
         <div class="bg-f5 divider-line" />
@@ -76,7 +76,7 @@ const props = defineProps({
     },
     content: {
         type: Object,
-        default: () => { },
+        default: () => {},
     },
 });
 const emit = defineEmits(['update:value']);
diff --git a/src/views/layout/components/navbar/index.vue b/src/views/layout/components/navbar/index.vue
index dc5eb529..dac3fbdd 100644
--- a/src/views/layout/components/navbar/index.vue
+++ b/src/views/layout/components/navbar/index.vue
@@ -109,7 +109,7 @@ const confirm_event = async (formEl: FormInstance | undefined) => {
 </script>
 <style lang="scss" scoped>
 .navbar {
-    height: 8rem;
+    height: 6rem;
     padding: 0 3rem;
     display: flex;
     justify-content: space-between;
diff --git a/src/views/layout/components/settings/index.vue b/src/views/layout/components/settings/index.vue
index 9dcb4374..e9ef1fb0 100644
--- a/src/views/layout/components/settings/index.vue
+++ b/src/views/layout/components/settings/index.vue
@@ -146,7 +146,7 @@ const radio = ref('1'); // 创建一个响应式的数字变量，初始值为0
         }
     }
     .setting-content {
-        height: calc(100vh - 16.8rem);
+        height: calc(100vh - 14.8rem);
         overflow: auto;
         background-color: #fff;
     }
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 1a6562a5..c3727d5d 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -220,7 +220,7 @@ const form_data_transfor_diy_data = (clone_form: diyData) => {
 .app-wrapper {
     background-color: #f0f2f5;
     .app-wrapper-content {
-        height: calc(100vh - 8rem);
+        height: calc(100vh - 6rem);
     }
 }
 .no-copy {