diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs
index aed39a7..93a24f0 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs
@@ -26,6 +26,7 @@ using Work;
 using Work._29Tools.BLL;
 using Work._29Tools.CefTools;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
+using static WPFCommon.Interop.InteropValues;
 
 namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 {
@@ -53,6 +54,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 		public ChromiumWebBrowser CefWebBrowser { get; private set; }
 		private BuyerLoginInfo buyer = null;
 		private oms_wei_order_item_info orderItem = null;
+		WXBuyMapSkusInfo buymapSkuInfo = null;
+		WXBuyMapInfo buyMapInfo = null;
 		private string currentUrl = "";
 		private volatile bool _isWindowLoaded = false;
 
@@ -79,6 +82,78 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 			set { this.SetValue(x => x.Address, value); }
 		}
 
+		/// <summary>拍单商品Id</summary>
+		public string txtBuyGoodsIdVal
+		{
+			get { return this.GetValue(x => x.txtBuyGoodsIdVal); }
+			set { this.SetValue(x => x.txtBuyGoodsIdVal, value); }
+		}
+		/// <summary>拍单商品Sku</summary>
+		public string txtBuySkuIdVal
+		{
+			get { return this.GetValue(x => x.txtBuySkuIdVal); }
+			set { this.SetValue(x => x.txtBuySkuIdVal, value); }
+		}
+		/// <summary>拍单商品名称</summary>
+		public string txtBuyGoodsNameVal
+		{
+			get { return this.GetValue(x => x.txtBuyGoodsNameVal); }
+			set { this.SetValue(x => x.txtBuyGoodsNameVal, value); }
+		}
+		/// <summary>拍单Sku名称</summary>
+		public string txtBuySkuNameVal
+		{
+			get { return this.GetValue(x => x.txtBuySkuNameVal); }
+			set { this.SetValue(x => x.txtBuySkuNameVal, value); }
+		}
+		/// <summary>拍单数量</summary>
+		public string txtBuyCntVal
+		{
+			get { return this.GetValue(x => x.txtBuyCntVal); }
+			set { this.SetValue(x => x.txtBuyCntVal, value); }
+		}
+		/// <summary>拍单总价格</summary>
+		public string txtBuyPriceVal
+		{
+			get { return this.GetValue(x => x.txtBuyPriceVal); }
+			set { this.SetValue(x => x.txtBuyPriceVal, value); }
+		}
+
+		/// <summary>关联商品名称</summary>
+		public string txtMapGoodsNameVal
+		{
+			get { return this.GetValue(x => x.txtMapGoodsNameVal); }
+			set { this.SetValue(x => x.txtMapGoodsNameVal, value); }
+		}
+		/// <summary>关联规格名称</summary>
+		public string txtMapSkuNameVal
+		{
+			get { return this.GetValue(x => x.txtMapSkuNameVal); }
+			set { this.SetValue(x => x.txtMapSkuNameVal, value); }
+		}
+		public string txtMapGoodsIdVal
+		{
+			get { return this.GetValue(x => x.txtMapGoodsIdVal); }
+			set { this.SetValue(x => x.txtMapGoodsIdVal, value); }
+		}
+		public string txtMapSkuIdVal
+		{
+			get { return this.GetValue(x => x.txtMapSkuIdVal); }
+			set { this.SetValue(x => x.txtMapSkuIdVal, value); }
+		}
+		/// <summary> 发货地 </summary>
+		public string txtSendProvinceVal
+		{
+			get { return this.GetValue(x => x.txtSendProvinceVal); }
+			set { this.SetValue(x => x.txtSendProvinceVal, value); }
+		}
+		/// <summary> 中转仓 </summary>
+		public string cmbTransitWarehouseVal
+		{
+			get { return this.GetValue(x => x.cmbTransitWarehouseVal); }
+			set { this.SetValue(x => x.cmbTransitWarehouseVal, value); }
+		}
+
 		#endregion
 
 		#region 命令
@@ -396,12 +471,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 
 						var pddFrontSkuInfo = new frontSkuInfo3()
 						{
+							skuId = key.ParseToLong(),
 							skuID = key.ParseToLong(),
 							goodsId = pddFrontGoods3.goodsId,
 							thumbUrl = thumbUrl,
 							quantity = tbSku2.quantity,
 							isOnsale = 1,
-							spec = taobaoSku?.propPath, // 淘宝在
+							spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异，包含冒号与父类型id
 							specs = pddSpecs,
 							price = tbSku2.price.priceMoney.ParseToInt() + 100,
 							normalPrice = ((tbSku2.price.priceMoney.ParseToInt() + 100) / 100m).ToString("F2"),
@@ -411,7 +487,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 						pddFrontGoods3.skus.Add(pddFrontSkuInfo);
 					}
 
-					WXBuyMapSkusInfo buymapSkuInfo = new WXBuyMapSkusInfo()
+					this.buymapSkuInfo = new WXBuyMapSkusInfo()
 					{
 						source_platform = "tb",
 						map_goods_id = BaseRegex.GetStringJson(ref loaderData, "itemId"),
@@ -419,6 +495,14 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 						map_url = "929536442189",
 						map_skus = JsonHelper.SerializeObject(pddFrontGoods3),
 					};
+
+					if (buyMapInfo == null)
+						buyMapInfo = new WXBuyMapInfo
+						{
+							map_spec_name = pddFrontGoods3.skus.FirstOrDefault()?.SpecNameStr, 
+							map_sku_id = pddFrontGoods3.skus.FirstOrDefault()?.skuID.ParseToString(),
+						};
+					SetBuyMapValues(buymapSkuInfo, buyMapInfo);
 				}
 			}
 
@@ -429,6 +513,56 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 			//}
 		}
 
+		private void SetBuyMapValues(WXBuyMapSkusInfo skuInfo, WXBuyMapInfo info)
+		{
+			//var data = taobaoResponseData;
+			//var goodsId = BaseRegex.GetLongJson(ref data, "goodsId");
+			//var skuId = BaseRegex.GetLongJson(ref data, "skuId");
+			//var goodsName = BaseRegex.GetStringJson(ref data, "goodsName");
+			//var spec = BaseRegex.GetStringJson(ref data, "spec");
+			//var oneGoodsPrice = BaseRegex.GetIntJson(ref data, "goodsPrice");
+			//var buyCnt = BaseRegex.GetIntJson(ref data, "goodsNumber");
+			//var buyPrice = BaseRegex.GetIntJson(ref data, "payAmount");
+			//if (buyPrice.IsNullOrZero())
+			//	buyPrice = BaseRegex.GetIntJson(ref data, "orderAmount");
+			//var orderSn = BaseRegex.GetIntJson(ref data, "orderSn");
+
+			if (skuInfo == null || info == null)
+				return;
+			var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
+			if (goods == null)
+				return;
+			var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id);
+			if (sku == null)
+				return;
+
+			var goodsId = skuInfo.map_goods_id;
+			var skuId = info.map_sku_id;
+			var goodsName = skuInfo.map_goods_name;
+			var spec = info.map_spec_name;
+			var oneGoodsPrice = sku.groupPrice.ParseToInt();
+			var buyCnt = orderItem.sku_cnt;
+			var buyPrice = oneGoodsPrice * buyCnt;
+			var orderSn = "";
+
+
+			// 自动填写关联信息界面
+			this.txtMapGoodsIdVal = goodsId.ParseToString();
+			this.txtMapSkuIdVal = skuId.ParseToString();
+			this.txtMapGoodsNameVal = goodsName;
+			this.txtMapSkuNameVal = spec;
+			this.txtSendProvinceVal = "";
+			this.cmbTransitWarehouseVal = "";
+
+			// 自动填写拍单信息界面
+			if (!goodsId.IsNullOrZero()) this.txtBuyGoodsIdVal = goodsId.ParseToString();
+			if (!skuId.IsNullOrZero()) this.txtBuySkuIdVal = skuId.ParseToString();
+			if (!goodsName.IsNullOrEmpty()) this.txtBuyGoodsNameVal = goodsName;
+			if (!spec.IsNullOrEmpty()) this.txtBuySkuNameVal = spec;
+			if (!buyCnt.IsNullOrZero()) this.txtBuyCntVal = buyCnt.ParseToString();
+			if (!buyPrice.IsNullOrZero()) this.txtBuyPriceVal = (buyPrice * 0.01m).ParseToString();
+		}
+
 		private void StopButton()
 		{
 		}
diff --git a/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml b/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml
index 20af15a..69205cb 100644
--- a/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml
+++ b/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml
@@ -1,41 +1,41 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="mainColorBrush" Color="#FF98638f" />
-    <SolidColorBrush x:Key="mainColorLightBrush" Color="#f5ebff" />
-    <SolidColorBrush x:Key="mainColorDarkBrush" Color="#FF6b5393" />
-    <SolidColorBrush x:Key="mainForegroundColorBrush" Color="#FF666666" />
-    <LinearGradientBrush x:Key="mainLinearColorBrush" StartPoint="0,0" EndPoint="1,0">
-        <GradientStop Offset="0.0" Color="#FF98638f" />
-        <GradientStop Offset="1.0" Color="#FF6b5393" />
-    </LinearGradientBrush>
-    <SolidColorBrush x:Key="pageColorBrush" Color="#FF98638f" />
-    <SolidColorBrush x:Key="pageColorLightBrush" Color="#f5ebff" />
-    <SolidColorBrush x:Key="pageColorDarkBrush" Color="#FF6b5393" />
+	<SolidColorBrush x:Key="mainColorBrush" Color="#FF98638f" />
+	<SolidColorBrush x:Key="mainColorLightBrush" Color="#f5ebff" />
+	<SolidColorBrush x:Key="mainColorDarkBrush" Color="#FF6b5393" />
+	<SolidColorBrush x:Key="mainForegroundColorBrush" Color="#FF666666" />
+	<LinearGradientBrush x:Key="mainLinearColorBrush" StartPoint="0,0" EndPoint="1,0">
+		<GradientStop Offset="0.0" Color="#FF98638f" />
+		<GradientStop Offset="1.0" Color="#FF6b5393" />
+	</LinearGradientBrush>
+	<SolidColorBrush x:Key="pageColorBrush" Color="#FF98638f" />
+	<SolidColorBrush x:Key="pageColorLightBrush" Color="#f5ebff" />
+	<SolidColorBrush x:Key="pageColorDarkBrush" Color="#FF6b5393" />
 
-    <SolidColorBrush x:Key="ListCtrlBackColorBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListHeadBackColorBrush" Color="#FFf8f8f9" />
-    <SolidColorBrush x:Key="ListHeadBorderColorBrush" Color="#FFe9e9ea" />
-    <SolidColorBrush x:Key="ListBackColorBrush" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListRowTitleBackColorBrush" Color="#FFf5f7fa" />
-    <SolidColorBrush x:Key="ListRowBorderColorBrush" Color="#FFf8f8f9" />
-    <SolidColorBrush x:Key="ListRowHoverBackColorBrush" Color="#FFf5f7fa" />
+	<SolidColorBrush x:Key="ListCtrlBackColorBrush" Color="#FFFFFFFF" />
+	<SolidColorBrush x:Key="ListHeadBackColorBrush" Color="#FFf8f8f9" />
+	<SolidColorBrush x:Key="ListHeadBorderColorBrush" Color="#FFe9e9ea" />
+	<SolidColorBrush x:Key="ListBackColorBrush" Color="#FFFFFFFF" />
+	<SolidColorBrush x:Key="ListRowTitleBackColorBrush" Color="#FFf5f7fa" />
+	<SolidColorBrush x:Key="ListRowBorderColorBrush" Color="#FFf8f8f9" />
+	<SolidColorBrush x:Key="ListRowHoverBackColorBrush" Color="#FFf5f7fa" />
 
-    <SolidColorBrush x:Key="HorizontalGridLinesBrush" Color="#FFf5f7fa" />
-    <SolidColorBrush x:Key="VerticalGridLinesBrush" Color="#FFFFFFFF" />
+	<SolidColorBrush x:Key="HorizontalGridLinesBrush" Color="#FFf5f7fa" />
+	<SolidColorBrush x:Key="VerticalGridLinesBrush" Color="#FFFFFFFF" />
 
-    <SolidColorBrush x:Key="PageOkBrush" Color="#FF67c23a" />
-    <SolidColorBrush x:Key="PageOkBrush50" Color="#5067c23a" />
-    <SolidColorBrush x:Key="PageWarningBrush" Color="#FFfa4733" />
-    <SolidColorBrush x:Key="PageWarningBrushCC" Color="#CCfa4733" />
-    <SolidColorBrush x:Key="PageWarningBrush80" Color="#80fa4733" />
-    <SolidColorBrush x:Key="PageWarningBrush50" Color="#50fa4733" />
-    <SolidColorBrush x:Key="PageWarningBrush20" Color="#20fa4733" />
-    <SolidColorBrush x:Key="PageLinkBrush" Color="#409eff" />
+	<SolidColorBrush x:Key="PageOkBrush" Color="#FF67c23a" />
+	<SolidColorBrush x:Key="PageOkBrush50" Color="#5067c23a" />
+	<SolidColorBrush x:Key="PageWarningBrush" Color="#FFfa4733" />
+	<SolidColorBrush x:Key="PageWarningBrushCC" Color="#CCfa4733" />
+	<SolidColorBrush x:Key="PageWarningBrush80" Color="#80fa4733" />
+	<SolidColorBrush x:Key="PageWarningBrush50" Color="#50fa4733" />
+	<SolidColorBrush x:Key="PageWarningBrush20" Color="#20fa4733" />
+	<SolidColorBrush x:Key="PageLinkBrush" Color="#409eff" />
 
 
-    <SolidColorBrush x:Key="FlagGrayBrush" Color="#ffaaaaaa" />
-    <SolidColorBrush x:Key="FlagRedBrush" Color="#FFfa4733" />
-    <SolidColorBrush x:Key="FlagOrangeBrush" Color="#FFfab533" />
-    <SolidColorBrush x:Key="FlagGreenBrush" Color="#FF67c23a" />
-    <SolidColorBrush x:Key="FlagBlueBrush" Color="#409eff" />
-    <SolidColorBrush x:Key="FlagPurpleBrush" Color="#FFc883bf" />
+	<SolidColorBrush x:Key="FlagGrayBrush" Color="#ffaaaaaa" />
+	<SolidColorBrush x:Key="FlagRedBrush" Color="#FFfa4733" />
+	<SolidColorBrush x:Key="FlagOrangeBrush" Color="#FFfab533" />
+	<SolidColorBrush x:Key="FlagGreenBrush" Color="#FF67c23a" />
+	<SolidColorBrush x:Key="FlagBlueBrush" Color="#409eff" />
+	<SolidColorBrush x:Key="FlagPurpleBrush" Color="#FFc883bf" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml b/29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml
index a4d9aff..f00dcb7 100644
--- a/29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml
+++ b/29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml
@@ -1,21 +1,37 @@
-<UserControl x:Class="_29WxOrderWpf.UserControls.UcWaterMarkTextBox"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:_29WxOrderWpf.UserControls"
-             mc:Ignorable="d" 
-             d:DesignHeight="28" d:DesignWidth="100">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <local:WaterMarkVisibilityConverter x:Key="WaterMarkVisibility"/>
-        </ResourceDictionary>
-    </UserControl.Resources>
-    <Grid>
-        <TextBox x:Name="txt" Text="{Binding Text, Mode=TwoWay}" Style="{StaticResource BaseRoundCornerTextBoxStyle}" BorderBrush="{StaticResource pageColorBrush}"
-                 BorderThickness="{Binding TextBorderThickness}"
-                 HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Center" TextWrapping="{Binding TextWrapping}" TextChanged="txt_TextChanged"/>
-        <TextBlock x:Name="tbWaterMark" Text="{Binding WaterMark}" Margin="4,0,4,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="DarkGray" 
-                   Visibility="{Binding ElementName=txt,Path=Text,Converter={StaticResource WaterMarkVisibility}}"></TextBlock>
-    </Grid>
+<UserControl
+	x:Class="_29WxOrderWpf.UserControls.UcWaterMarkTextBox"
+	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.UserControls"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	d:DesignHeight="28"
+	d:DesignWidth="100"
+	mc:Ignorable="d">
+	<UserControl.Resources>
+		<ResourceDictionary>
+			<local:WaterMarkVisibilityConverter x:Key="WaterMarkVisibility" />
+		</ResourceDictionary>
+	</UserControl.Resources>
+	<Grid>
+		<TextBox
+			x:Name="txt"
+			HorizontalAlignment="Stretch"
+			VerticalAlignment="Stretch"
+			VerticalContentAlignment="Center"
+			BorderBrush="{StaticResource pageColorBrush}"
+			BorderThickness="{Binding TextBorderThickness}"
+			Style="{StaticResource BaseRoundCornerTextBoxStyle}"
+			Text="{Binding Text, Mode=TwoWay}"
+			TextChanged="txt_TextChanged"
+			TextWrapping="{Binding TextWrapping}" />
+		<TextBlock
+			x:Name="tbWaterMark"
+			Margin="4,0,4,0"
+			VerticalAlignment="Center"
+			Foreground="DarkGray"
+			IsHitTestVisible="False"
+			Text="{Binding WaterMark}"
+			Visibility="{Binding ElementName=txt, Path=Text, Converter={StaticResource WaterMarkVisibility}}" />
+	</Grid>
 </UserControl>
diff --git a/29WxOrderWpf/UserControls/UcWindowBoxes.xaml b/29WxOrderWpf/UserControls/UcWindowBoxes.xaml
index 7076337..f096691 100644
--- a/29WxOrderWpf/UserControls/UcWindowBoxes.xaml
+++ b/29WxOrderWpf/UserControls/UcWindowBoxes.xaml
@@ -1,55 +1,99 @@
-<UserControl x:Class="_29WxOrderWpf.UserControls.UcWindowBoxes"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:_29WxOrderWpf.UserControls"
-             mc:Ignorable="d" Width="Auto" Height="Auto"
-             d:DesignHeight="30" d:DesignWidth="60" Background="Transparent" Loaded="WindowBoxes_Loaded">
-    <Grid Background="Transparent">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"></ColumnDefinition>
-            <ColumnDefinition Width="Auto"></ColumnDefinition>
-            <ColumnDefinition Width="Auto"></ColumnDefinition>
-            <ColumnDefinition Width="Auto"></ColumnDefinition>
-        </Grid.ColumnDefinitions>
+<UserControl
+	x:Class="_29WxOrderWpf.UserControls.UcWindowBoxes"
+	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.UserControls"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	Width="Auto"
+	Height="Auto"
+	d:DesignHeight="30"
+	d:DesignWidth="60"
+	Background="Transparent"
+	Loaded="WindowBoxes_Loaded"
+	mc:Ignorable="d">
+	<Grid Background="Transparent">
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition Width="Auto" />
+		</Grid.ColumnDefinitions>
 
-        <!--<Border Background="{StaticResource imgBrushCloseHover}" Width="17" Height="17" Margin="4">
+		<!--<Border Background="{StaticResource imgBrushCloseHover}" Width="17" Height="17" Margin="4">
         </Border>
         <Border Grid.Column="1" Width="17" Height="17" Margin="4">
             <Image Source="{StaticResource imgCloseHover}"/>
         </Border>-->
 
-        <!--不使用静态资源，在用户控件嵌套时，会发生预览错误-->
-        <local:UcImageButton x:Name="btnMin" Grid.Column="0" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4"
-                             ButtonImage="{StaticResource imgMin}" MouseOverButtonImage="{StaticResource imgMinHover}" MousePressButtonImage="{StaticResource imgMinHover}"/>
-        <local:UcImageButton x:Name="btnMax" Grid.Column="1" Width="17" Height="17" Background="Transparent" BorderThickness="0" Visibility="Collapsed" Margin="4"
-                             ButtonImage="{StaticResource imgMax}" MouseOverButtonImage="{StaticResource imgMaxHover}" MousePressButtonImage="{StaticResource imgMaxHover}"/>
-        <local:UcImageButton x:Name="btnNormal" Grid.Column="2" Width="17" Height="17" Background="Transparent" BorderThickness="0" Visibility="Collapsed" Margin="4"
-                             ButtonImage="{StaticResource imgNormal}" MouseOverButtonImage="{StaticResource imgNormalHover}" MousePressButtonImage="{StaticResource imgNormalHover}"/>
-        <local:UcImageButton x:Name="btnClose" Grid.Column="3" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4"
-                             ButtonImage="{StaticResource imgClose}" MouseOverButtonImage="{StaticResource imgCloseHover}" MousePressButtonImage="{StaticResource imgCloseHover}"/>
+		<!--  不使用静态资源，在用户控件嵌套时，会发生预览错误  -->
+		<local:UcImageButton
+			x:Name="btnMin"
+			Grid.Column="0"
+			Width="17"
+			Height="17"
+			Margin="4"
+			Background="Transparent"
+			BorderThickness="0"
+			ButtonImage="{StaticResource imgMin}"
+			MouseOverButtonImage="{StaticResource imgMinHover}"
+			MousePressButtonImage="{StaticResource imgMinHover}" />
+		<local:UcImageButton
+			x:Name="btnMax"
+			Grid.Column="1"
+			Width="17"
+			Height="17"
+			Margin="4"
+			Background="Transparent"
+			BorderThickness="0"
+			ButtonImage="{StaticResource imgMax}"
+			MouseOverButtonImage="{StaticResource imgMaxHover}"
+			MousePressButtonImage="{StaticResource imgMaxHover}"
+			Visibility="Collapsed" />
+		<local:UcImageButton
+			x:Name="btnNormal"
+			Grid.Column="2"
+			Width="17"
+			Height="17"
+			Margin="4"
+			Background="Transparent"
+			BorderThickness="0"
+			ButtonImage="{StaticResource imgNormal}"
+			MouseOverButtonImage="{StaticResource imgNormalHover}"
+			MousePressButtonImage="{StaticResource imgNormalHover}"
+			Visibility="Collapsed" />
+		<local:UcImageButton
+			x:Name="btnClose"
+			Grid.Column="3"
+			Width="17"
+			Height="17"
+			Margin="4"
+			Background="Transparent"
+			BorderThickness="0"
+			ButtonImage="{StaticResource imgClose}"
+			MouseOverButtonImage="{StaticResource imgCloseHover}"
+			MousePressButtonImage="{StaticResource imgCloseHover}" />
 
 
-        <!--<local:UcImageButton x:Name="btnMin" Grid.Column="0" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4"
-                             ButtonImage="/Resources/WindowBoxes/min.png" 
+		<!--<local:UcImageButton x:Name="btnMin" Grid.Column="0" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4"
+                             ButtonImage="/Resources/WindowBoxes/min.png"
                              MouseOverButtonImage="/Resources/WindowBoxes/min.hover.png"
                              MousePressButtonImage="/Resources/WindowBoxes/min.hover.png" />
         <local:UcImageButton x:Name="btnMax" Grid.Column="1" Width="17" Height="17" Background="Transparent" BorderThickness="0" Visibility="Collapsed" Margin="4"
-                             ButtonImage="/Resources/WindowBoxes/max.png" 
+                             ButtonImage="/Resources/WindowBoxes/max.png"
                              MouseOverButtonImage="/Resources/WindowBoxes/max.hover.png"
                              MousePressButtonImage="/Resources/WindowBoxes/max.hover.png" />
         <local:UcImageButton x:Name="btnNormal" Grid.Column="2" Width="17" Height="17" Background="Transparent" BorderThickness="0" Visibility="Collapsed" Margin="4"
-                             ButtonImage="/Resources/WindowBoxes/normal.png" 
+                             ButtonImage="/Resources/WindowBoxes/normal.png"
                              MouseOverButtonImage="/Resources/WindowBoxes/normal.hover.png"
                              MousePressButtonImage="/Resources/WindowBoxes/normal.hover.png" />
         <local:UcImageButton x:Name="btnClose" Grid.Column="3" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4"
-                             ButtonImage="/Resources/WindowBoxes/close.png" 
+                             ButtonImage="/Resources/WindowBoxes/close.png"
                              MouseOverButtonImage="/Resources/WindowBoxes/close.hover.png"
                              MousePressButtonImage="/Resources/WindowBoxes/close.hover.png" />-->
-        
 
-        <!--<Button x:Name="btnMin" Grid.Column="0" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4">
+
+		<!--<Button x:Name="btnMin" Grid.Column="0" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4">
             <Border>
                 <Grid>
                     <Image Source="/Resources/WindowBoxes/min.png" Stretch="Uniform"/>
@@ -81,5 +125,5 @@
                 </Grid>
             </Border>
         </Button>-->
-    </Grid>
+	</Grid>
 </UserControl>