Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10155";
+            ClientVersion = "10156";
         }
 
         private User user;

BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs

@@ -757,7 +757,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     SuggestPackUserName = resData.SuggestPackUserName;
 
 
-                    TaskCount = resData.ProcessTaskCount;
+                    ProcessTaskCount = resData.ProcessTaskCount;
                     DirectionalSingleFees = resData.DirectionalSingleFees?.ToString();
                     if (resData.DirectionalSingleFees > 0)
                     {
@@ -788,6 +788,8 @@ namespace BBWY.Client.ViewModels.PackTask
                             foreach (var con in resData.ConsumableList)
                             {
                                 var condate = ConsumableServiceList.FirstOrDefault(c => c.ConsumableItem.IsNullOrEmpty() && c.ConsumableType == con.ConsumableTypeName);
+                                if (condate != null)
+
                                     App.Current.Dispatcher.Invoke(() =>
                                     {
                                         condate.ConsumablePrice = con.ConsumablePrice;