diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index 1993bced..f446b363 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -7,7 +7,8 @@ { 淘宝 = 0, 京东 = 1, - 阿里巴巴 = 2 + 阿里巴巴 = 2, + 拼多多 = 3 } /// diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index dd8c6f24..0cd47141 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -238,12 +238,7 @@ namespace BBWY.Client.ViewModels } else if (storageType == StorageType.代发) { - if (order.ItemList.Count > 1) - { - MessageBox.Show("多个Sku请拆单", "提示"); - return; - } - var chooseDFType = new ChooseDFType(order.ItemList[0].Id); + var chooseDFType = new ChooseDFType(order.ItemList.Count > 1); if (chooseDFType.ShowDialog() != true) return; diff --git a/BBWY.Client/Views/Order/ChooseDFType.xaml.cs b/BBWY.Client/Views/Order/ChooseDFType.xaml.cs index 1a6de069..2f0b55a0 100644 --- a/BBWY.Client/Views/Order/ChooseDFType.xaml.cs +++ b/BBWY.Client/Views/Order/ChooseDFType.xaml.cs @@ -10,12 +10,24 @@ namespace BBWY.Client.Views.Order { public DFType DFType { get; private set; } - public string SkuId { get; private set; } - public ChooseDFType(string skuId) + private bool isDisablePurchaseOnline; + + public ChooseDFType(bool isDisablePurchaseOnline) { InitializeComponent(); - this.SkuId = skuId; + this.isDisablePurchaseOnline = isDisablePurchaseOnline; + this.Loaded += ChooseDFType_Loaded; + } + + private void ChooseDFType_Loaded(object sender, System.Windows.RoutedEventArgs e) + { + if (isDisablePurchaseOnline) + { + btn_purchase.IsEnabled = false; + btn_purchase.DisableText = "采购商品"; + } + } private void btn_purchase_Click(object sender, System.Windows.RoutedEventArgs e) diff --git a/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml b/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml index 2b3a5529..04b10983 100644 --- a/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml +++ b/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml @@ -122,7 +122,8 @@ - + diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs index 3fbe8f3a..59a0570a 100644 --- a/BBWY.Server.Model/Enums.cs +++ b/BBWY.Server.Model/Enums.cs @@ -9,7 +9,8 @@ { 淘宝 = 0, 京东 = 1, - 阿里巴巴 = 2 + 阿里巴巴 = 2, + 拼多多 = 3 } ///