From 16e02a948aee5a6525f8befda97f7299f8f53c2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 6 Sep 2024 18:24:22 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E5=8F=B3=E8=BE=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-notice/index.vue                | 4 ++--
 src/components/model-notice/model-notice-content.vue | 7 ++-----
 src/views/layout/components/main/default/notice.ts   | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/model-notice/index.vue b/src/components/model-notice/index.vue
index f72ab978..3938cbfe 100644
--- a/src/components/model-notice/index.vue
+++ b/src/components/model-notice/index.vue
@@ -16,7 +16,7 @@
                 <el-carousel :key="carouselKey" class="flex-1" indicator-position="none" :interval="interval_time" arrow="never" :direction="direction_type" :autoplay="true">
                     <el-carousel-item v-for="(item, index) in notice_list" :key="index" :style="`${ news_style } color: ${ new_style.news_color }`">{{ item.notice_title }}</el-carousel-item>
                 </el-carousel>
-                <div v-if="form.is_right_button == 'show'" class="size-12"><el-icon class="iconfont icon-arrow-right" :color="new_style.button_color || '#999'"></el-icon></div>
+                <div v-if="form.is_right_button == '1'" class="size-12"><el-icon class="iconfont icon-arrow-right" :color="new_style.button_color || '#999'"></el-icon></div>
             </div>
         </template>
         <template v-else>
@@ -33,7 +33,7 @@
                     <template v-else>
                         <div :style="topic_style" class="pl-6 pr-6 radius-sm">{{ form.title || '公告' }}</div>
                     </template>
-                    <div v-if="form.is_right_button == 'show'" class="size-12" :style="`color: ${ new_style.button_color || '#999'}`">更多<el-icon class="iconfont icon-arrow-right" :color="new_style.button_color || '#999'"></el-icon></div>
+                    <div v-if="form.is_right_button == '1'" class="size-12" :style="`color: ${ new_style.button_color || '#999'}`">更多<el-icon class="iconfont icon-arrow-right" :color="new_style.button_color || '#999'"></el-icon></div>
                 </div>
                 <div v-for="(item, index) in notice_list" :key="index" class="flex" :style="news_style"><span :class="`num one${ index + 1 }`">{{ index + 1 }}</span><div class="break" :style="`color: ${ new_style.news_color }`">{{ item.notice_title }}</div></div>
             </div>
diff --git a/src/components/model-notice/model-notice-content.vue b/src/components/model-notice/model-notice-content.vue
index 4409087e..4ca6451f 100644
--- a/src/components/model-notice/model-notice-content.vue
+++ b/src/components/model-notice/model-notice-content.vue
@@ -41,12 +41,9 @@
             <card-container>
                 <div class="mb-12">按钮设置</div>
                 <el-form-item label="右侧按钮">
-                    <el-radio-group v-model="form.is_right_button">
-                        <el-radio value="show">显示</el-radio>
-                        <el-radio value="hidden">隐藏</el-radio>
-                    </el-radio-group>
+                    <el-switch v-model="form.is_right_button" active-value="1" inactive-value="0"></el-switch>
                 </el-form-item>
-                <el-form-item v-if="is_card && form.is_right_button != 'hidden'" label="链接">
+                <el-form-item v-if="is_card && form.is_right_button != '0'" label="链接">
                     <url-value v-model="form.more_link"></url-value>
                 </el-form-item>
             </card-container>
diff --git a/src/views/layout/components/main/default/notice.ts b/src/views/layout/components/main/default/notice.ts
index 546b3ca4..f6c5a308 100644
--- a/src/views/layout/components/main/default/notice.ts
+++ b/src/views/layout/components/main/default/notice.ts
@@ -50,7 +50,7 @@ const defaultSearch: defaultSearch = {
         title: '测试标题',
         img_src: [],
         icon_class: '',
-        is_right_button: 'show',
+        is_right_button: '1',
         interval_time: 2,
         more_link: {},
         notice_list: [

From 04329e575b1ea1ac106905c6ff798ae9c75e4c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 6 Sep 2024 18:26:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A6=E4=BE=A7?=
 =?UTF-8?q?=E6=94=B6=E8=B5=B7=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/layout/components/main/index.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/layout/components/main/index.scss b/src/views/layout/components/main/index.scss
index dfa405ed..6c0902ae 100644
--- a/src/views/layout/components/main/index.scss
+++ b/src/views/layout/components/main/index.scss
@@ -370,7 +370,10 @@
     .siderbar {
         width: 32rem;
     }
-    .drawer-container, .layout-toggle-bar {
+    .drawer-container {
+        width: 0 !important;
+    }
+    .layout-toggle-bar {
         display: none;
     }
 }
\ No newline at end of file

From ec9ec46ceba30ed49fa09587bb12be93457e2470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 6 Sep 2024 18:29:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=B5=E8=84=91=E5=B0=8F=E7=93=B6?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/layout/components/main/index.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/layout/components/main/index.scss b/src/views/layout/components/main/index.scss
index 6c0902ae..8270ea16 100644
--- a/src/views/layout/components/main/index.scss
+++ b/src/views/layout/components/main/index.scss
@@ -366,6 +366,12 @@
     }
 }
 
+@media screen and (max-width: 1640px) {
+    .main .acticons .el-button {
+        width: 8rem;
+    }
+}
+
 @media screen and (max-width: 1560px) {
     .siderbar {
         width: 32rem;