diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index c1f21c4..6367116 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1031; + public static int VersionCount = 1036; //public static int VersionCount = 613; /// diff --git a/AllBase/Helper/GlobalConfig.cs b/AllBase/Helper/GlobalConfig.cs index 0512dfb..d31dced 100644 --- a/AllBase/Helper/GlobalConfig.cs +++ b/AllBase/Helper/GlobalConfig.cs @@ -66,6 +66,13 @@ namespace AllBase.Helper /// 拼多多api列表 /// public static ConcurrentList PddClientInfoList = new ConcurrentList(); + + public static System.Drawing.Color KJDMainColor = System.Drawing.Color.FromArgb(63, 126, 255); + public static System.Drawing.Color KJDMainColor2 = System.Drawing.Color.FromArgb(185, 215, 255); + public static System.Drawing.Color KJDBorderColor = System.Drawing.Color.FromArgb(25, 98, 200); + public static System.Drawing.Color PddMainColor = System.Drawing.Color.FromArgb(225, 120, 135); + public static System.Drawing.Color PddMainColor2 = System.Drawing.Color.FromArgb(255, 235, 245); + public static System.Drawing.Color PddBorderColor = System.Drawing.Color.FromArgb(195, 112, 135); } public enum ShopPlatform diff --git a/TEMUKJD/BaseForms/BaseForm.cs b/TEMUKJD/BaseForms/BaseForm.cs index 45f02d6..735cac5 100644 --- a/TEMUKJD/BaseForms/BaseForm.cs +++ b/TEMUKJD/BaseForms/BaseForm.cs @@ -1,4 +1,7 @@ -using NaiBa.Util.Extension; +using AllBase; +using AllBase.Helper; +using DevComponents.DotNetBar; +using NaiBa.Util.Extension; using System; using System.Collections.Generic; using System.ComponentModel; @@ -8,6 +11,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.UserControls; namespace TemuKJD.BaseForms { @@ -84,9 +88,69 @@ namespace TemuKJD.BaseForms tree.GroupFont = ngf; } - if (c is DataGridView) + // pdd皮肤颜色 + if (BaseClass.MainPath == "binxixi") { - + if (c is Panel && c.BackColor == GlobalConfig.KJDMainColor) + { + c.BackColor = GlobalConfig.PddMainColor; + } + if (c is PanelEx && c.Name.StartsWith("btn")) + { + var pnl = c as PanelEx; + if (pnl.Style.BackColor1.Color == GlobalConfig.KJDMainColor) + { + pnl.Style.BackColor1.Color = GlobalConfig.PddMainColor; + pnl.Style.BackColor2.Color = GlobalConfig.PddMainColor; + pnl.StyleMouseOver.BackColor1.Color = GlobalConfig.PddBorderColor; + pnl.StyleMouseOver.BackColor2.Color = GlobalConfig.PddBorderColor; + } + else if (pnl.Style.BorderColor.Color == GlobalConfig.KJDMainColor) + { + pnl.Style.BorderColor.Color = GlobalConfig.PddMainColor; + pnl.Style.BackColor1.Color = GlobalConfig.PddMainColor2; + pnl.Style.BackColor2.Color = GlobalConfig.PddMainColor2; + pnl.Style.ForeColor.Color = GlobalConfig.PddBorderColor; + pnl.StyleMouseOver.BackColor1.Color = GlobalConfig.PddBorderColor; + pnl.StyleMouseOver.BackColor2.Color = GlobalConfig.PddBorderColor; + } + } + if (c is ButtonEx) + { + c.BackColor = GlobalConfig.PddMainColor; + } + if (c is SplitContainer && c.BackColor == GlobalConfig.KJDMainColor) + { + c.BackColor = GlobalConfig.PddMainColor; + } + if (c is UserComponent.UcTreeView) + { + var tv = c as UserComponent.UcTreeView; + tv.ChildNodeSelectedBgColor = GlobalConfig.PddMainColor; + } + if (c is UserComponent.UcGroupBoxEx && (c as UserComponent.UcGroupBoxEx).BorderColor == GlobalConfig.KJDMainColor) + { + var gb = c as UserComponent.UcGroupBoxEx; + gb.BorderColor = GlobalConfig.PddMainColor; + } + if (c is UserComponent.DataGridViewEx) + { + var dgv = c as UserComponent.DataGridViewEx; + dgv.BorderColor = GlobalConfig.PddMainColor; + } + if (c is UserComponent.UcCheckBox) + { + var chk = c as UserComponent.UcCheckBox; + chk.CheckBoxCheckColor = GlobalConfig.PddMainColor; + chk.CheckBoxBorderColor = GlobalConfig.PddBorderColor; + } + if (c is UcTabControlMetro) + { + var tc = c as UcTabControlMetro; + tc.BorderColor = GlobalConfig.PddBorderColor; + tc.TabSelectColor = GlobalConfig.PddMainColor; + tc.TabSelectTextColor = GlobalConfig.PddMainColor; + } } if (c.Name == "pnlSA") diff --git a/TEMUKJD/BaseForms/BaseGeneralForm.cs b/TEMUKJD/BaseForms/BaseGeneralForm.cs index 20d9164..d42550f 100644 --- a/TEMUKJD/BaseForms/BaseGeneralForm.cs +++ b/TEMUKJD/BaseForms/BaseGeneralForm.cs @@ -1,4 +1,5 @@ using AllBase; +using AllBase.Helper; using System; using System.Collections.Generic; using System.ComponentModel; @@ -103,6 +104,12 @@ namespace TemuKJD.BaseForms private void LcBaseForm_Load(object sender, EventArgs e) { + if (BaseClass.MainPath == "binxixi") + { + this.panel1.BackColor = GlobalConfig.PddMainColor; + this.BackColor = GlobalConfig.PddBorderColor; + } + if (BaseClass.Ico != null) Iconx = Icon = BaseClass.Ico; else diff --git a/TEMUKJD/BaseForms/BaseMsgForm.cs b/TEMUKJD/BaseForms/BaseMsgForm.cs index 46d7060..54489ac 100644 --- a/TEMUKJD/BaseForms/BaseMsgForm.cs +++ b/TEMUKJD/BaseForms/BaseMsgForm.cs @@ -18,7 +18,7 @@ namespace TemuKJD.BaseForms InitializeComponent(); this.ShowMinimizedBox = false; - this.AcceptButton = pnlConfirm; + this.AcceptButton = btnConfirm; } public static BaseMsgForm ShowInfo(string msg, string caption = "", FormLevel fl = FormLevel.MEDIUM) @@ -46,8 +46,8 @@ namespace TemuKJD.BaseForms msgBox.Width = (int)FormLevel.LARGE; msgBox.Height = 280; } - msgBox.pnlConfirm.Location = msgBox.pnlCancel.Location; // 把确认按钮移到取消按钮上面 - msgBox.pnlCancel.Visible = false; + msgBox.btnConfirm.Location = msgBox.btnCancel.Location; // 把确认按钮移到取消按钮上面 + msgBox.btnCancel.Visible = false; return msgBox; } diff --git a/TEMUKJD/BaseForms/BaseMsgForm.designer.cs b/TEMUKJD/BaseForms/BaseMsgForm.designer.cs index 3847f09..760ffcb 100644 --- a/TEMUKJD/BaseForms/BaseMsgForm.designer.cs +++ b/TEMUKJD/BaseForms/BaseMsgForm.designer.cs @@ -28,9 +28,10 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BaseMsgForm)); this.panel2 = new System.Windows.Forms.Panel(); - this.pnlCancel = new DevComponents.DotNetBar.PanelEx(); - this.pnlConfirm = new DevComponents.DotNetBar.PanelEx(); + this.btnCancel = new DevComponents.DotNetBar.PanelEx(); + this.btnConfirm = new DevComponents.DotNetBar.PanelEx(); this.picTip = new System.Windows.Forms.PictureBox(); this.lblMsg = new System.Windows.Forms.Label(); this.panel2.SuspendLayout(); @@ -40,8 +41,8 @@ // panel2 // this.panel2.BackColor = System.Drawing.Color.White; - this.panel2.Controls.Add(this.pnlCancel); - this.panel2.Controls.Add(this.pnlConfirm); + this.panel2.Controls.Add(this.btnCancel); + this.panel2.Controls.Add(this.btnConfirm); this.panel2.Controls.Add(this.picTip); this.panel2.Controls.Add(this.lblMsg); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -50,49 +51,54 @@ this.panel2.Size = new System.Drawing.Size(386, 183); this.panel2.TabIndex = 1; // - // pnlCancel + // btnCancel // - this.pnlCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.pnlCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlCancel.Cursor = System.Windows.Forms.Cursors.Hand; - this.pnlCancel.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlCancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.pnlCancel.Location = new System.Drawing.Point(284, 132); - this.pnlCancel.Name = "pnlCancel"; - this.pnlCancel.Size = new System.Drawing.Size(80, 30); - this.pnlCancel.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pnlCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.pnlCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.pnlCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.pnlCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlCancel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Custom; - this.pnlCancel.Style.ForeColor.Color = System.Drawing.Color.Black; - this.pnlCancel.Style.GradientAngle = 90; - this.pnlCancel.TabIndex = 27; - this.pnlCancel.Text = "取 消"; - this.pnlCancel.Click += new System.EventHandler(this.PnlCancel_Click); + this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCancel.Location = new System.Drawing.Point(284, 132); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(80, 30); + this.btnCancel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.btnCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.btnCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCancel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Custom; + this.btnCancel.Style.ForeColor.Color = System.Drawing.Color.Black; + this.btnCancel.Style.GradientAngle = 90; + this.btnCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnCancel.TabIndex = 27; + this.btnCancel.Text = "取 消"; + this.btnCancel.Click += new System.EventHandler(this.PnlCancel_Click); // - // pnlConfirm + // btnConfirm // - this.pnlConfirm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.pnlConfirm.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlConfirm.Cursor = System.Windows.Forms.Cursors.Hand; - this.pnlConfirm.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlConfirm.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.pnlConfirm.Location = new System.Drawing.Point(167, 132); - this.pnlConfirm.Name = "pnlConfirm"; - this.pnlConfirm.Size = new System.Drawing.Size(80, 30); - this.pnlConfirm.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pnlConfirm.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlConfirm.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlConfirm.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.pnlConfirm.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.pnlConfirm.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.pnlConfirm.Style.ForeColor.Color = System.Drawing.Color.White; - this.pnlConfirm.Style.GradientAngle = 90; - this.pnlConfirm.TabIndex = 26; - this.pnlConfirm.Text = "确 定"; - this.pnlConfirm.Click += new System.EventHandler(this.PnlConfirm_Click); + this.btnConfirm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnConfirm.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnConfirm.DisabledBackColor = System.Drawing.Color.Empty; + this.btnConfirm.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnConfirm.Location = new System.Drawing.Point(167, 132); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(80, 30); + this.btnConfirm.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnConfirm.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnConfirm.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnConfirm.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnConfirm.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnConfirm.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnConfirm.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnConfirm.Style.GradientAngle = 90; + this.btnConfirm.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnConfirm.TabIndex = 26; + this.btnConfirm.Text = "确 定"; + this.btnConfirm.Click += new System.EventHandler(this.PnlConfirm_Click); // // picTip // @@ -117,10 +123,10 @@ // // BaseMsgForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(388, 217); this.Controls.Add(this.panel2); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "BaseMsgForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "BaseMsgForm"; @@ -135,8 +141,8 @@ #endregion private System.Windows.Forms.Panel panel2; - private DevComponents.DotNetBar.PanelEx pnlCancel; - private DevComponents.DotNetBar.PanelEx pnlConfirm; + private DevComponents.DotNetBar.PanelEx btnCancel; + private DevComponents.DotNetBar.PanelEx btnConfirm; private System.Windows.Forms.PictureBox picTip; private System.Windows.Forms.Label lblMsg; } diff --git a/TEMUKJD/BaseForms/BaseMsgForm.resx b/TEMUKJD/BaseForms/BaseMsgForm.resx index 1af7de1..2bdeb30 100644 --- a/TEMUKJD/BaseForms/BaseMsgForm.resx +++ b/TEMUKJD/BaseForms/BaseMsgForm.resx @@ -117,4 +117,182 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ + AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA + OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT + AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj/////// + ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP// + //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ + mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4 + mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ + mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ + mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ + mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ + mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ + mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY + //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ + mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf + //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/ + //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv/// + //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP// + if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ + mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz + MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn/// + iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ + mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4 + kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP// + /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ + mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ + mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ + mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ + mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ + //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ + mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ + mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ + mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT + mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj/////// + ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn/// + //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ + mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ + mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ + mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ + mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj/////////// + ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY////// + ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP + //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4 + /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ + mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ + mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7 + mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4 + eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb//// + ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ + mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj///// + /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/ + ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ + mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ + mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ + mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ + mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ + mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA + AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA + AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz + MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA + AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w + AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA + Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA + AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA + AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA + AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA + AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA + AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA + AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA + AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD///// + wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w== + + \ No newline at end of file diff --git a/TEMUKJD/ChangeForm.cs b/TEMUKJD/ChangeForm.cs index 4953053..76a7fa5 100644 --- a/TEMUKJD/ChangeForm.cs +++ b/TEMUKJD/ChangeForm.cs @@ -129,5 +129,10 @@ namespace TemuKJD ////df.SetTitle(); //Hide(); } + + private void panel5_Click(object sender, EventArgs e) + { + + } } } diff --git a/TEMUKJD/ChangeForm.designer.cs b/TEMUKJD/ChangeForm.designer.cs index fa0f1ae..bf79872 100644 --- a/TEMUKJD/ChangeForm.designer.cs +++ b/TEMUKJD/ChangeForm.designer.cs @@ -34,17 +34,17 @@ this.label1 = new System.Windows.Forms.Label(); this.pnlUploadGoods = new DevComponents.DotNetBar.PanelEx(); this.panel1 = new DevComponents.DotNetBar.PanelEx(); - this.panel5 = new DevComponents.DotNetBar.PanelEx(); this.pnlExtend = new DevComponents.DotNetBar.PanelEx(); this.pnlChat = new DevComponents.DotNetBar.PanelEx(); - this.panel5.SuspendLayout(); + this.panel2 = new System.Windows.Forms.Panel(); + this.panel2.SuspendLayout(); this.SuspendLayout(); // // panel4 // this.panel4.Cursor = System.Windows.Forms.Cursors.Hand; this.panel4.DisabledBackColor = System.Drawing.Color.Empty; - this.panel4.Location = new System.Drawing.Point(271, 176); + this.panel4.Location = new System.Drawing.Point(300, 171); this.panel4.Name = "panel4"; this.panel4.Size = new System.Drawing.Size(104, 37); this.panel4.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_order; @@ -58,7 +58,7 @@ // this.panel3.Cursor = System.Windows.Forms.Cursors.Hand; this.panel3.DisabledBackColor = System.Drawing.Color.Empty; - this.panel3.Location = new System.Drawing.Point(15, 176); + this.panel3.Location = new System.Drawing.Point(44, 171); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(104, 37); this.panel3.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_buyer_blast; @@ -72,7 +72,7 @@ // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(28, 108); + this.label1.Location = new System.Drawing.Point(29, 108); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(224, 27); this.label1.TabIndex = 54; @@ -82,7 +82,7 @@ // this.pnlUploadGoods.Cursor = System.Windows.Forms.Cursors.Hand; this.pnlUploadGoods.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlUploadGoods.Location = new System.Drawing.Point(33, 40); + this.pnlUploadGoods.Location = new System.Drawing.Point(34, 43); this.pnlUploadGoods.Name = "pnlUploadGoods"; this.pnlUploadGoods.Size = new System.Drawing.Size(172, 65); this.pnlUploadGoods.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_upload; @@ -105,27 +105,11 @@ this.panel1.Visible = false; this.panel1.Click += new System.EventHandler(this.panel1_Click); // - // panel5 - // - this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel5.Controls.Add(this.label1); - this.panel5.Controls.Add(this.pnlExtend); - this.panel5.Controls.Add(this.pnlChat); - this.panel5.Controls.Add(this.panel3); - this.panel5.Controls.Add(this.panel4); - this.panel5.Controls.Add(this.pnlUploadGoods); - this.panel5.DisabledBackColor = System.Drawing.Color.Empty; - this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel5.Location = new System.Drawing.Point(1, 33); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(440, 258); - this.panel5.TabIndex = 4; - // // pnlExtend // this.pnlExtend.Cursor = System.Windows.Forms.Cursors.Hand; this.pnlExtend.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlExtend.Location = new System.Drawing.Point(142, 176); + this.pnlExtend.Location = new System.Drawing.Point(171, 171); this.pnlExtend.Name = "pnlExtend"; this.pnlExtend.Size = new System.Drawing.Size(104, 37); this.pnlExtend.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_extend; @@ -139,7 +123,7 @@ // this.pnlChat.Cursor = System.Windows.Forms.Cursors.Hand; this.pnlChat.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlChat.Location = new System.Drawing.Point(235, 40); + this.pnlChat.Location = new System.Drawing.Point(236, 43); this.pnlChat.Name = "pnlChat"; this.pnlChat.Size = new System.Drawing.Size(172, 65); this.pnlChat.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_chat; @@ -148,12 +132,26 @@ this.pnlChat.TabIndex = 16; this.pnlChat.Click += new System.EventHandler(this.pnlChat_Click); // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.White; + this.panel2.Controls.Add(this.pnlExtend); + this.panel2.Controls.Add(this.label1); + this.panel2.Controls.Add(this.pnlChat); + this.panel2.Controls.Add(this.panel3); + this.panel2.Controls.Add(this.panel4); + this.panel2.Controls.Add(this.pnlUploadGoods); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(1, 33); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(440, 258); + this.panel2.TabIndex = 8; + // // ChangeForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(442, 292); - this.Controls.Add(this.panel5); + this.Controls.Add(this.panel2); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.Name = "ChangeForm"; @@ -161,9 +159,9 @@ this.TitleText = "功能选择"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ChangeForm_FormClosed); this.Load += new System.EventHandler(this.ChangeForm_Load); - this.Controls.SetChildIndex(this.panel5, 0); - this.panel5.ResumeLayout(false); - this.panel5.PerformLayout(); + this.Controls.SetChildIndex(this.panel2, 0); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); this.ResumeLayout(false); } @@ -174,9 +172,9 @@ private DevComponents.DotNetBar.PanelEx pnlUploadGoods; private DevComponents.DotNetBar.PanelEx panel3; private DevComponents.DotNetBar.PanelEx panel4; - private DevComponents.DotNetBar.PanelEx panel5; private DevComponents.DotNetBar.PanelEx pnlChat; private DevComponents.DotNetBar.PanelEx pnlExtend; private System.Windows.Forms.Label label1; + private System.Windows.Forms.Panel panel2; } } \ No newline at end of file diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index 0856cde..092f830 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -1804,6 +1804,9 @@ + + + diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditDetailForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditDetailForm.Designer.cs index 3d7dd76..17af663 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditDetailForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditDetailForm.Designer.cs @@ -33,7 +33,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.ucSkuImgListItem1 = new TemuKJD.ToolForms.UcSkuImgListItem(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.tabProduct = new PinBaoBao.UserControls.UcTabControlMetro(); + this.tabProduct = new TemuKJD.UserControls.UcTabControlMetro(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); @@ -250,7 +250,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms private System.Windows.Forms.SplitContainer splitContainer1; private DevComponents.DotNetBar.PanelEx btnSave; private DevComponents.DotNetBar.PanelEx btnCancel; - private PinBaoBao.UserControls.UcTabControlMetro tabProduct; + private TemuKJD.UserControls.UcTabControlMetro tabProduct; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2; diff --git a/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs b/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs index 71b9cd5..7ddb531 100644 --- a/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs +++ b/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs @@ -63,7 +63,12 @@ namespace TemuKJD.KJDForms.SystemForms private void SystemRemoveRestrictionsForm_Load(object sender, EventArgs e) { - + if (AllBase.BaseClass.MainPath == "weixin") + { + this.ucCheckBox1.Visible = true; + } + else + this.ucCheckBox1.Visible = false; } private void SystemRemoveRestrictionsForm_VisibleChanged(object sender, EventArgs e) diff --git a/TEMUKJD/MainForm.cs b/TEMUKJD/MainForm.cs index b121178..d21ed26 100644 --- a/TEMUKJD/MainForm.cs +++ b/TEMUKJD/MainForm.cs @@ -240,15 +240,23 @@ namespace TemuKJD //return; if (BaseClass.MainPath == "binxixi") - { - //this.pbLogo.Image = Properties.Resources.main_form_logo_pdd; - BaseClass.LogoImage = Properties.Resources.main_form_logo_pdd; - BaseClass.Ico = Icon.FromHandle(Properties.Resources.system_pdd.GetHicon()); + { + //BaseClass.Ico = Icon.FromHandle(Properties.Resources.system_pdd.GetHicon()); + BaseClass.Ico = Icon.FromHandle(Properties.Resources.pdd_icon.GetHicon()); + BaseClass.LogoImage = Properties.Resources.pdd_logo; + navPanel.Style.BackgroundImage = Properties.Resources.pdd_bg; + plTopRight.BackgroundImage = null; + this.BackColor = GlobalConfig.PddBorderColor; + lblVersionInfo.ForeColor = GlobalConfig.PddMainColor2; + + BaseClass.ToolName = "29供应链 - 多多管理工具"; } if (BaseClass.MainPath == "weixin") { BaseClass.LogoImage = Properties.Resources.main_form_logo_wx; BaseClass.Ico = Icon.FromHandle(Properties.Resources.system_wx.GetHicon()); + + BaseClass.ToolName = "微信小店管理工具"; } Rectangle rect = Screen.GetWorkingArea(this); diff --git a/TEMUKJD/MainForm.designer.cs b/TEMUKJD/MainForm.designer.cs index 4694ec3..ea39345 100644 --- a/TEMUKJD/MainForm.designer.cs +++ b/TEMUKJD/MainForm.designer.cs @@ -246,8 +246,7 @@ namespace TemuKJD // this.flowLayoutPanel1.AutoSize = true; this.flowLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.flowLayoutPanel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(143)))), ((int)(((byte)(255))))); - this.flowLayoutPanel1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("flowLayoutPanel1.BackgroundImage"))); + this.flowLayoutPanel1.BackColor = System.Drawing.Color.Transparent; this.flowLayoutPanel1.Controls.Add(this.pnlSA); this.flowLayoutPanel1.Controls.Add(this.pnlShop); this.flowLayoutPanel1.Controls.Add(this.pnlUpload); @@ -561,7 +560,7 @@ namespace TemuKJD // this.plTopRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.plTopRight.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("plTopRight.BackgroundImage"))); - this.plTopRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.plTopRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.plTopRight.Controls.Add(this.lblVersionName); this.plTopRight.Controls.Add(this.lblVersionInfo); this.plTopRight.Controls.Add(this.lblContactSupport); @@ -570,10 +569,11 @@ namespace TemuKJD this.plTopRight.Controls.Add(this.max); this.plTopRight.Controls.Add(this.min); this.plTopRight.Controls.Add(this.close); - this.plTopRight.Location = new System.Drawing.Point(1028, 0); + this.plTopRight.Location = new System.Drawing.Point(958, 0); this.plTopRight.Margin = new System.Windows.Forms.Padding(0); this.plTopRight.Name = "plTopRight"; - this.plTopRight.Size = new System.Drawing.Size(250, 91); + this.plTopRight.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.plTopRight.Size = new System.Drawing.Size(320, 91); this.plTopRight.TabIndex = 0; this.plTopRight.DoubleClick += new System.EventHandler(this.plTopRight_DoubleClick); this.plTopRight.MouseDown += new System.Windows.Forms.MouseEventHandler(this.plTopRight_MouseDown); @@ -582,10 +582,13 @@ namespace TemuKJD // // lblVersionName // + this.lblVersionName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.lblVersionName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); this.lblVersionName.Location = new System.Drawing.Point(3, 36); this.lblVersionName.Name = "lblVersionName"; - this.lblVersionName.Size = new System.Drawing.Size(238, 23); + this.lblVersionName.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.lblVersionName.Size = new System.Drawing.Size(308, 23); this.lblVersionName.TabIndex = 78; this.lblVersionName.Text = "版本类型"; this.lblVersionName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -593,10 +596,13 @@ namespace TemuKJD // // lblVersionInfo // + this.lblVersionInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.lblVersionInfo.ForeColor = System.Drawing.SystemColors.ControlDark; this.lblVersionInfo.Location = new System.Drawing.Point(3, 60); this.lblVersionInfo.Name = "lblVersionInfo"; - this.lblVersionInfo.Size = new System.Drawing.Size(238, 23); + this.lblVersionInfo.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.lblVersionInfo.Size = new System.Drawing.Size(308, 23); this.lblVersionInfo.TabIndex = 77; this.lblVersionInfo.Text = "版本信息"; this.lblVersionInfo.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -613,7 +619,7 @@ namespace TemuKJD this.lblContactSupport.Cursor = System.Windows.Forms.Cursors.Hand; this.lblContactSupport.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblContactSupport.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.lblContactSupport.Location = new System.Drawing.Point(107, 3); + this.lblContactSupport.Location = new System.Drawing.Point(177, 3); this.lblContactSupport.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.lblContactSupport.Name = "lblContactSupport"; this.lblContactSupport.Size = new System.Drawing.Size(65, 23); @@ -629,7 +635,7 @@ namespace TemuKJD this.max.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.max.Cursor = System.Windows.Forms.Cursors.Hand; this.max.DisabledBackColor = System.Drawing.Color.Empty; - this.max.Location = new System.Drawing.Point(200, 6); + this.max.Location = new System.Drawing.Point(270, 6); this.max.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.max.Name = "max"; this.max.Size = new System.Drawing.Size(16, 16); @@ -655,7 +661,7 @@ namespace TemuKJD this.min.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.min.Cursor = System.Windows.Forms.Cursors.Hand; this.min.DisabledBackColor = System.Drawing.Color.Empty; - this.min.Location = new System.Drawing.Point(173, 6); + this.min.Location = new System.Drawing.Point(243, 6); this.min.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.min.Name = "min"; this.min.Size = new System.Drawing.Size(16, 16); @@ -681,7 +687,7 @@ namespace TemuKJD this.close.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.close.Cursor = System.Windows.Forms.Cursors.Hand; this.close.DisabledBackColor = System.Drawing.Color.Empty; - this.close.Location = new System.Drawing.Point(225, 6); + this.close.Location = new System.Drawing.Point(295, 6); this.close.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.close.Name = "close"; this.close.Size = new System.Drawing.Size(16, 16); diff --git a/TEMUKJD/MainForm.resx b/TEMUKJD/MainForm.resx index a98663d..2e22dd9 100644 --- a/TEMUKJD/MainForm.resx +++ b/TEMUKJD/MainForm.resx @@ -155,184 +155,6 @@ hP++Da8dRI924BJ46Sg2JyFvRlnhBRttSWmJL3NWPkbsv5dNYdzsY3T1c6wl8kUXbaXUd3NlWUlGvc4H UJ2n5Up2C9UrGVF6wpfSFkKXUmIU/ywTKfJwYKZQ2v9qDBpnFYq8hAqGxs9eNoT5NSsXXBRFYX8456Vo pEeZ/ZHN9O4iHdv6gDE63oTZ+My+TWvt/AD6qFOB8ji3AwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAABH4AAABaCAIAAABBpQZ9AAAABGdBTUEAALYy8W048wAAACBjSFJNAACH - EAAAjBAAAP2qAACBKAAAfqcAAOtWAAA7iAAAF+negU1PAAAKEWlDQ1BzUkdCIGRpc3BsYXkgcHJvZmls - ZSB3aXRoIGRpc3BsYXkgaGFyZHdhcmUgY29uZmlndXJhdGlvbiBkYXRhIGRlcml2ZWQgZnJvbSBjYWxp - AABo3u1ZC3BUZxU+m4S8eBYQKBC4BIwBTbLZvEhKQ5NNedhsCtk0JFioN7t3H7Av797NJoBCMX04OBW0 - dKrFQRG12lGmgg5WZRirKMLUlmJHaKcq0nb6phQz6tTB85//bu69uzebbcpDZ9idu/ff+5/Hd85//v+c - swtQsi3gD4WzBIBgSJHblzcLXd1rhbxXIQtm43ULFIiuaMThXNYB5i8LwOAL7BPg+bI0dMO9Ct1S1IX3 - D/C64IrICop8C8eVcSWCY4YMpsoICsfVbOzl4xVs3MPHdxNNR7sdxxG8xnlpnLOFjXtonPsgGzucVitA - /sMARW+oetmrK8oMd/ujkYDYL0TksMcfkIS4X/ENPfSJsjsuypLgCoc8fm9MFhV/OCS4RUUU3JLs75Xc - gkcOBwWXGPD38FmATT57G8qfu77EW+Cbt/pYsDE2t3fA09jf0OnrC7QN7nJsDUkRV6h3AASIQjssh2YQ - +DzNPdA2CFfopUh9Crvbw5F+2e/1KUKpa6Fgs1qrBYffJYejYY8i2MNyJJxAj47BWODc73fQGlumHdee - hTcDLH4aIFvRnrn6AA4/DzBtu/Zs/nmACRsAfl7rism9Q2GDawalsARWgQvisAP2wkH4HbxlybLMtFRZ - HBa/5X7LfsvTlvNZuVkLs9qylKw9Wb/Nejd7VvaK7Hj297PP5IzLacrpyzmQ8/qYBWPEMXvH/CVXyHXl - Pp77Tl5t3ra8E/kz8r35hwsKC9YXHCocWygVHh1bNHbz2JfGNY7bNz5/fGT82QnLJhycWDzx4Ul5k7ZM - ev+mwE2vTXZPPjfFNeXVqRunvvexTdPGTPvqdGH6kzNaZpy5OTKzYOb+Wc2z/jZ7e1FJ0Yk50blFc48L - 8Xml884Wf2X+svmXFzz18b6SupJ/feJXpQMLWxdNX3T+k4c+dV9Zd3lFRX7FOevRyr22e6uk6jtqqmrn - 1I2r+2DxO/XnGs7ccmrJM7eeaDy59I+3nW56sfkV+8XbLcsmLy9ZsWTlXZ+O3PFQ648dz7UNripavbxd - cX6n40+dBWtu6+rv/unaS3dXr+tbf+SzeWJ7z7dcFyS75+ve9/ytG34YKAwGQ6ciDZ/7bnSysj32j/iG - vr9vWrf5xc9/5gsvb3Pd++YXe+/LuX/3g6VfOrKj88sXH9q5s3LX6a9t3r3gkWcf3foN62OvfHPP3s5v - T9l3av/u7619vPgHbz/xix/tOHDPkzUHJxx642fHDz/x1M5fxo/0HL3z10t/YztW+vt5fyg6OfuZOc8W - n1p0uuaF5j87z3pe2vLyI3/9ybnnzl967ebXm94MvP3YuycvwqXFg/I/D/z7wn+qLvdfvnwjFm7Ewo1Y - uBELybHgcFZa1ZSF+WMi5veJmzBnlwJM34d5fMUSWAp9EIQATveCBDImTj+EIQS3QjFUQjlY8S7gTAgD - KAxunA2Bl2ZjoIAHypCqFr8thUYYD4UYai6kCkID2JE+gJcMLcjfi5wuvDtIikQaueYQ6mxQuZhcH8pV - IILPKvAdxRkf0gdBxHE53pkcGaVE8fIgZTkhCyJtnNC58VscZyvAhuitUIMjK44riI4jqhgRXXEKPhHH - VwNfHY4q8Z2Mj+nzQw9+E1EKX5VkVHHkiV5Dr60hfXbiDBKiVSTVgzICqK8D+hGDhDTJSIPIOTLOMHGH - VE4PaQ2S/XxWxtiroCcybMQIjGD8cTsiqpd6CIkfx/1DtrD45NFZoItPI/I25A/iPUHHKLl3G9AqCREp - QxY14CUO7YNNaEEZ+qSNtFxcN893bPVAb6Onod/X6dgV2vqANNi2hPxslKYhqsgQk4a9hXzMVtSPliei - 46NiL1lf4GXoG4NzYwkLAn2DbcyKiBRyDfTqCmsYnYXpkWsWNtH54qM1/6h2OVKin6Pf86i8ndmbKXYz - TBpiB3KyKI7hrETrFkJqO9nnpojktkYN9qSelk6KZRetux1Wwu3QBd2w1oDEnDpV6hpEyzRLGFlh2ueK - LqpacGfUGOSmp0/1yIe3WcPmpHPWA63IHSRdYRwxSgWlxXBWr2l46tR1EHEFNQ+JhKlRzWZG9OaUqRKZ - vlQ6q4lEc8pkiXwPdSK1jPMxOuv1echsLc193ULnnogR3YG87KmTvrMTke0EG53iNtwNVvq0wWKkZOMG - XPt6/LTiZ7FO48i+vAtRSEiRuU81DnMtZl7TeDL1c3ot+tiWyVcsi/Sj57rIU/Xoj3LKfCx3dasVkFXV - zuugtUNPF+PTenpaMYy+dsJirquaPGfDu6bLpj6rNWhiWqrSaFlO0SCpmThVUxVZVadK5ZrqSG4N6tJr - 4rpsaXQ1o7djw/qvknxi9F8dWaTXo/dyOj3sTNs4jCarToN+Xaxp/SRSzSLCnXiKeChSFHrKIqmVPiXS - k3gm6Hj4+pSr66WXwPVyi7jlCf7ETD1y1aFvavGTzZvp4v6zDa0A2808qqO6U1Q7kzWt1XQle3PkMzpx - bpid6pmeTvrsZVatGk8xkbJ0E3KIlPkl1X7uYZ4zWOXjJaRmUvRyVpH/eGbisvyY9dmOsxN/L9UZel59 - 9cD3Zgfe7SnrXKnu98Q7eU3N5vURUalbneR41GPQdu71xZHY1dceBY+50a2nnnf0MWWsqYaPYfPay7xz - THBk0lnru2YxSXoTWhRRzwmR+m9j97wS9V+7zo/XiuUqzohpf3x9+vf0fvr/7Zj7THHG6V2OV5WuI+YI - 2G8IXWh7K9aAmjVlhDZKpz33jrEbFq9oN8zOszKsxJykZQ1a7kTKiEG6oHb2+m6S7SNJ9awXv7tMeoiR - +zQxwy5avKJdtNFmJtWDszGkUdLYLhrs57HBrOWzvAJJrJqbott9hf00ci8uXoFe3Ogds17cTpIjaiWf - wJGpFcN15Xy20+Cvkbtx8UP2zWLGfbNefrNa33rJEzHCpNXR9UO/u3YP9XDlhkqX9wqsqkyu+xIanJTx - NOmN6Ceeh0TUKhnQp9KmytP67sQpwrK8lnm5f5eRtwNqb1ir69tGKyUVCYtar1o7Gbn1WbsyJdJH5kmN - rUyjR8+TaWYaXZ3gpTyS6GdY5DvIkutXGTioSvOjVCf1auUqxtQagT+/dsiG99GNqiB9VZCIsqtTFXCp - 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 diff --git a/TEMUKJD/PDDForms/AdminForms/PDDAdminShopListForm.Designer.cs b/TEMUKJD/PDDForms/AdminForms/PDDAdminShopListForm.Designer.cs index 8c7732c..99765b1 100644 --- a/TEMUKJD/PDDForms/AdminForms/PDDAdminShopListForm.Designer.cs +++ b/TEMUKJD/PDDForms/AdminForms/PDDAdminShopListForm.Designer.cs @@ -41,12 +41,14 @@ namespace TemuKJD.PDDForms.AdminForms this.btnLoginSelect = new TemuKJD.UserControls.ButtonEx(); this.btnCheck = new TemuKJD.UserControls.ButtonEx(); this.panel4 = new System.Windows.Forms.Panel(); + this.lblAddToAccount = new System.Windows.Forms.Label(); + this.btnAddToAccount = new DevComponents.DotNetBar.PanelEx(); this.btnSetSubSa = new TemuKJD.UserControls.ButtonEx(); this.txtUserName = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); this.txtLoginName = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new TemuKJD.UserControls.ButtonEx(); this.txtNotes = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); @@ -64,11 +66,6 @@ namespace TemuKJD.PDDForms.AdminForms this.btnRemainOK = new DevComponents.DotNetBar.PanelEx(); this.lblAddProdRemaining = new System.Windows.Forms.Label(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.chkAutoDrag = new System.Windows.Forms.CheckBox(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.lblAddToAccount = new System.Windows.Forms.Label(); - this.btnAddToAccount = new DevComponents.DotNetBar.PanelEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -98,6 +95,9 @@ namespace TemuKJD.PDDForms.AdminForms this.colSubSa = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); + this.chkAutoDrag = new System.Windows.Forms.CheckBox(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -216,7 +216,7 @@ namespace TemuKJD.PDDForms.AdminForms this.panel4.Controls.Add(this.label5); this.panel4.Controls.Add(this.txtLoginName); this.panel4.Controls.Add(this.label1); - this.panel4.Controls.Add(this.pnlEmpty); + this.panel4.Controls.Add(this.btnEmpty); this.panel4.Controls.Add(this.btnSearch); this.panel4.Controls.Add(this.txtNotes); this.panel4.Controls.Add(this.label4); @@ -230,6 +230,41 @@ namespace TemuKJD.PDDForms.AdminForms this.panel4.Size = new System.Drawing.Size(1001, 75); this.panel4.TabIndex = 0; // + // lblAddToAccount + // + this.lblAddToAccount.AutoSize = true; + this.lblAddToAccount.Location = new System.Drawing.Point(755, 15); + this.lblAddToAccount.Name = "lblAddToAccount"; + this.lblAddToAccount.Size = new System.Drawing.Size(68, 17); + this.lblAddToAccount.TabIndex = 461; + this.lblAddToAccount.Text = "指定账号："; + this.lblAddToAccount.Visible = false; + // + // btnAddToAccount + // + this.btnAddToAccount.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddToAccount.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAddToAccount.DisabledBackColor = System.Drawing.Color.Empty; + this.btnAddToAccount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAddToAccount.Location = new System.Drawing.Point(598, 12); + this.btnAddToAccount.Name = "btnAddToAccount"; + this.btnAddToAccount.Size = new System.Drawing.Size(153, 23); + this.btnAddToAccount.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddToAccount.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddToAccount.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddToAccount.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnAddToAccount.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnAddToAccount.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnAddToAccount.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnAddToAccount.Style.GradientAngle = 90; + this.btnAddToAccount.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddToAccount.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddToAccount.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddToAccount.TabIndex = 460; + this.btnAddToAccount.Text = "选中店铺添加到指定账号"; + this.btnAddToAccount.Visible = false; + this.btnAddToAccount.Click += new System.EventHandler(this.btnAddToAccount_Click); + // // btnSetSubSa // this.btnSetSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -280,29 +315,29 @@ namespace TemuKJD.PDDForms.AdminForms this.label1.TabIndex = 418; this.label1.Text = "登录号码："; // - // pnlEmpty + // btnEmpty // - 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(507, 10); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 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 = 413; - this.pnlEmpty.Text = "清空条件"; - this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); + this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; + this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEmpty.Location = new System.Drawing.Point(507, 10); + this.btnEmpty.Name = "btnEmpty"; + this.btnEmpty.Size = new System.Drawing.Size(56, 26); + this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnEmpty.Style.GradientAngle = 90; + this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnEmpty.TabIndex = 413; + this.btnEmpty.Text = "清空条件"; + this.btnEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // // btnSearch // @@ -569,78 +604,6 @@ namespace TemuKJD.PDDForms.AdminForms this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); this.dgvShop.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvShop_CellMouseDown); // - // 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(597, 0); - 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; - // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.IsShowPageSize = false; - this.ucSplitPage1.Location = new System.Drawing.Point(911, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.PageSize = 50; - this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); - this.ucSplitPage1.TabIndex = 4; - this.ucSplitPage1.TotalPage = 1; - // - // 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(1273, 25); - this.statusBar.TabIndex = 1; - // - // lblAddToAccount - // - this.lblAddToAccount.AutoSize = true; - this.lblAddToAccount.Location = new System.Drawing.Point(755, 15); - this.lblAddToAccount.Name = "lblAddToAccount"; - this.lblAddToAccount.Size = new System.Drawing.Size(68, 17); - this.lblAddToAccount.TabIndex = 461; - this.lblAddToAccount.Text = "指定账号："; - this.lblAddToAccount.Visible = false; - // - // btnAddToAccount - // - this.btnAddToAccount.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnAddToAccount.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAddToAccount.DisabledBackColor = System.Drawing.Color.Empty; - this.btnAddToAccount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddToAccount.Location = new System.Drawing.Point(598, 12); - this.btnAddToAccount.Name = "btnAddToAccount"; - this.btnAddToAccount.Size = new System.Drawing.Size(153, 23); - this.btnAddToAccount.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnAddToAccount.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnAddToAccount.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnAddToAccount.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnAddToAccount.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnAddToAccount.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnAddToAccount.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnAddToAccount.Style.GradientAngle = 90; - this.btnAddToAccount.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnAddToAccount.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnAddToAccount.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnAddToAccount.TabIndex = 460; - this.btnAddToAccount.Text = "选中店铺添加到指定账号"; - this.btnAddToAccount.Visible = false; - this.btnAddToAccount.Click += new System.EventHandler(this.btnAddToAccount_Click); - // // colSelect // this.colSelect.FillWeight = 26F; @@ -886,6 +849,43 @@ namespace TemuKJD.PDDForms.AdminForms this.colDelete.ReadOnly = true; this.colDelete.Visible = false; // + // 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(597, 0); + 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; + // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.IsShowPageSize = false; + this.ucSplitPage1.Location = new System.Drawing.Point(911, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.PageSize = 50; + this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); + this.ucSplitPage1.TabIndex = 4; + this.ucSplitPage1.TotalPage = 1; + // + // 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(1273, 25); + this.statusBar.TabIndex = 1; + // // PDDAdminShopListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -941,7 +941,7 @@ namespace TemuKJD.PDDForms.AdminForms private UserComponent.DataGridViewEx dgvShop; private System.Windows.Forms.CheckBox chkAutoDrag; private UserControls.StatusBarUserControl statusBar; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty; private UserControls.UcSplitPage ucSplitPage1; private System.Windows.Forms.TextBox txtLoginName; private System.Windows.Forms.Label label1; diff --git a/TEMUKJD/PDDForms/AdminForms/RandomComProductForm.cs b/TEMUKJD/PDDForms/AdminForms/RandomComProductForm.cs index 8cce0ad..94f44e7 100644 --- a/TEMUKJD/PDDForms/AdminForms/RandomComProductForm.cs +++ b/TEMUKJD/PDDForms/AdminForms/RandomComProductForm.cs @@ -14,7 +14,7 @@ using Work; namespace TemuKJD.PDDForms.AdminForms { - public partial class RandomComProductForm : Form + public partial class RandomComProductForm : BaseForm { public RandomComProductForm() { diff --git a/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.Designer.cs b/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.Designer.cs index 158052e..4a40400 100644 --- a/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.Designer.cs @@ -32,14 +32,14 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.chkDown981Failed = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -87,7 +87,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms this.line1 = new DevComponents.DotNetBar.Controls.Line(); this.line2 = new DevComponents.DotNetBar.Controls.Line(); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); - this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); + this.btnStopSearch = new DevComponents.DotNetBar.PanelEx(); this.label2 = new System.Windows.Forms.Label(); this.dtpStartDay = new System.Windows.Forms.DateTimePicker(); this.btnGetProd = new DevComponents.DotNetBar.PanelEx(); @@ -834,7 +834,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; - this.ucGroupBoxEx4.Controls.Add(this.panelEx2); + this.ucGroupBoxEx4.Controls.Add(this.btnStopSearch); this.ucGroupBoxEx4.Controls.Add(this.label2); this.ucGroupBoxEx4.Controls.Add(this.dtpStartDay); this.ucGroupBoxEx4.Controls.Add(this.btnGetProd); @@ -845,31 +845,31 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "查询活动商品"; // - // panelEx2 + // btnStopSearch // - this.panelEx2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.panelEx2.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx2.Location = new System.Drawing.Point(125, 105); - this.panelEx2.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(66, 23); - this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx2.Style.GradientAngle = 90; - this.panelEx2.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx2.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx2.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx2.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx2.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.panelEx2.TabIndex = 859; - this.panelEx2.Text = "停止查询"; - this.panelEx2.Click += new System.EventHandler(this.btnStop_Click); + this.btnStopSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnStopSearch.CanvasColor = System.Drawing.SystemColors.Control; + this.btnStopSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnStopSearch.DisabledBackColor = System.Drawing.Color.Empty; + this.btnStopSearch.Location = new System.Drawing.Point(125, 105); + this.btnStopSearch.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnStopSearch.Name = "btnStopSearch"; + this.btnStopSearch.Size = new System.Drawing.Size(66, 23); + this.btnStopSearch.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopSearch.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnStopSearch.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopSearch.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnStopSearch.Style.GradientAngle = 90; + this.btnStopSearch.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopSearch.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnStopSearch.TabIndex = 859; + this.btnStopSearch.Text = "停止查询"; + this.btnStopSearch.Click += new System.EventHandler(this.btnStop_Click); // // label2 // @@ -1132,19 +1132,19 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvShop.AutoRowNumber = true; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -1349,19 +1349,19 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms // this.dgvActProduct.AllowUserToAddRows = false; this.dgvActProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvActProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvActProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvActProduct.AutoRowNumber = true; this.dgvActProduct.BackgroundColor = System.Drawing.Color.White; this.dgvActProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvActProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvActProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvActProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvActProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1410,8 +1410,8 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms // // colSupplierName // - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5; this.colSupplierName.Frozen = true; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; @@ -1466,8 +1466,8 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms // // colProductName // - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle6; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -1494,8 +1494,8 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms // // colUpdateTime // - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colUpdateTime.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colUpdateTime.DefaultCellStyle = dataGridViewCellStyle7; this.colUpdateTime.FillWeight = 80F; this.colUpdateTime.HeaderText = "上架时间"; this.colUpdateTime.Name = "colUpdateTime"; @@ -1511,8 +1511,8 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms // // colOpResult // - dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colOpResult.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colOpResult.DefaultCellStyle = dataGridViewCellStyle8; this.colOpResult.HeaderText = "操作结果"; this.colOpResult.Name = "colOpResult"; this.colOpResult.ReadOnly = true; @@ -1730,7 +1730,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private System.Windows.Forms.DateTimePicker dtpStartDay; - private DevComponents.DotNetBar.PanelEx panelEx2; + private DevComponents.DotNetBar.PanelEx btnStopSearch; private UserComponent.UcCheckBox chkDownNoPrice; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; diff --git a/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs b/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs index b418c06..ec98091 100644 --- a/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs +++ b/TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs @@ -460,8 +460,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms List addActivityFailLst = new List(); string activityErr = ""; var activityRst2 = ""; - Thread.Sleep(Randomx.GetId(500, 1500)); - Thread.Sleep(Randomx.GetId(500, 1500)); + Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); try { @@ -476,7 +475,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms activityRst2 = activity_goods_price_rule(shop, string.Join(",", prodParamsTmpTmp.Select(p => p.goods_id.ParseToString()).ToList()), 22365, 27); if (!activityRst2.Contains("\"success\":true")) { - Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); @@ -578,7 +576,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms var addActivityRst = ""; for (int i = 0; i < 3 && (addActivityRst.IsNullOrEmpty() || addActivityRst.Contains("频繁")); i++) { - Thread.Sleep(Randomx.GetId(3000, 7000)); + Thread.Sleep(Randomx.GetId(1000, 2000)); addActivityRst = add_activity_goods(shop, actSubmitParam, "0", 21365, 27); } if (!addActivityRst.Contains("\"success\":true")) @@ -632,7 +630,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms List addActivityFailLst = new List(); string activityErr = ""; var activityRst1 = "频繁"; - Thread.Sleep(Randomx.GetId(500, 1500)); + Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); for (int i = 0; i < 5 && activityRst1.Contains("频繁"); i++) { @@ -643,7 +641,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms int readCount = 0; while (page < totalPage) { - Thread.Sleep(Randomx.GetId(2000, 5000)); + Thread.Sleep(Randomx.GetId(1000, 2000)); var refreshRst = get_activity_goods_list_info(shop, page, "20981"); if (totalPage == 9999) totalPage = BaseRegex.GetIntJson(ref refreshRst, "total_page"); @@ -766,7 +764,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms List addActivityFailLst = new List(); string activityErr = ""; var activityRst1 = "频繁"; - Thread.Sleep(Randomx.GetId(500, 1500)); + Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); for (int i = 0; i < 5 && activityRst1.Contains("频繁"); i++) { @@ -777,7 +775,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms int readCount = 0; while (page < totalPage) { - Thread.Sleep(Randomx.GetId(2000, 5000)); + Thread.Sleep(Randomx.GetId(1000, 2000)); var refreshRst = get_activity_goods_list_info(shop, page, "20981"); if (totalPage == 9999) totalPage = BaseRegex.GetIntJson(ref refreshRst, "total_page"); @@ -974,7 +972,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms })); } - Thread.Sleep(Randomx.GetId(2000, 5000)); + Thread.Sleep(Randomx.GetId(1000, 2000)); addActivityRst = add_activity_goods(shop, actSubmitParam, "0", 20981, 27); //{"success":true,"error_code":1000000,"error_msg":null,"result":{"enroll_fail_goods_list":[{"goods_id":935055850626,"need_retry":false,"error_code":30001,"error_msg":"商品的建议价有更新，您提报的价格高于建议价，系统已刷新建议价，请重新提报。"},{"goods_id":939857649372,"need_retry":false,"error_code":30001,"error_msg":"商品的建议价有更新，您提报的价格高于建议价，系统已刷新建议价，请重新提报。"},{"goods_id":933564880168,"need_retry":false,"error_code":30001,"error_msg":"商品的建议价有更新，您提报的价格高于建议价，系统已刷新建议价，请重新提报。"}],"enroll_success_goods_list":[{"goods_id":935055877956,"activity_goods_id":11278050703428},{"goods_id":935055563227,"activity_goods_id":11278042020059}]}} } @@ -1029,7 +1027,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms { string activityErr = ""; var activityRst3 = activity_goods_price_rule(shop, prodParam.goods_id.ParseToString(), 15996, 18); - Thread.Sleep(Randomx.GetId(500, 1500)); + Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); if (!activityRst3.Contains("\"success\":true")) { @@ -1136,8 +1134,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms List addActivityFailLst = new List(); string activityErr = ""; var activityRst2 = ""; - Thread.Sleep(Randomx.GetId(500, 1500)); - Thread.Sleep(Randomx.GetId(500, 1500)); + Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); try { @@ -1152,8 +1149,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms activityRst2 = activity_goods_price_rule(shop, string.Join(",", prodParamsTmpTmp.Select(p => p.goods_id.ParseToString()).ToList()), 22347, 27); if (!activityRst2.Contains("\"success\":true")) { - Thread.Sleep(Randomx.GetId(1000, 2000)); - Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); } @@ -1263,7 +1258,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms loginForm.ShowDialog(); })); } - Thread.Sleep(Randomx.GetId(2000, 5000)); + Thread.Sleep(Randomx.GetId(1000, 2000)); addActivityRst = add_activity_goods(shop, actSubmitParam, "0", 22347, 27); } if (!addActivityRst.Contains("\"success\":true")) @@ -1316,7 +1311,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms { string activityErr = ""; var activityRst2 = activity_goods_price_rule(shop, prodParam.goods_id.ParseToString(), 23513, 414); - Thread.Sleep(Randomx.GetId(500, 1500)); + Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); if (!activityRst2.Contains("\"success\":true")) { @@ -1465,8 +1460,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms List addActivityFailLst = new List(); string activityErr = ""; var activityRst3 = "频繁"; - Thread.Sleep(Randomx.GetId(500, 1500)); - Thread.Sleep(Randomx.GetId(500, 1500)); + Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); try { @@ -1480,7 +1474,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms activityRst3 = activity_goods_price_rule3(shop, string.Join(",", prodParams.Select(p => p.goods_id.ParseToString())), 23730, 424); if (activityRst3.Contains("频繁")) { - Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); @@ -1620,15 +1613,13 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms { string activityErr = ""; var activityRst3 = "频繁"; - Thread.Sleep(Randomx.GetId(500, 1500)); - Thread.Sleep(Randomx.GetId(500, 1500)); + Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); for (int i = 1; i < 5 && activityRst3.Contains("频繁"); i++) { activityRst3 = activity_goods_price_rule3(shop, prodParam.goods_id.ParseToString(), 23456, 422); Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep(Randomx.GetId(1000, 2000)); - Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); } if (!activityRst3.Contains("\"success\":true")) @@ -1747,8 +1738,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms List addActivityFailLst = new List(); string activityErr = ""; var activityRst3 = "频繁"; - Thread.Sleep(Randomx.GetId(500, 1500)); - Thread.Sleep(Randomx.GetId(500, 1500)); + Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); try { @@ -1762,7 +1752,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms activityRst3 = activity_goods_price_rule3(shop, string.Join(",", prodParams.Select(p => p.goods_id.ParseToString())), 23456, 422); if (activityRst3.Contains("频繁")) { - Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep(Randomx.GetId(1000, 2000)); Thread.Sleep((moreSleepTime * 1000).ParseToInt()); @@ -1848,7 +1837,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms var addActivityRst = "频繁"; for (int i = 0; i < 3 && addActivityRst.Contains("频繁"); i++) { - Thread.Sleep(Randomx.GetId(2000, 5000)); + Thread.Sleep(Randomx.GetId(1000, 2000)); addActivityRst = add_activity_goods(shop, actSubmitParamV2, "0", 23456, 422); //{"success":true,"error_code":1000000,"error_msg":null,"result":{"enroll_fail_goods_list":[],"enroll_success_goods_list":[{"goods_id":939959837537,"activity_goods_id":11278102151265},{"goods_id":939958451500,"activity_goods_id":11278068868140},{"goods_id":939958936804,"activity_goods_id":11278114440420},{"goods_id":939958823706,"activity_goods_id":11278085253146},{"goods_id":939958300485,"activity_goods_id":11278098034757}]}} } @@ -3316,7 +3305,11 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms foreach (var prodParam in prodParamLst) { - + Act981FailedIds.Add(prodParam.goods_id); + } + if (chkDown981Failed.Checked) + { + DownProd(shop, Act981FailedIds); } continue; @@ -3370,7 +3363,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms foreach (var rw in rws) rw.Cells["colOpResult"].Value += " 正在优化商品以报名活动"; })); - Thread.Sleep(Randomx.GetId(3000, 5000)); + Thread.Sleep(Randomx.GetId(1000, 2000)); PddEditProdStockQuantity prodQuantity = new PddEditProdStockQuantity(); prodQuantity.data = new List(); diff --git a/TEMUKJD/PDDForms/ProductForms/PDDProductUpDownForm.Designer.cs b/TEMUKJD/PDDForms/ProductForms/PDDProductUpDownForm.Designer.cs index c95ba8d..6bbcfef 100644 --- a/TEMUKJD/PDDForms/ProductForms/PDDProductUpDownForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductForms/PDDProductUpDownForm.Designer.cs @@ -30,15 +30,15 @@ namespace TemuKJD.PDDForms.ProductForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnSelectNeedCutPrice = new DevComponents.DotNetBar.PanelEx(); @@ -56,7 +56,7 @@ namespace TemuKJD.PDDForms.ProductForms this.txtGoodsName = new System.Windows.Forms.TextBox(); this.txtSkuSns = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.label5 = new System.Windows.Forms.Label(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.cmbStatus = new System.Windows.Forms.ComboBox(); @@ -95,10 +95,6 @@ namespace TemuKJD.PDDForms.ProductForms this.txtShopId = new System.Windows.Forms.TextBox(); this.btnClearDgv = new DevComponents.DotNetBar.PanelEx(); this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx(); - this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.btnClear = new DevComponents.DotNetBar.PanelEx(); - this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSupplierName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -117,6 +113,10 @@ namespace TemuKJD.PDDForms.ProductForms this.colIsOnSale = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.btnClear = new DevComponents.DotNetBar.PanelEx(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -183,7 +183,7 @@ namespace TemuKJD.PDDForms.ProductForms this.ucGroupBoxEx2.Controls.Add(this.txtGoodsName); this.ucGroupBoxEx2.Controls.Add(this.txtSkuSns); this.ucGroupBoxEx2.Controls.Add(this.label1); - this.ucGroupBoxEx2.Controls.Add(this.pnlEmpty); + this.ucGroupBoxEx2.Controls.Add(this.btnEmpty); this.ucGroupBoxEx2.Controls.Add(this.label5); this.ucGroupBoxEx2.Controls.Add(this.btnSearch); this.ucGroupBoxEx2.Controls.Add(this.cmbStatus); @@ -415,30 +415,30 @@ namespace TemuKJD.PDDForms.ProductForms this.label1.TabIndex = 629; this.label1.Text = "规格编码"; // - // pnlEmpty + // btnEmpty // - 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(575, 32); - this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 23); - 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 = 504; - this.pnlEmpty.Text = "清空条件"; - this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); + this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; + this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEmpty.Location = new System.Drawing.Point(575, 32); + this.btnEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnEmpty.Name = "btnEmpty"; + this.btnEmpty.Size = new System.Drawing.Size(56, 23); + this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnEmpty.Style.GradientAngle = 90; + this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnEmpty.TabIndex = 504; + this.btnEmpty.Text = "清空条件"; + this.btnEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // // label5 // @@ -724,19 +724,19 @@ namespace TemuKJD.PDDForms.ProductForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.dgvShop.AutoRowNumber = true; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -955,19 +955,19 @@ namespace TemuKJD.PDDForms.ProductForms // this.dgvProduct.AllowUserToAddRows = false; this.dgvProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle12; this.dgvProduct.AutoRowNumber = true; this.dgvProduct.BackgroundColor = System.Drawing.Color.White; this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13; this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -998,6 +998,147 @@ namespace TemuKJD.PDDForms.ProductForms this.dgvProduct.TabIndex = 187; this.dgvProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProduct_CellContentClick); // + // colCheck + // + this.colCheck.Frozen = true; + this.colCheck.HeaderText = "选择"; + this.colCheck.Name = "colCheck"; + this.colCheck.ReadOnly = true; + this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCheck.Width = 30; + // + // colSupplierId + // + this.colSupplierId.HeaderText = "店铺Id"; + this.colSupplierId.Name = "colSupplierId"; + this.colSupplierId.ReadOnly = true; + this.colSupplierId.Width = 90; + // + // colSupplierName + // + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle14; + this.colSupplierName.HeaderText = "店铺名称"; + this.colSupplierName.Name = "colSupplierName"; + this.colSupplierName.ReadOnly = true; + this.colSupplierName.Width = 90; + // + // colImgUrl + // + this.colImgUrl.HeaderText = "图片地址"; + this.colImgUrl.Name = "colImgUrl"; + this.colImgUrl.ReadOnly = true; + this.colImgUrl.Visible = false; + // + // colProductSkcPic + // + this.colProductSkcPic.HeaderText = "图片"; + this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colProductSkcPic.Name = "colProductSkcPic"; + this.colProductSkcPic.ReadOnly = true; + this.colProductSkcPic.Width = 60; + // + // colSpuId + // + this.colSpuId.HeaderText = "商品ID"; + this.colSpuId.Name = "colSpuId"; + this.colSpuId.ReadOnly = true; + this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSpuId.Width = 95; + // + // colExtCode + // + this.colExtCode.HeaderText = "商品编码"; + this.colExtCode.Name = "colExtCode"; + this.colExtCode.ReadOnly = true; + // + // colProductName + // + dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle15; + this.colProductName.HeaderText = "商品标题"; + this.colProductName.Name = "colProductName"; + this.colProductName.ReadOnly = true; + this.colProductName.Width = 150; + // + // colResource + // + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colResource.DefaultCellStyle = dataGridViewCellStyle16; + this.colResource.HeaderText = "资源位"; + this.colResource.Name = "colResource"; + this.colResource.ReadOnly = true; + this.colResource.Width = 70; + // + // colPrice + // + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colPrice.DefaultCellStyle = dataGridViewCellStyle17; + this.colPrice.HeaderText = "价格"; + this.colPrice.Name = "colPrice"; + this.colPrice.ReadOnly = true; + this.colPrice.Width = 130; + // + // colStock + // + this.colStock.HeaderText = "库存"; + this.colStock.Name = "colStock"; + this.colStock.ReadOnly = true; + this.colStock.Width = 50; + // + // colFavorites + // + this.colFavorites.HeaderText = "收藏"; + this.colFavorites.Name = "colFavorites"; + this.colFavorites.ReadOnly = true; + this.colFavorites.Width = 50; + // + // colSales + // + this.colSales.HeaderText = "总销量"; + this.colSales.Name = "colSales"; + this.colSales.ReadOnly = true; + this.colSales.Width = 60; + // + // colSalesThirtyDays + // + this.colSalesThirtyDays.HeaderText = "30日销量"; + this.colSalesThirtyDays.Name = "colSalesThirtyDays"; + this.colSalesThirtyDays.ReadOnly = true; + this.colSalesThirtyDays.Width = 70; + // + // colAddTime + // + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle18; + this.colAddTime.HeaderText = "创建时间"; + this.colAddTime.Name = "colAddTime"; + this.colAddTime.ReadOnly = true; + this.colAddTime.Width = 80; + // + // colIsOnSale + // + this.colIsOnSale.HeaderText = "在售/下架"; + this.colIsOnSale.Name = "colIsOnSale"; + this.colIsOnSale.ReadOnly = true; + this.colIsOnSale.Width = 80; + // + // colStatus + // + this.colStatus.HeaderText = "审核状态"; + this.colStatus.Name = "colStatus"; + this.colStatus.ReadOnly = true; + this.colStatus.Width = 90; + // + // colOpResult + // + this.colOpResult.HeaderText = "操作结果"; + this.colOpResult.Name = "colOpResult"; + this.colOpResult.ReadOnly = true; + this.colOpResult.Width = 200; + // // splitContainer4 // this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1078,147 +1219,6 @@ namespace TemuKJD.PDDForms.ProductForms this.panelEx1.Text = "停止当前操作"; this.panelEx1.Click += new System.EventHandler(this.btnCancel_Click); // - // colCheck - // - this.colCheck.Frozen = true; - this.colCheck.HeaderText = "选择"; - this.colCheck.Name = "colCheck"; - this.colCheck.ReadOnly = true; - this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCheck.Width = 30; - // - // colSupplierId - // - this.colSupplierId.HeaderText = "店铺Id"; - this.colSupplierId.Name = "colSupplierId"; - this.colSupplierId.ReadOnly = true; - this.colSupplierId.Width = 90; - // - // colSupplierName - // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5; - this.colSupplierName.HeaderText = "店铺名称"; - this.colSupplierName.Name = "colSupplierName"; - this.colSupplierName.ReadOnly = true; - this.colSupplierName.Width = 90; - // - // colImgUrl - // - this.colImgUrl.HeaderText = "图片地址"; - this.colImgUrl.Name = "colImgUrl"; - this.colImgUrl.ReadOnly = true; - this.colImgUrl.Visible = false; - // - // colProductSkcPic - // - this.colProductSkcPic.HeaderText = "图片"; - this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colProductSkcPic.Name = "colProductSkcPic"; - this.colProductSkcPic.ReadOnly = true; - this.colProductSkcPic.Width = 60; - // - // colSpuId - // - this.colSpuId.HeaderText = "商品ID"; - this.colSpuId.Name = "colSpuId"; - this.colSpuId.ReadOnly = true; - this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colSpuId.Width = 95; - // - // colExtCode - // - this.colExtCode.HeaderText = "商品编码"; - this.colExtCode.Name = "colExtCode"; - this.colExtCode.ReadOnly = true; - // - // colProductName - // - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle6; - this.colProductName.HeaderText = "商品标题"; - this.colProductName.Name = "colProductName"; - this.colProductName.ReadOnly = true; - this.colProductName.Width = 150; - // - // colResource - // - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colResource.DefaultCellStyle = dataGridViewCellStyle7; - this.colResource.HeaderText = "资源位"; - this.colResource.Name = "colResource"; - this.colResource.ReadOnly = true; - this.colResource.Width = 70; - // - // colPrice - // - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colPrice.DefaultCellStyle = dataGridViewCellStyle8; - this.colPrice.HeaderText = "价格"; - this.colPrice.Name = "colPrice"; - this.colPrice.ReadOnly = true; - this.colPrice.Width = 130; - // - // colStock - // - this.colStock.HeaderText = "库存"; - this.colStock.Name = "colStock"; - this.colStock.ReadOnly = true; - this.colStock.Width = 50; - // - // colFavorites - // - this.colFavorites.HeaderText = "收藏"; - this.colFavorites.Name = "colFavorites"; - this.colFavorites.ReadOnly = true; - this.colFavorites.Width = 50; - // - // colSales - // - this.colSales.HeaderText = "总销量"; - this.colSales.Name = "colSales"; - this.colSales.ReadOnly = true; - this.colSales.Width = 60; - // - // colSalesThirtyDays - // - this.colSalesThirtyDays.HeaderText = "30日销量"; - this.colSalesThirtyDays.Name = "colSalesThirtyDays"; - this.colSalesThirtyDays.ReadOnly = true; - this.colSalesThirtyDays.Width = 70; - // - // colAddTime - // - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colAddTime.DefaultCellStyle = dataGridViewCellStyle9; - this.colAddTime.HeaderText = "创建时间"; - this.colAddTime.Name = "colAddTime"; - this.colAddTime.ReadOnly = true; - this.colAddTime.Width = 80; - // - // colIsOnSale - // - this.colIsOnSale.HeaderText = "在售/下架"; - this.colIsOnSale.Name = "colIsOnSale"; - this.colIsOnSale.ReadOnly = true; - this.colIsOnSale.Width = 80; - // - // colStatus - // - this.colStatus.HeaderText = "审核状态"; - this.colStatus.Name = "colStatus"; - this.colStatus.ReadOnly = true; - this.colStatus.Width = 90; - // - // colOpResult - // - this.colOpResult.HeaderText = "操作结果"; - this.colOpResult.Name = "colOpResult"; - this.colOpResult.ReadOnly = true; - this.colOpResult.Width = 200; - // // PDDProductUpDownForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1278,7 +1278,7 @@ namespace TemuKJD.PDDForms.ProductForms private DevComponents.DotNetBar.PanelEx btnClear; private DevComponents.DotNetBar.PanelEx panelEx1; private UserControls.UcSplitPage ucSplitPage1; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty; private System.Windows.Forms.TextBox txtShopId; private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.PanelEx btnSearch; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs index ccfd99b..cf16dd7 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs @@ -49,7 +49,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PDDDBProdListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucTabControlMetro1 = new PinBaoBao.UserControls.UcTabControlMetro(); + this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.btnExportIdImg = new DevComponents.DotNetBar.PanelEx(); this.btnSetGroup = new DevComponents.DotNetBar.PanelEx(); @@ -114,7 +114,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbCat3 = new System.Windows.Forms.ComboBox(); this.label17 = new System.Windows.Forms.Label(); this.txtRealCoid = new System.Windows.Forms.TextBox(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.label18 = new System.Windows.Forms.Label(); this.cmbHasReturn = new System.Windows.Forms.ComboBox(); @@ -750,7 +750,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.Controls.Add(this.cmbCat3, 7, 2); this.tableLayoutPanel1.Controls.Add(this.label17, 6, 2); this.tableLayoutPanel1.Controls.Add(this.txtRealCoid, 1, 2); - this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 14, 1); + this.tableLayoutPanel1.Controls.Add(this.btnEmpty, 14, 1); this.tableLayoutPanel1.Controls.Add(this.btnSearch, 14, 0); this.tableLayoutPanel1.Controls.Add(this.label18, 12, 1); this.tableLayoutPanel1.Controls.Add(this.cmbHasReturn, 13, 1); @@ -1198,30 +1198,30 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.txtRealCoid.Size = new System.Drawing.Size(46, 23); this.txtRealCoid.TabIndex = 814; // - // pnlEmpty + // btnEmpty // - this.pnlEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left; - 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(796, 40); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(46, 25); - 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 = 431; - this.pnlEmpty.Text = "清空"; - this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); + this.btnEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; + this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEmpty.Location = new System.Drawing.Point(796, 40); + this.btnEmpty.Name = "btnEmpty"; + this.btnEmpty.Size = new System.Drawing.Size(46, 25); + this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnEmpty.Style.GradientAngle = 90; + this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnEmpty.TabIndex = 431; + this.btnEmpty.Text = "清空"; + this.btnEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // // btnSearch // @@ -1950,7 +1950,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.TextBox txtSPU; private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox txtSKC; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty; private System.Windows.Forms.TextBox txtExtCode; private System.Windows.Forms.Label label4; private System.Windows.Forms.TextBox txtProdName; @@ -2057,7 +2057,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DateTimePicker dtpEnd; private System.Windows.Forms.DateTimePicker dtpStart; private DevComponents.DotNetBar.PanelEx panelEx1; - private PinBaoBao.UserControls.UcTabControlMetro ucTabControlMetro1; + private TemuKJD.UserControls.UcTabControlMetro ucTabControlMetro1; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.TabPage tabPage2; diff --git a/TEMUKJD/PDDForms/ShopForms/A_PddShopForm.Designer.cs b/TEMUKJD/PDDForms/ShopForms/A_PddShopForm.Designer.cs index 9a5f96c..ccbab4a 100644 --- a/TEMUKJD/PDDForms/ShopForms/A_PddShopForm.Designer.cs +++ b/TEMUKJD/PDDForms/ShopForms/A_PddShopForm.Designer.cs @@ -156,14 +156,14 @@ this.tv.TabIndex = 1; this.tv.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tv_AfterSelect); // - // ShopForm + // A_PddShopForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(933, 461); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Name = "ShopForm"; + this.Name = "A_PddShopForm"; this.Text = "ShopForm"; this.Load += new System.EventHandler(this.ShopForm_Load); this.panel1.ResumeLayout(false); diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopAddEditForm.Designer.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopAddEditForm.Designer.cs index e337815..37f3472 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopAddEditForm.Designer.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopAddEditForm.Designer.cs @@ -28,8 +28,9 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PDDShopAddEditForm)); this.panel2 = new System.Windows.Forms.Panel(); + this.label8 = new System.Windows.Forms.Label(); + this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label7 = new System.Windows.Forms.Label(); this.cmbGroup = new System.Windows.Forms.ComboBox(); this.txtBuyAccount = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -43,15 +44,14 @@ this.txtLoginName = new System.Windows.Forms.TextBox(); 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.btnOk = new DevComponents.DotNetBar.PanelEx(); this.panel2.SuspendLayout(); this.SuspendLayout(); // // panel2 // this.panel2.BackColor = System.Drawing.Color.White; + this.panel2.Controls.Add(this.btnOk); this.panel2.Controls.Add(this.label8); this.panel2.Controls.Add(this.txtNotes); this.panel2.Controls.Add(this.label7); @@ -67,7 +67,6 @@ this.panel2.Controls.Add(this.txtLoginName); this.panel2.Controls.Add(this.label1); this.panel2.Controls.Add(this.label5); - this.panel2.Controls.Add(this.btnOk); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(1, 33); this.panel2.Name = "panel2"; @@ -75,6 +74,35 @@ this.panel2.TabIndex = 1; this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint); // + // 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 = " 备注"; + // + // 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; + // // label7 // this.label7.AutoSize = true; @@ -237,57 +265,35 @@ // // btnOk // - this.btnOk.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOk.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnOk.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnOk.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnOk.DisabledBackColor = System.Drawing.Color.Empty; this.btnOk.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOk.ForeColor = System.Drawing.Color.White; this.btnOk.Location = new System.Drawing.Point(208, 209); - this.btnOk.Margin = new System.Windows.Forms.Padding(2); this.btnOk.Name = "btnOk"; this.btnOk.Size = new System.Drawing.Size(55, 26); - this.btnOk.TabIndex = 372; + this.btnOk.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnOk.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOk.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOk.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnOk.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnOk.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnOk.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnOk.Style.GradientAngle = 90; + this.btnOk.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnOk.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOk.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOk.TabIndex = 804; this.btnOk.Text = "新增"; - 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 + // PDDShopAddEditForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(297, 319); this.Controls.Add(this.panel2); 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 = "ShopAddEditForm"; + this.Name = "PDDShopAddEditForm"; this.Text = "添加店铺"; this.TitleText = "添加店铺"; this.Load += new System.EventHandler(this.ShopAddEditForm_Load); @@ -305,7 +311,6 @@ private System.Windows.Forms.TextBox txtShopPassword; private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox txtLoginName; - private UserControls.ButtonEx btnOk; private System.Windows.Forms.Label label5; private DevComponents.DotNetBar.Controls.TextBoxX txtUploadAccount; private System.Windows.Forms.Label label3; @@ -317,5 +322,6 @@ private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label8; private DevComponents.DotNetBar.Controls.TextBoxX txtNotes; + private DevComponents.DotNetBar.PanelEx btnOk; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs index 02d9110..3465878 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); @@ -39,24 +39,22 @@ this.btnLoginSelect = new TemuKJD.UserControls.ButtonEx(); this.btnCheck = new TemuKJD.UserControls.ButtonEx(); this.panel4 = new System.Windows.Forms.Panel(); + this.btnImport = new DevComponents.DotNetBar.PanelEx(); + this.btnAddShop = new DevComponents.DotNetBar.PanelEx(); this.btnOpenOrder = new TemuKJD.UserControls.ButtonEx(); this.chkUsePddWorkbanch = new TemuKJD.UserComponent.UcCheckBox(this.components); this.cmbNotes = new System.Windows.Forms.ComboBox(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new TemuKJD.UserControls.ButtonEx(); 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.btnRefreshAuth = new TemuKJD.UserControls.ButtonEx(); 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.colMallId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -85,6 +83,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(); @@ -205,24 +205,72 @@ // // panel4 // + this.panel4.Controls.Add(this.btnImport); + this.panel4.Controls.Add(this.btnAddShop); this.panel4.Controls.Add(this.btnOpenOrder); this.panel4.Controls.Add(this.chkUsePddWorkbanch); this.panel4.Controls.Add(this.cmbNotes); - this.panel4.Controls.Add(this.pnlEmpty); + this.panel4.Controls.Add(this.btnEmpty); this.panel4.Controls.Add(this.btnSearch); 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; this.panel4.Location = new System.Drawing.Point(3, 3); this.panel4.Name = "panel4"; this.panel4.Size = new System.Drawing.Size(1035, 40); this.panel4.TabIndex = 0; // + // btnImport + // + this.btnImport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnImport.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnImport.DisabledBackColor = System.Drawing.Color.Empty; + this.btnImport.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnImport.Location = new System.Drawing.Point(72, 9); + this.btnImport.Name = "btnImport"; + this.btnImport.Size = new System.Drawing.Size(66, 26); + this.btnImport.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnImport.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImport.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImport.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnImport.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnImport.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnImport.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnImport.Style.GradientAngle = 90; + this.btnImport.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnImport.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImport.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImport.TabIndex = 812; + this.btnImport.Text = "导入店铺"; + this.btnImport.Click += new System.EventHandler(this.btnImport_Click); + // + // btnAddShop + // + this.btnAddShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAddShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnAddShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAddShop.Location = new System.Drawing.Point(3, 9); + this.btnAddShop.Name = "btnAddShop"; + this.btnAddShop.Size = new System.Drawing.Size(66, 26); + this.btnAddShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnAddShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnAddShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnAddShop.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnAddShop.Style.GradientAngle = 90; + this.btnAddShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddShop.TabIndex = 808; + this.btnAddShop.Text = "添加店铺"; + this.btnAddShop.Click += new System.EventHandler(this.btnAddShop_Click); + // // btnOpenOrder // this.btnOpenOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -261,29 +309,29 @@ this.cmbNotes.TabIndex = 413; this.cmbNotes.Text = "全部"; // - // pnlEmpty + // btnEmpty // - 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(718, 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); + this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; + this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEmpty.Location = new System.Drawing.Point(718, 9); + this.btnEmpty.Name = "btnEmpty"; + this.btnEmpty.Size = new System.Drawing.Size(66, 26); + this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnEmpty.Style.GradientAngle = 90; + this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnEmpty.TabIndex = 409; + this.btnEmpty.Text = "清空条件"; + this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click); // // btnSearch // @@ -342,38 +390,6 @@ 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))))); - this.btnImport.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnImport.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnImport.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnImport.ForeColor = System.Drawing.Color.White; - this.btnImport.Location = new System.Drawing.Point(71, 9); - this.btnImport.Margin = new System.Windows.Forms.Padding(2); - this.btnImport.Name = "btnImport"; - this.btnImport.Size = new System.Drawing.Size(66, 26); - this.btnImport.TabIndex = 371; - this.btnImport.Text = "导入店铺"; - this.btnImport.UseVisualStyleBackColor = false; - this.btnImport.Click += new System.EventHandler(this.btnImport_Click); - // - // btnAddShop - // - this.btnAddShop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnAddShop.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnAddShop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnAddShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddShop.ForeColor = System.Drawing.Color.White; - this.btnAddShop.Location = new System.Drawing.Point(1, 9); - this.btnAddShop.Margin = new System.Windows.Forms.Padding(2); - this.btnAddShop.Name = "btnAddShop"; - this.btnAddShop.Size = new System.Drawing.Size(66, 26); - this.btnAddShop.TabIndex = 370; - this.btnAddShop.Text = "添加店铺"; - this.btnAddShop.UseVisualStyleBackColor = false; - this.btnAddShop.Click += new System.EventHandler(this.btnAddShop_Click); - // // splitContainer2 // this.splitContainer2.BackColor = System.Drawing.Color.White; @@ -430,20 +446,20 @@ // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvShop.AutoRowNumber = true; this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -484,31 +500,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(1108, 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.Bottom; - 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, -1); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1264, 29); - this.statusBar.TabIndex = 1; - // // colSelect // this.colSelect.FillWeight = 26F; @@ -736,6 +727,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(1108, 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.Bottom; + 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, -1); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1264, 29); + this.statusBar.TabIndex = 1; + // // PDDShopListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -778,10 +794,8 @@ private System.Windows.Forms.Panel panel5; private System.Windows.Forms.Panel panel4; private System.Windows.Forms.SplitContainer splitContainer2; - private UserControls.ButtonEx btnAddShop; private UserControls.ButtonEx btnLoginSelect; private UserControls.ButtonEx btnCheck; - private UserControls.ButtonEx btnImport; private UserControls.StatusBarUserControl statusBar; private UserComponent.DataGridViewEx dgvShop; private System.Windows.Forms.CheckBox chkAutoDrag; @@ -793,7 +807,7 @@ private System.Windows.Forms.Label label2; private UserControls.ButtonEx btnSearch; private System.Windows.Forms.Label label4; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty; private UserControls.ButtonEx btnRefreshShop; private System.Windows.Forms.ComboBox cmbNotes; private UserComponent.UcCheckBox chkUsePddWorkbanch; @@ -826,5 +840,7 @@ private System.Windows.Forms.DataGridViewLinkColumn colCopyCookies; private System.Windows.Forms.DataGridViewLinkColumn colEdit; private System.Windows.Forms.DataGridViewLinkColumn colDelete; + private DevComponents.DotNetBar.PanelEx btnAddShop; + private DevComponents.DotNetBar.PanelEx btnImport; } } \ No newline at end of file diff --git a/TEMUKJD/Properties/Resources.Designer.cs b/TEMUKJD/Properties/Resources.Designer.cs index 9754b57..b432f9d 100644 --- a/TEMUKJD/Properties/Resources.Designer.cs +++ b/TEMUKJD/Properties/Resources.Designer.cs @@ -583,6 +583,36 @@ namespace TemuKJD.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap pdd_bg { + get { + object obj = ResourceManager.GetObject("pdd_bg", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap pdd_icon { + get { + object obj = ResourceManager.GetObject("pdd_icon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap pdd_logo { + get { + object obj = ResourceManager.GetObject("pdd_logo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/TEMUKJD/Properties/Resources.resx b/TEMUKJD/Properties/Resources.resx index 59bb89e..453c41c 100644 --- a/TEMUKJD/Properties/Resources.resx +++ b/TEMUKJD/Properties/Resources.resx @@ -265,6 +265,15 @@ ..\Resources\normal.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\pdd_bg..jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\pdd_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\pdd_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/TEMUKJD/Resources/pdd_bg..jpg b/TEMUKJD/Resources/pdd_bg..jpg new file mode 100644 index 0000000..3e02075 Binary files /dev/null and b/TEMUKJD/Resources/pdd_bg..jpg differ diff --git a/TEMUKJD/Resources/pdd_icon.png b/TEMUKJD/Resources/pdd_icon.png new file mode 100644 index 0000000..8bb1284 Binary files /dev/null and b/TEMUKJD/Resources/pdd_icon.png differ diff --git a/TEMUKJD/Resources/pdd_logo.png b/TEMUKJD/Resources/pdd_logo.png new file mode 100644 index 0000000..2eb64d4 Binary files /dev/null and b/TEMUKJD/Resources/pdd_logo.png differ diff --git a/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs b/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs index d96953a..d8ae880 100644 --- a/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs +++ b/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs @@ -62,7 +62,7 @@ namespace TemuKJD.ToolForms this.btnMultiLogin = new DevComponents.DotNetBar.PanelEx(); this.btnDel = new DevComponents.DotNetBar.PanelEx(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucTabControlMetro1 = new PinBaoBao.UserControls.UcTabControlMetro(); + this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.btnNext = new System.Windows.Forms.Button(); @@ -970,7 +970,7 @@ namespace TemuKJD.ToolForms private DevComponents.DotNetBar.PanelEx btnMultiLogin; private DevComponents.DotNetBar.PanelEx btnDel; private System.Windows.Forms.SplitContainer splitContainer1; - private PinBaoBao.UserControls.UcTabControlMetro ucTabControlMetro1; + private TemuKJD.UserControls.UcTabControlMetro ucTabControlMetro1; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.SplitContainer splitContainer2; private System.Windows.Forms.Button btnNext; diff --git a/TEMUKJD/ToolForms/GetJuShuitanProdForm.Designer.cs b/TEMUKJD/ToolForms/GetJuShuitanProdForm.Designer.cs index e1ac234..05ffd2f 100644 --- a/TEMUKJD/ToolForms/GetJuShuitanProdForm.Designer.cs +++ b/TEMUKJD/ToolForms/GetJuShuitanProdForm.Designer.cs @@ -61,7 +61,7 @@ namespace TemuKJD.ToolForms this.colDel = new System.Windows.Forms.DataGridViewLinkColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucTabControlMetro1 = new PinBaoBao.UserControls.UcTabControlMetro(); + this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage(); @@ -1445,7 +1445,7 @@ namespace TemuKJD.ToolForms private System.Windows.Forms.ComboBox cmbPlatformType; private UserComponent.UcCheckBox chkOverride; private UserComponent.UcCheckBox chkSkip; - private PinBaoBao.UserControls.UcTabControlMetro ucTabControlMetro1; + private TemuKJD.UserControls.UcTabControlMetro ucTabControlMetro1; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.TextBox txtTitle; diff --git a/TEMUKJD/ToolForms/GetJuShuitanProductSKUListForm.Designer.cs b/TEMUKJD/ToolForms/GetJuShuitanProductSKUListForm.Designer.cs index e49307f..fea3924 100644 --- a/TEMUKJD/ToolForms/GetJuShuitanProductSKUListForm.Designer.cs +++ b/TEMUKJD/ToolForms/GetJuShuitanProductSKUListForm.Designer.cs @@ -68,7 +68,7 @@ namespace TemuKJD.ToolForms this.btnMultiLogin = new DevComponents.DotNetBar.PanelEx(); this.btnDel = new DevComponents.DotNetBar.PanelEx(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucTabControlMetro1 = new PinBaoBao.UserControls.UcTabControlMetro(); + this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.btnNext = new System.Windows.Forms.Button(); @@ -1292,7 +1292,7 @@ namespace TemuKJD.ToolForms private DevComponents.DotNetBar.PanelEx btnMultiLogin; private DevComponents.DotNetBar.PanelEx btnDel; private System.Windows.Forms.SplitContainer splitContainer1; - private PinBaoBao.UserControls.UcTabControlMetro ucTabControlMetro1; + private TemuKJD.UserControls.UcTabControlMetro ucTabControlMetro1; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.SplitContainer splitContainer2; private System.Windows.Forms.Button btnNext; diff --git a/TEMUKJD/UserComponent/UcCheckBox.cs b/TEMUKJD/UserComponent/UcCheckBox.cs index ccf605a..4cfad71 100644 --- a/TEMUKJD/UserComponent/UcCheckBox.cs +++ b/TEMUKJD/UserComponent/UcCheckBox.cs @@ -26,9 +26,9 @@ namespace TemuKJD.UserComponent } private int checkBoxSize = 12; - private Color checkBoxColor = Color.White; - private Color checkBoxCheckColor = Color.Blue; - private Color checkBoxBorderColor = Color.Blue; + public Color CheckBoxColor = Color.White; + public Color CheckBoxCheckColor = Color.Blue; + public Color CheckBoxBorderColor = Color.Blue; protected override void OnPaint(PaintEventArgs e) { @@ -55,9 +55,9 @@ namespace TemuKJD.UserComponent rt.Width = checkBoxSize; rt.Height = checkBoxSize; - Color color = this.Checked ? checkBoxCheckColor : checkBoxColor; + Color color = this.Checked ? CheckBoxCheckColor : CheckBoxColor; DrawRoundedRectangle(g, rt, 2, color, true); - DrawRoundedRectangle(g, rt, 2, checkBoxBorderColor); + DrawRoundedRectangle(g, rt, 2, CheckBoxBorderColor); if (this.Checked) { diff --git a/TEMUKJD/UserComponent/UcTabControlMetro.cs b/TEMUKJD/UserComponent/UcTabControlMetro.cs index af9a14a..500fffe 100644 --- a/TEMUKJD/UserComponent/UcTabControlMetro.cs +++ b/TEMUKJD/UserComponent/UcTabControlMetro.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace PinBaoBao.UserControls +namespace TemuKJD.UserControls { public partial class UcTabControlMetro : TabControl { diff --git a/TEMUKJD/UserComponent/UcTabControlMetro.designer.cs b/TEMUKJD/UserComponent/UcTabControlMetro.designer.cs index baedc9d..a6560c8 100644 --- a/TEMUKJD/UserComponent/UcTabControlMetro.designer.cs +++ b/TEMUKJD/UserComponent/UcTabControlMetro.designer.cs @@ -1,4 +1,4 @@ -namespace PinBaoBao.UserControls +namespace TemuKJD.UserControls { partial class UcTabControlMetro { diff --git a/TEMUKJD/UserControls/UcSplitPage.Designer.cs b/TEMUKJD/UserControls/UcSplitPage.Designer.cs index b9114f9..68d25ba 100644 --- a/TEMUKJD/UserControls/UcSplitPage.Designer.cs +++ b/TEMUKJD/UserControls/UcSplitPage.Designer.cs @@ -34,7 +34,7 @@ namespace TemuKJD.UserControls 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.btnJump = 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(); @@ -118,7 +118,7 @@ namespace TemuKJD.UserControls // // flowLayoutPanel2 // - this.flowLayoutPanel2.Controls.Add(this.pnlJump); + this.flowLayoutPanel2.Controls.Add(this.btnJump); this.flowLayoutPanel2.Controls.Add(this.label1); this.flowLayoutPanel2.Controls.Add(this.txtJumpPage); this.flowLayoutPanel2.Controls.Add(this.lblJump); @@ -137,32 +137,32 @@ namespace TemuKJD.UserControls this.flowLayoutPanel2.Size = new System.Drawing.Size(480, 23); this.flowLayoutPanel2.TabIndex = 0; // - // pnlJump + // btnJump // - 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); + this.btnJump.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + this.btnJump.AutoSize = true; + this.btnJump.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnJump.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnJump.DisabledBackColor = System.Drawing.Color.Empty; + this.btnJump.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnJump.Location = new System.Drawing.Point(446, 0); + this.btnJump.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.btnJump.Name = "btnJump"; + this.btnJump.Size = new System.Drawing.Size(31, 20); + this.btnJump.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnJump.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnJump.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnJump.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnJump.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnJump.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnJump.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnJump.Style.GradientAngle = 90; + this.btnJump.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnJump.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnJump.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnJump.TabIndex = 439; + this.btnJump.Text = "跳转"; + this.btnJump.Click += new System.EventHandler(this.pnlJump_Click); // // label1 // @@ -281,7 +281,7 @@ namespace TemuKJD.UserControls private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2; private System.Windows.Forms.Label lblJump; - private DevComponents.DotNetBar.PanelEx pnlJump; + private DevComponents.DotNetBar.PanelEx btnJump; private System.Windows.Forms.Label label1; private DevComponents.DotNetBar.Controls.TextBoxX txtJumpPage; private System.Windows.Forms.Label lblPageSize; diff --git a/TEMUKJD/UserForm/LoginForm.Designer.cs b/TEMUKJD/UserForm/LoginForm.Designer.cs index e8b1dd3..94e2286 100644 --- a/TEMUKJD/UserForm/LoginForm.Designer.cs +++ b/TEMUKJD/UserForm/LoginForm.Designer.cs @@ -29,13 +29,14 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LoginForm)); - this.loginPanel = new DevComponents.DotNetBar.PanelEx(); + this.btnLogin = new DevComponents.DotNetBar.PanelEx(); this.txtMobile = new DevComponents.DotNetBar.Controls.TextBoxX(); this.password = new DevComponents.DotNetBar.Controls.TextBoxX(); this.lblResetPassword = new DevComponents.DotNetBar.LabelX(); this.chkRemember = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.autoLogin = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.closePanel = new DevComponents.DotNetBar.PanelEx(); this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); this.lblSignUp = new DevComponents.DotNetBar.LabelX(); @@ -47,33 +48,34 @@ this.lblBuy = new DevComponents.DotNetBar.LabelX(); this.lblContactSupport = new DevComponents.DotNetBar.LabelX(); this.panelEx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panelEx3.SuspendLayout(); this.grpEnvironmentChoice.SuspendLayout(); this.SuspendLayout(); // - // loginPanel + // btnLogin // - this.loginPanel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.loginPanel.Cursor = System.Windows.Forms.Cursors.Hand; - this.loginPanel.DisabledBackColor = System.Drawing.Color.Empty; - this.loginPanel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.loginPanel.Location = new System.Drawing.Point(133, 244); - this.loginPanel.Name = "loginPanel"; - this.loginPanel.Size = new System.Drawing.Size(194, 30); - this.loginPanel.Style.Alignment = System.Drawing.StringAlignment.Center; - this.loginPanel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.loginPanel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.loginPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.loginPanel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.loginPanel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.loginPanel.Style.ForeColor.Color = System.Drawing.Color.White; - this.loginPanel.Style.GradientAngle = 90; - this.loginPanel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.loginPanel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.loginPanel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.loginPanel.TabIndex = 0; - this.loginPanel.Text = "安 全 登 录"; - this.loginPanel.Click += new System.EventHandler(this.loginPanel_Click); + this.btnLogin.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnLogin.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnLogin.DisabledBackColor = System.Drawing.Color.Empty; + this.btnLogin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnLogin.Location = new System.Drawing.Point(133, 243); + this.btnLogin.Name = "btnLogin"; + this.btnLogin.Size = new System.Drawing.Size(194, 30); + this.btnLogin.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnLogin.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnLogin.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnLogin.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnLogin.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnLogin.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnLogin.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnLogin.Style.GradientAngle = 90; + this.btnLogin.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnLogin.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnLogin.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnLogin.TabIndex = 0; + this.btnLogin.Text = "安 全 登 录"; + this.btnLogin.Click += new System.EventHandler(this.loginPanel_Click); // // txtMobile // @@ -144,7 +146,7 @@ this.chkRemember.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.chkRemember.FocusCuesEnabled = false; this.chkRemember.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.chkRemember.Location = new System.Drawing.Point(134, 215); + this.chkRemember.Location = new System.Drawing.Point(134, 216); this.chkRemember.Name = "chkRemember"; this.chkRemember.Size = new System.Drawing.Size(80, 22); this.chkRemember.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -161,7 +163,7 @@ this.autoLogin.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.autoLogin.FocusCuesEnabled = false; this.autoLogin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.autoLogin.Location = new System.Drawing.Point(243, 215); + this.autoLogin.Location = new System.Drawing.Point(243, 216); this.autoLogin.Name = "autoLogin"; this.autoLogin.Size = new System.Drawing.Size(80, 22); this.autoLogin.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -175,6 +177,7 @@ // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.pictureBox1); this.panelEx1.Controls.Add(this.closePanel); this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Location = new System.Drawing.Point(0, 0); @@ -196,6 +199,15 @@ this.panelEx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panelEx1_MouseMove); this.panelEx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.panelEx1_MouseUp); // + // pictureBox1 + // + this.pictureBox1.Location = new System.Drawing.Point(119, 12); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(192, 96); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox1.TabIndex = 20; + this.pictureBox1.TabStop = false; + // // closePanel // this.closePanel.CanvasColor = System.Drawing.SystemColors.Control; @@ -301,7 +313,7 @@ // this.grpEnvironmentChoice.Controls.Add(this.rbtPrd); this.grpEnvironmentChoice.Controls.Add(this.rbtDev); - this.grpEnvironmentChoice.Location = new System.Drawing.Point(133, 274); + this.grpEnvironmentChoice.Location = new System.Drawing.Point(133, 273); this.grpEnvironmentChoice.Name = "grpEnvironmentChoice"; this.grpEnvironmentChoice.Size = new System.Drawing.Size(194, 37); this.grpEnvironmentChoice.TabIndex = 25; @@ -313,7 +325,7 @@ this.rbtPrd.Checked = true; this.rbtPrd.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.rbtPrd.ForeColor = System.Drawing.SystemColors.InfoText; - this.rbtPrd.Location = new System.Drawing.Point(119, 11); + this.rbtPrd.Location = new System.Drawing.Point(119, 13); this.rbtPrd.Name = "rbtPrd"; this.rbtPrd.Size = new System.Drawing.Size(47, 18); this.rbtPrd.TabIndex = 27; @@ -326,7 +338,7 @@ this.rbtDev.AutoSize = true; this.rbtDev.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.rbtDev.ForeColor = System.Drawing.SystemColors.InfoText; - this.rbtDev.Location = new System.Drawing.Point(35, 11); + this.rbtDev.Location = new System.Drawing.Point(35, 13); this.rbtDev.Name = "rbtDev"; this.rbtDev.Size = new System.Drawing.Size(47, 18); this.rbtDev.TabIndex = 26; @@ -344,7 +356,7 @@ this.lblBuy.Cursor = System.Windows.Forms.Cursors.Hand; this.lblBuy.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblBuy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(157)))), ((int)(((byte)(235))))); - this.lblBuy.Location = new System.Drawing.Point(334, 249); + this.lblBuy.Location = new System.Drawing.Point(334, 248); this.lblBuy.Name = "lblBuy"; this.lblBuy.Size = new System.Drawing.Size(56, 20); this.lblBuy.TabIndex = 38; @@ -372,7 +384,6 @@ // // LoginForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(247)))), ((int)(((byte)(254))))); this.ClientSize = new System.Drawing.Size(430, 323); @@ -386,8 +397,8 @@ this.Controls.Add(this.autoLogin); this.Controls.Add(this.chkRemember); this.Controls.Add(this.lblResetPassword); - this.Controls.Add(this.loginPanel); - this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Controls.Add(this.btnLogin); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "LoginForm"; @@ -395,6 +406,7 @@ this.Text = "登录 - 小奶牛"; this.Load += new System.EventHandler(this.LoginForm_Load); this.panelEx1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panelEx3.ResumeLayout(false); this.grpEnvironmentChoice.ResumeLayout(false); this.grpEnvironmentChoice.PerformLayout(); @@ -405,7 +417,7 @@ #endregion - private DevComponents.DotNetBar.PanelEx loginPanel; + private DevComponents.DotNetBar.PanelEx btnLogin; private DevComponents.DotNetBar.Controls.TextBoxX txtMobile; private DevComponents.DotNetBar.Controls.TextBoxX password; private DevComponents.DotNetBar.LabelX lblResetPassword; @@ -422,5 +434,6 @@ private DevComponents.DotNetBar.PanelEx pnlShowRemember; private DevComponents.DotNetBar.LabelX lblBuy; private DevComponents.DotNetBar.LabelX lblContactSupport; + private System.Windows.Forms.PictureBox pictureBox1; } } \ No newline at end of file diff --git a/TEMUKJD/UserForm/LoginForm.cs b/TEMUKJD/UserForm/LoginForm.cs index be950e0..3685fb5 100644 --- a/TEMUKJD/UserForm/LoginForm.cs +++ b/TEMUKJD/UserForm/LoginForm.cs @@ -39,7 +39,11 @@ namespace TemuKJD.UserForm private void LoginForm_Load(object sender, EventArgs e) { if (BaseClass.MainPath == "binxixi") - this.panelEx1.Style.BackgroundImage = Properties.Resources.login_bg_pdd; + { + this.panelEx1.Style.BackgroundImage = Properties.Resources.pdd_bg; + this.panelEx1.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Stretch; + this.pictureBox1.Image = Properties.Resources.pdd_logo; + } if (BaseClass.MainPath == "weixin") this.panelEx1.Style.BackgroundImage = Properties.Resources.login_bg_wx; diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs index 2efb2b0..d38dc56 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs @@ -30,10 +30,11 @@ namespace TemuKJD.WXForms.AdminForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); + this.chkChanceProdCollect = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkShopPoints = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkWXShowProdGetFromType = new TemuKJD.UserComponent.UcCheckBox(this.components); this.label7 = new System.Windows.Forms.Label(); @@ -86,7 +87,7 @@ namespace TemuKJD.WXForms.AdminForms this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); - this.chkChanceProdCollect = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkShopOptimize = new TemuKJD.UserComponent.UcCheckBox(this.components); ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); this.splitContainer5.Panel1.SuspendLayout(); this.splitContainer5.Panel2.SuspendLayout(); @@ -109,6 +110,7 @@ namespace TemuKJD.WXForms.AdminForms // splitContainer5.Panel1 // this.splitContainer5.Panel1.BackColor = System.Drawing.Color.WhiteSmoke; + this.splitContainer5.Panel1.Controls.Add(this.chkShopOptimize); this.splitContainer5.Panel1.Controls.Add(this.chkChanceProdCollect); this.splitContainer5.Panel1.Controls.Add(this.chkShopPoints); this.splitContainer5.Panel1.Controls.Add(this.chkWXShowProdGetFromType); @@ -154,9 +156,18 @@ namespace TemuKJD.WXForms.AdminForms this.splitContainer5.SplitterWidth = 1; this.splitContainer5.TabIndex = 3; // + // chkChanceProdCollect + // + this.chkChanceProdCollect.Location = new System.Drawing.Point(192, 422); + this.chkChanceProdCollect.Name = "chkChanceProdCollect"; + this.chkChanceProdCollect.Size = new System.Drawing.Size(96, 21); + this.chkChanceProdCollect.TabIndex = 812; + this.chkChanceProdCollect.Text = "机会商品采集"; + this.chkChanceProdCollect.UseVisualStyleBackColor = true; + // // chkShopPoints // - this.chkShopPoints.Location = new System.Drawing.Point(59, 518); + this.chkShopPoints.Location = new System.Drawing.Point(59, 524); this.chkShopPoints.Name = "chkShopPoints"; this.chkShopPoints.Size = new System.Drawing.Size(68, 21); this.chkShopPoints.TabIndex = 811; @@ -301,7 +312,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label1.AutoSize = true; this.label1.ForeColor = System.Drawing.SystemColors.ButtonShadow; - this.label1.Location = new System.Drawing.Point(56, 493); + this.label1.Location = new System.Drawing.Point(56, 498); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(212, 17); this.label1.TabIndex = 37; @@ -330,7 +341,7 @@ namespace TemuKJD.WXForms.AdminForms this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand; this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancel.ForeColor = System.Drawing.Color.White; - this.btnCancel.Location = new System.Drawing.Point(59, 455); + this.btnCancel.Location = new System.Drawing.Point(59, 460); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(86, 25); this.btnCancel.TabIndex = 35; @@ -346,7 +357,7 @@ namespace TemuKJD.WXForms.AdminForms this.btnOpUser.Cursor = System.Windows.Forms.Cursors.Hand; this.btnOpUser.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpUser.ForeColor = System.Drawing.Color.White; - this.btnOpUser.Location = new System.Drawing.Point(174, 455); + this.btnOpUser.Location = new System.Drawing.Point(174, 460); this.btnOpUser.Name = "btnOpUser"; this.btnOpUser.Size = new System.Drawing.Size(86, 25); this.btnOpUser.TabIndex = 34; @@ -532,20 +543,20 @@ namespace TemuKJD.WXForms.AdminForms // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; this.dgvUser.AutoRowNumber = true; this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvUser.BackgroundColor = System.Drawing.Color.White; this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.UserIdColumn, @@ -563,14 +574,14 @@ namespace TemuKJD.WXForms.AdminForms this.colAddShop, this.editColumn, this.deleteColumn}); - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvUser.DefaultCellStyle = dataGridViewCellStyle6; this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvUser.Location = new System.Drawing.Point(0, 0); @@ -711,14 +722,14 @@ namespace TemuKJD.WXForms.AdminForms this.btnExportShopErp.Visible = false; this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); // - // chkProdCollect + // chkShopOptimize // - this.chkChanceProdCollect.Location = new System.Drawing.Point(112, 421); - this.chkChanceProdCollect.Name = "chkProdCollect"; - this.chkChanceProdCollect.Size = new System.Drawing.Size(96, 21); - this.chkChanceProdCollect.TabIndex = 812; - this.chkChanceProdCollect.Text = "机会商品采集"; - this.chkChanceProdCollect.UseVisualStyleBackColor = true; + this.chkShopOptimize.Location = new System.Drawing.Point(112, 422); + this.chkShopOptimize.Name = "chkShopOptimize"; + this.chkShopOptimize.Size = new System.Drawing.Size(68, 21); + this.chkShopOptimize.TabIndex = 813; + this.chkShopOptimize.Text = "评分考核"; + this.chkShopOptimize.UseVisualStyleBackColor = true; // // WXAdminAccountForm // @@ -801,5 +812,6 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.DataGridViewLinkColumn deleteColumn; private UserComponent.UcCheckBox chkShopPoints; private UserComponent.UcCheckBox chkChanceProdCollect; + private UserComponent.UcCheckBox chkShopOptimize; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs index 685fc7f..2fb2322 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs @@ -83,6 +83,8 @@ namespace TemuKJD.WXForms.AdminForms authority += "货源选择,"; if (chkChanceProdCollect.Checked) authority += "机会商品采集,"; + if (chkShopOptimize.Checked) + authority += "评分考核,"; if (chkShopPoints.Checked) authority += "积分用户,"; data.Append("&authority=" + authority.Trim(',')); @@ -194,6 +196,7 @@ namespace TemuKJD.WXForms.AdminForms chkWXComplateProd.Checked = false; chkWXShowProdGetFromType.Checked = false; chkChanceProdCollect.Checked = false; + chkShopOptimize.Checked = false; chkShopPoints.Checked = false; } @@ -229,6 +232,7 @@ namespace TemuKJD.WXForms.AdminForms chkWXComplateProd.Checked = authority.Contains(chkWXComplateProd.Text); chkShopPoints.Checked = authority.Contains(chkShopPoints.Text); chkChanceProdCollect.Checked = authority.Contains(chkChanceProdCollect.Text); + chkShopOptimize.Checked = authority.Contains(chkShopOptimize.Text); chkWXShowProdGetFromType.Checked = authority.Contains(chkWXShowProdGetFromType.Text); } if (columname == "删除") diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs index 4b0cfea..e09d2f3 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs @@ -32,13 +32,13 @@ namespace TemuKJD.WXForms.ProductForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.chkRandomCompanyProd = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -75,7 +75,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearDgv = new DevComponents.DotNetBar.PanelEx(); this.label14 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); - this.panel4 = new System.Windows.Forms.Panel(); + this.pnlStep = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.fPnlPriceRule = new System.Windows.Forms.FlowLayoutPanel(); this.ucAddPrice1 = new TemuKJD.PDDForms.ProductSelectForms.UcAddPrice(); @@ -192,7 +192,7 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); this.ucGroupBoxEx2.SuspendLayout(); - this.panel4.SuspendLayout(); + this.pnlStep.SuspendLayout(); this.panel3.SuspendLayout(); this.fPnlPriceRule.SuspendLayout(); this.ucGroupBoxEx4.SuspendLayout(); @@ -278,7 +278,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx2.Controls.Add(this.btnClearDgv); this.ucGroupBoxEx2.Controls.Add(this.label14); this.ucGroupBoxEx2.Controls.Add(this.label15); - this.ucGroupBoxEx2.Controls.Add(this.panel4); + this.ucGroupBoxEx2.Controls.Add(this.pnlStep); this.ucGroupBoxEx2.Controls.Add(this.lblNewAddPrice); this.ucGroupBoxEx2.Controls.Add(this.txtAddMorePrice); this.ucGroupBoxEx2.Controls.Add(this.txtAddTimes); @@ -717,16 +717,16 @@ namespace TemuKJD.WXForms.ProductForms this.label15.TabIndex = 588; this.label15.Text = "元"; // - // panel4 + // pnlStep // - this.panel4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.pnlStep.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panel4.Controls.Add(this.panel3); - this.panel4.Location = new System.Drawing.Point(76, 17); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(350, 114); - this.panel4.TabIndex = 577; + this.pnlStep.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlStep.Controls.Add(this.panel3); + this.pnlStep.Location = new System.Drawing.Point(76, 17); + this.pnlStep.Name = "pnlStep"; + this.pnlStep.Size = new System.Drawing.Size(350, 114); + this.pnlStep.TabIndex = 577; // // panel3 // @@ -1773,19 +1773,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8; this.dgvShop.AutoRowNumber = true; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -2005,19 +2005,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.dgvSelectProduct.AutoRowNumber = true; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -2078,8 +2078,8 @@ namespace TemuKJD.WXForms.ProductForms // // colSupplierName // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle12; this.colSupplierName.Frozen = true; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; @@ -2157,8 +2157,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductName // - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle13; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -2218,8 +2218,8 @@ namespace TemuKJD.WXForms.ProductForms // // colAddTime // - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colAddTime.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle14; this.colAddTime.HeaderText = "上传时间"; this.colAddTime.Name = "colAddTime"; this.colAddTime.ReadOnly = true; @@ -2341,7 +2341,7 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer1.ResumeLayout(false); this.ucGroupBoxEx2.ResumeLayout(false); this.ucGroupBoxEx2.PerformLayout(); - this.panel4.ResumeLayout(false); + this.pnlStep.ResumeLayout(false); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); this.fPnlPriceRule.ResumeLayout(false); @@ -2400,7 +2400,7 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnClearUpload; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Label lblNewAddPrice; - private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel pnlStep; private System.Windows.Forms.Label label15; private System.Windows.Forms.TextBox txtSinglePriceAdd; private System.Windows.Forms.Label label14; diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs index 8fe73a0..5524ccb 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs @@ -61,7 +61,7 @@ namespace TemuKJD.WXForms.ProductForms this.chkCatBoundLessThan = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkCatBoundMoreThan = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.cmbCat3 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); this.label17 = new System.Windows.Forms.Label(); this.cmbCat2 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); @@ -279,7 +279,7 @@ namespace TemuKJD.WXForms.ProductForms this.tableLayoutPanel1.Controls.Add(this.chkCatBoundLessThan, 4, 1); this.tableLayoutPanel1.Controls.Add(this.chkCatBoundMoreThan, 2, 1); this.tableLayoutPanel1.Controls.Add(this.btnSearch, 10, 0); - this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 11, 0); + this.tableLayoutPanel1.Controls.Add(this.btnEmpty, 11, 0); this.tableLayoutPanel1.Controls.Add(this.cmbCat3, 7, 0); this.tableLayoutPanel1.Controls.Add(this.label17, 6, 0); this.tableLayoutPanel1.Controls.Add(this.cmbCat2, 5, 0); @@ -387,30 +387,30 @@ namespace TemuKJD.WXForms.ProductForms this.btnSearch.Text = "搜索"; this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); // - // pnlEmpty + // btnEmpty // - this.pnlEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left; - 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(1142, 5); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(46, 25); - 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 = 431; - this.pnlEmpty.Text = "清空"; - this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); + this.btnEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; + this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEmpty.Location = new System.Drawing.Point(1142, 5); + this.btnEmpty.Name = "btnEmpty"; + this.btnEmpty.Size = new System.Drawing.Size(46, 25); + this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnEmpty.Style.GradientAngle = 90; + this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnEmpty.TabIndex = 431; + this.btnEmpty.Text = "清空"; + this.btnEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // // cmbCat3 // @@ -1616,7 +1616,7 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.TextBox txtSPU; private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox txtSKC; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty; private System.Windows.Forms.TextBox txtExtCode; private System.Windows.Forms.Label label4; private System.Windows.Forms.TextBox txtProdName; diff --git a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs index f2f6137..dbe2972 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs @@ -41,15 +41,19 @@ namespace TemuKJD.WXForms.ShopForms List hideName = new List() { "店铺地址管理", "评分考核", "子账号管理", "高级运费模板", "运费模板", "素材库管理", "订单金额统计", "工作明细统计", "店铺经营统计1" }; + if (BaseClass.SaLevel == 1) + { + //hideName.Remove("店铺地址管理"); + } if (BaseClass.GroupId == 3) { hideName.Remove("店铺地址管理"); hideName.Remove("子账号管理"); hideName.Remove("评分考核"); } - if (BaseClass.SaLevel ==1) + if (BaseClass.UserAuthority.Contains("评分考核")) { - //hideName.Remove("店铺地址管理"); + hideName.Remove("评分考核"); } foreach (var item in hideName) diff --git a/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs index 7747308..e87f8dc 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs @@ -35,7 +35,7 @@ namespace TemuKJD.WXForms.ShopForms { // 获取服务端店铺 var serverShopList = WXShopListForm.GetServerShop(); - GlobalConfig.ShopLoginList.RemoveAll(s => serverShopList.Any(ss => ss.LoginName == s.LoginName && ss.ShopId == s.ShopId)); + GlobalConfig.ShopLoginList.RemoveAll(s => !serverShopList.Any(ss => ss.LoginName == s.LoginName && ss.ShopId == s.ShopId)); foreach (var serverShop in serverShopList) { var localShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.LoginName == serverShop.LoginName && s.ShopId == serverShop.ShopId); diff --git a/TEMUKJD/WXForms/ShopForms/WXShopLoginForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopLoginForm.cs index 380f8bd..07663ec 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopLoginForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopLoginForm.cs @@ -522,6 +522,10 @@ namespace TemuKJD.WXForms.ShopForms var shopId = BaseRegex.GetStringJson(ref data, "appid"); var nickName = BaseRegex.GetStringJson(ref data, "nickName"); var openId = BaseRegex.GetStringJson(ref data, "openid"); // oGu7k7HxmUyOmc1X6VM7GQwS-9cI + + if (shopId.IsNullOrEmpty() || nickName.IsNullOrEmpty() || openId.IsNullOrEmpty()) + return; + if (shop != null && shop.ShopId != shopId) { BaseMsgForm.ShowError("cookie与店铺不匹配，请核对店铺！"); diff --git a/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs b/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs index 25347a8..3affbd3 100644 --- a/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs +++ b/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs @@ -84,6 +84,8 @@ namespace TemuKJD.WXForms.TalkForms public int LocationXY = 0; public int LocationSize = 200; + DateTime nextRefreshTime = DateTime.Now.AddMinutes(30); + public WxTalkForm() { InitializeComponent(); @@ -178,9 +180,10 @@ namespace TemuKJD.WXForms.TalkForms Thread.Sleep(100); SetMainBrowserUrl(GlobalConfig.ShopLoginList.FirstOrDefault()); + // 网页初始化 LoadShop(); + RefreshCookie(true); InitOrderForm(); // 加载店铺确认默认店铺后再初始化订单列表读取 - InitAutoExecute(); Invoke(new Action(() => { foreach (var shopNote in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) @@ -205,6 +208,7 @@ namespace TemuKJD.WXForms.TalkForms try { RefreshCookie(true); + LoadShop(); } catch (Exception ex) { BaseMsgForm.ShowError("刷新Cookie出错 " + ex.Message); } try @@ -421,7 +425,6 @@ namespace TemuKJD.WXForms.TalkForms { Invoke(new Action(() => { - orderListForm = new BuyerOrderListForm(); orderListForm.TopLevel = false; orderListForm.FormBorderStyle = FormBorderStyle.None; @@ -430,7 +433,6 @@ namespace TemuKJD.WXForms.TalkForms orderListForm.lblCurrentShop.Tag = currentShop; tabPage3.Controls.Add(orderListForm); orderListForm.Show(); - })); } @@ -664,6 +666,19 @@ namespace TemuKJD.WXForms.TalkForms return; } } + else + { + while (shop.Chat?.IsBrowserInitialized != true) + { + Thread.Sleep(50); + } + + if (shop != currentShop || ChatConfig.ChatSettingConfig.IsAutoReply) + { + if (shop.LoginStatus == "登录成功") + shop.Chat.Load("https://store.weixin.qq.com/shop/kf"); + } + } })); } } @@ -1049,134 +1064,6 @@ namespace TemuKJD.WXForms.TalkForms mainWebBrowser.Load("https://store.weixin.qq.com/shop/home"); } - /// - /// 自动回复等 - /// - public void InitAutoExecute() - { - //Task.Run(() => - //{ - // while (true) - // { - // foreach (var shop in GlobalConfig.DouShopLoginList) - // { - // try - // { - // Thread.Sleep(new Random(DateTime.Now.Millisecond).Next(300, 500)); - // bool needReLogin = AutoCheckShopLoginStatus(shop); - // if (ChatConfig.ChatSettingConfig.IsAutoReLogin && needReLogin) - // AutoReLogin(shop); - - // if (shop.LoginStatus != "登录成功") - // continue; - - // Thread.Sleep(new Random(DateTime.Now.Millisecond).Next(300, 500)); - // AutoReConnect(shop); - - // Thread.Sleep(new Random(DateTime.Now.Millisecond).Next(300, 500)); - // AutoCloseMaskWindow(shop); - - - // Thread.Sleep(new Random(DateTime.Now.Millisecond).Next(300, 500)); - // var isNewMessage = AutoGetNewMessage(shop); - // while (isNewMessage && ChatConfig.ChatSettingConfig.IsAutoReply) - // { - // AutoReplyWithJs(shop); - // Thread.Sleep(new Random(DateTime.Now.Millisecond).Next(300, 500)); - // isNewMessage = AutoGetNewMessage(shop); - // } - // } - // catch (Exception ex) - // { - // } - // } - // } - //}); - - //Task.Run(() => - //{ - // var sleepTime = 1000; - // while (true) - // { - // Thread.Sleep(sleepTime); - // var jsStr = "function getVideo() {\r\n" + - // " var videos = document.getElementsByTagName('video')\r\n" + - // " if (videos && videos.length > 0) {\r\n" + - // " var src = videos[0].src;\r\n" + - // " videos[0].parentElement.parentElement.click();\r\n" + - // " return src;\r\n" + - // " //return '';\r\n" + - // " }\r\n" + - // " return '';\r\n" + - // "}" + - // "getVideo();\r\n"; - // if (currentShop?.Chat != null && currentShop.Chat.IsBrowserInitialized) - // { - // var t = currentShop.Chat.GetMainFrame().EvaluateScriptAsync(jsStr); - // t.Wait(); - // if (!string.IsNullOrEmpty(t.Result?.Result?.ToString())) - // { - // Invoke(new Action(() => - // { - // AllBase.GetHtml.OpenUrl(t.Result.Result.ToString()); - // })); - // } - // } - // } - //}); - - //Task.Run(() => - //{ - // var sleepTime = 2500; - // while (true) - // { - // try - // { - // Thread.Sleep(sleepTime); - // var jsStr1 = "function ClosePopWindow() {\r\n" + - // " var result = 'no_pop'\r\n" + - // " var item = document.getElementsByClassName('anticon-close-circle');\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();\r\n"; - // var jsStr2 = "function clickPopWindow() {\r\n" - // + "var child = document.body.firstElementChild;\r\n" - // + "var element1 = null;\r\n" - // + " while (child) {\r\n" - // + " if (child.innerHTML.indexOf('知道了') >= 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"; - // if (mainWebBrowser.IsBrowserInitialized) - // { - // var t1 = mainWebBrowser.GetMainFrame().EvaluateScriptAsync(jsStr1); - // t1.Wait(); - // var t2 = mainWebBrowser.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(2500, 3000); - // } - // } - // catch (Exception ex) { } - // } - //}); - } - private void chkIsAutoReLogin_CheckedChanged(object sender, EventArgs e) { ChatConfig.ChatSettingConfig.IsAutoReLogin = chkIsAutoReLogin.Checked; @@ -1314,7 +1201,7 @@ namespace TemuKJD.WXForms.TalkForms } - + // 右键点击 private void dgvShop_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) { if (e.ColumnIndex < 0 || e.RowIndex < 0) @@ -1371,6 +1258,7 @@ namespace TemuKJD.WXForms.TalkForms })); WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + // 掉线店铺重登校验后刷新网页 LoadShop(new List() { shop }); if (shop.LoginStatus == "登录成功") { @@ -1421,9 +1309,11 @@ namespace TemuKJD.WXForms.TalkForms } currentShop = shop; - orderListForm.lblCurrentShop.Text = currentShop.ShopAccount; - orderListForm.lblCurrentShop.Tag = currentShop; - + if (orderListForm != null) + { + orderListForm.lblCurrentShop.Text = currentShop.ShopAccount; + orderListForm.lblCurrentShop.Tag = currentShop; + } shop.Chat.Dock = DockStyle.Fill; shop.Chat.BringToFront(); @@ -1462,13 +1352,18 @@ namespace TemuKJD.WXForms.TalkForms Task.Run(() => { RefreshCookie(); + LoadShop(); Invoke(new Action(() => { pbLoading.Visible = false; })); }); } - DateTime nextRefreshTime = DateTime.Now; void RefreshCookie(bool isAuto = false) { + if (ChatConfig.ChatSettingConfig.IsAutoReply) + { + Invoke(new Action(()=> { this.ucTabControl1.SelectedIndex = 0; })); + } + if (!isAuto) WXShopListForm.UpdateShop(); foreach (var shop in GlobalConfig.ShopLoginList) @@ -1486,7 +1381,6 @@ namespace TemuKJD.WXForms.TalkForms r.Cells["colMessage"].Value = ""; })); } - LoadShop(); } private void btnFilterShop_Click(object sender, EventArgs e) @@ -1750,6 +1644,7 @@ namespace TemuKJD.WXForms.TalkForms pbLoading.Visible = true; Task.Run(() => { + // 批量登录后刷新网页 LoadShop(switchShopLst); foreach (var shop in needUpdateShopLst) {