diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml index 490c18c..461d02c 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml @@ -18,14 +18,6 @@ - - - + + - + + + { + orderItem.UpdateOrderItemBuyButton(); + orderItem.SetAbnormalAndDirectBtnVisibility(); + }); } } } @@ -353,11 +368,28 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls //OrderListCtrl.InitOrderObservableProp(order); foreach (var orderItem in order.orderItems) { - orderItem.UpdateOrderItemBuyButton(); - orderItem.SetAbnormalAndDirectBtnVisibility(); + await Task.Run(() => + { + orderItem.UpdateOrderItemBuyButton(); + orderItem.SetAbnormalAndDirectBtnVisibility(); + }); } } } } + + private void imgTb_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) + { + 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); + + Panel.SetZIndex(MainWindow.Instance.tbBuyerOrderReadCtrl, buyZIndex++); + MainWindow.Instance.pddBuyerOrderReadCtrl.Visibility = Visibility.Visible; + MainWindow.Instance.tbBuyerOrderReadCtrl.Visibility = Visibility.Visible; + } } } diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs index a6003bd..8c5587b 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs @@ -270,22 +270,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls Thread.Sleep(1); Dispatcher.Invoke(new Action(() => { - if (cefShowShopOrderLstWebBrowser == null) - { - cefShowShopOrderLstWebBrowser = WPFCEFBrowser.CreateChromiumWebBrowser("about:blank", false); - LocalResourceRequestHandler resourceRequestHandler = new LocalResourceRequestHandler(); - resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete; - resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad; - cefShowShopOrderLstWebBrowser.RequestHandler = new LocalRequestHandler(resourceRequestHandler); - var lifeSapnHandler = new LocalLifeSpanHandler(PopWindowType.SelfWindow); - cefShowShopOrderLstWebBrowser.LifeSpanHandler = lifeSapnHandler; - cefShowShopOrderLstWebBrowser.KeyboardHandler = new CefKeyboardHandler(); - cefShowShopOrderLstWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd; - cefShowShopOrderLstWebBrowser.AddressChanged += CefWebBrowser_AddressChanged; - cefShowShopOrderLstWebBrowser.LoadError += CefWebBrowser_LoadError; - Grid.SetRow(cefShowShopOrderLstWebBrowser, 0); - this.GridCef.Children.Add(cefShowShopOrderLstWebBrowser); - } if (cefWebBrowser == null) { cefWebBrowser = WPFCEFBrowser.CreateChromiumWebBrowser("about:blank", false); @@ -305,6 +289,22 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls if (buyer.wpf_browser == null) buyer.wpf_browser = cefWebBrowser; + if (cefShowShopOrderLstWebBrowser == null) + { + cefShowShopOrderLstWebBrowser = WPFCEFBrowser.CreateChromiumWebBrowser("about:blank", false); + LocalResourceRequestHandler resourceRequestHandler = new LocalResourceRequestHandler(); + resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete; + resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad; + cefShowShopOrderLstWebBrowser.RequestHandler = new LocalRequestHandler(resourceRequestHandler); + var lifeSapnHandler = new LocalLifeSpanHandler(PopWindowType.SelfWindow); + cefShowShopOrderLstWebBrowser.LifeSpanHandler = lifeSapnHandler; + cefShowShopOrderLstWebBrowser.KeyboardHandler = new CefKeyboardHandler(); + cefShowShopOrderLstWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd; + cefShowShopOrderLstWebBrowser.AddressChanged += CefWebBrowser_AddressChanged; + cefShowShopOrderLstWebBrowser.LoadError += CefWebBrowser_LoadError; + Grid.SetRow(cefShowShopOrderLstWebBrowser, 0); + this.GridCef.Children.Add(cefShowShopOrderLstWebBrowser); + } })); } } @@ -2674,7 +2674,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls Panel.SetZIndex(MainWindow.Instance.gridTbBuyerOrderReadCtrl, -1); } - private void CheckBox_Click(object sender, RoutedEventArgs e) + private async void CheckBox_Click(object sender, RoutedEventArgs e) { if (sender is CheckBox chk) { @@ -2695,18 +2695,18 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls //t.Wait(); foreach (var cook in cookieLst) { - var t = WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", cefShowShopOrderLstWebBrowser.GetCookieManager(null)); - t.Wait(5000); + await WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", cefShowShopOrderLstWebBrowser.GetCookieManager(null)); } Panel.SetZIndex(this.cefShowShopOrderLstWebBrowser, maxZIndex++); + cefShowShopOrderLstWebBrowser.Load("https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm?"); } } } //if (e.Source) } - private void txtBuyerNick_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + private async void txtBuyerNick_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) { if (sender is TextBox txt) { @@ -2727,11 +2727,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls //t.Wait(); foreach (var cook in cookieLst) { - var t = WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", cefShowShopOrderLstWebBrowser.GetCookieManager(null)); - t.Wait(5000); + await WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", cefShowShopOrderLstWebBrowser.GetCookieManager(null)); } Panel.SetZIndex(this.cefShowShopOrderLstWebBrowser, maxZIndex++); + cefShowShopOrderLstWebBrowser.Load("https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm?"); } } }