From 2a97aecd214f5f5dd3be94d43a3ec33ca0e9dd9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 12 Nov 2024 15:03:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/margin/index.vue  |  6 +++---
 src/components/base/padding/index.vue |  6 +++---
 src/components/base/radius/index.vue  |  6 +++---
 src/components/base/slider/index.vue  | 10 +++++++++-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/components/base/margin/index.vue b/src/components/base/margin/index.vue
index 59816b75..fcbd1eee 100644
--- a/src/components/base/margin/index.vue
+++ b/src/components/base/margin/index.vue
@@ -79,15 +79,15 @@ onBeforeMount(() => {
 });
 const icon_data = reactive({
     name: 'margin',
-    title: '统一'
+    title: '独个'
 });
 const icon_event = (name: string) => {
     if (name == 'margin') {
         icon_data.name = 'alone';
-        icon_data.title = '独个';
+        icon_data.title = '统一';
     } else {
         icon_data.name = 'margin';
-        icon_data.title = '统一';
+        icon_data.title = '独个';
     }
 }
 //#endregion
diff --git a/src/components/base/padding/index.vue b/src/components/base/padding/index.vue
index 3f43b9f6..1457e349 100644
--- a/src/components/base/padding/index.vue
+++ b/src/components/base/padding/index.vue
@@ -79,15 +79,15 @@ onBeforeMount(() => {
 });
 const icon_data = reactive({
     name: 'margin',
-    title: '统一'
+    title: '独个'
 });
 const icon_event = (name: string) => {
     if (name == 'margin') {
         icon_data.name = 'alone';
-        icon_data.title = '独个';
+        icon_data.title = '统一';
     } else {
         icon_data.name = 'margin';
-        icon_data.title = '统一';
+        icon_data.title = '独个';
     }
 }
 //#endregion
diff --git a/src/components/base/radius/index.vue b/src/components/base/radius/index.vue
index 02eab818..f4f6a00b 100644
--- a/src/components/base/radius/index.vue
+++ b/src/components/base/radius/index.vue
@@ -97,15 +97,15 @@ onBeforeMount(() => {
 });
 const icon_data = reactive({
     name: 'unified',
-    title: '统一'
+    title: '独个'
 });
 const icon_event = (name: string) => {
     if (name == 'unified') {
         icon_data.name = 'alone';
-        icon_data.title = '独个';
+        icon_data.title = '统一';
     } else {
         icon_data.name = 'unified';
-        icon_data.title = '统一';
+        icon_data.title = '独个';
     }
 }
 //#endregion
diff --git a/src/components/base/slider/index.vue b/src/components/base/slider/index.vue
index 572080e0..d2559a29 100644
--- a/src/components/base/slider/index.vue
+++ b/src/components/base/slider/index.vue
@@ -1,6 +1,11 @@
 <template>
     <div class="slider w">
-        <el-slider v-model="modelValue" :min="min" :max="max" :step="step" />
+        <template v-if="max <= 10">
+            <el-slider v-model="modelValue" :min="min" :max="max" :step="step" show-stops />
+        </template>
+        <template v-else>
+            <el-slider v-model="modelValue" :min="min" :max="max" :step="step" />
+        </template>
         <input-number v-model="modelValue" :class="type == 'notRetract'? 'slider-input' : 'slider-retract-input'" :min="min" :max="max"></input-number>
     </div>
 </template>
@@ -33,6 +38,9 @@ const modelValue = defineModel({ type: Number, default: 0 });
     align-items: center;
     justify-content: space-between;
     gap: 1rem;
+    :deep(.el-slider__stop) {
+        background: #f2f2f2;
+    }
     .slider-input {
         :deep(.el-input-number) {
             width: 10.7rem;