diff --git a/KJDService/KJD_WebService/BLL/ProductManage.cs b/KJDService/KJD_WebService/BLL/ProductManage.cs index 5e7b787..a8b84e6 100644 --- a/KJDService/KJD_WebService/BLL/ProductManage.cs +++ b/KJDService/KJD_WebService/BLL/ProductManage.cs @@ -91,23 +91,23 @@ namespace KJD_Web.BLL string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "select count(id) from kjd.product where 1=1"; + string sql = "select count(id) from kjd.product p where 1=1"; string where = ""; if (!string.IsNullOrWhiteSpace(search_spu)) - where += " and spu_id like '%" + search_spu + "%'"; + where += " and p.spu_id like '%" + search_spu + "%'"; if (!string.IsNullOrWhiteSpace(search_skc)) - where += " and skc_id like '%" + search_skc + "%'"; + where += " and p.skc_id like '%" + search_skc + "%'"; if (!string.IsNullOrWhiteSpace(search_cat)) - where += " and cat_name like '%" + search_cat + "%'"; + where += " and p.cat_name like '%" + search_cat + "%'"; if (!string.IsNullOrWhiteSpace(search_ext_code)) - where += " and ext_code like '%" + search_ext_code + "%'"; + where += " and p.ext_code like '%" + search_ext_code + "%'"; if (!string.IsNullOrWhiteSpace(search_prod_name)) - where += " and product_name like '%" + search_prod_name + "%'"; + where += " and p.product_name like '%" + search_prod_name + "%'"; if (!string.IsNullOrWhiteSpace(search_notes)) - where += " and notes like '%" + search_notes + "%'"; + where += " and p.notes like '%" + search_notes + "%'"; if (!string.IsNullOrEmpty(search_db_ids)) - where += " and id in (" + search_db_ids + ")"; + where += " and p.id in (" + search_db_ids + ")"; sql += where; var count = mySql.ExecuteRowCount(sql); diff --git a/KJDService/KJD_WebService/BLL/ShopManage.cs b/KJDService/KJD_WebService/BLL/ShopManage.cs index 5e42b9f..dd6fd73 100644 --- a/KJDService/KJD_WebService/BLL/ShopManage.cs +++ b/KJDService/KJD_WebService/BLL/ShopManage.cs @@ -68,7 +68,7 @@ namespace KJD_Web.BLL } else { - sql = "select id,login_name,login_pass,cookie,shop_id,shop_account,sub_user_name,user_name,company_name,notes,login_status," + + sql = "select id,login_name,login_pass,cookie,cookie2,shop_id,shop_account,sub_user_name,user_name,company_name,notes,login_status," + " add_product_remaining,add_product_month,add_time,mdy_time,add_sub_sa_time,operate_sub_sa_name" + " from kjd.shop where 1=1"; @@ -91,6 +91,7 @@ namespace KJD_Web.BLL login_name = row["login_name"].ToString(), login_pass = row["login_pass"].ToString(), cookie = row["cookie"].ToString(), + cookie2 = row["cookie2"].ToString(), shop_id = row["shop_id"].ToString(), shop_account = row["shop_account"].ToString(), sub_user_name = row["sub_user_name"].ToString(), @@ -150,7 +151,7 @@ namespace KJD_Web.BLL string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "select id,login_name,login_pass,cookie,shop_id,shop_account,sub_user_name,user_name from kjd.shop where user_name='" + string sql = "select id,login_name,login_pass,cookie,cookie2,shop_id,shop_account,sub_user_name,user_name from kjd.shop where user_name='" + user_name + "' and login_name='" + login_name + "'"; var dt = mySql.ExecuteDataTable(sql); @@ -166,6 +167,7 @@ namespace KJD_Web.BLL login_name = row["login_name"].ToString(), login_pass = row["login_pass"].ToString(), cookie = row["cookie"].ToString(), + cookie2 = row["cookie2"].ToString(), shop_id = row["shop_id"].ToString(), shop_account = row["shop_account"].ToString(), sub_user_name = row["sub_user_name"].ToString(), @@ -197,7 +199,7 @@ namespace KJD_Web.BLL string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "select id,login_name,login_pass,cookie,shop_id,shop_account,sub_user_name,user_name from kjd.shop where user_name='" + string sql = "select id,login_name,login_pass,cookie,cookie2,shop_id,shop_account,sub_user_name,user_name from kjd.shop where user_name='" + user_name + "' and login_name='" + login_name + "' and shop_id='" + shop_id + "'"; var dt = mySql.ExecuteDataTable(sql); @@ -213,6 +215,7 @@ namespace KJD_Web.BLL login_name = row["login_name"].ToString(), login_pass = row["login_pass"].ToString(), cookie = row["cookie"].ToString(), + cookie2 = row["cookie2"].ToString(), shop_id = row["shop_id"].ToString(), shop_account = row["shop_account"].ToString(), sub_user_name = row["sub_user_name"].ToString(), @@ -241,6 +244,7 @@ namespace KJD_Web.BLL string login_pass = RegexUtils.GetStringQuery(ref inputData, "login_pass"); string sub_user_name = RegexUtils.GetStringQuery(ref inputData, "sub_user_name"); string cookie = RegexUtils.GetStringQuery(ref inputData, "cookie"); + string cookie2 = RegexUtils.GetStringQuery(ref inputData, "cookie2"); string shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id"); string shop_account = RegexUtils.GetStringQuery(ref inputData, "shop_account"); string group_name = RegexUtils.GetStringQuery(ref inputData, "group_name"); @@ -272,8 +276,8 @@ namespace KJD_Web.BLL return "{\"code\":500,\"msg\":\"店铺" + login_name +" " + shop_account + "已存在\"}"; } - sql = "insert into kjd.shop (login_name,login_pass,cookie,shop_account,shop_id,sub_user_name,user_name,group_name,notes,add_time,mdy_time) " + - "values ('" + login_name + "','" + login_pass + "','" + cookie + "','" + shop_account + "','" + shop_id + "','" + + sql = "insert into kjd.shop (login_name,login_pass,cookie,cookie2,shop_account,shop_id,sub_user_name,user_name,group_name,notes,add_time,mdy_time) " + + "values ('" + login_name + "','" + login_pass + "','" + cookie + "','" + cookie2 + "','" + shop_account + "','" + shop_id + "','" + sub_user_name + "','" + user_name + "','" + group_name + "','" + notes + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "');"; @@ -298,6 +302,7 @@ namespace KJD_Web.BLL string login_pass = RegexUtils.GetStringQuery(ref inputData, "login_pass"); string sub_user_name = RegexUtils.GetStringQuery(ref inputData, "sub_user_name"); string cookie = RegexUtils.GetStringQuery(ref inputData, "cookie"); + string cookie2 = RegexUtils.GetStringQuery(ref inputData, "cookie2"); string new_shop_id = RegexUtils.GetStringQuery(ref inputData, "new_shop_id"); string old_shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id"); string shop_account = RegexUtils.GetStringQuery(ref inputData, "shop_account"); @@ -324,6 +329,8 @@ namespace KJD_Web.BLL sql += " login_pass='" + login_pass + "',"; if (cookie != null) sql += " cookie='" + cookie + "',"; + if (cookie2 != null) + sql += " cookie2='" + cookie2 + "',"; if (new_shop_id != null) sql += " shop_id='" + new_shop_id + "',"; if (shop_account != null) @@ -357,6 +364,7 @@ namespace KJD_Web.BLL { string login_name = RegexUtils.GetStringQuery(ref inputData, "login_name"); string cookie = RegexUtils.GetStringQuery(ref inputData, "cookie"); + string cookie2 = RegexUtils.GetStringQuery(ref inputData, "cookie2"); string login_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "login_status")); int r2 = 0; @@ -372,6 +380,8 @@ namespace KJD_Web.BLL string sql = "update kjd.shop set"; if (cookie != null) sql += " cookie='" + cookie + "',"; + if (cookie2 != null) + sql += " cookie2='" + cookie2 + "',"; if (login_status != null) sql += " login_status='" + login_status + "',"; sql = sql.TrimEnd(','); diff --git a/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs b/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs index 31b9963..8a1729d 100644 --- a/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs +++ b/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs @@ -11,6 +11,7 @@ namespace KJD_Web.Model.ShopModel public string login_name { get; set; } public string login_pass { get; set; } public string cookie { get; set; } + public string cookie2 { get; set; } public string shop_id { get; set; } public string shop_account { get; set; } public string sub_user_name { get; set; } diff --git a/TEMUKJD/KJDForms/AdminForms/AdminShopForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminShopForm.cs index e44f3c0..ba3f6be 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminShopForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminShopForm.cs @@ -367,6 +367,8 @@ namespace TemuKJD.KJDForms.AdminForms shop.GroupName = BaseRegex.GetStringJson(ref shopStr, "shop_group"); shop.Cookies = BaseRegex.GetStringJson(ref shopStr, "cookie"); shop.Cookies = shop.Cookies.Replace("＆", "&").Replace("％", "%").Replace("＋", "+"); + shop.Cookies2 = BaseRegex.GetStringJson(ref shopStr, "cookie2"); + shop.Cookies2 = shop.Cookies2.Replace("＆", "&").Replace("％", "%").Replace("＋", "+"); shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name"); shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes"); shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status"); diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs index aec9c17..1c2cc4c 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs @@ -264,7 +264,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.txtProdName.Text = ""; this.txtSKC.Text = ""; this.txtSPU.Text = ""; - this.txtExtCode.Text = ""; + this.txtNotes.Text = ""; } private void dgvDbProduct_CellContentClick(object sender, DataGridViewCellEventArgs e) diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs index 51c5bb0..29da6fe 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs @@ -641,6 +641,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms shop.GroupName = BaseRegex.GetStringJson(ref shopStr, "shop_group"); shop.Cookies = BaseRegex.GetStringJson(ref shopStr, "cookie"); shop.Cookies = shop.Cookies.Replace("＆", "&").Replace("％", "%").Replace("＋", "+"); + shop.Cookies2 = BaseRegex.GetStringJson(ref shopStr, "cookie2"); + shop.Cookies2 = shop.Cookies2.Replace("＆", "&").Replace("％", "%").Replace("＋", "+"); shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name"); shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes"); shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status"); diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs index c14ecaa..e649c02 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs @@ -33,32 +33,32 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductThirdSelectListManageForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.btnSetSubSa = new TemuKJD.UserControls.ButtonEx(); + this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.label6 = new System.Windows.Forms.Label(); + this.txtShopId = new System.Windows.Forms.TextBox(); this.cmbStatus = new System.Windows.Forms.ComboBox(); + this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.label7 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.txtShopName = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); - this.txtShopId = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.btnAdd = new TemuKJD.UserControls.ButtonEx(); - this.txtSPU = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); - this.txtSKC = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new TemuKJD.UserControls.ButtonEx(); + this.txtSKC = new System.Windows.Forms.TextBox(); + this.txtSPU = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.txtCat = new System.Windows.Forms.TextBox(); this.txtExtCode = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.txtProdName = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.txtCat = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.btnSetSubSa = new TemuKJD.UserControls.ButtonEx(); + this.btnAdd = new TemuKJD.UserControls.ButtonEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -83,10 +83,13 @@ this.colEditNotes = new System.Windows.Forms.DataGridViewLinkColumn(); this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn(); this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); this.splitContainer2.Panel1.SuspendLayout(); this.splitContainer2.Panel2.SuspendLayout(); @@ -106,27 +109,11 @@ // // splitContainer1.Panel1 // - this.splitContainer1.Panel1.Controls.Add(this.btnSetSubSa); - this.splitContainer1.Panel1.Controls.Add(this.cmbStatus); - this.splitContainer1.Panel1.Controls.Add(this.label8); - this.splitContainer1.Panel1.Controls.Add(this.txtShopName); - this.splitContainer1.Panel1.Controls.Add(this.label7); - this.splitContainer1.Panel1.Controls.Add(this.txtShopId); - this.splitContainer1.Panel1.Controls.Add(this.label6); - this.splitContainer1.Panel1.Controls.Add(this.btnAdd); - this.splitContainer1.Panel1.Controls.Add(this.txtSPU); - this.splitContainer1.Panel1.Controls.Add(this.label5); - this.splitContainer1.Panel1.Controls.Add(this.txtSKC); - this.splitContainer1.Panel1.Controls.Add(this.label1); - this.splitContainer1.Panel1.Controls.Add(this.pnlEmpty); - this.splitContainer1.Panel1.Controls.Add(this.btnSearch); - this.splitContainer1.Panel1.Controls.Add(this.txtExtCode); - this.splitContainer1.Panel1.Controls.Add(this.label4); - this.splitContainer1.Panel1.Controls.Add(this.txtProdName); - this.splitContainer1.Panel1.Controls.Add(this.label3); - this.splitContainer1.Panel1.Controls.Add(this.txtCat); - this.splitContainer1.Panel1.Controls.Add(this.label2); + this.splitContainer1.Panel1.Controls.Add(this.chkShowDel); + this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); this.splitContainer1.Panel1.Controls.Add(this.chkNoSubSa); + this.splitContainer1.Panel1.Controls.Add(this.btnSetSubSa); + this.splitContainer1.Panel1.Controls.Add(this.btnAdd); // // splitContainer1.Panel2 // @@ -135,6 +122,283 @@ this.splitContainer1.SplitterDistance = 53; this.splitContainer1.TabIndex = 2; // + // chkShowDel + // + this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkShowDel.AutoSize = true; + this.chkShowDel.Location = new System.Drawing.Point(1081, 17); + this.chkShowDel.Name = "chkShowDel"; + this.chkShowDel.Size = new System.Drawing.Size(123, 21); + this.chkShowDel.TabIndex = 471; + this.chkShowDel.Text = "显示删除功能按钮"; + this.chkShowDel.UseVisualStyleBackColor = true; + this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel1.ColumnCount = 18; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0); + this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 17, 0); + this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0); + this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0); + this.tableLayoutPanel1.Controls.Add(this.label5, 4, 0); + this.tableLayoutPanel1.Controls.Add(this.btnSearch, 16, 0); + this.tableLayoutPanel1.Controls.Add(this.txtSKC, 7, 0); + this.tableLayoutPanel1.Controls.Add(this.txtSPU, 5, 0); + this.tableLayoutPanel1.Controls.Add(this.label1, 6, 0); + this.tableLayoutPanel1.Controls.Add(this.label2, 8, 0); + this.tableLayoutPanel1.Controls.Add(this.txtCat, 9, 0); + this.tableLayoutPanel1.Controls.Add(this.txtExtCode, 13, 0); + this.tableLayoutPanel1.Controls.Add(this.label3, 10, 0); + this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0); + this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0); + this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 13); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 1; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(944, 28); + this.tableLayoutPanel1.TabIndex = 469; + // + // label6 + // + this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(3, 5); + this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(44, 17); + this.label6.TabIndex = 449; + this.label6.Text = "店铺Id"; + // + // txtShopId + // + this.txtShopId.Dock = System.Windows.Forms.DockStyle.Top; + this.txtShopId.Location = new System.Drawing.Point(47, 2); + this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopId.Name = "txtShopId"; + this.txtShopId.Size = new System.Drawing.Size(57, 23); + this.txtShopId.TabIndex = 448; + // + // cmbStatus + // + this.cmbStatus.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmbStatus.FormattingEnabled = true; + this.cmbStatus.Items.AddRange(new object[] { + "待上传", + "已上传", + "全部"}); + this.cmbStatus.Location = new System.Drawing.Point(758, 1); + this.cmbStatus.Margin = new System.Windows.Forms.Padding(0, 1, 0, 1); + this.cmbStatus.Name = "cmbStatus"; + this.cmbStatus.Size = new System.Drawing.Size(57, 25); + this.cmbStatus.TabIndex = 459; + this.cmbStatus.Text = "待上传"; + // + // 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(882, 3); + this.pnlEmpty.Name = "pnlEmpty"; + this.pnlEmpty.Size = new System.Drawing.Size(56, 22); + 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); + // + // label7 + // + this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(110, 5); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(56, 17); + this.label7.TabIndex = 452; + this.label7.Text = "店铺名称"; + // + // label8 + // + this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(702, 5); + this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(56, 17); + this.label8.TabIndex = 458; + this.label8.Text = "认领状态"; + // + // txtShopName + // + this.txtShopName.Dock = System.Windows.Forms.DockStyle.Top; + this.txtShopName.Location = new System.Drawing.Point(166, 2); + this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopName.Name = "txtShopName"; + this.txtShopName.Size = new System.Drawing.Size(57, 23); + this.txtShopName.TabIndex = 451; + // + // label5 + // + this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(229, 5); + this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(31, 17); + this.label5.TabIndex = 435; + this.label5.Text = "SPU"; + // + // btnSearch + // + this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSearch.ForeColor = System.Drawing.Color.White; + this.btnSearch.Location = new System.Drawing.Point(821, 2); + this.btnSearch.Margin = new System.Windows.Forms.Padding(6, 2, 2, 2); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(56, 24); + this.btnSearch.TabIndex = 424; + this.btnSearch.Text = "搜索"; + this.btnSearch.UseVisualStyleBackColor = false; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // + // txtSKC + // + this.txtSKC.Dock = System.Windows.Forms.DockStyle.Top; + this.txtSKC.Location = new System.Drawing.Point(354, 2); + this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSKC.Name = "txtSKC"; + this.txtSKC.Size = new System.Drawing.Size(57, 23); + this.txtSKC.TabIndex = 432; + // + // txtSPU + // + this.txtSPU.Dock = System.Windows.Forms.DockStyle.Top; + this.txtSPU.Location = new System.Drawing.Point(260, 2); + this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSPU.Name = "txtSPU"; + this.txtSPU.Size = new System.Drawing.Size(57, 23); + this.txtSPU.TabIndex = 434; + // + // label1 + // + this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(323, 5); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(31, 17); + this.label1.TabIndex = 433; + this.label1.Text = "SKC"; + // + // label2 + // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(417, 5); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(32, 17); + this.label2.TabIndex = 426; + this.label2.Text = "类目"; + // + // txtCat + // + this.txtCat.Dock = System.Windows.Forms.DockStyle.Top; + this.txtCat.Location = new System.Drawing.Point(449, 2); + this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtCat.Name = "txtCat"; + this.txtCat.Size = new System.Drawing.Size(57, 23); + this.txtCat.TabIndex = 425; + // + // txtExtCode + // + this.txtExtCode.Dock = System.Windows.Forms.DockStyle.Top; + this.txtExtCode.Location = new System.Drawing.Point(639, 2); + this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtExtCode.Name = "txtExtCode"; + this.txtExtCode.Size = new System.Drawing.Size(57, 23); + this.txtExtCode.TabIndex = 429; + // + // label3 + // + this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(512, 5); + this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(32, 17); + this.label3.TabIndex = 428; + this.label3.Text = "标题"; + // + // label4 + // + this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(607, 5); + this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(32, 17); + this.label4.TabIndex = 430; + this.label4.Text = "货号"; + // + // txtProdName + // + this.txtProdName.Dock = System.Windows.Forms.DockStyle.Top; + this.txtProdName.Location = new System.Drawing.Point(544, 2); + this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtProdName.Name = "txtProdName"; + this.txtProdName.Size = new System.Drawing.Size(57, 23); + this.txtProdName.TabIndex = 427; + // + // chkNoSubSa + // + this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkNoSubSa.AutoSize = true; + this.chkNoSubSa.Location = new System.Drawing.Point(958, 17); + this.chkNoSubSa.Name = "chkNoSubSa"; + this.chkNoSubSa.Size = new System.Drawing.Size(123, 21); + this.chkNoSubSa.TabIndex = 470; + this.chkNoSubSa.Text = "仅显示未分配超管"; + this.chkNoSubSa.UseVisualStyleBackColor = true; + // // btnSetSubSa // this.btnSetSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -152,60 +416,6 @@ this.btnSetSubSa.UseVisualStyleBackColor = false; this.btnSetSubSa.Click += new System.EventHandler(this.btnSetSubSa_Click); // - // cmbStatus - // - this.cmbStatus.FormattingEnabled = true; - this.cmbStatus.Items.AddRange(new object[] { - "待上传", - "已上传", - "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(946, 15); - this.cmbStatus.Name = "cmbStatus"; - this.cmbStatus.Size = new System.Drawing.Size(85, 25); - this.cmbStatus.TabIndex = 459; - this.cmbStatus.Text = "待上传"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(889, 19); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(68, 17); - this.label8.TabIndex = 458; - this.label8.Text = "认领状态："; - // - // txtShopName - // - this.txtShopName.Location = new System.Drawing.Point(192, 16); - this.txtShopName.Name = "txtShopName"; - this.txtShopName.Size = new System.Drawing.Size(85, 23); - this.txtShopName.TabIndex = 451; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(135, 19); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(68, 17); - this.label7.TabIndex = 452; - this.label7.Text = "店铺名称："; - // - // txtShopId - // - this.txtShopId.Location = new System.Drawing.Point(46, 16); - this.txtShopId.Name = "txtShopId"; - this.txtShopId.Size = new System.Drawing.Size(85, 23); - this.txtShopId.TabIndex = 448; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(1, 19); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(56, 17); - this.label6.TabIndex = 449; - this.label6.Text = "店铺Id："; - // // btnAdd // this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -223,136 +433,6 @@ this.btnAdd.UseVisualStyleBackColor = false; this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); // - // txtSPU - // - this.txtSPU.Location = new System.Drawing.Point(313, 16); - this.txtSPU.Name = "txtSPU"; - this.txtSPU.Size = new System.Drawing.Size(85, 23); - this.txtSPU.TabIndex = 434; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(281, 19); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(43, 17); - this.label5.TabIndex = 435; - this.label5.Text = "SPU："; - // - // txtSKC - // - this.txtSKC.Location = new System.Drawing.Point(434, 16); - this.txtSKC.Name = "txtSKC"; - this.txtSKC.Size = new System.Drawing.Size(85, 23); - this.txtSKC.TabIndex = 432; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(402, 19); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(43, 17); - this.label1.TabIndex = 433; - this.label1.Text = "SKC："; - // - // 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(1100, 14); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 26); - this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.pnlEmpty.Style.GradientAngle = 90; - this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.pnlEmpty.TabIndex = 431; - this.pnlEmpty.Text = "清空条件"; - this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); - // - // btnSearch - // - this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.ForeColor = System.Drawing.Color.White; - this.btnSearch.Location = new System.Drawing.Point(1039, 14); - this.btnSearch.Margin = new System.Windows.Forms.Padding(2); - this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(56, 26); - this.btnSearch.TabIndex = 424; - this.btnSearch.Text = "搜索"; - this.btnSearch.UseVisualStyleBackColor = false; - this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); - // - // txtExtCode - // - this.txtExtCode.Location = new System.Drawing.Point(800, 16); - this.txtExtCode.Name = "txtExtCode"; - this.txtExtCode.Size = new System.Drawing.Size(85, 23); - this.txtExtCode.TabIndex = 429; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(767, 19); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(44, 17); - this.label4.TabIndex = 430; - this.label4.Text = "货号："; - // - // txtProdName - // - this.txtProdName.Location = new System.Drawing.Point(678, 16); - this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(85, 23); - this.txtProdName.TabIndex = 427; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(645, 19); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(44, 17); - this.label3.TabIndex = 428; - this.label3.Text = "标题："; - // - // txtCat - // - this.txtCat.Location = new System.Drawing.Point(556, 16); - this.txtCat.Name = "txtCat"; - this.txtCat.Size = new System.Drawing.Size(85, 23); - this.txtCat.TabIndex = 425; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(523, 19); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(44, 17); - this.label2.TabIndex = 426; - this.label2.Text = "类目："; - // - // chkNoSubSa - // - this.chkNoSubSa.AutoSize = true; - this.chkNoSubSa.Location = new System.Drawing.Point(1167, 17); - this.chkNoSubSa.Name = "chkNoSubSa"; - this.chkNoSubSa.Size = new System.Drawing.Size(123, 21); - this.chkNoSubSa.TabIndex = 467; - this.chkNoSubSa.Text = "仅显示未分配超管"; - this.chkNoSubSa.UseVisualStyleBackColor = true; - // // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -439,29 +519,6 @@ this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll); // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.Location = new System.Drawing.Point(1076, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); - this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); - this.ucSplitPage1.TabIndex = 6; - 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(1438, 25); - this.statusBar.TabIndex = 5; - // // colSelect // this.colSelect.HeaderText = "选择"; @@ -564,7 +621,7 @@ this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; - this.colProductName.Width = 200; + this.colProductName.Width = 180; // // colProductCat // @@ -630,7 +687,7 @@ this.colEditNotes.ReadOnly = true; this.colEditNotes.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colEditNotes.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colEditNotes.Width = 70; + this.colEditNotes.Width = 62; // // ColDelete // @@ -638,7 +695,7 @@ this.ColDelete.Name = "ColDelete"; this.ColDelete.ReadOnly = true; this.ColDelete.Visible = false; - this.ColDelete.Width = 125; + this.ColDelete.Width = 38; // // colOpResult // @@ -647,6 +704,29 @@ this.colOpResult.ReadOnly = true; this.colOpResult.Width = 150; // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.Location = new System.Drawing.Point(1076, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); + this.ucSplitPage1.TabIndex = 6; + 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(1438, 25); + this.statusBar.TabIndex = 5; + // // ProductThirdSelectListManageForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -665,6 +745,8 @@ this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); this.splitContainer2.Panel1.ResumeLayout(false); this.splitContainer2.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); @@ -679,30 +761,11 @@ private System.Windows.Forms.SplitContainer splitContainer1; private UserControls.ButtonEx btnAdd; - private System.Windows.Forms.TextBox txtSPU; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.TextBox txtSKC; - private System.Windows.Forms.Label label1; - private DevComponents.DotNetBar.PanelEx pnlEmpty; - private UserControls.ButtonEx btnSearch; - private System.Windows.Forms.TextBox txtExtCode; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.TextBox txtProdName; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox txtCat; - private System.Windows.Forms.Label label2; private System.Windows.Forms.SplitContainer splitContainer2; private System.Windows.Forms.PictureBox pbLoading; private UserControls.UcSplitPage ucSplitPage1; private UserControls.StatusBarUserControl statusBar; - private System.Windows.Forms.TextBox txtShopName; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.TextBox txtShopId; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.ComboBox cmbStatus; - private System.Windows.Forms.Label label8; private UserControls.ButtonEx btnSetSubSa; - private UserComponent.UcCheckBox chkNoSubSa; private UserComponent.DataGridViewEx dgvSelectProduct; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId; @@ -728,5 +791,26 @@ private System.Windows.Forms.DataGridViewLinkColumn colEditNotes; private System.Windows.Forms.DataGridViewLinkColumn ColDelete; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; + private UserComponent.UcCheckBox chkShowDel; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.TextBox txtShopId; + private System.Windows.Forms.ComboBox cmbStatus; + private DevComponents.DotNetBar.PanelEx pnlEmpty; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.TextBox txtShopName; + private System.Windows.Forms.Label label5; + private UserControls.ButtonEx btnSearch; + private System.Windows.Forms.TextBox txtSKC; + private System.Windows.Forms.TextBox txtSPU; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox txtCat; + private System.Windows.Forms.TextBox txtExtCode; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox txtProdName; + private UserComponent.UcCheckBox chkNoSubSa; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs index 788359c..6ab18bf 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs @@ -41,12 +41,18 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.ucSplitPage1.PageChange += UcSplitPage1_PageChange; this.dgvSelectProduct.AddSelectorColumn("colSelect"); - if (BaseClass.SaLevel != 1) + dgvSelectProduct.Columns["colSubSaNick"].Visible = false; + dgvSelectProduct.Columns["colDelete"].Visible = false; + chkShowDel.Visible = false; + btnSetSubSa.Visible = false; + chkNoSubSa.Visible = false; + + if (BaseClass.SaLevel == 1) { - dgvSelectProduct.Columns["colSubSa"].Visible = false; - dgvSelectProduct.Columns["colSubSaNick"].Visible = false; - btnSetSubSa.Visible = false; - chkNoSubSa.Visible = false; + dgvSelectProduct.Columns["colSubSaNick"].Visible = true; + chkShowDel.Visible = true; + btnSetSubSa.Visible = true; + chkNoSubSa.Visible = true; } } @@ -274,9 +280,13 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms switch (headerText) { case "删除": - //if (BaseMsgForm.ShowConfirm("确定删除商品吗？删除后不可恢复！").DialogResult == DialogResult.Cancel) - // return; - //DeleteProduct(dbId); + if (BaseMsgForm.ShowConfirm("确定删除商品吗？删除后不可恢复！").DialogResult == DialogResult.Cancel) + return; + var rst = DeleteProduct(dbId); + if (rst) + { + SearchDbProdSelect(this.ucSplitPage1.CurrentPage); + } break; case "编辑备注": ProductSelectEditNotesForm editForm = new ProductSelectEditNotesForm(dbSelectProduct, SetProductSelectNotesType.ThirdProduct); @@ -363,6 +373,24 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms } } + private bool DeleteProduct(string dbId) + { + var url = BaseClass.BuildObjString("product_third/del_select_product"); + var data = UserLogin.GetSignaturex() + + "&db_id=" + dbId; + var html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + BaseMsgForm.ShowError("删除商品失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); + return false; + } + return true; + } + private void UpdateCookieForm_SaveComplete(object obj) { } @@ -627,6 +655,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms shop.GroupName = BaseRegex.GetStringJson(ref shopStr, "shop_group"); shop.Cookies = BaseRegex.GetStringJson(ref shopStr, "cookie"); shop.Cookies = shop.Cookies.Replace("＆", "&").Replace("％", "%").Replace("＋", "+"); + shop.Cookies2 = BaseRegex.GetStringJson(ref shopStr, "cookie2"); + shop.Cookies2 = shop.Cookies2.Replace("＆", "&").Replace("％", "%").Replace("＋", "+"); shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name"); shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes"); shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status"); @@ -1100,5 +1130,10 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms } } } + + private void chkShowDel_CheckedChanged(object sender, EventArgs e) + { + dgvSelectProduct.Columns["colDelete"].Visible = this.chkShowDel.Checked; + } } } diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs index a700f8b..fbb0aaa 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs @@ -39,6 +39,7 @@ namespace TemuKJD.KJDForms.ShopForms + "&shop_id=" + _shop.ShopId + "&shop_account=" + _shop.ShopAccount + "&cookie=" + _shop.Cookies + + "&cookie2=" + _shop.Cookies2 + "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.GroupName) + "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName) + "¬es=" + GetHtml.UrlEncodeUtf8(_shop.Notes) @@ -182,6 +183,8 @@ namespace TemuKJD.KJDForms.ShopForms shop.GroupName = BaseRegex.GetStringJson(ref shopStr, "shop_group"); shop.Cookies = BaseRegex.GetStringJson(ref shopStr, "cookie"); shop.Cookies = shop.Cookies.Replace("＆", "&").Replace("％", "%").Replace("＋", "+"); + shop.Cookies2 = BaseRegex.GetStringJson(ref shopStr, "cookie2"); + shop.Cookies2 = shop.Cookies2.Replace("＆", "&").Replace("％", "%").Replace("＋", "+"); shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name"); shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes"); shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status"); @@ -865,6 +868,11 @@ namespace TemuKJD.KJDForms.ShopForms //if (!cookie.StartsWith("SUB_PASS_ID") && !cookie.StartsWith("_nano_fp")) cookJs += "\r\ndocument.cookie='" + cookie.Substring(0, Math.Max(0, cookie.IndexOf("="))) + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';"; } + foreach (var shopCook in shop.Cookies2.Split(';')) + { + var cookie = shopCook.Trim(); + cookJs += "\r\ndocument.cookie='" + cookie.Substring(0, Math.Max(0, cookie.IndexOf("="))) + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';"; + } foreach (var shopCook in shop.Cookies.Split(';')) { var cookie = shopCook.Trim(); @@ -876,13 +884,15 @@ namespace TemuKJD.KJDForms.ShopForms cookJs += "\r\ndocument.cookie='" + cookie + "; domain=seller.kuajingmaihuo.com;';"; } // 全球站cookie - foreach (var shopCook in shop?.Cookies2?.Split(';')) + foreach (var shopCook in shop.Cookies2.Split(';')) { var cookie = shopCook.Trim(); - if (!cookie.StartsWith("SUB_PASS_ID") && !cookie.StartsWith("mallid") && !cookie.StartsWith("_nano_fp")) - cookJs += "\r\ndocument.cookie='" + cookie + "; domain=.kuajingmaihuo.com;';"; + if (cookie.StartsWith("mc-pc-cookie-captcha-token=")) + continue; + if (!cookie.StartsWith("seller_temp") && !cookie.StartsWith("_nano_fp") && !cookie.StartsWith("mallid")) + cookJs += "\r\ndocument.cookie='" + cookie + "; domain=.temu.com; expires=" + DateTime.Now.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ") + "; path=/';"; else - cookJs += "\r\ndocument.cookie='" + cookie + "; domain=seller.kuajingmaihuo.com;';"; + cookJs += "\r\ndocument.cookie='" + cookie + "; agentseller.temu.com; expires=" + DateTime.Now.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ") + "; path=/';"; } cookJs += "\r\nwindow.localStorage.setItem('" + "mall-info-id" + "', '" + shop.ShopId + "');"; cookJs += "\r\nsetTimeout(() => { window.location.href='https://seller.kuajingmaihuo.com'; }, 200)"; diff --git a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs index bc91b17..b7fc135 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs @@ -41,8 +41,10 @@ namespace TemuKJD.KJDForms.ShopForms public string MultiLoginCookieName = ""; public string InitUrl = ""; private string shopCookieHead = "kuajingmaihuo.com"; + private string shopCookieHead2 = "temu.com"; private string shopLoginUrl = "http://seller.kuajingmaihuo.com/login"; private string shopMainUrl = "https://seller.kuajingmaihuo.com"; + private string shopMainUrl2 = "https://agentseller.temu.com"; private ChromiumWebBrowser cefWebBrowser = null; private ShopLoginInfo shop = null; private List lstShopCompany = new List(); @@ -181,6 +183,92 @@ namespace TemuKJD.KJDForms.ShopForms } StartUp.SaveLocalShopLoginInfo(); // 店铺保存到本地 ShopListForm.UpdateServerShopCookies(shop, shop.Cookies); // 店铺cookie写入服务端，多店共用一个登录账号一组cookie + //OnSaveComplete(shop); + //if (this.Created && this.chkCloseAfterLogin.Checked) + //{ + // Invoke(new Action(() => { this.Close(); })); + //} + //else + // break; + } + //cefWebBrowser.Load(shopMainUrl2); + } + + + if (this.shop != null && currentUrl.TrimEnd('/') == shopMainUrl2) + {//https://agentseller.temu.com + if (!cefWebBrowser.GetBrowser().MainFrame.IsValid) + continue; + + if (openType != EnumOpenType.login) + continue; + + if (!lstShopCompany.Any(c => c.LoginName == shop.LoginName)) + continue; + + string cookies2 = ""; + List cookieList2 = CEFBrowser.GetCookieList(shopCookieHead2, cefWebBrowser.RequestContext.GetCookieManager(null)); + if (cookieList2 != null && cookieList2.Count > 0) + { + foreach (var cookie in cookieList2) + { + //SUB_PASS_ID同时出现两个，domain是seller.kuajingmaihuo.com才是能登录店铺后台的 + if (cookie.Name == "seller_temp" && cookie.Domain != "agentseller.temu.com") + continue; + if (cookie.Name == "mallid" && cookie.Domain != "agentseller.temu.com") + continue; + + cookies2 += cookie.Name + "=" + cookie.Value + "; "; + } + cookies2 = cookies2.Trim().TrimEnd(';'); + } + + if (!string.IsNullOrEmpty(cookies2) + && lstShopCompany.Any(c => c.LoginName == shop.LoginName)) + { + var lstShopCompanyCopy = lstShopCompany.ToList(); + lstShopCompanyCopy = lstShopCompanyCopy.Where(l => l.LoginName == shop.LoginName).ToList(); + + foreach (ShopCompany sc in lstShopCompanyCopy) + { + ShopLoginInfo newShop = new ShopLoginInfo() + { + LoginName = shop.LoginName, + Password = shop.Password, + GroupName = shop.GroupName, + ShopAccount = sc.AccountName, + ShopId = sc.AccountId, + SubUserName = shop.SubUserName, + Notes = shop.Notes, + }; + + var oldShop = GlobalConfig.ShopLoginList.FirstOrDefault(l => + l.LoginName == newShop.LoginName && l.ShopId == newShop.ShopId); + if (oldShop == null) + { + GlobalConfig.ShopLoginList.Add(newShop); + ShopListForm.AddServerDouShop(newShop); // 店铺写入到服务端 + } + else + { + oldShop.LoginName = newShop.LoginName; + oldShop.Password = newShop.Password; + oldShop.GroupName = newShop.GroupName; + oldShop.ShopAccount = newShop.ShopAccount; + oldShop.ShopId = newShop.ShopId; + oldShop.SubUserName = newShop.SubUserName; + oldShop.Notes = newShop.Notes; + } + } + var lstShop = GlobalConfig.ShopLoginList.Where(l => l.LoginName == shop.LoginName).ToList(); + foreach (var s in lstShop) + { + s.LoginStatus = "登录成功"; + s.Cookies2 = cookies2; + s.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); + } + StartUp.SaveLocalShopLoginInfo(); // 店铺保存到本地 + ShopListForm.UpdateServerShopCookies(shop, shop.Cookies); // 店铺cookie写入服务端，多店共用一个登录账号一组cookie OnSaveComplete(shop); if (this.Created && this.chkCloseAfterLogin.Checked) { @@ -300,11 +388,14 @@ namespace TemuKJD.KJDForms.ShopForms if (isMultiLogin) cookie = shop.DictMultiCookies.Keys.Contains(MultiLoginCookieName) ? shop.DictMultiCookies[MultiLoginCookieName] : ""; + var cookie2 = shop.Cookies2; Task.Run(() => { var t = CEFBrowser.SetCookieAsync(shopCookieHead, cookie, cefWebBrowser.RequestContext.GetCookieManager(null)); t.Wait(5000); + t = CEFBrowser.SetCookieAsync(shopCookieHead2, cookie2, cefWebBrowser.RequestContext.GetCookieManager(null)); + t.Wait(5000); Invoke(new Action(() => { diff --git a/TEMUKJD/KJDForms/ShopForms/ShopUpdateCookieForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopUpdateCookieForm.cs index 5143676..441fc68 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopUpdateCookieForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopUpdateCookieForm.cs @@ -251,6 +251,8 @@ namespace TemuKJD.KJDForms.ShopForms shop.GroupName = BaseRegex.GetStringJson(ref shopStr, "shop_group"); shop.Cookies = BaseRegex.GetStringJson(ref shopStr, "cookie"); shop.Cookies = shop.Cookies.Replace("＆", "&").Replace("％", "%").Replace("＋", "+"); + shop.Cookies2 = BaseRegex.GetStringJson(ref shopStr, "cookie2"); + shop.Cookies2 = shop.Cookies2.Replace("＆", "&").Replace("％", "%").Replace("＋", "+"); shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name"); shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes"); shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status");