From ddc1eaf54ee1c990bb16c1f0437a22e418ac3fad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 10 Mar 2025 15:00:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AE=E6=92=AD?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-carousel/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/model-carousel/index.vue b/src/components/model-carousel/index.vue
index 86627f2a..5cdbd52f 100644
--- a/src/components/model-carousel/index.vue
+++ b/src/components/model-carousel/index.vue
@@ -2,7 +2,7 @@
     <div class="re" :style="style_container + swiper_bg_style">
         <div class="abs top-0 w h" :style="swiper_bg_img_style"></div>
         <div class="re" :style="style_img_container + (!isEmpty(swiper_bg_img_style) ? `background-image: url('');` : '')">
-            <div ref="swiperSize" class="swiper-container w h oh">
+            <div ref="swiperSize" class="swiper-container w h oh" :style="swiper_img_style">
                 <swiper
                     :key="carouselKey"
                     :class="[`swiper-right-${swiper_style.slidesPerView}`, {'swiper-card': interval_types}]"
@@ -100,7 +100,8 @@ const style_img_container = computed(() => props.isCommon ? common_img_computer(
 
 const autoplay = ref<boolean | object>(false)
 // 图片的设置
-const img_style = computed(() => radius_computer(new_style.value) );
+const img_style = computed(() => form.value.carousel_type == 'inherit' ? '' : radius_computer(new_style.value) );
+const swiper_img_style = computed(() => form.value.carousel_type == 'inherit' ? radius_computer(new_style.value) : '');
 //#region 指示器处理
 // 指示器选中样式
 const actived_color = computed(() => new_style.value?.actived_color || '#2A94FF' );

From ec1a015c3e83ef0d5df225f58c6c4562e3e216d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 10 Mar 2025 18:25:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=80=E5=85=B3=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page-settings/page-content.vue | 6 ++++++
 src/config/const/header-nav.ts                | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/components/page-settings/page-content.vue b/src/components/page-settings/page-content.vue
index 86a106fc..c5b7b8c7 100644
--- a/src/components/page-settings/page-content.vue
+++ b/src/components/page-settings/page-content.vue
@@ -57,6 +57,12 @@
                         <el-checkbox v-for="item in base_list.list_show_list.filter((item) => item.type.includes(form.theme))" :key="item.value" :value="item.value">{{ item.name }}</el-checkbox>
                     </el-checkbox-group>
                 </el-form-item>
+                <el-form-item label="返回按钮">
+                    <div class="flex-row align-c gap-10">
+                        <el-switch v-model="form.is_left_back_btn_show" active-value="1" inactive-value="0"></el-switch>
+                        <tooltip content="当从其他页面进入时有效"></tooltip>
+                    </div>
+                </el-form-item>
             </card-container>
             <template v-if="['4', '5'].includes(form.theme)">
                 <div class="bg-f5 divider-line" />
diff --git a/src/config/const/header-nav.ts b/src/config/const/header-nav.ts
index 9a7eb291..3880228b 100644
--- a/src/config/const/header-nav.ts
+++ b/src/config/const/header-nav.ts
@@ -23,6 +23,7 @@ interface DefaultFooterNav {
         title: string;
         link: object;
         data_alone_row_value: string[];
+        is_left_back_btn_show: string;
         indicator_location: string;
         bottom_navigation_show: string;
         positioning_name: string;
@@ -126,6 +127,7 @@ const defaultFooterNav: DefaultFooterNav = {
         link: {},
         // 换行内容
         data_alone_row_value: [],
+        is_left_back_btn_show: '1',
         // 对齐方式
         indicator_location: 'center',
         // 右侧图标信息