From 540add8f60b4c42ba5cf2d404819279036c42c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=AB=E5=9F=8Evia?= <mochengvia@panuon.com>
Date: Fri, 24 May 2024 15:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=A5=97=E9=A4=90=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/basestyle.xaml    |  14 ++
 .../VPet-Simulator.Core.csproj                |   4 +-
 .../VPet-Simulator.Windows.Interface.csproj   |   4 +-
 .../VPet-Simulator.Windows.csproj             |   4 +-
 .../WinDesign/winWorkMenu.xaml                | 221 +++++++++++++-----
 VPet.Solution/VPet.Solution.csproj            |   4 +-
 6 files changed, 186 insertions(+), 65 deletions(-)

diff --git a/VPet-Simulator.Core/Display/basestyle.xaml b/VPet-Simulator.Core/Display/basestyle.xaml
index c281f66..026e8ed 100644
--- a/VPet-Simulator.Core/Display/basestyle.xaml
+++ b/VPet-Simulator.Core/Display/basestyle.xaml
@@ -159,6 +159,20 @@
         </Setter>
     </Style>
 
+    <Style x:Key="StandardToggleButtonStyle" BasedOn="{StaticResource {x:Type ToggleButton}}"
+        TargetType="{x:Type ToggleButton}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="pu:ToggleButtonHelper.HoverBackground" Value="{DynamicResource DARKPrimaryLighter}" />
+        <Setter Property="pu:ToggleButtonHelper.HoverForeground" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="pu:ToggleButtonHelper.CheckedBackground" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="pu:ToggleButtonHelper.CheckedForeground" Value="{DynamicResource DARKPrimaryText}" />
+        <Setter Property="Foreground" Value="{DynamicResource DARKPrimary}" />
+        <Setter Property="Padding" Value="10,5" />
+        <Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
+    </Style>
+    
     <Style x:Key="ThemedToggleButtonStyle" BasedOn="{StaticResource {x:Type ToggleButton}}"
             TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
diff --git a/VPet-Simulator.Core/VPet-Simulator.Core.csproj b/VPet-Simulator.Core/VPet-Simulator.Core.csproj
index d6b4a93..3ff73ed 100644
--- a/VPet-Simulator.Core/VPet-Simulator.Core.csproj
+++ b/VPet-Simulator.Core/VPet-Simulator.Core.csproj
@@ -25,8 +25,8 @@
 	<ItemGroup>
 		<PackageReference Include="LinePutScript" Version="1.11.6" />
 		<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" />
-		<PackageReference Include="Panuon.WPF" Version="1.1.0" />
-		<PackageReference Include="Panuon.WPF.UI" Version="1.2.1.3" />
+		<PackageReference Include="Panuon.WPF" Version="1.1.0.1" />
+		<PackageReference Include="Panuon.WPF.UI" Version="1.2.1.5" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">
diff --git a/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj b/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
index 1d25ea1..8191b2e 100644
--- a/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
+++ b/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="LinePutScript" Version="1.11.6" />
     <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" />
-    <PackageReference Include="Panuon.WPF" Version="1.1.0" />
-    <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.3" />
+    <PackageReference Include="Panuon.WPF" Version="1.1.0.1" />
+    <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.5" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
index 262575f..6f6b7ac 100644
--- a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
+++ b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
@@ -230,8 +230,8 @@
 		<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 		<PackageReference Include="NAudio" Version="2.2.1" />
-		<PackageReference Include="Panuon.WPF" Version="1.1.0" />
-		<PackageReference Include="Panuon.WPF.UI" Version="1.2.1.3" />
+		<PackageReference Include="Panuon.WPF" Version="1.1.0.1" />
+		<PackageReference Include="Panuon.WPF.UI" Version="1.2.1.5" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" />
diff --git a/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml b/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml
index c197623..75cb7a6 100644
--- a/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml
@@ -151,7 +151,7 @@
                             Background="Transparent" BorderThickness="0" Foreground="{DynamicResource PrimaryText}"
                             SelectedIndex="0">
                         <TabItem Header="机构签署">
-                            <Grid Margin="7">
+                            <Grid Margin="7,3">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition />
                                     <ColumnDefinition Width="15" />
@@ -162,6 +162,7 @@
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition />
+                                        <RowDefinition Height="Auto" />
                                     </Grid.RowDefinitions>
                                     <UniformGrid Columns="2">
                                         <UniformGrid.Resources>
@@ -187,67 +188,175 @@
                                                 Checked="tbtn_Agency_CheckChanged"
                                                 PreviewMouseLeftButtonDown="tbtnAgency_PreviewMouseLeftButtonDown" />
                                     </UniformGrid>
-                                    <Image x:Name="imgAgency" RenderOptions.BitmapScalingMode="HighQuality" Grid.Row="2"
+                                    <Image x:Name="imgAgency" RenderOptions.BitmapScalingMode="HighQuality" Grid.Row="2" Grid.RowSpan="2"
                                             Margin="-20,0" Stretch="Uniform" Source="/Res/img/r_agency_job.png" />
+                                    <ToggleButton x:Name="tbtnCurrentPlan"
+                                                  Grid.Row="3"
+                                                  HorizontalAlignment="Right"
+                                                  Style="{DynamicResource StandardToggleButtonStyle}"
+                                                  Padding="5,3"
+                                                  Content="当前套餐">
+                                        <pu:ToggleButtonHelper.CheckedContent>
+                                            <StackPanel Orientation="Horizontal">
+                                                <TextBlock>当前套餐</TextBlock>
+                                                <TextBlock Margin="3,0,0,0" VerticalAlignment="Center" FontFamily="{StaticResource RemixIcon}">&#xeb97;</TextBlock>
+                                            </StackPanel>
+                                        </pu:ToggleButtonHelper.CheckedContent>
+                                    </ToggleButton>
                                 </Grid>
                                 <Border Grid.Column="2" Background="White" CornerRadius="4" />
-                                <Grid Grid.Column="2" Margin="15">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <ComboBox x:Name="combTaskType" Margin="0,3,0,0"
-                                            Style="{DynamicResource StandardComboBoxStyle}"
-                                            pu:ComboBoxHelper.Watermark="--请选择套餐--" />
-                                    <TextBlock Grid.Row="1" Margin="0,7,0,0" VerticalAlignment="Bottom"
-                                            Text="{ll:Str 选择等级}" />
-                                    <TextBlock Grid.Row="1" Margin="0,7,0,0" FontSize="16" HorizontalAlignment="Right"
-                                            Foreground="{DynamicResource DARKPrimary}">
+                                <Grid Grid.Column="2"
+                                      Margin="7">
+                                    <Grid Visibility="{Binding IsChecked, Converter={x:Static pu:Converters.TrueToCollapseConverter}, ElementName=tbtnCurrentPlan}">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition />
+                                            <RowDefinition Height="Auto" />
+                                        </Grid.RowDefinitions>
+                                        <ComboBox x:Name="combTaskType"
+                                                  Margin="0,3,0,0"
+                                                  Style="{DynamicResource StandardComboBoxStyle}"
+                                                  pu:ComboBoxHelper.Watermark="--请选择套餐--" />
+                                        <TextBlock Grid.Row="1"
+                                                   Margin="0,7,0,0"
+                                                   VerticalAlignment="Bottom"
+                                                   Text="{ll:Str 选择等级}" />
+                                        <TextBlock Grid.Row="1"
+                                                   Margin="0,7,0,0"
+                                                   FontSize="16"
+                                                   HorizontalAlignment="Right"
+                                                   Foreground="{DynamicResource DARKPrimary}">
                                         <Run Text="Lv." />
                                         <Run Text="50" />
-                                    </TextBlock>
-                                    <Slider Grid.Row="2" pu:SliderHelper.ThumbWidth="10"
-                                            pu:SliderHelper.ThumbCornerRadius="2" pu:SliderHelper.ThumbHeight="16"
-                                            pu:SliderHelper.ThumbBorderThickness="2" SmallChange="1" Value="1"
-                                            Minimum="1" TickFrequency="1" IsSnapToTickEnabled="True" LargeChange="1"
-                                            Style="{DynamicResource StandardSliderStyle}" TickPlacement="Both"></Slider>
-                                    <Grid Grid.Row="4" Margin="0,3,0,0">
+                                        </TextBlock>
+                                        <Slider Grid.Row="2"
+                                                pu:SliderHelper.ThumbWidth="10"
+                                                pu:SliderHelper.ThumbCornerRadius="2"
+                                                pu:SliderHelper.ThumbHeight="16"
+                                                pu:SliderHelper.ThumbBorderThickness="2"
+                                                SmallChange="1"
+                                                Value="1"
+                                                Minimum="1"
+                                                TickFrequency="1"
+                                                IsSnapToTickEnabled="True"
+                                                LargeChange="1"
+                                                Style="{DynamicResource StandardSliderStyle}"
+                                                TickPlacement="BottomRight"></Slider>
+                                        <Grid Grid.Row="4"
+                                              Margin="0,7,0,0">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="22" />
+                                                <RowDefinition Height="22" />
+                                                <RowDefinition Height="22" />
+                                                <RowDefinition />
+                                                <RowDefinition Height="Auto" />
+                                            </Grid.RowDefinitions>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="Auto" />
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock x:Name="rTaskType">抽成</TextBlock>
+                                            <TextBlock Grid.Column="2"
+                                                       HorizontalAlignment="Right"
+                                                       Foreground="{DynamicResource DARKPrimary}"
+                                                       Text="20%" />
+                                            <TextBlock Grid.Row="1"
+                                                       Text="{ll:Str '等级需求'}" />
+                                            <TextBlock Grid.Row="1"
+                                                       Grid.Column="2"
+                                                       HorizontalAlignment="Right"
+                                                       Foreground="{DynamicResource DARKPrimary}"
+                                                       Text="Lv 100" />
+                                            <TextBlock Grid.Row="2"
+                                                       Text="{ll:Str '合同持续时间'}" />
+                                            <TextBlock Grid.Row="2"
+                                                       Grid.Column="2"
+                                                       HorizontalAlignment="Right"
+                                                       Foreground="{DynamicResource DARKPrimary}"
+                                                       Text="7 天" />
+                                            <TextBlock Grid.Row="4"
+                                                       Text="{ll:Str '办理费用'}"
+                                                       VerticalAlignment="Bottom" />
+                                            <TextBlock Grid.Row="4"
+                                                       Grid.Column="2"
+                                                       HorizontalAlignment="Right"
+                                                       VerticalAlignment="Center"
+                                                       Foreground="{DynamicResource DARKPrimary}"
+                                                       Text="100000"
+                                                       FontSize="26" />
+                                        </Grid>
+                                        <Button x:Name="btnSignAgency"
+                                                Grid.Row="6"
+                                                Margin="0,5,0,0"
+                                                Height="30"
+                                                Content="{ll:Str 签署}"
+                                                Style="{DynamicResource ThemedButtonStyle}"
+                                                Background="{DynamicResource PrimaryDarker}"
+                                                Click="btnSignAgency_Click"
+                                                FontSize="16"
+                                                FontWeight="Bold" />
+                                    </Grid>
+                                    <Grid Visibility="{Binding IsChecked, Converter={x:Static pu:Converters.FalseToCollapseConverter}, ElementName=tbtnCurrentPlan}">
                                         <Grid.RowDefinitions>
-                                            <RowDefinition />
-                                            <RowDefinition Height="5" />
-                                            <RowDefinition />
-                                            <RowDefinition />
-                                            <RowDefinition Height="10"/>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
                                             <RowDefinition />
                                         </Grid.RowDefinitions>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="35" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock x:Name="rTaskType">抽成</TextBlock>
-                                        <TextBlock Grid.Column="2" HorizontalAlignment="Right"
-                                                Foreground="{DynamicResource DARKPrimary}" Text="20%" />
-                                        <TextBlock Grid.Row="5" Text="{ll:Str '办理费用'}" />
-                                        <TextBlock Grid.Row="5" Grid.Column="2" HorizontalAlignment="Right"
-                                                Foreground="{DynamicResource DARKPrimary}" Text="100000"
-                                                FontWeight="Bold" FontSize="16" />
-                                        <TextBlock Grid.Row="2" Text="{ll:Str '等级需求'}" />
-                                        <TextBlock Grid.Row="3" Text="{ll:Str '合同持续时间'}" />
-                                        <TextBlock Grid.Row="2" Grid.Column="2" HorizontalAlignment="Right"
-                                                Foreground="{DynamicResource DARKPrimary}" Text="Lv 100" />
-                                        <TextBlock Grid.Row="3" Grid.Column="2" HorizontalAlignment="Right"
-                                                Foreground="{DynamicResource DARKPrimary}" Text="7 天" />
+                                        <TextBlock Text="当前套餐"
+                                                   Opacity="0.7" />
+                                        <TextBlock Grid.Row="1"
+                                                   Text="特别周特训套餐"
+                                                   FontSize="24"
+                                                   Foreground="{DynamicResource DARKPrimary}" />
+                                        <Grid Grid.Row="2"
+                                              Margin="0,7,0,0">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="22" />
+                                                <RowDefinition Height="22" />
+                                                <RowDefinition Height="22" />
+                                                <RowDefinition />
+                                                <RowDefinition Height="Auto" />
+                                            </Grid.RowDefinitions>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="Auto" />
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock >抽成</TextBlock>
+                                            <TextBlock Grid.Column="2"
+                                                       HorizontalAlignment="Right"
+                                                       Foreground="{DynamicResource DARKPrimary}"
+                                                       Text="20%" />
+                                            <TextBlock Grid.Row="1"
+                                                       Text="{ll:Str '等级需求'}" />
+                                            <TextBlock Grid.Row="1"
+                                                       Grid.Column="2"
+                                                       HorizontalAlignment="Right"
+                                                       Foreground="{DynamicResource DARKPrimary}"
+                                                       Text="Lv 100" />
+                                            <TextBlock Grid.Row="2"
+                                                       Text="{ll:Str '合同剩余时间'}" />
+                                            <TextBlock Grid.Row="2"
+                                                       Grid.Column="2"
+                                                       HorizontalAlignment="Right"
+                                                       Foreground="{DynamicResource DARKPrimary}"
+                                                       Text="7 天" />
+                                            <TextBlock Grid.Row="4"
+                                                       Text="{ll:Str '办理费用'}"
+                                                       VerticalAlignment="Bottom" />
+                                            <TextBlock Grid.Row="4"
+                                                       Grid.Column="2"
+                                                       HorizontalAlignment="Right"
+                                                       VerticalAlignment="Center"
+                                                       Foreground="{DynamicResource DARKPrimary}"
+                                                       Text="100000"
+                                                       FontSize="26" />
+                                        </Grid>
                                     </Grid>
-                                    <Button x:Name="btnSignAgency" Grid.Row="6" Height="30" Content="{ll:Str 签署}"
-                                            Style="{DynamicResource ThemedButtonStyle}"
-                                            Background="{DynamicResource PrimaryDarker}" Click="btnSignAgency_Click"
-                                            FontSize="16" FontWeight="Bold" />
                                 </Grid>
                             </Grid>
                         </TabItem>
@@ -332,10 +441,8 @@
                                                                     </Grid.ColumnDefinitions>
                                                                     <StackPanel Orientation="Horizontal" Margin="7,0">
                                                                         <TextBlock VerticalAlignment="Center">休息</TextBlock>
-                                                                        <pu:NumberInput Minimum="0" Interval="1"
-                                                                                IsSnapToIntervalEnabled="True"
-                                                                                Background="Transparent"
-                                                                                BorderThickness="0"
+                                                                        <pu:NumberInput Minimum="0" Interval="1" StepFactor="5"
+                                                                                IsSnapToIntervalEnabled="True" Background="Transparent" BorderThickness="0"
                                                                                 Foreground="{DynamicResource DARKPrimary}"
                                                                                 FontSize="16" Padding="0"
                                                                                 Value="{Binding RestTime, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
diff --git a/VPet.Solution/VPet.Solution.csproj b/VPet.Solution/VPet.Solution.csproj
index 2c08e74..1eb43db 100644
--- a/VPet.Solution/VPet.Solution.csproj
+++ b/VPet.Solution/VPet.Solution.csproj
@@ -22,8 +22,8 @@
     <PackageReference Include="LinePutScript" Version="1.11.6" />
     <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Panuon.WPF" Version="1.1.0" />
-    <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.3" />
+    <PackageReference Include="Panuon.WPF" Version="1.1.0.1" />
+    <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.5" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file