From 05553a3ba3cb9cf224314e1266aaf67a9f68dbd3 Mon Sep 17 00:00:00 2001 From: wule Date: Thu, 7 May 2026 16:21:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=A4=9A=E5=A4=9A=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=AF=84=E5=88=86=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/BaseClass.cs | 2 +- AllBase/Helper/GlobalConfig.cs | 7 + TEMUKJD/BaseForms/BaseForm.cs | 70 ++- TEMUKJD/BaseForms/BaseGeneralForm.cs | 7 + TEMUKJD/BaseForms/BaseMsgForm.cs | 6 +- TEMUKJD/BaseForms/BaseMsgForm.designer.cs | 100 +++-- TEMUKJD/BaseForms/BaseMsgForm.resx | 178 ++++++++ TEMUKJD/ChangeForm.cs | 5 + TEMUKJD/ChangeForm.designer.cs | 58 ++- TEMUKJD/KJD.csproj | 3 + .../DbProductEditDetailForm.Designer.cs | 4 +- .../SystemRemoveRestrictionsForm.cs | 7 +- TEMUKJD/MainForm.cs | 16 +- TEMUKJD/MainForm.designer.cs | 28 +- TEMUKJD/MainForm.resx | 178 -------- .../PDDAdminShopListForm.Designer.cs | 204 ++++----- .../AdminForms/RandomComProductForm.cs | 2 +- .../PDDAddActivityForm.Designer.cs | 126 +++--- .../ActivityForms/PDDAddActivityForm.cs | 49 +-- .../PDDProductUpDownForm.Designer.cs | 400 +++++++++--------- .../PDDDBProdListForm.Designer.cs | 56 +-- .../ShopForms/A_PddShopForm.Designer.cs | 4 +- .../ShopForms/PDDShopAddEditForm.Designer.cs | 94 ++-- .../ShopForms/PDDShopListForm.Designer.cs | 220 +++++----- TEMUKJD/Properties/Resources.Designer.cs | 30 ++ TEMUKJD/Properties/Resources.resx | 9 + TEMUKJD/Resources/pdd_bg..jpg | Bin 0 -> 25463 bytes TEMUKJD/Resources/pdd_icon.png | Bin 0 -> 7886 bytes TEMUKJD/Resources/pdd_logo.png | Bin 0 -> 7364 bytes .../ToolForms/Get1688ProductForm.Designer.cs | 4 +- .../GetJuShuitanProdForm.Designer.cs | 4 +- ...GetJuShuitanProductSKUListForm.Designer.cs | 4 +- TEMUKJD/UserComponent/UcCheckBox.cs | 10 +- TEMUKJD/UserComponent/UcTabControlMetro.cs | 2 +- .../UcTabControlMetro.designer.cs | 2 +- TEMUKJD/UserControls/UcSplitPage.Designer.cs | 56 +-- TEMUKJD/UserForm/LoginForm.Designer.cs | 79 ++-- TEMUKJD/UserForm/LoginForm.cs | 6 +- .../AdminForms/WXAdminAccountForm.Designer.cs | 78 ++-- .../WXForms/AdminForms/WXAdminAccountForm.cs | 4 + .../WXDBProdUploadForm.Designer.cs | 92 ++-- .../WXUserProdListForm.Designer.cs | 52 +-- TEMUKJD/WXForms/ShopForms/WXShopForm.cs | 8 +- TEMUKJD/WXForms/ShopForms/WXShopListForm.cs | 2 +- TEMUKJD/WXForms/ShopForms/WXShopLoginForm.cs | 4 + TEMUKJD/WXForms/TalkForms/WxTalkForm.cs | 169 ++------ 46 files changed, 1269 insertions(+), 1170 deletions(-) create mode 100644 TEMUKJD/Resources/pdd_bg..jpg create mode 100644 TEMUKJD/Resources/pdd_icon.png create mode 100644 TEMUKJD/Resources/pdd_logo.png 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 0000000000000000000000000000000000000000..3e020754dc87184421cb3517c2be067c727784f5 GIT binary patch literal 25463 zcmeIZ30M?owl`jYf}%i7sKl#+j5-m^F@j+ef}rhw1zMoGon}inqAX1}JA~CGNKz9a zCOYwIR1g8_N_WcyXoLU;?2x&cNl-wD4YoANC}6WhHbvln-f9-jn6zPBC}3qq{e zq2f4kY^XTOYLopNwwtW1xnZJ%;>6f>*e07z4$e0A&Nhx#wzkfjY@KbLU_54!tEYSR z)D(v0>d!pGFgVv><~J6JE`-fc&tRHP!{_Isw`y)Kdc^Z{(bt=~hu$Xr*?a4|qnp9D z8~)LJnD42!DJ`~`nMDxG1Jj@C!%Uey?BEe}-INM@7hAkw!GeVg7B5`5c*!E;MN4qA z#f#1GrLVk#zw*k`C5xGD`b)R-^G`jKMT<;KOTcdZ3dX0{=E5yMhg}iF9HC(cv273 zH<&s35~ep#&p>~k{(K|D1@jFSzX>Oo7|i?K%eM2k?&rU=w)D_aFHTbPfi`+P`}FFUMcs{;}`D9d-F}4zJxNH6cHJ{%(C!eAnZhYfoRv zEIo6x`G=u`GG)t;!<<72C;nVm{?(m-j5zM%9!|{qq)5@w`e1Ykrmqjw&SPjYGMsPE zknlU(m*)Wm(W_pWzv<{Hb40<58~nW?BEaZ%`?}jeME+|B zcaRQoA(~kd{$mQ(&XF*67h7z=JaY-=hBfY4bK3OjNAP*&qdmW0x8|cg|GMVFChI?L zius86{(+FEeJWPgoMVVp~`o8iP*j?imu}$&U>2-EqJd4(T4I8^Decix2sP#KlK>3BrTn z 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 aGZw-m5$}ayEG3C+EE|71xfGxJ{{I8M1Upv% literal 0 HcmV?d00001 diff --git a/TEMUKJD/Resources/pdd_icon.png b/TEMUKJD/Resources/pdd_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8bb12842212ee9a1c57381877ff5367b88fd9a0d GIT binary patch literal 7886 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 literal 0 HcmV?d00001 diff --git a/TEMUKJD/Resources/pdd_logo.png b/TEMUKJD/Resources/pdd_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2eb64d4137e2b7f7fcdb9bd38b49092ec35c0bb6 GIT binary patch literal 7364 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 Zx@(Py80C6CgWvx%8tNJAR%_dn{vWDP`%3@- literal 0 HcmV?d00001 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) {