diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index bd2e396..6c4bc9b 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1052; + public static int VersionCount = 1055; //public static int VersionCount = 613; /// diff --git a/AllBase/Helper/GlobalConfig.cs b/AllBase/Helper/GlobalConfig.cs index 5ece097..7e814ce 100644 --- a/AllBase/Helper/GlobalConfig.cs +++ b/AllBase/Helper/GlobalConfig.cs @@ -78,6 +78,10 @@ namespace AllBase.Helper public static System.Drawing.Color PddMainColor { get; set; } = System.Drawing.Color.FromArgb(225, 120, 135); public static System.Drawing.Color PddMainColorLight { get; set; } = System.Drawing.Color.FromArgb(255, 235, 245); public static System.Drawing.Color PddBorderColor { get; set; } = System.Drawing.Color.FromArgb(195, 112, 135); + + public static System.Drawing.Color WeiXinMainColor { get; set; } = System.Drawing.Color.FromArgb(152, 99, 143); + public static System.Drawing.Color WeiXinMainColorLight { get; set; } = System.Drawing.Color.FromArgb(245, 235, 255); + public static System.Drawing.Color WeiXinBorderColor { get; set; } = System.Drawing.Color.FromArgb(107, 83, 147); } public enum ShopPlatform diff --git a/AllBase/Model/Result/BuyerLoginInfo.cs b/AllBase/Model/Result/BuyerLoginInfo.cs index 63697f3..7dda852 100644 --- a/AllBase/Model/Result/BuyerLoginInfo.cs +++ b/AllBase/Model/Result/BuyerLoginInfo.cs @@ -18,5 +18,6 @@ namespace AllBase.Model.Result public string notes { get; set; } public DateTime add_time { get; set; } public DateTime mdy_time { get; set; } + public CefSharp.WinForms.ChromiumWebBrowser browser { get; set; } } } diff --git a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs index cca5981..60f8388 100644 --- a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs +++ b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs @@ -58,7 +58,7 @@ namespace KJD_Web.BLL.BXX string sale_count_text = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count_text"))?.Replace("'", "\\'"); string distribution_set = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "distribution_set"))?.Replace("'", "\\'"); string special_prod_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "special_prod_type"))?.Replace("'", "\\'"); - if (special_prod_type == null) + if (special_prod_type != "爆款商品") special_prod_type = "普通商品"; string add_user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "add_user_name"))?.Replace("'", "\\'"); @@ -173,6 +173,8 @@ namespace KJD_Web.BLL.BXX string sale_count_text = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count_text"))?.Replace("'", "\\'"); string wx_safe_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_safe_status"))?.Replace("'", "\\'"); string special_prod_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "special_prod_type"))?.Replace("'", "\\'"); + if (!string.IsNullOrEmpty(special_prod_type) && special_prod_type != "爆款商品") + special_prod_type = "普通商品"; string wx_cat_1 = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_cat_1"))?.Replace("'", "\\'"); string wx_cat_2 = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_cat_2"))?.Replace("'", "\\'"); string wx_cat_3 = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_cat_3"))?.Replace("'", "\\'"); @@ -1519,8 +1521,9 @@ namespace KJD_Web.BLL.BXX where += " and p.product_get_type ='" + product_get_type + "'"; if (!string.IsNullOrEmpty(wx_safe_status)) where += " and p.wx_safe_status in ('" + wx_safe_status.Replace(",", "','") + "')"; - if (!string.IsNullOrEmpty(special_prod_type)) // 图书,普通商品 - where += " and p.special_prod_type ='" + special_prod_type + "'"; + //if (!string.IsNullOrEmpty(special_prod_type)) // 普通商品 爆款商品 + // where += " and p.special_prod_type ='" + special_prod_type + "'"; + sql += " and p.special_prod_type in ('普通商品','书籍')"; // 供应商货源是否已完成初始设置 if (!string.IsNullOrEmpty(is_supplier_prod_ok)) { @@ -1868,6 +1871,8 @@ namespace KJD_Web.BLL.BXX string sku_edit_json = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sku_edit_json"))?.Replace("'", "\\'"); string wx_safe_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_safe_status"))?.Replace("'", "\\'"); string special_prod_type = RegexUtils.GetStringQuery(ref inputData, "special_prod_type")?.Replace("'", "\\'"); + if (!string.IsNullOrEmpty(special_prod_type) && special_prod_type != "爆款商品") + special_prod_type = "普通商品"; if (string.IsNullOrEmpty(user_name)) { diff --git a/KJDService/KJD_WebService/Upload/Prod/WXProd.aspx.cs b/KJDService/KJD_WebService/Upload/Prod/WXProd.aspx.cs index 0b49270..b2bafef 100644 --- a/KJDService/KJD_WebService/Upload/Prod/WXProd.aspx.cs +++ b/KJDService/KJD_WebService/Upload/Prod/WXProd.aspx.cs @@ -83,6 +83,11 @@ namespace KJD_Web.Upload.Prod { string prodStr = Encoding.UTF8.GetString(this.FileUpload1.FileBytes); prodStr = TextBox2.Text.Trim(); + return getProd(prodStr); + } + + public static string getProd(string prodStr, string special_prod_type = null) + { var reducePer = 0m; var realPricePer = 1m - reducePer * 0.01m; if (realPricePer < 0.1m) @@ -366,10 +371,10 @@ namespace KJD_Web.Upload.Prod return "解析失败Sku价格为0"; } - return SaveWxProd(wxClientProd.product_key.product_id, wxClientProd, prodStr); + return SaveWxProd(wxClientProd.product_key.product_id, wxClientProd, prodStr, special_prod_type); } - string SaveWxProd(string prodId, WXClientProductInfoLite wxClientProdInfoLite, string baseStr) + public static string SaveWxProd(string prodId, WXClientProductInfoLite wxClientProdInfoLite, string baseProdStr, string special_prod_type = null) { bool isExist = false; var existUrl = BaseClass.BuildPDDObjString("product/get_product_spu_id_list"); @@ -395,7 +400,7 @@ namespace KJD_Web.Upload.Prod var skus = wxClientProdInfoLite.productSkus; - var product_json = "{\"wxxdData\":" + JsonUtils.SerializeObject(wxClientProdInfoLite) + ",\"baseData\":" + JsonUtils.SerializeObject(baseStr) + "}"; + var product_json = "{\"wxxdData\":" + JsonUtils.SerializeObject(wxClientProdInfoLite) + ",\"baseData\":" + JsonUtils.SerializeObject(baseProdStr) + "}"; var data = UserLogin.GetSignaturex() + "&from_shop_id=" + wxClientProdInfoLite.product_key.appid + "&from_shop_name=" + wxClientProdInfoLite.product_key.appid + @@ -430,9 +435,13 @@ namespace KJD_Web.Upload.Prod data += "&wx_cat_3=" + wxClientProdInfoLite.info.category[2].catIdStr; } - if (wxClientProdInfoLite.info.category.FirstOrDefault().name == "图书") + //if (wxClientProdInfoLite.info.category.FirstOrDefault().name == "图书") + //{ + // data += "&special_prod_type=" + HttpUtility.UrlEncode("书籍", Encoding.UTF8); + //} + if (special_prod_type != null) { - data += "&special_prod_type=" + HttpUtility.UrlEncode("书籍", Encoding.UTF8); + data += "&special_prod_type=" + special_prod_type; } html = HtmlUtils.PostUtf8(url, data); diff --git a/TEMUKJD/BaseForms/BaseForm.cs b/TEMUKJD/BaseForms/BaseForm.cs index 5f1a24c..171cf72 100644 --- a/TEMUKJD/BaseForms/BaseForm.cs +++ b/TEMUKJD/BaseForms/BaseForm.cs @@ -109,7 +109,7 @@ namespace TemuKJD.BaseForms { c.BackColor = GlobalConfig.MainColor; } - if (c is PanelEx && c.Name.StartsWith("btn")) + else if (c is PanelEx && c.Name.StartsWith("btn")) { var pnl = c as PanelEx; if (pnl.Style.BackColor1.Color == GlobalConfig.DefaultMainColor) @@ -119,7 +119,7 @@ namespace TemuKJD.BaseForms pnl.StyleMouseOver.BackColor1.Color = GlobalConfig.BorderColor; pnl.StyleMouseOver.BackColor2.Color = GlobalConfig.BorderColor; } - else if (pnl.Style.BorderColor.Color == GlobalConfig.DefaultMainColor) + else if (pnl.Style.BackColor1.Color == GlobalConfig.DefaultMainColorLight || pnl.Style.BorderColor.Color == GlobalConfig.DefaultMainColor) { pnl.Style.BorderColor.Color = GlobalConfig.MainColor; pnl.Style.BackColor1.Color = GlobalConfig.MainColorLight; @@ -129,25 +129,25 @@ namespace TemuKJD.BaseForms pnl.StyleMouseOver.BackColor2.Color = GlobalConfig.BorderColor; } } - if (c is ButtonEx) + else if (c is ButtonEx) { c.BackColor = GlobalConfig.MainColor; } - if (c is SplitContainer && c.BackColor == GlobalConfig.DefaultMainColor) + else if (c is SplitContainer && c.BackColor == GlobalConfig.DefaultMainColor) { c.BackColor = GlobalConfig.MainColor; } - if (c is UserComponent.UcTreeView) + else if (c is UserComponent.UcTreeView) { var tv = c as UserComponent.UcTreeView; tv.ChildNodeSelectedBgColor = GlobalConfig.MainColor; } - if (c is UserComponent.UcGroupBoxEx && (c as UserComponent.UcGroupBoxEx).BorderColor == GlobalConfig.DefaultMainColor) + else if (c is UserComponent.UcGroupBoxEx && (c as UserComponent.UcGroupBoxEx).BorderColor == GlobalConfig.DefaultMainColor) { var gb = c as UserComponent.UcGroupBoxEx; gb.BorderColor = GlobalConfig.MainColor; } - if (c is UserComponent.DataGridViewEx) + else if (c is UserComponent.DataGridViewEx) { var dgv = c as UserComponent.DataGridViewEx; dgv.BorderColor = GlobalConfig.MainColor; @@ -156,13 +156,19 @@ namespace TemuKJD.BaseForms dgv.CheckBoxRowBoxCheckColor = GlobalConfig.MainColor; dgv.CheckBoxRowBoxBorderColor = GlobalConfig.BorderColor; } - if (c is UserComponent.UcCheckBox) + else if (c is UserComponent.UcCheckBox) { var chk = c as UserComponent.UcCheckBox; chk.CheckBoxCheckColor = GlobalConfig.MainColor; chk.CheckBoxBorderColor = GlobalConfig.BorderColor; } - if (c is UcTabControlMetro) + else if (c is UserComponent.UcTabControl) + { + var tc = c as UserComponent.UcTabControl; + tc.TabSelectColor = GlobalConfig.MainColor; + tc.TabSelectTextColor = GlobalConfig.MainColor; + } + else if (c is UcTabControlMetro) { var tc = c as UcTabControlMetro; tc.BorderColor = GlobalConfig.BorderColor; diff --git a/TEMUKJD/BaseForms/BaseGeneralForm.cs b/TEMUKJD/BaseForms/BaseGeneralForm.cs index d42550f..e81611c 100644 --- a/TEMUKJD/BaseForms/BaseGeneralForm.cs +++ b/TEMUKJD/BaseForms/BaseGeneralForm.cs @@ -104,10 +104,10 @@ namespace TemuKJD.BaseForms private void LcBaseForm_Load(object sender, EventArgs e) { - if (BaseClass.MainPath == "binxixi") + if (BaseClass.MainPath == "binxixi" || BaseClass.MainPath == "weixin") { - this.panel1.BackColor = GlobalConfig.PddMainColor; - this.BackColor = GlobalConfig.PddBorderColor; + this.pnlTitle.BackColor = GlobalConfig.MainColor; + this.BackColor = GlobalConfig.BorderColor; } if (BaseClass.Ico != null) @@ -143,12 +143,12 @@ namespace TemuKJD.BaseForms if (visible) { this.Padding = new Padding(1); - this.panel1.Visible = true; + this.pnlTitle.Visible = true; } else { this.Padding = new Padding(0); - this.panel1.Visible = false; + this.pnlTitle.Visible = false; } } @@ -285,7 +285,7 @@ namespace TemuKJD.BaseForms public virtual void HideTitle() { - this.panel1.Visible = false; + this.pnlTitle.Visible = false; } #region 窗体提交数据完成事件 diff --git a/TEMUKJD/BaseForms/BaseGeneralForm.designer.cs b/TEMUKJD/BaseForms/BaseGeneralForm.designer.cs index e1d4654..7718826 100644 --- a/TEMUKJD/BaseForms/BaseGeneralForm.designer.cs +++ b/TEMUKJD/BaseForms/BaseGeneralForm.designer.cs @@ -28,14 +28,14 @@ /// private void InitializeComponent() { - this.panel1 = new System.Windows.Forms.Panel(); + this.pnlTitle = new System.Windows.Forms.Panel(); this.pbMinBase = new System.Windows.Forms.PictureBox(); this.pbNormalBase = new System.Windows.Forms.PictureBox(); this.pbMaxBase = new System.Windows.Forms.PictureBox(); this.pbLogo = new System.Windows.Forms.PictureBox(); this.lbTitle = new System.Windows.Forms.Label(); this.pbCloseBase = new System.Windows.Forms.PictureBox(); - this.panel1.SuspendLayout(); + this.pnlTitle.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbMinBase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbNormalBase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbMaxBase)).BeginInit(); @@ -43,23 +43,23 @@ ((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).BeginInit(); this.SuspendLayout(); // - // panel1 + // pnlTitle // - this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panel1.Controls.Add(this.pbMinBase); - this.panel1.Controls.Add(this.pbNormalBase); - this.panel1.Controls.Add(this.pbMaxBase); - this.panel1.Controls.Add(this.pbLogo); - this.panel1.Controls.Add(this.lbTitle); - this.panel1.Controls.Add(this.pbCloseBase); - this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(1, 1); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(657, 32); - this.panel1.TabIndex = 0; - this.panel1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Panel1_MouseDown); - this.panel1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.Panel1_MouseMove); - this.panel1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.Panel1_MouseUp); + this.pnlTitle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlTitle.Controls.Add(this.pbMinBase); + this.pnlTitle.Controls.Add(this.pbNormalBase); + this.pnlTitle.Controls.Add(this.pbMaxBase); + this.pnlTitle.Controls.Add(this.pbLogo); + this.pnlTitle.Controls.Add(this.lbTitle); + this.pnlTitle.Controls.Add(this.pbCloseBase); + this.pnlTitle.Dock = System.Windows.Forms.DockStyle.Top; + this.pnlTitle.Location = new System.Drawing.Point(1, 1); + this.pnlTitle.Name = "pnlTitle"; + this.pnlTitle.Size = new System.Drawing.Size(657, 32); + this.pnlTitle.TabIndex = 0; + this.pnlTitle.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Panel1_MouseDown); + this.pnlTitle.MouseMove += new System.Windows.Forms.MouseEventHandler(this.Panel1_MouseMove); + this.pnlTitle.MouseUp += new System.Windows.Forms.MouseEventHandler(this.Panel1_MouseUp); // // pbMinBase // @@ -125,9 +125,9 @@ this.lbTitle.ForeColor = System.Drawing.Color.White; this.lbTitle.Location = new System.Drawing.Point(31, 7); this.lbTitle.Name = "lbTitle"; - this.lbTitle.Size = new System.Drawing.Size(45, 17); + this.lbTitle.Size = new System.Drawing.Size(48, 17); this.lbTitle.TabIndex = 2; - this.lbTitle.Text = "label1"; + this.lbTitle.Text = "lbTitle"; this.lbTitle.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lbTitle_MouseDown); this.lbTitle.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lbTitle_MouseMove); this.lbTitle.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lbTitle_MouseUp); @@ -151,15 +151,15 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(98)))), ((int)(((byte)(200))))); this.ClientSize = new System.Drawing.Size(659, 535); - this.Controls.Add(this.panel1); + this.Controls.Add(this.pnlTitle); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "BaseGeneralForm"; this.Padding = new System.Windows.Forms.Padding(1); this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "LcBaseForm"; this.Load += new System.EventHandler(this.LcBaseForm_Load); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); + this.pnlTitle.ResumeLayout(false); + this.pnlTitle.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbMinBase)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbNormalBase)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbMaxBase)).EndInit(); @@ -171,7 +171,7 @@ #endregion - private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel pnlTitle; private System.Windows.Forms.PictureBox pbMinBase; private System.Windows.Forms.PictureBox pbCloseBase; private System.Windows.Forms.Label lbTitle; diff --git a/TEMUKJD/BaseForms/BaseTalkForm.cs b/TEMUKJD/BaseForms/BaseTalkForm.cs index e368531..ce0dc90 100644 --- a/TEMUKJD/BaseForms/BaseTalkForm.cs +++ b/TEMUKJD/BaseForms/BaseTalkForm.cs @@ -1,4 +1,5 @@ using AllBase; +using AllBase.Helper; using System; using System.Collections.Generic; using System.ComponentModel; @@ -103,6 +104,7 @@ namespace TemuKJD.BaseForms private void LcBaseForm_Load(object sender, EventArgs e) { + this.BackColor = GlobalConfig.BorderColor; if (BaseClass.Ico != null) Iconx = Icon = BaseClass.Ico; else @@ -130,6 +132,7 @@ namespace TemuKJD.BaseForms } lblVersionInfo.Text = BaseClass.ToolName + " V" + BaseClass.Varsion + " - " + BaseClass.NickName; + lblVersionInfo.ForeColor = GlobalConfig.MainColorLight; SetPanelVisible(this.TopLevel || DesignMode); } diff --git a/TEMUKJD/BaseForms/BaseTalkForm.designer.cs b/TEMUKJD/BaseForms/BaseTalkForm.designer.cs index 5aedf42..962156e 100644 --- a/TEMUKJD/BaseForms/BaseTalkForm.designer.cs +++ b/TEMUKJD/BaseForms/BaseTalkForm.designer.cs @@ -33,17 +33,17 @@ this.lblVersionInfo = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); this.pbMinBase = new System.Windows.Forms.PictureBox(); - this.pbCloseBase = new System.Windows.Forms.PictureBox(); this.pbNormalBase = new System.Windows.Forms.PictureBox(); this.pbMaxBase = new System.Windows.Forms.PictureBox(); + this.pbCloseBase = new System.Windows.Forms.PictureBox(); this.pbLogo = new System.Windows.Forms.PictureBox(); this.lbTitle = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbMinBase)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbNormalBase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbMaxBase)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbLogo)).BeginInit(); this.SuspendLayout(); // @@ -80,9 +80,9 @@ // this.lblVersionInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblVersionInfo.ForeColor = System.Drawing.SystemColors.ControlDark; - this.lblVersionInfo.Location = new System.Drawing.Point(723, 56); + this.lblVersionInfo.Location = new System.Drawing.Point(579, 56); this.lblVersionInfo.Name = "lblVersionInfo"; - this.lblVersionInfo.Size = new System.Drawing.Size(238, 23); + this.lblVersionInfo.Size = new System.Drawing.Size(382, 23); this.lblVersionInfo.TabIndex = 80; this.lblVersionInfo.Text = "版本信息"; this.lblVersionInfo.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -113,20 +113,6 @@ this.pbMinBase.MouseLeave += new System.EventHandler(this.PictureBox2_MouseLeave); this.pbMinBase.MouseHover += new System.EventHandler(this.PictureBox2_MouseHover); // - // pbCloseBase - // - this.pbCloseBase.Dock = System.Windows.Forms.DockStyle.Right; - this.pbCloseBase.Image = global::TemuKJD.Properties.Resources.close; - this.pbCloseBase.Location = new System.Drawing.Point(128, 0); - this.pbCloseBase.Name = "pbCloseBase"; - this.pbCloseBase.Size = new System.Drawing.Size(32, 32); - this.pbCloseBase.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pbCloseBase.TabIndex = 0; - this.pbCloseBase.TabStop = false; - this.pbCloseBase.Click += new System.EventHandler(this.PictureBox1_Click); - this.pbCloseBase.MouseLeave += new System.EventHandler(this.PictureBox1_MouseLeave); - this.pbCloseBase.MouseHover += new System.EventHandler(this.PictureBox1_MouseHover); - // // pbNormalBase // this.pbNormalBase.Dock = System.Windows.Forms.DockStyle.Right; @@ -157,6 +143,20 @@ this.pbMaxBase.MouseLeave += new System.EventHandler(this.pbMaxBase_MouseLeave); this.pbMaxBase.MouseHover += new System.EventHandler(this.pbMaxBase_MouseHover); // + // pbCloseBase + // + this.pbCloseBase.Dock = System.Windows.Forms.DockStyle.Right; + this.pbCloseBase.Image = global::TemuKJD.Properties.Resources.close; + this.pbCloseBase.Location = new System.Drawing.Point(128, 0); + this.pbCloseBase.Name = "pbCloseBase"; + this.pbCloseBase.Size = new System.Drawing.Size(32, 32); + this.pbCloseBase.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pbCloseBase.TabIndex = 0; + this.pbCloseBase.TabStop = false; + this.pbCloseBase.Click += new System.EventHandler(this.PictureBox1_Click); + this.pbCloseBase.MouseLeave += new System.EventHandler(this.PictureBox1_MouseLeave); + this.pbCloseBase.MouseHover += new System.EventHandler(this.PictureBox1_MouseHover); + // // pbLogo // this.pbLogo.Location = new System.Drawing.Point(10, 10); @@ -197,9 +197,9 @@ this.panel1.PerformLayout(); this.panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pbMinBase)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbNormalBase)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbMaxBase)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbLogo)).EndInit(); this.ResumeLayout(false); diff --git a/TEMUKJD/ChangeForm.cs b/TEMUKJD/ChangeForm.cs index 76a7fa5..3cfd191 100644 --- a/TEMUKJD/ChangeForm.cs +++ b/TEMUKJD/ChangeForm.cs @@ -9,6 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using AllBase; +using AllBase.Helper; //using TemuKJD.ChatForms; //using TemuKJD.DashBoardForms; using TemuKJD.BaseForms; @@ -57,6 +58,8 @@ namespace TemuKJD label1.Visible = false; pnlChat.Visible = pnlUploadGoods.Visible = true; } + this.pnlChat.StyleMouseOver.BorderColor.Color = GlobalConfig.BorderColor; + this.pnlUploadGoods.StyleMouseOver.BorderColor.Color = GlobalConfig.BorderColor; } private void panel1_Click(object sender, EventArgs e) diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index 5df82b1..78585ad 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -1805,7 +1805,7 @@ - + @@ -1814,6 +1814,9 @@ + + + diff --git a/TEMUKJD/MainForm.cs b/TEMUKJD/MainForm.cs index 7a6dd35..821801e 100644 --- a/TEMUKJD/MainForm.cs +++ b/TEMUKJD/MainForm.cs @@ -159,14 +159,17 @@ namespace TemuKJD GlobalConfig.BorderColor = GlobalConfig.PddBorderColor; this.pnlJit.Visible = false; } - else if (loginType == "Dy") - { - BaseClass.MainPath = "douyin"; - this.pnlJit.Visible = false; - } else if (loginType == "Wx") { BaseClass.MainPath = "weixin"; + GlobalConfig.MainColor = GlobalConfig.WeiXinMainColor; + GlobalConfig.MainColorLight = GlobalConfig.WeiXinMainColorLight; + GlobalConfig.BorderColor = GlobalConfig.WeiXinBorderColor; + this.pnlJit.Visible = false; + } + else if (loginType == "Dy") + { + BaseClass.MainPath = "douyin"; this.pnlJit.Visible = false; } @@ -176,6 +179,9 @@ namespace TemuKJD //CefInit(); } + /// + /// 初始化cef InitCef + /// public static void CefInit() { var initFormSettings = NaiBa.Util.Helper.ConfigHelper.LoadConfig("initFormSettings"); @@ -224,42 +230,25 @@ namespace TemuKJD private void MainForm_Load(object sender, EventArgs e) { - //CefSettings settings = new CefSettings(); - //settings.CefCommandLineArgs.Add("enable-media-stream", "1"); - //settings.CefCommandLineArgs.Add("allow-running-insecure-content", "1"); - //settings.CefCommandLineArgs.Add("use-fake-ui-for-media-stream", "1"); - //settings.CefCommandLineArgs.Add("enable-speech-input", "1"); - //settings.CefCommandLineArgs.Add("enable-usermedia-screen-capture", "1"); - //settings.CefCommandLineArgs.Add("debug-plugin-loading", "1"); - //settings.CefCommandLineArgs.Add("allow-outdated-plugins", "1"); - //settings.CefCommandLineArgs.Add("always-authorize-plugins", "1"); - //settings.CefCommandLineArgs.Add("disable-web-security", "1"); - //settings.CefCommandLineArgs.Add("enable-npapi", "1"); - //Cef.Initialize(settings); - //var cef = new ChromiumWebBrowser("https://www.bilibili.com"); - //this.Controls.Add(cef); - //cef.BringToFront(); - // - //return; - if (BaseClass.MainPath == "binxixi") { - //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.PddMainColorLight; + this.BackColor = GlobalConfig.BorderColor; 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.Ico = Icon.FromHandle(Properties.Resources.weixin_icon.GetHicon()); + BaseClass.LogoImage = Properties.Resources.weixin_logo; + navPanel.Style.BackgroundImage = Properties.Resources.weixin_bg; + plTopRight.BackgroundImage = null; + this.BackColor = GlobalConfig.BorderColor; - BaseClass.ToolName = "微信小店管理工具"; + BaseClass.ToolName = "29供应链 - 微信小店管理工具"; } Rectangle rect = Screen.GetWorkingArea(this); @@ -471,6 +460,8 @@ namespace TemuKJD public void SetTitle() { lblVersionInfo.Text = BaseClass.ToolName + " V" + BaseClass.Varsion + " - " + BaseClass.NickName; + lblVersionInfo.ForeColor = GlobalConfig.MainColorLight; + lblVersionName.Text = "[" + BaseClass.UserVersionString + "]"; #if DEBUG lblVersionName.Visible = true; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.Designer.cs index 10e01ee..0367964 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.Designer.cs @@ -38,7 +38,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnAdd = new DevComponents.DotNetBar.PanelEx(); this.chkUpdateTag = 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.cmbTypeFilter = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); this.cmbGroupFilter = new System.Windows.Forms.ComboBox(); @@ -99,7 +99,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer1.Panel1.Controls.Add(this.btnAdd); this.splitContainer1.Panel1.Controls.Add(this.chkUpdateTag); this.splitContainer1.Panel1.Controls.Add(this.btnSearch); - this.splitContainer1.Panel1.Controls.Add(this.pnlEmpty); + this.splitContainer1.Panel1.Controls.Add(this.btnEmpty); this.splitContainer1.Panel1.Controls.Add(this.cmbTypeFilter); this.splitContainer1.Panel1.Controls.Add(this.label1); this.splitContainer1.Panel1.Controls.Add(this.cmbGroupFilter); @@ -176,27 +176,27 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // pnlEmpty // - this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; - this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(73, 15); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 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.Visible = false; + 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(73, 15); + this.btnEmpty.Name = "pnlEmpty"; + this.btnEmpty.Size = new System.Drawing.Size(56, 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.Visible = false; // // cmbTypeFilter // @@ -615,7 +615,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.Label label1; private System.Windows.Forms.ComboBox cmbGroupFilter; private DevComponents.DotNetBar.PanelEx btnSearch; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty; private System.Windows.Forms.Label lblGroupFilter; private System.Windows.Forms.SplitContainer splitContainer2; private System.Windows.Forms.PictureBox pbLoading; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs index cf16dd7..5a24adc 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs @@ -772,7 +772,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbPddRelation.Location = new System.Drawing.Point(743, 5); + this.cmbPddRelation.Location = new System.Drawing.Point(743, 7); this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbPddRelation.Name = "cmbPddRelation"; this.cmbPddRelation.Size = new System.Drawing.Size(47, 25); @@ -827,7 +827,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat2.FormattingEnabled = true; - this.cmbCat2.Location = new System.Drawing.Point(278, 77); + this.cmbCat2.Location = new System.Drawing.Point(278, 75); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Size = new System.Drawing.Size(46, 25); @@ -912,7 +912,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "机会商品", "以图搜品", "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(278, 42); + this.cmbSourceType.Location = new System.Drawing.Point(278, 40); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(46, 25); @@ -958,7 +958,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(622, 7); + this.cmbWxCat.Location = new System.Drawing.Point(622, 5); this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxCat.Name = "cmbWxCat"; this.cmbWxCat.Size = new System.Drawing.Size(47, 25); @@ -980,7 +980,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbSort.Items.AddRange(new object[] { "入库时间", "认领总数"}); - this.cmbSort.Location = new System.Drawing.Point(381, 42); + this.cmbSort.Location = new System.Drawing.Point(381, 40); this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSort.Name = "cmbSort"; this.cmbSort.Size = new System.Drawing.Size(46, 25); @@ -1056,7 +1056,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbGroupFilter.FormattingEnabled = true; - this.cmbGroupFilter.Location = new System.Drawing.Point(175, 42); + this.cmbGroupFilter.Location = new System.Drawing.Point(175, 40); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Size = new System.Drawing.Size(46, 25); @@ -1071,7 +1071,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "导出未拉回"}); - this.cmbExportToOutServer.Location = new System.Drawing.Point(622, 42); + this.cmbExportToOutServer.Location = new System.Drawing.Point(622, 40); this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbExportToOutServer.Name = "cmbExportToOutServer"; this.cmbExportToOutServer.Size = new System.Drawing.Size(47, 25); @@ -1107,7 +1107,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "安全商品", "违规商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(501, 42); + this.cmbWxSafe.Location = new System.Drawing.Point(501, 40); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Size = new System.Drawing.Size(47, 25); @@ -1149,7 +1149,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat1.FormattingEnabled = true; - this.cmbCat1.Location = new System.Drawing.Point(175, 77); + this.cmbCat1.Location = new System.Drawing.Point(175, 75); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; this.cmbCat1.Size = new System.Drawing.Size(46, 25); @@ -1171,7 +1171,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat3.FormattingEnabled = true; - this.cmbCat3.Location = new System.Drawing.Point(381, 77); + this.cmbCat3.Location = new System.Drawing.Point(381, 75); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; this.cmbCat3.Size = new System.Drawing.Size(46, 25); @@ -1268,7 +1268,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "修复回传未拉回"}); - this.cmbHasReturn.Location = new System.Drawing.Point(743, 42); + this.cmbHasReturn.Location = new System.Drawing.Point(743, 40); this.cmbHasReturn.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbHasReturn.Name = "cmbHasReturn"; this.cmbHasReturn.Size = new System.Drawing.Size(47, 25); diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDFissionProdByChanceImgForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDFissionProdByChanceImgForm.Designer.cs index 680dbef..5c1b5c0 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDFissionProdByChanceImgForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDFissionProdByChanceImgForm.Designer.cs @@ -88,7 +88,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbCat1 = new System.Windows.Forms.ComboBox(); this.lblGroupFilter = new System.Windows.Forms.Label(); this.cmbCat2 = new System.Windows.Forms.ComboBox(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnEmpty2 = new DevComponents.DotNetBar.PanelEx(); this.label9 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); @@ -607,7 +607,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer3.Panel2.Controls.Add(this.cmbCat1); this.splitContainer3.Panel2.Controls.Add(this.lblGroupFilter); this.splitContainer3.Panel2.Controls.Add(this.cmbCat2); - this.splitContainer3.Panel2.Controls.Add(this.pnlEmpty); + this.splitContainer3.Panel2.Controls.Add(this.btnEmpty2); this.splitContainer3.Panel2.Controls.Add(this.label9); this.splitContainer3.Panel2.Controls.Add(this.label1); this.splitContainer3.Panel2.Controls.Add(this.label8); @@ -868,28 +868,28 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // pnlEmpty // - this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; - this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(575, 50); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 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.Visible = false; - this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); + this.btnEmpty2.CanvasColor = System.Drawing.SystemColors.Control; + this.btnEmpty2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEmpty2.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEmpty2.Location = new System.Drawing.Point(575, 50); + this.btnEmpty2.Name = "pnlEmpty"; + this.btnEmpty2.Size = new System.Drawing.Size(56, 25); + this.btnEmpty2.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnEmpty2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnEmpty2.Style.GradientAngle = 90; + this.btnEmpty2.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty2.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty2.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty2.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty2.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnEmpty2.TabIndex = 431; + this.btnEmpty2.Text = "清空条件"; + this.btnEmpty2.Visible = false; + this.btnEmpty2.Click += new System.EventHandler(this.pnlEmpty_Click); // // label9 // @@ -1131,7 +1131,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.SplitContainer splitContainer1; private DevComponents.DotNetBar.PanelEx btnSearch; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty2; private System.Windows.Forms.ComboBox cmbSearchLabel; private System.Windows.Forms.Label lblGroupFilter; private System.Windows.Forms.SplitContainer splitContainer2; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdByImgForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdByImgForm.Designer.cs index bbbceb7..8184cc8 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdByImgForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdByImgForm.Designer.cs @@ -88,7 +88,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbCat1 = new System.Windows.Forms.ComboBox(); this.lblGroupFilter = new System.Windows.Forms.Label(); this.cmbCat2 = new System.Windows.Forms.ComboBox(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnEmpty2 = new DevComponents.DotNetBar.PanelEx(); this.label9 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); @@ -722,7 +722,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer3.Panel2.Controls.Add(this.cmbCat1); this.splitContainer3.Panel2.Controls.Add(this.lblGroupFilter); this.splitContainer3.Panel2.Controls.Add(this.cmbCat2); - this.splitContainer3.Panel2.Controls.Add(this.pnlEmpty); + this.splitContainer3.Panel2.Controls.Add(this.btnEmpty2); this.splitContainer3.Panel2.Controls.Add(this.label9); this.splitContainer3.Panel2.Controls.Add(this.label1); this.splitContainer3.Panel2.Controls.Add(this.label8); @@ -911,28 +911,28 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // pnlEmpty // - this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; - this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(575, 50); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 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.Visible = false; - this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); + this.btnEmpty2.CanvasColor = System.Drawing.SystemColors.Control; + this.btnEmpty2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnEmpty2.DisabledBackColor = System.Drawing.Color.Empty; + this.btnEmpty2.Location = new System.Drawing.Point(575, 50); + this.btnEmpty2.Name = "pnlEmpty"; + this.btnEmpty2.Size = new System.Drawing.Size(56, 25); + this.btnEmpty2.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnEmpty2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnEmpty2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnEmpty2.Style.GradientAngle = 90; + this.btnEmpty2.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty2.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnEmpty2.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty2.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnEmpty2.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnEmpty2.TabIndex = 431; + this.btnEmpty2.Text = "清空条件"; + this.btnEmpty2.Visible = false; + this.btnEmpty2.Click += new System.EventHandler(this.pnlEmpty_Click); // // label9 // @@ -1248,7 +1248,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.SplitContainer splitContainer1; private DevComponents.DotNetBar.PanelEx btnSearch; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty2; private System.Windows.Forms.ComboBox cmbSearchLabel; private System.Windows.Forms.Label lblGroupFilter; private System.Windows.Forms.SplitContainer splitContainer2; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs index 463d0b2..302f8bb 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs @@ -68,7 +68,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.txtShopName = new System.Windows.Forms.TextBox(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnRestoreEmpty = new DevComponents.DotNetBar.PanelEx(); this.txtNotes = new System.Windows.Forms.TextBox(); this.lblGroupFilter = new System.Windows.Forms.Label(); this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); @@ -182,7 +182,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucGroupBoxEx1.Controls.Add(this.btnEmpty); this.ucGroupBoxEx1.Controls.Add(this.txtShopName); this.ucGroupBoxEx1.Controls.Add(this.btnSearch); - this.ucGroupBoxEx1.Controls.Add(this.pnlEmpty); + this.ucGroupBoxEx1.Controls.Add(this.btnRestoreEmpty); this.ucGroupBoxEx1.Controls.Add(this.txtNotes); this.ucGroupBoxEx1.Controls.Add(this.lblGroupFilter); this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); @@ -633,29 +633,29 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSearch.Text = "搜索机会商品列表"; this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); // - // pnlEmpty + // btnRestoreEmpty // - 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(672, 102); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 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.btnRestoreEmpty.CanvasColor = System.Drawing.SystemColors.Control; + this.btnRestoreEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRestoreEmpty.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRestoreEmpty.Location = new System.Drawing.Point(672, 102); + this.btnRestoreEmpty.Name = "btnRestoreEmpty"; + this.btnRestoreEmpty.Size = new System.Drawing.Size(56, 25); + this.btnRestoreEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestoreEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRestoreEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRestoreEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnRestoreEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestoreEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnRestoreEmpty.Style.GradientAngle = 90; + this.btnRestoreEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestoreEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestoreEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestoreEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestoreEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnRestoreEmpty.TabIndex = 431; + this.btnRestoreEmpty.Text = "清空条件"; + this.btnRestoreEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // // txtNotes // @@ -1141,7 +1141,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.SplitContainer splitContainer1; private DevComponents.DotNetBar.PanelEx btnSearch; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnRestoreEmpty; private System.Windows.Forms.ComboBox cmbSearchLabel; private System.Windows.Forms.Label lblGroupFilter; private System.Windows.Forms.SplitContainer splitContainer2; diff --git a/TEMUKJD/Properties/Resources.Designer.cs b/TEMUKJD/Properties/Resources.Designer.cs index b432f9d..832c386 100644 --- a/TEMUKJD/Properties/Resources.Designer.cs +++ b/TEMUKJD/Properties/Resources.Designer.cs @@ -1163,6 +1163,36 @@ namespace TemuKJD.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap weixin_bg { + get { + object obj = ResourceManager.GetObject("weixin_bg", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap weixin_icon { + get { + object obj = ResourceManager.GetObject("weixin_icon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap weixin_logo { + get { + object obj = ResourceManager.GetObject("weixin_logo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/TEMUKJD/Properties/Resources.resx b/TEMUKJD/Properties/Resources.resx index 453c41c..1867569 100644 --- a/TEMUKJD/Properties/Resources.resx +++ b/TEMUKJD/Properties/Resources.resx @@ -266,7 +266,7 @@ ..\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_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 @@ -436,6 +436,15 @@ ..\resources\wang_wang_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\weixin_bg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\weixin_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\weixin_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\static\base.css;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 diff --git a/TEMUKJD/Resources/choice_chat.png b/TEMUKJD/Resources/choice_chat.png index d4bf0a7..c3360d9 100644 Binary files a/TEMUKJD/Resources/choice_chat.png and b/TEMUKJD/Resources/choice_chat.png differ diff --git a/TEMUKJD/Resources/choice_chat_weixin_old.png b/TEMUKJD/Resources/choice_chat_weixin_old.png new file mode 100644 index 0000000..d4bf0a7 Binary files /dev/null and b/TEMUKJD/Resources/choice_chat_weixin_old.png differ diff --git a/TEMUKJD/Resources/choice_upload.png b/TEMUKJD/Resources/choice_upload.png index b1293a3..fdbde6b 100644 Binary files a/TEMUKJD/Resources/choice_upload.png and b/TEMUKJD/Resources/choice_upload.png differ diff --git a/TEMUKJD/Resources/choice_upload_weixin_old.png b/TEMUKJD/Resources/choice_upload_weixin_old.png new file mode 100644 index 0000000..b1293a3 Binary files /dev/null and b/TEMUKJD/Resources/choice_upload_weixin_old.png differ diff --git a/TEMUKJD/Resources/pdd_bg..jpg b/TEMUKJD/Resources/pdd_bg.jpg similarity index 100% rename from TEMUKJD/Resources/pdd_bg..jpg rename to TEMUKJD/Resources/pdd_bg.jpg diff --git a/TEMUKJD/Resources/weixin_bg.jpg b/TEMUKJD/Resources/weixin_bg.jpg new file mode 100644 index 0000000..bc0681a Binary files /dev/null and b/TEMUKJD/Resources/weixin_bg.jpg differ diff --git a/TEMUKJD/Resources/weixin_icon.png b/TEMUKJD/Resources/weixin_icon.png new file mode 100644 index 0000000..80bbdff Binary files /dev/null and b/TEMUKJD/Resources/weixin_icon.png differ diff --git a/TEMUKJD/Resources/weixin_logo.png b/TEMUKJD/Resources/weixin_logo.png new file mode 100644 index 0000000..2eb64d4 Binary files /dev/null and b/TEMUKJD/Resources/weixin_logo.png differ diff --git a/TEMUKJD/ToolForms/GetAddressForm.Designer.cs b/TEMUKJD/ToolForms/GetAddressForm.Designer.cs index b43c1e6..63aa83b 100644 --- a/TEMUKJD/ToolForms/GetAddressForm.Designer.cs +++ b/TEMUKJD/ToolForms/GetAddressForm.Designer.cs @@ -28,9 +28,9 @@ /// private void InitializeComponent() { - 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.label18 = new System.Windows.Forms.Label(); this.cmbType = new System.Windows.Forms.ComboBox(); @@ -70,7 +70,7 @@ this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.cmbTypeFilter = new System.Windows.Forms.ComboBox(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.label17 = new System.Windows.Forms.Label(); this.txtSearch = new System.Windows.Forms.TextBox(); this.label14 = new System.Windows.Forms.Label(); @@ -554,7 +554,7 @@ // this.splitContainer2.Panel1.Controls.Add(this.cmbTypeFilter); this.splitContainer2.Panel1.Controls.Add(this.btnSearch); - this.splitContainer2.Panel1.Controls.Add(this.pnlEmpty); + this.splitContainer2.Panel1.Controls.Add(this.btnEmpty); this.splitContainer2.Panel1.Controls.Add(this.label17); this.splitContainer2.Panel1.Controls.Add(this.txtSearch); this.splitContainer2.Panel1.Controls.Add(this.label14); @@ -604,29 +604,29 @@ this.btnSearch.Text = "查询"; this.btnSearch.Click += new System.EventHandler(this.btnRefresh_Click); // - // 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(622, 12); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(52, 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 = 417; - 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(622, 12); + this.btnEmpty.Name = "btnEmpty"; + this.btnEmpty.Size = new System.Drawing.Size(52, 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 = 417; + this.btnEmpty.Text = "清空"; + this.btnEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // // label17 // @@ -659,7 +659,7 @@ // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(2729, 1154); + this.pbLoading.Location = new System.Drawing.Point(3493, 1490); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -670,20 +670,20 @@ // this.dgvAddress.AllowUserToAddRows = false; this.dgvAddress.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvAddress.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvAddress.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; this.dgvAddress.AutoRowNumber = true; this.dgvAddress.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvAddress.BackgroundColor = System.Drawing.Color.White; this.dgvAddress.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.dgvAddress.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.dgvAddress.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; this.dgvAddress.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvAddress.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colId, @@ -701,14 +701,14 @@ this.editColumn, this.deleteColumn, this.colSync}); - 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.dgvAddress.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.dgvAddress.DefaultCellStyle = dataGridViewCellStyle6; this.dgvAddress.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvAddress.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvAddress.Location = new System.Drawing.Point(0, 0); @@ -909,7 +909,7 @@ private System.Windows.Forms.PictureBox pbLoading; private System.Windows.Forms.Label label14; private System.Windows.Forms.TextBox txtSearch; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty; private System.Windows.Forms.Label label15; private System.Windows.Forms.SplitContainer splitContainer2; private System.Windows.Forms.Label label16; diff --git a/TEMUKJD/UserForm/LoginForm.Designer.cs b/TEMUKJD/UserForm/LoginForm.Designer.cs index 94e2286..eb45e96 100644 --- a/TEMUKJD/UserForm/LoginForm.Designer.cs +++ b/TEMUKJD/UserForm/LoginForm.Designer.cs @@ -35,8 +35,8 @@ 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.pnlLoginBg = new DevComponents.DotNetBar.PanelEx(); + this.pbLogo = new System.Windows.Forms.PictureBox(); this.closePanel = new DevComponents.DotNetBar.PanelEx(); this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); this.lblSignUp = new DevComponents.DotNetBar.LabelX(); @@ -47,8 +47,8 @@ this.rbtDev = new System.Windows.Forms.RadioButton(); this.lblBuy = new DevComponents.DotNetBar.LabelX(); this.lblContactSupport = new DevComponents.DotNetBar.LabelX(); - this.panelEx1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.pnlLoginBg.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbLogo)).BeginInit(); this.panelEx3.SuspendLayout(); this.grpEnvironmentChoice.SuspendLayout(); this.SuspendLayout(); @@ -175,38 +175,38 @@ // // panelEx1 // - 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); - this.panelEx1.Margin = new System.Windows.Forms.Padding(0); - this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(430, 120); - this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.panelEx1.Style.BackgroundImage = global::TemuKJD.Properties.Resources.login_bg; - this.panelEx1.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Center; - this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.panelEx1.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx1.Style.GradientAngle = 90; - this.panelEx1.TabIndex = 9; - this.panelEx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelEx1_MouseDown); - this.panelEx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panelEx1_MouseMove); - this.panelEx1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.panelEx1_MouseUp); + this.pnlLoginBg.CanvasColor = System.Drawing.SystemColors.Control; + this.pnlLoginBg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlLoginBg.Controls.Add(this.pbLogo); + this.pnlLoginBg.Controls.Add(this.closePanel); + this.pnlLoginBg.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlLoginBg.Location = new System.Drawing.Point(0, 0); + this.pnlLoginBg.Margin = new System.Windows.Forms.Padding(0); + this.pnlLoginBg.Name = "panelEx1"; + this.pnlLoginBg.Size = new System.Drawing.Size(430, 120); + this.pnlLoginBg.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlLoginBg.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.pnlLoginBg.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.pnlLoginBg.Style.BackgroundImage = global::TemuKJD.Properties.Resources.login_bg; + this.pnlLoginBg.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Center; + this.pnlLoginBg.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pnlLoginBg.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.pnlLoginBg.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.pnlLoginBg.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pnlLoginBg.Style.GradientAngle = 90; + this.pnlLoginBg.TabIndex = 9; + this.pnlLoginBg.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelEx1_MouseDown); + this.pnlLoginBg.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panelEx1_MouseMove); + this.pnlLoginBg.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; + this.pbLogo.Location = new System.Drawing.Point(119, 12); + this.pbLogo.Name = "pictureBox1"; + this.pbLogo.Size = new System.Drawing.Size(192, 96); + this.pbLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pbLogo.TabIndex = 20; + this.pbLogo.TabStop = false; // // closePanel // @@ -393,7 +393,7 @@ this.Controls.Add(this.panelEx3); this.Controls.Add(this.lblSignUp); this.Controls.Add(this.panelEx2); - this.Controls.Add(this.panelEx1); + this.Controls.Add(this.pnlLoginBg); this.Controls.Add(this.autoLogin); this.Controls.Add(this.chkRemember); this.Controls.Add(this.lblResetPassword); @@ -405,8 +405,8 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "登录 - 小奶牛"; this.Load += new System.EventHandler(this.LoginForm_Load); - this.panelEx1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.pnlLoginBg.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pbLogo)).EndInit(); this.panelEx3.ResumeLayout(false); this.grpEnvironmentChoice.ResumeLayout(false); this.grpEnvironmentChoice.PerformLayout(); @@ -423,7 +423,7 @@ private DevComponents.DotNetBar.LabelX lblResetPassword; private DevComponents.DotNetBar.Controls.CheckBoxX chkRemember; private DevComponents.DotNetBar.Controls.CheckBoxX autoLogin; - private DevComponents.DotNetBar.PanelEx panelEx1; + private DevComponents.DotNetBar.PanelEx pnlLoginBg; private DevComponents.DotNetBar.PanelEx panelEx2; private DevComponents.DotNetBar.LabelX lblSignUp; private DevComponents.DotNetBar.PanelEx panelEx3; @@ -434,6 +434,6 @@ private DevComponents.DotNetBar.PanelEx pnlShowRemember; private DevComponents.DotNetBar.LabelX lblBuy; private DevComponents.DotNetBar.LabelX lblContactSupport; - private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.PictureBox pbLogo; } } \ No newline at end of file diff --git a/TEMUKJD/UserForm/LoginForm.cs b/TEMUKJD/UserForm/LoginForm.cs index 3685fb5..a993d7a 100644 --- a/TEMUKJD/UserForm/LoginForm.cs +++ b/TEMUKJD/UserForm/LoginForm.cs @@ -40,12 +40,16 @@ namespace TemuKJD.UserForm { if (BaseClass.MainPath == "binxixi") { - this.panelEx1.Style.BackgroundImage = Properties.Resources.pdd_bg; - this.panelEx1.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Stretch; - this.pictureBox1.Image = Properties.Resources.pdd_logo; + this.pnlLoginBg.Style.BackgroundImage = Properties.Resources.pdd_bg; + this.pnlLoginBg.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Stretch; + this.pbLogo.Image = Properties.Resources.pdd_logo; } if (BaseClass.MainPath == "weixin") - this.panelEx1.Style.BackgroundImage = Properties.Resources.login_bg_wx; + { + this.pnlLoginBg.Style.BackgroundImage = Properties.Resources.weixin_bg; + this.pnlLoginBg.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Stretch; + this.pbLogo.Image = Properties.Resources.weixin_logo; + } GetUserList(); #if DEBUG @@ -71,7 +75,7 @@ namespace TemuKJD.UserForm Text = "登录 " + BaseClass.ToolName; if (BaseClass.LoginImage != null) - panelEx1.Style.BackgroundImage = BaseClass.LoginImage; + pnlLoginBg.Style.BackgroundImage = BaseClass.LoginImage; lblSignUp.Visible = BaseClass.ToolName == "跨境达-管理工具"; lblSignUp.Visible = false; diff --git a/TEMUKJD/VDianForms/VDianUploadProductForm.cs b/TEMUKJD/VDianForms/VDianUploadProductForm.cs index 70a46e5..9bd0e74 100644 --- a/TEMUKJD/VDianForms/VDianUploadProductForm.cs +++ b/TEMUKJD/VDianForms/VDianUploadProductForm.cs @@ -79,9 +79,9 @@ namespace KJD.VDianForms #region 窗体事件 private void UploadProductForm_Load(object sender, EventArgs e) { - chkSelectAll = dgvShop.Columns["colIsUpload"].AddHeaderCheckBox(HorizontalAlignment.Right, 0, 10, null, null, false); - chkSelectAll.Width = 20; - chkSelectAll.Height = 16; + chkSelectAll = dgvShop.Columns["colIsUpload"].AddHeaderCheckBox(HorizontalAlignment.Right, 0, 20, null, null, false); + chkSelectAll.Width = 13; + chkSelectAll.Height = 13; chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged; GlobalConfig.WeiDianUploadParam = NaiBa.Util.Helper.ConfigHelper.LoadConfig("vdian_upload_setting_param"); @@ -1110,6 +1110,7 @@ namespace KJD.VDianForms break; case "上货": + case "": //if (dgvShop.Rows[e.RowIndex].Cells["colIsAuthorize"].Value.ParseToBool()) { dgvShop.Rows[e.RowIndex].Cells["colIsUpload"].Value = !dgvShop.Rows[e.RowIndex].Cells["colIsUpload"].Value.ParseToBool(); diff --git a/TEMUKJD/VDianForms/VDianUploadProductForm.designer.cs b/TEMUKJD/VDianForms/VDianUploadProductForm.designer.cs index a0791d1..1865c2d 100644 --- a/TEMUKJD/VDianForms/VDianUploadProductForm.designer.cs +++ b/TEMUKJD/VDianForms/VDianUploadProductForm.designer.cs @@ -30,14 +30,14 @@ namespace KJD.VDianForms /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = 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.groupBox3 = new System.Windows.Forms.GroupBox(); this.lblPriceRatio = new DevComponents.DotNetBar.LabelX(); this.lblPriceRatioUnit = new DevComponents.DotNetBar.LabelX(); @@ -46,9 +46,10 @@ namespace KJD.VDianForms this.txtPriceBase = new DevComponents.DotNetBar.Controls.TextBoxX(); this.lblPriceBase = new DevComponents.DotNetBar.LabelX(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.txtSleep = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.btnClear2 = new DevComponents.DotNetBar.ButtonX(); this.btnStop = new DevComponents.DotNetBar.ButtonX(); - this.labelX3 = new DevComponents.DotNetBar.LabelX(); this.cmbThreadCount = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.comboItem6 = new DevComponents.Editors.ComboItem(); this.comboItem7 = new DevComponents.Editors.ComboItem(); @@ -60,6 +61,7 @@ namespace KJD.VDianForms this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.btnUpload = new DevComponents.DotNetBar.ButtonX(); this.btnImport = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.btnManageVDian = new DevComponents.DotNetBar.ButtonX(); this.btnGetProductCount = new DevComponents.DotNetBar.ButtonX(); @@ -86,14 +88,6 @@ namespace KJD.VDianForms this.colCPSResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colUploadOperate = new System.Windows.Forms.DataGridViewLinkColumn(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewXEx(); - this.colId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopName = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colProductCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colIsAuthorize = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colIsUpload = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.groupBox5 = new System.Windows.Forms.GroupBox(); this.btnShowCef = new DevComponents.DotNetBar.ButtonX(); this.labelX4 = new DevComponents.DotNetBar.LabelX(); @@ -102,8 +96,14 @@ namespace KJD.VDianForms this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.pbShopLoading = new System.Windows.Forms.PictureBox(); this.pbLoading = new System.Windows.Forms.PictureBox(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); - this.txtSleep = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.colId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colProductCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colIsAuthorize = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colIsUpload = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.groupBox3.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -234,6 +234,34 @@ namespace KJD.VDianForms this.groupBox1.TabStop = false; this.groupBox1.Text = "操作"; // + // txtSleep + // + // + // + // + this.txtSleep.Border.Class = "TextBoxBorder"; + this.txtSleep.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txtSleep.DisabledBackColor = System.Drawing.Color.White; + this.txtSleep.Location = new System.Drawing.Point(294, 37); + this.txtSleep.Name = "txtSleep"; + this.txtSleep.PreventEnterBeep = true; + this.txtSleep.Size = new System.Drawing.Size(39, 23); + this.txtSleep.TabIndex = 94; + this.txtSleep.Text = "10"; + this.txtSleep.TextChanged += new System.EventHandler(this.txtSleep_TextChanged); + // + // labelX7 + // + // + // + // + this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX7.Location = new System.Drawing.Point(231, 37); + this.labelX7.Name = "labelX7"; + this.labelX7.Size = new System.Drawing.Size(68, 23); + this.labelX7.TabIndex = 93; + this.labelX7.Text = "上传休眠:"; + // // btnClear2 // this.btnClear2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; @@ -258,18 +286,6 @@ namespace KJD.VDianForms this.btnStop.Text = "中断上货"; this.btnStop.Click += new System.EventHandler(this.btnStop_Click); // - // labelX3 - // - // - // - // - this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX3.Location = new System.Drawing.Point(108, 37); - this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(68, 23); - this.labelX3.TabIndex = 90; - this.labelX3.Text = "上传线程:"; - // // cmbThreadCount // this.cmbThreadCount.DisplayMember = "Text"; @@ -372,6 +388,18 @@ namespace KJD.VDianForms this.btnImport.Text = "导入数据"; this.btnImport.Click += new System.EventHandler(this.BtnImport_Click); // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(108, 37); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(68, 23); + this.labelX3.TabIndex = 90; + this.labelX3.Text = "上传线程:"; + // // groupBox2 // this.groupBox2.Controls.Add(this.btnManageVDian); @@ -521,17 +549,17 @@ namespace KJD.VDianForms // dgvProduct // this.dgvProduct.AllowUserToAddRows = false; - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvProduct.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18; + 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.WindowText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colUploadShopId, @@ -547,28 +575,28 @@ namespace KJD.VDianForms this.colUploadStatus, this.colCPSResult, this.colUploadOperate}); - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle19.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvProduct.DefaultCellStyle = dataGridViewCellStyle19; + 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.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvProduct.DefaultCellStyle = dataGridViewCellStyle3; this.dgvProduct.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvProduct.EnableHeadersVisualStyles = false; this.dgvProduct.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvProduct.Location = new System.Drawing.Point(0, 0); this.dgvProduct.Name = "dgvProduct"; this.dgvProduct.ReadOnly = true; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvProduct.RowHeadersDefaultCellStyle = dataGridViewCellStyle20; + 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.WindowText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvProduct.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvProduct.RowTemplate.Height = 23; this.dgvProduct.Size = new System.Drawing.Size(569, 339); this.dgvProduct.TabIndex = 102; @@ -671,17 +699,17 @@ namespace KJD.VDianForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvShop.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colId, @@ -692,97 +720,34 @@ namespace KJD.VDianForms this.colIsUpload, this.colLoginStatus, this.colStatus}); - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle23.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.DefaultCellStyle = dataGridViewCellStyle23; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.DefaultCellStyle = dataGridViewCellStyle7; this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvShop.EnableHeadersVisualStyles = false; this.dgvShop.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvShop.Location = new System.Drawing.Point(0, 0); this.dgvShop.Name = "dgvShop"; this.dgvShop.ReadOnly = true; - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvShop.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvShop.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; this.dgvShop.RowTemplate.Height = 23; this.dgvShop.Size = new System.Drawing.Size(463, 339); this.dgvShop.TabIndex = 101; this.dgvShop.UseCustomBackgroundColor = true; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DgvShop_CellContentClick); // - // colId - // - this.colId.HeaderText = "Id"; - this.colId.Name = "colId"; - this.colId.ReadOnly = true; - this.colId.Visible = false; - // - // colShopId - // - this.colShopId.HeaderText = "店铺Id"; - this.colShopId.Name = "colShopId"; - this.colShopId.ReadOnly = true; - this.colShopId.Visible = false; - // - // colShopName - // - this.colShopName.HeaderText = "店铺名称"; - this.colShopName.Name = "colShopName"; - this.colShopName.ReadOnly = true; - this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colShopName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colShopName.Width = 120; - // - // colProductCount - // - this.colProductCount.HeaderText = "商品数量"; - this.colProductCount.Name = "colProductCount"; - this.colProductCount.ReadOnly = true; - this.colProductCount.Visible = false; - this.colProductCount.Width = 80; - // - // colIsAuthorize - // - this.colIsAuthorize.HeaderText = "接口"; - this.colIsAuthorize.Name = "colIsAuthorize"; - this.colIsAuthorize.ReadOnly = true; - this.colIsAuthorize.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.colIsAuthorize.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colIsAuthorize.Visible = false; - this.colIsAuthorize.Width = 50; - // - // colIsUpload - // - this.colIsUpload.HeaderText = "上货"; - this.colIsUpload.Name = "colIsUpload"; - this.colIsUpload.ReadOnly = true; - this.colIsUpload.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.colIsUpload.Width = 50; - // - // colLoginStatus - // - this.colLoginStatus.HeaderText = "登录"; - this.colLoginStatus.Name = "colLoginStatus"; - this.colLoginStatus.ReadOnly = true; - this.colLoginStatus.Width = 50; - // - // colStatus - // - this.colStatus.HeaderText = "状态"; - this.colStatus.Name = "colStatus"; - this.colStatus.ReadOnly = true; - this.colStatus.Width = 150; - // // groupBox5 // this.groupBox5.Controls.Add(this.btnShowCef); @@ -893,33 +858,68 @@ namespace KJD.VDianForms this.pbLoading.TabStop = false; this.pbLoading.Visible = false; // - // labelX7 + // colId // + this.colId.HeaderText = "Id"; + this.colId.Name = "colId"; + this.colId.ReadOnly = true; + this.colId.Visible = false; // + // colShopId // + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + this.colShopId.Visible = false; // - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(231, 37); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(68, 23); - this.labelX7.TabIndex = 93; - this.labelX7.Text = "上传休眠:"; + // colShopName // - // txtSleep + this.colShopName.HeaderText = "店铺名称"; + this.colShopName.Name = "colShopName"; + this.colShopName.ReadOnly = true; + this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colShopName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colShopName.Width = 120; // + // colProductCount // + this.colProductCount.HeaderText = "商品数量"; + this.colProductCount.Name = "colProductCount"; + this.colProductCount.ReadOnly = true; + this.colProductCount.Visible = false; + this.colProductCount.Width = 80; // + // colIsAuthorize // - this.txtSleep.Border.Class = "TextBoxBorder"; - this.txtSleep.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txtSleep.DisabledBackColor = System.Drawing.Color.White; - this.txtSleep.Location = new System.Drawing.Point(294, 37); - this.txtSleep.Name = "txtSleep"; - this.txtSleep.PreventEnterBeep = true; - this.txtSleep.Size = new System.Drawing.Size(39, 23); - this.txtSleep.TabIndex = 94; - this.txtSleep.Text = "10"; - this.txtSleep.TextChanged += new System.EventHandler(this.txtSleep_TextChanged); + this.colIsAuthorize.HeaderText = "接口"; + this.colIsAuthorize.Name = "colIsAuthorize"; + this.colIsAuthorize.ReadOnly = true; + this.colIsAuthorize.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.colIsAuthorize.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colIsAuthorize.Visible = false; + this.colIsAuthorize.Width = 50; + // + // colIsUpload + // + this.colIsUpload.HeaderText = "上货"; + this.colIsUpload.Name = "colIsUpload"; + this.colIsUpload.ReadOnly = true; + this.colIsUpload.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.colIsUpload.Width = 50; + // + // colLoginStatus + // + this.colLoginStatus.HeaderText = "登录"; + this.colLoginStatus.Name = "colLoginStatus"; + this.colLoginStatus.ReadOnly = true; + this.colLoginStatus.Width = 50; + // + // colStatus + // + this.colStatus.HeaderText = "状态"; + this.colStatus.Name = "colStatus"; + this.colStatus.ReadOnly = true; + this.colStatus.Width = 150; // // VDianUploadProductForm // @@ -1015,6 +1015,8 @@ namespace KJD.VDianForms private System.Windows.Forms.DataGridViewTextBoxColumn colUploadStatus; private System.Windows.Forms.DataGridViewTextBoxColumn colCPSResult; private System.Windows.Forms.DataGridViewLinkColumn colUploadOperate; + private DevComponents.DotNetBar.Controls.TextBoxX txtSleep; + private DevComponents.DotNetBar.LabelX labelX7; private System.Windows.Forms.DataGridViewTextBoxColumn colId; private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; private System.Windows.Forms.DataGridViewLinkColumn colShopName; @@ -1023,7 +1025,5 @@ namespace KJD.VDianForms private System.Windows.Forms.DataGridViewCheckBoxColumn colIsUpload; private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus; private System.Windows.Forms.DataGridViewTextBoxColumn colStatus; - private DevComponents.DotNetBar.Controls.TextBoxX txtSleep; - private DevComponents.DotNetBar.LabelX labelX7; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAddressSyncForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAddressSyncForm.Designer.cs index fa6b6e8..f745e91 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAddressSyncForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAddressSyncForm.Designer.cs @@ -41,7 +41,7 @@ namespace TemuKJD.WXForms.AdminForms 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.txtNotes = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.txtShopName = new System.Windows.Forms.TextBox(); @@ -186,27 +186,27 @@ namespace TemuKJD.WXForms.AdminForms // // pnlEmpty // - this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; - this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(380, 12); - 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 = 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(380, 12); + this.btnEmpty.Name = "pnlEmpty"; + 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 = 413; + this.btnEmpty.Text = "清空条件"; + this.btnEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // // txtNotes // @@ -398,7 +398,7 @@ namespace TemuKJD.WXForms.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.txtNotes); this.panel4.Controls.Add(this.label4); this.panel4.Location = new System.Drawing.Point(3, 3); @@ -747,7 +747,7 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.PictureBox pbLoading; private UserComponent.DataGridViewEx dgvShop; 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/WXForms/AdminForms/WXAdminShopListForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs index a8d0cdb..492ab64 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs @@ -38,9 +38,9 @@ namespace TemuKJD.WXForms.AdminForms this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.panel5 = new System.Windows.Forms.Panel(); - this.pbtnLoginSelect = new DevComponents.DotNetBar.PanelEx(); + this.btnLoginSelect = new DevComponents.DotNetBar.PanelEx(); this.chkShowDelete = new System.Windows.Forms.CheckBox(); - this.pbtnCheck = new DevComponents.DotNetBar.PanelEx(); + this.btnCheck = new DevComponents.DotNetBar.PanelEx(); this.panel4 = new System.Windows.Forms.Panel(); this.lblAddToAccount = new System.Windows.Forms.Label(); this.btnAddToAccount = new DevComponents.DotNetBar.PanelEx(); @@ -49,7 +49,7 @@ namespace TemuKJD.WXForms.AdminForms 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.txtNotes = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.txtShopName = new System.Windows.Forms.TextBox(); @@ -68,10 +68,6 @@ namespace TemuKJD.WXForms.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.panel3 = new System.Windows.Forms.Panel(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -103,6 +99,10 @@ namespace TemuKJD.WXForms.AdminForms this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.chkAutoDrag = new System.Windows.Forms.CheckBox(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.panel3 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -160,37 +160,37 @@ namespace TemuKJD.WXForms.AdminForms // // panel5 // - this.panel5.Controls.Add(this.pbtnLoginSelect); + this.panel5.Controls.Add(this.btnLoginSelect); this.panel5.Controls.Add(this.chkShowDelete); - this.panel5.Controls.Add(this.pbtnCheck); + this.panel5.Controls.Add(this.btnCheck); this.panel5.Location = new System.Drawing.Point(1008, 3); this.panel5.Name = "panel5"; this.panel5.Size = new System.Drawing.Size(260, 40); this.panel5.TabIndex = 1; // - // pbtnLoginSelect + // btnLoginSelect // - this.pbtnLoginSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pbtnLoginSelect.Cursor = System.Windows.Forms.Cursors.Hand; - this.pbtnLoginSelect.DisabledBackColor = System.Drawing.Color.Empty; - this.pbtnLoginSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.pbtnLoginSelect.Location = new System.Drawing.Point(192, 12); - this.pbtnLoginSelect.Name = "pbtnLoginSelect"; - this.pbtnLoginSelect.Size = new System.Drawing.Size(66, 23); - this.pbtnLoginSelect.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pbtnLoginSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pbtnLoginSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pbtnLoginSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.pbtnLoginSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.pbtnLoginSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.pbtnLoginSelect.Style.ForeColor.Color = System.Drawing.Color.White; - this.pbtnLoginSelect.Style.GradientAngle = 90; - this.pbtnLoginSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.pbtnLoginSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.pbtnLoginSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.pbtnLoginSelect.TabIndex = 467; - this.pbtnLoginSelect.Text = "检测选中"; - this.pbtnLoginSelect.Click += new System.EventHandler(this.btnLoginSelect_Click); + this.btnLoginSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnLoginSelect.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnLoginSelect.DisabledBackColor = System.Drawing.Color.Empty; + this.btnLoginSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnLoginSelect.Location = new System.Drawing.Point(192, 12); + this.btnLoginSelect.Name = "btnLoginSelect"; + this.btnLoginSelect.Size = new System.Drawing.Size(66, 23); + this.btnLoginSelect.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnLoginSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnLoginSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnLoginSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnLoginSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnLoginSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnLoginSelect.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnLoginSelect.Style.GradientAngle = 90; + this.btnLoginSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnLoginSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnLoginSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnLoginSelect.TabIndex = 467; + this.btnLoginSelect.Text = "检测选中"; + this.btnLoginSelect.Click += new System.EventHandler(this.btnLoginSelect_Click); // // chkShowDelete // @@ -205,29 +205,29 @@ namespace TemuKJD.WXForms.AdminForms this.chkShowDelete.UseVisualStyleBackColor = false; this.chkShowDelete.CheckedChanged += new System.EventHandler(this.chkShowDelete_CheckedChanged); // - // pbtnCheck + // btnCheck // - this.pbtnCheck.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pbtnCheck.Cursor = System.Windows.Forms.Cursors.Hand; - this.pbtnCheck.DisabledBackColor = System.Drawing.Color.Empty; - this.pbtnCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.pbtnCheck.Location = new System.Drawing.Point(122, 12); - this.pbtnCheck.Name = "pbtnCheck"; - this.pbtnCheck.Size = new System.Drawing.Size(66, 23); - this.pbtnCheck.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pbtnCheck.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pbtnCheck.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pbtnCheck.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.pbtnCheck.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.pbtnCheck.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.pbtnCheck.Style.ForeColor.Color = System.Drawing.Color.White; - this.pbtnCheck.Style.GradientAngle = 90; - this.pbtnCheck.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.pbtnCheck.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.pbtnCheck.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.pbtnCheck.TabIndex = 463; - this.pbtnCheck.Text = "检测选中"; - this.pbtnCheck.Click += new System.EventHandler(this.btnCheck_Click); + this.btnCheck.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCheck.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnCheck.DisabledBackColor = System.Drawing.Color.Empty; + this.btnCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCheck.Location = new System.Drawing.Point(122, 12); + this.btnCheck.Name = "btnCheck"; + this.btnCheck.Size = new System.Drawing.Size(66, 23); + this.btnCheck.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnCheck.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCheck.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCheck.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnCheck.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnCheck.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnCheck.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnCheck.Style.GradientAngle = 90; + this.btnCheck.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnCheck.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnCheck.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnCheck.TabIndex = 463; + this.btnCheck.Text = "检测选中"; + this.btnCheck.Click += new System.EventHandler(this.btnCheck_Click); // // panel4 // @@ -238,7 +238,7 @@ namespace TemuKJD.WXForms.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.txtNotes); this.panel4.Controls.Add(this.label4); this.panel4.Controls.Add(this.txtShopName); @@ -343,29 +343,29 @@ namespace TemuKJD.WXForms.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(502, 12); - 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 = 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(502, 12); + 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 = 413; + this.btnEmpty.Text = "清空条件"; + this.btnEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // // txtNotes // @@ -670,53 +670,6 @@ namespace TemuKJD.WXForms.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(595, 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 = true; - this.ucSplitPage1.Location = new System.Drawing.Point(882, 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(389, 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(1271, 25); - this.statusBar.TabIndex = 1; - // - // panel3 - // - this.panel3.BackColor = System.Drawing.Color.White; - this.panel3.Controls.Add(this.splitContainer1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(1, 33); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1271, 576); - this.panel3.TabIndex = 35; - // // colSelect // this.colSelect.FillWeight = 26F; @@ -977,6 +930,53 @@ namespace TemuKJD.WXForms.AdminForms this.colMsg.ReadOnly = true; this.colMsg.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(595, 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 = true; + this.ucSplitPage1.Location = new System.Drawing.Point(882, 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(389, 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(1271, 25); + this.statusBar.TabIndex = 1; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.White; + this.panel3.Controls.Add(this.splitContainer1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(1, 33); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1271, 576); + this.panel3.TabIndex = 35; + // // WXAdminShopListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1033,7 +1033,7 @@ namespace TemuKJD.WXForms.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; @@ -1050,8 +1050,8 @@ namespace TemuKJD.WXForms.AdminForms private DevComponents.DotNetBar.PanelEx btnExportShopErp; private DevComponents.DotNetBar.PanelEx btnSearch; private DevComponents.DotNetBar.PanelEx btnSetSubSa; - private DevComponents.DotNetBar.PanelEx pbtnLoginSelect; - private DevComponents.DotNetBar.PanelEx pbtnCheck; + private DevComponents.DotNetBar.PanelEx btnLoginSelect; + private DevComponents.DotNetBar.PanelEx btnCheck; private System.Windows.Forms.Panel panel3; public System.Windows.Forms.Label lblAddToAccount; public DevComponents.DotNetBar.PanelEx btnAddToAccount; diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs index 8406db8..154dbd9 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs @@ -181,7 +181,7 @@ namespace TemuKJD.WXForms.AdminForms private void btnLoginSelect_Click(object sender, EventArgs e) { IsOperate = true; - if (this.pbtnLoginSelect.Text == "登录选中") + if (this.btnLoginSelect.Text == "登录选中") { List shopLoginNameList = GetCheckedList(); if (!shopLoginNameList.Any()) @@ -452,7 +452,7 @@ namespace TemuKJD.WXForms.AdminForms private void btnCheck_Click(object sender, EventArgs e) { - if (this.pbtnCheck.Text == "检测选中") + if (this.btnCheck.Text == "检测选中") { List shopLoginNameList = GetCheckedList(); if (!shopLoginNameList.Any()) diff --git a/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.Designer.cs index 54495b9..0555231 100644 --- a/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXWaybillManageForm.Designer.cs @@ -48,7 +48,7 @@ namespace TemuKJD.WXForms.AdminForms this.txtUserName = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvExpress = new TemuKJD.UserComponent.DataGridViewEx(); @@ -170,7 +170,7 @@ namespace TemuKJD.WXForms.AdminForms this.panel4.Controls.Add(this.txtUserName); this.panel4.Controls.Add(this.label5); this.panel4.Controls.Add(this.label1); - this.panel4.Controls.Add(this.pnlEmpty); + this.panel4.Controls.Add(this.btnEmpty); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(3, 3); this.panel4.Name = "panel4"; @@ -270,27 +270,27 @@ namespace TemuKJD.WXForms.AdminForms // // pnlEmpty // - this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; - this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(571, 14); - 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 = 413; - this.pnlEmpty.Text = "清空条件"; - this.pnlEmpty.Visible = false; + 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(571, 14); + this.btnEmpty.Name = "pnlEmpty"; + 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 = 413; + this.btnEmpty.Text = "清空条件"; + this.btnEmpty.Visible = false; // // splitContainer2 // @@ -554,7 +554,7 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.TextBox txtUserName; private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label1; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty; private System.Windows.Forms.SplitContainer splitContainer2; private System.Windows.Forms.PictureBox pbLoading; private UserComponent.DataGridViewEx dgvExpress; diff --git a/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.Designer.cs index 788d8e0..bf0c046 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdCouponOrderBoomForm.Designer.cs @@ -71,7 +71,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbSaleSort = new System.Windows.Forms.ComboBox(); this.label6 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.panelEx6 = new DevComponents.DotNetBar.PanelEx(); + this.btnStopSearch = new DevComponents.DotNetBar.PanelEx(); this.btnClearDgv = new DevComponents.DotNetBar.PanelEx(); this.txtPageEnd = new System.Windows.Forms.TextBox(); this.txtFiltSaleNumLessThan = new System.Windows.Forms.TextBox(); @@ -90,7 +90,7 @@ namespace TemuKJD.WXForms.ProductForms this.label7 = new System.Windows.Forms.Label(); this.txtRatio = new System.Windows.Forms.TextBox(); this.btnEndCoupon = new DevComponents.DotNetBar.PanelEx(); - this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); + this.btnStopOp = new DevComponents.DotNetBar.PanelEx(); this.btnEndPromotion = new DevComponents.DotNetBar.PanelEx(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnRefreshAuthor = new DevComponents.DotNetBar.PanelEx(); @@ -567,7 +567,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx3.Controls.Add(this.cmbSaleSort); this.ucGroupBoxEx3.Controls.Add(this.label6); this.ucGroupBoxEx3.Controls.Add(this.label5); - this.ucGroupBoxEx3.Controls.Add(this.panelEx6); + this.ucGroupBoxEx3.Controls.Add(this.btnStopSearch); this.ucGroupBoxEx3.Controls.Add(this.btnClearDgv); this.ucGroupBoxEx3.Controls.Add(this.txtPageEnd); this.ucGroupBoxEx3.Controls.Add(this.txtFiltSaleNumLessThan); @@ -622,30 +622,30 @@ namespace TemuKJD.WXForms.ProductForms this.label5.TabIndex = 844; this.label5.Text = "销量小于"; // - // panelEx6 + // btnStopSearch // - this.panelEx6.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx6.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx6.Location = new System.Drawing.Point(288, 127); - this.panelEx6.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.panelEx6.Name = "panelEx6"; - this.panelEx6.Size = new System.Drawing.Size(58, 25); - this.panelEx6.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx6.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx6.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx6.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx6.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx6.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx6.Style.GradientAngle = 90; - this.panelEx6.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx6.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx6.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx6.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx6.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.panelEx6.TabIndex = 848; - this.panelEx6.Text = "停止查询"; - this.panelEx6.Click += new System.EventHandler(this.btnStop_Click); + 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(288, 127); + this.btnStopSearch.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnStopSearch.Name = "btnStopSearch"; + this.btnStopSearch.Size = new System.Drawing.Size(58, 25); + 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 = 848; + this.btnStopSearch.Text = "停止查询"; + this.btnStopSearch.Click += new System.EventHandler(this.btnStop_Click); // // btnClearDgv // @@ -863,7 +863,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.Controls.Add(this.label7); this.ucGroupBoxEx4.Controls.Add(this.txtRatio); this.ucGroupBoxEx4.Controls.Add(this.btnEndCoupon); - this.ucGroupBoxEx4.Controls.Add(this.panelEx2); + this.ucGroupBoxEx4.Controls.Add(this.btnStopOp); this.ucGroupBoxEx4.Controls.Add(this.btnEndPromotion); this.ucGroupBoxEx4.Location = new System.Drawing.Point(963, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; @@ -952,31 +952,31 @@ namespace TemuKJD.WXForms.ProductForms this.btnEndCoupon.Text = "作废选中商品优惠券"; this.btnEndCoupon.Click += new System.EventHandler(this.btnEndCoupon_Click); // - // panelEx2 + // btnStopOp // - 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(390, 128); - this.panelEx2.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(58, 25); - 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 = 805; - this.panelEx2.Text = "停止操作"; - this.panelEx2.Click += new System.EventHandler(this.btnStop_Click); + this.btnStopOp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnStopOp.CanvasColor = System.Drawing.SystemColors.Control; + this.btnStopOp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnStopOp.DisabledBackColor = System.Drawing.Color.Empty; + this.btnStopOp.Location = new System.Drawing.Point(390, 128); + this.btnStopOp.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnStopOp.Name = "btnStopOp"; + this.btnStopOp.Size = new System.Drawing.Size(58, 25); + this.btnStopOp.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopOp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopOp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopOp.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnStopOp.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopOp.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnStopOp.Style.GradientAngle = 90; + this.btnStopOp.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopOp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopOp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopOp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopOp.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnStopOp.TabIndex = 805; + this.btnStopOp.Text = "停止操作"; + this.btnStopOp.Click += new System.EventHandler(this.btnStop_Click); // // btnEndPromotion // @@ -1401,6 +1401,7 @@ namespace TemuKJD.WXForms.ProductForms this.colMessage}); this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvShop.Location = new System.Drawing.Point(4, 0); + this.dgvShop.MultiSelectCheckBox = true; this.dgvShop.Name = "dgvShop"; this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 25; @@ -1585,6 +1586,7 @@ namespace TemuKJD.WXForms.ProductForms this.colOpResult}); this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvSelectProduct.Location = new System.Drawing.Point(0, 0); + this.dgvSelectProduct.MultiSelectCheckBox = true; this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowTemplate.Height = 23; @@ -1978,7 +1980,7 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.TextBox txtPageEnd; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; - private DevComponents.DotNetBar.PanelEx panelEx2; + private DevComponents.DotNetBar.PanelEx btnStopOp; private System.Windows.Forms.Label label3; private System.Windows.Forms.ComboBox cmbPreType; private UserComponent.UcGroupBoxEx ucGroupBoxEx3; @@ -2008,7 +2010,7 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.Label label14; private DevComponents.DotNetBar.PanelEx btnEndCoupon; private DevComponents.DotNetBar.PanelEx btnClearCoupon; - private DevComponents.DotNetBar.PanelEx panelEx6; + private DevComponents.DotNetBar.PanelEx btnStopSearch; private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox txtFiltSaleNumLessThan; private DevComponents.DotNetBar.PanelEx btnFiltSelectLessThan; diff --git a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs index c8c0794..5323810 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs @@ -32,25 +32,26 @@ namespace TemuKJD.WXForms.ProductForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnBatchRealDel = new DevComponents.DotNetBar.PanelEx(); this.btnSelectLimit2 = new DevComponents.DotNetBar.PanelEx(); this.btnSelectLimit1 = new DevComponents.DotNetBar.PanelEx(); this.btnBatchDel = new DevComponents.DotNetBar.PanelEx(); this.label4 = new System.Windows.Forms.Label(); this.txtFiltSaleNum = new System.Windows.Forms.TextBox(); this.btnFiltSelect = new DevComponents.DotNetBar.PanelEx(); - this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); - this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); + this.btnStopUpDownOrDel = new DevComponents.DotNetBar.PanelEx(); + this.btnClearList = new DevComponents.DotNetBar.PanelEx(); this.btnDown = new DevComponents.DotNetBar.PanelEx(); this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.chkFailDownProd = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -67,7 +68,7 @@ namespace TemuKJD.WXForms.ProductForms this.label3 = new System.Windows.Forms.Label(); this.txtIdFilter = new System.Windows.Forms.TextBox(); this.lblIdFilter = new System.Windows.Forms.Label(); - this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); + this.btnStopSearch = new DevComponents.DotNetBar.PanelEx(); this.txtPageEnd = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.txtProductName = new System.Windows.Forms.TextBox(); @@ -143,7 +144,6 @@ namespace TemuKJD.WXForms.ProductForms this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.btnBatchRealDel = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -206,8 +206,8 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx3.Controls.Add(this.label4); this.ucGroupBoxEx3.Controls.Add(this.txtFiltSaleNum); this.ucGroupBoxEx3.Controls.Add(this.btnFiltSelect); - this.ucGroupBoxEx3.Controls.Add(this.panelEx3); - this.ucGroupBoxEx3.Controls.Add(this.panelEx4); + this.ucGroupBoxEx3.Controls.Add(this.btnStopUpDownOrDel); + this.ucGroupBoxEx3.Controls.Add(this.btnClearList); this.ucGroupBoxEx3.Controls.Add(this.btnDown); this.ucGroupBoxEx3.Location = new System.Drawing.Point(995, 2); this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; @@ -216,6 +216,31 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx3.TabStop = false; this.ucGroupBoxEx3.Text = "商品下架"; // + // btnBatchRealDel + // + this.btnBatchRealDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnBatchRealDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnBatchRealDel.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnBatchRealDel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnBatchRealDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnBatchRealDel.Location = new System.Drawing.Point(243, 91); + this.btnBatchRealDel.Name = "btnBatchRealDel"; + this.btnBatchRealDel.Size = new System.Drawing.Size(84, 23); + this.btnBatchRealDel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnBatchRealDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnBatchRealDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnBatchRealDel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnBatchRealDel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnBatchRealDel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnBatchRealDel.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnBatchRealDel.Style.GradientAngle = 90; + this.btnBatchRealDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnBatchRealDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnBatchRealDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnBatchRealDel.TabIndex = 865; + this.btnBatchRealDel.Text = "彻底刪除"; + this.btnBatchRealDel.Click += new System.EventHandler(this.btnBatchRealDel_Click); + // // btnSelectLimit2 // this.btnSelectLimit2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -332,57 +357,57 @@ namespace TemuKJD.WXForms.ProductForms this.btnFiltSelect.Text = "批量选择"; this.btnFiltSelect.Click += new System.EventHandler(this.btnFiltSelect_Click); // - // panelEx3 + // btnStopUpDownOrDel // - this.panelEx3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx3.Location = new System.Drawing.Point(243, 121); - this.panelEx3.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.panelEx3.Name = "panelEx3"; - this.panelEx3.Size = new System.Drawing.Size(84, 23); - this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx3.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx3.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx3.Style.GradientAngle = 90; - this.panelEx3.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx3.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx3.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx3.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx3.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.panelEx3.TabIndex = 546; - this.panelEx3.Text = "停止下/刪"; - this.panelEx3.Click += new System.EventHandler(this.btnStop_Click); + this.btnStopUpDownOrDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnStopUpDownOrDel.CanvasColor = System.Drawing.SystemColors.Control; + this.btnStopUpDownOrDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnStopUpDownOrDel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnStopUpDownOrDel.Location = new System.Drawing.Point(243, 121); + this.btnStopUpDownOrDel.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnStopUpDownOrDel.Name = "btnStopUpDownOrDel"; + this.btnStopUpDownOrDel.Size = new System.Drawing.Size(84, 23); + this.btnStopUpDownOrDel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopUpDownOrDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopUpDownOrDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopUpDownOrDel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnStopUpDownOrDel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopUpDownOrDel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnStopUpDownOrDel.Style.GradientAngle = 90; + this.btnStopUpDownOrDel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopUpDownOrDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopUpDownOrDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopUpDownOrDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopUpDownOrDel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnStopUpDownOrDel.TabIndex = 546; + this.btnStopUpDownOrDel.Text = "停止下/刪"; + this.btnStopUpDownOrDel.Click += new System.EventHandler(this.btnStop_Click); // - // panelEx4 + // btnClearList // - this.panelEx4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.panelEx4.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx4.Location = new System.Drawing.Point(32, 121); - this.panelEx4.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.panelEx4.Name = "panelEx4"; - this.panelEx4.Size = new System.Drawing.Size(84, 23); - this.panelEx4.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx4.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx4.Style.GradientAngle = 90; - this.panelEx4.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx4.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx4.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx4.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx4.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.panelEx4.TabIndex = 612; - this.panelEx4.Text = "清空列表选中"; - this.panelEx4.Click += new System.EventHandler(this.btnClearDgv_Click); + this.btnClearList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnClearList.CanvasColor = System.Drawing.SystemColors.Control; + this.btnClearList.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClearList.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClearList.Location = new System.Drawing.Point(32, 121); + this.btnClearList.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnClearList.Name = "btnClearList"; + this.btnClearList.Size = new System.Drawing.Size(84, 23); + this.btnClearList.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClearList.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnClearList.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnClearList.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnClearList.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClearList.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnClearList.Style.GradientAngle = 90; + this.btnClearList.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnClearList.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClearList.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClearList.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClearList.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnClearList.TabIndex = 612; + this.btnClearList.Text = "清空列表选中"; + this.btnClearList.Click += new System.EventHandler(this.btnClearDgv_Click); // // btnDown // @@ -574,7 +599,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.Controls.Add(this.label3); this.ucGroupBoxEx4.Controls.Add(this.txtIdFilter); this.ucGroupBoxEx4.Controls.Add(this.lblIdFilter); - this.ucGroupBoxEx4.Controls.Add(this.panelEx2); + this.ucGroupBoxEx4.Controls.Add(this.btnStopSearch); this.ucGroupBoxEx4.Controls.Add(this.txtPageEnd); this.ucGroupBoxEx4.Controls.Add(this.label2); this.ucGroupBoxEx4.Controls.Add(this.txtProductName); @@ -654,31 +679,31 @@ namespace TemuKJD.WXForms.ProductForms this.lblIdFilter.Text = "ID"; this.lblIdFilter.Visible = false; // - // 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(338, 127); - this.panelEx2.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(58, 25); - 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 = 805; - 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(338, 127); + this.btnStopSearch.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnStopSearch.Name = "btnStopSearch"; + this.btnStopSearch.Size = new System.Drawing.Size(58, 25); + 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 = 805; + this.btnStopSearch.Text = "停止查询"; + this.btnStopSearch.Click += new System.EventHandler(this.btnStop_Click); // // txtPageEnd // @@ -1175,19 +1200,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle19.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19; + 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))))); - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20; + 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, @@ -1359,19 +1384,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle21.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; 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))))); - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; + 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; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1435,8 +1460,8 @@ namespace TemuKJD.WXForms.ProductForms // // colSupplierName // - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle23; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5; this.colSupplierName.Frozen = true; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; @@ -1524,8 +1549,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductName // - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle24; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle6; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -1533,8 +1558,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductCat // - dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductCat.DefaultCellStyle = dataGridViewCellStyle25; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductCat.DefaultCellStyle = dataGridViewCellStyle7; this.colProductCat.HeaderText = "商品类目"; this.colProductCat.Name = "colProductCat"; this.colProductCat.ReadOnly = true; @@ -1563,8 +1588,8 @@ namespace TemuKJD.WXForms.ProductForms // // colMsg // - dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colMsg.DefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMsg.DefaultCellStyle = dataGridViewCellStyle8; this.colMsg.HeaderText = "状态"; this.colMsg.Name = "colMsg"; this.colMsg.ReadOnly = true; @@ -1602,8 +1627,8 @@ namespace TemuKJD.WXForms.ProductForms // // colAddTime // - dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colAddTime.DefaultCellStyle = dataGridViewCellStyle27; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle9; this.colAddTime.HeaderText = "上架时间"; this.colAddTime.Name = "colAddTime"; this.colAddTime.ReadOnly = true; @@ -1696,31 +1721,6 @@ namespace TemuKJD.WXForms.ProductForms this.panelEx1.Text = "停止当前操作"; this.panelEx1.Visible = false; // - // btnBatchRealDel - // - this.btnBatchRealDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnBatchRealDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnBatchRealDel.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnBatchRealDel.DisabledBackColor = System.Drawing.Color.Empty; - this.btnBatchRealDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnBatchRealDel.Location = new System.Drawing.Point(243, 91); - this.btnBatchRealDel.Name = "btnBatchRealDel"; - this.btnBatchRealDel.Size = new System.Drawing.Size(84, 23); - this.btnBatchRealDel.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnBatchRealDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnBatchRealDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnBatchRealDel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnBatchRealDel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnBatchRealDel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnBatchRealDel.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnBatchRealDel.Style.GradientAngle = 90; - this.btnBatchRealDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnBatchRealDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnBatchRealDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnBatchRealDel.TabIndex = 865; - this.btnBatchRealDel.Text = "彻底刪除"; - this.btnBatchRealDel.Click += new System.EventHandler(this.btnBatchRealDel_Click); - // // WXProdPreSaleForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1830,13 +1830,13 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private UserComponent.UcCheckBox chkNoPreSale; - private DevComponents.DotNetBar.PanelEx panelEx2; + private DevComponents.DotNetBar.PanelEx btnStopSearch; private System.Windows.Forms.Label label3; private System.Windows.Forms.ComboBox cmbPreType; private UserComponent.UcCheckBox chkFailDownProd; private UserComponent.UcGroupBoxEx ucGroupBoxEx3; - private DevComponents.DotNetBar.PanelEx panelEx3; - private DevComponents.DotNetBar.PanelEx panelEx4; + private DevComponents.DotNetBar.PanelEx btnStopUpDownOrDel; + private DevComponents.DotNetBar.PanelEx btnClearList; private DevComponents.DotNetBar.PanelEx btnDown; private System.Windows.Forms.Label label4; private System.Windows.Forms.TextBox txtFiltSaleNum; diff --git a/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.Designer.cs index d089e94..381a431 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdSyncForm.Designer.cs @@ -45,7 +45,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbSaleSort = new System.Windows.Forms.ComboBox(); this.label6 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.panelEx6 = new DevComponents.DotNetBar.PanelEx(); + this.btnStopSearch = new DevComponents.DotNetBar.PanelEx(); this.btnClearDgv = new DevComponents.DotNetBar.PanelEx(); this.txtPageEnd = new System.Windows.Forms.TextBox(); this.txtFiltSaleNumLessThan = new System.Windows.Forms.TextBox(); @@ -61,7 +61,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.chkFailDownProd = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnPromotion = new DevComponents.DotNetBar.PanelEx(); - this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); + this.btnStopOp = new DevComponents.DotNetBar.PanelEx(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnRefreshAuthor = new DevComponents.DotNetBar.PanelEx(); this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx(); @@ -183,7 +183,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx3.Controls.Add(this.cmbSaleSort); this.ucGroupBoxEx3.Controls.Add(this.label6); this.ucGroupBoxEx3.Controls.Add(this.label5); - this.ucGroupBoxEx3.Controls.Add(this.panelEx6); + this.ucGroupBoxEx3.Controls.Add(this.btnStopSearch); this.ucGroupBoxEx3.Controls.Add(this.btnClearDgv); this.ucGroupBoxEx3.Controls.Add(this.txtPageEnd); this.ucGroupBoxEx3.Controls.Add(this.txtFiltSaleNumLessThan); @@ -238,30 +238,30 @@ namespace TemuKJD.WXForms.ProductForms this.label5.TabIndex = 844; this.label5.Text = "销量小于"; // - // panelEx6 + // btnStopSearch // - this.panelEx6.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx6.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx6.Location = new System.Drawing.Point(288, 127); - this.panelEx6.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.panelEx6.Name = "panelEx6"; - this.panelEx6.Size = new System.Drawing.Size(58, 25); - this.panelEx6.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx6.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx6.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx6.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx6.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx6.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx6.Style.GradientAngle = 90; - this.panelEx6.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx6.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx6.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx6.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx6.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.panelEx6.TabIndex = 848; - this.panelEx6.Text = "停止查询"; - this.panelEx6.Click += new System.EventHandler(this.btnStop_Click); + 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(288, 127); + this.btnStopSearch.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnStopSearch.Name = "btnStopSearch"; + this.btnStopSearch.Size = new System.Drawing.Size(58, 25); + 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 = 848; + this.btnStopSearch.Text = "停止查询"; + this.btnStopSearch.Click += new System.EventHandler(this.btnStop_Click); // // btnClearDgv // @@ -476,7 +476,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx4.Controls.Add(this.chkFailDownProd); this.ucGroupBoxEx4.Controls.Add(this.btnPromotion); - this.ucGroupBoxEx4.Controls.Add(this.panelEx2); + this.ucGroupBoxEx4.Controls.Add(this.btnStopOp); this.ucGroupBoxEx4.Location = new System.Drawing.Point(518, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; this.ucGroupBoxEx4.Size = new System.Drawing.Size(904, 165); @@ -518,30 +518,30 @@ namespace TemuKJD.WXForms.ProductForms this.btnPromotion.Text = "批量同步商品"; this.btnPromotion.Click += new System.EventHandler(this.btnSync_Click); // - // panelEx2 + // btnStopOp // - 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(135, 61); - this.panelEx2.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(58, 25); - 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 = 805; - this.panelEx2.Text = "停止操作"; - this.panelEx2.Click += new System.EventHandler(this.btnStop_Click); + this.btnStopOp.CanvasColor = System.Drawing.SystemColors.Control; + this.btnStopOp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnStopOp.DisabledBackColor = System.Drawing.Color.Empty; + this.btnStopOp.Location = new System.Drawing.Point(135, 61); + this.btnStopOp.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnStopOp.Name = "btnStopOp"; + this.btnStopOp.Size = new System.Drawing.Size(58, 25); + this.btnStopOp.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopOp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopOp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopOp.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnStopOp.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopOp.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnStopOp.Style.GradientAngle = 90; + this.btnStopOp.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopOp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopOp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopOp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopOp.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnStopOp.TabIndex = 805; + this.btnStopOp.Text = "停止操作"; + this.btnStopOp.Click += new System.EventHandler(this.btnStop_Click); // // ucGroupBoxEx1 // @@ -942,6 +942,7 @@ namespace TemuKJD.WXForms.ProductForms this.colMessage}); this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvShop.Location = new System.Drawing.Point(4, 0); + this.dgvShop.MultiSelectCheckBox = true; this.dgvShop.Name = "dgvShop"; this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 25; @@ -1126,6 +1127,7 @@ namespace TemuKJD.WXForms.ProductForms this.colOpResult}); this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvSelectProduct.Location = new System.Drawing.Point(0, 0); + this.dgvSelectProduct.MultiSelectCheckBox = true; this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowTemplate.Height = 23; @@ -1517,7 +1519,7 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.Label label4; private System.Windows.Forms.TextBox txtFiltSaleNumMoreThan; private DevComponents.DotNetBar.PanelEx btnFiltSelectMoreThan; - private DevComponents.DotNetBar.PanelEx panelEx6; + private DevComponents.DotNetBar.PanelEx btnStopSearch; private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox txtFiltSaleNumLessThan; private DevComponents.DotNetBar.PanelEx btnFiltSelectLessThan; @@ -1550,7 +1552,7 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; private UserComponent.UcGroupBoxEx ucGroupBoxEx4; private DevComponents.DotNetBar.PanelEx btnPromotion; - private DevComponents.DotNetBar.PanelEx panelEx2; + private DevComponents.DotNetBar.PanelEx btnStopOp; private UserComponent.UcCheckBox chkFailDownProd; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs index f27f043..ca694ad 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs @@ -57,7 +57,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(); @@ -214,7 +214,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); @@ -324,28 +324,28 @@ namespace TemuKJD.WXForms.ProductForms // // pnlEmpty // - 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 = "pnlEmpty"; + 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 // @@ -1294,7 +1294,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/ProductForms/WXUserProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs index 5524ccb..8af1b54 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs @@ -420,7 +420,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat3.DropDownWidth = 1; this.cmbCat3.FormattingEnabled = true; this.cmbCat3.IntegralHeight = false; - this.cmbCat3.Location = new System.Drawing.Point(718, 5); + this.cmbCat3.Location = new System.Drawing.Point(718, 7); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; this.cmbCat3.Size = new System.Drawing.Size(146, 25); @@ -448,7 +448,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat2.DropDownWidth = 1; this.cmbCat2.FormattingEnabled = true; this.cmbCat2.IntegralHeight = false; - this.cmbCat2.Location = new System.Drawing.Point(515, 5); + this.cmbCat2.Location = new System.Drawing.Point(515, 7); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Size = new System.Drawing.Size(146, 25); @@ -476,7 +476,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat1.DropDownWidth = 1; this.cmbCat1.FormattingEnabled = true; this.cmbCat1.IntegralHeight = false; - this.cmbCat1.Location = new System.Drawing.Point(293, 7); + this.cmbCat1.Location = new System.Drawing.Point(293, 5); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; this.cmbCat1.Size = new System.Drawing.Size(146, 25); @@ -536,7 +536,7 @@ namespace TemuKJD.WXForms.ProductForms "安全+未校验", "安全商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(71, 42); + this.cmbWxSafe.Location = new System.Drawing.Point(71, 40); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Size = new System.Drawing.Size(146, 25); @@ -559,7 +559,7 @@ namespace TemuKJD.WXForms.ProductForms // this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbGroupFilter.FormattingEnabled = true; - this.cmbGroupFilter.Location = new System.Drawing.Point(938, 5); + this.cmbGroupFilter.Location = new System.Drawing.Point(938, 7); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Size = new System.Drawing.Size(146, 25); @@ -580,7 +580,7 @@ namespace TemuKJD.WXForms.ProductForms "机会商品", "以图搜品", "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(718, 40); + this.cmbSourceType.Location = new System.Drawing.Point(718, 42); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(146, 25); @@ -610,7 +610,7 @@ namespace TemuKJD.WXForms.ProductForms "", "是", "否"}); - this.cmbRelation.Location = new System.Drawing.Point(938, 40); + this.cmbRelation.Location = new System.Drawing.Point(938, 42); this.cmbRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbRelation.Name = "cmbRelation"; this.cmbRelation.Size = new System.Drawing.Size(146, 25); diff --git a/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressEditForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressEditForm.Designer.cs index 5538ad5..0731267 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressEditForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressEditForm.Designer.cs @@ -33,7 +33,7 @@ namespace TemuKJD.WXForms.ShopForms this.panel2 = new System.Windows.Forms.Panel(); this.lblStatus = new System.Windows.Forms.Label(); this.btnSave = new DevComponents.DotNetBar.PanelEx(); - this.pnlCancel = new DevComponents.DotNetBar.PanelEx(); + this.btnCancel = new DevComponents.DotNetBar.PanelEx(); this.label13 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.txtDetailInfo = new System.Windows.Forms.TextBox(); @@ -64,7 +64,7 @@ namespace TemuKJD.WXForms.ShopForms this.panel2.BackColor = System.Drawing.Color.White; this.panel2.Controls.Add(this.lblStatus); this.panel2.Controls.Add(this.btnSave); - this.panel2.Controls.Add(this.pnlCancel); + this.panel2.Controls.Add(this.btnCancel); this.panel2.Controls.Add(this.label13); this.panel2.Controls.Add(this.label10); this.panel2.Controls.Add(this.txtDetailInfo); @@ -128,29 +128,29 @@ namespace TemuKJD.WXForms.ShopForms this.btnSave.Text = "保存"; this.btnSave.Click += new System.EventHandler(this.btnSave_Click); // - // pnlCancel + // btnCancel // - this.pnlCancel.CanvasColor = System.Drawing.SystemColors.Control; - this.pnlCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlCancel.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlCancel.Location = new System.Drawing.Point(122, 393); - this.pnlCancel.Name = "pnlCancel"; - this.pnlCancel.Size = new System.Drawing.Size(52, 25); - this.pnlCancel.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pnlCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.pnlCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - 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.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.pnlCancel.Style.GradientAngle = 90; - this.pnlCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.pnlCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.pnlCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.pnlCancel.TabIndex = 809; - this.pnlCancel.Text = "取消"; - this.pnlCancel.Click += new System.EventHandler(this.pnlCancel_Click); + this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control; + this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnCancel.Location = new System.Drawing.Point(122, 393); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(52, 25); + this.btnCancel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + 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.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnCancel.Style.GradientAngle = 90; + this.btnCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + 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 = 809; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.pnlCancel_Click); // // label13 // @@ -418,7 +418,7 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.Label label39; private System.Windows.Forms.Label label40; private DevComponents.DotNetBar.PanelEx btnSave; - private DevComponents.DotNetBar.PanelEx pnlCancel; + private DevComponents.DotNetBar.PanelEx btnCancel; private System.Windows.Forms.Label lblStatus; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.Designer.cs index 4998972..9c5af84 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.Designer.cs @@ -47,7 +47,7 @@ this.label6 = new System.Windows.Forms.Label(); this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); @@ -200,7 +200,7 @@ this.tableLayoutPanel1.Controls.Add(this.label6, 6, 0); this.tableLayoutPanel1.Controls.Add(this.btnRefreshShop, 9, 0); this.tableLayoutPanel1.Controls.Add(this.btnSearch, 11, 0); - this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 13, 0); + this.tableLayoutPanel1.Controls.Add(this.btnEmpty, 13, 0); this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; @@ -352,31 +352,31 @@ this.btnSearch.Text = "筛选"; this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); // - // pnlEmpty + // btnEmpty // - this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - 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(797, 8); - this.pnlEmpty.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(61, 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 = 409; - this.pnlEmpty.Text = "清空条件"; - this.pnlEmpty.Click += new System.EventHandler(this.btnEmpty_Click); + this.btnEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + 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(797, 8); + this.btnEmpty.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.btnEmpty.Name = "btnEmpty"; + this.btnEmpty.Size = new System.Drawing.Size(61, 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 = 409; + this.btnEmpty.Text = "清空条件"; + this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click); // // splitContainer2 // @@ -569,7 +569,7 @@ this.statusBar.Size = new System.Drawing.Size(1394, 29); this.statusBar.TabIndex = 1; // - // WXShopAfterSaleAddressListForm + // WXShopDefaultAddressListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.White; @@ -579,7 +579,7 @@ this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.KeyPreview = true; this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Name = "WXShopAfterSaleAddressListForm"; + this.Name = "WXShopDefaultAddressListForm"; this.Text = "售后地址管理"; this.Load += new System.EventHandler(this.ShopListForm_Load); this.VisibleChanged += new System.EventHandler(this.ShopListForm_VisibleChanged); @@ -619,7 +619,7 @@ private System.Windows.Forms.TextBox txtShopId; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label4; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty; private UserComponent.UcComboBoxMutiSelect cmbNotes; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private DevComponents.DotNetBar.PanelEx btnSearch; diff --git a/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs index ac752a5..7ef4e6f 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs @@ -47,7 +47,7 @@ this.txtShopName = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.cmbSubAccount = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); this.label5 = new System.Windows.Forms.Label(); @@ -59,8 +59,6 @@ this.pbLoading = new System.Windows.Forms.PictureBox(); this.btnImport = new TemuKJD.UserControls.ButtonEx(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.chkAutoDrag = new System.Windows.Forms.CheckBox(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -89,6 +87,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(); @@ -269,7 +269,7 @@ this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0); this.tableLayoutPanel1.Controls.Add(this.label4, 4, 0); this.tableLayoutPanel1.Controls.Add(this.btnRefreshShop, 11, 0); - this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 15, 0); + this.tableLayoutPanel1.Controls.Add(this.btnEmpty, 15, 0); this.tableLayoutPanel1.Controls.Add(this.btnSearch, 13, 0); this.tableLayoutPanel1.Controls.Add(this.cmbSubAccount, 9, 0); this.tableLayoutPanel1.Controls.Add(this.label5, 8, 0); @@ -289,7 +289,7 @@ this.cmbGroup.DropDownWidth = 1; this.cmbGroup.FormattingEnabled = true; this.cmbGroup.IntegralHeight = false; - this.cmbGroup.Location = new System.Drawing.Point(385, 8); + this.cmbGroup.Location = new System.Drawing.Point(385, 5); this.cmbGroup.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4); this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(74, 25); @@ -315,7 +315,7 @@ this.cmbNotes.DropDownWidth = 1; this.cmbNotes.FormattingEnabled = true; this.cmbNotes.IntegralHeight = false; - this.cmbNotes.Location = new System.Drawing.Point(276, 8); + this.cmbNotes.Location = new System.Drawing.Point(276, 5); this.cmbNotes.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4); this.cmbNotes.Name = "cmbNotes"; this.cmbNotes.Size = new System.Drawing.Size(74, 25); @@ -388,31 +388,31 @@ this.btnRefreshShop.Text = "刷新店铺"; this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshCookie_Click); // - // pnlEmpty + // btnEmpty // - this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - 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(706, 8); - this.pnlEmpty.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(60, 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 = 409; - this.pnlEmpty.Text = "清空条件"; - this.pnlEmpty.Click += new System.EventHandler(this.btnEmpty_Click); + this.btnEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + 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(706, 8); + this.btnEmpty.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.btnEmpty.Name = "btnEmpty"; + this.btnEmpty.Size = new System.Drawing.Size(60, 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 = 409; + this.btnEmpty.Text = "清空条件"; + this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click); // // btnSearch // @@ -448,7 +448,7 @@ this.cmbSubAccount.DropDownWidth = 1; this.cmbSubAccount.FormattingEnabled = true; this.cmbSubAccount.IntegralHeight = false; - this.cmbSubAccount.Location = new System.Drawing.Point(506, 8); + this.cmbSubAccount.Location = new System.Drawing.Point(506, 5); this.cmbSubAccount.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4); this.cmbSubAccount.Name = "cmbSubAccount"; this.cmbSubAccount.Size = new System.Drawing.Size(74, 25); @@ -639,31 +639,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(1238, 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(1394, 29); - this.statusBar.TabIndex = 1; - // // colSelect // this.colSelect.FillWeight = 26F; @@ -894,6 +869,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(1238, 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(1394, 29); + this.statusBar.TabIndex = 1; + // // WXShopListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -950,7 +950,7 @@ private System.Windows.Forms.TextBox txtShopId; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label4; - private DevComponents.DotNetBar.PanelEx pnlEmpty; + private DevComponents.DotNetBar.PanelEx btnEmpty; private UserComponent.UcComboBoxMutiSelect cmbNotes; public UserControls.ButtonEx btnOpenOrder; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; diff --git a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs index e50c082..75ed4f6 100644 --- a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs @@ -38,60 +38,59 @@ namespace TemuKJD.WXForms.ShopForms this.label18 = new System.Windows.Forms.Label(); this.txtFilterShopName = new System.Windows.Forms.TextBox(); this.label19 = new System.Windows.Forms.Label(); - this.pnlClear = new DevComponents.DotNetBar.PanelEx(); + this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.btnGetSelect = new DevComponents.DotNetBar.PanelEx(); - this.pnlFliter = new DevComponents.DotNetBar.PanelEx(); + this.btnFliter = new DevComponents.DotNetBar.PanelEx(); this.btnSetColumn = new DevComponents.DotNetBar.PanelEx(); this.btnGetNotGet = new DevComponents.DotNetBar.PanelEx(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.label17 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.lblPayRefund30 = new System.Windows.Forms.Label(); - this.lblPayRefund7 = new System.Windows.Forms.Label(); - this.lblPayRefund = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.lblOrderNum = new System.Windows.Forms.Label(); - this.lblPayCnt30 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.lblPayCnt7 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.lblPayRefund1 = new System.Windows.Forms.Label(); + this.label22 = new System.Windows.Forms.Label(); + this.lblPayCnt1 = new System.Windows.Forms.Label(); + this.label21 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.lblPayCnt = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.lblDepositBalance = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.lblPendingAmount = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.lblAvailableAmount = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.lblTotalAmount = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.lblPunish = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.lblAfterSaleAll = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.lblWaybillError = new System.Windows.Forms.Label(); + this.lblOrderNum = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.lblPayRefund30 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.lblPayRefund7 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); this.lblPay30 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.lblPay7 = new System.Windows.Forms.Label(); + this.label20 = new System.Windows.Forms.Label(); + this.lblPay1 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.lblPay = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); - this.lblAvailableAmount = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.lblPunish = new System.Windows.Forms.Label(); - this.lblAfterSaleAll = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.lblWaybillError = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.lblPendingAmount = new System.Windows.Forms.Label(); - this.lblDepositBalance = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.lblTotalAmount = new System.Windows.Forms.Label(); + this.lblPayCnt30 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.lblPayCnt7 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.lblPayRefund = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.panel1 = new System.Windows.Forms.Panel(); this.btnClose = new DevComponents.DotNetBar.PanelEx(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.label20 = new System.Windows.Forms.Label(); - this.lblPay1 = new System.Windows.Forms.Label(); - this.label21 = new System.Windows.Forms.Label(); - this.lblPayCnt1 = new System.Windows.Forms.Label(); - this.label22 = new System.Windows.Forms.Label(); - this.lblPayRefund1 = new System.Windows.Forms.Label(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDetail = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -122,6 +121,7 @@ namespace TemuKJD.WXForms.ShopForms this.colAvailableAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPendingAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDepositBalance = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -170,9 +170,9 @@ namespace TemuKJD.WXForms.ShopForms this.ucGroupBoxEx3.Controls.Add(this.label18); this.ucGroupBoxEx3.Controls.Add(this.txtFilterShopName); this.ucGroupBoxEx3.Controls.Add(this.label19); - this.ucGroupBoxEx3.Controls.Add(this.pnlClear); + this.ucGroupBoxEx3.Controls.Add(this.btnClear); this.ucGroupBoxEx3.Controls.Add(this.btnGetSelect); - this.ucGroupBoxEx3.Controls.Add(this.pnlFliter); + this.ucGroupBoxEx3.Controls.Add(this.btnFliter); this.ucGroupBoxEx3.Controls.Add(this.btnSetColumn); this.ucGroupBoxEx3.Controls.Add(this.btnGetNotGet); this.ucGroupBoxEx3.Location = new System.Drawing.Point(1002, 2); @@ -224,30 +224,30 @@ namespace TemuKJD.WXForms.ShopForms this.label19.TabIndex = 834; this.label19.Text = "名称"; // - // pnlClear + // btnClear // - this.pnlClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pnlClear.CanvasColor = System.Drawing.SystemColors.Control; - this.pnlClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlClear.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlClear.Location = new System.Drawing.Point(180, 49); - this.pnlClear.Name = "pnlClear"; - this.pnlClear.Size = new System.Drawing.Size(35, 25); - this.pnlClear.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pnlClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.pnlClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.pnlClear.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.pnlClear.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlClear.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.pnlClear.Style.GradientAngle = 90; - this.pnlClear.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.pnlClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.pnlClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.pnlClear.TabIndex = 815; - this.pnlClear.Text = "还原"; - this.pnlClear.Click += new System.EventHandler(this.pnlClear_Click); + this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnClear.CanvasColor = System.Drawing.SystemColors.Control; + this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClear.Location = new System.Drawing.Point(180, 49); + this.btnClear.Name = "btnClear"; + this.btnClear.Size = new System.Drawing.Size(35, 25); + this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnClear.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnClear.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnClear.Style.GradientAngle = 90; + this.btnClear.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.TabIndex = 815; + this.btnClear.Text = "还原"; + this.btnClear.Click += new System.EventHandler(this.pnlClear_Click); // // btnGetSelect // @@ -274,30 +274,30 @@ namespace TemuKJD.WXForms.ShopForms this.btnGetSelect.Text = "查询选中"; this.btnGetSelect.Click += new System.EventHandler(this.btnGetSelect_Click); // - // pnlFliter + // btnFliter // - this.pnlFliter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pnlFliter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlFliter.Cursor = System.Windows.Forms.Cursors.Hand; - this.pnlFliter.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlFliter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.pnlFliter.Location = new System.Drawing.Point(180, 21); - this.pnlFliter.Name = "pnlFliter"; - this.pnlFliter.Size = new System.Drawing.Size(35, 25); - this.pnlFliter.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pnlFliter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlFliter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlFliter.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.pnlFliter.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.pnlFliter.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.pnlFliter.Style.ForeColor.Color = System.Drawing.Color.White; - this.pnlFliter.Style.GradientAngle = 90; - this.pnlFliter.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.pnlFliter.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.pnlFliter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.pnlFliter.TabIndex = 435; - this.pnlFliter.Text = "过滤"; - this.pnlFliter.Click += new System.EventHandler(this.pnlFliter_Click); + this.btnFliter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnFliter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnFliter.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnFliter.DisabledBackColor = System.Drawing.Color.Empty; + this.btnFliter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnFliter.Location = new System.Drawing.Point(180, 21); + this.btnFliter.Name = "btnFliter"; + this.btnFliter.Size = new System.Drawing.Size(35, 25); + this.btnFliter.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnFliter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFliter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFliter.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnFliter.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnFliter.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnFliter.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnFliter.Style.GradientAngle = 90; + this.btnFliter.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnFliter.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFliter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFliter.TabIndex = 435; + this.btnFliter.Text = "过滤"; + this.btnFliter.Click += new System.EventHandler(this.pnlFliter_Click); // // btnSetColumn // @@ -430,137 +430,49 @@ namespace TemuKJD.WXForms.ShopForms this.tableLayoutPanel1.Size = new System.Drawing.Size(957, 115); this.tableLayoutPanel1.TabIndex = 435; // - // label17 + // lblPayRefund1 // - this.label17.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label17.AutoSize = true; - this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label17.Location = new System.Drawing.Point(573, 60); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(80, 17); - this.label17.TabIndex = 25; - this.label17.Text = "货款金额总和"; + this.lblPayRefund1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPayRefund1.AutoSize = true; + this.lblPayRefund1.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblPayRefund1.Location = new System.Drawing.Point(858, 30); + this.lblPayRefund1.Name = "lblPayRefund1"; + this.lblPayRefund1.Size = new System.Drawing.Size(18, 20); + this.lblPayRefund1.TabIndex = 20; + this.lblPayRefund1.Text = "0"; // - // label16 + // label22 // - this.label16.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label16.AutoSize = true; - this.label16.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label16.Location = new System.Drawing.Point(98, 57); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(82, 23); - this.label16.TabIndex = 24; - this.label16.Text = "近30日退款金额"; + this.label22.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label22.AutoSize = true; + this.label22.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label22.Location = new System.Drawing.Point(858, 3); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(80, 17); + this.label22.TabIndex = 16; + this.label22.Text = "昨日退款金额"; // - // label15 + // lblPayCnt1 // - this.label15.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label15.AutoSize = true; - this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label15.Location = new System.Drawing.Point(3, 60); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(87, 17); - this.label15.TabIndex = 23; - this.label15.Text = "近7日退款金额"; + this.lblPayCnt1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPayCnt1.AutoSize = true; + this.lblPayCnt1.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblPayCnt1.Location = new System.Drawing.Point(98, 30); + this.lblPayCnt1.Name = "lblPayCnt1"; + this.lblPayCnt1.Size = new System.Drawing.Size(18, 20); + this.lblPayCnt1.TabIndex = 16; + this.lblPayCnt1.Text = "0"; // - // lblPayRefund30 + // label21 // - this.lblPayRefund30.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPayRefund30.AutoSize = true; - this.lblPayRefund30.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayRefund30.Location = new System.Drawing.Point(98, 87); - this.lblPayRefund30.Name = "lblPayRefund30"; - this.lblPayRefund30.Size = new System.Drawing.Size(18, 20); - this.lblPayRefund30.TabIndex = 21; - this.lblPayRefund30.Text = "0"; - // - // lblPayRefund7 - // - this.lblPayRefund7.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPayRefund7.AutoSize = true; - this.lblPayRefund7.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayRefund7.Location = new System.Drawing.Point(3, 87); - this.lblPayRefund7.Name = "lblPayRefund7"; - this.lblPayRefund7.Size = new System.Drawing.Size(18, 20); - this.lblPayRefund7.TabIndex = 20; - this.lblPayRefund7.Text = "0"; - // - // lblPayRefund - // - this.lblPayRefund.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPayRefund.AutoSize = true; - this.lblPayRefund.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayRefund.Location = new System.Drawing.Point(763, 30); - this.lblPayRefund.Name = "lblPayRefund"; - this.lblPayRefund.Size = new System.Drawing.Size(18, 20); - this.lblPayRefund.TabIndex = 19; - this.lblPayRefund.Text = "0"; - // - // label13 - // - this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label13.AutoSize = true; - this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label13.Location = new System.Drawing.Point(763, 3); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(80, 17); - this.label13.TabIndex = 15; - this.label13.Text = "今日退款金额"; - // - // lblOrderNum - // - this.lblOrderNum.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblOrderNum.AutoSize = true; - this.lblOrderNum.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblOrderNum.Location = new System.Drawing.Point(193, 87); - this.lblOrderNum.Name = "lblOrderNum"; - this.lblOrderNum.Size = new System.Drawing.Size(18, 20); - this.lblOrderNum.TabIndex = 22; - this.lblOrderNum.Text = "0"; - // - // lblPayCnt30 - // - this.lblPayCnt30.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPayCnt30.AutoSize = true; - this.lblPayCnt30.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayCnt30.Location = new System.Drawing.Point(288, 30); - this.lblPayCnt30.Name = "lblPayCnt30"; - this.lblPayCnt30.Size = new System.Drawing.Size(18, 20); - this.lblPayCnt30.TabIndex = 16; - this.lblPayCnt30.Text = "0"; - // - // label12 - // - this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label12.AutoSize = true; - this.label12.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label12.Location = new System.Drawing.Point(668, 0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(82, 23); - this.label12.TabIndex = 8; - this.label12.Text = "近30日成交金额"; - // - // lblPayCnt7 - // - this.lblPayCnt7.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPayCnt7.AutoSize = true; - this.lblPayCnt7.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayCnt7.Location = new System.Drawing.Point(193, 30); - this.lblPayCnt7.Name = "lblPayCnt7"; - this.lblPayCnt7.Size = new System.Drawing.Size(18, 20); - this.lblPayCnt7.TabIndex = 15; - this.lblPayCnt7.Text = "0"; - // - // label2 - // - this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label2.AutoSize = true; - this.label2.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label2.Location = new System.Drawing.Point(193, 3); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(63, 17); - this.label2.TabIndex = 7; - this.label2.Text = "近7日订单"; + this.label21.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label21.AutoSize = true; + this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label21.Location = new System.Drawing.Point(98, 3); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(56, 17); + this.label21.TabIndex = 15; + this.label21.Text = "昨日订单"; // // label1 // @@ -584,6 +496,237 @@ namespace TemuKJD.WXForms.ShopForms this.lblPayCnt.TabIndex = 14; this.lblPayCnt.Text = "0"; // + // label6 + // + this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label6.AutoSize = true; + this.label6.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label6.Location = new System.Drawing.Point(858, 60); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(92, 17); + this.label6.TabIndex = 11; + this.label6.Text = "保证金金额总和"; + // + // lblDepositBalance + // + this.lblDepositBalance.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblDepositBalance.AutoSize = true; + this.lblDepositBalance.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblDepositBalance.Location = new System.Drawing.Point(858, 87); + this.lblDepositBalance.Name = "lblDepositBalance"; + this.lblDepositBalance.Size = new System.Drawing.Size(18, 20); + this.lblDepositBalance.TabIndex = 15; + this.lblDepositBalance.Text = "0"; + // + // label8 + // + this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label8.AutoSize = true; + this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label8.Location = new System.Drawing.Point(763, 57); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(80, 23); + this.label8.TabIndex = 13; + this.label8.Text = "待结算金额总和"; + // + // lblPendingAmount + // + this.lblPendingAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPendingAmount.AutoSize = true; + this.lblPendingAmount.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblPendingAmount.Location = new System.Drawing.Point(763, 87); + this.lblPendingAmount.Name = "lblPendingAmount"; + this.lblPendingAmount.Size = new System.Drawing.Size(18, 20); + this.lblPendingAmount.TabIndex = 15; + this.lblPendingAmount.Text = "0"; + // + // label7 + // + this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label7.AutoSize = true; + this.label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label7.Location = new System.Drawing.Point(668, 57); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(80, 23); + this.label7.TabIndex = 12; + this.label7.Text = "可提现金额总和"; + // + // lblAvailableAmount + // + this.lblAvailableAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblAvailableAmount.AutoSize = true; + this.lblAvailableAmount.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblAvailableAmount.Location = new System.Drawing.Point(668, 87); + this.lblAvailableAmount.Name = "lblAvailableAmount"; + this.lblAvailableAmount.Size = new System.Drawing.Size(18, 20); + this.lblAvailableAmount.TabIndex = 15; + this.lblAvailableAmount.Text = "0"; + // + // label17 + // + this.label17.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label17.AutoSize = true; + this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label17.Location = new System.Drawing.Point(573, 60); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(80, 17); + this.label17.TabIndex = 25; + this.label17.Text = "货款金额总和"; + // + // lblTotalAmount + // + this.lblTotalAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblTotalAmount.AutoSize = true; + this.lblTotalAmount.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblTotalAmount.Location = new System.Drawing.Point(573, 87); + this.lblTotalAmount.Name = "lblTotalAmount"; + this.lblTotalAmount.Size = new System.Drawing.Size(18, 20); + this.lblTotalAmount.TabIndex = 26; + this.lblTotalAmount.Text = "0"; + // + // label5 + // + this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label5.AutoSize = true; + this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label5.Location = new System.Drawing.Point(478, 60); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(56, 17); + this.label5.TabIndex = 10; + this.label5.Text = "店铺违规"; + // + // lblPunish + // + this.lblPunish.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPunish.AutoSize = true; + this.lblPunish.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblPunish.Location = new System.Drawing.Point(478, 87); + this.lblPunish.Name = "lblPunish"; + this.lblPunish.Size = new System.Drawing.Size(18, 20); + this.lblPunish.TabIndex = 15; + this.lblPunish.Text = "0"; + // + // label4 + // + this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label4.AutoSize = true; + this.label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label4.Location = new System.Drawing.Point(383, 60); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(32, 17); + this.label4.TabIndex = 9; + this.label4.Text = "售后"; + // + // lblAfterSaleAll + // + this.lblAfterSaleAll.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblAfterSaleAll.AutoSize = true; + this.lblAfterSaleAll.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblAfterSaleAll.Location = new System.Drawing.Point(383, 87); + this.lblAfterSaleAll.Name = "lblAfterSaleAll"; + this.lblAfterSaleAll.Size = new System.Drawing.Size(18, 20); + this.lblAfterSaleAll.TabIndex = 15; + this.lblAfterSaleAll.Text = "0"; + // + // label3 + // + this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label3.AutoSize = true; + this.label3.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label3.Location = new System.Drawing.Point(288, 60); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(56, 17); + this.label3.TabIndex = 8; + this.label3.Text = "物流异常"; + // + // lblWaybillError + // + this.lblWaybillError.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblWaybillError.AutoSize = true; + this.lblWaybillError.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblWaybillError.Location = new System.Drawing.Point(288, 87); + this.lblWaybillError.Name = "lblWaybillError"; + this.lblWaybillError.Size = new System.Drawing.Size(18, 20); + this.lblWaybillError.TabIndex = 15; + this.lblWaybillError.Text = "0"; + // + // lblOrderNum + // + this.lblOrderNum.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblOrderNum.AutoSize = true; + this.lblOrderNum.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblOrderNum.Location = new System.Drawing.Point(193, 87); + this.lblOrderNum.Name = "lblOrderNum"; + this.lblOrderNum.Size = new System.Drawing.Size(18, 20); + this.lblOrderNum.TabIndex = 22; + this.lblOrderNum.Text = "0"; + // + // label14 + // + this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label14.AutoSize = true; + this.label14.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label14.Location = new System.Drawing.Point(193, 60); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(44, 17); + this.label14.TabIndex = 20; + this.label14.Text = "待发货"; + // + // label16 + // + this.label16.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label16.AutoSize = true; + this.label16.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label16.Location = new System.Drawing.Point(98, 57); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(82, 23); + this.label16.TabIndex = 24; + this.label16.Text = "近30日退款金额"; + // + // lblPayRefund30 + // + this.lblPayRefund30.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPayRefund30.AutoSize = true; + this.lblPayRefund30.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblPayRefund30.Location = new System.Drawing.Point(98, 87); + this.lblPayRefund30.Name = "lblPayRefund30"; + this.lblPayRefund30.Size = new System.Drawing.Size(18, 20); + this.lblPayRefund30.TabIndex = 21; + this.lblPayRefund30.Text = "0"; + // + // label15 + // + this.label15.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label15.AutoSize = true; + this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label15.Location = new System.Drawing.Point(3, 60); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(87, 17); + this.label15.TabIndex = 23; + this.label15.Text = "近7日退款金额"; + // + // lblPayRefund7 + // + this.lblPayRefund7.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPayRefund7.AutoSize = true; + this.lblPayRefund7.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblPayRefund7.Location = new System.Drawing.Point(3, 87); + this.lblPayRefund7.Name = "lblPayRefund7"; + this.lblPayRefund7.Size = new System.Drawing.Size(18, 20); + this.lblPayRefund7.TabIndex = 20; + this.lblPayRefund7.Text = "0"; + // + // label12 + // + this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label12.AutoSize = true; + this.label12.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label12.Location = new System.Drawing.Point(668, 0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(82, 23); + this.label12.TabIndex = 8; + this.label12.Text = "近30日成交金额"; + // // lblPay30 // this.lblPay30.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -617,6 +760,28 @@ namespace TemuKJD.WXForms.ShopForms this.lblPay7.TabIndex = 17; this.lblPay7.Text = "0"; // + // label20 + // + this.label20.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label20.AutoSize = true; + this.label20.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label20.Location = new System.Drawing.Point(478, 3); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(80, 17); + this.label20.TabIndex = 14; + this.label20.Text = "昨日成交金额"; + // + // lblPay1 + // + this.lblPay1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPay1.AutoSize = true; + this.lblPay1.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblPay1.Location = new System.Drawing.Point(478, 30); + this.lblPay1.Name = "lblPay1"; + this.lblPay1.Size = new System.Drawing.Size(18, 20); + this.lblPay1.TabIndex = 18; + this.lblPay1.Text = "0"; + // // label9 // this.label9.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -650,159 +815,60 @@ namespace TemuKJD.WXForms.ShopForms this.label11.TabIndex = 14; this.label11.Text = "近30日订单"; // - // lblAvailableAmount + // lblPayCnt30 // - this.lblAvailableAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblAvailableAmount.AutoSize = true; - this.lblAvailableAmount.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblAvailableAmount.Location = new System.Drawing.Point(668, 87); - this.lblAvailableAmount.Name = "lblAvailableAmount"; - this.lblAvailableAmount.Size = new System.Drawing.Size(18, 20); - this.lblAvailableAmount.TabIndex = 15; - this.lblAvailableAmount.Text = "0"; + this.lblPayCnt30.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPayCnt30.AutoSize = true; + this.lblPayCnt30.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblPayCnt30.Location = new System.Drawing.Point(288, 30); + this.lblPayCnt30.Name = "lblPayCnt30"; + this.lblPayCnt30.Size = new System.Drawing.Size(18, 20); + this.lblPayCnt30.TabIndex = 16; + this.lblPayCnt30.Text = "0"; // - // label7 + // label2 // - this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label7.AutoSize = true; - this.label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label7.Location = new System.Drawing.Point(668, 57); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(80, 23); - this.label7.TabIndex = 12; - this.label7.Text = "可提现金额总和"; + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label2.AutoSize = true; + this.label2.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label2.Location = new System.Drawing.Point(193, 3); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(63, 17); + this.label2.TabIndex = 7; + this.label2.Text = "近7日订单"; // - // label5 + // lblPayCnt7 // - this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label5.AutoSize = true; - this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label5.Location = new System.Drawing.Point(478, 60); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(56, 17); - this.label5.TabIndex = 10; - this.label5.Text = "店铺违规"; + this.lblPayCnt7.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPayCnt7.AutoSize = true; + this.lblPayCnt7.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblPayCnt7.Location = new System.Drawing.Point(193, 30); + this.lblPayCnt7.Name = "lblPayCnt7"; + this.lblPayCnt7.Size = new System.Drawing.Size(18, 20); + this.lblPayCnt7.TabIndex = 15; + this.lblPayCnt7.Text = "0"; // - // lblPunish + // label13 // - this.lblPunish.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPunish.AutoSize = true; - this.lblPunish.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPunish.Location = new System.Drawing.Point(478, 87); - this.lblPunish.Name = "lblPunish"; - this.lblPunish.Size = new System.Drawing.Size(18, 20); - this.lblPunish.TabIndex = 15; - this.lblPunish.Text = "0"; + this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label13.AutoSize = true; + this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.label13.Location = new System.Drawing.Point(763, 3); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(80, 17); + this.label13.TabIndex = 15; + this.label13.Text = "今日退款金额"; // - // lblAfterSaleAll + // lblPayRefund // - this.lblAfterSaleAll.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblAfterSaleAll.AutoSize = true; - this.lblAfterSaleAll.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblAfterSaleAll.Location = new System.Drawing.Point(383, 87); - this.lblAfterSaleAll.Name = "lblAfterSaleAll"; - this.lblAfterSaleAll.Size = new System.Drawing.Size(18, 20); - this.lblAfterSaleAll.TabIndex = 15; - this.lblAfterSaleAll.Text = "0"; - // - // label4 - // - this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label4.AutoSize = true; - this.label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label4.Location = new System.Drawing.Point(383, 60); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(32, 17); - this.label4.TabIndex = 9; - this.label4.Text = "售后"; - // - // lblWaybillError - // - this.lblWaybillError.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblWaybillError.AutoSize = true; - this.lblWaybillError.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblWaybillError.Location = new System.Drawing.Point(288, 87); - this.lblWaybillError.Name = "lblWaybillError"; - this.lblWaybillError.Size = new System.Drawing.Size(18, 20); - this.lblWaybillError.TabIndex = 15; - this.lblWaybillError.Text = "0"; - // - // label3 - // - this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label3.AutoSize = true; - this.label3.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label3.Location = new System.Drawing.Point(288, 60); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(56, 17); - this.label3.TabIndex = 8; - this.label3.Text = "物流异常"; - // - // label14 - // - this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label14.AutoSize = true; - this.label14.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label14.Location = new System.Drawing.Point(193, 60); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(44, 17); - this.label14.TabIndex = 20; - this.label14.Text = "待发货"; - // - // label8 - // - this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label8.AutoSize = true; - this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label8.Location = new System.Drawing.Point(763, 57); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(80, 23); - this.label8.TabIndex = 13; - this.label8.Text = "待结算金额总和"; - // - // lblPendingAmount - // - this.lblPendingAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPendingAmount.AutoSize = true; - this.lblPendingAmount.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPendingAmount.Location = new System.Drawing.Point(763, 87); - this.lblPendingAmount.Name = "lblPendingAmount"; - this.lblPendingAmount.Size = new System.Drawing.Size(18, 20); - this.lblPendingAmount.TabIndex = 15; - this.lblPendingAmount.Text = "0"; - // - // lblDepositBalance - // - this.lblDepositBalance.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblDepositBalance.AutoSize = true; - this.lblDepositBalance.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblDepositBalance.Location = new System.Drawing.Point(858, 87); - this.lblDepositBalance.Name = "lblDepositBalance"; - this.lblDepositBalance.Size = new System.Drawing.Size(18, 20); - this.lblDepositBalance.TabIndex = 15; - this.lblDepositBalance.Text = "0"; - // - // label6 - // - this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label6.AutoSize = true; - this.label6.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label6.Location = new System.Drawing.Point(858, 60); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(92, 17); - this.label6.TabIndex = 11; - this.label6.Text = "保证金金额总和"; - // - // lblTotalAmount - // - this.lblTotalAmount.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblTotalAmount.AutoSize = true; - this.lblTotalAmount.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblTotalAmount.Location = new System.Drawing.Point(573, 87); - this.lblTotalAmount.Name = "lblTotalAmount"; - this.lblTotalAmount.Size = new System.Drawing.Size(18, 20); - this.lblTotalAmount.TabIndex = 26; - this.lblTotalAmount.Text = "0"; + this.lblPayRefund.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPayRefund.AutoSize = true; + this.lblPayRefund.Font = new System.Drawing.Font("微软雅黑", 11F); + this.lblPayRefund.Location = new System.Drawing.Point(763, 30); + this.lblPayRefund.Name = "lblPayRefund"; + this.lblPayRefund.Size = new System.Drawing.Size(18, 20); + this.lblPayRefund.TabIndex = 19; + this.lblPayRefund.Text = "0"; // // splitContainer2 // @@ -948,83 +1014,6 @@ namespace TemuKJD.WXForms.ShopForms this.dgvShop.TabIndex = 5; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // - // 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(1235, 26); - this.statusBar.TabIndex = 1; - // - // label20 - // - this.label20.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label20.AutoSize = true; - this.label20.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label20.Location = new System.Drawing.Point(478, 3); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(80, 17); - this.label20.TabIndex = 14; - this.label20.Text = "昨日成交金额"; - // - // lblPay1 - // - this.lblPay1.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPay1.AutoSize = true; - this.lblPay1.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPay1.Location = new System.Drawing.Point(478, 30); - this.lblPay1.Name = "lblPay1"; - this.lblPay1.Size = new System.Drawing.Size(18, 20); - this.lblPay1.TabIndex = 18; - this.lblPay1.Text = "0"; - // - // label21 - // - this.label21.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label21.AutoSize = true; - this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label21.Location = new System.Drawing.Point(98, 3); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(56, 17); - this.label21.TabIndex = 15; - this.label21.Text = "昨日订单"; - // - // lblPayCnt1 - // - this.lblPayCnt1.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPayCnt1.AutoSize = true; - this.lblPayCnt1.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayCnt1.Location = new System.Drawing.Point(98, 30); - this.lblPayCnt1.Name = "lblPayCnt1"; - this.lblPayCnt1.Size = new System.Drawing.Size(18, 20); - this.lblPayCnt1.TabIndex = 16; - this.lblPayCnt1.Text = "0"; - // - // label22 - // - this.label22.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label22.AutoSize = true; - this.label22.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.label22.Location = new System.Drawing.Point(858, 3); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(80, 17); - this.label22.TabIndex = 16; - this.label22.Text = "昨日退款金额"; - // - // lblPayRefund1 - // - this.lblPayRefund1.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPayRefund1.AutoSize = true; - this.lblPayRefund1.Font = new System.Drawing.Font("微软雅黑", 11F); - this.lblPayRefund1.Location = new System.Drawing.Point(858, 30); - this.lblPayRefund1.Name = "lblPayRefund1"; - this.lblPayRefund1.Size = new System.Drawing.Size(18, 20); - this.lblPayRefund1.TabIndex = 20; - this.lblPayRefund1.Text = "0"; - // // colSelect // this.colSelect.FillWeight = 22F; @@ -1254,6 +1243,17 @@ namespace TemuKJD.WXForms.ShopForms this.colDepositBalance.ReadOnly = true; this.colDepositBalance.Width = 60; // + // 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(1235, 26); + this.statusBar.TabIndex = 1; + // // WxShopStatisticsForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1289,8 +1289,8 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.SplitContainer splitContainer1; private UserComponent.UcGroupBoxEx ucGroupBoxEx3; - private DevComponents.DotNetBar.PanelEx pnlClear; - private DevComponents.DotNetBar.PanelEx pnlFliter; + private DevComponents.DotNetBar.PanelEx btnClear; + private DevComponents.DotNetBar.PanelEx btnFliter; private DevComponents.DotNetBar.PanelEx btnSetColumn; private DevComponents.DotNetBar.PanelEx btnGetNotGet; private DevComponents.DotNetBar.PanelEx btnGetSelect; diff --git a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.Designer.cs b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.Designer.cs index 73d9930..f539e80 100644 --- a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.Designer.cs +++ b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.Designer.cs @@ -40,12 +40,12 @@ namespace TemuKJD.WXForms.TalkForms 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 dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BuyerOrderListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.chkAutoAfterSale = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -81,34 +81,35 @@ namespace TemuKJD.WXForms.TalkForms this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); - this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); + this.btnClose = new DevComponents.DotNetBar.PanelEx(); this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.panel2 = new System.Windows.Forms.Panel(); + this.txtOrderMsgFilter = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.txtOrderSnFilter = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); this.dgvAfterSale = new TemuKJD.UserComponent.DataGridViewEx(); + this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colRBuyerId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colRBuyerName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colRAfterSaleId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colRPddOrderSn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colROrderDate = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn(); + this.colRGoodsInfo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colROrderAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colRRefundAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colRStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colRMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewLinkColumn1 = new System.Windows.Forms.DataGridViewLinkColumn(); this.btnExchange = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.lblMsg = new System.Windows.Forms.Label(); this.btnRestore = new DevComponents.DotNetBar.PanelEx(); - this.txtOrderSnFilter = new System.Windows.Forms.TextBox(); this.btnFilterOrder = new DevComponents.DotNetBar.PanelEx(); this.dgvPddBuyerOrder = new TemuKJD.UserComponent.DataGridViewEx(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.btnFilter = new DevComponents.DotNetBar.PanelEx(); - this.label3 = new System.Windows.Forms.Label(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); - this.label17 = new System.Windows.Forms.Label(); - this.txtMobile = new System.Windows.Forms.TextBox(); - this.txtOrderSn = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.dtpStartTime = new System.Windows.Forms.DateTimePicker(); - this.label14 = new System.Windows.Forms.Label(); - this.dtpEndTime = new System.Windows.Forms.DateTimePicker(); - this.chkOnlyShowCurrentShop = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.lblCurrentShop = new System.Windows.Forms.Label(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.label1 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colOBuyerId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOBuyerName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -124,21 +125,20 @@ namespace TemuKJD.WXForms.TalkForms this.colOMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSend = new System.Windows.Forms.DataGridViewLinkColumn(); this.colAfterSale = new System.Windows.Forms.DataGridViewLinkColumn(); - this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colRBuyerId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colRBuyerName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colRAfterSaleId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colRPddOrderSn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colROrderDate = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn(); - this.colRGoodsInfo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colROrderAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colRRefundAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colRStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colRMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewLinkColumn1 = new System.Windows.Forms.DataGridViewLinkColumn(); - this.txtOrderMsgFilter = new System.Windows.Forms.TextBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.btnFilter = new DevComponents.DotNetBar.PanelEx(); + this.label3 = new System.Windows.Forms.Label(); + this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.label17 = new System.Windows.Forms.Label(); + this.txtMobile = new System.Windows.Forms.TextBox(); + this.txtOrderSn = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.dtpStartTime = new System.Windows.Forms.DateTimePicker(); + this.label14 = new System.Windows.Forms.Label(); + this.dtpEndTime = new System.Windows.Forms.DateTimePicker(); + this.chkOnlyShowCurrentShop = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.lblCurrentShop = new System.Windows.Forms.Label(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -639,7 +639,7 @@ namespace TemuKJD.WXForms.TalkForms // // splitContainer3.Panel2 // - this.splitContainer3.Panel2.Controls.Add(this.panelEx3); + this.splitContainer3.Panel2.Controls.Add(this.btnClose); this.splitContainer3.Panel2.Controls.Add(this.panelEx2); this.splitContainer3.Panel2.Controls.Add(this.panelEx1); this.splitContainer3.Panel2.Controls.Add(this.panel2); @@ -650,30 +650,30 @@ namespace TemuKJD.WXForms.TalkForms this.splitContainer3.SplitterDistance = 364; this.splitContainer3.TabIndex = 8; // - // panelEx3 + // btnClose // - this.panelEx3.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx3.Cursor = System.Windows.Forms.Cursors.Hand; - this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.panelEx3.Location = new System.Drawing.Point(501, 638); - this.panelEx3.Name = "panelEx3"; - this.panelEx3.Size = new System.Drawing.Size(61, 20); - this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx3.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.panelEx3.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.panelEx3.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.panelEx3.Style.ForeColor.Color = System.Drawing.Color.White; - this.panelEx3.Style.GradientAngle = 90; - this.panelEx3.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx3.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.panelEx3.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.panelEx3.TabIndex = 898; - this.panelEx3.Text = "折叠"; - this.panelEx3.Click += new System.EventHandler(this.btnClose_Click); + this.btnClose.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.btnClose.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClose.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClose.Location = new System.Drawing.Point(501, 637); + this.btnClose.Name = "btnClose"; + this.btnClose.Size = new System.Drawing.Size(61, 20); + this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClose.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClose.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClose.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnClose.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnClose.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnClose.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnClose.Style.GradientAngle = 90; + this.btnClose.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClose.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClose.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClose.TabIndex = 898; + this.btnClose.Text = "折叠"; + this.btnClose.Click += new System.EventHandler(this.btnClose_Click); // // panelEx2 // @@ -746,6 +746,38 @@ namespace TemuKJD.WXForms.TalkForms this.panel2.Size = new System.Drawing.Size(1062, 345); this.panel2.TabIndex = 908; // + // txtOrderMsgFilter + // + this.txtOrderMsgFilter.Location = new System.Drawing.Point(425, 3); + this.txtOrderMsgFilter.Name = "txtOrderMsgFilter"; + this.txtOrderMsgFilter.Size = new System.Drawing.Size(242, 23); + this.txtOrderMsgFilter.TabIndex = 953; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(372, 6); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(56, 17); + this.label4.TabIndex = 952; + this.label4.Text = "订单信息"; + // + // txtOrderSnFilter + // + this.txtOrderSnFilter.Location = new System.Drawing.Point(124, 3); + this.txtOrderSnFilter.Name = "txtOrderSnFilter"; + this.txtOrderSnFilter.Size = new System.Drawing.Size(242, 23); + this.txtOrderSnFilter.TabIndex = 903; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(1, 6); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(126, 17); + this.label1.TabIndex = 951; + this.label1.Text = "买手/订单号/售后单号"; + // // dgvAfterSale // this.dgvAfterSale.AllowUserToAddRows = false; @@ -792,6 +824,113 @@ namespace TemuKJD.WXForms.TalkForms this.dgvAfterSale.TabIndex = 941; this.dgvAfterSale.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAfterSale_CellContentClick); // + // dataGridViewCheckBoxColumn2 + // + this.dataGridViewCheckBoxColumn2.FillWeight = 26F; + this.dataGridViewCheckBoxColumn2.HeaderText = "选"; + this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2"; + this.dataGridViewCheckBoxColumn2.ReadOnly = true; + this.dataGridViewCheckBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewCheckBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colRBuyerId + // + this.colRBuyerId.HeaderText = "买手编号"; + this.colRBuyerId.Name = "colRBuyerId"; + this.colRBuyerId.ReadOnly = true; + this.colRBuyerId.Visible = false; + // + // colRBuyerName + // + this.colRBuyerName.FillWeight = 80F; + this.colRBuyerName.HeaderText = "买手名称"; + this.colRBuyerName.Name = "colRBuyerName"; + this.colRBuyerName.ReadOnly = true; + // + // colRAfterSaleId + // + this.colRAfterSaleId.FillWeight = 80F; + this.colRAfterSaleId.HeaderText = "售后单号"; + this.colRAfterSaleId.Name = "colRAfterSaleId"; + this.colRAfterSaleId.ReadOnly = true; + // + // colRPddOrderSn + // + this.colRPddOrderSn.HeaderText = "拍单订单号"; + this.colRPddOrderSn.Name = "colRPddOrderSn"; + this.colRPddOrderSn.ReadOnly = true; + // + // colROrderDate + // + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colROrderDate.DefaultCellStyle = dataGridViewCellStyle11; + this.colROrderDate.FillWeight = 70F; + this.colROrderDate.HeaderText = "拍单日期"; + this.colROrderDate.Name = "colROrderDate"; + this.colROrderDate.ReadOnly = true; + // + // dataGridViewTextBoxColumn5 + // + this.dataGridViewTextBoxColumn5.HeaderText = "图片路径"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.ReadOnly = true; + this.dataGridViewTextBoxColumn5.Visible = false; + // + // dataGridViewImageColumn1 + // + this.dataGridViewImageColumn1.FillWeight = 35F; + this.dataGridViewImageColumn1.HeaderText = "订单图片"; + this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1"; + this.dataGridViewImageColumn1.ReadOnly = true; + this.dataGridViewImageColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewImageColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.dataGridViewImageColumn1.Visible = false; + // + // colRGoodsInfo + // + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colRGoodsInfo.DefaultCellStyle = dataGridViewCellStyle12; + this.colRGoodsInfo.FillWeight = 140F; + this.colRGoodsInfo.HeaderText = "商品信息"; + this.colRGoodsInfo.Name = "colRGoodsInfo"; + this.colRGoodsInfo.ReadOnly = true; + // + // colROrderAmount + // + this.colROrderAmount.FillWeight = 50F; + this.colROrderAmount.HeaderText = "付款金额"; + this.colROrderAmount.Name = "colROrderAmount"; + this.colROrderAmount.ReadOnly = true; + // + // colRRefundAmount + // + this.colRRefundAmount.FillWeight = 50F; + this.colRRefundAmount.HeaderText = "退款金额"; + this.colRRefundAmount.Name = "colRRefundAmount"; + this.colRRefundAmount.ReadOnly = true; + // + // colRStatus + // + this.colRStatus.HeaderText = "售后状态"; + this.colRStatus.Name = "colRStatus"; + this.colRStatus.ReadOnly = true; + // + // colRMsg + // + this.colRMsg.HeaderText = "订单信息"; + this.colRMsg.Name = "colRMsg"; + this.colRMsg.ReadOnly = true; + // + // dataGridViewLinkColumn1 + // + this.dataGridViewLinkColumn1.FillWeight = 50F; + this.dataGridViewLinkColumn1.HeaderText = "发送"; + this.dataGridViewLinkColumn1.Name = "dataGridViewLinkColumn1"; + this.dataGridViewLinkColumn1.ReadOnly = true; + this.dataGridViewLinkColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewLinkColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // // btnExchange // this.btnExchange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -862,13 +1001,6 @@ namespace TemuKJD.WXForms.TalkForms this.btnRestore.Text = "还原"; this.btnRestore.Click += new System.EventHandler(this.btnRestore_Click); // - // txtOrderSnFilter - // - this.txtOrderSnFilter.Location = new System.Drawing.Point(124, 3); - this.txtOrderSnFilter.Name = "txtOrderSnFilter"; - this.txtOrderSnFilter.Size = new System.Drawing.Size(242, 23); - this.txtOrderSnFilter.TabIndex = 903; - // // btnFilterOrder // this.btnFilterOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -940,6 +1072,119 @@ namespace TemuKJD.WXForms.TalkForms this.dgvPddBuyerOrder.TabIndex = 886; this.dgvPddBuyerOrder.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPddBuyerOrder_CellContentClick); // + // dataGridViewCheckBoxColumn1 + // + this.dataGridViewCheckBoxColumn1.FillWeight = 26F; + this.dataGridViewCheckBoxColumn1.HeaderText = "选"; + this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1"; + this.dataGridViewCheckBoxColumn1.ReadOnly = true; + this.dataGridViewCheckBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewCheckBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colOBuyerId + // + this.colOBuyerId.HeaderText = "买手编号"; + this.colOBuyerId.Name = "colOBuyerId"; + this.colOBuyerId.ReadOnly = true; + this.colOBuyerId.Visible = false; + // + // colOBuyerName + // + this.colOBuyerName.FillWeight = 80F; + this.colOBuyerName.HeaderText = "买手名称"; + this.colOBuyerName.Name = "colOBuyerName"; + this.colOBuyerName.ReadOnly = true; + // + // colOPddOrderSn + // + this.colOPddOrderSn.HeaderText = "拍单订单号"; + this.colOPddOrderSn.Name = "colOPddOrderSn"; + this.colOPddOrderSn.ReadOnly = true; + // + // colOOrderTime + // + dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colOOrderTime.DefaultCellStyle = dataGridViewCellStyle15; + this.colOOrderTime.FillWeight = 70F; + this.colOOrderTime.HeaderText = "拍单时间"; + this.colOOrderTime.Name = "colOOrderTime"; + this.colOOrderTime.ReadOnly = true; + // + // colOImgUrl + // + this.colOImgUrl.HeaderText = "图片路径"; + this.colOImgUrl.Name = "colOImgUrl"; + this.colOImgUrl.ReadOnly = true; + this.colOImgUrl.Visible = false; + // + // colOImg + // + this.colOImg.FillWeight = 35F; + this.colOImg.HeaderText = "订单图片"; + this.colOImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colOImg.Name = "colOImg"; + this.colOImg.ReadOnly = true; + this.colOImg.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colOImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colOImg.Visible = false; + // + // colOGoodsInfo + // + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colOGoodsInfo.DefaultCellStyle = dataGridViewCellStyle16; + this.colOGoodsInfo.FillWeight = 140F; + this.colOGoodsInfo.HeaderText = "商品信息"; + this.colOGoodsInfo.Name = "colOGoodsInfo"; + this.colOGoodsInfo.ReadOnly = true; + // + // colOOrderAmount + // + this.colOOrderAmount.FillWeight = 50F; + this.colOOrderAmount.HeaderText = "金额"; + this.colOOrderAmount.Name = "colOOrderAmount"; + this.colOOrderAmount.ReadOnly = true; + // + // colOStatus + // + this.colOStatus.HeaderText = "订单状态"; + this.colOStatus.Name = "colOStatus"; + this.colOStatus.ReadOnly = true; + // + // colOExpressName + // + this.colOExpressName.HeaderText = "物流名称"; + this.colOExpressName.Name = "colOExpressName"; + this.colOExpressName.ReadOnly = true; + // + // colOExpressId + // + this.colOExpressId.HeaderText = "物流单号"; + this.colOExpressId.Name = "colOExpressId"; + this.colOExpressId.ReadOnly = true; + // + // colOMsg + // + this.colOMsg.HeaderText = "订单信息"; + this.colOMsg.Name = "colOMsg"; + this.colOMsg.ReadOnly = true; + // + // colSend + // + this.colSend.FillWeight = 50F; + this.colSend.HeaderText = "发送"; + this.colSend.Name = "colSend"; + this.colSend.ReadOnly = true; + this.colSend.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSend.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colAfterSale + // + this.colAfterSale.FillWeight = 50F; + this.colAfterSale.HeaderText = "退货"; + this.colAfterSale.Name = "colAfterSale"; + this.colAfterSale.ReadOnly = true; + this.colAfterSale.Visible = false; + // // tableLayoutPanel1 // this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -1153,251 +1398,6 @@ namespace TemuKJD.WXForms.TalkForms this.statusBar.Size = new System.Drawing.Size(1438, 25); this.statusBar.TabIndex = 5; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(1, 6); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(126, 17); - this.label1.TabIndex = 951; - this.label1.Text = "买手/订单号/售后单号"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(372, 6); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(56, 17); - this.label4.TabIndex = 952; - this.label4.Text = "订单信息"; - // - // dataGridViewCheckBoxColumn1 - // - this.dataGridViewCheckBoxColumn1.FillWeight = 26F; - this.dataGridViewCheckBoxColumn1.HeaderText = "选"; - this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1"; - this.dataGridViewCheckBoxColumn1.ReadOnly = true; - this.dataGridViewCheckBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewCheckBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // colOBuyerId - // - this.colOBuyerId.HeaderText = "买手编号"; - this.colOBuyerId.Name = "colOBuyerId"; - this.colOBuyerId.ReadOnly = true; - this.colOBuyerId.Visible = false; - // - // colOBuyerName - // - this.colOBuyerName.FillWeight = 80F; - this.colOBuyerName.HeaderText = "买手名称"; - this.colOBuyerName.Name = "colOBuyerName"; - this.colOBuyerName.ReadOnly = true; - // - // colOPddOrderSn - // - this.colOPddOrderSn.HeaderText = "拍单订单号"; - this.colOPddOrderSn.Name = "colOPddOrderSn"; - this.colOPddOrderSn.ReadOnly = true; - // - // colOOrderTime - // - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colOOrderTime.DefaultCellStyle = dataGridViewCellStyle15; - this.colOOrderTime.FillWeight = 70F; - this.colOOrderTime.HeaderText = "拍单时间"; - this.colOOrderTime.Name = "colOOrderTime"; - this.colOOrderTime.ReadOnly = true; - // - // colOImgUrl - // - this.colOImgUrl.HeaderText = "图片路径"; - this.colOImgUrl.Name = "colOImgUrl"; - this.colOImgUrl.ReadOnly = true; - this.colOImgUrl.Visible = false; - // - // colOImg - // - this.colOImg.FillWeight = 35F; - this.colOImg.HeaderText = "订单图片"; - this.colOImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colOImg.Name = "colOImg"; - this.colOImg.ReadOnly = true; - this.colOImg.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colOImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colOImg.Visible = false; - // - // colOGoodsInfo - // - dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colOGoodsInfo.DefaultCellStyle = dataGridViewCellStyle16; - this.colOGoodsInfo.FillWeight = 140F; - this.colOGoodsInfo.HeaderText = "商品信息"; - this.colOGoodsInfo.Name = "colOGoodsInfo"; - this.colOGoodsInfo.ReadOnly = true; - // - // colOOrderAmount - // - this.colOOrderAmount.FillWeight = 50F; - this.colOOrderAmount.HeaderText = "金额"; - this.colOOrderAmount.Name = "colOOrderAmount"; - this.colOOrderAmount.ReadOnly = true; - // - // colOStatus - // - this.colOStatus.HeaderText = "订单状态"; - this.colOStatus.Name = "colOStatus"; - this.colOStatus.ReadOnly = true; - // - // colOExpressName - // - this.colOExpressName.HeaderText = "物流名称"; - this.colOExpressName.Name = "colOExpressName"; - this.colOExpressName.ReadOnly = true; - // - // colOExpressId - // - this.colOExpressId.HeaderText = "物流单号"; - this.colOExpressId.Name = "colOExpressId"; - this.colOExpressId.ReadOnly = true; - // - // colOMsg - // - this.colOMsg.HeaderText = "订单信息"; - this.colOMsg.Name = "colOMsg"; - this.colOMsg.ReadOnly = true; - // - // colSend - // - this.colSend.FillWeight = 50F; - this.colSend.HeaderText = "发送"; - this.colSend.Name = "colSend"; - this.colSend.ReadOnly = true; - this.colSend.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colSend.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // colAfterSale - // - this.colAfterSale.FillWeight = 50F; - this.colAfterSale.HeaderText = "退货"; - this.colAfterSale.Name = "colAfterSale"; - this.colAfterSale.ReadOnly = true; - this.colAfterSale.Visible = false; - // - // dataGridViewCheckBoxColumn2 - // - this.dataGridViewCheckBoxColumn2.FillWeight = 26F; - this.dataGridViewCheckBoxColumn2.HeaderText = "选"; - this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2"; - this.dataGridViewCheckBoxColumn2.ReadOnly = true; - this.dataGridViewCheckBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewCheckBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // colRBuyerId - // - this.colRBuyerId.HeaderText = "买手编号"; - this.colRBuyerId.Name = "colRBuyerId"; - this.colRBuyerId.ReadOnly = true; - this.colRBuyerId.Visible = false; - // - // colRBuyerName - // - this.colRBuyerName.FillWeight = 80F; - this.colRBuyerName.HeaderText = "买手名称"; - this.colRBuyerName.Name = "colRBuyerName"; - this.colRBuyerName.ReadOnly = true; - // - // colRAfterSaleId - // - this.colRAfterSaleId.FillWeight = 80F; - this.colRAfterSaleId.HeaderText = "售后单号"; - this.colRAfterSaleId.Name = "colRAfterSaleId"; - this.colRAfterSaleId.ReadOnly = true; - // - // colRPddOrderSn - // - this.colRPddOrderSn.HeaderText = "拍单订单号"; - this.colRPddOrderSn.Name = "colRPddOrderSn"; - this.colRPddOrderSn.ReadOnly = true; - // - // colROrderDate - // - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colROrderDate.DefaultCellStyle = dataGridViewCellStyle11; - this.colROrderDate.FillWeight = 70F; - this.colROrderDate.HeaderText = "拍单日期"; - this.colROrderDate.Name = "colROrderDate"; - this.colROrderDate.ReadOnly = true; - // - // dataGridViewTextBoxColumn5 - // - this.dataGridViewTextBoxColumn5.HeaderText = "图片路径"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.ReadOnly = true; - this.dataGridViewTextBoxColumn5.Visible = false; - // - // dataGridViewImageColumn1 - // - this.dataGridViewImageColumn1.FillWeight = 35F; - this.dataGridViewImageColumn1.HeaderText = "订单图片"; - this.dataGridViewImageColumn1.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1"; - this.dataGridViewImageColumn1.ReadOnly = true; - this.dataGridViewImageColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewImageColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.dataGridViewImageColumn1.Visible = false; - // - // colRGoodsInfo - // - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colRGoodsInfo.DefaultCellStyle = dataGridViewCellStyle12; - this.colRGoodsInfo.FillWeight = 140F; - this.colRGoodsInfo.HeaderText = "商品信息"; - this.colRGoodsInfo.Name = "colRGoodsInfo"; - this.colRGoodsInfo.ReadOnly = true; - // - // colROrderAmount - // - this.colROrderAmount.FillWeight = 50F; - this.colROrderAmount.HeaderText = "付款金额"; - this.colROrderAmount.Name = "colROrderAmount"; - this.colROrderAmount.ReadOnly = true; - // - // colRRefundAmount - // - this.colRRefundAmount.FillWeight = 50F; - this.colRRefundAmount.HeaderText = "退款金额"; - this.colRRefundAmount.Name = "colRRefundAmount"; - this.colRRefundAmount.ReadOnly = true; - // - // colRStatus - // - this.colRStatus.HeaderText = "售后状态"; - this.colRStatus.Name = "colRStatus"; - this.colRStatus.ReadOnly = true; - // - // colRMsg - // - this.colRMsg.HeaderText = "订单信息"; - this.colRMsg.Name = "colRMsg"; - this.colRMsg.ReadOnly = true; - // - // dataGridViewLinkColumn1 - // - this.dataGridViewLinkColumn1.FillWeight = 50F; - this.dataGridViewLinkColumn1.HeaderText = "发送"; - this.dataGridViewLinkColumn1.Name = "dataGridViewLinkColumn1"; - this.dataGridViewLinkColumn1.ReadOnly = true; - this.dataGridViewLinkColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewLinkColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // txtOrderMsgFilter - // - this.txtOrderMsgFilter.Location = new System.Drawing.Point(425, 3); - this.txtOrderMsgFilter.Name = "txtOrderMsgFilter"; - this.txtOrderMsgFilter.Size = new System.Drawing.Size(242, 23); - this.txtOrderMsgFilter.TabIndex = 953; - // // BuyerOrderListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1484,7 +1484,7 @@ namespace TemuKJD.WXForms.TalkForms private DevComponents.DotNetBar.PanelEx btnRefresh; private DevComponents.DotNetBar.PanelEx btnCheck; private UserComponent.DataGridViewEx dgvPddBuyerOrder; - private DevComponents.DotNetBar.PanelEx panelEx3; + private DevComponents.DotNetBar.PanelEx btnClose; private DevComponents.DotNetBar.PanelEx panelEx2; private DevComponents.DotNetBar.PanelEx panelEx1; private UserComponent.UcCheckBox chkPause; diff --git a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs index 789a882..a05031e 100644 --- a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs +++ b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs @@ -45,7 +45,7 @@ namespace TemuKJD.WXForms.TalkForms ConcurrentList lstPddBuyerOrderInfoLite { get; set; } = new ConcurrentList(); ConcurrentList lstPddBuyerAfterSaleInfoLite { get; set; } = new ConcurrentList(); public CancellationTokenSource cancellationTokenSource { get; set; } = new CancellationTokenSource(); - public ChromiumWebBrowser cefWebBrowser = null; + //public ChromiumWebBrowser cefWebBrowser = null; public BuyerOrderConfig buyerOrderConfig = new BuyerOrderConfig(); public DateTime nextGetOrderTime = DateTime.MinValue; public bool isLoadComplate = false; @@ -72,8 +72,6 @@ namespace TemuKJD.WXForms.TalkForms dgvAfterSale.Height = dgvPddBuyerOrder.Height; dgvAfterSale.SendToBack(); - InitCef(); - buyerOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig("pdd_buyer_order_config"); if (buyerOrderConfig == null) buyerOrderConfig = new BuyerOrderConfig(); @@ -101,6 +99,7 @@ namespace TemuKJD.WXForms.TalkForms { Thread.Sleep(500); } + InitCef(); ShowExistOrder(); while (isInitOrder || isInitAfterSale) @@ -136,34 +135,42 @@ namespace TemuKJD.WXForms.TalkForms void ShowExistOrder() { isInitOrder = true; - Task.Run(() => { - foreach(var order in lstPddBuyerOrderInfoLite) + //Task.Run(() => { + int index = 0; + foreach (var order in lstPddBuyerOrderInfoLite) + { + if (index % 100 == 0) + Thread.Sleep(1); + index++; + if (GlobalConfig.BuyerLoginList.Any(b => b.buyer_id == order.buyerId)) { - if (GlobalConfig.BuyerLoginList.Any(b => b.buyer_id == order.buyerId)) + Invoke(new Action(() => { - Invoke(new Action(() => - { - ShowOrder(order); - })); - } + ShowOrder(order); + })); } - isInitOrder = false; - }); + } + isInitOrder = false; + //}); isInitAfterSale = true; - Task.Run(() => { - foreach (var afterSale in lstPddBuyerAfterSaleInfoLite) + //Task.Run(() => { + //int index = 0; + foreach (var afterSale in lstPddBuyerAfterSaleInfoLite) + { + if (index % 100 == 0) + Thread.Sleep(1); + index++; + if (GlobalConfig.BuyerLoginList.Any(b => b.buyer_id == afterSale.buyerId)) { - if (GlobalConfig.BuyerLoginList.Any(b => b.buyer_id == afterSale.buyerId)) + Invoke(new Action(() => { - Invoke(new Action(() => - { - ShowAfterSale(afterSale); - })); - } + ShowAfterSale(lstPddBuyerAfterSaleInfoLite.FirstOrDefault(a => a.orderSn == afterSale.orderSn)); + })); } - isInitAfterSale = false; - }); + } + isInitAfterSale = false; + //}); } void ShowOrder(PddBuyerOrderInfoLite order) @@ -264,6 +271,11 @@ namespace TemuKJD.WXForms.TalkForms if (afterSale == null) return; + if (afterSale.orderSn == "260414-035525772830257") + { + + } + var row = dgvAfterSale.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colRPddOrderSn").ParseToString() == afterSale.orderSn); if (row == null) { @@ -337,20 +349,27 @@ namespace TemuKJD.WXForms.TalkForms private void InitCef() { - cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false); - CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal(); - resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete; - resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad; - cefWebBrowser.RequestHandler = new CustomRequestHandler(resourceRequestHandler); - var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow); - cefWebBrowser.LifeSpanHandler = lifeSapnHandler; - cefWebBrowser.KeyboardHandler = new KeyboardHandler(); - cefWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd; - cefWebBrowser.AddressChanged += CefWebBrowser_AddressChanged; - cefWebBrowser.LoadError += CefWebBrowser_LoadError; - cefWebBrowser.Dock = DockStyle.Fill; - cefWebBrowser.SendToBack(); - splitContainer3.Panel2.Controls.Add(cefWebBrowser); + foreach (var buyer in GlobalConfig.BuyerLoginList) + { + Thread.Sleep(1); + Invoke(new Action(() => + { + buyer.browser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false); + CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal(); + resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete; + resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad; + buyer.browser.RequestHandler = new CustomRequestHandler(resourceRequestHandler); + var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow); + buyer.browser.LifeSpanHandler = lifeSapnHandler; + buyer.browser.KeyboardHandler = new KeyboardHandler(); + buyer.browser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd; + buyer.browser.AddressChanged += CefWebBrowser_AddressChanged; + buyer.browser.LoadError += CefWebBrowser_LoadError; + buyer.browser.Dock = DockStyle.Fill; + buyer.browser.SendToBack(); + splitContainer3.Panel2.Controls.Add(buyer.browser); + })); + } //js绑定C#对象 //PDDShopBrowserObject shopObj = new PDDShopBrowserObject(); @@ -450,7 +469,6 @@ namespace TemuKJD.WXForms.TalkForms Task.Run(() => { CefReadBuyerAfterSale(url1, data1); - }); } @@ -599,6 +617,11 @@ namespace TemuKJD.WXForms.TalkForms if (buyer == null) return; + if (data.Contains("260414-035525772830257")) + { + + } + if (data.Contains("\"listItemVOList\":[]") || data.Contains("\"hasNextQuery\":false")) { Invoke(new Action(() => @@ -623,20 +646,35 @@ namespace TemuKJD.WXForms.TalkForms var list = JsonHelper.DeserializeJsonToList(JsonHelper.JObjectParse(data)["result"]["listItemVOList"].ParseToString()); foreach (var af in list) { + if (af.orderSn == "260414-035525772830257") + { + + } + af.buyerId = buyer.buyer_id; af.buyerName = buyer.buyer_name; + bool isUpdate = false; PddBuyerAfterSaleInfoLite afterSale = null; if (!this.lstPddBuyerAfterSaleInfoLite.Any(or => or.afterSalesId == af.afterSalesId)) { + isUpdate = true; afterSale = af; lstPddBuyerAfterSaleInfoLite.Add(afterSale); } else { afterSale = this.lstPddBuyerAfterSaleInfoLite.FirstOrDefault(aft => aft.afterSalesId == af.afterSalesId); - if (JsonHelper.SerializeObject(afterSale) != JsonHelper.SerializeObject(af)) + var afterSaleTmp = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(afterSale)); + afterSaleTmp.sendStatus = ""; + afterSaleTmp.listItemMallVO = new ListItemMallVO(); + var afTmp = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(af)); + afTmp.listItemMallVO = new ListItemMallVO(); + //"{\"buyerId\":\"9303896321\",\"buyerName\":\"吴镇强\",\"sendStatus\":\"\",\"orderSn\":\"260419-166104962590257\",\"orderDate\":260419,\"afterSalesId\":20379701953346,\"listItemExtraVO\":{\"navToDetailPageUrl\":\"/complaints_new_detail.html?after_sales_id=20379701953346&order_sn=260419-166104962590257\"},\"listItemMallVO\":{\"mallName\":\"喜悦时光婚礼屋\",\"mallLogo\":\"http://t16img.yangkeduo.com/pdd_ims/img_check/v2/F3E6FF9A2BE40120200112155401880/9632a275dd974e9aa2e138cde6d0adf9.png\",\"mallTagLink\":null,\"pddRoute\":\"mall_page.html?mall_id=938572084&msn=zjdvupyguflkhtcgugbw3hbdpm_axbuy&_sop_rcto=YWLr7xLhO9bbI6L9S-r6ALQbTuXTx_3fIjo\"},\"listItemStatusVO\":{\"statusText\":\"待用户发货\"},\"listItemGoodsVO\":{\"goodsImage\":\"https://img.pddpic.com/mms-material-img/2026-03-21/005e0aa1-ad62-4db3-8018-00490ddc0a82.jpeg\",\"goodsName\":\"2026高级可折叠蚊帐家用卧室懒人免安装加高加厚加密学生宿舍蚊帐\",\"spec\":\"免安装/可折叠/网眼加密【可爱粉】+固定器,适用双人1.8m床【190*160*80】\",\"goodsPrice\":1890,\"goodsNumber\":1,\"richTextList\":null},\"listItemAmountVO\":{\"orderAmountTitle\":\"实付:\",\"orderAmount\":1890,\"payLaterAmountTitle\":null,\"payLaterAmount\":null,\"refundAmountTitle\":\"退款金额:\",\"refundAmount\":1890,\"refundAmountText\":null,\"useCoupon\":false}}" + //"{\"buyerId\":\"9303896321\",\"buyerName\":\"吴镇强\",\"sendStatus\":\"\",\"orderSn\":\"260419-166104962590257\",\"orderDate\":260419,\"afterSalesId\":20379701953346,\"listItemExtraVO\":{\"navToDetailPageUrl\":\"/complaints_new_detail.html?after_sales_id=20379701953346&order_sn=260419-166104962590257\"},\"listItemMallVO\":{\"mallName\":\"喜悦时光婚礼屋\",\"mallLogo\":\"http://t16img.yangkeduo.com/pdd_ims/img_check/v2/F3E6FF9A2BE40120200112155401880/9632a275dd974e9aa2e138cde6d0adf9.png\",\"mallTagLink\":null,\"pddRoute\":\"mall_page.html?mall_id=938572084&msn=zjdvupyguflkhtcgugbw3hbdpm_axbuy&_sop_rcto=YWKCoxwbKDHFAaL9S-r6ALQbTuXTx_3fIjo\"},\"listItemStatusVO\":{\"statusText\":\"待用户发货\"},\"listItemGoodsVO\":{\"goodsImage\":\"https://img.pddpic.com/mms-material-img/2026-03-21/005e0aa1-ad62-4db3-8018-00490ddc0a82.jpeg\",\"goodsName\":\"2026高级可折叠蚊帐家用卧室懒人免安装加高加厚加密学生宿舍蚊帐\",\"spec\":\"免安装/可折叠/网眼加密【可爱粉】+固定器,适用双人1.8m床【190*160*80】\",\"goodsPrice\":1890,\"goodsNumber\":1,\"richTextList\":null},\"listItemAmountVO\":{\"orderAmountTitle\":\"实付:\",\"orderAmount\":1890,\"payLaterAmountTitle\":null,\"payLaterAmount\":null,\"refundAmountTitle\":\"退款金额:\",\"refundAmount\":1890,\"refundAmountText\":null,\"useCoupon\":false}}" + if (JsonHelper.SerializeObject(afterSaleTmp) != JsonHelper.SerializeObject(afTmp)) { + isUpdate = true; //order = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(o)); afterSale.afterSalesId = af.afterSalesId; afterSale.listItemAmountVO = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(af.listItemAmountVO)); @@ -654,18 +692,21 @@ namespace TemuKJD.WXForms.TalkForms lblMsg.Text = buyer.buyer_name + " 近2个月售后列表获取完成,退出自动滑动 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); })); currentReadBuyer = ""; - return; + //return; } - Task.Run(() => + if (isUpdate) { - SendAfterSaleE57(afterSale); - }); + Task.Run(() => + { + SendAfterSaleE57(lstPddBuyerAfterSaleInfoLite.FirstOrDefault(a => a.orderSn == afterSale.orderSn)); + }); - Invoke(new Action(() => - { - ShowAfterSale(afterSale); - })); + Invoke(new Action(() => + { + ShowAfterSale(lstPddBuyerAfterSaleInfoLite.FirstOrDefault(a => a.orderSn == afterSale.orderSn)); + })); + } } NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_after_sale_list", lstPddBuyerAfterSaleInfoLite); } @@ -790,7 +831,7 @@ namespace TemuKJD.WXForms.TalkForms if (row == null) { var rowIndex = this.dgvBuyer.Rows.Add( - selectIds.Contains(buyer.buyer_id), + true, buyer.buyer_id, buyer.buyer_name, buyer.buyer_nick, @@ -862,6 +903,11 @@ namespace TemuKJD.WXForms.TalkForms Task.Run(() => { + while (isInitOrder || isInitAfterSale) + { + Thread.Sleep(500); + } + currentReadBuyer = ""; foreach (var buyer in GlobalConfig.BuyerLoginList) @@ -872,25 +918,33 @@ namespace TemuKJD.WXForms.TalkForms if (buyer.status != "在线") continue; + var row = dgvBuyer.Rows.Cast().FirstOrDefault(r => r.Cells["colBuyerNick"].Value.ParseToString() == buyer.buyer_nick); + if (row == null || row.Cells["colSelect"].Value.ParseToBool() != true) + { + if (row != null) + Invoke(new Action(() => { row.Cells["colMessage"].Value = "未勾选买手号,跳过"; })); + continue; + } + try { - while (cefWebBrowser == null || !cefWebBrowser.IsBrowserInitialized || !cefWebBrowser.GetBrowser().MainFrame.IsValid) + while (buyer.browser == null || !buyer.browser.IsBrowserInitialized || !buyer.browser.GetBrowser().MainFrame.IsValid) { Thread.Sleep(1); } - CEFBrowser.DeleteCookie(cefWebBrowser.GetCookieManager(null)); + CEFBrowser.DeleteCookie(buyer.browser.GetCookieManager(null)); var cookieLst = JsonHelper.DeserializeJsonToList(buyer?.cookie); - var t = CEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), cefWebBrowser.GetCookieManager(null)); + var t = CEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), buyer.browser.GetCookieManager(null)); - cefWebBrowser.Load("https://mobile.yangkeduo.com/personal.html"); + buyer.browser.Load("https://mobile.yangkeduo.com/personal.html"); Thread.Sleep(Randomx.GetId(2000, 3000)); // 售后 string readBuyer = buyer.buyer_id; currentReadBuyer = buyer.buyer_id; - cefWebBrowser.Load("https://mobile.yangkeduo.com/complaint_list.html?refer_page_name=personal&refer_page_sn=10001&tab=all"); + buyer.browser.Load("https://mobile.yangkeduo.com/complaint_list.html?refer_page_name=personal&refer_page_sn=10001&tab=all"); Thread.Sleep(Randomx.GetId(2000, 3000)); int top = 0; @@ -899,6 +953,8 @@ namespace TemuKJD.WXForms.TalkForms if (cancellationTokenSource.IsCancellationRequested) break; + Invoke(new Action(() => { buyer.browser.BringToFront(); })); + top += Randomx.GetId(450, 600); Thread.Sleep(Randomx.GetId(100, 300)); @@ -914,19 +970,21 @@ namespace TemuKJD.WXForms.TalkForms });"; //var t1 = cefWebBrowser.GetMainFrame().EvaluateScriptAsync(jsStr); //t1.Wait(1000); - var client = cefWebBrowser.GetDevToolsClient(); + var client = buyer.browser.GetDevToolsClient(); if (client != null) { var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true); result.Wait(5000); } } + if (cancellationTokenSource.IsCancellationRequested) + break; Thread.Sleep(Randomx.GetId(2000, 3000)); // 待发货 readBuyer = buyer.buyer_id; currentReadBuyer = buyer.buyer_id; - cefWebBrowser.Load("https://mobile.yangkeduo.com/orders.html?type=2"); + buyer.browser.Load("https://mobile.yangkeduo.com/orders.html?type=2"); Thread.Sleep(Randomx.GetId(2000, 3000)); top = 0; @@ -935,6 +993,8 @@ namespace TemuKJD.WXForms.TalkForms if (cancellationTokenSource.IsCancellationRequested) break; + Invoke(new Action(() => { buyer.browser.BringToFront(); })); + top += Randomx.GetId(450, 600); Thread.Sleep(Randomx.GetId(100,300)); @@ -950,19 +1010,21 @@ namespace TemuKJD.WXForms.TalkForms });"; //var t1 = cefWebBrowser.GetMainFrame().EvaluateScriptAsync(jsStr); //t1.Wait(1000); - var client = cefWebBrowser.GetDevToolsClient(); + var client = buyer.browser.GetDevToolsClient(); if (client != null) { var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true); result.Wait(5000); } } + if (cancellationTokenSource.IsCancellationRequested) + break; Thread.Sleep(Randomx.GetId(2000, 3000)); // 已发货 readBuyer = buyer.buyer_id; currentReadBuyer = buyer.buyer_id; - cefWebBrowser.Load("https://mobile.yangkeduo.com/orders.html?type=3"); + buyer.browser.Load("https://mobile.yangkeduo.com/orders.html?type=3"); Thread.Sleep(Randomx.GetId(2000, 3000)); top = 0; @@ -971,6 +1033,8 @@ namespace TemuKJD.WXForms.TalkForms if (cancellationTokenSource.IsCancellationRequested) break; + Invoke(new Action(() => { buyer.browser.BringToFront(); })); + top += Randomx.GetId(450, 600); Thread.Sleep(Randomx.GetId(100, 300)); @@ -986,7 +1050,7 @@ namespace TemuKJD.WXForms.TalkForms });"; //var t1 = cefWebBrowser.GetMainFrame().EvaluateScriptAsync(jsStr); //t1.Wait(1000); - var client = cefWebBrowser.GetDevToolsClient(); + var client = buyer.browser.GetDevToolsClient(); if (client != null) { var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true); @@ -1135,24 +1199,28 @@ namespace TemuKJD.WXForms.TalkForms shopLoginForm.Show(); } break; - case "详情": - case "编辑/详情": - //PDDDBProdEditForm editForm = new PDDDBProdEditForm(dbProduct); - //if (BaseClass.MainPath != "binxixi") - //{ - // editForm.pnlSkuOption.Visible = false; - // editForm.txtProductName.ReadOnly = true; - // editForm.txtExtCode.ReadOnly = true; - // editForm.lblSkcId.Text = "仓库编码"; - //} - //editForm.ShowDialog(); - //dgvDbProduct.Rows[e.RowIndex].Cells["col_notes"].Value = dbProduct.notes; - //dgvDbProduct.Rows[e.RowIndex].Cells["col_ext_code"].Value = dbProduct.ext_code; - //dgvDbProduct.Rows[e.RowIndex].Cells["colHeadWords"].Value = dbProduct.head_words; - //dgvDbProduct.Rows[e.RowIndex].Cells["colEndWords"].Value = dbProduct.end_words; - //dgvDbProduct.Rows[e.RowIndex].Cells["colFissionWords"].Value = dbProduct.fission_words; - //dgvDbProduct.Rows[e.RowIndex].Cells["col_product_name"].Value = dbProduct.product_name; - //dgvDbProduct.Rows[e.RowIndex].Cells["colSkuReplaceImgUrl"].Value = dbProduct.sku_img_replace_url; + case "买手昵称": + Task.Run(() => + { + try + { + while (buyer.browser == null || !buyer.browser.IsBrowserInitialized || !buyer.browser.GetBrowser().MainFrame.IsValid) + { + Thread.Sleep(1); + } + if (!buyer.browser.Address.ParseToString().Contains("yangkeduo.com")) + { + CEFBrowser.DeleteCookie(buyer.browser.GetCookieManager(null)); + var cookieLst = JsonHelper.DeserializeJsonToList(buyer?.cookie); + var t = CEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), buyer.browser.GetCookieManager(null)); + buyer.browser.Load("https://mobile.yangkeduo.com/personal.html"); + } + Invoke(new Action(()=> { buyer.browser?.BringToFront(); })); + } + catch + { } + Thread.Sleep(Randomx.GetId(2000, 3000)); + }); break; case "": case "全选": @@ -1685,9 +1753,9 @@ namespace TemuKJD.WXForms.TalkForms { panel2.Visible = !panel2.Visible; if (panel2.Visible == false) - panelEx3.Text = "打开"; + btnClose.Text = "打开"; else - panelEx3.Text = "折叠"; + btnClose.Text = "折叠"; } private void panelEx1_Click(object sender, EventArgs e) diff --git a/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs b/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs index 90dc70b..14c2404 100644 --- a/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs +++ b/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs @@ -42,7 +42,7 @@ namespace TemuKJD.WXForms.TalkForms this.chkNotShowMessageWindow = new System.Windows.Forms.CheckBox(); this.cmbMessage = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); - this.pnlSet = new DevComponents.DotNetBar.PanelEx(); + this.btnSet = new DevComponents.DotNetBar.PanelEx(); this.line4 = new DevComponents.DotNetBar.Controls.Line(); this.chkIsAutoReply = new System.Windows.Forms.CheckBox(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); @@ -71,10 +71,10 @@ namespace TemuKJD.WXForms.TalkForms this.label4 = new System.Windows.Forms.Label(); this.btnRefreshAfterSale = new DevComponents.DotNetBar.PanelEx(); this.cmbFiltNotes = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); - this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.btnRestore = new DevComponents.DotNetBar.PanelEx(); this.txtFiltShopName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.btnFilterShop = new DevComponents.DotNetBar.PanelEx(); - this.pnlRefreshShop = new DevComponents.DotNetBar.PanelEx(); + this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.line1 = new DevComponents.DotNetBar.Controls.Line(); @@ -185,7 +185,7 @@ namespace TemuKJD.WXForms.TalkForms this.splitContainer2.Panel1.Controls.Add(this.chkNotShowMessageWindow); this.splitContainer2.Panel1.Controls.Add(this.cmbMessage); this.splitContainer2.Panel1.Controls.Add(this.label1); - this.splitContainer2.Panel1.Controls.Add(this.pnlSet); + this.splitContainer2.Panel1.Controls.Add(this.btnSet); this.splitContainer2.Panel1.Controls.Add(this.line4); this.splitContainer2.Panel1.Controls.Add(this.chkIsAutoReply); // @@ -223,6 +223,7 @@ namespace TemuKJD.WXForms.TalkForms this.btnChangeAddress.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; this.btnChangeAddress.Style.ForeColor.Color = System.Drawing.Color.White; this.btnChangeAddress.Style.GradientAngle = 90; + this.btnChangeAddress.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; this.btnChangeAddress.TabIndex = 223; this.btnChangeAddress.Text = "订单优化"; this.btnChangeAddress.Click += new System.EventHandler(this.btnChangeAddress_Click); @@ -245,6 +246,7 @@ namespace TemuKJD.WXForms.TalkForms this.btnMultiLogin.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; this.btnMultiLogin.Style.ForeColor.Color = System.Drawing.Color.White; this.btnMultiLogin.Style.GradientAngle = 90; + this.btnMultiLogin.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; this.btnMultiLogin.TabIndex = 213; this.btnMultiLogin.Text = "批量登录"; this.btnMultiLogin.Click += new System.EventHandler(this.btnMultiLogin_Click); @@ -306,26 +308,27 @@ namespace TemuKJD.WXForms.TalkForms this.label1.TabIndex = 197; this.label1.Text = "消息提示音:"; // - // pnlSet + // btnSet // - this.pnlSet.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlSet.Cursor = System.Windows.Forms.Cursors.Hand; - this.pnlSet.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlSet.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.pnlSet.Location = new System.Drawing.Point(102, 37); - this.pnlSet.Name = "pnlSet"; - this.pnlSet.Size = new System.Drawing.Size(88, 20); - this.pnlSet.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pnlSet.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlSet.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlSet.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.pnlSet.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.pnlSet.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.pnlSet.Style.ForeColor.Color = System.Drawing.Color.White; - this.pnlSet.Style.GradientAngle = 90; - this.pnlSet.TabIndex = 184; - this.pnlSet.Text = "自动回复设置"; - this.pnlSet.Click += new System.EventHandler(this.pnlSet_Click); + this.btnSet.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSet.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSet.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSet.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSet.Location = new System.Drawing.Point(102, 37); + this.btnSet.Name = "btnSet"; + this.btnSet.Size = new System.Drawing.Size(88, 20); + this.btnSet.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSet.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSet.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSet.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSet.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSet.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSet.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSet.Style.GradientAngle = 90; + this.btnSet.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSet.TabIndex = 184; + this.btnSet.Text = "自动回复设置"; + this.btnSet.Click += new System.EventHandler(this.pnlSet_Click); // // line4 // @@ -374,10 +377,10 @@ namespace TemuKJD.WXForms.TalkForms this.splitContainer4.Panel2.Controls.Add(this.label4); this.splitContainer4.Panel2.Controls.Add(this.btnRefreshAfterSale); this.splitContainer4.Panel2.Controls.Add(this.cmbFiltNotes); - this.splitContainer4.Panel2.Controls.Add(this.panelEx1); + this.splitContainer4.Panel2.Controls.Add(this.btnRestore); this.splitContainer4.Panel2.Controls.Add(this.txtFiltShopName); this.splitContainer4.Panel2.Controls.Add(this.btnFilterShop); - this.splitContainer4.Panel2.Controls.Add(this.pnlRefreshShop); + this.splitContainer4.Panel2.Controls.Add(this.btnRefreshShop); this.splitContainer4.Panel2.Controls.Add(this.label2); this.splitContainer4.Panel2.Controls.Add(this.label3); this.splitContainer4.Panel2.Controls.Add(this.line1); @@ -686,30 +689,30 @@ namespace TemuKJD.WXForms.TalkForms this.cmbFiltNotes.TabIndex = 0; this.cmbFiltNotes.Text = "全部"; // - // panelEx1 + // btnRestore // - this.panelEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx1.Cursor = System.Windows.Forms.Cursors.Hand; - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.panelEx1.Location = new System.Drawing.Point(315, 41); - this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(53, 23); - this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.White; - this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.White; - this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.Style.ForeColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.Style.GradientAngle = 90; - this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.panelEx1.TabIndex = 207; - this.panelEx1.Text = "还 原"; - this.panelEx1.Click += new System.EventHandler(this.btnEmpty_Click); + this.btnRestore.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnRestore.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRestore.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRestore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRestore.Location = new System.Drawing.Point(315, 41); + this.btnRestore.Name = "btnRestore"; + this.btnRestore.Size = new System.Drawing.Size(53, 23); + this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestore.Style.BackColor1.Color = System.Drawing.Color.White; + this.btnRestore.Style.BackColor2.Color = System.Drawing.Color.White; + this.btnRestore.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnRestore.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestore.Style.ForeColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestore.Style.GradientAngle = 90; + this.btnRestore.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestore.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestore.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestore.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnRestore.TabIndex = 207; + this.btnRestore.Text = "还 原"; + this.btnRestore.Click += new System.EventHandler(this.btnEmpty_Click); // // txtFiltShopName // @@ -751,30 +754,30 @@ namespace TemuKJD.WXForms.TalkForms this.btnFilterShop.Text = "搜 索"; this.btnFilterShop.Click += new System.EventHandler(this.btnFilterShop_Click); // - // pnlRefreshShop + // btnRefreshShop // - this.pnlRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.pnlRefreshShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; - this.pnlRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.pnlRefreshShop.Location = new System.Drawing.Point(370, 41); - this.pnlRefreshShop.Name = "pnlRefreshShop"; - this.pnlRefreshShop.Size = new System.Drawing.Size(122, 23); - this.pnlRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pnlRefreshShop.Style.BackColor1.Color = System.Drawing.Color.White; - this.pnlRefreshShop.Style.BackColor2.Color = System.Drawing.Color.White; - this.pnlRefreshShop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.pnlRefreshShop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlRefreshShop.Style.ForeColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlRefreshShop.Style.GradientAngle = 90; - this.pnlRefreshShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.pnlRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlRefreshShop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.pnlRefreshShop.TabIndex = 188; - this.pnlRefreshShop.Text = "刷 新 店 铺"; - this.pnlRefreshShop.Click += new System.EventHandler(this.pnlRefresh_Click); + this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnRefreshShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRefreshShop.Location = new System.Drawing.Point(370, 41); + this.btnRefreshShop.Name = "btnRefreshShop"; + this.btnRefreshShop.Size = new System.Drawing.Size(122, 23); + this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.White; + this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.White; + this.btnRefreshShop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnRefreshShop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshShop.Style.ForeColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshShop.Style.GradientAngle = 90; + this.btnRefreshShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshShop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnRefreshShop.TabIndex = 188; + this.btnRefreshShop.Text = "刷 新 店 铺"; + this.btnRefreshShop.Click += new System.EventHandler(this.pnlRefresh_Click); // // label2 // @@ -1195,13 +1198,13 @@ namespace TemuKJD.WXForms.TalkForms private System.Windows.Forms.CheckBox chkNotShowMessageWindow; private System.Windows.Forms.ComboBox cmbMessage; private System.Windows.Forms.Label label1; - private DevComponents.DotNetBar.PanelEx pnlSet; + private DevComponents.DotNetBar.PanelEx btnSet; private DevComponents.DotNetBar.Controls.Line line4; private System.Windows.Forms.CheckBox chkIsAutoReLogin; private System.Windows.Forms.TextBox txtAutoReplyText; private System.Windows.Forms.CheckBox chkIsAutoReply; private System.Windows.Forms.SplitContainer splitContainer4; - private DevComponents.DotNetBar.PanelEx pnlRefreshShop; + private DevComponents.DotNetBar.PanelEx btnRefreshShop; private System.Windows.Forms.DataGridViewTextBoxColumn ColumnShopID; private System.Windows.Forms.DataGridViewTextBoxColumn ColumnShopName; private System.Windows.Forms.DataGridViewLinkColumn ColumnShopStatus; @@ -1219,7 +1222,7 @@ namespace TemuKJD.WXForms.TalkForms private System.Windows.Forms.Panel mainPanel; private System.Windows.Forms.PictureBox pbLoading; private DevComponents.DotNetBar.PanelEx btnFilterShop; - private DevComponents.DotNetBar.PanelEx panelEx1; + private DevComponents.DotNetBar.PanelEx btnRestore; private DevComponents.DotNetBar.Controls.TextBoxX txtFiltShopName; private UserComponent.UcComboBoxMutiSelect cmbFiltNotes; private System.Windows.Forms.Label label3; diff --git a/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs b/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs index 1b4c1d9..ec1745b 100644 --- a/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs +++ b/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs @@ -227,7 +227,7 @@ namespace TemuKJD.WXForms.TalkForms var deltaTime = nextRefreshTime - DateTime.Now; Invoke(new Action(() => { - this.pnlRefreshShop.Text = "刷 新 店 铺 " + deltaTime.Minutes.ToString("00") + ":" + deltaTime.Seconds.ToString("00"); + this.btnRefreshShop.Text = "刷 新 店 铺 " + deltaTime.Minutes.ToString("00") + ":" + deltaTime.Seconds.ToString("00"); })); } });