From 942ca54dd878e50ef8a29f81a4465d29672b72e1 Mon Sep 17 00:00:00 2001 From: wule_5900x Date: Sun, 8 Nov 2026 14:41:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B9=81=E4=BD=93=E5=9C=B0=E5=9D=80=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9D=83=E9=99=90=E6=89=8D=E5=8F=AF=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 29WxOrderWpf/Ctrls/Settings/SettingsView.xaml | 2 +- 29WxOrderWpf/ViewModels/SettingViewModel.cs | 7 +++++++ AllBase/Model/Config/SettingConfig.cs | 6 +++++- Work/UserLogin.cs | 9 +++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml b/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml index d17cb6c..f59891c 100644 --- a/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml +++ b/29WxOrderWpf/Ctrls/Settings/SettingsView.xaml @@ -25,7 +25,7 @@ - + diff --git a/29WxOrderWpf/ViewModels/SettingViewModel.cs b/29WxOrderWpf/ViewModels/SettingViewModel.cs index f3dcc91..da40bb6 100644 --- a/29WxOrderWpf/ViewModels/SettingViewModel.cs +++ b/29WxOrderWpf/ViewModels/SettingViewModel.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows; using WPFCommon.Models; namespace _29WxOrderWpf.ViewModels; @@ -36,11 +37,17 @@ public class SettingViewModel : BindableBaseEx get => GetValue(); set => SetValue(value); } + public Visibility ShowEnablePddTransitTraditionalAddress + { + get => GetValue(); + set => SetValue(value); + } public void Assign(SettingConfig config) { AutoSwitchGiftType = config.AutoSwitchGiftType; SwitchEnableDirectBuy = config.SwitchEnableDirectBuy; SwitchEnablePddTransitTraditionalAddress = config.SwitchEnablePddTransitTraditionalAddress; + ShowEnablePddTransitTraditionalAddress = config.ShowEnablePddTransitTraditionalAddress ? Visibility.Visible : Visibility.Collapsed; } public SettingConfig ToConfig() { diff --git a/AllBase/Model/Config/SettingConfig.cs b/AllBase/Model/Config/SettingConfig.cs index 8d688eb..f918a3d 100644 --- a/AllBase/Model/Config/SettingConfig.cs +++ b/AllBase/Model/Config/SettingConfig.cs @@ -24,6 +24,10 @@ public class SettingConfig /// /// 拼多多仓库订单使用随机繁体字 /// - public bool SwitchEnablePddTransitTraditionalAddress { get; set; } = false; + public bool SwitchEnablePddTransitTraditionalAddress { get; set; } = false; + /// + /// 是否显示使用随机繁体字配置(不显示则不可使用繁体字) + /// + public bool ShowEnablePddTransitTraditionalAddress { get; set; } = false; #endregion } diff --git a/Work/UserLogin.cs b/Work/UserLogin.cs index 3df5ee4..e2c5f37 100644 --- a/Work/UserLogin.cs +++ b/Work/UserLogin.cs @@ -126,6 +126,15 @@ namespace Work BaseClass.ParentUserName = BaseRegex.GetStringJson(ref html, "parent_user_name"); BaseClass.SaLevel = BaseRegex.GetIntJson(ref html, "sa_level").ParseToInt(); BaseClass.UserAuthority = BaseRegex.GetStringJson(ref html, "authority").ParseToString(); + + if (BaseClass.UserAuthority != null && BaseClass.UserAuthority.Contains("繁体地址")) + BaseClass.Setting.ShowEnablePddTransitTraditionalAddress = true; + else + { + BaseClass.Setting.ShowEnablePddTransitTraditionalAddress = false; + BaseClass.Setting.SwitchEnablePddTransitTraditionalAddress = false; + } + BaseClass.ParentAuthority = BaseRegex.GetStringJson(ref html, "parent_authority").ParseToString(); BaseClass.ForbiddenPage = BaseRegex.GetStringJson(ref html, "forbidden_page").ParseToString(); BaseClass.Mobile = BaseRegex.GetStringJson(ref html, "mobile");