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

BBWY.Client/BBWYAppSettings.json

@@ -5,5 +5,5 @@
   "JOSApiHost": "",
   "1688ApiHost": "",
   "QKApiHost": "http://localhost:8080"
-  // "QKApiHost": "http://qiku.qiyue666.com"
+  //"QKApiHost": "http://qiku.qiyue666.com"
 }

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

@@ -116,10 +116,10 @@ namespace BBWY.Client.ViewModels.PackTask
             get => processTaskCount; set
             {
                 Set(ref processTaskCount, value);
-                if (PackProcessType == PackProcessType.推荐工序&& SelectProcessComboIdV2>0&& ProcessTaskCount>0)
-                    
+                if (PackProcessType == PackProcessType.推荐工序 && SelectProcessComboIdV2 > 0 && ProcessTaskCount > 0)
+
                     TotalPackFeesDetail(null, ProcessTaskCount, SelectProcessComboIdV2);
-                if (PackProcessType == PackProcessType.自定义工序&& !SelectProcessType.IsNullOrEmpty()&& ProcessTaskCount>0)
+                if (PackProcessType == PackProcessType.自定义工序 && !SelectProcessType.IsNullOrEmpty() && ProcessTaskCount > 0)
                     TotalPackFeesDetail(SelectProcessType, ProcessTaskCount, null);
             }
         }
@@ -317,7 +317,7 @@ namespace BBWY.Client.ViewModels.PackTask
         }
         private void TotalPackFeesDetail(string processType, int taskCount, long? processComboId)
         {
-           
+
 
             var discountRes = processService.GetDiscountFactory(processType, taskCount, processComboId);
             if (!discountRes.Success)
@@ -346,7 +346,7 @@ namespace BBWY.Client.ViewModels.PackTask
             }
             //统计打包费用
 
-     
+
         }
 
 
@@ -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,13 +788,15 @@ namespace BBWY.Client.ViewModels.PackTask
                             foreach (var con in resData.ConsumableList)
                             {
                                 var condate = ConsumableServiceList.FirstOrDefault(c => c.ConsumableItem.IsNullOrEmpty() && c.ConsumableType == con.ConsumableTypeName);
-                                App.Current.Dispatcher.Invoke(() =>
-                                {
-                                    condate.ConsumablePrice = con.ConsumablePrice;
-                                    condate.SelectId = con.ConsumableId;
-                                    condate.TaskCount = con.TaskCount;
+                                if (condate != null)
 
-                                });
+                                    App.Current.Dispatcher.Invoke(() =>
+                                    {
+                                        condate.ConsumablePrice = con.ConsumablePrice;
+                                        condate.SelectId = con.ConsumableId;
+                                        condate.TaskCount = con.TaskCount;
+
+                                    });
 
                             }
                         }