From 1bb9debf3a8f157654f364f8a5676877395ff9ff Mon Sep 17 00:00:00 2001
From: anlyyao <anly_yaw@163.com>
Date: Wed, 23 Jul 2025 15:52:24 +0800
Subject: [PATCH] fix(Switch): fixed multiple color value errors

---
 src/common/style/theme/_components.less | 4 ++++
 src/switch/switch.less                  | 4 +++-
 src/switch/switch.wxml                  | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/common/style/theme/_components.less b/src/common/style/theme/_components.less
index 8af481c9e9..d452729152 100644
--- a/src/common/style/theme/_components.less
+++ b/src/common/style/theme/_components.less
@@ -3,6 +3,9 @@
   page,
   .page {
     --td-picker-transparent-color: rgba(255, 255, 255, 0);
+
+    --td-switch-dot-disabled-color: var(--td-font-white-1);
+    --td-switch-loading-color: var(--td-brand-color);
   }
 }
 
@@ -20,5 +23,6 @@
     --td-picker-transparent-color: transparent;
 
     --td-switch-dot-disabled-color: var(--td-font-white-2);
+    --td-switch-loading-color: var(--td-font-white-1);
   }
 }
diff --git a/src/switch/switch.less b/src/switch/switch.less
index b3278ed2bf..774bee5762 100644
--- a/src/switch/switch.less
+++ b/src/switch/switch.less
@@ -46,6 +46,8 @@
 @switch-icon-large-size: var(--td-switch-icon-large-size, 48rpx);
 @switch-icon-small-size: var(--td-switch-icon-small-size, 32rpx);
 
+@switch-loading-color: var(--td-switch-loading-color, @brand-color);
+
 .@{prefix}-switch {
   display: flex;
   align-items: center;
@@ -103,7 +105,7 @@
   }
 
   &__loading {
-    color: @switch-label-checked-color;
+    --td-loading-color: @switch-loading-color;
   }
 
   &__body {
diff --git a/src/switch/switch.wxml b/src/switch/switch.wxml
index 970a397744..814d2c605c 100644
--- a/src/switch/switch.wxml
+++ b/src/switch/switch.wxml
@@ -12,14 +12,14 @@
     class="{{_.cls(classPrefix + '__body', [['checked', checked], ['disabled', disabled || loading], size])}} {{prefix}}-class-body"
   >
     <view
-      class="{{_.cls(classPrefix + '__dot', [['checked', checked], ['disabled', disabled], ['plain', label.length != 2 && icon.length != 2 && !loading], size])}} {{prefix}}-class-dot"
+      class="{{_.cls(classPrefix + '__dot', [['checked', checked], ['disabled', disabled || loading], ['plain', label.length != 2 && icon.length != 2 && !loading], size])}} {{prefix}}-class-dot"
       aria-hidden="{{true}}"
     >
       <view
         wx:if="{{label}}"
         class="{{_.cls(classPrefix + '__label', [['checked', checked], ['disabled', disabled], size])}} {{prefix}}-class-label"
       >
-        <t-loading wx:if="{{loading}}" inherit-color size="32rpx" />
+        <t-loading wx:if="{{loading}}" class="{{classPrefix}}__loading" size="32rpx" />
         <text wx:elif="{{label.length == 2}}">{{checked ? label[0] : label[1]}}</text>
         <t-icon
           wx:elif="{{icon.length == 2}}"