diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml index ee3c0e3..128f3ae 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml @@ -58,7 +58,7 @@ VerticalAlignment="Center" BorderBrush="{StaticResource mainColorBrush}" Checked="chkAutoReadBuyerOrder_CheckedChanged" - Content="自动读买手单" + Content="自动读多多买手单" FontSize="12" IsChecked="true" Unchecked="chkAutoReadBuyerOrder_CheckedChanged" /> diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs index 4834ac3..70bb0b1 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs @@ -2802,12 +2802,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls private void btnHideAll_Click(object sender, RoutedEventArgs e) { - if (MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility != Visibility.Visible) - MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility = Visibility.Visible; - if (Panel.GetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl) < 1) - Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, 1); + if (MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility != Visibility.Visible) + MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility = Visibility.Visible; + if (Panel.GetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl) < 1) + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, 1); else - Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, -1); + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1); } private void CheckBox_Click(object sender, RoutedEventArgs e) diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs index 06ba8fd..b2c2b25 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs @@ -153,16 +153,29 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls { if (wpPddBuyer.Visibility == Visibility.Visible) { - if (MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility != Visibility.Visible) - MainWindow.Instance.gridPddBuyerOrderReadCtrl.Visibility = Visibility.Visible; - if (Panel.GetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl) < 1) - Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, 1); + if (MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility != Visibility.Visible) + MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility = Visibility.Visible; + if (Panel.GetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl) < 1) + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, 1); else - Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, -1); + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1); + MainWindow.Instance.pddBuyerOrderReadCtrl.Visibility = Visibility.Visible; + MainWindow.Instance.tbBuyerOrderReadCtrl.Visibility = Visibility.Collapsed; + } + else if (wpTaobaoBuyer.Visibility == Visibility.Visible) + { + if (MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility != Visibility.Visible) + MainWindow.Instance.gridTbBuyerOrderReadCtrl.Visibility = Visibility.Visible; + if (Panel.GetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl) < 1) + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, 1); + else + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1); + MainWindow.Instance.pddBuyerOrderReadCtrl.Visibility = Visibility.Collapsed; + MainWindow.Instance.tbBuyerOrderReadCtrl.Visibility = Visibility.Visible; } else { - Panel.SetZIndex(MainWindow.Instance.gridPddBuyerOrderReadCtrl, -1); + Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1); } } diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml index cc849b9..c13a90e 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml @@ -139,12 +139,12 @@ - +