diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index f04a43b..0f79f02 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 f04a43b..0f79f02 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index 23ee8a9..2410644 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -158,7 +158,6 @@
 
         private void SettingsSelectionChanged(object sender)
         {
-            // TODO 解决ListBox无法单击的问题
             var listBox = (ListBox)sender;
             if (listBox.SelectedIndex == -1)
             {
@@ -178,6 +177,9 @@
                 case "灯光":
                     MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel,
                         MessageBoxImage.Question);
+
+                    // 解决ListBox无法单击的问题
+                    listBox.SelectedIndex = -1;
                     break;
                 case "近消耗品":
                     IsTopSearchBarVisible = "Collapsed";
@@ -185,8 +187,6 @@
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
-
-            listBox.SelectedIndex = -1;
         }
 
         private void SearchData()

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index f04a43b..0f79f02 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index 23ee8a9..2410644 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -158,7 +158,6 @@
 
         private void SettingsSelectionChanged(object sender)
         {
-            // TODO 解决ListBox无法单击的问题
             var listBox = (ListBox)sender;
             if (listBox.SelectedIndex == -1)
             {
@@ -178,6 +177,9 @@
                 case "灯光":
                     MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel,
                         MessageBoxImage.Question);
+
+                    // 解决ListBox无法单击的问题
+                    listBox.SelectedIndex = -1;
                     break;
                 case "近消耗品":
                     IsTopSearchBarVisible = "Collapsed";
@@ -185,8 +187,6 @@
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
-
-            listBox.SelectedIndex = -1;
         }
 
         private void SearchData()
diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
index a37b202..4d47ef1 100644
--- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class EmergencyPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index f04a43b..0f79f02 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index 23ee8a9..2410644 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -158,7 +158,6 @@
 
         private void SettingsSelectionChanged(object sender)
         {
-            // TODO 解决ListBox无法单击的问题
             var listBox = (ListBox)sender;
             if (listBox.SelectedIndex == -1)
             {
@@ -178,6 +177,9 @@
                 case "灯光":
                     MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel,
                         MessageBoxImage.Question);
+
+                    // 解决ListBox无法单击的问题
+                    listBox.SelectedIndex = -1;
                     break;
                 case "近消耗品":
                     IsTopSearchBarVisible = "Collapsed";
@@ -185,8 +187,6 @@
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
-
-            listBox.SelectedIndex = -1;
         }
 
         private void SearchData()
diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
index a37b202..4d47ef1 100644
--- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class EmergencyPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
index 4a26e47..ee69af8 100644
--- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class PutGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index f04a43b..0f79f02 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index 23ee8a9..2410644 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -158,7 +158,6 @@
 
         private void SettingsSelectionChanged(object sender)
         {
-            // TODO 解决ListBox无法单击的问题
             var listBox = (ListBox)sender;
             if (listBox.SelectedIndex == -1)
             {
@@ -178,6 +177,9 @@
                 case "灯光":
                     MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel,
                         MessageBoxImage.Question);
+
+                    // 解决ListBox无法单击的问题
+                    listBox.SelectedIndex = -1;
                     break;
                 case "近消耗品":
                     IsTopSearchBarVisible = "Collapsed";
@@ -185,8 +187,6 @@
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
-
-            listBox.SelectedIndex = -1;
         }
 
         private void SearchData()
diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
index a37b202..4d47ef1 100644
--- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class EmergencyPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
index 4a26e47..ee69af8 100644
--- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class PutGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
index 293eeb0..d43cde1 100644
--- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class RefundSpdPageViewModel: ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index f04a43b..0f79f02 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index 23ee8a9..2410644 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -158,7 +158,6 @@
 
         private void SettingsSelectionChanged(object sender)
         {
-            // TODO 解决ListBox无法单击的问题
             var listBox = (ListBox)sender;
             if (listBox.SelectedIndex == -1)
             {
@@ -178,6 +177,9 @@
                 case "灯光":
                     MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel,
                         MessageBoxImage.Question);
+
+                    // 解决ListBox无法单击的问题
+                    listBox.SelectedIndex = -1;
                     break;
                 case "近消耗品":
                     IsTopSearchBarVisible = "Collapsed";
@@ -185,8 +187,6 @@
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
-
-            listBox.SelectedIndex = -1;
         }
 
         private void SearchData()
diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
index a37b202..4d47ef1 100644
--- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class EmergencyPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
index 4a26e47..ee69af8 100644
--- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class PutGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
index 293eeb0..d43cde1 100644
--- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class RefundSpdPageViewModel: ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
index 65fb955..8cc1539 100644
--- a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class ReturnGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index f04a43b..0f79f02 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index 23ee8a9..2410644 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -158,7 +158,6 @@
 
         private void SettingsSelectionChanged(object sender)
         {
-            // TODO 解决ListBox无法单击的问题
             var listBox = (ListBox)sender;
             if (listBox.SelectedIndex == -1)
             {
@@ -178,6 +177,9 @@
                 case "灯光":
                     MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel,
                         MessageBoxImage.Question);
+
+                    // 解决ListBox无法单击的问题
+                    listBox.SelectedIndex = -1;
                     break;
                 case "近消耗品":
                     IsTopSearchBarVisible = "Collapsed";
@@ -185,8 +187,6 @@
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
-
-            listBox.SelectedIndex = -1;
         }
 
         private void SearchData()
diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
index a37b202..4d47ef1 100644
--- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class EmergencyPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
index 4a26e47..ee69af8 100644
--- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class PutGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
index 293eeb0..d43cde1 100644
--- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class RefundSpdPageViewModel: ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
index 65fb955..8cc1539 100644
--- a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class ReturnGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index c74043f..0992ec7 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -45,7 +45,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index f04a43b..0f79f02 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index 23ee8a9..2410644 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -158,7 +158,6 @@
 
         private void SettingsSelectionChanged(object sender)
         {
-            // TODO 解决ListBox无法单击的问题
             var listBox = (ListBox)sender;
             if (listBox.SelectedIndex == -1)
             {
@@ -178,6 +177,9 @@
                 case "灯光":
                     MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel,
                         MessageBoxImage.Question);
+
+                    // 解决ListBox无法单击的问题
+                    listBox.SelectedIndex = -1;
                     break;
                 case "近消耗品":
                     IsTopSearchBarVisible = "Collapsed";
@@ -185,8 +187,6 @@
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
-
-            listBox.SelectedIndex = -1;
         }
 
         private void SearchData()
diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
index a37b202..4d47ef1 100644
--- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class EmergencyPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
index 4a26e47..ee69af8 100644
--- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class PutGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
index 293eeb0..d43cde1 100644
--- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class RefundSpdPageViewModel: ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
index 65fb955..8cc1539 100644
--- a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class ReturnGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index c74043f..0992ec7 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -45,7 +45,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 8630f29..87e6a93 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -40,7 +40,7 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <TextBlock

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index f04a43b..0f79f02 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index 23ee8a9..2410644 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -158,7 +158,6 @@
 
         private void SettingsSelectionChanged(object sender)
         {
-            // TODO 解决ListBox无法单击的问题
             var listBox = (ListBox)sender;
             if (listBox.SelectedIndex == -1)
             {
@@ -178,6 +177,9 @@
                 case "灯光":
                     MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel,
                         MessageBoxImage.Question);
+
+                    // 解决ListBox无法单击的问题
+                    listBox.SelectedIndex = -1;
                     break;
                 case "近消耗品":
                     IsTopSearchBarVisible = "Collapsed";
@@ -185,8 +187,6 @@
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
-
-            listBox.SelectedIndex = -1;
         }
 
         private void SearchData()
diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
index a37b202..4d47ef1 100644
--- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class EmergencyPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
index 4a26e47..ee69af8 100644
--- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class PutGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
index 293eeb0..d43cde1 100644
--- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class RefundSpdPageViewModel: ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
index 65fb955..8cc1539 100644
--- a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class ReturnGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index c74043f..0992ec7 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -45,7 +45,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 8630f29..87e6a93 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -40,7 +40,7 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index a045c6e..837777d 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -292,7 +292,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
@@ -373,7 +373,8 @@
                         Width="80"
                         Height="30"
                         Background="{StaticResource MainThemeColor}"
-                        BorderThickness="0">
+                        BorderThickness="0"
+                        Command="{Binding GoBackCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index f04a43b..0f79f02 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index 23ee8a9..2410644 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -158,7 +158,6 @@
 
         private void SettingsSelectionChanged(object sender)
         {
-            // TODO 解决ListBox无法单击的问题
             var listBox = (ListBox)sender;
             if (listBox.SelectedIndex == -1)
             {
@@ -178,6 +177,9 @@
                 case "灯光":
                     MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel,
                         MessageBoxImage.Question);
+
+                    // 解决ListBox无法单击的问题
+                    listBox.SelectedIndex = -1;
                     break;
                 case "近消耗品":
                     IsTopSearchBarVisible = "Collapsed";
@@ -185,8 +187,6 @@
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
-
-            listBox.SelectedIndex = -1;
         }
 
         private void SearchData()
diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
index a37b202..4d47ef1 100644
--- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class EmergencyPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
index 4a26e47..ee69af8 100644
--- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class PutGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
index 293eeb0..d43cde1 100644
--- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class RefundSpdPageViewModel: ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
index 65fb955..8cc1539 100644
--- a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class ReturnGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index c74043f..0992ec7 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -45,7 +45,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 8630f29..87e6a93 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -40,7 +40,7 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index a045c6e..837777d 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -292,7 +292,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
@@ -373,7 +373,8 @@
                         Width="80"
                         Height="30"
                         Background="{StaticResource MainThemeColor}"
-                        BorderThickness="0">
+                        BorderThickness="0"
+                        Command="{Binding GoBackCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index e525970..30b3b09 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -292,7 +292,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
@@ -356,7 +356,8 @@
                         Width="80"
                         Height="30"
                         Background="{StaticResource MainThemeColor}"
-                        BorderThickness="0">
+                        BorderThickness="0"
+                        Command="{Binding GoBackCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index f04a43b..0f79f02 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index 23ee8a9..2410644 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -158,7 +158,6 @@
 
         private void SettingsSelectionChanged(object sender)
         {
-            // TODO 解决ListBox无法单击的问题
             var listBox = (ListBox)sender;
             if (listBox.SelectedIndex == -1)
             {
@@ -178,6 +177,9 @@
                 case "灯光":
                     MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel,
                         MessageBoxImage.Question);
+
+                    // 解决ListBox无法单击的问题
+                    listBox.SelectedIndex = -1;
                     break;
                 case "近消耗品":
                     IsTopSearchBarVisible = "Collapsed";
@@ -185,8 +187,6 @@
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
-
-            listBox.SelectedIndex = -1;
         }
 
         private void SearchData()
diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
index a37b202..4d47ef1 100644
--- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class EmergencyPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
index 4a26e47..ee69af8 100644
--- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class PutGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
index 293eeb0..d43cde1 100644
--- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class RefundSpdPageViewModel: ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
index 65fb955..8cc1539 100644
--- a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class ReturnGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index c74043f..0992ec7 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -45,7 +45,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 8630f29..87e6a93 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -40,7 +40,7 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index a045c6e..837777d 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -292,7 +292,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
@@ -373,7 +373,8 @@
                         Width="80"
                         Height="30"
                         Background="{StaticResource MainThemeColor}"
-                        BorderThickness="0">
+                        BorderThickness="0"
+                        Command="{Binding GoBackCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index e525970..30b3b09 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -292,7 +292,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
@@ -356,7 +356,8 @@
                         Width="80"
                         Height="30"
                         Background="{StaticResource MainThemeColor}"
-                        BorderThickness="0">
+                        BorderThickness="0"
+                        Command="{Binding GoBackCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index bc23386..3eeb454 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -292,7 +292,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
@@ -356,7 +356,8 @@
                         Width="80"
                         Height="30"
                         Background="{StaticResource MainThemeColor}"
-                        BorderThickness="0">
+                        BorderThickness="0"
+                        Command="{Binding GoBackCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index f04a43b..0f79f02 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
index 23ee8a9..2410644 100644
--- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -158,7 +158,6 @@
 
         private void SettingsSelectionChanged(object sender)
         {
-            // TODO 解决ListBox无法单击的问题
             var listBox = (ListBox)sender;
             if (listBox.SelectedIndex == -1)
             {
@@ -178,6 +177,9 @@
                 case "灯光":
                     MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel,
                         MessageBoxImage.Question);
+
+                    // 解决ListBox无法单击的问题
+                    listBox.SelectedIndex = -1;
                     break;
                 case "近消耗品":
                     IsTopSearchBarVisible = "Collapsed";
@@ -185,8 +187,6 @@
                     navigationService.NavigateTo("RecentUsePage");
                     break;
             }
-
-            listBox.SelectedIndex = -1;
         }
 
         private void SearchData()
diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
index a37b202..4d47ef1 100644
--- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class EmergencyPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
index 4a26e47..ee69af8 100644
--- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class PutGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
index 293eeb0..d43cde1 100644
--- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class RefundSpdPageViewModel: ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
index 65fb955..8cc1539 100644
--- a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
+++ b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs
@@ -1,11 +1,15 @@
 using System.Collections.ObjectModel;
+using CommonServiceLocator;
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Views;
 using SubCabinetSolution.Model;
 
 namespace SubCabinetSolution.ViewModel
 {
     public class ReturnGoodsPageViewModel : ViewModelBase
     {
+        public RelayCommand GoBackCommand { get; set; }
         public ObservableCollection<GoodsModel> FirstDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> SecondDoorGoods { get; set; }
         public ObservableCollection<GoodsModel> ThirdDoorGoods { get; set; }
@@ -51,6 +55,12 @@
                     Description = null
                 }
             };
+            
+            GoBackCommand = new RelayCommand(() =>
+            {
+                ServiceLocator.Current.GetInstance<INavigationService>().NavigateTo("CabinetMainPage");
+                //Messenger.Default.Send(MessageToken.ChangeCabinetPage);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml
index c74043f..0992ec7 100644
--- a/SubCabinetSolution/Views/AdoptionPage.xaml
+++ b/SubCabinetSolution/Views/AdoptionPage.xaml
@@ -45,7 +45,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 8630f29..87e6a93 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -40,7 +40,7 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition />
-                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <TextBlock
diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml
index a045c6e..837777d 100644
--- a/SubCabinetSolution/Views/EmergencyPage.xaml
+++ b/SubCabinetSolution/Views/EmergencyPage.xaml
@@ -292,7 +292,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
@@ -373,7 +373,8 @@
                         Width="80"
                         Height="30"
                         Background="{StaticResource MainThemeColor}"
-                        BorderThickness="0">
+                        BorderThickness="0"
+                        Command="{Binding GoBackCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml
index e525970..30b3b09 100644
--- a/SubCabinetSolution/Views/PutGoodsPage.xaml
+++ b/SubCabinetSolution/Views/PutGoodsPage.xaml
@@ -292,7 +292,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
@@ -356,7 +356,8 @@
                         Width="80"
                         Height="30"
                         Background="{StaticResource MainThemeColor}"
-                        BorderThickness="0">
+                        BorderThickness="0"
+                        Command="{Binding GoBackCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml
index bc23386..3eeb454 100644
--- a/SubCabinetSolution/Views/RefundSpdPage.xaml
+++ b/SubCabinetSolution/Views/RefundSpdPage.xaml
@@ -292,7 +292,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
@@ -356,7 +356,8 @@
                         Width="80"
                         Height="30"
                         Background="{StaticResource MainThemeColor}"
-                        BorderThickness="0">
+                        BorderThickness="0"
+                        Command="{Binding GoBackCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"
diff --git a/SubCabinetSolution/Views/ReturnGoodsPage.xaml b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
index 1c10bc9..4a7b992 100644
--- a/SubCabinetSolution/Views/ReturnGoodsPage.xaml
+++ b/SubCabinetSolution/Views/ReturnGoodsPage.xaml
@@ -310,7 +310,7 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition />
-                    <RowDefinition Height="60" />
+                    <RowDefinition Height="80" />
                 </Grid.RowDefinitions>
 
                 <ListView
@@ -374,7 +374,8 @@
                         Width="80"
                         Height="30"
                         Background="{StaticResource MainThemeColor}"
-                        BorderThickness="0">
+                        BorderThickness="0"
+                        Command="{Binding GoBackCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="/SubCabinetSolution;component/IconFont/#iconfont"