diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index f3a08b9..3ef98e0 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +67,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +83,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +101,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +109,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +127,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +136,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -189,32 +167,32 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OperatePersion, Mode=OneWay}"
                     Header="操作人"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding OperateTime, Mode=OneWay}"
                     Header="操作时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -231,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +217,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +226,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index f3a08b9..3ef98e0 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +67,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +83,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +101,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +109,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +127,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +136,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -189,32 +167,32 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OperatePersion, Mode=OneWay}"
                     Header="操作人"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding OperateTime, Mode=OneWay}"
                     Header="操作时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -231,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +217,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +226,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index baf8459..71313de 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -383,9 +362,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +379,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +396,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +413,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index f3a08b9..3ef98e0 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +67,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +83,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +101,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +109,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +127,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +136,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -189,32 +167,32 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OperatePersion, Mode=OneWay}"
                     Header="操作人"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding OperateTime, Mode=OneWay}"
                     Header="操作时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -231,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +217,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +226,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index baf8459..71313de 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -383,9 +362,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +379,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +396,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +413,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index bf98ca9..92a0763 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainThemeColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +72,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -148,17 +126,17 @@
                         Width="*"
                         Binding="{Binding OperatePersion, Mode=OneWay}"
                         Header="操作人"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="1.5*"
                         Binding="{Binding OperateTime, Mode=OneWay}"
                         Header="时间"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="*"
                         Binding="{Binding RFID, Mode=OneWay}"
                         Header="业务类型"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -202,7 +180,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +332,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index f3a08b9..3ef98e0 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +67,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +83,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +101,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +109,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +127,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +136,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -189,32 +167,32 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OperatePersion, Mode=OneWay}"
                     Header="操作人"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding OperateTime, Mode=OneWay}"
                     Header="操作时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -231,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +217,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +226,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index baf8459..71313de 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -383,9 +362,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +379,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +396,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +413,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index bf98ca9..92a0763 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainThemeColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +72,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -148,17 +126,17 @@
                         Width="*"
                         Binding="{Binding OperatePersion, Mode=OneWay}"
                         Header="操作人"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="1.5*"
                         Binding="{Binding OperateTime, Mode=OneWay}"
                         Header="时间"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="*"
                         Binding="{Binding RFID, Mode=OneWay}"
                         Header="业务类型"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -202,7 +180,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +332,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 19d251a..6f4ce12 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="{DynamicResource MainThemeColor}"
+                                Background="{StaticResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="{DynamicResource MainTextColor}"
+                                Foreground="{StaticResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index f3a08b9..3ef98e0 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +67,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +83,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +101,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +109,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +127,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +136,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -189,32 +167,32 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OperatePersion, Mode=OneWay}"
                     Header="操作人"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding OperateTime, Mode=OneWay}"
                     Header="操作时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -231,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +217,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +226,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index baf8459..71313de 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -383,9 +362,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +379,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +396,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +413,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index bf98ca9..92a0763 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainThemeColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +72,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -148,17 +126,17 @@
                         Width="*"
                         Binding="{Binding OperatePersion, Mode=OneWay}"
                         Header="操作人"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="1.5*"
                         Binding="{Binding OperateTime, Mode=OneWay}"
                         Header="时间"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="*"
                         Binding="{Binding RFID, Mode=OneWay}"
                         Header="业务类型"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -202,7 +180,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +332,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 19d251a..6f4ce12 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="{DynamicResource MainThemeColor}"
+                                Background="{StaticResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="{DynamicResource MainTextColor}"
+                                Foreground="{StaticResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 601350f..fdda213 100644
--- a/SubCabinetSolution/Views/InventoryPage.xaml
+++ b/SubCabinetSolution/Views/InventoryPage.xaml
@@ -18,7 +18,7 @@
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="FontSize" Value="30" />
             <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
             <Setter Property="FontFamily" Value="微软雅黑" />
             <Setter Property="TextAlignment" Value="Center" />
         </Style>
@@ -29,7 +29,7 @@
                 <Setter Property="Width" Value="15" />
                 <Setter Property="Height" Value="15" />
                 <Setter Property="Canvas.Left" Value="142.5" />
-                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
+                <Setter Property="Fill" Value="{StaticResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index f3a08b9..3ef98e0 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +67,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +83,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +101,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +109,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +127,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +136,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -189,32 +167,32 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OperatePersion, Mode=OneWay}"
                     Header="操作人"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding OperateTime, Mode=OneWay}"
                     Header="操作时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -231,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +217,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +226,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index baf8459..71313de 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -383,9 +362,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +379,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +396,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +413,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index bf98ca9..92a0763 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainThemeColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +72,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -148,17 +126,17 @@
                         Width="*"
                         Binding="{Binding OperatePersion, Mode=OneWay}"
                         Header="操作人"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="1.5*"
                         Binding="{Binding OperateTime, Mode=OneWay}"
                         Header="时间"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="*"
                         Binding="{Binding RFID, Mode=OneWay}"
                         Header="业务类型"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -202,7 +180,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +332,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 19d251a..6f4ce12 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="{DynamicResource MainThemeColor}"
+                                Background="{StaticResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="{DynamicResource MainTextColor}"
+                                Foreground="{StaticResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 601350f..fdda213 100644
--- a/SubCabinetSolution/Views/InventoryPage.xaml
+++ b/SubCabinetSolution/Views/InventoryPage.xaml
@@ -18,7 +18,7 @@
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="FontSize" Value="30" />
             <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
             <Setter Property="FontFamily" Value="微软雅黑" />
             <Setter Property="TextAlignment" Value="Center" />
         </Style>
@@ -29,7 +29,7 @@
                 <Setter Property="Width" Value="15" />
                 <Setter Property="Height" Value="15" />
                 <Setter Property="Canvas.Left" Value="142.5" />
-                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
+                <Setter Property="Fill" Value="{StaticResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 1a389c4..7b19cd7 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -382,9 +361,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +378,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +395,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index f3a08b9..3ef98e0 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +67,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +83,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +101,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +109,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +127,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +136,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -189,32 +167,32 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OperatePersion, Mode=OneWay}"
                     Header="操作人"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding OperateTime, Mode=OneWay}"
                     Header="操作时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -231,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +217,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +226,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index baf8459..71313de 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -383,9 +362,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +379,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +396,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +413,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index bf98ca9..92a0763 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainThemeColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +72,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -148,17 +126,17 @@
                         Width="*"
                         Binding="{Binding OperatePersion, Mode=OneWay}"
                         Header="操作人"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="1.5*"
                         Binding="{Binding OperateTime, Mode=OneWay}"
                         Header="时间"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="*"
                         Binding="{Binding RFID, Mode=OneWay}"
                         Header="业务类型"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -202,7 +180,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +332,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 19d251a..6f4ce12 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="{DynamicResource MainThemeColor}"
+                                Background="{StaticResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="{DynamicResource MainTextColor}"
+                                Foreground="{StaticResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 601350f..fdda213 100644
--- a/SubCabinetSolution/Views/InventoryPage.xaml
+++ b/SubCabinetSolution/Views/InventoryPage.xaml
@@ -18,7 +18,7 @@
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="FontSize" Value="30" />
             <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
             <Setter Property="FontFamily" Value="微软雅黑" />
             <Setter Property="TextAlignment" Value="Center" />
         </Style>
@@ -29,7 +29,7 @@
                 <Setter Property="Width" Value="15" />
                 <Setter Property="Height" Value="15" />
                 <Setter Property="Canvas.Left" Value="142.5" />
-                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
+                <Setter Property="Fill" Value="{StaticResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 1a389c4..7b19cd7 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -382,9 +361,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +378,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +395,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index c8b7dfa..e1da944 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +65,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -111,38 +89,34 @@
                 </StackPanel>
             </Border>
 
-            <Border
-                Grid.Column="1"
-                Margin="20"
-                Padding="10,0,0,0"
-                Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
-                CornerRadius="3">
-                <StackPanel Orientation="Horizontal">
-                    <widgets:PlaceHolderTextBox
-                        Width="350"
-                        Padding="5"
-                        VerticalContentAlignment="Center"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        FontSize="16"
-                        Foreground="{DynamicResource MainTextColor}"
-                        HintText="请输入助记码查询"
-                        PlaceHolderPadding="5" />
+            <StackPanel Grid.Column="1" Orientation="Horizontal">
+                <widgets:PlaceHolderTextBox
+                    Width="350"
+                    Height="40"
+                    Padding="5,0"
+                    VerticalContentAlignment="Center"
+                    BorderBrush="#F1F1F1"
+                    BorderCornerRadius="3"
+                    BorderThickness="1"
+                    FontSize="16"
+                    Foreground="{StaticResource MainTextColor}"
+                    HintText="请输入助记码查询"
+                    MouseOverBorderColor="{StaticResource MainThemeColor}"
+                    PlaceHolderPadding="5" />
 
-                    <widgets:CornerRadiusButton
-                        Width="60"
-                        Height="40"
-                        Background="#FFD9E3ED"
-                        BorderCornerRadius="5"
-                        Command="{Binding SearchDataCommand}"
-                        Content="&#xe67d;"
-                        FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
-                        FontSize="20"
-                        Foreground="#809AB1"
-                        MouseOverBackground="#AAD9E3ED" />
-                </StackPanel>
-            </Border>
+                <widgets:CornerRadiusButton
+                    Width="80"
+                    Height="40"
+                    Margin="10,0,0,0"
+                    Background="#FFD9E3ED"
+                    BorderCornerRadius="5"
+                    Command="{Binding SearchDataCommand}"
+                    Content="&#xe67d;"
+                    FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
+                    FontSize="20"
+                    Foreground="#809AB1"
+                    MouseOverBackground="#AAD9E3ED" />
+            </StackPanel>
         </Grid>
 
         <DataGrid
@@ -154,37 +128,37 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding JxDate, Mode=OneWay}"
                     Header="近效期"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding Batch, Mode=OneWay}"
                     Header="批次"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding ValidityPeriod, Mode=OneWay}"
                     Header="效期"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -201,7 +175,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +183,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +192,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index f3a08b9..3ef98e0 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +67,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +83,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +101,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +109,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +127,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +136,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -189,32 +167,32 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OperatePersion, Mode=OneWay}"
                     Header="操作人"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding OperateTime, Mode=OneWay}"
                     Header="操作时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -231,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +217,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +226,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index baf8459..71313de 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -383,9 +362,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +379,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +396,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +413,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index bf98ca9..92a0763 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainThemeColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +72,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -148,17 +126,17 @@
                         Width="*"
                         Binding="{Binding OperatePersion, Mode=OneWay}"
                         Header="操作人"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="1.5*"
                         Binding="{Binding OperateTime, Mode=OneWay}"
                         Header="时间"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="*"
                         Binding="{Binding RFID, Mode=OneWay}"
                         Header="业务类型"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -202,7 +180,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +332,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 19d251a..6f4ce12 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="{DynamicResource MainThemeColor}"
+                                Background="{StaticResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="{DynamicResource MainTextColor}"
+                                Foreground="{StaticResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 601350f..fdda213 100644
--- a/SubCabinetSolution/Views/InventoryPage.xaml
+++ b/SubCabinetSolution/Views/InventoryPage.xaml
@@ -18,7 +18,7 @@
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="FontSize" Value="30" />
             <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
             <Setter Property="FontFamily" Value="微软雅黑" />
             <Setter Property="TextAlignment" Value="Center" />
         </Style>
@@ -29,7 +29,7 @@
                 <Setter Property="Width" Value="15" />
                 <Setter Property="Height" Value="15" />
                 <Setter Property="Canvas.Left" Value="142.5" />
-                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
+                <Setter Property="Fill" Value="{StaticResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 1a389c4..7b19cd7 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -382,9 +361,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +378,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +395,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index c8b7dfa..e1da944 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +65,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -111,38 +89,34 @@
                 </StackPanel>
             </Border>
 
-            <Border
-                Grid.Column="1"
-                Margin="20"
-                Padding="10,0,0,0"
-                Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
-                CornerRadius="3">
-                <StackPanel Orientation="Horizontal">
-                    <widgets:PlaceHolderTextBox
-                        Width="350"
-                        Padding="5"
-                        VerticalContentAlignment="Center"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        FontSize="16"
-                        Foreground="{DynamicResource MainTextColor}"
-                        HintText="请输入助记码查询"
-                        PlaceHolderPadding="5" />
+            <StackPanel Grid.Column="1" Orientation="Horizontal">
+                <widgets:PlaceHolderTextBox
+                    Width="350"
+                    Height="40"
+                    Padding="5,0"
+                    VerticalContentAlignment="Center"
+                    BorderBrush="#F1F1F1"
+                    BorderCornerRadius="3"
+                    BorderThickness="1"
+                    FontSize="16"
+                    Foreground="{StaticResource MainTextColor}"
+                    HintText="请输入助记码查询"
+                    MouseOverBorderColor="{StaticResource MainThemeColor}"
+                    PlaceHolderPadding="5" />
 
-                    <widgets:CornerRadiusButton
-                        Width="60"
-                        Height="40"
-                        Background="#FFD9E3ED"
-                        BorderCornerRadius="5"
-                        Command="{Binding SearchDataCommand}"
-                        Content="&#xe67d;"
-                        FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
-                        FontSize="20"
-                        Foreground="#809AB1"
-                        MouseOverBackground="#AAD9E3ED" />
-                </StackPanel>
-            </Border>
+                <widgets:CornerRadiusButton
+                    Width="80"
+                    Height="40"
+                    Margin="10,0,0,0"
+                    Background="#FFD9E3ED"
+                    BorderCornerRadius="5"
+                    Command="{Binding SearchDataCommand}"
+                    Content="&#xe67d;"
+                    FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
+                    FontSize="20"
+                    Foreground="#809AB1"
+                    MouseOverBackground="#AAD9E3ED" />
+            </StackPanel>
         </Grid>
 
         <DataGrid
@@ -154,37 +128,37 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding JxDate, Mode=OneWay}"
                     Header="近效期"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding Batch, Mode=OneWay}"
                     Header="批次"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding ValidityPeriod, Mode=OneWay}"
                     Header="效期"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -201,7 +175,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +183,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +192,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index 133df57..5e8dc73 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -382,9 +361,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +378,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +395,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index f3a08b9..3ef98e0 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +67,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +83,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +101,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +109,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +127,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +136,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -189,32 +167,32 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OperatePersion, Mode=OneWay}"
                     Header="操作人"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding OperateTime, Mode=OneWay}"
                     Header="操作时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -231,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +217,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +226,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index baf8459..71313de 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -383,9 +362,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +379,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +396,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +413,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index bf98ca9..92a0763 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainThemeColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +72,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -148,17 +126,17 @@
                         Width="*"
                         Binding="{Binding OperatePersion, Mode=OneWay}"
                         Header="操作人"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="1.5*"
                         Binding="{Binding OperateTime, Mode=OneWay}"
                         Header="时间"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="*"
                         Binding="{Binding RFID, Mode=OneWay}"
                         Header="业务类型"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -202,7 +180,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +332,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 19d251a..6f4ce12 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="{DynamicResource MainThemeColor}"
+                                Background="{StaticResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="{DynamicResource MainTextColor}"
+                                Foreground="{StaticResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 601350f..fdda213 100644
--- a/SubCabinetSolution/Views/InventoryPage.xaml
+++ b/SubCabinetSolution/Views/InventoryPage.xaml
@@ -18,7 +18,7 @@
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="FontSize" Value="30" />
             <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
             <Setter Property="FontFamily" Value="微软雅黑" />
             <Setter Property="TextAlignment" Value="Center" />
         </Style>
@@ -29,7 +29,7 @@
                 <Setter Property="Width" Value="15" />
                 <Setter Property="Height" Value="15" />
                 <Setter Property="Canvas.Left" Value="142.5" />
-                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
+                <Setter Property="Fill" Value="{StaticResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 1a389c4..7b19cd7 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -382,9 +361,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +378,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +395,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index c8b7dfa..e1da944 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +65,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -111,38 +89,34 @@
                 </StackPanel>
             </Border>
 
-            <Border
-                Grid.Column="1"
-                Margin="20"
-                Padding="10,0,0,0"
-                Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
-                CornerRadius="3">
-                <StackPanel Orientation="Horizontal">
-                    <widgets:PlaceHolderTextBox
-                        Width="350"
-                        Padding="5"
-                        VerticalContentAlignment="Center"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        FontSize="16"
-                        Foreground="{DynamicResource MainTextColor}"
-                        HintText="请输入助记码查询"
-                        PlaceHolderPadding="5" />
+            <StackPanel Grid.Column="1" Orientation="Horizontal">
+                <widgets:PlaceHolderTextBox
+                    Width="350"
+                    Height="40"
+                    Padding="5,0"
+                    VerticalContentAlignment="Center"
+                    BorderBrush="#F1F1F1"
+                    BorderCornerRadius="3"
+                    BorderThickness="1"
+                    FontSize="16"
+                    Foreground="{StaticResource MainTextColor}"
+                    HintText="请输入助记码查询"
+                    MouseOverBorderColor="{StaticResource MainThemeColor}"
+                    PlaceHolderPadding="5" />
 
-                    <widgets:CornerRadiusButton
-                        Width="60"
-                        Height="40"
-                        Background="#FFD9E3ED"
-                        BorderCornerRadius="5"
-                        Command="{Binding SearchDataCommand}"
-                        Content="&#xe67d;"
-                        FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
-                        FontSize="20"
-                        Foreground="#809AB1"
-                        MouseOverBackground="#AAD9E3ED" />
-                </StackPanel>
-            </Border>
+                <widgets:CornerRadiusButton
+                    Width="80"
+                    Height="40"
+                    Margin="10,0,0,0"
+                    Background="#FFD9E3ED"
+                    BorderCornerRadius="5"
+                    Command="{Binding SearchDataCommand}"
+                    Content="&#xe67d;"
+                    FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
+                    FontSize="20"
+                    Foreground="#809AB1"
+                    MouseOverBackground="#AAD9E3ED" />
+            </StackPanel>
         </Grid>
 
         <DataGrid
@@ -154,37 +128,37 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding JxDate, Mode=OneWay}"
                     Header="近效期"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding Batch, Mode=OneWay}"
                     Header="批次"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding ValidityPeriod, Mode=OneWay}"
                     Header="效期"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -201,7 +175,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +183,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +192,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index 133df57..5e8dc73 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -382,9 +361,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +378,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +395,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/ReturnGoodsPage.xaml b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
index d94eaa6..fe8f2d2 100644
--- a/SubCabinetSolution/Views/ReturnGoodsPage.xaml
+++ b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
@@ -31,34 +31,13 @@
             <Setter Property="TextAlignment" Value="Center" />
         </Style>
 
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -357,7 +336,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -371,27 +350,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -407,9 +386,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -424,9 +403,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -441,9 +420,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index f3a08b9..3ef98e0 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +67,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +83,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +101,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +109,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +127,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +136,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -189,32 +167,32 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OperatePersion, Mode=OneWay}"
                     Header="操作人"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding OperateTime, Mode=OneWay}"
                     Header="操作时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -231,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +217,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +226,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index baf8459..71313de 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -383,9 +362,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +379,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +396,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +413,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index bf98ca9..92a0763 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainThemeColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +72,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -148,17 +126,17 @@
                         Width="*"
                         Binding="{Binding OperatePersion, Mode=OneWay}"
                         Header="操作人"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="1.5*"
                         Binding="{Binding OperateTime, Mode=OneWay}"
                         Header="时间"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="*"
                         Binding="{Binding RFID, Mode=OneWay}"
                         Header="业务类型"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -202,7 +180,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +332,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 19d251a..6f4ce12 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="{DynamicResource MainThemeColor}"
+                                Background="{StaticResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="{DynamicResource MainTextColor}"
+                                Foreground="{StaticResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 601350f..fdda213 100644
--- a/SubCabinetSolution/Views/InventoryPage.xaml
+++ b/SubCabinetSolution/Views/InventoryPage.xaml
@@ -18,7 +18,7 @@
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="FontSize" Value="30" />
             <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
             <Setter Property="FontFamily" Value="微软雅黑" />
             <Setter Property="TextAlignment" Value="Center" />
         </Style>
@@ -29,7 +29,7 @@
                 <Setter Property="Width" Value="15" />
                 <Setter Property="Height" Value="15" />
                 <Setter Property="Canvas.Left" Value="142.5" />
-                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
+                <Setter Property="Fill" Value="{StaticResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 1a389c4..7b19cd7 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -382,9 +361,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +378,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +395,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index c8b7dfa..e1da944 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +65,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -111,38 +89,34 @@
                 </StackPanel>
             </Border>
 
-            <Border
-                Grid.Column="1"
-                Margin="20"
-                Padding="10,0,0,0"
-                Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
-                CornerRadius="3">
-                <StackPanel Orientation="Horizontal">
-                    <widgets:PlaceHolderTextBox
-                        Width="350"
-                        Padding="5"
-                        VerticalContentAlignment="Center"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        FontSize="16"
-                        Foreground="{DynamicResource MainTextColor}"
-                        HintText="请输入助记码查询"
-                        PlaceHolderPadding="5" />
+            <StackPanel Grid.Column="1" Orientation="Horizontal">
+                <widgets:PlaceHolderTextBox
+                    Width="350"
+                    Height="40"
+                    Padding="5,0"
+                    VerticalContentAlignment="Center"
+                    BorderBrush="#F1F1F1"
+                    BorderCornerRadius="3"
+                    BorderThickness="1"
+                    FontSize="16"
+                    Foreground="{StaticResource MainTextColor}"
+                    HintText="请输入助记码查询"
+                    MouseOverBorderColor="{StaticResource MainThemeColor}"
+                    PlaceHolderPadding="5" />
 
-                    <widgets:CornerRadiusButton
-                        Width="60"
-                        Height="40"
-                        Background="#FFD9E3ED"
-                        BorderCornerRadius="5"
-                        Command="{Binding SearchDataCommand}"
-                        Content="&#xe67d;"
-                        FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
-                        FontSize="20"
-                        Foreground="#809AB1"
-                        MouseOverBackground="#AAD9E3ED" />
-                </StackPanel>
-            </Border>
+                <widgets:CornerRadiusButton
+                    Width="80"
+                    Height="40"
+                    Margin="10,0,0,0"
+                    Background="#FFD9E3ED"
+                    BorderCornerRadius="5"
+                    Command="{Binding SearchDataCommand}"
+                    Content="&#xe67d;"
+                    FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
+                    FontSize="20"
+                    Foreground="#809AB1"
+                    MouseOverBackground="#AAD9E3ED" />
+            </StackPanel>
         </Grid>
 
         <DataGrid
@@ -154,37 +128,37 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding JxDate, Mode=OneWay}"
                     Header="近效期"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding Batch, Mode=OneWay}"
                     Header="批次"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding ValidityPeriod, Mode=OneWay}"
                     Header="效期"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -201,7 +175,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +183,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +192,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index 133df57..5e8dc73 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -382,9 +361,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +378,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +395,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/ReturnGoodsPage.xaml b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
index d94eaa6..fe8f2d2 100644
--- a/SubCabinetSolution/Views/ReturnGoodsPage.xaml
+++ b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
@@ -31,34 +31,13 @@
             <Setter Property="TextAlignment" Value="Center" />
         </Style>
 
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -357,7 +336,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -371,27 +350,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -407,9 +386,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -424,9 +403,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -441,9 +420,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/SettingsPage.xaml b/SubCabinetSolution/Views/SettingsPage.xaml
index 2a70fdb..6221782 100644
--- a/SubCabinetSolution/Views/SettingsPage.xaml
+++ b/SubCabinetSolution/Views/SettingsPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -71,70 +49,99 @@
     </Page.Resources>
     <Grid Background="White">
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="9*" />
-            <RowDefinition />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <DataGrid ItemsSource="{Binding UserModels}" Style="{StaticResource DataGridStyle}">
+        <Border
+            Grid.Row="0"
+            BorderBrush="#F1F1F1"
+            BorderThickness="0,0,0,1">
+            <StackPanel Grid.Row="0" Orientation="Horizontal">
+                <widgets:CornerRadiusButton
+                    Width="100"
+                    Height="30"
+                    Margin="20"
+                    HorizontalAlignment="Left"
+                    Background="{StaticResource MainThemeColor}"
+                    BorderCornerRadius="5"
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                            FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
+                            FontSize="20"
+                            Foreground="White"
+                            Text="&#xe6a4;" />
+                        <TextBlock Style="{StaticResource TextBlockStyle}" Text="用户管理" />
+                    </StackPanel>
+                </widgets:CornerRadiusButton>
+            </StackPanel>
+        </Border>
+
+        <DataGrid
+            Grid.Row="1"
+            ItemsSource="{Binding UserModels}"
+            Style="{StaticResource DataGridStyle}">
             <DataGrid.Columns>
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UserId, Mode=OneWay}"
                     Header="用户ID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UserName, Mode=OneWay}"
                     Header="用户名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UserRole, Mode=OneWay}"
                     Header="用户角色"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UserSerialNum, Mode=OneWay}"
                     Header="用户编号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding UserCardNum, Mode=OneWay}"
                     Header="用户卡号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RegisterTime, Mode=OneWay}"
                     Header="注册时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding FaceFeature, Mode=OneWay}"
                     Header="人脸登记"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OpticalFeature, Mode=OneWay}"
                     Header="虹膜登记"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UserState, Mode=OneWay}"
                     Header="状态"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <widgets:CornerRadiusButton
-            Grid.Row="1"
+            Grid.Row="2"
             Width="80"
             Height="30"
-            Margin="30,0"
+            Margin="20,10"
             HorizontalAlignment="Right"
-            Background="{DynamicResource MainThemeColor}"
+            Background="{StaticResource MainThemeColor}"
             BorderCornerRadius="5"
             Command="{Binding AddUserCommand}"
-            MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+            MouseOverBackground="{StaticResource MainThemeOpacityColor}">
             <StackPanel Orientation="Horizontal">
                 <TextBlock
                     FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0ff7c5c..bf19c3c 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml
index 3641238..c21950f 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -17,6 +17,28 @@
             <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
             <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
             <!--#endregion 颜色-->
+
+            <Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
+                <Setter Property="TextBlock.Foreground" Value="Black" />
+                <Setter Property="FontWeight" Value="Bold" />
+                <Setter Property="Background" Value="White" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="Height" Value="50" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="BorderThickness" Value="0,0,0,1" />
+                <Setter Property="BorderBrush" Value="#F1F1F1" />
+            </Style>
+
+            <Style x:Key="DataGridStyle" TargetType="DataGrid">
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="CanUserResizeColumns" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="GridLinesVisibility" Value="None" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index f6847ee..45b1928 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="{DynamicResource MainThemeColor}"
+    Background="{StaticResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="{DynamicResource MainThemeColor}"
+                    Foreground="{StaticResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="{DynamicResource MainThemeColor}">
+                    Foreground="{StaticResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index bd44184..91b1f08 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -209,6 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
+                    IsTopSearchBarVisible = "Collapsed";
                     MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 7a16285..e0f81af 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -127,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -163,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -199,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -235,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="{DynamicResource MainThemeColor}"
+                        Foreground="{StaticResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -261,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -274,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="{DynamicResource MainThemeColor}"
+                    Stroke="{StaticResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -304,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index 8246f3e..dce1f75 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -16,34 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -81,28 +60,28 @@
                     Width="*"
                     Binding="{Binding DoctorName, Mode=OneWay}"
                     Header="姓名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding DeptName, Mode=OneWay}"
                     Header="所在科室"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding SurgeryTime, Mode=OneWay}"
                     Header="计划手术时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding SurgeryNum, Mode=OneWay}"
                     Header="手术单号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -116,27 +95,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -153,9 +132,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +149,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +166,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +183,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 4d3eea4..e2ae234 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -23,7 +23,7 @@
         <Style x:Key="UserDefineBorderStyle" TargetType="Border">
             <Setter Property="Width" Value="80" />
             <Setter Property="Height" Value="80" />
-            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Background" Value="{StaticResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -50,7 +50,7 @@
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -86,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="{DynamicResource MainThemeColor}"
+                                        Background="{StaticResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -185,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -232,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="{DynamicResource MainThemeColor}"
+                            Background="{StaticResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -266,7 +266,7 @@
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="{DynamicResource MainTextColor}"
+                            Foreground="{StaticResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index f3a08b9..3ef98e0 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +67,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +83,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +101,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +109,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +127,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="{DynamicResource MainThemeColor}" />
+                        Foreground="{StaticResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +136,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -189,32 +167,32 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OperatePersion, Mode=OneWay}"
                     Header="操作人"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding OperateTime, Mode=OneWay}"
                     Header="操作时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -231,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +217,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +226,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index baf8459..71313de 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -383,9 +362,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +379,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +396,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +413,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index bf98ca9..92a0763 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainThemeColor}" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +72,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -148,17 +126,17 @@
                         Width="*"
                         Binding="{Binding OperatePersion, Mode=OneWay}"
                         Header="操作人"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="1.5*"
                         Binding="{Binding OperateTime, Mode=OneWay}"
                         Header="时间"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     <DataGridTextColumn
                         Width="*"
                         Binding="{Binding RFID, Mode=OneWay}"
                         Header="业务类型"
-                        HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                        HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -202,7 +180,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="{DynamicResource MainThemeColor}"
+                            Foreground="{StaticResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +332,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="{DynamicResource MainThemeColor}"
+                    Background="{StaticResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 19d251a..6f4ce12 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="{DynamicResource MainThemeColor}"
+                                Background="{StaticResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="{DynamicResource MainTextColor}"
+                                Foreground="{StaticResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 601350f..fdda213 100644
--- a/SubCabinetSolution/Views/InventoryPage.xaml
+++ b/SubCabinetSolution/Views/InventoryPage.xaml
@@ -18,7 +18,7 @@
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="FontSize" Value="30" />
             <Setter Property="FontWeight" Value="Bold" />
-            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
+            <Setter Property="Foreground" Value="{StaticResource MainThemeColor}" />
             <Setter Property="FontFamily" Value="微软雅黑" />
             <Setter Property="TextAlignment" Value="Center" />
         </Style>
@@ -29,7 +29,7 @@
                 <Setter Property="Width" Value="15" />
                 <Setter Property="Height" Value="15" />
                 <Setter Property="Canvas.Left" Value="142.5" />
-                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
+                <Setter Property="Fill" Value="{StaticResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 1a389c4..7b19cd7 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -382,9 +361,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +378,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +395,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index c8b7dfa..e1da944 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +65,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="{DynamicResource MainThemeColor}"
+                BorderBrush="{StaticResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -111,38 +89,34 @@
                 </StackPanel>
             </Border>
 
-            <Border
-                Grid.Column="1"
-                Margin="20"
-                Padding="10,0,0,0"
-                Background="#F1F1F1"
-                BorderBrush="{DynamicResource MainThemeColor}"
-                CornerRadius="3">
-                <StackPanel Orientation="Horizontal">
-                    <widgets:PlaceHolderTextBox
-                        Width="350"
-                        Padding="5"
-                        VerticalContentAlignment="Center"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        FontSize="16"
-                        Foreground="{DynamicResource MainTextColor}"
-                        HintText="请输入助记码查询"
-                        PlaceHolderPadding="5" />
+            <StackPanel Grid.Column="1" Orientation="Horizontal">
+                <widgets:PlaceHolderTextBox
+                    Width="350"
+                    Height="40"
+                    Padding="5,0"
+                    VerticalContentAlignment="Center"
+                    BorderBrush="#F1F1F1"
+                    BorderCornerRadius="3"
+                    BorderThickness="1"
+                    FontSize="16"
+                    Foreground="{StaticResource MainTextColor}"
+                    HintText="请输入助记码查询"
+                    MouseOverBorderColor="{StaticResource MainThemeColor}"
+                    PlaceHolderPadding="5" />
 
-                    <widgets:CornerRadiusButton
-                        Width="60"
-                        Height="40"
-                        Background="#FFD9E3ED"
-                        BorderCornerRadius="5"
-                        Command="{Binding SearchDataCommand}"
-                        Content="&#xe67d;"
-                        FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
-                        FontSize="20"
-                        Foreground="#809AB1"
-                        MouseOverBackground="#AAD9E3ED" />
-                </StackPanel>
-            </Border>
+                <widgets:CornerRadiusButton
+                    Width="80"
+                    Height="40"
+                    Margin="10,0,0,0"
+                    Background="#FFD9E3ED"
+                    BorderCornerRadius="5"
+                    Command="{Binding SearchDataCommand}"
+                    Content="&#xe67d;"
+                    FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
+                    FontSize="20"
+                    Foreground="#809AB1"
+                    MouseOverBackground="#AAD9E3ED" />
+            </StackPanel>
         </Grid>
 
         <DataGrid
@@ -154,37 +128,37 @@
                     Width="1.5*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="2*"
                     Binding="{Binding Specification, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="柜号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="0.5*"
                     Binding="{Binding JxDate, Mode=OneWay}"
                     Header="近效期"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding Batch, Mode=OneWay}"
                     Header="批次"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding ValidityPeriod, Mode=OneWay}"
                     Header="效期"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RFID, Mode=OneWay}"
                     Header="RFID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -201,7 +175,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +183,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="{DynamicResource MainThemeColor}"
+                Foreground="{StaticResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +192,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index 133df57..5e8dc73 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -31,27 +31,6 @@
             <Setter Property="CornerRadius" Value="5" />
         </Style>
 
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
         <Style x:Key="TextBlockStyle" TargetType="TextBlock">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -332,7 +311,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -346,27 +325,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -382,9 +361,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +378,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +395,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/ReturnGoodsPage.xaml b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
index d94eaa6..fe8f2d2 100644
--- a/SubCabinetSolution/Views/ReturnGoodsPage.xaml
+++ b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
@@ -31,34 +31,13 @@
             <Setter Property="TextAlignment" Value="Center" />
         </Style>
 
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -357,7 +336,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="{DynamicResource MainThemeColor}"
+            BorderBrush="{StaticResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -371,27 +350,27 @@
                             Width="*"
                             Binding="{Binding GoodsName, Mode=OneWay}"
                             Header="名称"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding GoodsFormat, Mode=OneWay}"
                             Header="规格"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding CabinetNum, Mode=OneWay}"
                             Header="柜号"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RFIDNum, Mode=OneWay}"
                             Header="RFID"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                         <DataGridTextColumn
                             Width="2*"
                             Binding="{Binding Description, Mode=OneWay}"
                             Header="描述"
-                            HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                            HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -407,9 +386,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -424,9 +403,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -441,9 +420,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="{DynamicResource MainThemeColor}"
+                        Background="{StaticResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                        MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/SettingsPage.xaml b/SubCabinetSolution/Views/SettingsPage.xaml
index 2a70fdb..6221782 100644
--- a/SubCabinetSolution/Views/SettingsPage.xaml
+++ b/SubCabinetSolution/Views/SettingsPage.xaml
@@ -16,35 +16,13 @@
     </Page.DataContext>
 
     <Page.Resources>
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-            <Setter Property="Background" Value="White" />
-        </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="TextBlock.Foreground" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
+                    <Setter Property="Background" Value="{StaticResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -71,70 +49,99 @@
     </Page.Resources>
     <Grid Background="White">
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="9*" />
-            <RowDefinition />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <DataGrid ItemsSource="{Binding UserModels}" Style="{StaticResource DataGridStyle}">
+        <Border
+            Grid.Row="0"
+            BorderBrush="#F1F1F1"
+            BorderThickness="0,0,0,1">
+            <StackPanel Grid.Row="0" Orientation="Horizontal">
+                <widgets:CornerRadiusButton
+                    Width="100"
+                    Height="30"
+                    Margin="20"
+                    HorizontalAlignment="Left"
+                    Background="{StaticResource MainThemeColor}"
+                    BorderCornerRadius="5"
+                    MouseOverBackground="{StaticResource MainThemeOpacityColor}">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                            FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
+                            FontSize="20"
+                            Foreground="White"
+                            Text="&#xe6a4;" />
+                        <TextBlock Style="{StaticResource TextBlockStyle}" Text="用户管理" />
+                    </StackPanel>
+                </widgets:CornerRadiusButton>
+            </StackPanel>
+        </Border>
+
+        <DataGrid
+            Grid.Row="1"
+            ItemsSource="{Binding UserModels}"
+            Style="{StaticResource DataGridStyle}">
             <DataGrid.Columns>
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UserId, Mode=OneWay}"
                     Header="用户ID"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UserName, Mode=OneWay}"
                     Header="用户名"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UserRole, Mode=OneWay}"
                     Header="用户角色"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UserSerialNum, Mode=OneWay}"
                     Header="用户编号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding UserCardNum, Mode=OneWay}"
                     Header="用户卡号"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="1.5*"
                     Binding="{Binding RegisterTime, Mode=OneWay}"
                     Header="注册时间"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding FaceFeature, Mode=OneWay}"
                     Header="人脸登记"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding OpticalFeature, Mode=OneWay}"
                     Header="虹膜登记"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding UserState, Mode=OneWay}"
                     Header="状态"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
         <widgets:CornerRadiusButton
-            Grid.Row="1"
+            Grid.Row="2"
             Width="80"
             Height="30"
-            Margin="30,0"
+            Margin="20,10"
             HorizontalAlignment="Right"
-            Background="{DynamicResource MainThemeColor}"
+            Background="{StaticResource MainThemeColor}"
             BorderCornerRadius="5"
             Command="{Binding AddUserCommand}"
-            MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+            MouseOverBackground="{StaticResource MainThemeOpacityColor}">
             <StackPanel Orientation="Horizontal">
                 <TextBlock
                     FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/TotalQueryPage.xaml b/SubCabinetSolution/Views/TotalQueryPage.xaml
index bb3b3ec..8f09522 100644
--- a/SubCabinetSolution/Views/TotalQueryPage.xaml
+++ b/SubCabinetSolution/Views/TotalQueryPage.xaml
@@ -30,7 +30,7 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="True">
-                                <Setter TargetName="RadioButtonBorder" Property="Background" Value="{DynamicResource MainThemeColor}" />
+                                <Setter TargetName="RadioButtonBorder" Property="Background" Value="{StaticResource MainThemeColor}" />
                                 <Setter TargetName="RadioButtonBorder" Property="TextBlock.Foreground" Value="White" />
                             </Trigger>
 
@@ -42,27 +42,6 @@
                 </Setter.Value>
             </Setter>
         </Style>
-
-        <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#7D97AE" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Height" Value="50" />
-            <Setter Property="FontSize" Value="16" />
-            <Setter Property="BorderThickness" Value="0,0,0,1" />
-            <Setter Property="BorderBrush" Value="#F1F1F1" />
-        </Style>
-
-        <Style x:Key="DataGridStyle" TargetType="DataGrid">
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="AutoGenerateColumns" Value="False" />
-            <Setter Property="CanUserAddRows" Value="False" />
-            <Setter Property="CanUserDeleteRows" Value="False" />
-            <Setter Property="CanUserReorderColumns" Value="False" />
-            <Setter Property="CanUserResizeColumns" Value="False" />
-            <Setter Property="CanUserResizeRows" Value="False" />
-            <Setter Property="GridLinesVisibility" Value="None" />
-        </Style>
     </Page.Resources>
 
     <Grid>
@@ -95,7 +74,7 @@
         <Grid
             Grid.Row="1"
             Margin="20,0"
-            Background="{DynamicResource MainThemeColor}" />
+            Background="{StaticResource MainThemeColor}" />
 
         <DataGrid
             Grid.Row="2"
@@ -106,22 +85,22 @@
                     Width="*"
                     Binding="{Binding GoodsName, Mode=OneWay}"
                     Header="名称"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding GoodsFormat, Mode=OneWay}"
                     Header="规格"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding CabinetNum, Mode=OneWay}"
                     Header="领用"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
                 <DataGridTextColumn
                     Width="*"
                     Binding="{Binding RFIDNum, Mode=OneWay}"
                     Header="在库"
-                    HeaderStyle="{StaticResource ColumnHeaderStyle}" />
+                    HeaderStyle="{StaticResource DataGridHeaderStyle}" />
             </DataGrid.Columns>
         </DataGrid>
 
@@ -137,10 +116,10 @@
                 Grid.Column="3"
                 Width="80"
                 Height="30"
-                Background="{DynamicResource MainThemeColor}"
+                Background="{StaticResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
+                MouseOverBackground="{StaticResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"