From f7c1d7967bc9c67c26336ada3b118a9cc6968c2e Mon Sep 17 00:00:00 2001 From: chfei Date: Mon, 5 Oct 2026 13:48:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=BE=E7=BD=AE=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 29WxOrderWpf/Ctrls/Settings/SettingsView.xaml.cs | 4 +--- 29WxOrderWpf/StartUp.cs | 7 ++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml.cs b/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml.cs index df5200a..36b30c5 100644 --- a/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml.cs +++ b/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml.cs @@ -35,9 +35,7 @@ public partial class SettingsView : Window } private void SettingsView_Loaded(object sender, RoutedEventArgs e) { - var setting = NaiBa.Util.Helper.ConfigHelper.LoadConfig(SettingViewModel.SettingFileName); - if (setting == null) setting = new SettingConfig(); - vm.Assign(setting); + vm.Assign(BaseClass.Setting); } private void SettingsView_Closed(object sender, EventArgs e) { diff --git a/29WxOrderWpf/StartUp.cs b/29WxOrderWpf/StartUp.cs index 6cb9175..808957c 100644 --- a/29WxOrderWpf/StartUp.cs +++ b/29WxOrderWpf/StartUp.cs @@ -1,4 +1,5 @@ -using AllBase; +using _29WxOrderWpf.ViewModels; +using AllBase; using AllBase.DouYinModel.Param.ConfigManage; using AllBase.Helper; using AllBase.Model.Config; @@ -34,6 +35,10 @@ namespace _29WxOrderWpf if (GlobalConfig.AutoBuyConfig == null) GlobalConfig.AutoBuyConfig = new AutoBuyConfig() { AlipayPassword = alipayPassword, IsLimitMinProfit = false, MinProfit = 0 }; + + BaseClass.Setting = NaiBa.Util.Helper.ConfigHelper.LoadConfig(SettingViewModel.SettingFileName); + if (BaseClass.Setting==null) BaseClass.Setting = new SettingConfig(); + new WxOrder.Framework.Startup(); }