diff --git a/Form1.Designer.cs b/Form1.Designer.cs index c0fccbe..c683924 100644 --- a/Form1.Designer.cs +++ b/Form1.Designer.cs @@ -113,10 +113,10 @@ namespace Vmianqian buttonCollapse = new AntdUI.Button(); menu = new AntdUI.Menu(); contentHost = new System.Windows.Forms.Panel(); - pageAlipay = new System.Windows.Forms.Panel(); - pageWechat = new System.Windows.Forms.Panel(); pageHome = new System.Windows.Forms.Panel(); pageSettings = new System.Windows.Forms.Panel(); + pageAlipay = new System.Windows.Forms.Panel(); + pageWechat = new System.Windows.Forms.Panel(); homeSummaryCard.SuspendLayout(); homeConfigCard.SuspendLayout(); homeMemberCard.SuspendLayout(); @@ -134,10 +134,10 @@ namespace Vmianqian titlebar.SuspendLayout(); bottomBar.SuspendLayout(); contentHost.SuspendLayout(); - pageAlipay.SuspendLayout(); - pageWechat.SuspendLayout(); pageHome.SuspendLayout(); pageSettings.SuspendLayout(); + pageAlipay.SuspendLayout(); + pageWechat.SuspendLayout(); SuspendLayout(); // // homeSummaryCard @@ -948,31 +948,6 @@ namespace Vmianqian contentHost.Size = new Size(1008, 916); contentHost.TabIndex = 0; // - // pageAlipay - // - pageAlipay.AutoScroll = true; - pageAlipay.BackColor = Color.FromArgb(245, 247, 250); - pageAlipay.Controls.Add(alipayConfigCard); - pageAlipay.Controls.Add(alipayLogCard); - pageAlipay.Dock = DockStyle.Fill; - pageAlipay.Location = new Point(0, 0); - pageAlipay.Name = "pageAlipay"; - pageAlipay.Size = new Size(1008, 916); - pageAlipay.TabIndex = 1; - // - // pageWechat - // - pageWechat.AutoScroll = true; - pageWechat.BackColor = Color.FromArgb(245, 247, 250); - pageWechat.Controls.Add(wechatHookCard); - pageWechat.Controls.Add(wechatProtocolCard); - pageWechat.Controls.Add(wechatLogCard); - pageWechat.Dock = DockStyle.Fill; - pageWechat.Location = new Point(0, 0); - pageWechat.Name = "pageWechat"; - pageWechat.Size = new Size(1008, 916); - pageWechat.TabIndex = 2; - // // pageHome // pageHome.AutoScroll = true; @@ -1000,6 +975,31 @@ namespace Vmianqian pageSettings.Size = new Size(1008, 916); pageSettings.TabIndex = 0; // + // pageAlipay + // + pageAlipay.AutoScroll = true; + pageAlipay.BackColor = Color.FromArgb(245, 247, 250); + pageAlipay.Controls.Add(alipayConfigCard); + pageAlipay.Controls.Add(alipayLogCard); + pageAlipay.Dock = DockStyle.Fill; + pageAlipay.Location = new Point(0, 0); + pageAlipay.Name = "pageAlipay"; + pageAlipay.Size = new Size(1008, 916); + pageAlipay.TabIndex = 1; + // + // pageWechat + // + pageWechat.AutoScroll = true; + pageWechat.BackColor = Color.FromArgb(245, 247, 250); + pageWechat.Controls.Add(wechatHookCard); + pageWechat.Controls.Add(wechatProtocolCard); + pageWechat.Controls.Add(wechatLogCard); + pageWechat.Dock = DockStyle.Fill; + pageWechat.Location = new Point(0, 0); + pageWechat.Name = "pageWechat"; + pageWechat.Size = new Size(1008, 916); + pageWechat.TabIndex = 2; + // // Form1 // AutoScaleDimensions = new SizeF(7F, 17F); @@ -1040,10 +1040,10 @@ namespace Vmianqian titlebar.ResumeLayout(false); bottomBar.ResumeLayout(false); contentHost.ResumeLayout(false); - pageAlipay.ResumeLayout(false); - pageWechat.ResumeLayout(false); pageHome.ResumeLayout(false); pageSettings.ResumeLayout(false); + pageAlipay.ResumeLayout(false); + pageWechat.ResumeLayout(false); ResumeLayout(false); } diff --git a/bin/Debug/net10.0-windows/Vmianqian.dll b/bin/Debug/net10.0-windows/Vmianqian.dll index 5fa4331..ba907b0 100644 Binary files a/bin/Debug/net10.0-windows/Vmianqian.dll and b/bin/Debug/net10.0-windows/Vmianqian.dll differ diff --git a/bin/Debug/net10.0-windows/Vmianqian.exe b/bin/Debug/net10.0-windows/Vmianqian.exe index 1151703..4451148 100644 Binary files a/bin/Debug/net10.0-windows/Vmianqian.exe and b/bin/Debug/net10.0-windows/Vmianqian.exe differ diff --git a/bin/Debug/net10.0-windows/Vmianqian.pdb b/bin/Debug/net10.0-windows/Vmianqian.pdb index 8d87e78..a0d6914 100644 Binary files a/bin/Debug/net10.0-windows/Vmianqian.pdb and b/bin/Debug/net10.0-windows/Vmianqian.pdb differ diff --git a/obj/Debug/net10.0-windows/Vmianqian.AssemblyInfo.cs b/obj/Debug/net10.0-windows/Vmianqian.AssemblyInfo.cs index 0c923a3..1dc683b 100644 --- a/obj/Debug/net10.0-windows/Vmianqian.AssemblyInfo.cs +++ b/obj/Debug/net10.0-windows/Vmianqian.AssemblyInfo.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// This code was generated by a tool. // -// 对此文件的更改可能会导致不正确的行为,并且如果 -// 重新生成代码,这些更改将会丢失。 +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -14,12 +13,12 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Vmianqian")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a3d8595a50353d13747bd605c96fe35f2f9be2f3")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4cf9bb67de2f0045bfce5eba6a0132e5e6eed268")] [assembly: System.Reflection.AssemblyProductAttribute("Vmianqian")] [assembly: System.Reflection.AssemblyTitleAttribute("Vmianqian")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] [assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] -// Generated by the MSBuild WriteCodeFragment class. +// 由 MSBuild WriteCodeFragment 类生成。 diff --git a/obj/Debug/net10.0-windows/Vmianqian.AssemblyInfoInputs.cache b/obj/Debug/net10.0-windows/Vmianqian.AssemblyInfoInputs.cache index fb50780..ab881df 100644 --- a/obj/Debug/net10.0-windows/Vmianqian.AssemblyInfoInputs.cache +++ b/obj/Debug/net10.0-windows/Vmianqian.AssemblyInfoInputs.cache @@ -1 +1 @@ -b485efd0b4f1ef3ebf2f86472e1044cdcb234120ac1fadab6acbfeaad6c81be6 +145dcc92c0e221c03b00a4fb64fac367600cb39a2e7c265091ac9bb60ccf58c0 diff --git a/obj/Debug/net10.0-windows/Vmianqian.csproj.CoreCompileInputs.cache b/obj/Debug/net10.0-windows/Vmianqian.csproj.CoreCompileInputs.cache index 4df5d65..1ad1f25 100644 --- a/obj/Debug/net10.0-windows/Vmianqian.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net10.0-windows/Vmianqian.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -f5a7563dfce5232e1c5a9116ced46141bcc1701be44a9504f149a9339e3409e9 +42d38a7275d963e9940e89dd19bb6cb55b601c9c3bcf43ecf6ffc1df4b96ac27 diff --git a/obj/Debug/net10.0-windows/Vmianqian.csproj.GenerateResource.cache b/obj/Debug/net10.0-windows/Vmianqian.csproj.GenerateResource.cache index 3442b54..a654658 100644 Binary files a/obj/Debug/net10.0-windows/Vmianqian.csproj.GenerateResource.cache and b/obj/Debug/net10.0-windows/Vmianqian.csproj.GenerateResource.cache differ diff --git a/obj/Debug/net10.0-windows/Vmianqian.dll b/obj/Debug/net10.0-windows/Vmianqian.dll index 5fa4331..ba907b0 100644 Binary files a/obj/Debug/net10.0-windows/Vmianqian.dll and b/obj/Debug/net10.0-windows/Vmianqian.dll differ diff --git a/obj/Debug/net10.0-windows/Vmianqian.pdb b/obj/Debug/net10.0-windows/Vmianqian.pdb index 8d87e78..a0d6914 100644 Binary files a/obj/Debug/net10.0-windows/Vmianqian.pdb and b/obj/Debug/net10.0-windows/Vmianqian.pdb differ diff --git a/obj/Debug/net10.0-windows/apphost.exe b/obj/Debug/net10.0-windows/apphost.exe index 1151703..4451148 100644 Binary files a/obj/Debug/net10.0-windows/apphost.exe and b/obj/Debug/net10.0-windows/apphost.exe differ diff --git a/obj/Debug/net10.0-windows/ref/Vmianqian.dll b/obj/Debug/net10.0-windows/ref/Vmianqian.dll index 5dbbdfd..9fcdbde 100644 Binary files a/obj/Debug/net10.0-windows/ref/Vmianqian.dll and b/obj/Debug/net10.0-windows/ref/Vmianqian.dll differ diff --git a/obj/Debug/net10.0-windows/refint/Vmianqian.dll b/obj/Debug/net10.0-windows/refint/Vmianqian.dll index 5dbbdfd..9fcdbde 100644 Binary files a/obj/Debug/net10.0-windows/refint/Vmianqian.dll and b/obj/Debug/net10.0-windows/refint/Vmianqian.dll differ diff --git a/obj/Vmianqian.csproj.nuget.dgspec.json b/obj/Vmianqian.csproj.nuget.dgspec.json index 41c1bfb..fe67b93 100644 --- a/obj/Vmianqian.csproj.nuget.dgspec.json +++ b/obj/Vmianqian.csproj.nuget.dgspec.json @@ -30,8 +30,7 @@ "https://api.nuget.org/v3/index.json": {} }, "frameworks": { - "net10.0-windows": { - "framework": "net10.0-windows7.0", + "net10.0-windows7.0": { "targetAlias": "net10.0-windows", "projectReferences": {} } @@ -49,8 +48,7 @@ "SdkAnalysisLevel": "10.0.200" }, "frameworks": { - "net10.0-windows": { - "framework": "net10.0-windows7.0", + "net10.0-windows7.0": { "targetAlias": "net10.0-windows", "dependencies": { "AntdUI": { @@ -85,7 +83,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.202/PortableRuntimeIdentifierGraph.json", + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.203/PortableRuntimeIdentifierGraph.json", "packagesToPrune": { "Microsoft.CSharp": "(,4.7.32767]", "Microsoft.VisualBasic": "(,10.4.32767]", diff --git a/obj/project.assets.json b/obj/project.assets.json index 45f97e3..dc66fe4 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -383,7 +383,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.202/PortableRuntimeIdentifierGraph.json", + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.203/PortableRuntimeIdentifierGraph.json", "packagesToPrune": { "Microsoft.CSharp": "(,4.7.32767]", "Microsoft.VisualBasic": "(,10.4.32767]", diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index c2d8eec..1b261fc 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "IdXVTdj4e7A=", + "dgSpecHash": "YN2dWMlZUlg=", "success": true, "projectFilePath": "E:\\Demo\\C\\Vmianqian\\Vmianqian.csproj", "expectedPackageFiles": [