diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj index 1b9514b..774c127 100644 --- a/AllBase/AllBase.csproj +++ b/AllBase/AllBase.csproj @@ -1,9 +1,8 @@  - - - - + + + Debug AnyCPU @@ -107,6 +106,15 @@ false + + ..\packages\CefSharp.Common.92.0.260\lib\net452\CefSharp.dll + + + ..\packages\CefSharp.Common.92.0.260\lib\net452\CefSharp.Core.dll + + + ..\packages\CefSharp.WinForms.92.0.260\lib\net452\CefSharp.WinForms.dll + ..\DllReference\DevComponents.DotNetBar2.dll @@ -188,7 +196,7 @@ - + @@ -232,15 +240,12 @@ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.Designer.cs new file mode 100644 index 0000000..9138e8f --- /dev/null +++ b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.Designer.cs @@ -0,0 +1,379 @@ +namespace TemuKJD.KJDForms.AdminForms +{ + partial class AdminShopLoginForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AdminShopLoginForm)); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.btnLoginAgain = new TemuKJD.UserControls.ButtonEx(); + this.pnlMultiLogin = new System.Windows.Forms.Panel(); + this.cmbMultiCookieName = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.btnMultiLogin = new DevComponents.DotNetBar.PanelEx(); + this.btnDel = new DevComponents.DotNetBar.PanelEx(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.btnCopyPassword = new TemuKJD.UserControls.ButtonEx(); + this.btnCopyUserName = new TemuKJD.UserControls.ButtonEx(); + this.txtPassWord = new System.Windows.Forms.TextBox(); + this.txtUserName = new System.Windows.Forms.TextBox(); + this.btnStop = new TemuKJD.UserControls.ButtonEx(); + this.btnReload = new TemuKJD.UserControls.ButtonEx(); + this.chkCloseAfterLogin = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.txtAddress = new System.Windows.Forms.TextBox(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.pnlMultiLogin.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White; + this.splitContainer1.Panel2.Controls.Add(this.btnLoginAgain); + this.splitContainer1.Panel2.Controls.Add(this.pnlMultiLogin); + this.splitContainer1.Panel2.Controls.Add(this.label2); + this.splitContainer1.Panel2.Controls.Add(this.label1); + this.splitContainer1.Panel2.Controls.Add(this.btnCopyPassword); + this.splitContainer1.Panel2.Controls.Add(this.btnCopyUserName); + this.splitContainer1.Panel2.Controls.Add(this.txtPassWord); + this.splitContainer1.Panel2.Controls.Add(this.txtUserName); + this.splitContainer1.Panel2.Controls.Add(this.btnStop); + this.splitContainer1.Panel2.Controls.Add(this.btnReload); + this.splitContainer1.Panel2.Controls.Add(this.chkCloseAfterLogin); + this.splitContainer1.Size = new System.Drawing.Size(1438, 736); + this.splitContainer1.SplitterDistance = 674; + this.splitContainer1.SplitterWidth = 3; + this.splitContainer1.TabIndex = 4; + // + // btnLoginAgain + // + this.btnLoginAgain.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnLoginAgain.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnLoginAgain.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnLoginAgain.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnLoginAgain.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnLoginAgain.ForeColor = System.Drawing.Color.White; + this.btnLoginAgain.Location = new System.Drawing.Point(1137, 31); + this.btnLoginAgain.Margin = new System.Windows.Forms.Padding(2); + this.btnLoginAgain.Name = "btnLoginAgain"; + this.btnLoginAgain.Size = new System.Drawing.Size(91, 25); + this.btnLoginAgain.TabIndex = 462; + this.btnLoginAgain.Text = "重新登录"; + this.btnLoginAgain.UseVisualStyleBackColor = false; + this.btnLoginAgain.Click += new System.EventHandler(this.btnLoginAgain_Click); + // + // pnlMultiLogin + // + this.pnlMultiLogin.Controls.Add(this.cmbMultiCookieName); + this.pnlMultiLogin.Controls.Add(this.btnMultiLogin); + this.pnlMultiLogin.Controls.Add(this.btnDel); + this.pnlMultiLogin.Location = new System.Drawing.Point(403, 1); + this.pnlMultiLogin.Name = "pnlMultiLogin"; + this.pnlMultiLogin.Size = new System.Drawing.Size(270, 33); + this.pnlMultiLogin.TabIndex = 461; + this.pnlMultiLogin.Visible = false; + // + // cmbMultiCookieName + // + this.cmbMultiCookieName.DisplayMember = "Text"; + this.cmbMultiCookieName.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cmbMultiCookieName.FormattingEnabled = true; + this.cmbMultiCookieName.ItemHeight = 18; + this.cmbMultiCookieName.Location = new System.Drawing.Point(3, 3); + this.cmbMultiCookieName.Name = "cmbMultiCookieName"; + this.cmbMultiCookieName.Size = new System.Drawing.Size(158, 24); + this.cmbMultiCookieName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cmbMultiCookieName.TabIndex = 379; + this.cmbMultiCookieName.Text = "cookie1"; + // + // btnMultiLogin + // + this.btnMultiLogin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnMultiLogin.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMultiLogin.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnMultiLogin.DisabledBackColor = System.Drawing.Color.Empty; + this.btnMultiLogin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnMultiLogin.Location = new System.Drawing.Point(186, 3); + this.btnMultiLogin.Name = "btnMultiLogin"; + this.btnMultiLogin.Size = new System.Drawing.Size(60, 24); + this.btnMultiLogin.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnMultiLogin.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnMultiLogin.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnMultiLogin.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnMultiLogin.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnMultiLogin.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnMultiLogin.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnMultiLogin.Style.GradientAngle = 90; + this.btnMultiLogin.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnMultiLogin.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnMultiLogin.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnMultiLogin.TabIndex = 460; + this.btnMultiLogin.Text = "多重登录"; + this.btnMultiLogin.Click += new System.EventHandler(this.btnMultiLogin_Click); + // + // btnDel + // + this.btnDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnDel.CanvasColor = System.Drawing.SystemColors.Control; + this.btnDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnDel.Location = new System.Drawing.Point(161, 3); + this.btnDel.Name = "btnDel"; + this.btnDel.Size = new System.Drawing.Size(20, 24); + this.btnDel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnDel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnDel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnDel.Style.GradientAngle = 90; + this.btnDel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnDel.TabIndex = 409; + this.btnDel.Text = "删"; + this.btnDel.Click += new System.EventHandler(this.btnDel_Click); + // + // label2 + // + this.label2.Location = new System.Drawing.Point(23, 35); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(44, 17); + this.label2.TabIndex = 378; + this.label2.Text = "密码"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(23, 8); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(44, 17); + this.label1.TabIndex = 377; + this.label1.Text = "用户名"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // btnCopyPassword + // + this.btnCopyPassword.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCopyPassword.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnCopyPassword.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCopyPassword.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCopyPassword.ForeColor = System.Drawing.Color.White; + this.btnCopyPassword.Location = new System.Drawing.Point(295, 31); + this.btnCopyPassword.Margin = new System.Windows.Forms.Padding(2); + this.btnCopyPassword.Name = "btnCopyPassword"; + this.btnCopyPassword.Size = new System.Drawing.Size(57, 25); + this.btnCopyPassword.TabIndex = 376; + this.btnCopyPassword.Text = "复制"; + this.btnCopyPassword.UseVisualStyleBackColor = false; + this.btnCopyPassword.Click += new System.EventHandler(this.btnCopyPassword_Click); + // + // btnCopyUserName + // + this.btnCopyUserName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCopyUserName.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnCopyUserName.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCopyUserName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCopyUserName.ForeColor = System.Drawing.Color.White; + this.btnCopyUserName.Location = new System.Drawing.Point(295, 4); + this.btnCopyUserName.Margin = new System.Windows.Forms.Padding(2); + this.btnCopyUserName.Name = "btnCopyUserName"; + this.btnCopyUserName.Size = new System.Drawing.Size(57, 25); + this.btnCopyUserName.TabIndex = 375; + this.btnCopyUserName.Text = "复制"; + this.btnCopyUserName.UseVisualStyleBackColor = false; + this.btnCopyUserName.Click += new System.EventHandler(this.btnCopyUserName_Click); + // + // txtPassWord + // + this.txtPassWord.Location = new System.Drawing.Point(72, 32); + this.txtPassWord.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txtPassWord.Name = "txtPassWord"; + this.txtPassWord.PasswordChar = '●'; + this.txtPassWord.ReadOnly = true; + this.txtPassWord.Size = new System.Drawing.Size(221, 23); + this.txtPassWord.TabIndex = 374; + // + // txtUserName + // + this.txtUserName.Location = new System.Drawing.Point(72, 5); + this.txtUserName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txtUserName.Name = "txtUserName"; + this.txtUserName.ReadOnly = true; + this.txtUserName.Size = new System.Drawing.Size(221, 23); + this.txtUserName.TabIndex = 373; + // + // btnStop + // + this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnStop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnStop.ForeColor = System.Drawing.Color.White; + this.btnStop.Location = new System.Drawing.Point(1324, 31); + this.btnStop.Margin = new System.Windows.Forms.Padding(2); + this.btnStop.Name = "btnStop"; + this.btnStop.Size = new System.Drawing.Size(96, 25); + this.btnStop.TabIndex = 372; + this.btnStop.Text = "停止操作"; + this.btnStop.UseVisualStyleBackColor = false; + this.btnStop.Click += new System.EventHandler(this.btnStop_Click); + // + // btnReload + // + this.btnReload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnReload.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnReload.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnReload.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnReload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnReload.ForeColor = System.Drawing.Color.White; + this.btnReload.Location = new System.Drawing.Point(1231, 31); + this.btnReload.Margin = new System.Windows.Forms.Padding(2); + this.btnReload.Name = "btnReload"; + this.btnReload.Size = new System.Drawing.Size(91, 25); + this.btnReload.TabIndex = 371; + this.btnReload.Text = "重新加载"; + this.btnReload.UseVisualStyleBackColor = false; + this.btnReload.Click += new System.EventHandler(this.btnReload_Click); + // + // chkCloseAfterLogin + // + this.chkCloseAfterLogin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + // + // + // + this.chkCloseAfterLogin.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.chkCloseAfterLogin.Checked = true; + this.chkCloseAfterLogin.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkCloseAfterLogin.CheckValue = "Y"; + this.chkCloseAfterLogin.Location = new System.Drawing.Point(997, 32); + this.chkCloseAfterLogin.Name = "chkCloseAfterLogin"; + this.chkCloseAfterLogin.Size = new System.Drawing.Size(135, 23); + this.chkCloseAfterLogin.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.chkCloseAfterLogin.TabIndex = 8; + this.chkCloseAfterLogin.Text = "登录成功后关闭窗口"; + // + // splitContainer2 + // + this.splitContainer2.BackColor = System.Drawing.Color.White; + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer2.Location = new System.Drawing.Point(1, 33); + this.splitContainer2.Name = "splitContainer2"; + this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.txtAddress); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.splitContainer1); + this.splitContainer2.Size = new System.Drawing.Size(1438, 766); + this.splitContainer2.SplitterDistance = 26; + this.splitContainer2.TabIndex = 5; + // + // txtAddress + // + this.txtAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtAddress.Location = new System.Drawing.Point(3, 3); + this.txtAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txtAddress.Name = "txtAddress"; + this.txtAddress.Size = new System.Drawing.Size(1432, 23); + this.txtAddress.TabIndex = 7; + this.txtAddress.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtAddress_KeyDown); + // + // ShopLoginForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(1440, 800); + this.Controls.Add(this.splitContainer2); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "ShopLoginForm"; + this.ShowMaximizeBox = true; + this.Text = "店铺登录"; + this.TitleText = "店铺登录"; + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ShopLoginForm_FormClosed); + this.Load += new System.EventHandler(this.ShopLoginForm_Load); + this.Controls.SetChildIndex(this.splitContainer2, 0); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.Panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.pnlMultiLogin.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel1.PerformLayout(); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private DevComponents.DotNetBar.Controls.CheckBoxX chkCloseAfterLogin; + private UserControls.ButtonEx btnStop; + private UserControls.ButtonEx btnReload; + private System.Windows.Forms.TextBox txtPassWord; + private System.Windows.Forms.TextBox txtUserName; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private UserControls.ButtonEx btnCopyPassword; + private UserControls.ButtonEx btnCopyUserName; + private System.Windows.Forms.SplitContainer splitContainer2; + private System.Windows.Forms.TextBox txtAddress; + private DevComponents.DotNetBar.Controls.ComboBoxEx cmbMultiCookieName; + private DevComponents.DotNetBar.PanelEx btnDel; + private DevComponents.DotNetBar.PanelEx btnMultiLogin; + private System.Windows.Forms.Panel pnlMultiLogin; + private UserControls.ButtonEx btnLoginAgain; + } +} \ No newline at end of file diff --git a/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs new file mode 100644 index 0000000..bee72f5 --- /dev/null +++ b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs @@ -0,0 +1,838 @@ +using AllBase; +using AllBase.Helper; +using AllBase.Model.Result; +using CefSharp; +using CefSharp.WinForms; +using TemuKJD.DashBoardForms; +using TemuKJD.Helper; +using TemuKJD.KJDForms.BaseForms; +using Microsoft.Win32; +using NaiBa.CefHelper; +using NaiBa.CefHelper.Handler; +using NaiBa.Util.Extension; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.Web.Hosting; +using System.Windows.Forms; +using Work; +using Work.BLL.Tools; +using TemuKJD.KJDForms.ShopForms; + +namespace TemuKJD.KJDForms.AdminForms +{ + public partial class AdminShopLoginForm : LRBaseForm + { + public int CloseAfterSecond { get; set; } + public EnumOpenType openType = EnumOpenType.manage; + public bool isMultiLogin = false; + public string MultiLoginCookieName = ""; + private string shopCookieHead = "kuajingmaihuo.com"; + private string shopLoginUrl = "http://seller.kuajingmaihuo.com/login"; + private string shopMainUrl = "https://seller.kuajingmaihuo.com"; + private ChromiumWebBrowser cefWebBrowser = null; + private ShopLoginInfo shop = null; + private List lstShopCompany = new List(); + private string currentUrl = ""; + + public AdminShopLoginForm(ShopLoginInfo shopInfo) + { + InitializeComponent(); + + this.shop = shopInfo; + this.txtUserName.Text = shopInfo.LoginName; + this.txtPassWord.Text = DataOpenSSL.DecryptString(shopInfo.Password); + } + + private void ShopLoginForm_Load(object sender, EventArgs e) + { + //this.splitContainer1.SplitterDistance = 674; + + if (openType == EnumOpenType.login) + { + //this.shop.ShopId = ""; + //this.shop.ShopAccount = ""; + } + + if (isMultiLogin && shop != null) + { + this.pnlMultiLogin.Visible = true; + InitMultiLoginCookies(); + } + + if (CloseAfterSecond > 0) + { + Task.Run(() => + { + Thread.Sleep(1000 * CloseAfterSecond); + if (this.Created) + { + Invoke(new Action(() => { this.Close(); })); + } + }); + } + + if (!isMultiLogin) + AutoLogin(); + + CheckAndSaveShop(); //判断登录是否成功，成功则保存店铺信息和店铺cookie + //ClosePopWindow(); //自动关闭弹窗 + } + + /// + /// 判断登录，保存店铺 + /// + private void CheckAndSaveShop() + { + Task.Run(() => + { + // 自动判断是否登录成功，登录成功后记录cookie保存到服务端。 + while (this.Created) + { + Thread.Sleep(3000); + //continue; + if (!this.Created) + break; + + if (this.shop != null && currentUrl.TrimEnd('/') == shopMainUrl) + { + if (!cefWebBrowser.GetBrowser().MainFrame.IsValid) + continue; + + if (openType!= EnumOpenType.login) + continue; + + if (!lstShopCompany.Any(c => c.LoginName == shop.LoginName)) + continue; + + string cookies = ""; + List cookieList = CEFBrowser.GetCookieList(shopCookieHead, cefWebBrowser.RequestContext.GetCookieManager(null)); + if (cookieList != null && cookieList.Count > 0) + { + foreach (var cookie in cookieList) + { + //SUB_PASS_ID同时出现两个，domain是seller.kuajingmaihuo.com才是能登录店铺后台的 + if (cookie.Name == "SUB_PASS_ID" && cookie.Domain != "seller.kuajingmaihuo.com" + && cookieList.Any(c=>c.Name== "SUB_PASS_ID" && c.Domain == "seller.kuajingmaihuo.com")) + continue; + + cookies += cookie.Name + "=" + cookie.Value + "; "; + } + cookies = cookies.Trim().TrimEnd(';'); + } + + if (!string.IsNullOrEmpty(cookies) + && lstShopCompany.Any(c => c.LoginName == shop.LoginName)) + { + var lstShopCompanyCopy = lstShopCompany.ToList(); + lstShopCompanyCopy = lstShopCompanyCopy.Where(l => l.LoginName == shop.LoginName).ToList(); + + foreach (ShopCompany sc in lstShopCompanyCopy) + { + ShopLoginInfo newShop = new ShopLoginInfo() + { + LoginName = shop.LoginName, + Password = shop.Password, + GroupName = shop.GroupName, + ShopAccount = sc.AccountName, + ShopId = sc.AccountId, + SubUserName = shop.SubUserName, + UserName = shop.UserName, + Cookies = cookies, + }; + + if (string.IsNullOrEmpty(shop.Cookies)) // 有cookie的认为是已登录过的 + { + newShop.LoginStatus = "登录成功"; + newShop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); + AdminShopForm.AdminAddServerShop(newShop); // 店铺写入到服务端 + } + } + shop.Cookies = cookies; + shop.LoginStatus = "登录成功"; + ShopListForm.UpdateServerShopCookies(shop, shop.Cookies); // 店铺cookie写入服务端，多店共用一个登录账号一组cookie + OnSaveComplete(shop); + if (this.Created && this.chkCloseAfterLogin.Checked) + { + Invoke(new Action(() => { this.Close(); })); + } + else + break; + } + } + } + }); + } + + /// + /// 自动关闭弹窗 + /// + private void ClosePopWindow() + { + // 关闭弹窗 + Task.Run(() => + { + var sleepTime = 2500; + int i = 0; + while (true && i++ < 50) + { + try + { + Thread.Sleep(sleepTime); + var jsStr1 = "function ClosePopWindow(txt) {\r\n" + + " var result = 'no_pop'\r\n" + + " var item = document.getElementsByClassName(txt);\r\n" + + " for(i = 0; i < item.length; i++) {\r\n" + + " item[i].click();\r\n" + + " result = 'success'\r\n" + + " }\r\n" + + " return result;\r\n" + + "}\r\n" + + "ClosePopWindow('anticon-close-circle');\r\n" + + "ClosePopWindow('ant-modal-close-x');\r\n"; + var jsStr2 = "function clickPopWindow(txt) {\r\n" + + "var child = document.body.firstElementChild;\r\n" + + "var element1 = null;\r\n" + + " while (child) {\r\n" + + " if (child.innerHTML.indexOf(txt) >= 0) {\r\n" + + " element1 = child;\r\n" + + " if (child.firstElementChild) {\r\n" + + " child = child.firstElementChild; continue;\r\n" + + " } else break;\r\n" + + " }\r\n" + + " child = child.nextElementSibling;\r\n" + + " }\r\n" + + " if (element1) {\r\n" + + " element1.click(); return 'success';\r\n" + + " } else return 'no_pop';\r\n" + + "}\r\n" + + "clickPopWindow('我知道了');\r\n" + + "clickPopWindow('知道了');\r\n"; + if (cefWebBrowser != null && cefWebBrowser.IsBrowserInitialized) + { + var t1 = cefWebBrowser.GetMainFrame().EvaluateScriptAsync(jsStr1); + t1.Wait(); + var t2 = cefWebBrowser.GetMainFrame().EvaluateScriptAsync(jsStr2); + t2.Wait(); + if (t1.Result?.Result?.ToString() == "success" || t2.Result?.Result?.ToString() == "success") + sleepTime = Randomx.GetId(550, 650); + else + sleepTime = Randomx.GetId(1500, 2000); + } + } + catch (Exception ex) { } + } + }); + } + + /// + /// 自动登录店铺后台 + /// + private void AutoLogin() + { + if (shop == null) + return; + + if (cefWebBrowser == null) + { + //cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false); + cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(shopMainUrl, false); + CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal(); + resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete; + cefWebBrowser.RequestHandler = new CustomRequestHandler(resourceRequestHandler); + var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow); + cefWebBrowser.LifeSpanHandler = lifeSapnHandler; + cefWebBrowser.KeyboardHandler = new KeyboardHandler(); + cefWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd; + cefWebBrowser.AddressChanged += CefWebBrowser_AddressChanged; + cefWebBrowser.LoadError += CefWebBrowser_LoadError; + cefWebBrowser.Dock = DockStyle.Fill; + + if (shop.Cookies == null) + shop.Cookies = ""; + + var cookie = shop.Cookies; + if (isMultiLogin) + cookie = shop.DictMultiCookies.Keys.Contains(MultiLoginCookieName) ? shop.DictMultiCookies[MultiLoginCookieName] : ""; + + + Task.Run(() => + { + var t = CEFBrowser.SetCookieAsync(shopCookieHead, cookie, cefWebBrowser.RequestContext.GetCookieManager(null)); + t.Wait(5000); + + Invoke(new Action(() => + { + splitContainer1.Panel1.Controls.Add(cefWebBrowser); + //cefWebBrowser.Load(shopMainUrl); + })); + + if (openType != EnumOpenType.login) + { + Invoke(new Action(() => + { + chkCloseAfterLogin.Visible = false; + btnLoginAgain.Visible = false; + })); + return; + } + + for (int i = 0; i < 50; i++) + { + if (cefWebBrowser.IsLoading) + Thread.Sleep(100); + } + Thread.Sleep(Randomx.GetId(1500,2000)); + + //设置 local storage + //if (GlobalConfig.dicLocalStorage != null) + //{ + // Thread.Sleep(500); + // string jsCode = "function setStorage() {"; + // foreach (var item in GlobalConfig.dicLocalStorage) + // { + // if (item.Key == "$TCC_CONFIG" || item.Key == "$TCC_CONFIG_operate_config" || item.Key == "menuStyleStr") + // continue; + + // jsCode += "window.localStorage.setItem('" + item.Key + "', '" + item.Value + "');\r\n"; + // } + // jsCode += "}"; + // jsCode += "setStorage();"; + // if (cefWebBrowser.GetBrowser().MainFrame.IsValid) + // cefWebBrowser.GetBrowser().MainFrame.ExecuteJavaScriptAsync(jsCode); + //} + + if (!this.Created) + return; + + InputUserNameAndPassword(cefWebBrowser, shop.LoginName, DataOpenSSL.DecryptString(shop.Password)); + }); + } + } + + private void CefWebBrowser_LoadError(object sender, CefSharp.LoadErrorEventArgs e) + { + } + + private void CefWebBrowser_AddressChanged(object sender, CefSharp.AddressChangedEventArgs e) + { + if (this.Created) + Invoke(new Action(() => + { + currentUrl = e.Address; + txtAddress.Text = e.Address; + })); + } + + private void CefWebBrowser_FrameLoadEnd(object sender, CefSharp.FrameLoadEndEventArgs e) + { + //if (!cefWebBrowser.IsBrowserInitialized) return; + + //currentUrl = e.Url; + //if (currentUrl.StartsWith("https://fxg.jinritemai.com/ffa/multiShop")) + //{ + // Thread.Sleep(Randomx.GetId(500, 800)); + //} + //if (currentUrl.StartsWith("https://fxg.jinritemai.com/ffa/mshop/homepage/index")) + //{ + // Task.Run(() => + // { + // + // }); + //} + } + + private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request) + { + if (url.StartsWith("https://seller.kuajingmaihuo.com/settle/site-main")) + { + cefWebBrowser.Load(shopMainUrl); + } + //if (url == shopMainUrl) + if (url == "https://seller.kuajingmaihuo.com/bg/quiet/api/mms/userInfo") + { + Task.Run(() => + { + var data = responseData; + if (this.shop != null && data.Contains("\"success\":true")) + { + var maskMobile = BaseRegex.GetStringJson(ref data, "maskOwnerMobile"); + if (shop.LoginName.EndsWith(maskMobile)) + { + lstShopCompany.Clear(); + var jObj = JObject.Parse(data); + var jArr = jObj["result"]?["companyList"]?[0]?["malInfoList"] as JArray; + if (jArr == null) + jArr = new JArray(); + + Thread.Sleep(500); + foreach (var productObj in jArr) + { + var prod = JsonHelper.SerializeObject(productObj); + ShopCompany sc = new ShopCompany() + { + AccountId = BaseRegex.GetStringJson(ref prod, "mallId"), + AccountName = BaseRegex.GetStringJson(ref prod, "mallName"), + LoginName = shop.LoginName, + UserName = BaseClass.UserName, + LoginStatus = "登录成功", + }; + this.lstShopCompany.Add(sc); + } + } + } + }); + } + //if (url.Contains("_signature")) + //{ + // var re = request; + // if ((re.Headers != null && re.Headers.AllKeys.Contains("x-secsdk-csrf-token"))) + // { + // } + // Task.Run(() => + // { + // var _url = url; + // var data = responseData; + // var signature = url.Substring(url.IndexOf("_signature=") + "_signature=".Length).Split('&')[0]; + // if (shop != null) + // { + // shop.Signature = signature; + // } + // if (url.Contains("x-secsdk-csrf-token") || postData.Contains("x-secsdk-csrf-token") || data.Contains("x-secsdk-csrf-token")) + // { + // } + // }); + //} + } + + /// + /// 自动登录 + /// + /// + /// + /// + private void InputUserNameAndPassword(ChromiumWebBrowser webBrowser, string _account, string _password) + { + string jsStr1 = "function getInputItem () {var usernameId = document.getElementById('usernameId'); if (usernameId) return 'true';} getInputItem();"; + Task response1 = null; + while (response1?.Result?.Result == null || !response1.Result.Result.ParseToString().Contains("true")) + { + Thread.Sleep(250); + if (!this.Created) + return; + + response1 = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr1); + response1.Wait(5000); + + if (!this.Created) + return; + } + + webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sInputValueChange2); + webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sGetElementWithText); + + jsStr1 = "var usernameId = document.getElementById('usernameId'); " + + "changeReactInputValue(usernameId,'" + _account + "');"; + response1 = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr1); + response1.Wait(1000); + Thread.Sleep(Randomx.GetId(500, 1000)); + + string jsStr = "var passwordId = document.getElementById('passwordId'); "+ + "changeReactInputValue(passwordId,'" + _password + "');"; + var response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(1000); + Thread.Sleep(Randomx.GetId(500, 1000)); + + jsStr = "var clickBox = getElementWithText('我已阅读并同意'); " + + "clickBox.click()"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(1000); + Thread.Sleep(Randomx.GetId(500, 1000)); + + jsStr = "var clickBox = getElementWithText('登录'); " + + "clickBox.click()"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(1000); + Thread.Sleep(Randomx.GetId(500, 1000)); + return; + //下面代码原抖音使用，废弃 + + #region 输入用js + string jsSetValue = @" +function keyboardInput(dom, st) { + var evt = new InputEvent('input', { + //var evt = new Event('input', { // cef57 + inputType: 'insertText', + data: st, + dataTransfer: null, + isComposing: false + }); + dom.value = st; + dom.dispatchEvent(evt); + dom.focus(); +};"; + + string jsInputKey = @" +function fireKeyEvent(el, evtType, keyCode) { + var evtObj; + if (document.createEvent) + { + if (window.KeyEvent) + { + //firefox 浏览器下模拟事件 + evtObj = document.createEvent('KeyEvents'); + evtObj.initKeyEvent(evtType, true, true, window, true, false, false, false, keyCode, 0); + } + else + { + //chrome 浏览器下模拟事件 + evtObj = document.createEvent('UIEvents'); + evtObj.initUIEvent(evtType, true, true, window, 1); + + delete evtObj.keyCode; + if (typeof evtObj.keyCode === 'undefined') + { + //为了模拟keycode + Object.defineProperty(evtObj, 'keyCode', { value: keyCode }); + } + else + { + evtObj.key = String.fromCharCode(keyCode); + } + + if (typeof evtObj.ctrlKey === 'undefined') + { + //为了模拟ctrl键 + Object.defineProperty(evtObj, 'ctrlKey', { value: true }); + } + else + { + evtObj.ctrlKey = true; + } + } + el.dispatchEvent(evtObj); + } + else if (document.createEventObject) + { + //IE 浏览器下模拟事件 + evtObj = document.createEventObject(); + evtObj.keyCode = keyCode + el.fireEvent('on' + evtType, evtObj); + } +}"; + #endregion + + #region 输入用户名 + jsStr = @"var txt1 = document.getElementsByName('email')[0]; txt1.focus(); txt1.click(); keyboardInput(txt1, '" + _account + "');" + + "var uname = '" + _account + "';" + + "for(var i = 0; i < uname.length; i++) {" + + " cCode = uname.charCodeAt(i);" + + " fireKeyEvent(txt1, 'keydown', cCode);" + + " fireKeyEvent(txt1, 'keypress', cCode);" + + " fireKeyEvent(txt1, 'keyup', cCode);" + + "}"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsSetValue + jsInputKey + jsStr); + response.Wait(2000); + Thread.Sleep(Randomx.GetId(400, 800)); + #endregion + + #region 输入密码 + jsStr = @"var txt2 = document.getElementsByName('password')[0]; txt2.focus(); txt2.click(); keyboardInput(txt2, '" + _password + "');" + + "var pwd = '" + _password + "';" + + "for(var i = 0; i < pwd.length; i++) {" + + " cCode = pwd.charCodeAt(i);" + + " fireKeyEvent(txt2, 'keydown', cCode);" + + " fireKeyEvent(txt2, 'keypress', cCode);" + + " fireKeyEvent(txt2, 'keyup', cCode);" + + "}"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsInputKey + jsStr); + response.Wait(2000); + Thread.Sleep(Randomx.GetId(400, 800)); + #endregion + + #region 点击登录按钮 + jsStr = "var btn = document.getElementsByClassName('account-center-action-button')[0]; btn.click(); //btn.dispatchEvent(new Event('change'));"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(2000); + Thread.Sleep(1500 + Randomx.GetId(1000)); + #endregion + + #region 获取验证码 + int getImageCount = 0; + getImageAgain: + if (!this.Created) + return; + + jsStr = "function getImg() { return document.getElementsByClassName('captcha_verify_img--wrapper')[0].innerHTML; }"; + jsStr += "getImg();"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(2000); + if (response.Result?.Result == null) + { + if (getImageCount < 50) + { + Thread.Sleep(2500); + getImageCount++; + goto getImageAgain; + } + } + if (response.Result?.Result != null) + { + var imgStr = response.Result.Result.ToString(); + var src = BaseRegex.GetMatchRegexString(ref imgStr, "src=\"([\\s\\S]*?)\""); + Bitmap bt = (Bitmap)GetHtml.LoadImage(src); + if (bt != null) + { + int Stopxt = 0; + int dragButtonWidth = 53; + //Stopxt = new Base64ChangeImgUrl().CalculateNick(bt, dragButtonWidth); + Thread.Sleep(500 + Randomx.GetId(1000)); + Stopxt = new Base64ChangeImgUrl().CalculateNickNew(bt, dragButtonWidth); + if (Stopxt > 0) + { + jsStr = "function getImgPos() { return document.getElementsByClassName('secsdk-captcha-drag-icon')[0].getBoundingClientRect().left + '|' " + + " + document.getElementsByClassName('secsdk-captcha-drag-icon')[0].getBoundingClientRect().top;} getImgPos();"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(2000); + if (response.Result?.Result != null) + { + var xy = response.Result?.Result.ToString(); + var xyArr = xy.Split('|'); + if (xyArr.Length == 2) + { + try + { + int x = (int)Convert.ToDecimal(xyArr[0]) + 25; + int y = (int)Convert.ToDecimal(xyArr[1]) + 25; + + // 自动滑块图形验证 + if (GlobalConfig.DouShopSettingParam.IsAutoDragLogin) + { + ShopLoginForm.CefMouseDragDou(cefWebBrowser, x, y, Convert.ToInt32((x + Stopxt * 340m / 552m) - 15), y); + for (int i = 0; i < 1; i++) + Thread.Sleep(2000 + Randomx.GetId(1000)); + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(2000); + if (response.Result?.Result != null && getImageCount < 50) + { + getImageCount++; + goto getImageAgain; + } + } + } + catch + { + } + } + } + for (int i = 0; i < 1; i++) + Thread.Sleep(2000 + Randomx.GetId(1000)); + } + } + } + Thread.Sleep(1500 + Randomx.GetId(1000)); + #endregion + } + + // 鼠标左键按下,移动,移动...左键抬起。 + public static void CefMouseDragDou(ChromiumWebBrowser webBrowser, int x1, int y1, int x2, int y2) + { + Thread.Sleep(100); + var host = webBrowser.GetBrowser().GetHost(); + + var rx = -6 + Randomx.GetId(13); + x2 = x2 + rx; + // 随机按下点的位置（正负6像素），提高仿真性 + int x = x1 + rx; + int y = y1 - 6 + Randomx.GetId(13); + + // 按下鼠标左键 + host.SendMouseClickEvent(x, y, MouseButtonType.Left, false, 1, CefEventFlags.None); + Thread.Sleep(100 + Randomx.GetId(300)); + + // 滑动光标 + int times = -20; + while (x < x2 + 4 - Randomx.GetId(9)) + { + times++; + x += (15 + Randomx.GetId(15)) / 8; + if (times % 5 == 0) + y = y - 1 + Randomx.GetId(3); + Thread.Sleep(6 + Math.Abs(times) / 5 + Randomx.GetId(16)); + host.SendMouseMoveEvent((int)x, (int)y, false, CefEventFlags.LeftMouseButton); + } + if (x < x2 - 1) + while (x < x2) + { + times++; + x += (8 + Randomx.GetId(8)) / 8; + if (times % 5 == 0) + y = y - 1 + Randomx.GetId(3); + Thread.Sleep(6 + Math.Abs(times) / 5 + Randomx.GetId(16)); + host.SendMouseMoveEvent((int)x, (int)y, false, CefEventFlags.LeftMouseButton); + } + else if (x > x2 + 1) + while (x > x2) + { + times++; + x -= (8 + Randomx.GetId(8)) / 8; + if (times % 5 == 0) + y = y - 1 + Randomx.GetId(3); + Thread.Sleep(6 + Math.Abs(times) / 5 + Randomx.GetId(16)); + host.SendMouseMoveEvent((int)x, (int)y, false, CefEventFlags.LeftMouseButton); + } + + // 如果最后位置偏差较多，再做一次调整 + x = x2 - 1 + Randomx.GetId(3); + x = x2; + Thread.Sleep(18 + Math.Abs(times) / 5 + Randomx.GetId(16)); + Thread.Sleep(18 + Math.Abs(times) / 5 + Randomx.GetId(16)); + host.SendMouseMoveEvent((int)x, (int)y, false, CefEventFlags.LeftMouseButton); + + // 抬起鼠标左键 + Thread.Sleep(300 + Randomx.GetId(500)); + host.SendMouseClickEvent(x, y, MouseButtonType.Left, true, 1, CefEventFlags.None); + host.SendMouseClickEvent(x, y, MouseButtonType.Left, true, 1, CefEventFlags.None); + } + + private void btnStop_Click(object sender, EventArgs e) + { + + } + + private void btnCopyUserName_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(txtUserName.Text)) + Clipboard.SetDataObject(txtUserName.Text); + } + + private void btnCopyPassword_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(txtPassWord.Text)) + Clipboard.SetDataObject(txtPassWord.Text); + } + + private void btnReload_Click(object sender, EventArgs e) + { + if (cefWebBrowser != null) + { + if (txtAddress.Text != "about:blank") + cefWebBrowser.Load(txtAddress.Text); + else + cefWebBrowser.Load(shopMainUrl); + } + } + + private void ShopLoginForm_FormClosed(object sender, FormClosedEventArgs e) + { + //OnSaveComplete(shop); + } + + private void txtAddress_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + if (cefWebBrowser != null) + { + cefWebBrowser.Load(txtAddress.Text); + } + } + } + + private void btnMultiLogin_Click(object sender, EventArgs e) + { + MultiLoginCookieName = cmbMultiCookieName.Text; + AutoLogin(); + } + + private void btnDel_Click(object sender, EventArgs e) + { + if (shop != null) + { + shop.DictMultiCookies.Remove(cmbMultiCookieName.Text); + StartUp.SaveLocalShopLoginInfo(); + + InitMultiLoginCookies(); + } + } + + private void InitMultiLoginCookies() + { + this.cmbMultiCookieName.Items.Clear(); + foreach (var cookieKey in shop.DictMultiCookies.Keys) + { + this.cmbMultiCookieName.Items.Add(cookieKey); + } + int i = 1; + foreach (var item in this.cmbMultiCookieName.Items) + { + if (i <= item.ToString().Replace("cookie", "").ParseToInt()) + { + i = item.ToString().Replace("cookie", "").ParseToInt() + 1; + } + } + this.cmbMultiCookieName.Items.Insert(0, "cookie" + i); + this.cmbMultiCookieName.Text = "cookie" + i; + } + + + string sInputValueChange = @" +let usernameId = document.getElementById('usernameId'); +usernameId.value = '1'; + +var event = document.createEvent('HTMLEvents'); +event.initEvent('input', true, true); +event.eventType = 'message'; +usernameId.dispatchEvent(event); +"; + + string sInputValueChange2 = @" +function changeReactInputValue(inputDom,newText){ + let lastValue = inputDom.value; + inputDom.value = newText; + let event = new Event('input', { bubbles: true }); + event.simulated = true; + let tracker = inputDom._valueTracker; + if (tracker) { + tracker.setValue(lastValue); + } + inputDom.dispatchEvent(event); +} +"; + + string sGetElementWithText = @" +function getElementWithText(sText) +{ + var elem=null; + const elements = document.querySelectorAll('*'); // 选择所有元素 + elements.forEach(element => { + if (element.textContent.includes(sText)) { + // 对每个匹配的元素执行操作 + //console.log(element); + elem=element; + } + }); + return elem; +}; +"; + + private void btnLoginAgain_Click(object sender, EventArgs e) + { + if (this.currentUrl != shopLoginUrl) + this.cefWebBrowser.Load(shopLoginUrl); + + + Task.Run(() => + { + InputUserNameAndPassword(cefWebBrowser, shop.LoginName, DataOpenSSL.DecryptString(shop.Password)); + }); + } + } +} diff --git a/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.resx b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.resx similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/ShopAuthForm.resx rename to TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.resx diff --git a/TEMUKJD/KJDForms/ProductForms/Old/CommissionForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/CommissionForm.cs index 2d2569c..05f8846 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/CommissionForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/CommissionForm.cs @@ -138,7 +138,7 @@ namespace TemuKJD.KJDForms.ProductForms /// 使用cef修改申样规则 /// /// - public void EditSampleRuleWithCef(List shops) + public void EditSampleRuleWithCef(List shops) { Task.Run(() => { @@ -205,7 +205,7 @@ namespace TemuKJD.KJDForms.ProductForms }); } - void EditSampleRule(DouShopLoginInfo shop) + void EditSampleRule(ShopLoginInfo shop) { // 错误提示信息 string failMsg = ""; @@ -435,7 +435,7 @@ namespace TemuKJD.KJDForms.ProductForms /// /// /// - public void AddCommissionWithCef(List shops) + public void AddCommissionWithCef(List shops) { Task.Run(() => { @@ -506,7 +506,7 @@ namespace TemuKJD.KJDForms.ProductForms /// 登录店铺佣金页面 /// /// - private string LoadShopCommissionPage(DouShopLoginInfo shop) + private string LoadShopCommissionPage(ShopLoginInfo shop) { Thread.Sleep(1000); @@ -616,7 +616,7 @@ namespace TemuKJD.KJDForms.ProductForms /// 设置新佣金 /// /// - private void SetNewCommission(DouShopLoginInfo shop) + private void SetNewCommission(ShopLoginInfo shop) { // 错误提示信息 string failMsg = ""; diff --git a/TEMUKJD/KJDForms/ProductForms/Old/Fission.cs b/TEMUKJD/KJDForms/ProductForms/Old/Fission.cs index 0e03ee7..9740d56 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/Fission.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/Fission.cs @@ -248,9 +248,9 @@ namespace TemuKJD.KJDForms.ProductForms fissionBrowserObject.InformationReceived += fissionBrowserObject_InfomationReceived; // 注册C#类为JS对象（FissionBrowserObject.cs）类 //browser.RegisterJsObject("cefBrowser", fissionBrowserObject, new CefSharp.BindingOptions { CamelCaseJavascriptNames = false }); - CefSharpSettings.LegacyJavascriptBindingEnabled = true; + //CefSharpSettings.LegacyJavascriptBindingEnabled = true;//cef 79 84以后：“CefSharpSettings”未包含“LegacyJavascriptBindingEnabled”的定义 CefSharpSettings.WcfEnabled = true; - browser.JavascriptObjectRepository.Register("cefBrowser", fissionBrowserObject, isAsync: false, options: new BindingOptions { CamelCaseJavascriptNames = false }); + browser.JavascriptObjectRepository.Register("cefBrowser", fissionBrowserObject, isAsync: false, options: new BindingOptions { /*CamelCaseJavascriptNames = false*/ /*cef79*/ }); browser.FrameLoadEnd += Browser_FrameLoadEnd; browser.SizeChanged += Browser_SizeChanged; this.panel1.Controls.Add(browser); @@ -660,7 +660,7 @@ namespace TemuKJD.KJDForms.ProductForms int level = 0; string name = "其他"; - DouShopLoginInfo dyShop = null; + ShopLoginInfo dyShop = null; var item = this.cmbGetCatShop.SelectedItem as ComboBoxItem; if (item != null && item.Name != "随机选择") { diff --git a/TEMUKJD/KJDForms/ProductForms/Old/FissionDataBaseForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/FissionDataBaseForm.cs index 931f6bd..9fefcc9 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/FissionDataBaseForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/FissionDataBaseForm.cs @@ -294,7 +294,7 @@ namespace TemuKJD.KJDForms.ProductForms { } - public List GetCategoryList(int catId, DouShopLoginInfo shop) + public List GetCategoryList(int catId, ShopLoginInfo shop) { List cateList = new List(); if (catId < 0) diff --git a/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs index cf605dd..c09b601 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs @@ -37,8 +37,8 @@ namespace TemuKJD.KJDForms.ProductForms public DateTime notOperateChangeDays = DateTime.Now.Date.AddDays(-7); public long notOperateChangeDaysTick = 0; public List lstProductIdHasSales = new List(); - public List lstGetSalesSuccesShop = new List(); - public DouShopLoginInfo currentShop = null; + public List lstGetSalesSuccesShop = new List(); + public ShopLoginInfo currentShop = null; public bool isReadShopSales = false; ShopProductBLL shopProductBLL = new ShopProductBLL(); CancellationTokenSource cancellationTokenSource = null; @@ -106,7 +106,7 @@ namespace TemuKJD.KJDForms.ProductForms })); } - void GetShopProduct(DouShopLoginInfo shop, bool isShowResult = true) + void GetShopProduct(ShopLoginInfo shop, bool isShowResult = true) { DataGridViewRow row = null; Invoke(new Action(() => @@ -209,13 +209,13 @@ namespace TemuKJD.KJDForms.ProductForms dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } } - private void BindShop(DouShopLoginInfo shopEntity) + private void BindShop(ShopLoginInfo shopEntity) { var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); if (row == null) @@ -658,7 +658,7 @@ namespace TemuKJD.KJDForms.ProductForms else notOperateChangeDaysTick = 0; // todo:先读取所有店铺的符合条件商品，然后统一删除 - Dictionary dicShopOperateProductList = new Dictionary(); + Dictionary dicShopOperateProductList = new Dictionary(); Task.Run(() => { @@ -1407,7 +1407,7 @@ namespace TemuKJD.KJDForms.ProductForms } // /product/getProductUpdateRule - string GetProductUpdateRule(DouShopLoginInfo shop, string catId) + string GetProductUpdateRule(ShopLoginInfo shop, string catId) { Dictionary dictionary = new Dictionary(); dictionary.Add("category_id", catId); @@ -1430,7 +1430,7 @@ namespace TemuKJD.KJDForms.ProductForms /// /// 获取有订单商品Id列表 /// - private void GetHasSales(DouShopLoginInfo shop) + private void GetHasSales(ShopLoginInfo shop) { currentShop = shop; @@ -1589,7 +1589,7 @@ namespace TemuKJD.KJDForms.ProductForms } } - private void updateTrailOperationCount(DouShopLoginInfo shop) + private void updateTrailOperationCount(ShopLoginInfo shop) { if (shop.PayStatus != 1) { diff --git a/TEMUKJD/KJDForms/ProductForms/Old/SpecialDelaySendForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/SpecialDelaySendForm.cs index 731425a..1974ae2 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/SpecialDelaySendForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/SpecialDelaySendForm.cs @@ -69,7 +69,7 @@ namespace TemuKJD.KJDForms.ProductForms } } - public string GetShopProductListData(DouShopLoginInfo shop, int productStatus = 0, int page = 1, int pageSize = 50) + public string GetShopProductListData(ShopLoginInfo shop, int productStatus = 0, int page = 1, int pageSize = 50) { // 读取在售商品数量 Dictionary dictionary = new Dictionary(); @@ -83,7 +83,7 @@ namespace TemuKJD.KJDForms.ProductForms var resultOnline = douApi.GetProductList(); return resultOnline; } - void GetShopProduct(DouShopLoginInfo shop, bool isShowResult = true) + void GetShopProduct(ShopLoginInfo shop, bool isShowResult = true) { DataGridViewRow row = null; Invoke(new Action(() => @@ -185,7 +185,7 @@ namespace TemuKJD.KJDForms.ProductForms }); } - void SetDelaySendCef(List shops) + void SetDelaySendCef(List shops) { Task.Run(() => { diff --git a/TEMUKJD/KJDForms/ProductForms/Old/StockSyncForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/StockSyncForm.cs index dc929eb..3774cf1 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/StockSyncForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/StockSyncForm.cs @@ -59,13 +59,13 @@ namespace TemuKJD.KJDForms.ProductForms dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } } - private void BindShop(DouShopLoginInfo shopEntity) + private void BindShop(ShopLoginInfo shopEntity) { var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); if (row == null) @@ -175,7 +175,7 @@ namespace TemuKJD.KJDForms.ProductForms })); } - void GetShopProduct(DouShopLoginInfo shop, bool isShowResult = true) + void GetShopProduct(ShopLoginInfo shop, bool isShowResult = true) { DataGridViewRow row = null; Invoke(new Action(() => @@ -252,7 +252,7 @@ namespace TemuKJD.KJDForms.ProductForms })); } - public string GetShopProductListData(DouShopLoginInfo shop, int productStatus = 0, int page = 1, int pageSize = 50) + public string GetShopProductListData(ShopLoginInfo shop, int productStatus = 0, int page = 1, int pageSize = 50) { // 读取在售商品数量 Dictionary dictionary = new Dictionary(); @@ -552,7 +552,7 @@ namespace TemuKJD.KJDForms.ProductForms }, cancellationTokenSource.Token); } - public string SetProductStock(DouShopLoginInfo shop, string productId, string skuId, string stock) + public string SetProductStock(ShopLoginInfo shop, string productId, string skuId, string stock) { Dictionary dictionary = new Dictionary(); dictionary.Add("product_id", productId); @@ -563,7 +563,7 @@ namespace TemuKJD.KJDForms.ProductForms var resultOnline = douApi.SetProductStock(); return resultOnline; } - public string GetProductDetail(DouShopLoginInfo shop, string productId) + public string GetProductDetail(ShopLoginInfo shop, string productId) { Dictionary dictionary = new Dictionary(); dictionary.Add("product_id", productId); diff --git a/TEMUKJD/KJDForms/ProductForms/Old/UploadProductForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/UploadProductForm.cs index 0022b63..c403d46 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/UploadProductForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/UploadProductForm.cs @@ -343,7 +343,7 @@ namespace TemuKJD.KJDForms.ProductForms public void Get(object shop) { - var Shop = shop as DouShopLoginInfo; + var Shop = shop as ShopLoginInfo; var bll = new UploadProductBLL(formName, Shop); bll.productHandler = RefreshGridView; bll.noticeHandler = RefreshLog; @@ -356,7 +356,7 @@ namespace TemuKJD.KJDForms.ProductForms /// public void GetMulti(object shop) { - var Shop = shop as DouShopLoginInfo; + var Shop = shop as ShopLoginInfo; var bll = new UploadProductBLL(formName, Shop); bll.productHandler = RefreshGridView; bll.noticeHandler = RefreshLog; diff --git a/TEMUKJD/KJDForms/ProductForms/Old/ViolateManageForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/ViolateManageForm.cs index 955fe06..456184b 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/ViolateManageForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/ViolateManageForm.cs @@ -529,7 +529,7 @@ namespace TemuKJD.KJDForms.ProductForms }, cancellationTokenSource.Token); } - private void TroubleShootingShopProduct(List shopList, bool isOperateOnline = true) + private void TroubleShootingShopProduct(List shopList, bool isOperateOnline = true) { @@ -1215,7 +1215,7 @@ namespace TemuKJD.KJDForms.ProductForms AddViolateToServer(violateRuleName); } - void GetShopProduct(DouShopLoginInfo shop, bool isShowResult = true) + void GetShopProduct(ShopLoginInfo shop, bool isShowResult = true) { DataGridViewRow row = null; Invoke(new Action(() => @@ -1282,7 +1282,7 @@ namespace TemuKJD.KJDForms.ProductForms })); } - public string GetShopProductListData(DouShopLoginInfo shop, int productStatus = 0, int page = 1, int pageSize = 50, long update_end_time = 0) + public string GetShopProductListData(ShopLoginInfo shop, int productStatus = 0, int page = 1, int pageSize = 50, long update_end_time = 0) { // 读取在售商品数量 Dictionary dictionary = new Dictionary(); diff --git a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs index 1cdf1dd..dfb75cd 100644 --- a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs @@ -84,14 +84,14 @@ namespace TemuKJD.KJDForms.ProductForms dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { if (!string.IsNullOrEmpty(shopEntity.ShopId)) BindShop(shopEntity, selectIds); } } - private void BindShop(DouShopLoginInfo shopEntity, List selectShopId = null) + private void BindShop(ShopLoginInfo shopEntity, List selectShopId = null) { if (shopEntity == null) return; @@ -380,7 +380,7 @@ namespace TemuKJD.KJDForms.ProductForms /// /// /// - private string GetPriceAdjustList(DouShopLoginInfo shop, int page = 1, string type = "待调价") + private string GetPriceAdjustList(ShopLoginInfo shop, int page = 1, string type = "待调价") { page = Math.Max(page, 1); string url = "https://seller.kuajingmaihuo.com/marvel-mms/cn/api/kiana/magneto/price-adjust/page-query"; @@ -545,7 +545,7 @@ namespace TemuKJD.KJDForms.ProductForms /// /// /// - private string refuseAdjust(DouShopLoginInfo shop, List adjustIdList, string refuseReason) + private string refuseAdjust(ShopLoginInfo shop, List adjustIdList, string refuseReason) { string url = "https://seller.kuajingmaihuo.com/marvel-mms/cn/api/kiana/gmp/bg/magneto/api/price-adjust/batch/adjust"; string body = "{\"adjustList\":["; diff --git a/TEMUKJD/KJDForms/ProductForms/ProductResponse/ProductResponse.cs b/TEMUKJD/KJDForms/ProductForms/ProductResponse/ProductResponse.cs index 417dcd1..f4fa982 100644 --- a/TEMUKJD/KJDForms/ProductForms/ProductResponse/ProductResponse.cs +++ b/TEMUKJD/KJDForms/ProductForms/ProductResponse/ProductResponse.cs @@ -12,7 +12,7 @@ namespace TemuKJD.KJDForms.ProductForms { public class ProductResponse { - public static string GetPostResponse(DouShopLoginInfo shop, string _url, string _data, string referer) + public static string GetPostResponse(ShopLoginInfo shop, string _url, string _data, string referer) { HttpWebResponse response = null; string result; diff --git a/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs b/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs index 8ca1557..43feebd 100644 --- a/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs @@ -102,14 +102,14 @@ namespace TemuKJD.KJDForms.ProductForms dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { if (!string.IsNullOrEmpty(shopEntity.ShopId)) BindShop(shopEntity, selectIds); } } - private void BindShop(DouShopLoginInfo shopEntity, List selectShopId = null) + private void BindShop(ShopLoginInfo shopEntity, List selectShopId = null) { if (shopEntity == null) return; @@ -356,7 +356,7 @@ namespace TemuKJD.KJDForms.ProductForms /// /// /// - private string GetShopStockList(DouShopLoginInfo shop, int page = 1, string type = "待创建") + private string GetShopStockList(ShopLoginInfo shop, int page = 1, string type = "待创建") { page = Math.Max(page, 1); string url = "https://seller.kuajingmaihuo.com/oms/bg/venom/api/supplier/purchase/manager/querySubOrderList"; @@ -377,7 +377,7 @@ namespace TemuKJD.KJDForms.ProductForms /// /// /// - private string CancelSubPurchaseOrder(DouShopLoginInfo shop, string subPurchaseOrderSn) + private string CancelSubPurchaseOrder(ShopLoginInfo shop, string subPurchaseOrderSn) { string url = "https://seller.kuajingmaihuo.com/oms/bg/venom/api/supplier/purchase/manager/batchCancelSubPurchaseOrder"; string body = "{\"subPurchaseOrderSnList\":[\"" + subPurchaseOrderSn + "\"]}"; @@ -386,7 +386,7 @@ namespace TemuKJD.KJDForms.ProductForms return ProductResponse.GetPostResponse(shop, url, body, refere); } - private string GetWarehouseList(DouShopLoginInfo shop, int page = 1) + private string GetWarehouseList(ShopLoginInfo shop, int page = 1) { page = Math.Max(page, 1); string url = "https://seller.kuajingmaihuo.com/marvel-mms/cn/api/kiana/venom/sales/management/listWarehouse"; @@ -402,7 +402,7 @@ namespace TemuKJD.KJDForms.ProductForms /// /// /// - private string QueryStockBaseInfo(DouShopLoginInfo shop, SubOrderInfo subOrderInfo) + private string QueryStockBaseInfo(ShopLoginInfo shop, SubOrderInfo subOrderInfo) { string url = "https://seller.kuajingmaihuo.com/oms/bg/venom/api/supplier/sales/management/queryStockBaseInfo"; string body = "{\"productSkcId\":" + subOrderInfo.productSkcId @@ -417,7 +417,7 @@ namespace TemuKJD.KJDForms.ProductForms /// /// /// - private string CreateStockOrder(DouShopLoginInfo shop, SubOrderInfo subOrderInfo) + private string CreateStockOrder(ShopLoginInfo shop, SubOrderInfo subOrderInfo) { string url = "https://seller.kuajingmaihuo.com/oms/bg/venom/api/supplier/sales/management/createStockOrder"; string body = "{\"productSkcId\":" + subOrderInfo.productSkcId + "," + @@ -505,7 +505,6 @@ namespace TemuKJD.KJDForms.ProductForms } string searchText = txtStockid.Text.Trim(); - btnCancelSubPurchaseOrder.Enabled = false; ucGroupBoxEx2.Enabled = false; ucGroupBoxEx3.Enabled = false; ucGroupBoxEx4.Enabled = false; @@ -653,8 +652,6 @@ namespace TemuKJD.KJDForms.ProductForms } string searchText = txtStockid.Text.Trim(); - btnListWarehouse.Enabled = false; - btnSearch.Enabled = false; ucGroupBoxEx2.Enabled = false; ucGroupBoxEx3.Enabled = false; ucGroupBoxEx4.Enabled = false; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs index 210bde3..ec557ce 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs @@ -99,13 +99,13 @@ namespace TemuKJD.KJDForms.SalesCenterForms dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } } - private void BindShop(DouShopLoginInfo shopEntity) + private void BindShop(ShopLoginInfo shopEntity) { if (shopEntity == null) return; @@ -236,7 +236,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms }, cancellationTokenSource.Token); } - public void GetSales(DouShopLoginInfo shop, bool isSales = true) + public void GetSales(ShopLoginInfo shop, bool isSales = true) { if (webBrowser == null) { @@ -340,7 +340,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms } if (webBrowser.Tag != null) { - var shop = webBrowser.Tag as DouShopLoginInfo; + var shop = webBrowser.Tag as ShopLoginInfo; var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); var clearForm = tab.Controls[0] as CouponShopForm; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs index 0fa00ad..dd06296 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs @@ -24,13 +24,13 @@ namespace TemuKJD.KJDForms.SalesCenterForms { private CheckBox chkSelectAll = null; - DouShopLoginInfo shop = null; + ShopLoginInfo shop = null; public CouponForm couponForm = null; public bool isGetProductSalesSuccess = false; public Dictionary dicProductSales = new Dictionary(); public List productList = new List(); - public CouponShopForm(DouShopLoginInfo _shop) + public CouponShopForm(ShopLoginInfo _shop) { InitializeComponent(); shop = _shop; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs index 0763877..a316f4d 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs @@ -15,7 +15,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms { public partial class FullMinusActiveForm : Form { - private DouShopLoginInfo shop = null; + private ShopLoginInfo shop = null; public List lstActiveId = new List(); public FullMinusForm fullMinusForm = null; private string _signature = ""; @@ -23,7 +23,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms public bool isGetActiveSuccess = false; public List activeList = new List(); - public FullMinusActiveForm(DouShopLoginInfo _shop = null) + public FullMinusActiveForm(ShopLoginInfo _shop = null) { InitializeComponent(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs index afe3bb7..473ae68 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs @@ -86,12 +86,12 @@ namespace TemuKJD.KJDForms.SalesCenterForms dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } } - private void BindShop(DouShopLoginInfo shopEntity) + private void BindShop(ShopLoginInfo shopEntity) { if (shopEntity == null) return; @@ -606,7 +606,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms }, cancellationTokenSource.Token); } - public void GetProductByCef(DouShopLoginInfo shop) + public void GetProductByCef(ShopLoginInfo shop) { if (webBrowser == null) { @@ -671,7 +671,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms headers[hk] = iRequest.Headers[hk]; } - var shop = webBrowser.Tag as DouShopLoginInfo; + var shop = webBrowser.Tag as ShopLoginInfo; var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); if (tab != null && this.btnManagerAct.Enabled == false) { @@ -1022,7 +1022,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms }, cancellationTokenSource.Token); } - public void GetActiveByCef(DouShopLoginInfo shop) + public void GetActiveByCef(ShopLoginInfo shop) { GetProductByCef(shop); } diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs index 96cb479..cf6204b 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs @@ -15,7 +15,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms { public partial class FullMinusShopForm : Form { - private DouShopLoginInfo shop = null; + private ShopLoginInfo shop = null; private CheckBox chkSelectAll = null; public List lstProductId = new List(); public FullMinusForm fullMinusForm = null; @@ -24,7 +24,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms private string _underline = ""; public bool isGetProductSuccess = false; - public FullMinusShopForm(DouShopLoginInfo _shop = null) + public FullMinusShopForm(ShopLoginInfo _shop = null) { InitializeComponent(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs index dfe797f..328b986 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs @@ -133,13 +133,13 @@ namespace TemuKJD.KJDForms.SalesCenterForms dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } } - private void BindShop(DouShopLoginInfo shopEntity) + private void BindShop(ShopLoginInfo shopEntity) { if (shopEntity == null) return; @@ -323,7 +323,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms }, cancellationTokenSource.Token); } - public void GetSales(DouShopLoginInfo shop, bool isSales = true) + public void GetSales(ShopLoginInfo shop, bool isSales = true) { if (webBrowser == null) { @@ -413,7 +413,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms Thread.Sleep(3000); } - public void GetProductByCef(DouShopLoginInfo shop) + public void GetProductByCef(ShopLoginInfo shop) { if (webBrowser == null) { @@ -487,7 +487,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms GroupBuyShopForm salesForm = null; Invoke(new Action(() => { - var shop = webBrowser.Tag as DouShopLoginInfo; + var shop = webBrowser.Tag as ShopLoginInfo; var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); salesForm = tab.Controls[0] as GroupBuyShopForm; })); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs index 310084c..66173f5 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs @@ -32,7 +32,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms } private CheckBox chkSelectAll = null; - DouShopLoginInfo shop = null; + ShopLoginInfo shop = null; public GroupBuyForm groupBuyForm = null; public bool isGetProductSuccess = false; public bool isGetSalesSuccess = false; @@ -41,7 +41,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms public Dictionary dicProductSales = new Dictionary(); public List productList = new List(); - public GroupBuyShopForm(DouShopLoginInfo _shop = null) + public GroupBuyShopForm(ShopLoginInfo _shop = null) { InitializeComponent(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs index 5f94b60..0048c16 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs @@ -16,7 +16,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms { public partial class LimitedSalesManagerActiveForm : Form { - private DouShopLoginInfo shop = null; + private ShopLoginInfo shop = null; private CheckBox chkSelectAll = null; public List lstActiveId = new List(); public SeckillingAndLimitedSalesForm seckillingAndLimitedSalesForm = null; @@ -26,7 +26,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms public List activeList = new List(); bool isAll = true; - public LimitedSalesManagerActiveForm(DouShopLoginInfo _shop = null) + public LimitedSalesManagerActiveForm(ShopLoginInfo _shop = null) { InitializeComponent(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs index e165014..581c668 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs @@ -245,13 +245,13 @@ namespace TemuKJD.KJDForms.SalesCenterForms dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } } - private void BindShop(DouShopLoginInfo shopEntity) + private void BindShop(ShopLoginInfo shopEntity) { if (shopEntity == null) return; @@ -412,7 +412,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms }, cancellationTokenSource.Token); } - public void GetProductByCef(DouShopLoginInfo shop) + public void GetProductByCef(ShopLoginInfo shop) { if (webBrowser == null) { @@ -480,7 +480,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms headers[hk] = iRequest.Headers[hk]; } - var shop = webBrowser.Tag as DouShopLoginInfo; + var shop = webBrowser.Tag as ShopLoginInfo; var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); var salesForm = tab.Controls[0] as SeckillingAndLimitedSalesShopForm; @@ -510,7 +510,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms headers[hk] = iRequest.Headers[hk]; } - var shop = webBrowser.Tag as DouShopLoginInfo; + var shop = webBrowser.Tag as ShopLoginInfo; var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopId + "Active"); var managerActiveForm = tab.Controls[0] as LimitedSalesManagerActiveForm; @@ -612,7 +612,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms }, addActiveCancellationTokenSource.Token); } - private void AddOrMdyActivity(DouShopLoginInfo shop, List productList, ActiveInfo active, + private void AddOrMdyActivity(ShopLoginInfo shop, List productList, ActiveInfo active, SeckillingAndLimitedSalesShopForm salesForm = null, LimitedSalesManagerActiveForm manageForm = null) { string activityName = ""; @@ -1319,7 +1319,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms }, cancellationTokenSource.Token); } - public void GetActiveByCef(DouShopLoginInfo shop) + public void GetActiveByCef(ShopLoginInfo shop) { if (webBrowser == null) { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs index 4f4a265..b3d5360 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs @@ -24,7 +24,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms { public partial class SeckillingAndLimitedSalesShopForm : Form { - private DouShopLoginInfo shop = null; + private ShopLoginInfo shop = null; private CheckBox chkSelectAll = null; private string _signature = ""; private string _timeSpan = ""; @@ -41,7 +41,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms } } - public SeckillingAndLimitedSalesShopForm(DouShopLoginInfo _shop = null) + public SeckillingAndLimitedSalesShopForm(ShopLoginInfo _shop = null) { InitializeComponent(); diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateAddForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.Designer.cs rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateAddForm.Designer.cs diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateAddForm.cs similarity index 99% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.cs rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateAddForm.cs index 328a1c3..1773474 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateAddForm.cs @@ -116,7 +116,7 @@ namespace TemuKJD.KJDForms.ShopForms } int count = 0; - public void RefreshDataGridView(DouShopLoginInfo shop,string message) + public void RefreshDataGridView(ShopLoginInfo shop,string message) { this.Invoke(new Action(() => { diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.resx b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateAddForm.resx similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.resx rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateAddForm.resx diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.Designer.cs rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateForm.Designer.cs diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateForm.cs similarity index 99% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.cs rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateForm.cs index 8b61f81..968ea39 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateForm.cs @@ -91,12 +91,12 @@ namespace TemuKJD.KJDForms.ShopForms dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity, selectIds); } } - private void BindShop(DouShopLoginInfo shopEntity, List selectShopId = null) + private void BindShop(ShopLoginInfo shopEntity, List selectShopId = null) { if (shopEntity == null) return; diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.resx b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateForm.resx similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.resx rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateForm.resx diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateListForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.Designer.cs rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateListForm.Designer.cs diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateListForm.cs similarity index 98% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.cs rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateListForm.cs index 56a040e..83f46e6 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateListForm.cs @@ -18,10 +18,10 @@ namespace TemuKJD.KJDForms.ShopForms { public partial class FreightTemplateListForm : Form { - public DouShopLoginInfo Shop = null; + public ShopLoginInfo Shop = null; public List LstTemplate = new List(); - public FreightTemplateListForm(DouShopLoginInfo shop = null) + public FreightTemplateListForm(ShopLoginInfo shop = null) { InitializeComponent(); diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.resx b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateListForm.resx similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.resx rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateListForm.resx diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNameForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.Designer.cs rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNameForm.Designer.cs diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNameForm.cs similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.cs rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNameForm.cs diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.resx b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNameForm.resx similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.resx rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNameForm.resx diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNotSendAreaForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.Designer.cs rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNotSendAreaForm.Designer.cs diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNotSendAreaForm.cs similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.cs rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNotSendAreaForm.cs diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.resx b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNotSendAreaForm.resx similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.resx rename to TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateNotSendAreaForm.resx diff --git a/TEMUKJD/KJDForms/ShopForms/MaterialManageForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Old/MaterialManageForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/MaterialManageForm.Designer.cs rename to TEMUKJD/KJDForms/ShopForms/Old/MaterialManageForm.Designer.cs diff --git a/TEMUKJD/KJDForms/ShopForms/MaterialManageForm.cs b/TEMUKJD/KJDForms/ShopForms/Old/MaterialManageForm.cs similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/MaterialManageForm.cs rename to TEMUKJD/KJDForms/ShopForms/Old/MaterialManageForm.cs diff --git a/TEMUKJD/KJDForms/ShopForms/MaterialManageForm.resx b/TEMUKJD/KJDForms/ShopForms/Old/MaterialManageForm.resx similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/MaterialManageForm.resx rename to TEMUKJD/KJDForms/ShopForms/Old/MaterialManageForm.resx diff --git a/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Old/ShopAuthForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/ShopForms/ShopAuthForm.Designer.cs rename to TEMUKJD/KJDForms/ShopForms/Old/ShopAuthForm.Designer.cs diff --git a/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.cs b/TEMUKJD/KJDForms/ShopForms/Old/ShopAuthForm.cs similarity index 99% rename from TEMUKJD/KJDForms/ShopForms/ShopAuthForm.cs rename to TEMUKJD/KJDForms/ShopForms/Old/ShopAuthForm.cs index 90023c4..9873b21 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/Old/ShopAuthForm.cs @@ -26,11 +26,11 @@ namespace TemuKJD.KJDForms.ShopForms public int CloseAfterSecond { get; set; } public string shopAuthUrl = "https://fuwu.jinritemai.com/authorize?service_id=815"; private ChromiumWebBrowser cefWebBrowser = null; - private DouShopLoginInfo shop = null; + private ShopLoginInfo shop = null; private bool isCefLoad = false; private string currentUrl = ""; - public ShopAuthForm(DouShopLoginInfo shopInfo) + public ShopAuthForm(ShopLoginInfo shopInfo) { InitializeComponent(); diff --git a/TEMUKJD/KJDForms/ShopForms/Old/ShopAuthForm.resx b/TEMUKJD/KJDForms/ShopForms/Old/ShopAuthForm.resx new file mode 100644 index 0000000..c963c3c --- /dev/null +++ b/TEMUKJD/KJDForms/ShopForms/Old/ShopAuthForm.resx @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + AAABAAEAgIAQYAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAABEZmbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMZmZkQAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAZszMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMxmAAAAAAAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMxkAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzGQAAAAAAAAAAAAAAAAAAAbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMYAAAAAAAAAAAAAAAAARszMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAABszMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAAAAAGzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAAAAbMzMzMzMzMzMzMzMzM + zMzMzMzMzMx3d4iIiIiIiIh3fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAABszMzMzMzMzMzM + zMzMzMzMzMzHeIiIiIj/////////iIiIiId8zMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAGzMzMzMzM + zMzMzMzMzMzMzMeIiI/////////////////////4iIh8zMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAATMzM + zMzMzMzMzMzMzMzMzHiI////////////////////////////iIfMzMzMzMzMzMzMzMzMzMzMxAAAAAAA + AGzMzMzMzMzMzMzMzMzMx3iP///////////////////////////////4iHzMzMzMzMzMzMzMzMzMzMYA + AAAAAAbMzMzMzMzMzMzMzMzMx3iP//////////////////////////////////+IfMzMzMzMzMzMzMzM + zMzMYAAAAABMzMzMzMzMzMzMzMzMx3iP/////////////////////////////////////4h8zMzMzMzM + zMzMzMzMzMQAAAAAbMzMzMzMzMzMzMzMzHiP////////////////////////////////////////h3zM + zMzMzMzMzMzMzMzGAAAABMzMzMzMzMzMzMzMzHiP//////////////////////////////////////// + //iHzMzMzMzMzMzMzMzMzEAAAAbMzMzMzMzMzMzMzMeI//////////////////////////////////// + ////////+IfMzMzMzMzMzMzMzMxgAABMzMzMzMzMzMzMzMx4//////////////////////////////// + //////////////+IfMzMzMzMzMzMzMzMxAAAbMzMzMzMzMzMzMzHj/////////////////////////// + /////////////////////4fMzMzMzMzMzMzMzMYAAMzMzMzMzMzMzMzMeP////////////////////// + ///////////////////////////4fMzMzMzMzMzMzMzMAAbMzMzMzMzMzMzMx4////////////////// + /////////////////////////////////4fMzMzMzMzMzMzMzGAGzMzMzMzMzMzMzHj///////////// + ///////////////////////////////////////4fMzMzMzMzMzMzMxgDMzMzMzMzMzMzMyI//////// + /////////////////////////////////////////////4zMzMzMzMzMzMzMwEzMzMzMzMzMzMzHj/// + //////////////////////////////////////////////////+HzMzMzMzMzMzMzMRszMzMzMzMzMzM + eP//////////////////////////////////////////////////////+HzMzMzMzMzMzMzGbMzMzMzM + zMzMzHj///////////////////////////////////////////////////////+MzMzMzMzMzMzMxmzM + zMzMzMzMzMyP////+IiP////////////////////////////////////////+I//////h8zMzMzMzMzM + zMZszMzMzMzMzMzHj////4iIiI//////////////////////////////////////+IiIj/////jMzMzM + zMzMzMzGbMzMzMzMzMzMyP////iIiIiI/////////////////////////////////////4iIiIj////4 + fMzMzMzMzMzMxszMzMzMzMzMzHj////4iIiIiP////////////////////////////////////+IiIiI + j////4zMzMzMzMzMzMbMzMzMzMzMzMx4////iIiIiIj////////////////////////////////////4 + iIiIiI////+HzMzMzMzMzMzMzMzMzMzMzMzMj////4iIiIiI//////////////+IiP//iI////////// + ////+IiIiIiP////h8zMzMzMzMzMzMzMzMzMzMzMzI/////4iIiIiP/////////////4d3eIiIeIj/// + //////////+IiIiIj/////jMzMzMzMzMzMzMzMzMzMzMzMyP////+IiIiIj/////////////iIiId3eI + iI//////////////iIiIiI/////4zMzMzMzMzMzMzMzMzMzMzMzHj/////+IiIiP/////////////4// + /4d4j/+P//////////////iIiIj/////+MzMzMzMzMzMzMzMzMzMzMzMx4//////+IiP//////////// + ///////4j///////////////////iIiP//////jMzMzMzMzMzMzMzMzMzMzMzMeP//////////+IiIj/ + ///////////////////////////////////////////4fMzMzMzMzMzMzMzMzMzMzMzH//////////+H + fMx8eP//////////////////////////iId3iP//////////+HzMzMzMzMzMzMzMzMzMzMzMyP////// + ///4fMzHh8eP////////////////////////+MzMzMd4//////////h8zMzMzMzMzMzMzMzMzMzMzMf/ + ////////+MzMePjMeP///////////////////////4zMzMeHx4/////////4fMzMzMzMzMzMzMzMzMzM + zMzH/////////4fMd3eHzMeP//////////////////////iMzMzIiHx4////////+HzMzMzMzMzMzMzM + zMzMzMzMx/////////+Hx4iIfMzMj//////////////////////4h3d8x4h8yP////////jMzMzMzMzM + zMzMzMzMzMzMzMeP////////+HiP+IfMzI//////////////////////+HiIiHd3zHj////////4zMzM + zMzMzMzMzMzMzMzMzMzHj/////////h4//+HzMeP//////////////////////h4//h8zMyP//////// + +MzMzMzMzMzMzMzMzMzMzMzMzI/////////4iP//h8x4///////////////////////4j//4fMzHj/// + //////jMzMzMzMzMzMzMzMzMzMzMzMyP///////4iIiP+IfHj///////////////////////+Ij/+HzM + eP/////////4zMzMzMzMzMzMzMzMzMzMzMzMj///////iIiIiIh3eP////////////////////////+I + j4h8x3iI////////h8zMzMzMzMzMzMzMzMzMzMzMzH//////+Hj///iIiI////////////////////// + /////4iId4iIiIj//////4zMzMzMzMzMzMzMzMzMzMzMzMx4//////iP////iP////////////////// + /////////////4iP//iI//////+MzMzMzMzMzMzMzMzMzMzMzMzMyP//////////+I////////////// + ///////////////////4eP//iP//////jMzMzMzMzMzMzMzMzMzMzMzMzMj///////////iP//////// + /////////////////////////4j/////////+HzMzMzMzMzMzMzMzMzMzMzMzMzHj/////////////// + //////////////////////////////+I//////////jMzMzMzMzMzMzMzMzMzMzMzMzMzI////////// + //////////////////////////////////////////////+HzMzMzMzMzMzMzMzMzMzMzMzMzMyP//// + ////////////////////////////////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzM + eP///////////////////////////////////////////////////////4zMzMzMzMzMzMzMzMzMzMzM + zMzMzMj///////////////////////////////////////////////////////h8zMzMzMzMzMzMzMzM + zMzMzMzMzMzHj//////////////////////////////////////////////////////4zMzMzMzMzMzM + zMzMzMzMzMzMzMzMzI//////////////////////////////////////////////////////h8zMzMzM + zMzMzMzMzMzMzMzMzMzMzMx4////////////////////////////////////////////////////+HzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMyI////+I//////////////////////////////////////////// + //h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP////+Ij///////////////////////////////////// + //////+HzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP////+IiIiIj//////////////////////////4 + ////iI/////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMiP/////4iIiP////////////////////// + ////+IiIiIj/////iHzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiP////////////////////////// + ///////////4iIj//////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiP//////////////////// + //////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiP////////////// + //////////////////////////////+HzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHj///////// + ///////////////////////////////////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP//// + ////////////////////////////////////////+MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzI + j/////////////////////////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMeP//////////////////////////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMx4////////+I//////////////////////////////////////jMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMeP///////4iIj///////////////////////////iP///////4fMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMx4////////iIiIiP///////////////////////4iIiP///////4zMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMj///////+IiIiIiI////////////////////+IiIiIj///////+HzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMx4////////iIiIiIj////////////////////4iIiIiIj/////// + +MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMj///////+IiIiIiI////////////////////+IiIiIiI// + //////h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx4////////iIiIiIiP////////////////////iIiI + iIiI///////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMj///////+IiIiIiIj/////iIiIiIiIj///// + /4iIiIiIiP///////4zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx4////////iIiIiIiI/////4zMzMzMzM + j/////+IiIiIiIiP//////+HzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP//////+IiIiIiIj/////+MzM + zMzMzI//////+IiIiIiIj///////+MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzI////////iIiIiIiI//// + //jMzMzMzMyP//////iIiIiIiIj///////jMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP///////4iIiIiI + iP/////4zMzMzMzMj//////4iIiIiIiI///////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzI////////iI + iIiIiI//////+MzMzMzMzI//////+IiIiIiIiP///////4zMzMzMzMzMzMzMzMzMzMzMzMzMzMyP//// + ///4iIiIiIiP//////fMzMzMzMyP//////+IiIiIiIj///////+MzMzMzMzMzMzMzMzMzMzMzMzMzMzH + j///////+IiIiIiI//////+HzMzMzMzMeP//////iIiIiIiIj///////jMzMzMzMzMzMzMzMzMzMzMzM + zMzMyP////////iIiIiIiP//////jMzMzMzMzHj///////iIiIiIiI///////4fMzMzMzMzMzMzMzMzM + zMzMzMzMzMj///////+IiIiIiI///////4zMzMzMzMzI///////4iIiIiIiI///////3zMzMzMzMzMzM + zMzMzMzMzMzMzMzI////////iIiIiIiP//////+MzMzMzMzMyP//////+IiIiIiIiP//////+MzMzMzM + zMzMzMzMzMzMzMzMzMzMeP///////4iIiIiIj///////jMzMzMzMzMj///////+IiIiIiIj///////jM + zMzMzMzMzMzMzMzMzMzMzMzMzI////////+IiIiIiP//////+HzMzMzMzMzHj///////iIiIiIiI//// + ///4zMzMzMzMzMzMzMzMzMzMzMzMzMyP////////iIiIiI////////jMzMzMzMzMzI///////4iIiIiI + iI//////+MzMzMzMzMzMzMzMzMzMzMzMzMzMj////////4iIiIiP///////4zMzMzMzMzMyP///////4 + iIiIiIiP//////jMzMzMzMzMzMzMzMzMzMzMzMzMzI////////+IiIiI////////h8zMzMzMzMzMeP// + /////4iIiIiIj//////4fMzMzMzMzMzMzMzMzMzMzMzMzMyP////////iIiIj////////4fMzMzMzMzM + zHj///////+IiIiIiI//////+HzMzMzMzMzMzMzMzMzMzMzMzMzHj/////////iIiP////////+MzMzM + zMzMzMzI////////+IiIiIiP//////h8zMzMzMzMzMzMxmzMzMzMzMzMx4/////////4iP/////////4 + fMzMzMzMzMzMx4////////+IiIiIj//////4fMzMzMzMzMzMzMZszMzMzMzMzMeP//////////////// + ////+MzMzMzMzMzMzMyP////////iIiIiP//////+HzMzMzMzMzMzMzGbMzMzMzMzMzH//////////// + //////////fMzMzMzMzMzMzMeP////////iIiIj///////98zMzMzMzMzMzMxmzMzMzMzMzMyP////// + //////////////+HzMzMzMzMzMzMzHj/////////+IiP////////jMzMzMzMzMzMzMZszMzMzMzMzMj/ + ////////////////////jMzMzMzMzMzMzMzIj////////////////////4zMzMzMzMzMzMzGTMzMzMzM + zMzH////////////////////+HzMzMzMzMzMzMzMx4////////////////////+MzMzMzMzMzMzMxAzM + zMzMzMzMx/////////////////////jMzMzMzMzMzMzMzMyI///////////////////4fMzMzMzMzMzM + zMAGzMzMzMzMzMeP//////////////////+HzMzMzMzMzMzMzMzMeP//////////////////+HzMzMzM + zMzMzMxgBszMzMzMzMzHj//////////////////4fMzMzMzMzMzMzMzMzMeP//////////////////h8 + zMzMzMzMzMzMYADMzMzMzMzMzI//////////////////+HzMzMzMzMzMzMzMzMzHj/////////////// + ///4zMzMzMzMzMzMzAAAbMzMzMzMzMyP/////////////////4fMzMzMzMzMzMzMzMzMzHj///////// + ////////+MzMzMzMzMzMzMYAAEzMzMzMzMzMj/////////////////+MzMzMzMzMzMzMzMzMzMzIj/// + /////////////4fMzMzMzMzMzMzEAAAGzMzMzMzMzHj////////////////4fMzMzMzMzMzMzMzMzMzM + x4////////////////+MzMzMzMzMzMzMYAAABMzMzMzMzMx4////////////////h8zMzMzMzMzMzMzM + zMzMzMx4///////////////4fMzMzMzMzMzMzEAAAABszMzMzMzMx4//////////////+HzMzMzMzMzM + zMzMzMzMzMzMx4//////////////+MzMzMzMzMzMzMYAAAAATMzMzMzMzMyP/////////////4fMzMzM + zMzMzMzMzMzMzMzMzMeI/////////////4fMzMzMzMzMzMzEAAAAAAbMzMzMzMzMeP////////////h8 + zMzMzMzMzMzMzMzMzMzMzMzMeI////////////h8zMzMzMzMzMzMYAAAAAAAbMzMzMzMzMeP//////// + //iHzMzMzMzMzMzMzMzMzMzMzMzMzMyI//////////+HzMzMzMzMzMzMxgAAAAAAAEzMzMzMzMzMeP// + //////iHfMzMzMzMzMzMzMzMzMzMzMzMzMzMx4/////////4fMzMzMzMzMzMzMQAAAAAAAAGzMzMzMzM + zMeI//////iHfMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx4j//////4h8zMzMzMzMzMzMxgAAAAAAAAAGzM + zMzMzMzMx4iIiIiHzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiIj/+Ih3zMzMzMzMzMzMzGAAAAAAAA + AAAGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx3iId8zMzMzMzMzMzMzMYAAA + AAAAAAAAAGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + xgAAAAAAAAAAAAAGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzGAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzGQAAAAAAAAAAAAAAAAAbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMYAAAAAAAAAAAAAAAAAAARszMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAABGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAAAAAAAABmzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzGYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARGZmzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMZmZEAAAAAAAAAAAAAAAAD////+AAAAAAAAAAD/////////AAAA + AAAAAAAAAP//////+AAAAAAAAAAAAAAf/////+AAAAAAAAAAAAAAB/////+AAAAAAAAAAAAAAAH////+ + AAAAAAAAAAAAAAAAf////AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAAP///gAAAAAAAAAAAAAAAA + B///wAAAAAAAAAAAAAAAAAP//4AAAAAAAAAAAAAAAAAB//8AAAAAAAAAAAAAAAAAAP/+AAAAAAAAAAAA + AAAAAAB//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAAAAAAAAAf+AAAAAAA + AAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAAAAAAAAAAAAAAB+AA + AAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAA + AAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABAAAAAAAA + AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAADwAAAAAAA + AAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AA + AAAAAAAAAAAAAAAAAA/4AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAA + AD/+AAAAAAAAAAAAAAAAAAB//gAAAAAAAAAAAAAAAAAAf/8AAAAAAAAAAAAAAAAAAP//gAAAAAAAAAAA + AAAAAAH//8AAAAAAAAAAAAAAAAAD///gAAAAAAAAAAAAAAAAB///8AAAAAAAAAAAAAAAAA////wAAAAA + AAAAAAAAAAA////+AAAAAAAAAAAAAAAAf////4AAAAAAAAAAAAAAAf/////gAAAAAAAAAAAAAAf///// + +AAAAAAAAAAAAAAf//////8AAAAAAAAAAAAA/////////gAAAAAAAAAAf////w== + + + \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.Designer.cs index f090e99..a4c3cfc 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.Designer.cs @@ -44,12 +44,16 @@ this.label1 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.btnOk = new TemuKJD.UserControls.ButtonEx(); + this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label8 = new System.Windows.Forms.Label(); this.panel2.SuspendLayout(); this.SuspendLayout(); // // panel2 // this.panel2.BackColor = System.Drawing.Color.White; + this.panel2.Controls.Add(this.label8); + this.panel2.Controls.Add(this.txtNotes); this.panel2.Controls.Add(this.label7); this.panel2.Controls.Add(this.cmbGroup); this.panel2.Controls.Add(this.txtBuyAccount); @@ -91,7 +95,7 @@ "上货", "数据", "登录"}); - this.cmbGroup.Location = new System.Drawing.Point(91, 169); + this.cmbGroup.Location = new System.Drawing.Point(91, 257); this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(172, 25); this.cmbGroup.TabIndex = 383; @@ -108,7 +112,7 @@ this.txtBuyAccount.Border.PaddingLeft = 2; this.txtBuyAccount.Border.PaddingRight = 2; this.txtBuyAccount.Border.PaddingTop = 2; - this.txtBuyAccount.Location = new System.Drawing.Point(91, 134); + this.txtBuyAccount.Location = new System.Drawing.Point(91, 240); this.txtBuyAccount.Name = "txtBuyAccount"; this.txtBuyAccount.Size = new System.Drawing.Size(172, 23); this.txtBuyAccount.TabIndex = 382; @@ -120,7 +124,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(29, 137); + this.label6.Location = new System.Drawing.Point(29, 243); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(56, 17); this.label6.TabIndex = 381; @@ -224,7 +228,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(29, 172); + this.label5.Location = new System.Drawing.Point(29, 260); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(56, 17); this.label5.TabIndex = 377; @@ -247,6 +251,35 @@ this.btnOk.UseVisualStyleBackColor = false; this.btnOk.Click += new System.EventHandler(this.btnOk_Click); // + // txtNotes + // + // + // + // + this.txtNotes.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.Class = "CrumbBarBackgroundKey"; + this.txtNotes.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txtNotes.Border.PaddingBottom = 2; + this.txtNotes.Border.PaddingLeft = 2; + this.txtNotes.Border.PaddingRight = 2; + this.txtNotes.Border.PaddingTop = 2; + this.txtNotes.Location = new System.Drawing.Point(91, 133); + this.txtNotes.Name = "txtNotes"; + this.txtNotes.Size = new System.Drawing.Size(172, 23); + this.txtNotes.TabIndex = 385; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(29, 135); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(56, 17); + this.label8.TabIndex = 386; + this.label8.Text = " 备注"; + // // ShopAddEditForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -282,5 +315,7 @@ private System.Windows.Forms.Label label4; private System.Windows.Forms.ComboBox cmbGroup; private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label8; + private DevComponents.DotNetBar.Controls.TextBoxX txtNotes; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs index a2e11fd..86b1789 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs @@ -15,10 +15,10 @@ namespace TemuKJD.KJDForms.ShopForms { public partial class ShopAddEditForm : LRBaseForm { - DouShopLoginInfo shopLoginInfo = null; + ShopLoginInfo shopLoginInfo = null; bool isAdd = true; - public ShopAddEditForm(DouShopLoginInfo shop = null) + public ShopAddEditForm(ShopLoginInfo shop = null) { InitializeComponent(); shopLoginInfo = shop; @@ -40,12 +40,23 @@ namespace TemuKJD.KJDForms.ShopForms } if (shopLoginInfo == null) - shopLoginInfo = new DouShopLoginInfo(); + shopLoginInfo = new ShopLoginInfo(); shopLoginInfo.LoginName = this.txtLoginName.Text.Trim(); if (!string.IsNullOrEmpty(this.txtShopPassword.Text.Trim())) shopLoginInfo.Password = DataOpenSSL.EncryptString(this.txtShopPassword.Text.Trim()); - shopLoginInfo.Group = this.cmbGroup.Text; + shopLoginInfo.GroupName = this.cmbGroup.Text; + shopLoginInfo.Notes = this.txtNotes.Text; + shopLoginInfo.CompanyName = AllBase.BaseClass.CompanyName; + + // 同一个登录账号下的店铺使用同样的groupName和Notes + var shopLst = GlobalConfig.ShopLoginList.Where(s => s.LoginName == shopLoginInfo.LoginName && s.ShopId != shopLoginInfo.ShopId).ToList(); + foreach (var shop in shopLst) + { + shop.GroupName = shopLoginInfo.GroupName; + shop.Notes = shopLoginInfo.Notes; + } + this.OnSaveComplete(shopLoginInfo, isAdd); this.Close(); } @@ -61,13 +72,14 @@ namespace TemuKJD.KJDForms.ShopForms this.cmbGroup.Items.Add(string.Empty); foreach (var shop in GlobalConfig.ShopLoginList) { - if (!string.IsNullOrEmpty(shop.Group) && !this.cmbGroup.Items.Contains(shop.Group)) - this.cmbGroup.Items.Add(shop.Group); + if (!string.IsNullOrEmpty(shop.GroupName) && !this.cmbGroup.Items.Contains(shop.GroupName)) + this.cmbGroup.Items.Add(shop.GroupName); } if (shopLoginInfo != null) { this.txtLoginName.Text = shopLoginInfo.LoginName; - this.cmbGroup.Text = shopLoginInfo.Group; + this.cmbGroup.Text = shopLoginInfo.GroupName; + this.txtNotes.Text = shopLoginInfo.Notes; this.btnOk.Text = "更新"; this.TitleText = "编辑店铺 - " + shopLoginInfo.ShopAccount; this.txtBuyAccount.Text = shopLoginInfo.BuyAccount; @@ -109,7 +121,7 @@ namespace TemuKJD.KJDForms.ShopForms private void F_SaveComplete(object obj) { - var shop = obj as DouShopLoginInfo; + var shop = obj as ShopLoginInfo; if (shop != null) { this.txtBuyAccount.Text = shop.BuyAccount; diff --git a/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs index 59bd19f..33cd31d 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs @@ -33,14 +33,16 @@ System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("运费模板"); System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("高级运费模板"); System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("素材库管理"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("超级用户管理"); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("超级店铺管理"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("超级用户管理"); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] { treeNode1, treeNode2, treeNode3, treeNode4, treeNode5, - treeNode6}); + treeNode6, + treeNode7}); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); @@ -141,12 +143,14 @@ treeNode4.Text = "高级运费模板"; treeNode5.Name = "素材库管理"; treeNode5.Text = "素材库管理"; - treeNode6.Name = "超级用户管理"; - treeNode6.Text = "超级用户管理"; - treeNode7.Name = "店铺管理"; - treeNode7.Text = "店铺管理"; + treeNode6.Name = "超级店铺管理"; + treeNode6.Text = "超级店铺管理"; + treeNode7.Name = "超级用户管理"; + treeNode7.Text = "超级用户管理"; + treeNode8.Name = "店铺管理"; + treeNode8.Text = "店铺管理"; this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode7}); + treeNode8}); this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); this.tv.Size = new System.Drawing.Size(140, 461); this.tv.TabIndex = 1; diff --git a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs index 21c7ca4..f45535e 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -using TemuKJD.KJDForms.AccountForms; +using TemuKJD.KJDForms.AdminForms; namespace TemuKJD.KJDForms.ShopForms { @@ -20,7 +20,8 @@ namespace TemuKJD.KJDForms.ShopForms public Lazy freightForm = new Lazy(); public Lazy freightTemplateForm = new Lazy(); public Lazy materialManageForm = new Lazy(); - public Lazy mainAccountForm = new Lazy(); + public Lazy adminAccountForm = new Lazy(); + public Lazy adminShopForm = new Lazy(); public ShopForm() { @@ -31,12 +32,17 @@ namespace TemuKJD.KJDForms.ShopForms tv.SelectedNode = tv.Nodes[0].Nodes[0]; tv.ExpandGroup(tv.Nodes[0].Name); - List hideName = new List() { "高级运费模板", "运费模板", "素材库管理", "超级用户管理" }; + List hideName = new List() { "用户管理", "高级运费模板", "运费模板", "素材库管理", "超级用户管理", "超级店铺管理" }; - if (BaseClass.GroupId != 3) - hideName.Add("用户管理"); - if (BaseClass.GroupId == 3 && (BaseClass.UserName == "18888888888" || BaseClass.UserName == "15266666666")) - hideName.Remove("超级用户管理"); + if (BaseClass.GroupId == 3) + { + hideName.Remove("用户管理"); + if (BaseClass.UserName == "18888888888" || BaseClass.UserName == "15333333333") + { + hideName.Remove("超级用户管理"); + hideName.Remove("超级店铺管理"); + } + } foreach (var item in hideName) { @@ -77,7 +83,10 @@ namespace TemuKJD.KJDForms.ShopForms SetForm(materialManageForm.Value); break; case "超级用户管理": - SetForm(mainAccountForm.Value); + SetForm(adminAccountForm.Value); + break; + case "超级店铺管理": + SetForm(adminShopForm.Value); break; } })); diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs index 4bfdd2f..15cc19a 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs @@ -39,20 +39,27 @@ this.btnLoginSelect = new TemuKJD.UserControls.ButtonEx(); this.btnCheck = new TemuKJD.UserControls.ButtonEx(); this.panel4 = new System.Windows.Forms.Panel(); + this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnSearch = new TemuKJD.UserControls.ButtonEx(); + this.txtNotes = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.txtShopName = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.txtShopId = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); this.btnImport = new TemuKJD.UserControls.ButtonEx(); this.btnAddShop = new TemuKJD.UserControls.ButtonEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.chkAutoDrag = new System.Windows.Forms.CheckBox(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.conNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCookie = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSubUser = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colGroupName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colUploadAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colBuyAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colChatAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -66,6 +73,8 @@ this.colCopyCookies = new System.Windows.Forms.DataGridViewLinkColumn(); this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); + this.chkAutoDrag = new System.Windows.Forms.CheckBox(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -187,6 +196,14 @@ // // panel4 // + this.panel4.Controls.Add(this.pnlEmpty); + this.panel4.Controls.Add(this.btnSearch); + this.panel4.Controls.Add(this.txtNotes); + this.panel4.Controls.Add(this.label4); + this.panel4.Controls.Add(this.txtShopName); + this.panel4.Controls.Add(this.label3); + this.panel4.Controls.Add(this.txtShopId); + this.panel4.Controls.Add(this.label2); this.panel4.Controls.Add(this.btnImport); this.panel4.Controls.Add(this.btnAddShop); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; @@ -195,6 +212,94 @@ this.panel4.Size = new System.Drawing.Size(822, 40); this.panel4.TabIndex = 0; // + // pnlEmpty + // + this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; + this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlEmpty.Location = new System.Drawing.Point(769, 9); + this.pnlEmpty.Name = "pnlEmpty"; + this.pnlEmpty.Size = new System.Drawing.Size(66, 26); + this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pnlEmpty.Style.GradientAngle = 90; + this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.pnlEmpty.TabIndex = 409; + this.pnlEmpty.Text = "清空条件"; + this.pnlEmpty.Click += new System.EventHandler(this.btnEmpty_Click); + // + // btnSearch + // + this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSearch.ForeColor = System.Drawing.Color.White; + this.btnSearch.Location = new System.Drawing.Point(698, 9); + this.btnSearch.Margin = new System.Windows.Forms.Padding(2); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(66, 26); + this.btnSearch.TabIndex = 372; + this.btnSearch.Text = "搜索"; + this.btnSearch.UseVisualStyleBackColor = false; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // + // txtNotes + // + this.txtNotes.Location = new System.Drawing.Point(574, 11); + this.txtNotes.Name = "txtNotes"; + this.txtNotes.Size = new System.Drawing.Size(110, 23); + this.txtNotes.TabIndex = 376; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(538, 14); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(44, 17); + this.label4.TabIndex = 377; + this.label4.Text = "备注："; + // + // txtShopName + // + this.txtShopName.Location = new System.Drawing.Point(415, 11); + this.txtShopName.Name = "txtShopName"; + this.txtShopName.Size = new System.Drawing.Size(110, 23); + this.txtShopName.TabIndex = 374; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(367, 14); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(56, 17); + this.label3.TabIndex = 375; + this.label3.Text = "店铺名："; + // + // txtShopId + // + this.txtShopId.Location = new System.Drawing.Point(245, 11); + this.txtShopId.Name = "txtShopId"; + this.txtShopId.Size = new System.Drawing.Size(110, 23); + this.txtShopId.TabIndex = 372; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(197, 14); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(55, 17); + this.label2.TabIndex = 373; + this.label2.Text = "店铺id："; + // // btnImport // this.btnImport.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -284,9 +389,10 @@ this.colLoginName, this.colShopId, this.colShopAccount, + this.conNotes, this.colCookie, this.colSubUser, - this.colGroup, + this.colGroupName, this.colUploadAccount, this.colBuyAccount, this.colChatAccount, @@ -311,31 +417,6 @@ this.dgvShop.TabIndex = 5; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // - // chkAutoDrag - // - this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.chkAutoDrag.AutoSize = true; - this.chkAutoDrag.BackColor = System.Drawing.Color.White; - this.chkAutoDrag.Location = new System.Drawing.Point(907, 2); - this.chkAutoDrag.Name = "chkAutoDrag"; - this.chkAutoDrag.Size = new System.Drawing.Size(159, 21); - this.chkAutoDrag.TabIndex = 3; - this.chkAutoDrag.Text = "登录时自动滑动拼图验证"; - this.chkAutoDrag.UseVisualStyleBackColor = false; - this.chkAutoDrag.Visible = false; - this.chkAutoDrag.Click += new System.EventHandler(this.chkAutoDrag_Click); - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1063, 28); - this.statusBar.TabIndex = 1; - // // colSelect // this.colSelect.FillWeight = 26F; @@ -347,14 +428,14 @@ // // colLoginName // - this.colLoginName.FillWeight = 69.42601F; + this.colLoginName.FillWeight = 69.426F; this.colLoginName.HeaderText = "店铺登录号码"; this.colLoginName.Name = "colLoginName"; this.colLoginName.ReadOnly = true; // // colShopId // - this.colShopId.FillWeight = 69.42601F; + this.colShopId.FillWeight = 69.426F; this.colShopId.HeaderText = "店铺Id"; this.colShopId.Name = "colShopId"; this.colShopId.ReadOnly = true; @@ -365,6 +446,12 @@ this.colShopAccount.Name = "colShopAccount"; this.colShopAccount.ReadOnly = true; // + // conNotes + // + this.conNotes.HeaderText = "备注"; + this.conNotes.Name = "conNotes"; + this.conNotes.ReadOnly = true; + // // colCookie // this.colCookie.HeaderText = "店铺Cookie"; @@ -379,17 +466,17 @@ this.colSubUser.Name = "colSubUser"; this.colSubUser.ReadOnly = true; // - // colGroup + // colGroupName // - this.colGroup.FillWeight = 69.42601F; - this.colGroup.HeaderText = "店铺分组"; - this.colGroup.Name = "colGroup"; - this.colGroup.ReadOnly = true; - this.colGroup.Visible = false; + this.colGroupName.FillWeight = 69.426F; + this.colGroupName.HeaderText = "店铺分组"; + this.colGroupName.Name = "colGroupName"; + this.colGroupName.ReadOnly = true; + this.colGroupName.Visible = false; // // colUploadAccount // - this.colUploadAccount.FillWeight = 69.42601F; + this.colUploadAccount.FillWeight = 69.426F; this.colUploadAccount.HeaderText = "上货账户"; this.colUploadAccount.Name = "colUploadAccount"; this.colUploadAccount.ReadOnly = true; @@ -397,7 +484,7 @@ // // colBuyAccount // - this.colBuyAccount.FillWeight = 69.42601F; + this.colBuyAccount.FillWeight = 69.426F; this.colBuyAccount.HeaderText = "采购账户"; this.colBuyAccount.Name = "colBuyAccount"; this.colBuyAccount.ReadOnly = true; @@ -405,7 +492,7 @@ // // colChatAccount // - this.colChatAccount.FillWeight = 69.42601F; + this.colChatAccount.FillWeight = 69.426F; this.colChatAccount.HeaderText = "客服账户"; this.colChatAccount.Name = "colChatAccount"; this.colChatAccount.ReadOnly = true; @@ -458,7 +545,7 @@ // // colApiAuth // - this.colApiAuth.FillWeight = 69.42601F; + this.colApiAuth.FillWeight = 69.426F; this.colApiAuth.HeaderText = "上货授权"; this.colApiAuth.Name = "colApiAuth"; this.colApiAuth.ReadOnly = true; @@ -468,7 +555,7 @@ // // colBuyApiAuth // - this.colBuyApiAuth.FillWeight = 69.42601F; + this.colBuyApiAuth.FillWeight = 69.426F; this.colBuyApiAuth.HeaderText = "拍单授权"; this.colBuyApiAuth.Name = "colBuyApiAuth"; this.colBuyApiAuth.ReadOnly = true; @@ -501,6 +588,31 @@ this.colDelete.Name = "colDelete"; this.colDelete.ReadOnly = true; // + // chkAutoDrag + // + this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.chkAutoDrag.AutoSize = true; + this.chkAutoDrag.BackColor = System.Drawing.Color.White; + this.chkAutoDrag.Location = new System.Drawing.Point(907, 2); + this.chkAutoDrag.Name = "chkAutoDrag"; + this.chkAutoDrag.Size = new System.Drawing.Size(159, 21); + this.chkAutoDrag.TabIndex = 3; + this.chkAutoDrag.Text = "登录时自动滑动拼图验证"; + this.chkAutoDrag.UseVisualStyleBackColor = false; + this.chkAutoDrag.Visible = false; + this.chkAutoDrag.Click += new System.EventHandler(this.chkAutoDrag_Click); + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1063, 28); + this.statusBar.TabIndex = 1; + // // ShopListForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); @@ -522,6 +634,7 @@ this.tableLayoutPanel2.ResumeLayout(false); this.panel5.ResumeLayout(false); this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); this.splitContainer2.Panel1.ResumeLayout(false); this.splitContainer2.Panel2.ResumeLayout(false); this.splitContainer2.Panel2.PerformLayout(); @@ -551,13 +664,21 @@ private System.Windows.Forms.CheckBox chkAutoDrag; private UserControls.ButtonEx btnRefreshAuth; private System.Windows.Forms.PictureBox pbLoading; + private System.Windows.Forms.TextBox txtShopName; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox txtShopId; + private System.Windows.Forms.Label label2; + private UserControls.ButtonEx btnSearch; + private System.Windows.Forms.TextBox txtNotes; + private System.Windows.Forms.Label label4; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName; private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount; + private System.Windows.Forms.DataGridViewTextBoxColumn conNotes; private System.Windows.Forms.DataGridViewTextBoxColumn colCookie; private System.Windows.Forms.DataGridViewTextBoxColumn colSubUser; - private System.Windows.Forms.DataGridViewTextBoxColumn colGroup; + private System.Windows.Forms.DataGridViewTextBoxColumn colGroupName; private System.Windows.Forms.DataGridViewTextBoxColumn colUploadAccount; private System.Windows.Forms.DataGridViewTextBoxColumn colBuyAccount; private System.Windows.Forms.DataGridViewTextBoxColumn colChatAccount; @@ -571,5 +692,6 @@ private System.Windows.Forms.DataGridViewLinkColumn colCopyCookies; private System.Windows.Forms.DataGridViewLinkColumn colEdit; private System.Windows.Forms.DataGridViewLinkColumn colDelete; + private DevComponents.DotNetBar.PanelEx pnlEmpty; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs index f9a5969..39643e4 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs @@ -29,7 +29,7 @@ namespace TemuKJD.KJDForms.ShopForms private bool isLoading { get; set; } = false; #region 服务端店铺管理 - public static string AddServerDouShop(DouShopLoginInfo _shop) + public static string AddServerDouShop(ShopLoginInfo _shop) { var url = BaseClass.BuildObjString("shop/add_shop"); var data = UserLogin.GetSignaturex() @@ -38,8 +38,10 @@ namespace TemuKJD.KJDForms.ShopForms + "&shop_id=" + _shop.ShopId + "&shop_account=" + _shop.ShopAccount + "&cookie=" + _shop.Cookies - + "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.Group) - + "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName); + + "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.GroupName) + + "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName) + + "¬es=" + GetHtml.UrlEncodeUtf8(_shop.Notes) + + "&login_status=" + _shop.LoginStatus; var result = GetHtml.PostUtf8(url, data); if (!result.Contains("\"code\":200") && !result.Contains("已达上限") && !result.Contains("已存在")) @@ -56,14 +58,15 @@ namespace TemuKJD.KJDForms.ShopForms return result; } - public static string MdyServerDouShop(DouShopLoginInfo _shop) + public static string MdyServerDouShop(ShopLoginInfo _shop) { var url = BaseClass.BuildObjString("shop/mdy_shop"); var data = UserLogin.GetSignaturex() + "&login_name=" + _shop.LoginName + "&login_pass=" + GetHtml.UrlEncodeUtf8(_shop.Password) - + "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.Group) - + "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName); + + "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.GroupName) + + "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName) + + "¬es=" + GetHtml.UrlEncodeUtf8(_shop.Notes); var result = GetHtml.PostUtf8(url, data); if (!result.Contains("\"code\":200") && !result.Contains("已达上限") && !result.Contains("已存在")) @@ -80,9 +83,9 @@ namespace TemuKJD.KJDForms.ShopForms return result; } - public static List GetServerDouShop() + public static List GetServerShop() { - List list = new List(); + List list = new List(); int page = 0; while (true) @@ -109,7 +112,7 @@ namespace TemuKJD.KJDForms.ShopForms foreach (JObject jObj in jArr) { string shopStr = jObj.ToString(); - DouShopLoginInfo shop = new DouShopLoginInfo(); + ShopLoginInfo shop = new ShopLoginInfo(); shop.DbId = BaseRegex.GetStringJson(ref shopStr, "id"); if (shop.DbId == null) continue; @@ -117,10 +120,14 @@ namespace TemuKJD.KJDForms.ShopForms shop.Password = BaseRegex.GetStringJson(ref shopStr, "login_pass"); shop.ShopId = BaseRegex.GetStringJson(ref shopStr, "shop_id"); shop.ShopAccount = BaseRegex.GetStringJson(ref shopStr, "shop_account"); + shop.UserName = BaseRegex.GetStringJson(ref shopStr, "user_name"); shop.SubUserName = BaseRegex.GetStringJson(ref shopStr, "sub_user_name"); - shop.Group = BaseRegex.GetStringJson(ref shopStr, "shop_group"); + shop.GroupName = BaseRegex.GetStringJson(ref shopStr, "shop_group"); shop.Cookies = BaseRegex.GetStringJson(ref shopStr, "cookie"); shop.Cookies = shop.Cookies.Replace("＆", "&").Replace("％", "%").Replace("＋", "+"); + shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name"); + shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes"); + shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status"); //shop.PayStatus = BaseRegex.GetIntJson(ref shopStr, "shop_pay_status"); //if (list.Any(l => l.ShopId == shop.ShopId) || list.Any(l => l.ShopName == shop.ShopName)) // continue; @@ -167,7 +174,7 @@ namespace TemuKJD.KJDForms.ShopForms return list; } - public static void UpdateShopTokens(List shops) + public static void UpdateShopTokens(List shops) { string shopIds = ""; foreach (var shop in shops) @@ -247,13 +254,13 @@ namespace TemuKJD.KJDForms.ShopForms /// 店铺名称 /// cookies /// 工具名称（可不填写） - public static void UpdateServerShopCookies(DouShopLoginInfo shop, string shopCookies, string fromTool = null) + public static void UpdateServerShopCookies(ShopLoginInfo shop, string shopCookies, string fromTool = null) { var fTool = string.IsNullOrEmpty(fromTool) ? "" : "&from_tool=" + fromTool; - var url = BaseClass.BuildObjString("shop/mdy_shop"); + var url = BaseClass.BuildObjString("shop/mdy_shop_cookie_and_login_status"); var data = UserLogin.GetSignaturex() + "&login_name=" + shop.LoginName - + "&sub_user_name=" + shop.SubUserName + + "&login_status=" + shop.LoginStatus + "&cookie=" + shopCookies.Replace("&", "＆").Replace("%", "％").Replace("+", "＋") + fTool; var result = GetHtml.PostUtf8(url, data); @@ -303,7 +310,7 @@ namespace TemuKJD.KJDForms.ShopForms private void Sae_SaveComplete(object obj, object isAdd) { - var shopInfo = obj as DouShopLoginInfo; + var shopInfo = obj as ShopLoginInfo; if (shopInfo != null) { if ((isAdd as bool?) == true) @@ -375,14 +382,14 @@ namespace TemuKJD.KJDForms.ShopForms var productArr = strArr[i].Split(new string[] { "-----" }, StringSplitOptions.RemoveEmptyEntries); if (productArr.Length >= 2) { - DouShopLoginInfo shop = new DouShopLoginInfo + ShopLoginInfo shop = new ShopLoginInfo { LoginName = productArr[0], Password = DataOpenSSL.EncryptString(productArr[1]), }; if (productArr.Length >= 3) { - shop.Group = productArr[3]; + shop.GroupName = productArr[3]; } //ShopLoginForm shopLoginForm = new ShopLoginForm(shop); @@ -394,7 +401,7 @@ namespace TemuKJD.KJDForms.ShopForms if (shopInfo != null) { shopInfo.Password = shop.Password; - shopInfo.Group = shop.Group; + shopInfo.GroupName = shop.GroupName; } else GlobalConfig.ShopLoginList.Add(shop); @@ -432,6 +439,19 @@ namespace TemuKJD.KJDForms.ShopForms || GlobalConfig.ShopLoginList.Where(ss=>ss.LoginName == s.LoginName).Count() == 1) .OrderBy(s=>s.LoginName).ToList(); + if (!string.IsNullOrEmpty(txtNotes.Text)) + { + shopList = shopList.Where(s => s.Notes.ParseToString().ToLower().Contains(txtNotes.Text.ToLower())).ToList(); + } + if (!string.IsNullOrEmpty(txtShopId.Text)) + { + shopList = shopList.Where(s => s.ShopId.ParseToString().ToLower().Contains(txtShopId.Text.ToLower())).ToList(); + } + if (!string.IsNullOrEmpty(txtShopName.Text)) + { + shopList = shopList.Where(s => s.ShopAccount.ParseToString().ToLower().Contains(txtShopName.Text.ToLower())).ToList(); + } + this.Invoke(new Action(() => { this.dgvShop.Rows.Clear(); @@ -465,7 +485,7 @@ namespace TemuKJD.KJDForms.ShopForms }); } - private void AddDataGridViewRow(DouShopLoginInfo param, bool isRefresh = false) + private void AddDataGridViewRow(ShopLoginInfo param, bool isRefresh = false) { if (!this.Created) return; @@ -490,9 +510,10 @@ namespace TemuKJD.KJDForms.ShopForms param.LoginName, param.ShopId, param.ShopAccount, + param.Notes, param.Cookies, param.SubUserName, - param.Group, + param.GroupName, param.UploadAccount, param.BuyAccount, param.ChatAccount, @@ -515,7 +536,7 @@ namespace TemuKJD.KJDForms.ShopForms })); } - private void UpdateDataGridViewRowToken(DataGridViewRow dgvr, DouShopLoginInfo param) + private void UpdateDataGridViewRowToken(DataGridViewRow dgvr, ShopLoginInfo param) { if (dgvr == null || param == null) return; @@ -524,7 +545,9 @@ namespace TemuKJD.KJDForms.ShopForms dgvr.Cells["colBuyApiAuth"].Value = param.BuyApiAuth.ApiAuthStatus; dgvr.Cells["colLoginName"].Value = param.LoginName; dgvr.Cells["colShopAccount"].Value = param.ShopAccount; - dgvr.Cells["colGroup"].Value = param.Group; + dgvr.Cells["colNotes"].Value = param.Notes; + dgvr.Cells["colCookie"].Value = param.Cookies; + dgvr.Cells["colGroupName"].Value = param.GroupName; dgvr.Cells["colUploadAccount"].Value = param.UploadAccount; dgvr.Cells["colBuyAccount"].Value = param.BuyAccount; dgvr.Cells["colChatAccount"].Value = param.ChatAccount; @@ -542,6 +565,7 @@ namespace TemuKJD.KJDForms.ShopForms { Invoke(new Action(() => { + this.pbLoading.Visible = true; this.statusBar.lblTaskStatus.Text = "正在检测..."; this.statusBar.pgbTaskProgress.Value = 0; this.statusBar.pgbTaskProgress.Maximum = shopNames.Length; @@ -555,6 +579,7 @@ namespace TemuKJD.KJDForms.ShopForms { this.Invoke(new Action(() => { + this.pbLoading.Visible = true; this.statusBar.lblTaskStatus.Text = "检测完毕"; })); } @@ -575,26 +600,18 @@ namespace TemuKJD.KJDForms.ShopForms foreach(var sc in campanys) { sc.LoginStatus = "登录成功"; - //var shopId = BaseRegex.GetStringJson(ref loginResult, "id"); - //var shopToken = BaseRegex.GetStringJson(ref loginResult, "token"); - //var shopName = BaseRegex.GetStringJson(ref loginResult, "shop_name"); - //var mobile = BaseRegex.GetStringJson(ref loginResult, "mobile"); - //if (!string.IsNullOrEmpty(shopId)) shop.ShopId = shopId; - //if (!string.IsNullOrEmpty(shopToken)) shop.ShopToken = shopToken; - //if (!string.IsNullOrEmpty(shopName)) shop.ShopAccount = shopName; - //if (!string.IsNullOrEmpty(mobile)) shop.Mobile = mobile; } } else { foreach (var sc in campanys) { - //sc.LoginStatus = "登录失败"; sc.LoginStatus = "未登录"; } } //if (!string.IsNullOrEmpty(loginResult)) // shop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); + UpdateServerShopCookies(shop, shop.Cookies); // 店铺cookie写入服务端，多店共用一个登录账号一组cookie StartUp.SaveLocalShopLoginInfo(); } if (this.Created && isShowProgress) @@ -609,7 +626,7 @@ namespace TemuKJD.KJDForms.ShopForms } } - private string GetShopStatus(DouShopLoginInfo shop) + public static string GetShopStatus(ShopLoginInfo shop) { //if (shop.ShopAccount == "权益服务齐全的专营店") //{ @@ -954,6 +971,21 @@ namespace TemuKJD.KJDForms.ShopForms } } + private void btnSearch_Click(object sender, EventArgs e) + { + Task.Run(() => + { + RefreshDataGridView(false); + }); + } + + private void btnEmpty_Click(object sender, EventArgs e) + { + this.txtNotes.Text = ""; + this.txtShopId.Text = ""; + this.txtShopName.Text = ""; + } + private static string sJsSetCookie = @" function setCookie(name, value, daysToLive, path, domain, secure, httpOnly, sameSite) { //let cookie = name + '=' + encodeURIComponent(value) + ';'; @@ -989,5 +1021,10 @@ function setCookie(name, value, daysToLive, path, domain, secure, httpOnly, same } document.cookie = cookie; }"; + + private void buttonEx1_Click(object sender, EventArgs e) + { + + } } } diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.resx b/TEMUKJD/KJDForms/ShopForms/ShopListForm.resx index 46a8355..02c542d 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.resx +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.resx @@ -129,13 +129,16 @@ True + + True + True True - + True diff --git a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.Designer.cs index f35daaf..9be8831 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.Designer.cs @@ -319,7 +319,7 @@ // // txtAddress // - this.txtAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txtAddress.Location = new System.Drawing.Point(3, 3); this.txtAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); diff --git a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs index a4870d2..9ba260e 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs @@ -42,11 +42,11 @@ namespace TemuKJD.KJDForms.ShopForms private string shopLoginUrl = "http://seller.kuajingmaihuo.com/login"; private string shopMainUrl = "https://seller.kuajingmaihuo.com"; private ChromiumWebBrowser cefWebBrowser = null; - private DouShopLoginInfo shop = null; + private ShopLoginInfo shop = null; private List lstShopCompany = new List(); private string currentUrl = ""; - public ShopLoginForm(DouShopLoginInfo shopInfo) + public ShopLoginForm(ShopLoginInfo shopInfo) { InitializeComponent(); @@ -141,11 +141,11 @@ namespace TemuKJD.KJDForms.ShopForms foreach (ShopCompany sc in lstShopCompanyCopy) { - DouShopLoginInfo newShop = new DouShopLoginInfo() + ShopLoginInfo newShop = new ShopLoginInfo() { LoginName = shop.LoginName, Password = shop.Password, - Group = shop.Group, + GroupName = shop.GroupName, ShopAccount = sc.AccountName, ShopId = sc.AccountId, SubUserName = shop.SubUserName, @@ -166,7 +166,7 @@ namespace TemuKJD.KJDForms.ShopForms oldShop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); oldShop.LoginName = newShop.LoginName; oldShop.Password = newShop.Password; - oldShop.Group = newShop.Group; + oldShop.GroupName = newShop.GroupName; oldShop.ShopAccount = newShop.ShopAccount; oldShop.ShopId = newShop.ShopId; oldShop.SubUserName = newShop.SubUserName; diff --git a/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs b/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs index 7b451e6..2ec8596 100644 --- a/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs @@ -16,11 +16,11 @@ namespace TemuKJD.KJDForms.ShopForms { public partial class SubAccountShopEditForm : LRBaseForm { - DouShopLoginInfo shop = null; + ShopLoginInfo shop = null; public List AllSubAccountList { get; set; } = new List(); public List ShopSubAccountList { get; set; } = new List(); public List NotShopSubAccountList { get; set; } = new List(); - public SubAccountShopEditForm(DouShopLoginInfo _shop) + public SubAccountShopEditForm(ShopLoginInfo _shop) { InitializeComponent(); shop = _shop; diff --git a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs index 5b49767..0bec187 100644 --- a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs +++ b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs @@ -97,13 +97,13 @@ namespace TemuKJD.KJDForms.ShopOptimizeForms dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } } - private void BindShop(DouShopLoginInfo shopEntity) + private void BindShop(ShopLoginInfo shopEntity) { if (shopEntity == null) return; @@ -230,7 +230,7 @@ namespace TemuKJD.KJDForms.ShopOptimizeForms }, cancellationTokenSource.Token); } - public void GetSalesOrVisitor(DouShopLoginInfo shop, bool isSales = true) + public void GetSalesOrVisitor(ShopLoginInfo shop, bool isSales = true) { if (webBrowser == null) { @@ -340,7 +340,7 @@ namespace TemuKJD.KJDForms.ShopOptimizeForms } if (webBrowser.Tag != null) { - var shop = webBrowser.Tag as DouShopLoginInfo; + var shop = webBrowser.Tag as ShopLoginInfo; var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); var clearForm = tab.Controls[0] as ClearNoVisitorShopForm; @@ -440,7 +440,7 @@ namespace TemuKJD.KJDForms.ShopOptimizeForms } if (webBrowser.Tag != null) { - var shop = webBrowser.Tag as DouShopLoginInfo; + var shop = webBrowser.Tag as ShopLoginInfo; var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); var clearForm = tab.Controls[0] as ClearNoVisitorShopForm; diff --git a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs index 8297548..cc771a9 100644 --- a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs +++ b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs @@ -21,7 +21,7 @@ namespace TemuKJD.KJDForms.ShopOptimizeForms { public partial class ClearNoVisitorShopForm : Form { - DouShopLoginInfo shop; + ShopLoginInfo shop; public ClearNoVisitorForm clearNoVisitorForm = null; public bool isGetProductSalesSuccess = false; public bool isGetProductVisitorSuccess = false; @@ -29,7 +29,7 @@ namespace TemuKJD.KJDForms.ShopOptimizeForms public List productTradeIndexList = new List(); List productList = new List(); - public ClearNoVisitorShopForm(DouShopLoginInfo _shop) + public ClearNoVisitorShopForm(ShopLoginInfo _shop) { InitializeComponent(); shop = _shop; diff --git a/TEMUKJD/MainForm.cs b/TEMUKJD/MainForm.cs index a40b2f5..ca07541 100644 --- a/TEMUKJD/MainForm.cs +++ b/TEMUKJD/MainForm.cs @@ -143,7 +143,7 @@ namespace TemuKJD public static void CefInit() { - CefSharpSettings.LegacyJavascriptBindingEnabled = true; + //CefSharpSettings.LegacyJavascriptBindingEnabled = true;//cef 79 84以后：“CefSharpSettings”未包含“LegacyJavascriptBindingEnabled”的定义 CefSharpSettings.WcfEnabled = false; CefSettings settings = new CefSettings(); diff --git a/TEMUKJD/MainForm.designer.cs b/TEMUKJD/MainForm.designer.cs index 93867b0..d0c8915 100644 --- a/TEMUKJD/MainForm.designer.cs +++ b/TEMUKJD/MainForm.designer.cs @@ -41,8 +41,8 @@ namespace TemuKJD this.pnlCollect = new DevComponents.DotNetBar.PanelEx(); this.pnlTools = new DevComponents.DotNetBar.PanelEx(); this.pnlOrder = new DevComponents.DotNetBar.PanelEx(); + this.pnlSA = new DevComponents.DotNetBar.PanelEx(); this.pbLogo = new System.Windows.Forms.PictureBox(); - this.lklbGetHwCode = new TemuKJD.UserComponent.LinkLabelLc(); this.plTopRight = new System.Windows.Forms.Panel(); this.lblContactSupport = new DevComponents.DotNetBar.LabelX(); this.picPinDuoDuoToken = new System.Windows.Forms.PictureBox(); @@ -59,6 +59,7 @@ namespace TemuKJD this.pnlWebBrowserJS = new DevComponents.DotNetBar.PanelEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tpMainForm = new System.Windows.Forms.ToolTip(this.components); + this.lklbGetHwCode = new TemuKJD.UserComponent.LinkLabelLc(); this.navPanel.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLogo)).BeginInit(); @@ -109,9 +110,10 @@ namespace TemuKJD this.flowLayoutPanel1.Controls.Add(this.pnlCollect); this.flowLayoutPanel1.Controls.Add(this.pnlTools); this.flowLayoutPanel1.Controls.Add(this.pnlOrder); + this.flowLayoutPanel1.Controls.Add(this.pnlSA); this.flowLayoutPanel1.Location = new System.Drawing.Point(196, 0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(506, 90); + this.flowLayoutPanel1.Size = new System.Drawing.Size(701, 90); this.flowLayoutPanel1.TabIndex = 131; // // pnlShop @@ -315,6 +317,39 @@ namespace TemuKJD this.pnlOrder.Visible = false; this.pnlOrder.Click += new System.EventHandler(this.pnlOrder_Click); // + // pnlSA + // + this.pnlSA.CanvasColor = System.Drawing.SystemColors.Control; + this.pnlSA.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlSA.Cursor = System.Windows.Forms.Cursors.Hand; + this.pnlSA.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlSA.Location = new System.Drawing.Point(480, 0); + this.pnlSA.Margin = new System.Windows.Forms.Padding(0); + this.pnlSA.Name = "pnlSA"; + this.pnlSA.Size = new System.Drawing.Size(80, 90); + this.pnlSA.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlSA.Style.BackColor1.Alpha = ((byte)(0)); + this.pnlSA.Style.BackColor1.Color = System.Drawing.Color.Transparent; + this.pnlSA.Style.BackColor2.Alpha = ((byte)(0)); + this.pnlSA.Style.BackColor2.Color = System.Drawing.Color.Transparent; + this.pnlSA.Style.BackgroundImage = global::TemuKJD.Properties.Resources.main_menu_sa; + this.pnlSA.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pnlSA.Style.BorderColor.Color = System.Drawing.Color.Transparent; + this.pnlSA.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.pnlSA.Style.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.pnlSA.Style.ForeColor.Color = System.Drawing.Color.White; + this.pnlSA.Style.GradientAngle = 90; + this.pnlSA.Style.LineAlignment = System.Drawing.StringAlignment.Near; + this.pnlSA.Style.MarginTop = 63; + this.pnlSA.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.pnlSA.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.main_menu_sa_select; + this.pnlSA.StyleMouseOver.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.pnlSA.StyleMouseOver.LineAlignment = System.Drawing.StringAlignment.Near; + this.pnlSA.StyleMouseOver.MarginTop = 63; + this.pnlSA.TabIndex = 121; + this.pnlSA.Text = "超级管理"; + this.pnlSA.Visible = false; + // // pbLogo // this.pbLogo.Image = global::TemuKJD.Properties.Resources.main_form_logo; @@ -326,20 +361,6 @@ namespace TemuKJD this.pbLogo.TabStop = false; this.pbLogo.Click += new System.EventHandler(this.logo_Click); // - // lklbGetHwCode - // - this.lklbGetHwCode.AutoSize = true; - this.lklbGetHwCode.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lklbGetHwCode.LinkColor = System.Drawing.Color.WhiteSmoke; - this.lklbGetHwCode.Location = new System.Drawing.Point(125, 2); - this.lklbGetHwCode.Name = "lklbGetHwCode"; - this.lklbGetHwCode.Size = new System.Drawing.Size(54, 15); - this.lklbGetHwCode.TabIndex = 89; - this.lklbGetHwCode.TabStop = true; - this.lklbGetHwCode.Text = "HwCode"; - this.lklbGetHwCode.Visible = false; - this.lklbGetHwCode.Click += new System.EventHandler(this.lklbGetHwCode_Click); - // // plTopRight // this.plTopRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -634,6 +655,20 @@ namespace TemuKJD // this.tpMainForm.AutomaticDelay = 300; // + // lklbGetHwCode + // + this.lklbGetHwCode.AutoSize = true; + this.lklbGetHwCode.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lklbGetHwCode.LinkColor = System.Drawing.Color.WhiteSmoke; + this.lklbGetHwCode.Location = new System.Drawing.Point(125, 2); + this.lklbGetHwCode.Name = "lklbGetHwCode"; + this.lklbGetHwCode.Size = new System.Drawing.Size(54, 15); + this.lklbGetHwCode.TabIndex = 89; + this.lklbGetHwCode.TabStop = true; + this.lklbGetHwCode.Text = "HwCode"; + this.lklbGetHwCode.Visible = false; + this.lklbGetHwCode.Click += new System.EventHandler(this.lklbGetHwCode_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -695,6 +730,7 @@ namespace TemuKJD private DevComponents.DotNetBar.LabelX lblContactSupport; public DevComponents.DotNetBar.PanelEx pnlMarket; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; + private DevComponents.DotNetBar.PanelEx pnlSA; } } diff --git a/TEMUKJD/Properties/Resources.Designer.cs b/TEMUKJD/Properties/Resources.Designer.cs index 461504d..8979476 100644 --- a/TEMUKJD/Properties/Resources.Designer.cs +++ b/TEMUKJD/Properties/Resources.Designer.cs @@ -343,6 +343,26 @@ namespace TemuKJD.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap main_menu_sa { + get { + object obj = ResourceManager.GetObject("main_menu_sa", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap main_menu_sa_select { + get { + object obj = ResourceManager.GetObject("main_menu_sa_select", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/TEMUKJD/Properties/Resources.resx b/TEMUKJD/Properties/Resources.resx index 0b01535..df9610c 100644 --- a/TEMUKJD/Properties/Resources.resx +++ b/TEMUKJD/Properties/Resources.resx @@ -118,268 +118,274 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\resources\banner_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\basemsgerr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\basemsginfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\basemsgque.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\choice_buyer_blast.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\choice_chat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\choice_extend.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\choice_loginer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\choice_order.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\choice_upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\close.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\static\dycategorys.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - ..\resources\fullpaste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\static\js\jquery.dad.min.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - ..\resources\loading_blue.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\login_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\login_bg_agent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\login_input_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\login_user_ico.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\main_form_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\main_form_top_right_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\main_menu_collect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\main_menu_collect_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\main_menu_sales_center.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\main_menu_sales_center_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\main_menu_settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\main_menu_settings_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\main_menu_shop_manage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\main_menu_shop_manage_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\main_menu_upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\main_menu_upload_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\max.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\max.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\min.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\static\nopic.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\normal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\normal.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\qrcode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\regedit_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\salescenter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\salescenter.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\shopmanager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\shopmanager.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\system_1688.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\system_pdd.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\system_pdd_token.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\system_pppoe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\system_proxy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\system_tb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\template.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - ..\resources\tree_default_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\tree_商品上下架_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\resources\tree_default_icon_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\tree_云违规排查.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\tree_云违规排查_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\tree_产品数据库.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\tree_产品数据库_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\tree_佣金设置.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\tree_佣金设置_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\tree_净化数据.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\tree_净化数据_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\tree_商品上下架.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\tree_商品上下架_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\tree_商品发布.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\resources\tree_商品发布_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\static\dycategorys.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\resources\tree_素材库管理_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\login_input_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_清理无流量_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\shopmanager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\max.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\shopmanager.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\main_menu_settings_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_商品上下架.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\main_menu_upload_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\static\base.css;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\login_user_ico.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\tree_佣金设置.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\choice_chat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\system_pdd.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\main_menu_collect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\choice_buyer_blast.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\salescenter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_店铺列表_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\main_menu_shop_manage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_店铺列表.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\main_menu_sales_center_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_default_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_用户管理.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\system_proxy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\normal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\tree_解除限制.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\loading_blue.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\normal.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\choice_loginer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_跳转上家_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_净化数据.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\main_form_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_清理无流量.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_运费模板.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\main_menu_settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\max.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\login_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_净化数据_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\static\js\jquery.dad.min.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\resources\template.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\resources\choice_order.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\close.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\main_menu_collect_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_产品数据库.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\system_1688.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\tree_佣金设置_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\basemsgerr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\main_form_top_right_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_产品数据库_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\static\nopic.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\min.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\banner_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\tree_解除限制_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\main_menu_sales_center.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_运费模板_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\公告发布.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\basemsginfo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\resources\tree_商品管理.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\system_pdd_token.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\resources\tree_商品管理_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\system_tb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\tree_素材库管理.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\salescenter.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\resources\tree_库存管理.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\resources\tree_库存管理_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\tree_店铺列表.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\system_pppoe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\tree_店铺列表_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\regedit_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\tree_清理无流量.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\tree_云违规排查.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\tree_清理无流量_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\main_menu_shop_manage_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\tree_用户管理.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\basemsgque.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\choice_upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\resources\tree_用户管理_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\tree_素材库管理.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\choice_extend.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\tree_素材库管理_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\tree_解除限制.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\tree_解除限制_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\fullpaste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\resources\tree_跳转上家.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\tree_跳转上家_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\main_menu_upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\tree_运费模板.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\tree_云违规排查_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\tree_运费模板_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\qrcode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\static\base.css;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + ..\Resources\main_menu_sa.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\公告发布.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\main_menu_sa_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/TEMUKJD/Resources/main_menu_sa.png b/TEMUKJD/Resources/main_menu_sa.png new file mode 100644 index 0000000..3528544 Binary files /dev/null and b/TEMUKJD/Resources/main_menu_sa.png differ diff --git a/TEMUKJD/Resources/main_menu_sa_select.png b/TEMUKJD/Resources/main_menu_sa_select.png new file mode 100644 index 0000000..063a901 Binary files /dev/null and b/TEMUKJD/Resources/main_menu_sa_select.png differ diff --git a/TEMUKJD/StartUp.cs b/TEMUKJD/StartUp.cs index eb7c501..92642e9 100644 --- a/TEMUKJD/StartUp.cs +++ b/TEMUKJD/StartUp.cs @@ -68,12 +68,12 @@ namespace TemuKJD Thread.Sleep(100); // 获取本地店铺和服务端店铺。将服务端相关信息与本地店铺合并后暂时存在内存中（不保存敏感信息）。 - GlobalConfig.ShopLoginList = new ConcurrentList(); + GlobalConfig.ShopLoginList = new ConcurrentList(); // 获取服务端店铺 - var serverDouShopList = KJDForms.ShopForms.ShopListForm.GetServerDouShop(); - var localDouShopList = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("dou_shop_login"); + var serverDouShopList = KJDForms.ShopForms.ShopListForm.GetServerShop(); + var localDouShopList = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("dou_shop_login"); if (localDouShopList == null) - localDouShopList = new ConcurrentList(); + localDouShopList = new ConcurrentList(); foreach (var serverShop in serverDouShopList) { var localShop = localDouShopList.FirstOrDefault(s => s.LoginName == serverShop.LoginName && s.ShopId == serverShop.ShopId); @@ -97,6 +97,7 @@ namespace TemuKJD localShop.Password = serverShop.Password; localShop.Cookies = serverShop.Cookies; localShop.DbId = serverShop.DbId; + localShop.UserName = serverShop.UserName; localShop.SubUserName = serverShop.SubUserName; localShop.ApiAuthInfoList = new List(); localShop.ApiAuthInfoList.AddRange(serverShop.ApiAuthInfoList); @@ -106,13 +107,15 @@ namespace TemuKJD localShop.BuyApiAuth.ExpiresTime = serverShop.BuyApiAuth.ExpiresTime; localShop.BuyApiAuth.RefreshToken = serverShop.BuyApiAuth.RefreshToken; localShop.PayStatus = serverShop.PayStatus; - localShop.Group = serverShop.Group; + localShop.GroupName = serverShop.GroupName; + localShop.Notes = serverShop.Notes; + localShop.LoginStatus = serverShop.LoginStatus; if (localShop.TrialUploadCount < 0) localShop.TrialUploadCount = 0; GlobalConfig.ShopLoginList.Add(localShop); } } - GlobalConfig.DouShopLoginOtherUserShopList = new ConcurrentList(); + GlobalConfig.DouShopLoginOtherUserShopList = new ConcurrentList(); GlobalConfig.DouShopLoginOtherUserShopList.AddRange(localDouShopList.Where(l => !GlobalConfig.ShopLoginList.Any(s => s.LoginName == l.LoginName))); IsShopInit = true; @@ -454,8 +457,8 @@ namespace TemuKJD public static void SaveLocalShopLoginInfo() { - ConcurrentList shopLoginListCopy = - JsonHelper.DeserializeJsonToObject>(JsonHelper.SerializeObject(GlobalConfig.ShopLoginList)); + ConcurrentList shopLoginListCopy = + JsonHelper.DeserializeJsonToObject>(JsonHelper.SerializeObject(GlobalConfig.ShopLoginList)); shopLoginListCopy.AddRange(GlobalConfig.DouShopLoginOtherUserShopList); // 替换掉密码，cookie等敏感参数 foreach (var shop in shopLoginListCopy) diff --git a/TEMUKJD/TaobaoLoginForm.cs b/TEMUKJD/TaobaoLoginForm.cs index 5eadc2d..75fc27f 100644 --- a/TEMUKJD/TaobaoLoginForm.cs +++ b/TEMUKJD/TaobaoLoginForm.cs @@ -74,7 +74,8 @@ namespace TemuKJD cefWebBrowser1.Dock = DockStyle.Fill; //cefWebBrowser1.RegisterJsObject("bound", new BoundObject(), BindingOptions.DefaultBinder); // 注册C#类为JS对象 - CefSharpSettings.LegacyJavascriptBindingEnabled = true; + //CefSharpSettings.LegacyJavascriptBindingEnabled = true; //cef 79 84以后：“CefSharpSettings”未包含“LegacyJavascriptBindingEnabled”的定义 + CefSharpSettings.WcfEnabled = true; cefWebBrowser1.JavascriptObjectRepository.Register("bound", new BoundObject(), isAsync: false, options: BindingOptions.DefaultBinder); diff --git a/TEMUKJD/UserControls/UcSplitPage.Designer.cs b/TEMUKJD/UserControls/UcSplitPage.Designer.cs new file mode 100644 index 0000000..93bde02 --- /dev/null +++ b/TEMUKJD/UserControls/UcSplitPage.Designer.cs @@ -0,0 +1,248 @@ + +namespace TemuKJD.UserControls +{ + partial class UcSplitPage + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.btnPrev = new DevComponents.DotNetBar.PanelEx(); + this.btnNext = new DevComponents.DotNetBar.PanelEx(); + this.lblPage = new System.Windows.Forms.Label(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); + this.pnlJump = new DevComponents.DotNetBar.PanelEx(); + this.label1 = new System.Windows.Forms.Label(); + this.txtJumpPage = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.lblJump = new System.Windows.Forms.Label(); + this.lblTotal = new System.Windows.Forms.Label(); + this.flowLayoutPanel2.SuspendLayout(); + this.SuspendLayout(); + // + // btnPrev + // + this.btnPrev.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + this.btnPrev.AutoSize = true; + this.btnPrev.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnPrev.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnPrev.DisabledBackColor = System.Drawing.Color.Empty; + this.btnPrev.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnPrev.Location = new System.Drawing.Point(206, 0); + this.btnPrev.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.btnPrev.Name = "btnPrev"; + this.btnPrev.Size = new System.Drawing.Size(44, 20); + this.btnPrev.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnPrev.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnPrev.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnPrev.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnPrev.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnPrev.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnPrev.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnPrev.Style.GradientAngle = 90; + this.btnPrev.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnPrev.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnPrev.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnPrev.TabIndex = 431; + this.btnPrev.Text = "上一页"; + this.btnPrev.Click += new System.EventHandler(this.btnPrev_Click); + // + // btnNext + // + this.btnNext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + this.btnNext.AutoSize = true; + this.btnNext.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnNext.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnNext.DisabledBackColor = System.Drawing.Color.Empty; + this.btnNext.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnNext.Location = new System.Drawing.Point(277, 0); + this.btnNext.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.btnNext.Name = "btnNext"; + this.btnNext.Size = new System.Drawing.Size(44, 20); + this.btnNext.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnNext.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnNext.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnNext.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnNext.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnNext.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnNext.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnNext.Style.GradientAngle = 90; + this.btnNext.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnNext.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnNext.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnNext.TabIndex = 435; + this.btnNext.Text = "下一页"; + this.btnNext.Click += new System.EventHandler(this.btnNext_Click); + // + // lblPage + // + this.lblPage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + this.lblPage.AutoSize = true; + this.lblPage.Location = new System.Drawing.Point(256, 0); + this.lblPage.Name = "lblPage"; + this.lblPage.Size = new System.Drawing.Size(15, 20); + this.lblPage.TabIndex = 436; + this.lblPage.Text = "1"; + this.lblPage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 3); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.Size = new System.Drawing.Size(200, 100); + this.flowLayoutPanel1.TabIndex = 437; + // + // flowLayoutPanel2 + // + this.flowLayoutPanel2.Controls.Add(this.pnlJump); + this.flowLayoutPanel2.Controls.Add(this.label1); + this.flowLayoutPanel2.Controls.Add(this.txtJumpPage); + this.flowLayoutPanel2.Controls.Add(this.lblJump); + this.flowLayoutPanel2.Controls.Add(this.btnNext); + this.flowLayoutPanel2.Controls.Add(this.lblPage); + this.flowLayoutPanel2.Controls.Add(this.btnPrev); + this.flowLayoutPanel2.Controls.Add(this.lblTotal); + this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.flowLayoutPanel2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 0); + this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); + this.flowLayoutPanel2.Name = "flowLayoutPanel2"; + this.flowLayoutPanel2.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.flowLayoutPanel2.Size = new System.Drawing.Size(480, 23); + this.flowLayoutPanel2.TabIndex = 0; + // + // pnlJump + // + this.pnlJump.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + this.pnlJump.AutoSize = true; + this.pnlJump.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlJump.Cursor = System.Windows.Forms.Cursors.Hand; + this.pnlJump.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlJump.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.pnlJump.Location = new System.Drawing.Point(446, 0); + this.pnlJump.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.pnlJump.Name = "pnlJump"; + this.pnlJump.Size = new System.Drawing.Size(31, 20); + this.pnlJump.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlJump.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlJump.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlJump.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.pnlJump.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.pnlJump.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.pnlJump.Style.ForeColor.Color = System.Drawing.Color.White; + this.pnlJump.Style.GradientAngle = 90; + this.pnlJump.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.pnlJump.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.pnlJump.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.pnlJump.TabIndex = 439; + this.pnlJump.Text = "跳转"; + this.pnlJump.Click += new System.EventHandler(this.pnlJump_Click); + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(420, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 445; + this.label1.Text = "页"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // txtJumpPage + // + this.txtJumpPage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + // + // + // + this.txtJumpPage.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtJumpPage.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtJumpPage.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtJumpPage.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtJumpPage.Border.Class = "CrumbBarBackgroundKey"; + this.txtJumpPage.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txtJumpPage.Border.PaddingBottom = 2; + this.txtJumpPage.Border.PaddingLeft = 2; + this.txtJumpPage.Border.PaddingRight = 2; + this.txtJumpPage.Border.PaddingTop = 2; + this.txtJumpPage.Font = new System.Drawing.Font("微软雅黑", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtJumpPage.Location = new System.Drawing.Point(382, 0); + this.txtJumpPage.Margin = new System.Windows.Forms.Padding(0); + this.txtJumpPage.Name = "txtJumpPage"; + this.txtJumpPage.Size = new System.Drawing.Size(35, 21); + this.txtJumpPage.TabIndex = 444; + this.txtJumpPage.Text = "1"; + // + // lblJump + // + this.lblJump.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + this.lblJump.AutoSize = true; + this.lblJump.Location = new System.Drawing.Point(327, 0); + this.lblJump.Name = "lblJump"; + this.lblJump.Size = new System.Drawing.Size(52, 20); + this.lblJump.TabIndex = 437; + this.lblJump.Text = "跳转到 "; + this.lblJump.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lblTotal + // + this.lblTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + this.lblTotal.AutoSize = true; + this.lblTotal.Location = new System.Drawing.Point(161, 0); + this.lblTotal.Name = "lblTotal"; + this.lblTotal.Size = new System.Drawing.Size(39, 20); + this.lblTotal.TabIndex = 446; + this.lblTotal.Text = "共1页"; + this.lblTotal.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // UcSplitPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.flowLayoutPanel2); + this.Controls.Add(this.flowLayoutPanel1); + this.Margin = new System.Windows.Forms.Padding(0); + this.Name = "UcSplitPage"; + this.Size = new System.Drawing.Size(480, 23); + this.flowLayoutPanel2.ResumeLayout(false); + this.flowLayoutPanel2.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private DevComponents.DotNetBar.PanelEx btnPrev; + private DevComponents.DotNetBar.PanelEx btnNext; + private System.Windows.Forms.Label lblPage; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2; + private System.Windows.Forms.Label lblJump; + private DevComponents.DotNetBar.PanelEx pnlJump; + private System.Windows.Forms.Label label1; + private DevComponents.DotNetBar.Controls.TextBoxX txtJumpPage; + private System.Windows.Forms.Label lblTotal; + } +} diff --git a/TEMUKJD/UserControls/UcSplitPage.cs b/TEMUKJD/UserControls/UcSplitPage.cs new file mode 100644 index 0000000..70b9fa6 --- /dev/null +++ b/TEMUKJD/UserControls/UcSplitPage.cs @@ -0,0 +1,91 @@ +using NaiBa.Util.Extension; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TemuKJD.UserControls +{ + public partial class UcSplitPage : UserControl + { + int totalPage = 1; + public int TotalPage + { + get { return totalPage; } + set + { + if (TotalPage != value && value > 0) + { + totalPage = value; + if (InvokeRequired) + { + Invoke(new Action(() => + { + this.lblTotal.Text = "共" + totalPage + "页"; + })); + } + else + this.lblTotal.Text = "共" + totalPage + "页"; + } + } + } + + int currentPage = 1; + public int CurrentPage + { + get { return currentPage; } + set + { + if (currentPage != value) + { + currentPage = value; + if (InvokeRequired) + { + Invoke(new Action(() => + { + this.lblPage.Text = "" + currentPage; + })); + } + else + this.lblPage.Text = "" + currentPage; + OnPageChange(this); + } + } + } + + public event Action PageChange; + protected virtual void OnPageChange(object sender) + { + this.PageChange?.Invoke(sender); + } + + public UcSplitPage() + { + InitializeComponent(); + } + + private void pnlJump_Click(object sender, EventArgs e) + { + int page = this.txtJumpPage.Text.ParseToInt(); + this.CurrentPage = Math.Max(1, page); + + } + + private void btnPrev_Click(object sender, EventArgs e) + { + int page = this.CurrentPage - 1; + this.CurrentPage = Math.Max(1, page); + } + + private void btnNext_Click(object sender, EventArgs e) + { + int page = this.CurrentPage + 1; + this.CurrentPage = Math.Min(totalPage, page); + } + } +} diff --git a/TEMUKJD/UserControls/UcSplitPage.resx b/TEMUKJD/UserControls/UcSplitPage.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TEMUKJD/UserControls/UcSplitPage.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TEMUKJD/packages.config b/TEMUKJD/packages.config index 1baabce..77bd870 100644 --- a/TEMUKJD/packages.config +++ b/TEMUKJD/packages.config @@ -1,10 +1,10 @@  - - - - + + + + diff --git a/Work/BLL/Product/ShopProductBLL.cs b/Work/BLL/Product/ShopProductBLL.cs index b481472..a67e430 100644 --- a/Work/BLL/Product/ShopProductBLL.cs +++ b/Work/BLL/Product/ShopProductBLL.cs @@ -19,7 +19,7 @@ namespace Work.BLL.Product /// 每页商品数量 /// 最后更新时间 /// - public string GetShopProductListData(DouShopLoginInfo shop, int productStatus = 0, int page = 1, int pageSize = 50, long update_end_time = 0) + public string GetShopProductListData(ShopLoginInfo shop, int productStatus = 0, int page = 1, int pageSize = 50, long update_end_time = 0) { // 读取在售商品数量 Dictionary dictionary = new Dictionary(); @@ -39,7 +39,7 @@ namespace Work.BLL.Product return resultOnline; } - public string OnSaleProduct(DouShopLoginInfo shop, string productIds) + public string OnSaleProduct(ShopLoginInfo shop, string productIds) { Dictionary dictionary = new Dictionary(); dictionary.Add("product_id", productIds); @@ -51,7 +51,7 @@ namespace Work.BLL.Product return resultOnline; } - public string OffSaleProduct(DouShopLoginInfo shop, string productIds) + public string OffSaleProduct(ShopLoginInfo shop, string productIds) { Dictionary dictionary = new Dictionary(); dictionary.Add("product_id", productIds); @@ -61,7 +61,7 @@ namespace Work.BLL.Product return resultOnline; } - public string DeleteProduct(DouShopLoginInfo shop, string productIds) + public string DeleteProduct(ShopLoginInfo shop, string productIds) { Dictionary dictionary = new Dictionary(); dictionary.Add("product_id", productIds); diff --git a/Work/BLL/Upload/UploadMaterialBLL.cs b/Work/BLL/Upload/UploadMaterialBLL.cs index ccccfc5..2d0543b 100644 --- a/Work/BLL/Upload/UploadMaterialBLL.cs +++ b/Work/BLL/Upload/UploadMaterialBLL.cs @@ -8,7 +8,7 @@ namespace Work.BLL.Upload { public class UploadMaterialBLL { - public bool DelOldestApiMaterialFolder(AllBase.Model.Result.DouShopLoginInfo shop) + public bool DelOldestApiMaterialFolder(AllBase.Model.Result.ShopLoginInfo shop) { ///^(\d{4})-(\d{2})-(\d{2})/ var folder = GetApiMaterialFolder(shop); @@ -47,7 +47,7 @@ namespace Work.BLL.Upload /// 分页的页数，从1开始 /// 排序方式 0-创建时间倒序 1-创建时间正序 2-修改时间倒序 3-修改时间正序 4-文件夹名倒序 5-文件夹名正序 /// - public string GetApiMaterialFolder(AllBase.Model.Result.DouShopLoginInfo shop, string parent_folder_id = "0", int page_size = 10, int page_num = 1, int order_by = 1, + public string GetApiMaterialFolder(AllBase.Model.Result.ShopLoginInfo shop, string parent_folder_id = "0", int page_size = 10, int page_num = 1, int order_by = 1, string create_time_start = "", string create_time_end = "") { //var api = new DouyinApiClass.DouyinApi(shop); @@ -71,7 +71,7 @@ namespace Work.BLL.Upload return html; } - public string GetApiMaterial(AllBase.Model.Result.DouShopLoginInfo shop, string parent_folder_id = "0", int page_size = 10, int page_num = 1, int order_by = 1, + public string GetApiMaterial(AllBase.Model.Result.ShopLoginInfo shop, string parent_folder_id = "0", int page_size = 10, int page_num = 1, int order_by = 1, string create_time_start = "", string create_time_end = "") { DouyinApiClass.DouyinApi api = new DouyinApiClass.DouyinApi(shop); diff --git a/Work/BLL/Upload/UploadProductBLL.cs b/Work/BLL/Upload/UploadProductBLL.cs index 18da970..642892f 100644 --- a/Work/BLL/Upload/UploadProductBLL.cs +++ b/Work/BLL/Upload/UploadProductBLL.cs @@ -36,7 +36,7 @@ namespace Work.BLL.Upload /// public static List ViolationSkuWords = new List() { "灭火器", "保护帽", }; public string Name; - DouShopLoginInfo Shop; + ShopLoginInfo Shop; public static bool isEdit = false; public static int ShopThreadCount = 20; public static bool IsNoToken = false; @@ -63,7 +63,7 @@ namespace Work.BLL.Upload public static List ProductTemp = new List(); public static List ProductStock = new List(); public static List ProductStockTemp = new List(); - public static List ShopTemp = new List(); + public static List ShopTemp = new List(); public static List FilterTitleWordList = new List(); // 过滤标题违规词 public static List FilterSkuWordList = new List(); // 过滤sku违规词 public static List FilterBrandWordList = new List(); // 过滤品牌违规词 @@ -151,7 +151,7 @@ namespace Work.BLL.Upload /// public static bool IsDelFirstContentPic = false; - public UploadProductBLL(string Name, DouShopLoginInfo Shop) + public UploadProductBLL(string Name, ShopLoginInfo Shop) { this.Name = Name; this.Shop = Shop; @@ -442,7 +442,7 @@ namespace Work.BLL.Upload long tid = BaseRegex.GetLongJson(ref html, "id"); } - public static long GetCat(string title, out string msg, out string fullCatInfo, DouShopLoginInfo dShop) + public static long GetCat(string title, out string msg, out string fullCatInfo, ShopLoginInfo dShop) { msg = ""; fullCatInfo = ""; @@ -2242,8 +2242,8 @@ namespace Work.BLL.Upload if (Shop.PayStatus != 1) { Shop.TrialUploadCount++; - NaiBa.Util.ConcurrentList shopLoginListCopy = - JsonHelper.DeserializeJsonToObject>(JsonHelper.SerializeObject(GlobalConfig.ShopLoginList)); + NaiBa.Util.ConcurrentList shopLoginListCopy = + JsonHelper.DeserializeJsonToObject>(JsonHelper.SerializeObject(GlobalConfig.ShopLoginList)); shopLoginListCopy.AddRange(GlobalConfig.DouShopLoginOtherUserShopList); // 替换掉密码，cookie等敏感参数 foreach (var shop in shopLoginListCopy) @@ -2394,7 +2394,7 @@ namespace Work.BLL.Upload - public static string getProductUpdateRule(string catId, DouShopLoginInfo Shop) + public static string getProductUpdateRule(string catId, ShopLoginInfo Shop) { DouyinApi api = new DouyinApi(Shop); api.JsonData = new Dictionary(); @@ -2403,7 +2403,7 @@ namespace Work.BLL.Upload return updateRule; } - public static string CreateImageFolder(DouShopLoginInfo shop) + public static string CreateImageFolder(ShopLoginInfo shop) { DouyinApi api = new DouyinApi(shop); api.JsonData = new Dictionary(); @@ -2412,7 +2412,7 @@ namespace Work.BLL.Upload string html = api.GetCreateFolder(); return html; } - public static string SearchFolder(DouShopLoginInfo shop) + public static string SearchFolder(ShopLoginInfo shop) { DouyinApi api = new DouyinApi(shop); api.JsonData = new Dictionary(); @@ -2425,7 +2425,7 @@ namespace Work.BLL.Upload } - public static string UploadImageSync(DouShopLoginInfo shop, string folder_id, string url, string title) + public static string UploadImageSync(ShopLoginInfo shop, string folder_id, string url, string title) { DouyinApi api = new DouyinApi(shop); api.JsonData = new Dictionary(); @@ -2436,7 +2436,7 @@ namespace Work.BLL.Upload string html = api.GetUploadImageSync(); return html; } - public static string BatchUploadImageSync(DouShopLoginInfo shop, string materials) + public static string BatchUploadImageSync(ShopLoginInfo shop, string materials) { DouyinApi api = new DouyinApi(shop); api.JsonData = new Dictionary(); @@ -2449,7 +2449,7 @@ namespace Work.BLL.Upload /// /// 获取品牌Id /// - public static List GetBrandList(DouShopLoginInfo shop) + public static List GetBrandList(ShopLoginInfo shop) { DouyinApi apiBrand = new DouyinApi(shop); string brandHtml = apiBrand.shopBrandList(); diff --git a/Work/BLL/Upload/UploadPropertyBLL.cs b/Work/BLL/Upload/UploadPropertyBLL.cs index e77cd14..89b0211 100644 --- a/Work/BLL/Upload/UploadPropertyBLL.cs +++ b/Work/BLL/Upload/UploadPropertyBLL.cs @@ -19,7 +19,7 @@ namespace Work.BLL.Upload /// public static bool IsFuzzyMatching = false; - public static string getCatePropertyInterface(string c3, DouShopLoginInfo shop, ProductCollectBase pc) + public static string getCatePropertyInterface(string c3, ShopLoginInfo shop, ProductCollectBase pc) { //string url = "https://fxg.jinritemai.com/product/tproduct/formatTpl?category_leaf_id=" + c3; //string htmlx = GetPostTaobaoHtml.UploadTaobao(url, "", true, shop.Cookies); @@ -30,7 +30,7 @@ namespace Work.BLL.Upload return result; } - public CatePropertyResponseInfo getCatePropertyInterfaceV2(string c3, DouShopLoginInfo shop) + public CatePropertyResponseInfo getCatePropertyInterfaceV2(string c3, ShopLoginInfo shop) { DouyinApi api = new DouyinApi(shop); api.JsonData = new Dictionary(); @@ -66,7 +66,7 @@ namespace Work.BLL.Upload /// /// /// - public string GetCatePropertyAnalysis(CatePropertyResponseInfo cateProperyInfo, DouShopLoginInfo shop, ProductCollectBase pcb) + public string GetCatePropertyAnalysis(CatePropertyResponseInfo cateProperyInfo, ShopLoginInfo shop, ProductCollectBase pcb) { if (cateProperyInfo?.data?.data == null) { diff --git a/Work/DouyinApiClass/DouyinApi.cs b/Work/DouyinApiClass/DouyinApi.cs index e571421..b371617 100644 --- a/Work/DouyinApiClass/DouyinApi.cs +++ b/Work/DouyinApiClass/DouyinApi.cs @@ -12,10 +12,10 @@ namespace Work.DouyinApiClass { public Dictionary Data = new Dictionary(); public Dictionary JsonData = new Dictionary(); - public DouShopLoginInfo Shop = null; + public ShopLoginInfo Shop = null; public string Type, Name; public static string Gate = "https://openapi-fxg.jinritemai.com/"; - public DouyinApi(DouShopLoginInfo shop) + public DouyinApi(ShopLoginInfo shop) { Shop = shop; } diff --git a/Work/Work.csproj b/Work/Work.csproj index 3d5248b..bf5848d 100644 --- a/Work/Work.csproj +++ b/Work/Work.csproj @@ -1,9 +1,8 @@  - - - - + + + Debug @@ -76,6 +75,15 @@ ..\packages\AdvancedStringBuilder.0.1.0\lib\net45\AdvancedStringBuilder.dll + + ..\packages\CefSharp.Common.92.0.260\lib\net452\CefSharp.dll + + + ..\packages\CefSharp.Common.92.0.260\lib\net452\CefSharp.Core.dll + + + ..\packages\CefSharp.WinForms.92.0.260\lib\net452\CefSharp.WinForms.dll + ..\packages\JavaScriptEngineSwitcher.V8.3.0.5\lib\net45\ClearScript.dll @@ -229,15 +237,12 @@ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - - - - + + + + - - +