From 4c0d985854e0efe5846473e8a986d96af44171ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=AB=E5=9F=8Evia?= <969954321@qq.com>
Date: Mon, 18 Dec 2023 17:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/basestyle.xaml        |  2 ++
 .../WinDesign/winBetterBuy.xaml                   | 15 +++++++++++++--
 .../WinDesign/winBetterBuy.xaml.cs                | 10 ++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/VPet-Simulator.Core/Display/basestyle.xaml b/VPet-Simulator.Core/Display/basestyle.xaml
index a41cbee..fcad8b7 100644
--- a/VPet-Simulator.Core/Display/basestyle.xaml
+++ b/VPet-Simulator.Core/Display/basestyle.xaml
@@ -185,6 +185,8 @@
 
     <Style x:Key="StandardPaginationStyle" TargetType="{x:Type pu:Pagination}">
         <Setter Property="Height" Value="25" />
+        <Setter Property="ItemsWidth" Value="NaN" />
+        <Setter Property="ItemsPadding" Value="7,0" />
         <Setter Property="ItemsBackground" Value="{DynamicResource DARKPrimaryTrans4}" />
         <Setter Property="ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
         <Setter Property="ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" />
diff --git a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
index 89bf127..9566a2e 100644
--- a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
@@ -319,8 +319,19 @@
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
-            <pu:Pagination x:Name="pagination" Grid.Row="1" Style="{DynamicResource StandardPaginationStyle}"
-                    CurrentPageChanged="pagination_CurrentPageChanged" />
+            <Grid Grid.Row="1" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <pu:Pagination x:Name="pagination" Style="{DynamicResource StandardPaginationStyle}"
+                               CurrentPageChanged="pagination_CurrentPageChanged" />
+                <StackPanel Grid.Column="1" Margin="5,0,0,0" Orientation="Horizontal">
+                    <TextBox x:Name="TbPage" MinWidth="50" Style="{DynamicResource StandardTextBoxStyle}" 
+                         PreviewKeyDown="TbPage_PreviewKeyDown" />
+                    <TextBlock Margin="3,0,0,0" Text="页" VerticalAlignment="Center"/> 
+                </StackPanel>
+            </Grid>
         </Grid>
     </Grid>
 </pu:WindowX>
diff --git a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs
index 9ba5e50..157f57f 100644
--- a/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml.cs
@@ -354,6 +354,7 @@ namespace VPet_Simulator.Windows
         private void pagination_CurrentPageChanged(object sender, SelectedValueChangedRoutedEventArgs<int> e)
         {
             Search();
+            TbPage.Text = e.NewValue.ToString();
         }
 
         private void rMoney_Loaded(object sender, RoutedEventArgs e)
@@ -408,5 +409,14 @@ namespace VPet_Simulator.Windows
             ((Button)sender).Content = "更好买".Translate() + mw.PrefixSave;
             ;
         }
+
+        private void TbPage_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if(e.Key ==  Key.Enter 
+                && int.TryParse(TbPage.Text?.Trim(), out int page))
+            {
+                pagination.CurrentPage = Math.Min(0, Math.Max(pagination.MaxPage, page));
+            }
+        }
     }
 }