diff --git a/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs b/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs
index 463c3bd..9e66e2b 100644
--- a/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs
+++ b/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs
@@ -122,6 +122,11 @@ namespace BBWYB.Client.Models
///
public bool IsPurchased { get; set; }
+ ///
+ /// 买家账号
+ ///
+ public string BuyerAccount { get; set; }
+
///
/// 收货人信息
///
diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
index a7af0b4..9c0c2d7 100644
--- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
+++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
@@ -113,15 +113,12 @@ namespace BBWYB.Client.ViewModels
var list = response.Data.Items.Map>();
App.Current.Dispatcher.Invoke(() =>
{
- foreach (var o in list)
+ foreach (var order in list)
{
- foreach (var order in list)
- {
- order.LocalConvert();
- OrderList.Add(order);
- }
- WeakReferenceMessenger.Default.Send(new Message_OrderListScrollToTop(null));
+ order.LocalConvert();
+ OrderList.Add(order);
}
+ WeakReferenceMessenger.Default.Send(new Message_OrderListScrollToTop(null));
});
}
diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml
index afcf1d2..a6e6e74 100644
--- a/BBWYB.Client/Views/Order/OrderList.xaml
+++ b/BBWYB.Client/Views/Order/OrderList.xaml
@@ -369,6 +369,10 @@
CommandParameter="{Binding Id}" Margin="5,0,0,0"/>
+
+
(dbOrder.Id).SetIf(updateOrderState, o => o.OrderState == orderState)
.SetIf(updateWaybillNo, o => o.WaybillNo, qtOrder.DeliveryResponse.WayBillNo)