From 7b73426e263954d1ed767da12a64becb0229a88f Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 12 Jul 2022 02:24:44 +0800
Subject: [PATCH] 1

---
 BBWY.Client/APIServices/OrderService.cs       |  6 ++++--
 .../ViewModels/Order/OrderListViewModel.cs    |  3 ++-
 BBWY.Client/Views/Order/OrderList.xaml        | 21 +++++++++++++------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/BBWY.Client/APIServices/OrderService.cs b/BBWY.Client/APIServices/OrderService.cs
index 93a9657a..c8d32fea 100644
--- a/BBWY.Client/APIServices/OrderService.cs
+++ b/BBWY.Client/APIServices/OrderService.cs
@@ -28,7 +28,8 @@ namespace BBWY.Client.APIServices
                                                            long shopId,
                                                            bool onlyDF,
                                                            bool excludeSD,
-                                                           bool excludeCanceled)
+                                                           bool excludeCanceled,
+                                                           bool isContainsAfterSaleOrder)
         {
             return SendRequest<OrderListResponse>(globalContext.BBYWApiHost, "api/order/getOrderList", new
             {
@@ -45,7 +46,8 @@ namespace BBWY.Client.APIServices
                 contactName,
                 onlyDF,
                 excludeSD,
-                excludeCanceled
+                excludeCanceled,
+                isContainsAfterSaleOrder
             }, null, HttpMethod.Post);
         }
 
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 18007d72..af63fac3 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -256,7 +256,8 @@ namespace BBWY.Client.ViewModels
                                                      globalContext.User.Shop.ShopId,
                                                      OnlyDF,
                                                      ExcludeSD,
-                                                     ExcludeCanceled);
+                                                     ExcludeCanceled,
+                                                     IncludeAfterOrder);
             if (!response.Success)
             {
                 IsLoading = false;
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 301fe020..27cc13ef 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -277,8 +277,10 @@
                     <TextBlock Text="采购信息" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="成本信息" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="利润信息" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock x:Name="txtwuliu" Text="物流信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock x:Name="txtshouhou" Text="售后信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock x:Name="txtwuliu" Text="物流信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"
+                               Visibility="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}"/>
+                    <TextBlock x:Name="txtshouhou" Text="售后信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"
+                               Visibility="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"/>
                     <TextBlock Text="订单状态" Grid.Column="6"  Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="备注信息" Grid.Column="7"  Style="{StaticResource middleTextBlock}"/>
 
@@ -712,10 +714,8 @@
                                 </StackPanel>
 
 
-                                <Grid Grid.Column="5">
-                                    <StackPanel 
-                                            VerticalAlignment="Center"
-                                            HorizontalAlignment="Center">
+                                <Grid x:Name="sp_store" Grid.Column="5">
+                                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
                                         <TextBlock x:Name="txt_storeName" 
                                                Text="{Binding StoreName}" 
                                                TextWrapping="Wrap"
@@ -742,6 +742,10 @@
                                         Visibility="{Binding Visibility,ElementName=btn_outStore}"/>
                                 </Grid>
 
+                                <ListBox x:Name="listbox_afterSaleOrder" Grid.Column="5"
+                                         Visibility="Collapsed">
+
+                                </ListBox>
 
                                 <TextBlock Text="{Binding OrderState}" Grid.Column="6"
                                            HorizontalAlignment="Center"
@@ -826,6 +830,11 @@
                                     <Setter TargetName="btn_outStore" Property="Visibility" Value="Visible"/>
                                 </MultiDataTrigger.Setters>
                             </MultiDataTrigger>
+                            <DataTrigger Binding="{Binding DataContext.IncludeAfterOrder,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
+                                         Value="True">
+                                <Setter TargetName="sp_store" Property="Visibility" Value="Collapsed"/>
+                                <Setter TargetName="listbox_afterSaleOrder" Property="Visibility" Value="Visible"/>
+                            </DataTrigger>
                         </DataTemplate.Triggers>
                     </DataTemplate>
                 </ListBox.ItemTemplate>