diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index 4ac76b6..52e3a27 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -7,6 +7,7 @@
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
+ xmlns:wpf="WPFCommon"
d:Background="White"
d:DesignHeight="220"
d:DesignWidth="1300"
@@ -16,6 +17,14 @@
+
+
+
@@ -32,8 +41,8 @@
-
-
+
+
@@ -75,8 +84,11 @@
MouseEnter="imgOrderItem_MouseEnter"
MouseLeave="imgOrderItem_MouseLeave" />
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Text="{Binding sku_attr_str}"
+ TextWrapping="Wrap"
+ WaterMark="规格" />
+
+
+
-
-
+
-
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Orientation="Vertical"
+ VerticalSpacing="2">
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Text="{Binding RealPriceStr}"
+ TextWrapping="Wrap"
+ WaterMark="售价" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Orientation="Vertical"
+ VerticalSpacing="2">
+
+
-
+
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
-
+ Title="采购时间："
+ Foreground="{Binding OutOrderTimeQualifiedBrush}">
-
-
+
-
+
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
+
-
-
-
-
-
+
+
+
-
+ Text="{Binding ItemOrder.out_account}"
+ TextWrapping="Wrap"
+ WaterMark="外采买手：" />
+
+
+
+
+
-
-
+
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Visibility="{Binding ElementName=txtDirectBuyerOrderNo, Path=Text, Converter={StaticResource HasTextVisibility}}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
ItemTransitOrderWithVoid.created_time.Date.AddHours(1.5))
return timeStr + " ×";
return timeStr + " √";