From 1fde1363b36d384b53b481d6a489d19489dea1b8 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Sat, 27 May 2023 22:42:40 +0800
Subject: [PATCH] 1

---
 .../PackPurchaseTask/UpdatePurchaseTaskViewModel.cs  |  2 +-
 .../PackPurchaseTask/UpdatePurchaseTaskWindow.xaml   | 12 ++++++------
 BBWYB.Client/appsettings.json                        |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
index ffc8c47..9986715 100644
--- a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
+++ b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
@@ -690,7 +690,7 @@ namespace BBWYB.Client.ViewModels
             }
             if (IsNeedCertificateModel == Need.需要)
             {
-                var cerList = purchaseSkuList.Where(p => p.IsNeedCer).Select(p => p.CerDTO).Select(c => c.Id).Where(c => c > 0).ToList();
+                var cerList = purchaseSkuList.Where(p => p.IsNeedCer&&p.CerDTO!=null).Select(p => p.CerDTO).Select(c => c.Id).Where(c => c > 0).ToList();
                 if (purchaseSkuList.Count() <= 0 || cerList.Count <= 0)
                 {
                     new TipsWindow("请设置合格证模板").Show();
diff --git a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml
index 071e4ed..12c5fcc 100644
--- a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml
+++ b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml
@@ -127,9 +127,9 @@
                 </StackPanel>
                 <Grid Grid.Column="1">
                     <ListBox x:Name="listbox_order" HorizontalAlignment="Left"
-                     Height="155" Width="900"  Margin="0"  ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                             
-                             ScrollViewer.VerticalScrollBarVisibility="Hidden"
+                     Height="150" Width="900"  Margin="0"  ScrollViewer.HorizontalScrollBarVisibility="Visible"
+                            
+                             ScrollViewer.VerticalScrollBarVisibility="Visible"
                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
                      ItemsSource="{Binding PurchaseSkuList,Mode=TwoWay}"   
                      BorderBrush="{StaticResource Border.Brush}"
@@ -137,7 +137,7 @@
                      Foreground="{StaticResource Text.Color}">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" VerticalAlignment="Top" IsItemsHost="True"/>
+                                <StackPanel Orientation="Horizontal" VerticalAlignment="Top" />
                             </ItemsPanelTemplate>
                         </ListBox.ItemsPanel>
 
@@ -145,7 +145,7 @@
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <Grid  
-                              MinHeight="100">
+                              MinHeight="150">
                                     <StackPanel Orientation="Horizontal" VerticalAlignment="Top" >
                                         <c:BAsyncImage UrlSource="{Binding Logo}"  
                                                            Height="150"  Width="150" Stretch="Fill"
@@ -216,7 +216,7 @@
                                                            CommandParameter="{Binding }"
                         Visibility="{Binding  IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=true:Visible:Collapsed }"/>-->
                                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" 
-                            Visibility="{Binding  IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=false:Visible:Collapsed }">
+                            >
                                                         <TextBlock Text="无需合格证"  Height="15"  Margin="5 0 0 0"
                                                              />
 
diff --git a/BBWYB.Client/appsettings.json b/BBWYB.Client/appsettings.json
index 06f7aa8..a5bfcc3 100644
--- a/BBWYB.Client/appsettings.json
+++ b/BBWYB.Client/appsettings.json
@@ -3,7 +3,7 @@
   "BBWYApiHost": "http://bbwyb.qiyue666.com",
   "MDSApiHost": "http://mdsapi.qiyue666.com",
   "BBWYCApiHost": "http://bbwytest.qiyue666.com",
-  //"QKApiHost": "http://localhost:8080"
-  "QKApiHost": "http://qiku.qiyue666.com"
+  "QKApiHost": "http://localhost:8080"
+  //"QKApiHost": "http://qiku.qiyue666.com"
 
 }
\ No newline at end of file