From 5906a1623faefc1232540607b80681e09258320b Mon Sep 17 00:00:00 2001 From: wule Date: Fri, 11 Sep 2026 18:53:38 +0800 Subject: [PATCH] =?UTF-8?q?1=E8=87=AA=E5=8A=A8=E6=8B=8D=E5=8D=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=88=E6=9A=82=E6=9C=AA=E5=BC=80=E6=94=BE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseWindows/BaseMsgWindow.xaml.cs | 26 +-- .../Ctrls/OrderCtrls/OrderListCtrl.xaml | 2 +- .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs | 10 +- 29WxOrderWpf/StartUp.cs | 5 +- .../Views/AutoBuyIntroductionView‌.xaml | 68 ++++-- .../Views/AutoBuyIntroductionView‌.xaml.cs | 37 +++- Work/Pinduoduo/DataOpenSSL.cs | 124 ++++++----- Work/_29Tools/Forms/PddMobileBuyOrderForm.cs | 200 +++++++++--------- 8 files changed, 287 insertions(+), 185 deletions(-) diff --git a/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs b/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs index 7061a44..528b65a 100644 --- a/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs +++ b/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs @@ -49,14 +49,14 @@ namespace _29WxOrderWpf.BaseWindows BaseMsgWindow msgBox = null; Window owner = window ?? MainWindow.Instance; - - owner.Dispatcher.Invoke(new Action(() => - { + //owner.Dispatcher.Invoke(() => + Application.Current.Dispatcher.Invoke(() => + { msgBox = CreateMsgForm(msg, title, wl); msgBox.imgTip.Source = Application.Current.Resources["imgBaseMsgInfo"] as ImageSource; - msgBox.Owner = owner; + //msgBox.Owner = owner; msgBox.ShowDialog(); - })); + }); return msgBox; } @@ -65,13 +65,14 @@ namespace _29WxOrderWpf.BaseWindows string title = string.IsNullOrEmpty(caption) ? "系统错误" : caption; BaseMsgWindow msgBox = null; Window owner = window ?? MainWindow.Instance; - owner.Dispatcher.Invoke(new Action(() => - { + //owner.Dispatcher.Invoke(() => + Application.Current.Dispatcher.Invoke(() => + { msgBox = CreateMsgForm(msg, title, wl); msgBox.imgTip.Source = Application.Current.Resources["imgBaseMsgErr"] as ImageSource; - msgBox.Owner = owner; + //msgBox.Owner = owner; msgBox.ShowDialog(); - })); + }); return msgBox; } @@ -81,8 +82,9 @@ namespace _29WxOrderWpf.BaseWindows BaseMsgWindow msgBox = null; Window owner = window ?? MainWindow.Instance; - owner.Dispatcher.Invoke(() => - { + //owner.Dispatcher.Invoke(() => + Application.Current.Dispatcher.Invoke(() => + { msgBox = new BaseMsgWindow { lblTitle = { Content = title }, @@ -94,7 +96,7 @@ namespace _29WxOrderWpf.BaseWindows msgBox.Width = (int)MsgWindowLevel.LARGE; msgBox.Height = 500; } - msgBox.Owner = owner; + //msgBox.Owner = owner; msgBox.ShowDialog(); }); return msgBox; diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml index 403bb8b..05a84c5 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml @@ -628,7 +628,7 @@ Padding="4,0" c:DebugVisibility.Enable="True" Click="btnAutoBuyIntroduction_Click" - Content="自动拍单说明" + Content="自动拍单设置说明" FontSize="12" Style="{StaticResource BasePageButtonLightStyle}" /> (); // 自动拍单支付宝密码 - GlobalConfig.AlipayPassword = ConfigHelper.LoadConfig("ali_pay_password"); + GlobalConfig.AlipayPassword = ConfigHelper.LoadConfig>("ali_pay_password")?.FirstOrDefault(); + if (GlobalConfig.AlipayPassword == null) + GlobalConfig.AlipayPassword = ""; new WxOrder.Framework.Startup(); } diff --git a/29WxOrderWpf/Views/AutoBuyIntroductionView‌.xaml b/29WxOrderWpf/Views/AutoBuyIntroductionView‌.xaml index 2ca3a45..8f9069f 100644 --- a/29WxOrderWpf/Views/AutoBuyIntroductionView‌.xaml +++ b/29WxOrderWpf/Views/AutoBuyIntroductionView‌.xaml @@ -2,6 +2,7 @@ x:Class="_29WxOrderWpf.Views.AutoBuyIntroductionView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:UserControls="clr-namespace:_29WxOrderWpf.UserControls" xmlns:comn="clr-namespace:_29WxOrderWpf.Common" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:_29WxOrderWpf.Views" @@ -16,47 +17,86 @@ Loaded="AutoBuyInstructionView_Loaded" mc:Ignorable="d"> - + + + +