diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index 8f683d6..bf98ca9 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -29,22 +29,22 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#4381DF" />
+            <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="#4381DF" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
         </Style>
 
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +94,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -202,7 +202,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +354,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="#AA4381DF">
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index 8f683d6..bf98ca9 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -29,22 +29,22 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#4381DF" />
+            <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="#4381DF" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
         </Style>
 
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +94,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -202,7 +202,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +354,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="#AA4381DF">
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 2bc5ca5..19d251a 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="#4381DF"
+                                Background="{DynamicResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="#333333"
+                                Foreground="{DynamicResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index 8f683d6..bf98ca9 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -29,22 +29,22 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#4381DF" />
+            <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="#4381DF" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
         </Style>
 
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +94,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -202,7 +202,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +354,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="#AA4381DF">
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 2bc5ca5..19d251a 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="#4381DF"
+                                Background="{DynamicResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="#333333"
+                                Foreground="{DynamicResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 70e2980..601350f 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="#4381DF" />
+            <Setter Property="Foreground" Value="{DynamicResource 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="#4381DF" />
+                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index 8f683d6..bf98ca9 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -29,22 +29,22 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#4381DF" />
+            <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="#4381DF" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
         </Style>
 
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +94,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -202,7 +202,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +354,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="#AA4381DF">
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 2bc5ca5..19d251a 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="#4381DF"
+                                Background="{DynamicResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="#333333"
+                                Foreground="{DynamicResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 70e2980..601350f 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="#4381DF" />
+            <Setter Property="Foreground" Value="{DynamicResource 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="#4381DF" />
+                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 683831c..1a389c4 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index 8f683d6..bf98ca9 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -29,22 +29,22 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#4381DF" />
+            <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="#4381DF" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
         </Style>
 
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +94,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -202,7 +202,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +354,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="#AA4381DF">
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 2bc5ca5..19d251a 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="#4381DF"
+                                Background="{DynamicResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="#333333"
+                                Foreground="{DynamicResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 70e2980..601350f 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="#4381DF" />
+            <Setter Property="Foreground" Value="{DynamicResource 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="#4381DF" />
+                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 683831c..1a389c4 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 3691964..c8b7dfa 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +87,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -116,7 +116,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -126,7 +126,7 @@
                         Background="Transparent"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#333333"
+                        Foreground="{DynamicResource MainTextColor}"
                         HintText="请输入助记码查询"
                         PlaceHolderPadding="5" />
 
@@ -201,7 +201,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +218,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index 8f683d6..bf98ca9 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -29,22 +29,22 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#4381DF" />
+            <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="#4381DF" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
         </Style>
 
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +94,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -202,7 +202,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +354,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="#AA4381DF">
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 2bc5ca5..19d251a 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="#4381DF"
+                                Background="{DynamicResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="#333333"
+                                Foreground="{DynamicResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 70e2980..601350f 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="#4381DF" />
+            <Setter Property="Foreground" Value="{DynamicResource 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="#4381DF" />
+                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 683831c..1a389c4 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 3691964..c8b7dfa 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +87,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -116,7 +116,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -126,7 +126,7 @@
                         Background="Transparent"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#333333"
+                        Foreground="{DynamicResource MainTextColor}"
                         HintText="请输入助记码查询"
                         PlaceHolderPadding="5" />
 
@@ -201,7 +201,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +218,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index f3f749f..133df57 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index 8f683d6..bf98ca9 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -29,22 +29,22 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#4381DF" />
+            <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="#4381DF" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
         </Style>
 
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +94,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -202,7 +202,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +354,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="#AA4381DF">
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 2bc5ca5..19d251a 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="#4381DF"
+                                Background="{DynamicResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="#333333"
+                                Foreground="{DynamicResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 70e2980..601350f 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="#4381DF" />
+            <Setter Property="Foreground" Value="{DynamicResource 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="#4381DF" />
+                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 683831c..1a389c4 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 3691964..c8b7dfa 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +87,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -116,7 +116,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -126,7 +126,7 @@
                         Background="Transparent"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#333333"
+                        Foreground="{DynamicResource MainTextColor}"
                         HintText="请输入助记码查询"
                         PlaceHolderPadding="5" />
 
@@ -201,7 +201,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +218,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index f3f749f..133df57 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/ReturnGoodsPage.xaml b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
index 5a8cb2b..d94eaa6 100644
--- a/SubCabinetSolution/Views/ReturnGoodsPage.xaml
+++ b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
@@ -55,10 +55,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -357,7 +357,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -407,9 +407,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -424,9 +424,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -441,9 +441,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index 8f683d6..bf98ca9 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -29,22 +29,22 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#4381DF" />
+            <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="#4381DF" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
         </Style>
 
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +94,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -202,7 +202,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +354,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="#AA4381DF">
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 2bc5ca5..19d251a 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="#4381DF"
+                                Background="{DynamicResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="#333333"
+                                Foreground="{DynamicResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 70e2980..601350f 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="#4381DF" />
+            <Setter Property="Foreground" Value="{DynamicResource 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="#4381DF" />
+                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 683831c..1a389c4 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 3691964..c8b7dfa 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +87,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -116,7 +116,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -126,7 +126,7 @@
                         Background="Transparent"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#333333"
+                        Foreground="{DynamicResource MainTextColor}"
                         HintText="请输入助记码查询"
                         PlaceHolderPadding="5" />
 
@@ -201,7 +201,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +218,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index f3f749f..133df57 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/ReturnGoodsPage.xaml b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
index 5a8cb2b..d94eaa6 100644
--- a/SubCabinetSolution/Views/ReturnGoodsPage.xaml
+++ b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
@@ -55,10 +55,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -357,7 +357,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -407,9 +407,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -424,9 +424,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -441,9 +441,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/SettingsPage.xaml b/SubCabinetSolution/Views/SettingsPage.xaml
index e77f01f..2a70fdb 100644
--- a/SubCabinetSolution/Views/SettingsPage.xaml
+++ b/SubCabinetSolution/Views/SettingsPage.xaml
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -131,10 +131,10 @@
             Height="30"
             Margin="30,0"
             HorizontalAlignment="Right"
-            Background="#4381DF"
+            Background="{DynamicResource MainThemeColor}"
             BorderCornerRadius="5"
             Command="{Binding AddUserCommand}"
-            MouseOverBackground="#AA4381DF">
+            MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
             <StackPanel Orientation="Horizontal">
                 <TextBlock
                     FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index 8f683d6..bf98ca9 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -29,22 +29,22 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#4381DF" />
+            <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="#4381DF" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
         </Style>
 
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +94,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -202,7 +202,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +354,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="#AA4381DF">
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 2bc5ca5..19d251a 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="#4381DF"
+                                Background="{DynamicResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="#333333"
+                                Foreground="{DynamicResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 70e2980..601350f 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="#4381DF" />
+            <Setter Property="Foreground" Value="{DynamicResource 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="#4381DF" />
+                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 683831c..1a389c4 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 3691964..c8b7dfa 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +87,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -116,7 +116,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -126,7 +126,7 @@
                         Background="Transparent"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#333333"
+                        Foreground="{DynamicResource MainTextColor}"
                         HintText="请输入助记码查询"
                         PlaceHolderPadding="5" />
 
@@ -201,7 +201,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +218,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index f3f749f..133df57 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/ReturnGoodsPage.xaml b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
index 5a8cb2b..d94eaa6 100644
--- a/SubCabinetSolution/Views/ReturnGoodsPage.xaml
+++ b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
@@ -55,10 +55,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -357,7 +357,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -407,9 +407,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -424,9 +424,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -441,9 +441,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/SettingsPage.xaml b/SubCabinetSolution/Views/SettingsPage.xaml
index e77f01f..2a70fdb 100644
--- a/SubCabinetSolution/Views/SettingsPage.xaml
+++ b/SubCabinetSolution/Views/SettingsPage.xaml
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -131,10 +131,10 @@
             Height="30"
             Margin="30,0"
             HorizontalAlignment="Right"
-            Background="#4381DF"
+            Background="{DynamicResource MainThemeColor}"
             BorderCornerRadius="5"
             Command="{Binding AddUserCommand}"
-            MouseOverBackground="#AA4381DF">
+            MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
             <StackPanel Orientation="Horizontal">
                 <TextBlock
                     FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/TotalQueryPage.xaml b/SubCabinetSolution/Views/TotalQueryPage.xaml
index 51f4461..bb3b3ec 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="#4381DF" />
+                                <Setter TargetName="RadioButtonBorder" Property="Background" Value="{DynamicResource MainThemeColor}" />
                                 <Setter TargetName="RadioButtonBorder" Property="TextBlock.Foreground" Value="White" />
                             </Trigger>
 
@@ -95,7 +95,7 @@
         <Grid
             Grid.Row="1"
             Margin="20,0"
-            Background="#4381DF" />
+            Background="{DynamicResource MainThemeColor}" />
 
         <DataGrid
             Grid.Row="2"
@@ -137,10 +137,10 @@
                 Grid.Column="3"
                 Width="80"
                 Height="30"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index 8f683d6..bf98ca9 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -29,22 +29,22 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#4381DF" />
+            <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="#4381DF" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
         </Style>
 
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +94,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -202,7 +202,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +354,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="#AA4381DF">
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 2bc5ca5..19d251a 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="#4381DF"
+                                Background="{DynamicResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="#333333"
+                                Foreground="{DynamicResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 70e2980..601350f 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="#4381DF" />
+            <Setter Property="Foreground" Value="{DynamicResource 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="#4381DF" />
+                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 683831c..1a389c4 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 3691964..c8b7dfa 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +87,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -116,7 +116,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -126,7 +126,7 @@
                         Background="Transparent"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#333333"
+                        Foreground="{DynamicResource MainTextColor}"
                         HintText="请输入助记码查询"
                         PlaceHolderPadding="5" />
 
@@ -201,7 +201,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +218,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index f3f749f..133df57 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/ReturnGoodsPage.xaml b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
index 5a8cb2b..d94eaa6 100644
--- a/SubCabinetSolution/Views/ReturnGoodsPage.xaml
+++ b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
@@ -55,10 +55,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -357,7 +357,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -407,9 +407,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -424,9 +424,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -441,9 +441,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/SettingsPage.xaml b/SubCabinetSolution/Views/SettingsPage.xaml
index e77f01f..2a70fdb 100644
--- a/SubCabinetSolution/Views/SettingsPage.xaml
+++ b/SubCabinetSolution/Views/SettingsPage.xaml
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -131,10 +131,10 @@
             Height="30"
             Margin="30,0"
             HorizontalAlignment="Right"
-            Background="#4381DF"
+            Background="{DynamicResource MainThemeColor}"
             BorderCornerRadius="5"
             Command="{Binding AddUserCommand}"
-            MouseOverBackground="#AA4381DF">
+            MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
             <StackPanel Orientation="Horizontal">
                 <TextBlock
                     FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/TotalQueryPage.xaml b/SubCabinetSolution/Views/TotalQueryPage.xaml
index 51f4461..bb3b3ec 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="#4381DF" />
+                                <Setter TargetName="RadioButtonBorder" Property="Background" Value="{DynamicResource MainThemeColor}" />
                                 <Setter TargetName="RadioButtonBorder" Property="TextBlock.Foreground" Value="White" />
                             </Trigger>
 
@@ -95,7 +95,7 @@
         <Grid
             Grid.Row="1"
             Margin="20,0"
-            Background="#4381DF" />
+            Background="{DynamicResource MainThemeColor}" />
 
         <DataGrid
             Grid.Row="2"
@@ -137,10 +137,10 @@
                 Grid.Column="3"
                 Width="80"
                 Height="30"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/obj/Debug/App.g.i.cs b/SubCabinetSolution/obj/Debug/App.g.i.cs
index 3fbe105..0134ce7 100644
--- a/SubCabinetSolution/obj/Debug/App.g.i.cs
+++ b/SubCabinetSolution/obj/Debug/App.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "08233F290145B875E527F4E0A8BA35E9D0DA594BE8B40688C7D9FEAFF416DE2A"
+#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BD779D304658E554B75E15A6BCFDFCDAD98ED7D15CBBC4A34152E893C69D4D95"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31a7016..0ff7c5c 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 27c3448..3641238 100644
--- a/SubCabinetSolution/App.xaml
+++ b/SubCabinetSolution/App.xaml
@@ -10,6 +10,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+
+            <!--#region 颜色-->
+            <SolidColorBrush x:Key="MainThemeColor" Color="#FF4381DF" />
+            <SolidColorBrush x:Key="MainThemeOpacityColor" Color="#AA4381DF" />
+            <SolidColorBrush x:Key="MainTextColor" Color="#232323" />
+            <SolidColorBrush x:Key="ItemSelectedColor" Color="#00D4B5" />
+            <!--#endregion 颜色-->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml
index b0776ca..f6847ee 100644
--- a/SubCabinetSolution/MainWindow.xaml
+++ b/SubCabinetSolution/MainWindow.xaml
@@ -9,7 +9,7 @@
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
-    Background="#4381DF"
+    Background="{DynamicResource MainThemeColor}"
     ResizeMode="CanResize"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
@@ -66,7 +66,7 @@
                     VerticalAlignment="Center"
                     FontFamily="微软雅黑"
                     FontSize="18"
-                    Foreground="#4381DF"
+                    Foreground="{DynamicResource MainThemeColor}"
                     Text="RFID智能耗材柜" />
 
                 <StackPanel
@@ -108,14 +108,14 @@
                     Grid.Row="3"
                     Width="200"
                     Height="30"
-                    Background="#FF4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding LoginToMainCommand}"
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                     Content="登录"
                     FontSize="14"
                     Foreground="White"
-                    MouseOverBackground="#AA4381DF" />
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
 
                 <Button
                     Grid.Row="4"
@@ -124,12 +124,12 @@
                     VerticalAlignment="Top"
                     Background="White"
                     BorderThickness="0"
-                    Foreground="#4381DF">
+                    Foreground="{DynamicResource MainThemeColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                             FontSize="20"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="&#xe6c6;" />
                         <TextBlock
                             Margin="10,0"
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index d97c297..bd44184 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -71,6 +71,18 @@
         private string _inputKeywords;
         public RelayCommand SearchDataCommand { get; set; }
 
+        private string _isTopSearchBarVisible;
+
+        public string IsTopSearchBarVisible
+        {
+            get => _isTopSearchBarVisible;
+            set
+            {
+                _isTopSearchBarVisible = value;
+                RaisePropertyChanged(() => IsTopSearchBarVisible);
+            }
+        }
+
         public CabinetViewModel()
         {
             var showTimer = new DispatcherTimer();
@@ -78,9 +90,9 @@
             showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
             showTimer.Start();
 
-            this.LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
+            LoginOutCommand = new RelayCommand<CabinetWindow>(LoginOut);
             // 初始化左侧功能列表
-            this.FunctionModels = new List<FunctionModel>
+            FunctionModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/手术单领用.png", "手术单领用"),
                 new FunctionModel("/Images/归还.png", "归还"),
@@ -92,24 +104,24 @@
                 new FunctionModel("/Images/主页.png", "主页")
             };
             // 初始化左侧底部功能列表
-            this.SettingsModels = new List<FunctionModel>
+            SettingsModels = new List<FunctionModel>
             {
                 new FunctionModel("/Images/settings.png", "设置"),
                 new FunctionModel("/Images/灯泡.png", "灯光"),
                 new FunctionModel("/Images/近消耗品.png", "近消耗品")
             };
-            this.FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
-            this.SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
-            this.SearchDataCommand = new RelayCommand(SearchData);
+            FuncSelectedCommand = new RelayCommand<object>(ItemSelectionChanged);
+            SettingsSelectedCommand = new RelayCommand<object>(SettingsSelectionChanged);
+            SearchDataCommand = new RelayCommand(SearchData);
             // 设置默认值
-            this.MainTopImage = FunctionModels[7].Image;
-            this.MainTopTitle = FunctionModels[7].Title;
+            MainTopImage = FunctionModels[7].Image;
+            MainTopTitle = FunctionModels[7].Title;
             // TODO 显示默认功能项数据
         }
 
         private void ShowCurTimer(object sender, EventArgs e)
         {
-            this.CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            CurrentTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
         }
 
         private void LoginOut(CabinetWindow window)
@@ -130,33 +142,42 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopImage = functionModel.Image;
-            this.MainTopTitle = functionModel.Title;
+            MainTopImage = functionModel.Image;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "手术单领用":
+                    //TODO
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("AdoptionPage");
                     break;
                 case "归还":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("ReturnGoodsPage");
                     break;
                 case "紧急领用":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("EmergencyPage");
                     break;
                 case "上架":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("PutGoodsPage");
                     break;
                 case "盘点":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InventoryPage");
                     break;
                 case "退SPD库":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("RefundSpdPage");
                     break;
                 case "查询":
+                    IsTopSearchBarVisible = "Collapsed";
                     navigationService.NavigateTo("InquirePage");
                     break;
                 case "主页":
+                    IsTopSearchBarVisible = "Visible";
                     navigationService.NavigateTo("CabinetMainPage");
                     break;
             }
@@ -175,12 +196,12 @@
 
             var functionModel = (FunctionModel)listBox.SelectedItem;
 
-            this.MainTopTitle = functionModel.Title;
+            MainTopTitle = functionModel.Title;
             var navigationService = ServiceLocator.Current.GetInstance<INavigationService>();
             switch (functionModel.Title)
             {
                 case "设置":
-                    this.MainTopImage = "/Images/设置_白.png";
+                    MainTopImage = "/Images/设置_白.png";
                     navigationService.NavigateTo("SettingsPage");
                     break;
                 case "灯光":
@@ -188,7 +209,7 @@
                         MessageBoxImage.Question);
                     break;
                 case "近消耗品":
-                    this.MainTopImage = "/Images/近消耗品_白.png";
+                    MainTopImage = "/Images/近消耗品_白.png";
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
diff --git a/SubCabinetSolution/Views/AddUserDialog.xaml b/SubCabinetSolution/Views/AddUserDialog.xaml
index 33ca158..7a16285 100644
--- a/SubCabinetSolution/Views/AddUserDialog.xaml
+++ b/SubCabinetSolution/Views/AddUserDialog.xaml
@@ -8,7 +8,7 @@
     xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="新增用户"
     Width="400"
-    Height="425"
+    Height="415"
     AllowsTransparency="True"
     Background="Transparent"
     ShowInTaskbar="False"
@@ -80,7 +80,8 @@
         </Style>
     </Window.Resources>
 
-    <Border Background="LightBlue" CornerRadius="10">
+
+    <Border Background="LightSkyBlue" CornerRadius="10">
         <StackPanel Orientation="Vertical">
             <Grid Margin="15,0">
                 <Grid.ColumnDefinitions>
@@ -126,7 +127,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -162,7 +163,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -198,7 +199,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe676;" />
 
                     <TextBlock
@@ -234,7 +235,7 @@
                         VerticalAlignment="Center"
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
                         FontSize="24"
-                        Foreground="#4381DF"
+                        Foreground="{DynamicResource MainThemeColor}"
                         Text="&#xe6a4;" />
 
                     <TextBlock
@@ -260,7 +261,7 @@
             <!--  分割线  -->
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -273,7 +274,7 @@
                     Text="用户角色" />
 
                 <Line
-                    Stroke="#4381DF"
+                    Stroke="{DynamicResource MainThemeColor}"
                     StrokeThickness="1"
                     X1="0"
                     X2="140"
@@ -303,13 +304,13 @@
             <widgets:CornerRadiusButton
                 Width="370"
                 Height="35"
-                Background="#FF4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding AddUserCommand}"
                 Content="登记"
                 FontSize="16"
                 Foreground="White"
-                MouseOverBackground="#AA4381DF" />
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index fae4fac..8246f3e 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -40,10 +40,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -102,7 +102,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -153,9 +153,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -170,9 +170,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -187,9 +187,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -204,9 +204,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 27134a0..4d3eea4 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="#4381DF" />
+            <Setter Property="Background" Value="{DynamicResource MainThemeColor}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="5" />
         </Style>
@@ -44,14 +44,13 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="160" />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
                     Grid.Row="0"
                     Padding="0,20"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="18"
                     FontWeight="Bold"
                     Foreground="White"
@@ -87,7 +86,7 @@
                                         x:Name="ImageBorder"
                                         Margin="5"
                                         HorizontalAlignment="Center"
-                                        Background="#4381DF"
+                                        Background="{DynamicResource MainThemeColor}"
                                         CornerRadius="5">
                                         <Image
                                             Width="40"
@@ -186,7 +185,7 @@
                         <Style TargetType="ListBoxItem">
                             <Setter Property="OverridesDefaultStyle" Value="True" />
                             <Setter Property="HorizontalContentAlignment" Value="Center" />
-                            <Setter Property="Foreground" Value="#4381DF" />
+                            <Setter Property="Foreground" Value="{DynamicResource MainThemeColor}" />
                             <Setter Property="FontSize" Value="12" />
                             <Setter Property="Width" Value="65" />
                             <Setter Property="Height" Value="65" />
@@ -210,16 +209,6 @@
                         </Style>
                     </ListBox.ItemContainerStyle>
                 </ListBox>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Padding="0,20"
-                    Background="#4381DF"
-                    FontSize="18"
-                    FontWeight="Bold"
-                    Foreground="White"
-                    Text="航天203所"
-                    TextAlignment="Center" />
             </Grid>
         </Border>
 
@@ -243,7 +232,7 @@
                             Height="40"
                             Margin="5"
                             HorizontalAlignment="Center"
-                            Background="#4381DF"
+                            Background="{DynamicResource MainThemeColor}"
                             CornerRadius="5">
                             <Image
                                 Width="28"
@@ -269,14 +258,15 @@
                     <StackPanel
                         Grid.Column="1"
                         HorizontalAlignment="Center"
-                        Orientation="Horizontal">
+                        Orientation="Horizontal"
+                        Visibility="{Binding IsTopSearchBarVisible}">
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
                             Padding="3,0"
                             VerticalContentAlignment="Center"
                             BorderCornerRadius="3"
-                            Foreground="#333333"
+                            Foreground="{DynamicResource MainTextColor}"
                             HintText="请输入要查询的关键字"
                             MouseOverBorderColor="Blue"
                             PlaceHolderPadding="5"
diff --git a/SubCabinetSolution/Views/ConsumeQueryPage.xaml b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
index cdbd529..f3a08b9 100644
--- a/SubCabinetSolution/Views/ConsumeQueryPage.xaml
+++ b/SubCabinetSolution/Views/ConsumeQueryPage.xaml
@@ -29,7 +29,7 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="Black" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource MainTextColor}" />
             <Setter Property="Background" Value="White" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="Height" Value="50" />
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -89,12 +89,12 @@
                 Grid.Column="0"
                 Margin="20,20,0,20"
                 VerticalAlignment="Center"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <TextBlock
                     Padding="20,10"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     FontSize="16"
                     Foreground="White"
                     Text="今日" />
@@ -105,7 +105,7 @@
                 Grid.Column="1"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -123,7 +123,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -131,7 +131,7 @@
                 Grid.Column="2"
                 Margin="0,20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -149,7 +149,7 @@
                         Background="{x:Null}"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#4381DF" />
+                        Foreground="{DynamicResource MainThemeColor}" />
                 </StackPanel>
             </Border>
 
@@ -158,10 +158,10 @@
                 Width="80"
                 Height="40"
                 Margin="20"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding SearchDataCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -231,7 +231,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -239,7 +239,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="0" />
 
             <widgets:CornerRadiusButton
@@ -248,10 +248,10 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index c411208..baf8459 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -383,9 +383,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -400,9 +400,9 @@
                         Grid.Column="1"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -417,9 +417,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -434,9 +434,9 @@
                         Grid.Column="4"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/GoodsQueryPage.xaml b/SubCabinetSolution/Views/GoodsQueryPage.xaml
index 8f683d6..bf98ca9 100644
--- a/SubCabinetSolution/Views/GoodsQueryPage.xaml
+++ b/SubCabinetSolution/Views/GoodsQueryPage.xaml
@@ -29,22 +29,22 @@
         </Style>
 
         <Style x:Key="ColumnHeaderStyle" TargetType="DataGridColumnHeader">
-            <Setter Property="TextBlock.Foreground" Value="#4381DF" />
+            <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="#4381DF" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MainThemeColor}" />
         </Style>
 
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -94,7 +94,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -202,7 +202,7 @@
                             Margin="5,0"
                             FontSize="16"
                             FontWeight="Bold"
-                            Foreground="#4381DF"
+                            Foreground="{DynamicResource MainThemeColor}"
                             Text="起" />
                     </StackPanel>
 
@@ -354,10 +354,10 @@
                     Height="30"
                     Margin="20"
                     HorizontalAlignment="Right"
-                    Background="#4381DF"
+                    Background="{DynamicResource MainThemeColor}"
                     BorderCornerRadius="5"
                     Command="{Binding GoBackCommand}"
-                    MouseOverBackground="#AA4381DF">
+                    MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
                             FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml
index 2bc5ca5..19d251a 100644
--- a/SubCabinetSolution/Views/InquirePage.xaml
+++ b/SubCabinetSolution/Views/InquirePage.xaml
@@ -71,7 +71,7 @@
                             <Border
                                 Width="80"
                                 Height="80"
-                                Background="#4381DF"
+                                Background="{DynamicResource MainThemeColor}"
                                 CornerRadius="10,10,10,10">
                                 <Image
                                     Width="48"
@@ -85,7 +85,7 @@
                                 VerticalAlignment="Center"
                                 FontFamily="微软雅黑"
                                 FontSize="16"
-                                Foreground="#333333"
+                                Foreground="{DynamicResource MainTextColor}"
                                 Text="{Binding Title}"
                                 TextAlignment="Center" />
                         </Grid>
diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml
index 70e2980..601350f 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="#4381DF" />
+            <Setter Property="Foreground" Value="{DynamicResource 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="#4381DF" />
+                <Setter Property="Fill" Value="{DynamicResource MainThemeColor}" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,10" />
             </Style>
 
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index 683831c..1a389c4 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 3691964..c8b7dfa 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -87,7 +87,7 @@
                 Grid.Column="0"
                 Margin="20"
                 Padding="10,5,0,5"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 BorderThickness="1"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
@@ -116,7 +116,7 @@
                 Margin="20"
                 Padding="10,0,0,0"
                 Background="#F1F1F1"
-                BorderBrush="#4381DF"
+                BorderBrush="{DynamicResource MainThemeColor}"
                 CornerRadius="3">
                 <StackPanel Orientation="Horizontal">
                     <widgets:PlaceHolderTextBox
@@ -126,7 +126,7 @@
                         Background="Transparent"
                         BorderThickness="0"
                         FontSize="16"
-                        Foreground="#333333"
+                        Foreground="{DynamicResource MainTextColor}"
                         HintText="请输入助记码查询"
                         PlaceHolderPadding="5" />
 
@@ -201,7 +201,7 @@
                 VerticalAlignment="Center"
                 FontSize="18"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="汇总数量" />
 
             <TextBlock
@@ -209,7 +209,7 @@
                 VerticalAlignment="Center"
                 FontSize="22"
                 FontWeight="Bold"
-                Foreground="#4381DF"
+                Foreground="{DynamicResource MainThemeColor}"
                 Text="27" />
 
             <widgets:CornerRadiusButton
@@ -218,9 +218,9 @@
                 Height="30"
                 Margin="20,0"
                 HorizontalAlignment="Right"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index f3f749f..133df57 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -332,7 +332,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -382,9 +382,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -399,9 +399,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -416,9 +416,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/ReturnGoodsPage.xaml b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
index 5a8cb2b..d94eaa6 100644
--- a/SubCabinetSolution/Views/ReturnGoodsPage.xaml
+++ b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
@@ -55,10 +55,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -357,7 +357,7 @@
 
         <Border
             Grid.Row="1"
-            BorderBrush="#4381DF"
+            BorderBrush="{DynamicResource MainThemeColor}"
             BorderThickness="1,5,1,1">
             <Grid>
                 <Grid.RowDefinitions>
@@ -407,9 +407,9 @@
                         Grid.Column="0"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -424,9 +424,9 @@
                         Grid.Column="2"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
@@ -441,9 +441,9 @@
                         Grid.Column="3"
                         Width="80"
                         Height="30"
-                        Background="#4381DF"
+                        Background="{DynamicResource MainThemeColor}"
                         BorderCornerRadius="5"
-                        MouseOverBackground="#AA4381DF">
+                        MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/SettingsPage.xaml b/SubCabinetSolution/Views/SettingsPage.xaml
index e77f01f..2a70fdb 100644
--- a/SubCabinetSolution/Views/SettingsPage.xaml
+++ b/SubCabinetSolution/Views/SettingsPage.xaml
@@ -41,10 +41,10 @@
         <Style TargetType="DataGridRow">
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="TextBlock.Foreground" Value="#00D4B5" />
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
                 <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#00D4B5" />
+                    <Setter Property="Background" Value="{DynamicResource ItemSelectedColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -131,10 +131,10 @@
             Height="30"
             Margin="30,0"
             HorizontalAlignment="Right"
-            Background="#4381DF"
+            Background="{DynamicResource MainThemeColor}"
             BorderCornerRadius="5"
             Command="{Binding AddUserCommand}"
-            MouseOverBackground="#AA4381DF">
+            MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
             <StackPanel Orientation="Horizontal">
                 <TextBlock
                     FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/TotalQueryPage.xaml b/SubCabinetSolution/Views/TotalQueryPage.xaml
index 51f4461..bb3b3ec 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="#4381DF" />
+                                <Setter TargetName="RadioButtonBorder" Property="Background" Value="{DynamicResource MainThemeColor}" />
                                 <Setter TargetName="RadioButtonBorder" Property="TextBlock.Foreground" Value="White" />
                             </Trigger>
 
@@ -95,7 +95,7 @@
         <Grid
             Grid.Row="1"
             Margin="20,0"
-            Background="#4381DF" />
+            Background="{DynamicResource MainThemeColor}" />
 
         <DataGrid
             Grid.Row="2"
@@ -137,10 +137,10 @@
                 Grid.Column="3"
                 Width="80"
                 Height="30"
-                Background="#4381DF"
+                Background="{DynamicResource MainThemeColor}"
                 BorderCornerRadius="5"
                 Command="{Binding GoBackCommand}"
-                MouseOverBackground="#AA4381DF">
+                MouseOverBackground="{DynamicResource MainThemeOpacityColor}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/obj/Debug/App.g.i.cs b/SubCabinetSolution/obj/Debug/App.g.i.cs
index 3fbe105..0134ce7 100644
--- a/SubCabinetSolution/obj/Debug/App.g.i.cs
+++ b/SubCabinetSolution/obj/Debug/App.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "08233F290145B875E527F4E0A8BA35E9D0DA594BE8B40688C7D9FEAFF416DE2A"
+#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BD779D304658E554B75E15A6BCFDFCDAD98ED7D15CBBC4A34152E893C69D4D95"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs b/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs
index dad4cf0..75a46c5 100644
--- a/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs
+++ b/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4BBA1068D6F9EBCA47A6C57E5A35F562A98DF3A590CA7B234432CF51DC7127D6"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "902436421D463978A87A577B9DA394664E587CA1CE4DF52EFEBE2482E3A07659"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。