From 73f7f5c1456d3d6debb5dce012f6e18f51f577dc Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Sun, 2 Jul 2023 15:10:04 +0800
Subject: [PATCH] 1

---
 BBWY.Client/GlobalContext.cs                  |  2 +-
 BBWY.Client/Views/PackTask/ServiceWindow.xaml | 92 +++++++++----------
 2 files changed, 43 insertions(+), 51 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 0feab96c..8c9ecfa7 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10140";
+            ClientVersion = "10141";
         }
 
         private User user;
diff --git a/BBWY.Client/Views/PackTask/ServiceWindow.xaml b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
index d288ce9d..c6c1b3af 100644
--- a/BBWY.Client/Views/PackTask/ServiceWindow.xaml
+++ b/BBWY.Client/Views/PackTask/ServiceWindow.xaml
@@ -421,7 +421,7 @@
 
 
 
-        <Grid Grid.Row="1" Grid.Column="1"  Visibility="Hidden">
+        <Grid Grid.Row="1" Grid.Column="1"  Visibility="Visible">
             <StackPanel Orientation="Vertical" Name="printArea"  Width="1065" Height="800">
 
                 <StackPanel Orientation="Horizontal">
@@ -520,68 +520,60 @@
                                             <ColumnDefinition Width="60"/>
                                             <ColumnDefinition MinWidth="100"/>
                                         </Grid.ColumnDefinitions>
-                                        <ListBox x:Name="listbox_orerSku"   ItemsSource="{Binding ItemList}"
-                                         Style="{StaticResource NoScrollViewListBoxStyle}"
-                                         ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  >
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="90"/>
-                                                            <ColumnDefinition/>
-                                                 
-                                                        </Grid.ColumnDefinitions>
-
-                                                        <!--{Binding Logo}-->
-                                                        <c:BAsyncImage UrlSource="{Binding Logo}"
+                                        <Grid >
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="90"/>
+                                                <ColumnDefinition/>
+
+                                            </Grid.ColumnDefinitions>
+
+                                            <!--{Binding Logo}-->
+                                            <c:BAsyncImage UrlSource="{Binding ItemList[0].Logo}"
                                                            Width="80" DecodePixelWidth="80"
                                                            VerticalAlignment="Top" Margin="11,9,0,10"
                                                            Cursor="Hand">
-                                                            <b:Interaction.Triggers>
-                                                                <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
-                                                                    <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
-                                                                        <b:InvokeCommandAction.CommandParameter>
-                                                                            <MultiBinding Converter="{StaticResource mptConverter}">
-                                                                                <Binding Path="DataContext.Id" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/>
-                                                                                <Binding Path="Id"/>
-                                                                            </MultiBinding>
-                                                                        </b:InvokeCommandAction.CommandParameter>
-                                                                    </b:InvokeCommandAction>
-                                                                </b:EventTrigger>
-                                                            </b:Interaction.Triggers>
-                                                        </c:BAsyncImage>
-
-                                                        <StackPanel   Grid.Column="1"  Orientation="Vertical" Margin="8,12,0,10">
-                                                            <TextBlock  Foreground="{StaticResource Text.Gray}"    TextWrapping="Wrap">
-                                                                <TextBlock.ToolTip>
-                                                                    <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
-                                                                        <TextBlock Text="{Binding SkuName}"/>
-                                                                    </ToolTip>
-                                                                </TextBlock.ToolTip>
+                                                <b:Interaction.Triggers>
+                                                    <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                        <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                                            <b:InvokeCommandAction.CommandParameter>
+                                                                <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                    <Binding Path="DataContext.Id" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/>
+                                                                    <Binding Path="Id"/>
+                                                                </MultiBinding>
+                                                            </b:InvokeCommandAction.CommandParameter>
+                                                        </b:InvokeCommandAction>
+                                                    </b:EventTrigger>
+                                                </b:Interaction.Triggers>
+                                            </c:BAsyncImage>
+
+                                            <StackPanel   Grid.Column="1"  Orientation="Vertical" Margin="8,10,0,10">
+                                                <TextBlock  Foreground="{StaticResource Text.Gray}"    TextWrapping="Wrap">
+                                                    <TextBlock.ToolTip>
+                                                        <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                            <TextBlock Text="{Binding ItemList[0].SkuName}"/>
+                                                        </ToolTip>
+                                                    </TextBlock.ToolTip>
                                                          <Run Text="SKU名称:"/>
-                                                         <Run Text="{Binding SkuName}"/>
+                                                         <Run Text="{Binding ItemList[0].SkuName}"/>
                                                     </TextBlock>
-                                                            <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,11">
+                                                <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,11">
                                                             <Run Text="品名:"/>
-                                                            <Run Text="{Binding BrandName}"/>
-                                                            </TextBlock>
+                                                            <Run Text="{Binding ItemList[0].BrandName}"/>
+                                                </TextBlock>
 
 
-                                                            <StackPanel Orientation="Horizontal">
-                                                                <TextBlock Text="店铺:"/>
-                                                                <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                                <StackPanel Orientation="Horizontal">
+                                                    <TextBlock Text="店铺:"/>
+                                                    <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
                                                                    CommandParameter="{Binding ShopName}"
                                                                    Margin=" 5,0,7,0"/>
 
-                                                            </StackPanel>
+                                                </StackPanel>
+
+                                            </StackPanel>
 
-                                                        </StackPanel>
-                                                       
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
+                                        </Grid>
 
                                         <Grid Grid.Column="1" >
                                             <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">