From 14118f4f9aad23aa95fe2f24ca62349ec0619559 Mon Sep 17 00:00:00 2001
From: "GukSang.Jin" <guksang_chen@163.com>
Date: Fri, 27 Feb 2026 09:38:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PetWash.Api/petwash.db                        | Bin 20480 -> 20480 bytes
 PetWash.Api/petwash.db-shm                    | Bin 32768 -> 32768 bytes
 PetWash.Api/petwash.db-wal                    | Bin 74192 -> 0 bytes
 .../Services/ConfigurationService.cs          |  12 +
 PetWashControl/ViewModels/MainViewModel.cs    |  91 ++-
 PetWashControl/Views/MainWindow.xaml          | 543 +++++++++++++++---
 6 files changed, 568 insertions(+), 78 deletions(-)

diff --git a/PetWash.Api/petwash.db b/PetWash.Api/petwash.db
index acef599f0aa677c0db0e9b6e728552e6c8bf74ed..847d61592ddcdd6a75353ca5c0bfec780e31cf74 100644
GIT binary patch
delta 1076
zcmZ`%y=s&}6x}ahcE4Rv$1M`_vq?7D9~(2dGk5O%e25sfu@Qqdf)EHQ5(Ghlk=Sem
zn^YG20x5g|CC?!E1lBe-TBWhoJDa4)goWW0bMD-8&z*C4oE;u#Ursk>``5C3Dcjn4
z_G;(li@p4MrBdlvTcZLtmh0PfUvCz_i*Lno@xFLm+%9UhpS9iUY4xDm`ugGf^wiV-
zsC{Q<=t|;)Qllkfaax16>!8=QZL2fRNzmGP=Mu`7K+*w|-tPArmBt`z3<iUw3QF|S
zIR%D%?FwgxD8T|Z30FBQ$)VC<5=xf{QiH_+xZj;1jL62MBS5m02%{-MOKZFiL!!&w
znNvzSOXzLl7^x%{4y3fwZ#x&lo0l7CRU%KWv^QQQ!jTJ-8Ee&<D}H;vYOPCUq$Q8R
z>7*rl;d#+$r@CvSH(_SmmE22vi5Qe})Lm^<vdu=FBakO=RjHf|+ESoio2v$ss*DWC
z%FgvxM*sY5b1b1W8wRJe>n=xO&I=0zn_z>asI$atI1^5Ep(KiL$x){@p$J@Qf<(`)
zTyJsGaIuPH0292*U2oxhx_FHoKwdNX?)>?5@fO%G=MCNd+{Gs)u>_35oFDMkCZEI{
zS<aX8)+eb14vvx-Jg+^;4G@2AUGn<4r#boIWs&zq7!~*Ww?2xYcrA9tbMZjj7Xxuu
z1o2mV5(i>i{1KnUk=PSY#G{ku&0jaRrt?PDkI;+IjnIj(R?V|4UmasR;?zpKUXHL7
Up*5x!$J9c+n2#_wI(qo-Kfb%l`~Uy|

delta 79
zcmV-V0I>gnpaFoO0kH8e78eWw104ZSVPk7yXJvB(4FCWD7YNpq2QV+OfuINiB^Q$}
lHx{$*I2H#37Y~V(2S6qX_79H_>kp(4iL((9QxB7gPj`n(7gGQL

diff --git a/PetWash.Api/petwash.db-shm b/PetWash.Api/petwash.db-shm
index cff27ec8dcb7cc40e262c3d4d18be5d68fc4658e..fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10 100644
GIT binary patch
delta 80
zcmZo@U}|V!;+1%$%K!t66E8}OTChv7nNGgVi7p`mlYpuI4+Il)WHvsK^4Rzw&Kv-+
C%@oA|

delta 259
zcmZo@U}|V!s+V}A%K!o#K+MR%ARq*!S%G-5>|Ub>3nnb8J=k+cM}D2anx*TrZt&+X
zAyqxlC@|m$lK+taRCr=Nrz<m%%>u+AYe6&&Ba0JcZ*0`{;ACWAXW(MsWf0id_?3yD
k31|{40~^q5+zfmSf*Tv(GjTFAa5C^P@G}T)Y-BV90K*|O<^TWy

diff --git a/PetWash.Api/petwash.db-wal b/PetWash.Api/petwash.db-wal
index ffbb270486495df317c69cfa4ee0a7eb0a90ae7d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 74192
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

diff --git a/PetWashControl/Services/ConfigurationService.cs b/PetWashControl/Services/ConfigurationService.cs
index e65a5db..c9bf6ab 100644
--- a/PetWashControl/Services/ConfigurationService.cs
+++ b/PetWashControl/Services/ConfigurationService.cs
@@ -9,4 +9,16 @@ public class ConfigurationService
     
     public int PaymentCheckIntervalSeconds { get; set; } = 2;
     public int WashSimulationSeconds { get; set; } = 10;
+    
+    // 洗护流程时间参数（单位：分钟）
+    public int FirstSprayWaterTime { get; set; } = 2;     // 首次喷水时间
+    public int AfterShampoo1SprayTime { get; set; } = 2;  // 沐浴1后喷水时间
+    public int AfterShampoo2SprayTime { get; set; } = 2;  // 沐浴2后喷水时间
+    public int AfterShampoo3SprayTime { get; set; } = 2;  // 沐浴3后喷水时间
+    public int SprayShampoo1Time { get; set; } = 1;       // 喷沐浴露1时间
+    public int SprayShampoo2Time { get; set; } = 1;       // 喷沐浴露2时间
+    public int SprayShampoo3Time { get; set; } = 1;       // 喷沐浴露3时间
+    public int SprayWaterTime { get; set; } = 2;          // 喷水时间（保留用于兼容）
+    public int ColdAirTime { get; set; } = 2;             // 冷风机时间
+    public int HotAirTime { get; set; } = 5;              // 热风机时间
 }
diff --git a/PetWashControl/ViewModels/MainViewModel.cs b/PetWashControl/ViewModels/MainViewModel.cs
index 8ff2097..ff88fb0 100644
--- a/PetWashControl/ViewModels/MainViewModel.cs
+++ b/PetWashControl/ViewModels/MainViewModel.cs
@@ -91,6 +91,36 @@ public partial class MainViewModel : ObservableObject
     [ObservableProperty]
     private bool _isCustomerServiceDialogOpen;
 
+    [ObservableProperty]
+    private int _firstSprayWaterTime = 2;
+
+    [ObservableProperty]
+    private int _afterShampoo1SprayTime = 2;
+
+    [ObservableProperty]
+    private int _afterShampoo2SprayTime = 2;
+
+    [ObservableProperty]
+    private int _afterShampoo3SprayTime = 2;
+
+    [ObservableProperty]
+    private int _sprayShampoo1Time = 1;
+
+    [ObservableProperty]
+    private int _sprayShampoo2Time = 1;
+
+    [ObservableProperty]
+    private int _sprayShampoo3Time = 1;
+
+    [ObservableProperty]
+    private int _sprayWaterTime = 2;
+
+    [ObservableProperty]
+    private int _coldAirTime = 2;
+
+    [ObservableProperty]
+    private int _hotAirTime = 5;
+
     private readonly System.Timers.Timer _carouselTimer;
     private readonly System.Timers.Timer _clockTimer;
     private readonly string[] _carouselImages = { "/Images/dog.png", "/Images/dog1.png", "/Images/dog2.png" };
@@ -104,6 +134,18 @@ public partial class MainViewModel : ObservableObject
         _mqttService = new MqttClientService(_config);
         _mqttService.MessageReceived += OnMqttMessageReceived;
         
+        // 从配置加载时间参数
+        FirstSprayWaterTime = _config.FirstSprayWaterTime;
+        AfterShampoo1SprayTime = _config.AfterShampoo1SprayTime;
+        AfterShampoo2SprayTime = _config.AfterShampoo2SprayTime;
+        AfterShampoo3SprayTime = _config.AfterShampoo3SprayTime;
+        SprayShampoo1Time = _config.SprayShampoo1Time;
+        SprayShampoo2Time = _config.SprayShampoo2Time;
+        SprayShampoo3Time = _config.SprayShampoo3Time;
+        SprayWaterTime = _config.SprayWaterTime;
+        ColdAirTime = _config.ColdAirTime;
+        HotAirTime = _config.HotAirTime;
+        
         // 初始化洗护步骤
         InitializeWashSteps();
 
@@ -140,6 +182,8 @@ public partial class MainViewModel : ObservableObject
         WashSteps.Add(new WashStep { Name = "第二次冲水", Status = "等待中" });
         WashSteps.Add(new WashStep { Name = "香波喷洒", Status = "等待中" });
         WashSteps.Add(new WashStep { Name = "第三次冲水", Status = "等待中" });
+        WashSteps.Add(new WashStep { Name = "护理液喷洒", Status = "等待中" });
+        WashSteps.Add(new WashStep { Name = "第四次冲水", Status = "等待中" });
         WashSteps.Add(new WashStep { Name = "热风吹毛", Status = "等待中" });
         WashSteps.Add(new WashStep { Name = "冷热风混合", Status = "等待中" });
     }
@@ -237,6 +281,34 @@ public partial class MainViewModel : ObservableObject
         _logger.LogInfo("关闭联系客服");
     }
 
+    [RelayCommand]
+    private void SaveSettings()
+    {
+        try
+        {
+            // 更新配置
+            _config.FirstSprayWaterTime = FirstSprayWaterTime;
+            _config.AfterShampoo1SprayTime = AfterShampoo1SprayTime;
+            _config.AfterShampoo2SprayTime = AfterShampoo2SprayTime;
+            _config.AfterShampoo3SprayTime = AfterShampoo3SprayTime;
+            _config.SprayShampoo1Time = SprayShampoo1Time;
+            _config.SprayShampoo2Time = SprayShampoo2Time;
+            _config.SprayShampoo3Time = SprayShampoo3Time;
+            _config.SprayWaterTime = SprayWaterTime;
+            _config.ColdAirTime = ColdAirTime;
+            _config.HotAirTime = HotAirTime;
+            
+            _logger.LogInfo($"系统参数已保存 - 首次喷水:{FirstSprayWaterTime}min, 沐浴1后喷水:{AfterShampoo1SprayTime}min, 沐浴2后喷水:{AfterShampoo2SprayTime}min, 沐浴3后喷水:{AfterShampoo3SprayTime}min, 喷沐浴露1:{SprayShampoo1Time}min, 喷沐浴露2:{SprayShampoo2Time}min, 喷沐浴露3:{SprayShampoo3Time}min, 喷水:{SprayWaterTime}min, 冷风:{ColdAirTime}min, 热风:{HotAirTime}min");
+            
+            MessageBox.Show("系统参数保存成功！", "成功", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("保存系统参数失败", ex);
+            MessageBox.Show($"保存失败: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+    }
+
     [RelayCommand]
     private void BackToIdle()
     {
@@ -446,15 +518,18 @@ public partial class MainViewModel : ObservableObject
     {
         try
         {
+            // 将分钟转换为秒
             var steps = new[]
             {
-                ("第一次冲水", 120),
-                ("沐浴露喷洒", 30),
-                ("第二次冲水", 180),
-                ("香波喷洒", 30),
-                ("第三次冲水", 180),
-                ("热风吹毛", 300),
-                ("冷热风混合", 120)
+                ("第一次冲水", FirstSprayWaterTime * 60),
+                ("沐浴露喷洒", SprayShampoo1Time * 60),
+                ("第二次冲水", AfterShampoo1SprayTime * 60),
+                ("香波喷洒", SprayShampoo2Time * 60),
+                ("第三次冲水", AfterShampoo2SprayTime * 60),
+                ("护理液喷洒", SprayShampoo3Time * 60),
+                ("第四次冲水", AfterShampoo3SprayTime * 60),
+                ("热风吹毛", HotAirTime * 60),
+                ("冷热风混合", ColdAirTime * 60)
             };
 
             int totalDuration = steps.Sum(s => s.Item2);
@@ -464,7 +539,7 @@ public partial class MainViewModel : ObservableObject
             {
                 var (stepName, duration) = steps[stepIndex];
                 CurrentStep = stepName;
-                _logger.LogInfo($"开始步骤: {stepName}");
+                _logger.LogInfo($"开始步骤: {stepName}, 时长: {duration / 60}分钟");
 
                 // 更新步骤状态
                 Application.Current.Dispatcher.Invoke(() =>
diff --git a/PetWashControl/Views/MainWindow.xaml b/PetWashControl/Views/MainWindow.xaml
index 20881a0..9159b8b 100644
--- a/PetWashControl/Views/MainWindow.xaml
+++ b/PetWashControl/Views/MainWindow.xaml
@@ -1550,79 +1550,482 @@
                                           Foreground="#2E7D32"
                                           Margin="0,0,0,20"/>
                                 
-                                <!-- 参数列表 -->
-                                <StackPanel>
-                                    <Border Background="#F5F5F5"
-                                           CornerRadius="10"
-                                           Padding="20,15"
-                                           Margin="0,0,0,10">
-                                        <Grid>
-                                            <TextBlock Text="水温设置" 
-                                                      FontSize="18"
-                                                      Foreground="#424242"
-                                                      VerticalAlignment="Center"/>
-                                            <TextBlock Text="40°C" 
-                                                      FontSize="20"
-                                                      FontWeight="Bold"
-                                                      Foreground="#FF6F00"
-                                                      HorizontalAlignment="Right"
-                                                      VerticalAlignment="Center"/>
-                                        </Grid>
-                                    </Border>
+                                <!-- 参数列表 - 两列布局 -->
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="15"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
                                     
-                                    <Border Background="#F5F5F5"
-                                           CornerRadius="10"
-                                           Padding="20,15"
-                                           Margin="0,0,0,10">
-                                        <Grid>
-                                            <TextBlock Text="风温设置" 
-                                                      FontSize="18"
-                                                      Foreground="#424242"
-                                                      VerticalAlignment="Center"/>
-                                            <TextBlock Text="45°C" 
-                                                      FontSize="20"
-                                                      FontWeight="Bold"
-                                                      Foreground="#FF6F00"
-                                                      HorizontalAlignment="Right"
-                                                      VerticalAlignment="Center"/>
-                                        </Grid>
-                                    </Border>
+                                    <!-- 左列 -->
+                                    <StackPanel Grid.Column="0">
+                                        <!-- 首次喷水 -->
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Text="首次喷水" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                                                    <TextBox Text="{Binding FirstSprayWaterTime, UpdateSourceTrigger=PropertyChanged}"
+                                                            Width="70"
+                                                            FontSize="16"
+                                                            FontWeight="Bold"
+                                                            Foreground="#FF6F00"
+                                                            Background="White"
+                                                            BorderBrush="#FF6F00"
+                                                            BorderThickness="2"
+                                                            Padding="6,4"
+                                                            TextAlignment="Center"
+                                                            VerticalContentAlignment="Center"/>
+                                                    <TextBlock Text="分钟" 
+                                                              FontSize="16"
+                                                              Foreground="#424242"
+                                                              Margin="8,0,0,0"
+                                                              VerticalAlignment="Center"/>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Border>
+                                        
+                                        <!-- 喷沐浴露1 -->
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Text="喷沐浴露1" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                                                    <TextBox Text="{Binding SprayShampoo1Time, UpdateSourceTrigger=PropertyChanged}"
+                                                            Width="70"
+                                                            FontSize="16"
+                                                            FontWeight="Bold"
+                                                            Foreground="#FF6F00"
+                                                            Background="White"
+                                                            BorderBrush="#FF6F00"
+                                                            BorderThickness="2"
+                                                            Padding="6,4"
+                                                            TextAlignment="Center"
+                                                            VerticalContentAlignment="Center"/>
+                                                    <TextBlock Text="分钟" 
+                                                              FontSize="16"
+                                                              Foreground="#424242"
+                                                              Margin="8,0,0,0"
+                                                              VerticalAlignment="Center"/>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Border>
+                                        
+                                        <!-- 沐浴1后喷水 -->
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Text="沐浴1后喷水" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                                                    <TextBox Text="{Binding AfterShampoo1SprayTime, UpdateSourceTrigger=PropertyChanged}"
+                                                            Width="70"
+                                                            FontSize="16"
+                                                            FontWeight="Bold"
+                                                            Foreground="#FF6F00"
+                                                            Background="White"
+                                                            BorderBrush="#FF6F00"
+                                                            BorderThickness="2"
+                                                            Padding="6,4"
+                                                            TextAlignment="Center"
+                                                            VerticalContentAlignment="Center"/>
+                                                    <TextBlock Text="分钟" 
+                                                              FontSize="16"
+                                                              Foreground="#424242"
+                                                              Margin="8,0,0,0"
+                                                              VerticalAlignment="Center"/>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Border>
+                                        
+                                        <!-- 喷沐浴露2 -->
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Text="喷沐浴露2" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                                                    <TextBox Text="{Binding SprayShampoo2Time, UpdateSourceTrigger=PropertyChanged}"
+                                                            Width="70"
+                                                            FontSize="16"
+                                                            FontWeight="Bold"
+                                                            Foreground="#FF6F00"
+                                                            Background="White"
+                                                            BorderBrush="#FF6F00"
+                                                            BorderThickness="2"
+                                                            Padding="6,4"
+                                                            TextAlignment="Center"
+                                                            VerticalContentAlignment="Center"/>
+                                                    <TextBlock Text="分钟" 
+                                                              FontSize="16"
+                                                              Foreground="#424242"
+                                                              Margin="8,0,0,0"
+                                                              VerticalAlignment="Center"/>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Border>
+                                        
+                                        <!-- 沐浴2后喷水 -->
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Text="沐浴2后喷水" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                                                    <TextBox Text="{Binding AfterShampoo2SprayTime, UpdateSourceTrigger=PropertyChanged}"
+                                                            Width="70"
+                                                            FontSize="16"
+                                                            FontWeight="Bold"
+                                                            Foreground="#FF6F00"
+                                                            Background="White"
+                                                            BorderBrush="#FF6F00"
+                                                            BorderThickness="2"
+                                                            Padding="6,4"
+                                                            TextAlignment="Center"
+                                                            VerticalContentAlignment="Center"/>
+                                                    <TextBlock Text="分钟" 
+                                                              FontSize="16"
+                                                              Foreground="#424242"
+                                                              Margin="8,0,0,0"
+                                                              VerticalAlignment="Center"/>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Border>
+                                    </StackPanel>
                                     
-                                    <Border Background="#F5F5F5"
-                                           CornerRadius="10"
-                                           Padding="20,15"
-                                           Margin="0,0,0,10">
-                                        <Grid>
-                                            <TextBlock Text="水压设置" 
-                                                      FontSize="18"
-                                                      Foreground="#424242"
-                                                      VerticalAlignment="Center"/>
-                                            <TextBlock Text="标准" 
-                                                      FontSize="20"
-                                                      FontWeight="Bold"
-                                                      Foreground="#4CAF50"
-                                                      HorizontalAlignment="Right"
-                                                      VerticalAlignment="Center"/>
-                                        </Grid>
-                                    </Border>
+                                    <!-- 右列 -->
+                                    <StackPanel Grid.Column="2">
+                                        <!-- 喷沐浴露3 -->
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Text="喷沐浴露3" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                                                    <TextBox Text="{Binding SprayShampoo3Time, UpdateSourceTrigger=PropertyChanged}"
+                                                            Width="70"
+                                                            FontSize="16"
+                                                            FontWeight="Bold"
+                                                            Foreground="#FF6F00"
+                                                            Background="White"
+                                                            BorderBrush="#FF6F00"
+                                                            BorderThickness="2"
+                                                            Padding="6,4"
+                                                            TextAlignment="Center"
+                                                            VerticalContentAlignment="Center"/>
+                                                    <TextBlock Text="分钟" 
+                                                              FontSize="16"
+                                                              Foreground="#424242"
+                                                              Margin="8,0,0,0"
+                                                              VerticalAlignment="Center"/>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Border>
+                                        
+                                        <!-- 沐浴3后喷水 -->
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Text="沐浴3后喷水" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                                                    <TextBox Text="{Binding AfterShampoo3SprayTime, UpdateSourceTrigger=PropertyChanged}"
+                                                            Width="70"
+                                                            FontSize="16"
+                                                            FontWeight="Bold"
+                                                            Foreground="#FF6F00"
+                                                            Background="White"
+                                                            BorderBrush="#FF6F00"
+                                                            BorderThickness="2"
+                                                            Padding="6,4"
+                                                            TextAlignment="Center"
+                                                            VerticalContentAlignment="Center"/>
+                                                    <TextBlock Text="分钟" 
+                                                              FontSize="16"
+                                                              Foreground="#424242"
+                                                              Margin="8,0,0,0"
+                                                              VerticalAlignment="Center"/>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Border>
+                                        
+                                        <!-- 喷水时间 -->
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Text="喷水时间" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                                                    <TextBox Text="{Binding SprayWaterTime, UpdateSourceTrigger=PropertyChanged}"
+                                                            Width="70"
+                                                            FontSize="16"
+                                                            FontWeight="Bold"
+                                                            Foreground="#FF6F00"
+                                                            Background="White"
+                                                            BorderBrush="#FF6F00"
+                                                            BorderThickness="2"
+                                                            Padding="6,4"
+                                                            TextAlignment="Center"
+                                                            VerticalContentAlignment="Center"/>
+                                                    <TextBlock Text="分钟" 
+                                                              FontSize="16"
+                                                              Foreground="#424242"
+                                                              Margin="8,0,0,0"
+                                                              VerticalAlignment="Center"/>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Border>
+                                        
+                                        <!-- 冷风机时间 -->
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Text="冷风机时间" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                                                    <TextBox Text="{Binding ColdAirTime, UpdateSourceTrigger=PropertyChanged}"
+                                                            Width="70"
+                                                            FontSize="16"
+                                                            FontWeight="Bold"
+                                                            Foreground="#FF6F00"
+                                                            Background="White"
+                                                            BorderBrush="#FF6F00"
+                                                            BorderThickness="2"
+                                                            Padding="6,4"
+                                                            TextAlignment="Center"
+                                                            VerticalContentAlignment="Center"/>
+                                                    <TextBlock Text="分钟" 
+                                                              FontSize="16"
+                                                              Foreground="#424242"
+                                                              Margin="8,0,0,0"
+                                                              VerticalAlignment="Center"/>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Border>
+                                        
+                                        <!-- 热风机时间 -->
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock Text="热风机时间" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal">
+                                                    <TextBox Text="{Binding HotAirTime, UpdateSourceTrigger=PropertyChanged}"
+                                                            Width="70"
+                                                            FontSize="16"
+                                                            FontWeight="Bold"
+                                                            Foreground="#FF6F00"
+                                                            Background="White"
+                                                            BorderBrush="#FF6F00"
+                                                            BorderThickness="2"
+                                                            Padding="6,4"
+                                                            TextAlignment="Center"
+                                                            VerticalContentAlignment="Center"/>
+                                                    <TextBlock Text="分钟" 
+                                                              FontSize="16"
+                                                              Foreground="#424242"
+                                                              Margin="8,0,0,0"
+                                                              VerticalAlignment="Center"/>
+                                                </StackPanel>
+                                            </Grid>
+                                        </Border>
+                                    </StackPanel>
+                                </Grid>
+                                
+                                <!-- 分隔线 -->
+                                <Border Height="2" Background="#E0E0E0" Margin="0,20,0,20"/>
+                                
+                                <!-- 固定参数显示 - 两列布局 -->
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="15"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
                                     
-                                    <Border Background="#F5F5F5"
-                                           CornerRadius="10"
-                                           Padding="20,15">
-                                        <Grid>
-                                            <TextBlock Text="系统版本" 
-                                                      FontSize="18"
-                                                      Foreground="#424242"
-                                                      VerticalAlignment="Center"/>
-                                            <TextBlock Text="v1.0.0" 
-                                                      FontSize="20"
-                                                      FontWeight="Bold"
-                                                      Foreground="#3F51B5"
-                                                      HorizontalAlignment="Right"
-                                                      VerticalAlignment="Center"/>
-                                        </Grid>
-                                    </Border>
-                                </StackPanel>
+                                    <StackPanel Grid.Column="0">
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <TextBlock Text="水温设置" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <TextBlock Text="40°C" 
+                                                          FontSize="18"
+                                                          FontWeight="Bold"
+                                                          Foreground="#FF6F00"
+                                                          HorizontalAlignment="Right"
+                                                          VerticalAlignment="Center"/>
+                                            </Grid>
+                                        </Border>
+                                        
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <TextBlock Text="水压设置" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <TextBlock Text="标准" 
+                                                          FontSize="18"
+                                                          FontWeight="Bold"
+                                                          Foreground="#4CAF50"
+                                                          HorizontalAlignment="Right"
+                                                          VerticalAlignment="Center"/>
+                                            </Grid>
+                                        </Border>
+                                    </StackPanel>
+                                    
+                                    <StackPanel Grid.Column="2">
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <TextBlock Text="风温设置" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <TextBlock Text="45°C" 
+                                                          FontSize="18"
+                                                          FontWeight="Bold"
+                                                          Foreground="#FF6F00"
+                                                          HorizontalAlignment="Right"
+                                                          VerticalAlignment="Center"/>
+                                            </Grid>
+                                        </Border>
+                                        
+                                        <Border Background="#F5F5F5"
+                                               CornerRadius="10"
+                                               Padding="15,12"
+                                               Margin="0,0,0,10">
+                                            <Grid>
+                                                <TextBlock Text="系统版本" 
+                                                          FontSize="16"
+                                                          Foreground="#424242"
+                                                          VerticalAlignment="Center"/>
+                                                <TextBlock Text="v1.0.0" 
+                                                          FontSize="18"
+                                                          FontWeight="Bold"
+                                                          Foreground="#3F51B5"
+                                                          HorizontalAlignment="Right"
+                                                          VerticalAlignment="Center"/>
+                                            </Grid>
+                                        </Border>
+                                    </StackPanel>
+                                </Grid>
+                                
+                                <!-- 保存按钮 -->
+                                <Button Content="保存设置"
+                                       FontSize="24"
+                                       FontWeight="Bold"
+                                       Height="60"
+                                       Background="#4CAF50"
+                                       Foreground="White"
+                                       BorderThickness="0"
+                                       Margin="0,20,0,0"
+                                       Cursor="Hand"
+                                       Command="{Binding SaveSettingsCommand}">
+                                    <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <Border Background="{TemplateBinding Background}" 
+                                                   CornerRadius="15">
+                                                <Border.Effect>
+                                                    <DropShadowEffect Color="#000000" BlurRadius="8" ShadowDepth="3" Opacity="0.3"/>
+                                                </Border.Effect>
+                                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                            </Border>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
                             </StackPanel>
                         </Border>
                     </StackPanel>