diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index e658f3fc..80a08e61 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -66,9 +66,9 @@ namespace BBWY.Client serviceCollection.AddSingleton(); serviceCollection.AddSingleton(gl); serviceCollection.BatchRegisterServices(new Assembly[] { Assembly.Load("BBWY.Client") }, typeof(IDenpendency)); - serviceCollection.AddMapper(new MappingProfile()); + serviceCollection.AddTransient<_1688PreviewPurchaseViewModel>(); ServiceProvider = serviceCollection.BuildServiceProvider(); base.OnStartup(e); } diff --git a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs index a417ea42..65af59f7 100644 --- a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs +++ b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs @@ -23,6 +23,7 @@ namespace BBWY.Client.ViewModels public ICommand DeleteCommand { get; set; } public ICommand EditCommand { get; set; } + public ICommand PreviewPurchaseCommand { get; set; } public ChoosePurchaseSchemeViewModel(PurchaseService purchaseService, GlobalContext globalContext, BindingPurchaseProductViewModel bindingPurchaseProduct) { @@ -32,6 +33,7 @@ namespace BBWY.Client.ViewModels PurchaseSchemeList = new ObservableCollection(); DeleteCommand = new RelayCommand(Delete); EditCommand = new RelayCommand(Edit); + PreviewPurchaseCommand = new RelayCommand(PreviewPurchase); } protected override void Load() @@ -92,5 +94,10 @@ namespace BBWY.Client.ViewModels if (r == true) Task.Factory.StartNew(() => LoadPurchaseScheme(SkuId)); } + + public void PreviewPurchase(PurchaseScheme purchaseScheme) + { + + } } } diff --git a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs new file mode 100644 index 00000000..df303037 --- /dev/null +++ b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs @@ -0,0 +1,10 @@ +namespace BBWY.Client.ViewModels +{ + public class _1688PreviewPurchaseViewModel : BaseVM + { + public _1688PreviewPurchaseViewModel() + { + + } + } +} diff --git a/BBWY.Client/ViewModels/ViewModelLocator.cs b/BBWY.Client/ViewModels/ViewModelLocator.cs index bd3abc2e..851d87c1 100644 --- a/BBWY.Client/ViewModels/ViewModelLocator.cs +++ b/BBWY.Client/ViewModels/ViewModelLocator.cs @@ -77,5 +77,16 @@ namespace BBWY.Client.ViewModels } } } + + public _1688PreviewPurchaseViewModel _1688PreviewPurchase + { + get + { + using (var s = sp.CreateScope()) + { + return s.ServiceProvider.GetRequiredService<_1688PreviewPurchaseViewModel>(); + } + } + } } } diff --git a/BBWY.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs b/BBWY.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs index 6876c687..a23d4a25 100644 --- a/BBWY.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs +++ b/BBWY.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs @@ -125,7 +125,7 @@ namespace BBWY.Client.ViewModels } } - private void LoadPurchaseProduct(PurchaseSchemeProduct purchaseSchemeProduct, IList skuList = null) + public void LoadPurchaseProduct(PurchaseSchemeProduct purchaseSchemeProduct, IList skuList = null) { App.Current.Dispatcher.Invoke(() => { diff --git a/BBWY.Client/Views/Purchase/1688Purchase.xaml b/BBWY.Client/Views/Purchase/1688Purchase.xaml index 6b02d674..f618e654 100644 --- a/BBWY.Client/Views/Purchase/1688Purchase.xaml +++ b/BBWY.Client/Views/Purchase/1688Purchase.xaml @@ -6,11 +6,12 @@ xmlns:local="clr-namespace:BBWY.Client.Views.Purchase" xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" mc:Ignorable="d" - Title="提交订单" Height="450" Width="800" + Title="提交订单" Height="600" Width="800" Style="{StaticResource bwstyle}" MinButtonVisibility="Collapsed" - MaxButtonVisibility="Collapsed"> - + MaxButtonVisibility="Collapsed" + DataContext="{Binding _1688PreviewPurchase,Source={StaticResource Locator}}"> + @@ -30,21 +31,32 @@ + + + + + + + + + - + - + - + - +