diff --git a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs index 834194d4..a417ea42 100644 --- a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs +++ b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs @@ -17,6 +17,7 @@ namespace BBWY.Client.ViewModels private BindingPurchaseProductViewModel bindingPurchaseProduct; public string SkuId { get; set; } public string SkuName { get; set; } + public string OrderId { get; set; } public IList PurchaseSchemeList { get; set; } @@ -41,12 +42,13 @@ namespace BBWY.Client.ViewModels protected override void Unload() { - this.SkuId = this.SkuName = string.Empty; + this.OrderId = this.SkuId = this.SkuName = string.Empty; PurchaseSchemeList.Clear(); } - public void SetData(string skuId, string skuName) + public void SetData(string orderId, string skuId, string skuName) { + this.OrderId = orderId; this.SkuId = skuId; this.SkuName = skuName; } diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index 415b364e..82690aba 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -257,7 +257,7 @@ namespace BBWY.Client.ViewModels } else if (chooseDFType.DFType == DFType.在线采购) { - choosePurchaseSchemeViewModel.SetData(order.ItemList[0].Id, order.ItemList[0].Title); + choosePurchaseSchemeViewModel.SetData(order.Id, order.ItemList[0].Id, order.ItemList[0].Title); var choosePurchaseScheme = new ChoosePurchaseScheme(); choosePurchaseScheme.ShowDialog(); } diff --git a/BBWY.Client/Views/Purchase/1688Purchase.xaml b/BBWY.Client/Views/Purchase/1688Purchase.xaml new file mode 100644 index 00000000..6b02d674 --- /dev/null +++ b/BBWY.Client/Views/Purchase/1688Purchase.xaml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BBWY.Client/Views/Purchase/1688Purchase.xaml.cs b/BBWY.Client/Views/Purchase/1688Purchase.xaml.cs new file mode 100644 index 00000000..17d1e80f --- /dev/null +++ b/BBWY.Client/Views/Purchase/1688Purchase.xaml.cs @@ -0,0 +1,15 @@ +using BBWY.Controls; + +namespace BBWY.Client.Views.Purchase +{ + /// + /// _1688Purchase.xaml 的交互逻辑 + /// + public partial class _1688Purchase : BWindow + { + public _1688Purchase() + { + InitializeComponent(); + } + } +}