diff --git a/BPASmartClient.Tourism/Views/Debug.xaml b/BPASmartClient.Tourism/View/Debug.xaml similarity index 100% rename from BPASmartClient.Tourism/Views/Debug.xaml rename to BPASmartClient.Tourism/View/Debug.xaml diff --git a/BPASmartClient.Tourism/Views/Debug.xaml.cs b/BPASmartClient.Tourism/View/Debug.xaml.cs similarity index 100% rename from BPASmartClient.Tourism/Views/Debug.xaml.cs rename to BPASmartClient.Tourism/View/Debug.xaml.cs diff --git a/BPASmartClient.Tourism/Views/ItemStorageView.xaml b/BPASmartClient.Tourism/View/ItemStorageView.xaml similarity index 95% rename from BPASmartClient.Tourism/Views/ItemStorageView.xaml rename to BPASmartClient.Tourism/View/ItemStorageView.xaml index be52d3a9..6d9b3e20 100644 --- a/BPASmartClient.Tourism/Views/ItemStorageView.xaml +++ b/BPASmartClient.Tourism/View/ItemStorageView.xaml @@ -1,9 +1,9 @@ - @@ -41,7 +41,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/BPASmartClient.Tourism/Views/ItemStorageView.xaml.cs b/BPASmartClient.Tourism/View/ItemStorageView.xaml.cs similarity index 93% rename from BPASmartClient.Tourism/Views/ItemStorageView.xaml.cs rename to BPASmartClient.Tourism/View/ItemStorageView.xaml.cs index 5101bf7c..d8860fd9 100644 --- a/BPASmartClient.Tourism/Views/ItemStorageView.xaml.cs +++ b/BPASmartClient.Tourism/View/ItemStorageView.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace BPASmartClient.TourismCollege.Views +namespace BPASmartClient.TourismCollege.View { /// /// ItemStorageView.xaml 的交互逻辑 diff --git a/BPASmartClient.Tourism/Views/Monitor.xaml b/BPASmartClient.Tourism/View/Monitor.xaml similarity index 100% rename from BPASmartClient.Tourism/Views/Monitor.xaml rename to BPASmartClient.Tourism/View/Monitor.xaml diff --git a/BPASmartClient.Tourism/Views/Monitor.xaml.cs b/BPASmartClient.Tourism/View/Monitor.xaml.cs similarity index 100% rename from BPASmartClient.Tourism/Views/Monitor.xaml.cs rename to BPASmartClient.Tourism/View/Monitor.xaml.cs diff --git a/BPASmartClient.Tourism/Views/ParSet.xaml b/BPASmartClient.Tourism/View/ParSet.xaml similarity index 100% rename from BPASmartClient.Tourism/Views/ParSet.xaml rename to BPASmartClient.Tourism/View/ParSet.xaml diff --git a/BPASmartClient.Tourism/Views/ParSet.xaml.cs b/BPASmartClient.Tourism/View/ParSet.xaml.cs similarity index 100% rename from BPASmartClient.Tourism/Views/ParSet.xaml.cs rename to BPASmartClient.Tourism/View/ParSet.xaml.cs diff --git a/BPASmartClient.Tourism/Views/RecipeManageView.xaml b/BPASmartClient.Tourism/View/RecipeManageView.xaml similarity index 91% rename from BPASmartClient.Tourism/Views/RecipeManageView.xaml rename to BPASmartClient.Tourism/View/RecipeManageView.xaml index 7b149e56..de88969c 100644 --- a/BPASmartClient.Tourism/Views/RecipeManageView.xaml +++ b/BPASmartClient.Tourism/View/RecipeManageView.xaml @@ -1,9 +1,9 @@ - @@ -20,7 +20,7 @@ - + diff --git a/BPASmartClient.Tourism/Views/RecipeManageView.xaml.cs b/BPASmartClient.Tourism/View/RecipeManageView.xaml.cs similarity index 91% rename from BPASmartClient.Tourism/Views/RecipeManageView.xaml.cs rename to BPASmartClient.Tourism/View/RecipeManageView.xaml.cs index 9b282a48..a01b9487 100644 --- a/BPASmartClient.Tourism/Views/RecipeManageView.xaml.cs +++ b/BPASmartClient.Tourism/View/RecipeManageView.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace BPASmartClient.TourismCollege.Views +namespace BPASmartClient.TourismCollege.View { /// /// RecipeManageView.xaml 的交互逻辑 @@ -23,7 +23,7 @@ namespace BPASmartClient.TourismCollege.Views public RecipeManageView() { InitializeComponent(); - + } } } diff --git a/BPASmartClient.Tourism/Viewmodels/ItemStorageViewModel.cs b/BPASmartClient.Tourism/ViewModel/ItemStorageViewModel.cs similarity index 77% rename from BPASmartClient.Tourism/Viewmodels/ItemStorageViewModel.cs rename to BPASmartClient.Tourism/ViewModel/ItemStorageViewModel.cs index 6aa6fd46..a1206f30 100644 --- a/BPASmartClient.Tourism/Viewmodels/ItemStorageViewModel.cs +++ b/BPASmartClient.Tourism/ViewModel/ItemStorageViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.Viewmodels +namespace BPASmartClient.TourismCollege.ViewModel { internal class ItemStorageViewModel { diff --git a/BPASmartClient.Tourism/Viewmodels/MonitorViewModel.cs b/BPASmartClient.Tourism/ViewModel/MonitorViewModel.cs similarity index 100% rename from BPASmartClient.Tourism/Viewmodels/MonitorViewModel.cs rename to BPASmartClient.Tourism/ViewModel/MonitorViewModel.cs diff --git a/BPASmartClient.Tourism/Viewmodels/RecipeManageViewModel.cs b/BPASmartClient.Tourism/ViewModel/RecipeManageViewModel.cs similarity index 77% rename from BPASmartClient.Tourism/Viewmodels/RecipeManageViewModel.cs rename to BPASmartClient.Tourism/ViewModel/RecipeManageViewModel.cs index a261a206..dfe24f7d 100644 --- a/BPASmartClient.Tourism/Viewmodels/RecipeManageViewModel.cs +++ b/BPASmartClient.Tourism/ViewModel/RecipeManageViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BPASmartClient.TourismCollege.ViewModels +namespace BPASmartClient.TourismCollege.ViewModel { public class RecipeManageViewModel {