Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder
This commit is contained in:
commit
dc136e449e
14 files changed
+350
-144
No files matched your search
@@ -691,7 +691,8 @@
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent"
|
||||
Foreground="#FFEE0099"
|
||||
Header="异常需重拍"
|
||||
d:Header="异常需重拍"
|
||||
Header="{Binding AbnormalTabTxt}"
|
||||
SizeChanged="TabItem_SizeChanged" />
|
||||
<TabItem
|
||||
MinWidth="60"
|
||||
@@ -877,7 +878,8 @@
|
||||
Background="#FF6666"
|
||||
BorderBrush="Transparent"
|
||||
Foreground="#FF2222"
|
||||
Header="需处理售后单"
|
||||
d:Header="需处理售后单"
|
||||
Header="{Binding EmergencyManualReturnOrderTabTxt}"
|
||||
SizeChanged="TabItem_SizeChanged">
|
||||
<Border
|
||||
Margin="4,0,4,4"
|
||||
@@ -1155,7 +1157,8 @@
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent"
|
||||
Foreground="#FF7744"
|
||||
Header="退货仓自动售后单"
|
||||
d:Header="退货仓自动售后单"
|
||||
Header="{Binding EmergencyDistribReturnOrderTabTxt}"
|
||||
SizeChanged="TabItem_SizeChanged">
|
||||
<Border
|
||||
Margin="4,0,4,4"
|
||||
@@ -1290,7 +1293,8 @@
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent"
|
||||
Foreground="#FFaa77"
|
||||
Header="售后完成单"
|
||||
d:Header="售后完成单"
|
||||
Header="{Binding RefundTabTxt}"
|
||||
SizeChanged="TabItem_SizeChanged">
|
||||
<Border
|
||||
Margin="4,0,4,4"
|
||||
@@ -1380,7 +1384,8 @@
|
||||
MinWidth="60"
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent"
|
||||
Header="全部订单"
|
||||
d:Header="全部订单"
|
||||
Header="{Binding AllOrderTabTxt}"
|
||||
SizeChanged="TabItem_SizeChanged" />
|
||||
<!--<TabItem Header="发货异常">
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
@@ -1496,7 +1501,7 @@
|
||||
ScrollViewer.CanContentScroll="True"
|
||||
VirtualizingPanel.ScrollUnit="Pixel"
|
||||
VirtualizingStackPanel.IsVirtualizing="True"
|
||||
VirtualizingStackPanel.VirtualizationMode="Recycling">
|
||||
><!--VirtualizingStackPanel.VirtualizationMode="Recycling"-->
|
||||
<!-- 使用自定义属性模板去除ListBox高亮显示框 -->
|
||||
<ListBox.ItemContainerStyle>
|
||||
<Style TargetType="ListBoxItem">
|
||||
|
||||
Reference in new issue
Block a user