修改 主程序下的Comm文件夹 转到 Frameork中

This commit is contained in:
chfei committed 2026-10-17 18:16:55 +08:00
1 parent 2f9c98b105
commit 1eb5315261
78 files changed
+274 -227

No files matched your search

@@ -2,7 +2,7 @@
x:Class="_29WxOrderWpf.Ctrls.BuyerCtrls.PDDBuyerSelectCtrl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:c="clr-namespace:_29WxOrderWpf.Common"
xmlns:c="WxOrder.Framework"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -1,5 +1,4 @@
using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.Common;
using _29WxOrderWpf.Ctrls.OrderCtrls;
using _29WxOrderWpf.ViewModels;
using _29WxOrderWpf.Views;
@@ -25,6 +24,7 @@ using System.Windows.Shapes;
using TemuKJD.ToolForms;
using Work;
using Work.BaseForms;
using WxOrder.Framework.Commons;
namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{
@@ -1,6 +1,6 @@
using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.CefHelper;
using _29WxOrderWpf.Commands;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.ViewModels;
using AllBase;
using AllBase.Helper;
@@ -31,7 +31,6 @@ using Work;
using Work._29Tools.BLL;
using Work._29Tools.CefTools;
using Work.BaseForms;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Helpers;
using static AllBase.DouYinModel.Result.DouOrderListInfo;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView;
@@ -1,6 +1,6 @@
using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.CefHelper;
using _29WxOrderWpf.Commands;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.ViewModels;
using AllBase;
using AllBase.Helper;
@@ -11,7 +11,7 @@ using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using TinyPinyin;
using WxOrder.Framework.Commons.pinyin;
namespace _29WxOrderWpf.Ctrls.Commons
{
@@ -1,13 +1,12 @@
using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.Commands;
using _29WxOrderWpf.Common;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Ctrls.PDDInvoice;
using _29WxOrderWpf.Ctrls.Statistics;
using _29WxOrderWpf.Services;
using AllBase.Helper;
using AllBase.Model.DBModel;
using NaiBa.Util.Extension;
using Prism.Services.Dialogs;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -16,6 +15,7 @@ using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
using Work._29Tools.BLL;
using WxOrder.Framework.Commons.Dialogs;
using static _29WxOrderWpf.Services.ShipGiftService;
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
@@ -2,7 +2,7 @@
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListCtrl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:c="clr-namespace:_29WxOrderWpf.Common"
xmlns:c="WxOrder.Framework"
xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
@@ -1,6 +1,6 @@
using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.Commands;
using _29WxOrderWpf.Common;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Ctrls.BuyerCtrls;
using _29WxOrderWpf.Ctrls.Statistics;
using _29WxOrderWpf.Services;
@@ -1,5 +1,5 @@
using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.Common;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Converters;
using _29WxOrderWpf.Ctrls.BuyerCtrls;
using _29WxOrderWpf.UserControls;
@@ -2,7 +2,7 @@
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTaskDialogView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:comn="clr-namespace:_29WxOrderWpf.Common"
xmlns:comn="WxOrder.Framework"
xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
@@ -1,4 +1,4 @@
using _29WxOrderWpf.Commands;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Services;
using AllBase.Model.MvvmBaseClasses;
using AllBase.Util;
@@ -1,7 +1,6 @@
using _29WxOrderWpf.Commands;
using _29WxOrderWpf.Common;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Ctrls.PDDInvoice.ViewModels;
using Prism.Services.Dialogs;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -17,6 +16,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using WPFCommon.Models;
using WxOrder.Framework.Commons.Dialogs;
using static Org.BouncyCastle.Math.EC.ECCurve;
namespace _29WxOrderWpf.Ctrls.PDDInvoice;
@@ -2,8 +2,8 @@
x:Class="_29WxOrderWpf.Ctrls.PDDInvoice.PDDInvoiceView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:comm="clr-namespace:_29WxOrderWpf.Common"
xmlns:common="clr-namespace:_29WxOrderWpf.Common"
xmlns:comm="WxOrder.Framework"
xmlns:common="WxOrder.Framework"
xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -1,5 +1,5 @@
using _29WxOrderWpf.CefHelper;
using _29WxOrderWpf.Commands;
using WxOrder.Framework.Commons;
using AllBase;
using CefSharp;
using CefSharp.Handler;
@@ -1,7 +1,7 @@
using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.CefHelper;
using _29WxOrderWpf.Commands;
using _29WxOrderWpf.Common;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Ctrls.Statistics;
using AllBase;
using AllBase.Helper;
@@ -11,11 +11,9 @@ using AllBase.Util;
using CefSharp;
using CefSharp.Handler;
using CefSharp.Wpf;
using MAX.Core.Helpers;
using NaiBa.Util.Extension;
using Newtonsoft.Json;
using NPOI.SS.Formula.Functions;
using Prism.Services.Dialogs;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -38,6 +36,8 @@ using Work.BaseForms;
using WPFCommon.Converters;
using WPFCommon.Helpers;
using WPFCommon.Models;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons.Dialogs;
using WxOrder.Framework.Helpers;
namespace _29WxOrderWpf.Ctrls.PDDInvoice.ViewModels;
@@ -2,7 +2,7 @@
x:Class="_29WxOrderWpf.Ctrls.Statistics.PeriodRevenueStatisticsView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:common="clr-namespace:_29WxOrderWpf.Common"
xmlns:common="WxOrder.Framework"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:stat="clr-namespace:_29WxOrderWpf.Ctrls.Statistics"
@@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:stat="clr-namespace:_29WxOrderWpf.Ctrls.Statistics"
xmlns:vm="clr-namespace:_29WxOrderWpf.Ctrls.Statistics.ViewModels"
xmlns:wpf="clr-namespace:_29WxOrderWpf.Common"
xmlns:wpf="WxOrder.Framework"
Width="1600"
d:Background="#F5F7FB"
d:DataContext="{d:DesignInstance Type=vm:ShopRevenueStatisticsViewModel,
@@ -2,7 +2,7 @@
x:Class="_29WxOrderWpf.Ctrls.Statistics.ShowOrderDialogView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:comn="clr-namespace:_29WxOrderWpf.Common"
xmlns:comn="WxOrder.Framework"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.Statistics"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -1,6 +1,5 @@
using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.Commands;
using _29WxOrderWpf.Common;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Ctrls.Statistics.Models;
using _29WxOrderWpf.Ctrls.Statistics.Services;
using _29WxOrderWpf.ToolCtrls;
@@ -1,5 +1,4 @@
using _29WxOrderWpf.Commands;
using _29WxOrderWpf.Common;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Ctrls.Statistics.Models;
using _29WxOrderWpf.Ctrls.Statistics.Services;
using AllBase.Model.MvvmBaseClasses;
@@ -10,6 +9,7 @@ using System.Linq;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
using WxOrder.Framework.Commons;
namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
{
@@ -1,5 +1,5 @@
using _29WxOrderWpf.Commands;
using _29WxOrderWpf.Common;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Ctrls.Statistics.Models;
using _29WxOrderWpf.Ctrls.Statistics.Services;
using AllBase.Model.MvvmBaseClasses;