继续优化读单

2026-10-19 13:23:50 +08:00
1 parent 3d86e986b0
commit bbac29ac78
@@ -688,11 +688,11 @@
 				</TabItem>
 				<TabItem
 					MinWidth="60"
+					d:Header="异常需重拍"
 					Background="Transparent"
 					BorderBrush="Transparent"
 					Foreground="#FFEE0099"
-					d:Header="异常需重拍"
-                    Header="{Binding AbnormalTabTxt}"
+					Header="{Binding AbnormalTabTxt}"
 					SizeChanged="TabItem_SizeChanged" />
 				<TabItem
 					MinWidth="60"
@@ -875,11 +875,11 @@
 				</TabItem>
 				<TabItem
 					MinWidth="60"
+					d:Header="需处理售后单"
 					Background="#FF6666"
 					BorderBrush="Transparent"
 					Foreground="#FF2222"
-					d:Header="需处理售后单"
-                    Header="{Binding EmergencyManualReturnOrderTabTxt}"
+					Header="{Binding EmergencyManualReturnOrderTabTxt}"
 					SizeChanged="TabItem_SizeChanged">
 					<Border
 						Margin="4,0,4,4"
@@ -1154,11 +1154,11 @@
 				</TabItem>
 				<TabItem
 					MinWidth="60"
+					d:Header="退货仓自动售后单"
 					Background="Transparent"
 					BorderBrush="Transparent"
 					Foreground="#FF7744"
-					d:Header="退货仓自动售后单"
-                    Header="{Binding EmergencyDistribReturnOrderTabTxt}"
+					Header="{Binding EmergencyDistribReturnOrderTabTxt}"
 					SizeChanged="TabItem_SizeChanged">
 					<Border
 						Margin="4,0,4,4"
@@ -1290,11 +1290,11 @@
 				</TabItem>
 				<TabItem
 					MinWidth="60"
+					d:Header="售后完成单"
 					Background="Transparent"
 					BorderBrush="Transparent"
 					Foreground="#FFaa77"
-					d:Header="售后完成单"
-                    Header="{Binding RefundTabTxt}"
+					Header="{Binding RefundTabTxt}"
 					SizeChanged="TabItem_SizeChanged">
 					<Border
 						Margin="4,0,4,4"
@@ -1382,10 +1382,10 @@
 				</TabItem>
 				<TabItem
 					MinWidth="60"
+					d:Header="全部订单"
 					Background="Transparent"
 					BorderBrush="Transparent"
-					d:Header="全部订单"
-                    Header="{Binding AllOrderTabTxt}"
+					Header="{Binding AllOrderTabTxt}"
 					SizeChanged="TabItem_SizeChanged" />
 				<!--<TabItem Header="发货异常">
                    <Grid Background="#FFE5E5E5"/>
@@ -1499,9 +1499,11 @@
 			HorizontalContentAlignment="Stretch"
 			BorderThickness="0"
 			ScrollViewer.CanContentScroll="True"
+			VirtualizingPanel.IsVirtualizingWhenGrouping="True"
 			VirtualizingPanel.ScrollUnit="Pixel"
 			VirtualizingStackPanel.IsVirtualizing="True"
-			><!--VirtualizingStackPanel.VirtualizationMode="Recycling"-->
+			VirtualizingStackPanel.VirtualizationMode="Recycling">
+			<!--  VirtualizingStackPanel.VirtualizationMode="Recycling"  -->
 			<!--  使用自定义属性模板去除ListBox高亮显示框  -->
 			<ListBox.ItemContainerStyle>
 				<Style TargetType="ListBoxItem">
@@ -344,7 +344,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			}));
 			int page = 0;
 			int totalPage = 1;
-			int pageSize = 50;
+			int pageSize = 200;

 			while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
 			{
@@ -753,6 +753,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order");
 			var data3 = UserLogin.GetSignaturex();
 			data3 += "&order_no=" + order_ids;
+			data3 += "&page_size=5000";
 			var html3 = GetHtml.PostUtf8(url3, data3);
 			if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
 				html3 = GetHtml.PostUtf8(url3, data3);
@@ -1544,8 +1545,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			//var orders1 = string.Join(",", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
 			var userOrderLst = GlobalConfig.lstOrder.Where(o => GlobalConfig.ShopLoginList.Any(s => s.ErpShopId.ParseToLong() == o.shop_id)).ToList();

-			TabItem tabItem = null;
-			List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
+			//TabItem tabItem = null;
+			//List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
 			{
 				var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count();
 				var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
@@ -1630,15 +1631,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					int n = 0;
 					foreach (var order in orderLstTmp)
 					{
-						if (n++ % 100 == 0)
-							Thread.Sleep(1);
+						//if (n++ % 10 == 0)
+						Thread.Sleep(1);

 						if (token.IsCancellationRequested)
 							break;

 						if (!GlobalConfig.lstFilterOrder.ToList().Any(o => o.order_id == order.order_id))
 						{
-							Dispatcher.Invoke(() => { GlobalConfig.lstFilterOrder.Add(order); });
+							Dispatcher.InvokeAsync(() => 
+							{ 
+								GlobalConfig.lstFilterOrder.Add(order); 
+							});
 						}
 					}
 				}
@@ -1682,7 +1686,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				var index = -1;
 				if (nextOrder != null)
                    index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
-				Dispatcher.Invoke(() =>
+				Dispatcher.InvokeAsync(() =>
 				{
 					if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
 					{
@@ -1693,6 +1697,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 						GlobalConfig.lstFilterOrder.Add(order);
 					}
 				});
+				Thread.Sleep(1);
 			}

 			if (updateTabCount)
@@ -43,8 +43,32 @@
 					<Grid.RowDefinitions>
 						<RowDefinition Height="6" />
 						<RowDefinition Height="auto" />
+						<RowDefinition Height="auto" />
+						<RowDefinition Height="auto" />
+						<RowDefinition Height="auto" />
+						<RowDefinition Height="auto" />
 						<RowDefinition Height="6" />
 					</Grid.RowDefinitions>
+					<local:OrderListRowItemCtrl
+						Grid.Row="1"
+						DataContext="{Binding orderItem}"
+						Visibility="{Binding OrderItemVisibility}" />
+					<!--<local:OrderListRowItemCtrl
+						Grid.Row="2"
+						DataContext="{Binding orderItem2}"
+						Visibility="{Binding OrderItemVisibility}" />
+					<local:OrderListRowItemCtrl
+						Grid.Row="3"
+						DataContext="{Binding orderItem2}"
+						Visibility="{Binding OrderItemVisibility}" />
+					<local:OrderListRowItemCtrl
+						Grid.Row="4"
+						DataContext="{Binding orderItem3}"
+						Visibility="{Binding OrderItemVisibility}" />
+					<local:OrderListRowItemCtrl
+						Grid.Row="5"
+						DataContext="{Binding orderItem4}"
+						Visibility="{Binding OrderItemVisibility}" />-->
 					<!--<ItemsControl Grid.Row="1" ItemsSource="{Binding orderItems}">
 						<ItemsControl.ItemTemplate>
                            <DataTemplate>
@@ -52,6 +76,19 @@
 							</DataTemplate>
 						</ItemsControl.ItemTemplate>
 					</ItemsControl>-->
+					<!--<ListBox
+						Grid.Row="1"
+						ItemsSource="{Binding orderItems}"
+						ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+						ScrollViewer.VerticalScrollBarVisibility="Disabled"
+						VirtualizingStackPanel.IsVirtualizing="True"
+						VirtualizingStackPanel.VirtualizationMode="Recycling">
+						<ListBox.ItemTemplate>
+							<DataTemplate>
+								<local:OrderListRowItemCtrl DataContext="{Binding}" />
+							</DataTemplate>
+						</ListBox.ItemTemplate>
+					</ListBox>-->
 					<!--<TextBlock Text="{Binding ProductName}" Margin="20,0,0,0"/>-->
 				</Grid>
 			</Border>
@@ -41,22 +41,22 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls

        private async void OrderListRowCtrl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
        {
-			await Task.Run(() => { Thread.Sleep(1); });
+			//await Task.Run(() => { Thread.Sleep(1); });

-			if (this.DataContext is oms_wei_order_info order)
-			{
-				int index = 0;
-				foreach (var orderItem in order.orderItems)
-				{
-					gridChildOrder.RowDefinitions.Insert(gridChildOrder.RowDefinitions.Count - 1, new RowDefinition() { Height = GridLength.Auto });
-					index++;
-					var rowItem = new OrderListRowItemCtrl() { DataContext = orderItem, Name = "rowItem" + index };
-					Grid.SetRow(rowItem, index);
-					this.gridChildOrder.Children.Add(rowItem);
-					if (index >= 5)
-						break;
-				}
-			}
+			//if (this.DataContext is oms_wei_order_info order)
+			//{
+			//	int index = 0;
+			//	foreach (var orderItem in order.orderItems)
+			//	{
+			//		gridChildOrder.RowDefinitions.Insert(gridChildOrder.RowDefinitions.Count - 1, new RowDefinition() { Height = GridLength.Auto });
+			//		index++;
+			//		var rowItem = new OrderListRowItemCtrl() { DataContext = orderItem, Name = "rowItem" + index };
+			//		Grid.SetRow(rowItem, index);
+			//		this.gridChildOrder.Children.Add(rowItem);
+			//		if (index >= 5)
+			//			break;
+			//	}
+			//}
 		}

        private void CheckBox_Click(object sender, RoutedEventArgs e)
@@ -1,86 +1,86 @@
 <UserControl
-    x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowHeaderCtrl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
-    d:DesignHeight="50"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
+	x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowHeaderCtrl"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
+	d:DesignHeight="50"
+	d:DesignWidth="800"
+	mc:Ignorable="d">

-    <Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="auto" />
-                <ColumnDefinition Width="20" />
-            </Grid.ColumnDefinitions>
-            <TextBox
-                Grid.Column="0"
-                Margin="8,8,-4,8"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                BorderThickness="0"
-                FontSize="20"
-                FontWeight="ExtraBold"
-                Foreground="{Binding OrderBuyTypeColor}"
-                IsReadOnly="True"
-                Text="{Binding OrderBuyType}"
-                Visibility="{Binding OrderBuyTypeVisibility}" />
-            <TextBox
-                Grid.Column="1"
-                Margin="8,8,-4,8"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                BorderThickness="0"
-                FontSize="14"
-                IsReadOnly="True"
-                Text="店铺单号：" />
-            <uc:UcWaterMarkTextBox1
-                x:Name="txtOrderId"
-                Grid.Column="2"
-                Margin="0,8,4,8"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                BorderThickness="0"
-                Cursor="Hand"
-                FontSize="14"
-                Foreground="{StaticResource PageLinkBrush}"
-                IsReadOnly="True"
-                Text="{Binding order_id}"
-                WaterMark="订单号" />
-            <Border
-                Grid.Column="3"
-                Width="12"
-                Height="12"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                Cursor="Hand"
-                MouseLeftButtonDown="Path_MouseLeftButtonDown"
-                Tag="{Binding order_id}">
-                <Path
-                    Margin="0,0,0,0"
-                    Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
-                    Fill="{StaticResource PageLinkBrush}"
-                    MouseLeftButtonDown="Path_MouseLeftButtonDown"
-                    Stretch="Uniform"
-                    Tag="{Binding order_id}" />
-            </Border>
+	<Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="*" />
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="auto" />
+				<ColumnDefinition Width="20" />
+			</Grid.ColumnDefinitions>
+			<TextBox
+				Grid.Column="0"
+				Margin="8,8,-4,8"
+				VerticalAlignment="Center"
+				Background="Transparent"
+				BorderThickness="0"
+				FontSize="20"
+				FontWeight="ExtraBold"
+				Foreground="{Binding OrderBuyTypeColor}"
+				IsReadOnly="True"
+				Text="{Binding OrderBuyType}"
+				Visibility="{Binding OrderBuyTypeVisibility}" />
+			<TextBox
+				Grid.Column="1"
+				Margin="8,8,-4,8"
+				VerticalAlignment="Center"
+				Background="Transparent"
+				BorderThickness="0"
+				FontSize="14"
+				IsReadOnly="True"
+				Text="店铺单号：" />
+			<uc:UcWaterMarkTextBox1
+				x:Name="txtOrderId"
+				Grid.Column="2"
+				Margin="0,8,4,8"
+				VerticalAlignment="Center"
+				Background="Transparent"
+				BorderThickness="0"
+				Cursor="Hand"
+				FontSize="14"
+				Foreground="{StaticResource PageLinkBrush}"
+				IsReadOnly="True"
+				Text="{Binding order_id}"
+				WaterMark="订单号" />
+			<Border
+				Grid.Column="3"
+				Width="12"
+				Height="12"
+				VerticalAlignment="Center"
+				Background="Transparent"
+				Cursor="Hand"
+				MouseLeftButtonDown="Path_MouseLeftButtonDown"
+				Tag="{Binding order_id}">
+				<Path
+					Margin="0,0,0,0"
+					Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
+					Fill="{StaticResource PageLinkBrush}"
+					MouseLeftButtonDown="Path_MouseLeftButtonDown"
+					Stretch="Uniform"
+					Tag="{Binding order_id}" />
+			</Border>

-            <!--<Border x:Name="borderDeadline" Grid.Column="3" Margin="8,0,0,0" Background="#e8fbf9" BorderBrush="#d0fbea" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2">
+			<!--<Border x:Name="borderDeadline" Grid.Column="3" Margin="8,0,0,0" Background="#e8fbf9" BorderBrush="#d0fbea" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2">
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition></ColumnDefinition>
@@ -94,169 +94,170 @@
                             Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
                </Grid>
            </Border>-->
-            <Border
-                x:Name="borderDeadline"
-                Grid.Column="4"
-                Height="24"
-                MinWidth="30"
-                Margin="8,0,0,0"
-                Background="{Binding StatusBoxBackColor}"
-                BorderBrush="{Binding StatusBoxBorderColor}"
-                BorderThickness="1"
-                CornerRadius="2">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <Border
-                        x:Name="borderDeadlineHead"
-                        Background="{Binding StatusBoxForeColor}"
-                        CornerRadius="2,0,10,2">
-                        <TextBox
-                            Grid.Column="0"
-                            MinWidth="20"
-                            Margin="2,0,2,1"
-                            VerticalAlignment="Center"
-                            VerticalContentAlignment="Center"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Foreground="White"
-                            IsReadOnly="True"
-                            Text="{Binding DeliveryDeadlineStatusStr}" />
-                    </Border>
-                    <TextBox
-                        x:Name="txtDeadline"
-                        Grid.Column="1"
-                        MinWidth="20"
-                        Margin="2,0,2,1"
-                        VerticalAlignment="Center"
-                        VerticalContentAlignment="Center"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        Foreground="{Binding StatusBoxForeColor}"
-                        IsReadOnly="True"
-                        Text="{Binding DeliveryDeadlineStr}" />
-                </Grid>
-            </Border>
+			<Border
+				x:Name="borderDeadline"
+				Grid.Column="4"
+				Height="24"
+				MinWidth="30"
+				Margin="8,0,0,0"
+				Background="{Binding StatusBoxBackColor}"
+				BorderBrush="{Binding StatusBoxBorderColor}"
+				BorderThickness="1"
+				CornerRadius="2">
+				<Grid>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition />
+					</Grid.ColumnDefinitions>
+					<Border
+						x:Name="borderDeadlineHead"
+						Background="{Binding StatusBoxForeColor}"
+						CornerRadius="2,0,10,2">
+						<TextBox
+							Grid.Column="0"
+							MinWidth="20"
+							Margin="2,0,2,1"
+							VerticalAlignment="Center"
+							VerticalContentAlignment="Center"
+							Background="Transparent"
+							BorderThickness="0"
+							Foreground="White"
+							IsReadOnly="True"
+							Text="{Binding DeliveryDeadlineStatusStr}" />
+					</Border>
+					<TextBox
+						x:Name="txtDeadline"
+						Grid.Column="1"
+						MinWidth="20"
+						Margin="2,0,2,1"
+						VerticalAlignment="Center"
+						VerticalContentAlignment="Center"
+						Background="Transparent"
+						BorderThickness="0"
+						Foreground="{Binding StatusBoxForeColor}"
+						IsReadOnly="True"
+						Text="{Binding DeliveryDeadlineStr}" />
+				</Grid>
+			</Border>


-            <Image
-                Grid.Column="5"
-                Width="24"
-                Height="24"
-                Margin="8,8,0,8"
-                Source="{StaticResource imgOrderWeishopIcon}" />
-            <uc:UcWaterMarkTextBox1
-                x:Name="txtShopLoginStatus"
-                Grid.Column="5"
-                Margin="0,12,-6,0"
-                Padding="0"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                Background="{StaticResource ListHeadBackColorBrush}"
-                BorderThickness="0"
-                FontSize="7"
-                FontWeight="Bold"
-                Foreground="{Binding Shop.LoginStatusStrColor}"
-                IsReadOnly="True"
-                Text="{Binding Shop.LoginStatusStr}"
-                WaterMark="店铺状态" />
-            <uc:UcWaterMarkTextBox1
-                x:Name="txtShopName"
-                Grid.Column="6"
-                Margin="4,8,4,8"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                BorderThickness="0"
-                Cursor="Hand"
-                FontSize="14"
-                Foreground="{StaticResource PageLinkBrush}"
-                IsReadOnly="True"
-                Text="{Binding shop_name}"
-                WaterMark="店铺名称" />
+			<Image
+				Grid.Column="5"
+				Width="24"
+				Height="24"
+				Margin="8,8,0,8"
+				Source="{StaticResource imgOrderWeishopIcon}" />
+			<uc:UcWaterMarkTextBox1
+				x:Name="txtShopLoginStatus"
+				Grid.Column="5"
+				Margin="0,12,-6,0"
+				Padding="0"
+				HorizontalAlignment="Right"
+				VerticalAlignment="Center"
+				Background="{StaticResource ListHeadBackColorBrush}"
+				BorderThickness="0"
+				FontSize="7"
+				FontWeight="Bold"
+				Foreground="{Binding Shop.LoginStatusStrColor}"
+				IsReadOnly="True"
+				Text="{Binding Shop.LoginStatusStr}"
+				WaterMark="店铺状态" />
+			<uc:UcWaterMarkTextBox1
+				x:Name="txtShopName"
+				Grid.Column="6"
+				Margin="4,8,4,8"
+				VerticalAlignment="Center"
+				Background="Transparent"
+				BorderThickness="0"
+				Cursor="Hand"
+				FontSize="14"
+				Foreground="{StaticResource PageLinkBrush}"
+				IsReadOnly="True"
+				Text="{Binding shop_name}"
+				WaterMark="店铺名称" />


-            <Border
-                Grid.Column="7"
-                Width="12"
-                Height="12"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                Cursor="Hand"
-                MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
-                Tag="{Binding order_id}">
-                <Path
-                    Margin="0,0,0,0"
-                    Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
-                    Fill="{StaticResource PageLinkBrush}"
-                    MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
-                    Stretch="Uniform"
-                    Tag="{Binding order_id}" />
-            </Border>
+			<Border
+				Grid.Column="7"
+				Width="12"
+				Height="12"
+				VerticalAlignment="Center"
+				Background="Transparent"
+				Cursor="Hand"
+				MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
+				Tag="{Binding order_id}">
+				<Path
+					Margin="0,0,0,0"
+					Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
+					Fill="{StaticResource PageLinkBrush}"
+					MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
+					Stretch="Uniform"
+					Tag="{Binding order_id}" />
+			</Border>


-            <uc:UcWaterMarkTextBox1
-                x:Name="txtCount"
-                Grid.Column="9"
-                Margin="8,8,0,8"
-                VerticalAlignment="Center"
-                d:Text="该订单共有 x 条不同商品记录"
-                Background="Transparent"
-                BorderThickness="0"
-                FontSize="14"
-                Foreground="Gray"
-                IsReadOnly="True"
-                WaterMark="该订单共有 1 条不同商品记录" />
+			<uc:UcWaterMarkTextBox1
+				x:Name="txtCount"
+				Grid.Column="9"
+				Margin="8,8,0,8"
+				VerticalAlignment="Center"
+				d:Text="该订单共有 x 条不同商品记录"
+				Background="Transparent"
+				BorderThickness="0"
+				FontSize="14"
+				Foreground="#FF8888"
+				IsReadOnly="True"
+				Text="{Binding OrderDiffItemCountStr}"
+				WaterMark="该订单共有 1 条不同商品记录" />

-            <TextBlock
-                Grid.Column="11"
-                Margin="10"
-                VerticalAlignment="Center"
-                d:Text="仅退款/退货退款"
-                Foreground="Gray"
-                Text="{Binding RefundTypeStr}" />
+			<TextBlock
+				Grid.Column="11"
+				Margin="10"
+				VerticalAlignment="Center"
+				d:Text="仅退款/退货退款"
+				Foreground="Gray"
+				Text="{Binding RefundTypeStr}" />

-            <Border
-                x:Name="borderFlag"
-                Grid.Column="12"
-                Width="auto"
-                Margin="2"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                Cursor="Hand"
-                MouseLeftButtonDown="borderFlag_MouseLeftButtonDown">
-                <!--<Path Margin="0,0,0,0" Fill="{StaticResource FlagGrayBrush}" Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" Stretch="Uniform" />-->
-                <WrapPanel VerticalAlignment="Center">
-                    <Button
-                        Width="60"
-                        Height="22"
-                        Margin="0,0,10,0"
-                        Click="btn_createOrderSupportTicket"
-                        Content="创建工单"
-                        Style="{StaticResource BasePageButtonStyle}" />
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        FontSize="12"
-                        Foreground="Gray"
-                        Text="隐藏标记" />
-                    <Path
-                        Width="15"
-                        Height="15"
-                        Margin="2,0,0,0"
-                        d:Fill="SkyBlue"
-                        Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z"
-                        Fill="{Binding ColourFlagBrush}"
-                        Stretch="Uniform" />
-                    <!--  ColourFlagBrush  -->
-                    <!--  Fill="{Binding colour_flag, Converter={StaticResource flagColorConverter}}"  -->
-                </WrapPanel>
-            </Border>
+			<Border
+				x:Name="borderFlag"
+				Grid.Column="12"
+				Width="auto"
+				Margin="2"
+				VerticalAlignment="Center"
+				Background="Transparent"
+				Cursor="Hand"
+				MouseLeftButtonDown="borderFlag_MouseLeftButtonDown">
+				<!--<Path Margin="0,0,0,0" Fill="{StaticResource FlagGrayBrush}" Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" Stretch="Uniform" />-->
+				<WrapPanel VerticalAlignment="Center">
+					<Button
+						Width="60"
+						Height="22"
+						Margin="0,0,10,0"
+						Click="btn_createOrderSupportTicket"
+						Content="创建工单"
+						Style="{StaticResource BasePageButtonStyle}" />
+					<TextBlock
+						VerticalAlignment="Center"
+						FontSize="12"
+						Foreground="Gray"
+						Text="隐藏标记" />
+					<Path
+						Width="15"
+						Height="15"
+						Margin="2,0,0,0"
+						d:Fill="SkyBlue"
+						Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z"
+						Fill="{Binding ColourFlagBrush}"
+						Stretch="Uniform" />
+					<!--  ColourFlagBrush  -->
+					<!--  Fill="{Binding colour_flag, Converter={StaticResource flagColorConverter}}"  -->
+				</WrapPanel>
+			</Border>


-            <!--<Border Grid.Column="11" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand">
+			<!--<Border Grid.Column="11" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand">
                <Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathShop_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
            </Border>-->
-        </Grid>
-    </Border>
+		</Grid>
+	</Border>
 </UserControl>
@@ -121,7 +121,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			{
 				if (order.orderItems.Count > 5)
 				{
-					txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品";
+					//txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品";
 				}
 			}
 		}
@@ -787,8 +787,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					// 异步加载图片防止卡顿
 					// 缩略图在有的电脑上无法显示
 					//BitmapImage bImg = ImageUrlToBitmapImageConverter.LoadImageFromUrl(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
-					//BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img, 100, 100);
-					BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img);
+					BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img, 100, 100);
+					//BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img);
 					Thread.Sleep(Randomx.GetId(1000));
 					Dispatcher.Invoke(new Action(() =>
 					{
@@ -30,6 +30,11 @@ namespace AllBase.Model.DBModel
 			get { return this.GetValue(x => x.Shop); }
 			set { this.SetValue(x => x.Shop, value); }
 		}
+		public string OrderDiffItemCountStr
+		{
+			get { return this.GetValue(x => x.OrderDiffItemCountStr); }
+			set { this.SetValue(x => x.OrderDiffItemCountStr, value); }
+		}

 		public string OrderBuyType
 		{
@@ -48,6 +53,31 @@ namespace AllBase.Model.DBModel
 		}

 		public ObservableCollection<oms_wei_order_item_info> orderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>();
+		public oms_wei_order_item_info orderItem
+		{
+			get { return this.GetValue(x => x.orderItem); }
+			set { this.SetValue(x => x.orderItem, value); }
+		}
+		public oms_wei_order_item_info orderItem2
+		{
+			get { return this.GetValue(x => x.orderItem2); }
+			set { this.SetValue(x => x.orderItem2, value); }
+		}
+		public oms_wei_order_item_info orderItem3
+		{
+			get { return this.GetValue(x => x.orderItem3); }
+			set { this.SetValue(x => x.orderItem3, value); }
+		}
+		public oms_wei_order_item_info orderItem4
+		{
+			get { return this.GetValue(x => x.orderItem4); }
+			set { this.SetValue(x => x.orderItem4, value); }
+		}
+		public oms_wei_order_item_info orderItem5
+		{
+			get { return this.GetValue(x => x.orderItem5); }
+			set { this.SetValue(x => x.orderItem5, value); }
+		}

 		public ObservableCollection<oms_wei_refund_info> refundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();

@@ -714,22 +744,22 @@ namespace AllBase.Model.DBModel
 			Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString());

 			if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
-            {
-                OrderBuyType = "云改直";
-                OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
-            }
-            else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
-            {
-                OrderBuyType = "直发";
-                OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
-            }
-            else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
-            {
-                OrderBuyType = "云仓";
-                OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
-            }
-            else
-                OrderBuyType = "";
+			{
+				OrderBuyType = "云改直";
+				OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
+			}
+			else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
+			{
+				OrderBuyType = "直发";
+				OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
+			}
+			else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
+			{
+				OrderBuyType = "云仓";
+				OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
+			}
+			else
+				OrderBuyType = "";

 			if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
 				this.RefundTypeStr = "仅退款";
@@ -744,7 +774,7 @@ namespace AllBase.Model.DBModel
 			IsRefund = GetIsRefund();
 			IsEmergency = GetIsEmergency();
 			IsDistribReturnOrder = GetIsDistribReturnOrder();
-			IsEmergencyDistribReturnOrder = IsEmergency && IsDistribReturnOrder; 
+			IsEmergencyDistribReturnOrder = IsEmergency && IsDistribReturnOrder;
 			IsEmergencyManualReturnOrder = IsEmergency && !IsDistribReturnOrder;
 			IsAbnormal = GetIsAbnormal();

@@ -762,8 +792,15 @@ namespace AllBase.Model.DBModel
 			SetDeliveryDeadlineStr();
 			SetStatusBoxColor();
 			SetOutExpressNo();
-            SetShipDoneTimeStr();
+			SetShipDoneTimeStr();
 			SetColorBrush();
+
+			orderItem = orderItems.FirstOrDefault() != null ? orderItems.FirstOrDefault() : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+			orderItem2 = orderItems.Count > 1 ? orderItems[1] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+			orderItem3 = orderItems.Count > 2 ? orderItems[2] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+			orderItem4 = orderItems.Count > 3 ? orderItems[3] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+			orderItem5 = orderItems.Count > 4 ? orderItems[4] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+			OrderDiffItemCountStr = orderItems.Count > 1 ? "该订单共有 " + orderItems.Count + " 个不同的商品规格" : "";
 		}

 		public void SetColorBrush()
@@ -27,13 +27,23 @@ namespace AllBase.Model.DBModel
        {
            get { return this.GetValue(x => x.Shop); }
            set { this.SetValue(x => x.Shop, value); }
-        }
+		}

-        #region 订单采购参数
-        /// <summary>
-        /// 采购关联
-        /// </summary>
-        public WXBuyMapInfo PddBuyMap
+		/// <summary>
+		/// 订单扩展信息
+		/// </summary>
+		public Visibility OrderItemVisibility
+		{
+			get { return this.GetValue(x => x.OrderItemVisibility); }
+			set { this.SetValue(x => x.OrderItemVisibility, value); }
+		}
+
+
+		#region 订单采购参数
+		/// <summary>
+		/// 采购关联
+		/// </summary>
+		public WXBuyMapInfo PddBuyMap
        {
            get { return this.GetValue(x => x.PddBuyMap); }
            set { this.SetValue(x => x.PddBuyMap, value); }
@@ -391,10 +401,10 @@ namespace AllBase.Model.DBModel
 			this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
 			this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
 			// 优先找非撤销买手退款单
-			this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && p.statusText == "退款成功") ??
-				                     PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && !p.statusText.Contains("申请已撤销"));
+			this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && p.statusText == "退款成功") ??
+				                     PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && !p.statusText.Contains("申请已撤销"));
 			if (PddBuyerAfterSale == null)
-				PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no);
+				PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no);

 			// 直接取号和更正取号显示的买手到仓库物流
 			if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
@@ -1125,7 +1135,13 @@ namespace AllBase.Model.DBModel
 		public string DirectRefundStatusStr
 		{
 			get { return this.GetValue(x => x.DirectRefundStatusStr); }
-			set { this.SetValue(x => x.DirectRefundStatusStr, value); DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+			set {
+				if (order_id == "3739897762013171200")
+				{
+
+				}
+				this.SetValue(x => x.DirectRefundStatusStr, value);
+				DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(DirectRefundStatusStr) ? Visibility.Collapsed : Visibility.Visible; }
 		}
 		public Visibility DirectRefundStatusStrVisibility
 		{