pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
1c087eaa70
commit
73f7f5c145
2 changed files with 43 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 90
      BBWY.Client/Views/PackTask/ServiceWindow.xaml

2
BBWY.Client/GlobalContext.cs
View File

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

90
BBWY.Client/Views/PackTask/ServiceWindow.xaml
View File

@ -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="Vertical" Name="printArea" Width="1065" Height="800">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@ -520,68 +520,60 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition MinWidth="100"/> <ColumnDefinition MinWidth="100"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding ItemList}" <Grid >
Style="{StaticResource NoScrollViewListBoxStyle}" <Grid.ColumnDefinitions>
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" > <ColumnDefinition Width="90"/>
<ListBox.ItemTemplate> <ColumnDefinition/>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}"> </Grid.ColumnDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/> <!--{Binding Logo}-->
<ColumnDefinition/> <c:BAsyncImage UrlSource="{Binding ItemList[0].Logo}"
</Grid.ColumnDefinitions>
<!--{Binding Logo}-->
<c:BAsyncImage UrlSource="{Binding Logo}"
Width="80" DecodePixelWidth="80" Width="80" DecodePixelWidth="80"
VerticalAlignment="Top" Margin="11,9,0,10" VerticalAlignment="Top" Margin="11,9,0,10"
Cursor="Hand"> Cursor="Hand">
<b:Interaction.Triggers> <b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown"> <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"> <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
<b:InvokeCommandAction.CommandParameter> <b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}"> <MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="DataContext.Id" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/> <Binding Path="DataContext.Id" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}"/>
<Binding Path="Id"/> <Binding Path="Id"/>
</MultiBinding> </MultiBinding>
</b:InvokeCommandAction.CommandParameter> </b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction> </b:InvokeCommandAction>
</b:EventTrigger> </b:EventTrigger>
</b:Interaction.Triggers> </b:Interaction.Triggers>
</c:BAsyncImage> </c:BAsyncImage>
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,12,0,10"> <StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,10,0,10">
<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap"> <TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap">
<TextBlock.ToolTip> <TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}"> <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding SkuName}"/> <TextBlock Text="{Binding ItemList[0].SkuName}"/>
</ToolTip> </ToolTip>
</TextBlock.ToolTip> </TextBlock.ToolTip>
<Run Text="SKU名称:"/> <Run Text="SKU名称:"/>
<Run Text="{Binding SkuName}"/> <Run Text="{Binding ItemList[0].SkuName}"/>
</TextBlock> </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="品名:"/>
<Run Text="{Binding BrandName}"/> <Run Text="{Binding ItemList[0].BrandName}"/>
</TextBlock> </TextBlock>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Text="店铺:"/> <TextBlock Text="店铺:"/>
<c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding ShopName}" CommandParameter="{Binding ShopName}"
Margin=" 5,0,7,0"/> Margin=" 5,0,7,0"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<Grid Grid.Column="1" > <Grid Grid.Column="1" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">

Write Preview
Loading…
Cancel
Save