From cc1bc3123fff099bc32085712d0299222e791de3 Mon Sep 17 00:00:00 2001 From: wule Date: Mon, 4 Aug 2025 18:53:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=B4=BB=E5=8A=A8=E6=8A=A5?= =?UTF-8?q?=E5=90=8D--=E5=BA=97=E9=93=BA=E6=B4=BB=E5=8A=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=88=9D=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/AllBase.csproj | 1 + AllBase/BaseClass.cs | 4 +- AllBase/Model/Result/TemuActivityInfo.cs | 60 ++ KJDService/KJD_WebService/BLL/ShopManage.cs | 6 +- TEMUKJD/Extension/DataGridViewExtension.cs | 3 +- TEMUKJD/KJD.csproj | 111 +-- .../ProductForms/PriceManageForm.Designer.cs | 36 +- .../KJDForms/ProductForms/PriceManageForm.cs | 16 +- .../DbProductSelectListManageForm.Designer.cs | 50 +- .../MarketingActivityForm.Designer.cs | 779 ++++++++++++++++++ .../SalesCenterForms/MarketingActivityForm.cs | 536 ++++++++++++ .../MarketingActivityForm.resx | 195 +++++ .../{ => Old}/CouponForm.Designer.cs | 0 .../SalesCenterForms/{ => Old}/CouponForm.cs | 0 .../{ => Old}/CouponForm.resx | 0 .../{ => Old}/CouponMulitAddForm.Designer.cs | 0 .../{ => Old}/CouponMulitAddForm.cs | 0 .../{ => Old}/CouponMulitAddForm.resx | 0 .../{ => Old}/CouponShopForm.Designer.cs | 0 .../{ => Old}/CouponShopForm.cs | 0 .../{ => Old}/CouponShopForm.resx | 0 ...uctProPromotionListSkuInfoForm.Designer.cs | 0 .../DouProductProPromotionListSkuInfoForm.cs | 0 ...DouProductProPromotionListSkuInfoForm.resx | 0 ...ctPromotionListSkuInfoEditForm.Designer.cs | 0 .../DouProductPromotionListSkuInfoEditForm.cs | 0 ...ouProductPromotionListSkuInfoEditForm.resx | 0 .../{ => Old}/FullMinusActiveForm.Designer.cs | 0 .../{ => Old}/FullMinusActiveForm.cs | 0 .../{ => Old}/FullMinusActiveForm.resx | 0 .../{ => Old}/FullMinusForm.Designer.cs | 0 .../{ => Old}/FullMinusForm.cs | 0 .../{ => Old}/FullMinusForm.resx | 0 .../{ => Old}/FullMinusShopForm.Designer.cs | 0 .../{ => Old}/FullMinusShopForm.cs | 0 .../{ => Old}/FullMinusShopForm.resx | 0 ...GroupBuyCustomActivityNameForm.Designer.cs | 0 .../GroupBuyCustomActivityNameForm.cs | 0 .../GroupBuyCustomActivityNameForm.resx | 0 .../{ => Old}/GroupBuyForm.Designer.cs | 0 .../{ => Old}/GroupBuyForm.cs | 0 .../{ => Old}/GroupBuyForm.resx | 0 .../{ => Old}/GroupBuyMonitorForm.Designer.cs | 0 .../{ => Old}/GroupBuyMonitorForm.cs | 0 .../{ => Old}/GroupBuyMonitorForm.resx | 0 .../{ => Old}/GroupBuyShopForm.Designer.cs | 0 .../{ => Old}/GroupBuyShopForm.cs | 0 .../{ => Old}/GroupBuyShopForm.resx | 0 .../LimitedSalesActivityNameForm.Designer.cs | 0 .../{ => Old}/LimitedSalesActivityNameForm.cs | 0 .../LimitedSalesActivityNameForm.resx | 0 .../LimitedSalesManagerActiveForm.Designer.cs | 0 .../LimitedSalesManagerActiveForm.cs | 0 .../LimitedSalesManagerActiveForm.resx | 0 .../SeckillingAndLimitedSalesForm.Designer.cs | 0 .../SeckillingAndLimitedSalesForm.cs | 0 .../SeckillingAndLimitedSalesForm.resx | 0 ...killingAndLimitedSalesShopForm.Designer.cs | 0 .../SeckillingAndLimitedSalesShopForm.cs | 0 .../SeckillingAndLimitedSalesShopForm.resx | 0 .../{ => Old}/UcCouponAddParam.Designer.cs | 0 .../{ => Old}/UcCouponAddParam.cs | 0 .../{ => Old}/UcCouponAddParam.resx | 0 .../SalesCenterForm.Designer.cs | 44 +- .../SalesCenterForms/SalesCenterForm.cs | 6 +- TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs | 3 +- TEMUKJD/KJDForms/ShopForms/ShopListForm.cs | 3 +- .../ShopForms/SubAccountShopEditForm.cs | 9 +- TEMUKJD/MainForm.designer.cs | 1 - 69 files changed, 1729 insertions(+), 134 deletions(-) create mode 100644 AllBase/Model/Result/TemuActivityInfo.cs create mode 100644 TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs create mode 100644 TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs create mode 100644 TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.resx rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/CouponForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/CouponForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/CouponForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/CouponMulitAddForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/CouponMulitAddForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/CouponMulitAddForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/CouponShopForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/CouponShopForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/CouponShopForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/DouProductProPromotionListSkuInfoForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/DouProductProPromotionListSkuInfoForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/DouProductProPromotionListSkuInfoForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/DouProductPromotionListSkuInfoEditForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/DouProductPromotionListSkuInfoEditForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/DouProductPromotionListSkuInfoEditForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/FullMinusActiveForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/FullMinusActiveForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/FullMinusActiveForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/FullMinusForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/FullMinusForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/FullMinusForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/FullMinusShopForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/FullMinusShopForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/FullMinusShopForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyCustomActivityNameForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyCustomActivityNameForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyCustomActivityNameForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyMonitorForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyMonitorForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyMonitorForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyShopForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyShopForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/GroupBuyShopForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/LimitedSalesActivityNameForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/LimitedSalesActivityNameForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/LimitedSalesActivityNameForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/LimitedSalesManagerActiveForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/LimitedSalesManagerActiveForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/LimitedSalesManagerActiveForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/SeckillingAndLimitedSalesForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/SeckillingAndLimitedSalesForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/SeckillingAndLimitedSalesForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/SeckillingAndLimitedSalesShopForm.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/SeckillingAndLimitedSalesShopForm.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/SeckillingAndLimitedSalesShopForm.resx (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/UcCouponAddParam.Designer.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/UcCouponAddParam.cs (100%) rename TEMUKJD/KJDForms/SalesCenterForms/{ => Old}/UcCouponAddParam.resx (100%) diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj index 769990f..703da7f 100644 --- a/AllBase/AllBase.csproj +++ b/AllBase/AllBase.csproj @@ -193,6 +193,7 @@ + diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 80f75b7..c9d4be3 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,8 +27,8 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 397; - //public static int VersionCount = 397; + public static int VersionCount = 398; + //public static int VersionCount = 398; /// /// 版本号 diff --git a/AllBase/Model/Result/TemuActivityInfo.cs b/AllBase/Model/Result/TemuActivityInfo.cs new file mode 100644 index 0000000..7b5f748 --- /dev/null +++ b/AllBase/Model/Result/TemuActivityInfo.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AllBase.Model.Result +{ + public class TemuActivityInfo + { + public string activityLabelDesc { get; set; } + public string activityContent { get; set; } + public long? sessionEndTime { get; set; } + public string activityLabelTag { get; set; } + public long? sessionStartTime { get; set; } + public string activityName { get; set; } //大促进阶-限时活动 + public List thematicList { get; set; } + public long? autoAssignEndTime { get; set; } + public long? autoAssignStartTime { get; set; } + public List benefitLabelName { get; set; } + public object sessionList { get; set; } + public int? sessionAssignType { get; set; } + public object sessionAggList { get; set; } + public int activityType { get; set; } + } + + public class TemuActivityThematicInfo + { + public object canEnrollTotal { get; set; } + public string activityLabelDesc { get; set; } + public long? enrollDeadLine { get; set; } + public string activityLabelTag { get; set; } + public List sites { get; set; } + public string activityThematicContent { get; set; } + public long? activityThematicId { get; set; } + public int? durationDays { get; set; } + public List benefitLabelName { get; set; } + public int? enrollSource { get; set; } + public string salePromotionLabel { get; set; } + public int? enrolledCount { get; set; } + public long? enrollStartAt { get; set; } + public long? startTime { get; set; } + public long? endTime { get; set; } + public List activityLabelList { get; set; } + public string activityThematicName { get; set; } + public string discount { get; set; } = "-"; + } + + public class TemuActivitySiteInfo + { + public string siteName { get; set; } + public int? siteId { get; set; } + } + + public class TemuActivityLabelInfo + { + public string value { get; set; } + public int? key { get; set; } + } +} diff --git a/KJDService/KJD_WebService/BLL/ShopManage.cs b/KJDService/KJD_WebService/BLL/ShopManage.cs index dd2b782..ac73b6d 100644 --- a/KJDService/KJD_WebService/BLL/ShopManage.cs +++ b/KJDService/KJD_WebService/BLL/ShopManage.cs @@ -50,7 +50,7 @@ namespace KJD_Web.BLL if (isAdmin) where += " and (cookie='' or shop_id!='')"; if (!isAdmin) - where += " and (user_name='" + user_name + "' or sub_user_name='" + user_name + "')"; + where += " and (user_name='" + user_name + "' or sub_user_name like '%" + user_name + "%')"; if (!string.IsNullOrWhiteSpace(operate_sub_sa_name)) where += " and operate_sub_sa_name='" + operate_sub_sa_name + "'"; if (!string.IsNullOrWhiteSpace(search_user_name)) @@ -309,7 +309,7 @@ namespace KJD_Web.BLL user_name = RegexUtils.GetStringQuery(ref inputData, "shop_user_name"); string login_name = RegexUtils.GetStringQuery(ref inputData, "login_name"); string login_pass = RegexUtils.GetStringQuery(ref inputData, "login_pass"); - string sub_user_name = RegexUtils.GetStringQuery(ref inputData, "sub_user_name"); + string sub_user_name = HtmlUtils.UrlDecodeUtf8(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"); @@ -353,7 +353,7 @@ namespace KJD_Web.BLL if (login_status != null) sql += " login_status='" + login_status + "',"; sql = sql.TrimEnd(','); - sql += " where login_name='" + login_name + "' and (user_name='" + user_name + "' or sub_user_name='" + user_name + "')"; + sql += " where login_name='" + login_name + "' and (user_name='" + user_name + "' or sub_user_name like '%" + user_name + "%')"; if (!string.IsNullOrEmpty(old_shop_id)) sql += " and shop_id='" + old_shop_id + "'"; diff --git a/TEMUKJD/Extension/DataGridViewExtension.cs b/TEMUKJD/Extension/DataGridViewExtension.cs index db62b6b..9dd12ee 100644 --- a/TEMUKJD/Extension/DataGridViewExtension.cs +++ b/TEMUKJD/Extension/DataGridViewExtension.cs @@ -51,7 +51,8 @@ namespace TemuKJD.Extension public static CheckBox AddHeaderCheckBox(this DataGridViewColumn column, HorizontalAlignment align = HorizontalAlignment.Center, int leftBorderOffset = 0, int rightBorderOffset = 0, Func getValue = null, Action setValue = null, bool isSetCheckedChangedEvent = true, CheckBox checkBox = null, bool isClearHeaderText = false) { - if (column.DataGridView == null) throw new ArgumentNullException("First you need to add the column to grid."); + if (column?.DataGridView == null) //throw new ArgumentNullException("First you need to add the column to grid."); + MessageBox.Show("DataGridView中没有对应的CheckBox列"); // Creating checkbox without panel if (checkBox == null) diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index ec7daa8..b07395a 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -331,100 +331,106 @@ UserSelectThirdProductForm.cs - + Form - + + MarketingActivityForm.cs + + + Form + + FullMinusActiveForm.cs - + Form - + FullMinusForm.cs - + Form - + FullMinusShopForm.cs - + Form - + GroupBuyMonitorForm.cs - + Form - + LimitedSalesActivityNameForm.cs - + Form - + GroupBuyCustomActivityNameForm.cs - + Form - + GroupBuyForm.cs - + Form - + GroupBuyShopForm.cs - + Form - + LimitedSalesManagerActiveForm.cs - + UserControl - + UcCouponAddParam.cs - + Form - + CouponForm.cs - + Form - + CouponMulitAddForm.cs - + Form - + CouponShopForm.cs - + Form - + DouProductPromotionListSkuInfoEditForm.cs - + Form - + DouProductProPromotionListSkuInfoForm.cs - + Form - + SeckillingAndLimitedSalesForm.cs @@ -433,10 +439,10 @@ SalesCenterForm.cs - + Form - + SeckillingAndLimitedSalesShopForm.cs @@ -936,58 +942,61 @@ UserSelectThirdProductForm.cs - + + MarketingActivityForm.cs + + FullMinusActiveForm.cs - + FullMinusForm.cs - + FullMinusShopForm.cs - + GroupBuyMonitorForm.cs - + LimitedSalesActivityNameForm.cs - + GroupBuyCustomActivityNameForm.cs - + GroupBuyForm.cs - + GroupBuyShopForm.cs - + LimitedSalesManagerActiveForm.cs - + UcCouponAddParam.cs - + CouponForm.cs - + CouponMulitAddForm.cs - + CouponShopForm.cs - + DouProductPromotionListSkuInfoEditForm.cs - + DouProductProPromotionListSkuInfoForm.cs SalesCenterForm.cs - + SeckillingAndLimitedSalesForm.cs - + SeckillingAndLimitedSalesShopForm.cs diff --git a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.Designer.cs index 1477f11..dd9090d 100644 --- a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.Designer.cs @@ -35,7 +35,7 @@ namespace TemuKJD.KJDForms.ProductForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtScale1 = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); this.btnStartStockUp = new DevComponents.DotNetBar.PanelEx(); @@ -79,7 +79,7 @@ namespace TemuKJD.KJDForms.ProductForms this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); - this.ucGroupBoxEx4.SuspendLayout(); + this.ucGroupBoxEx3.SuspendLayout(); this.ucGroupBoxEx2.SuspendLayout(); this.ucGroupBoxEx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); @@ -108,7 +108,7 @@ namespace TemuKJD.KJDForms.ProductForms // // splitContainer1.Panel1 // - this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx4); + this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx3); this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx2); this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx1); // @@ -121,20 +121,20 @@ namespace TemuKJD.KJDForms.ProductForms // // ucGroupBoxEx4 // - this.ucGroupBoxEx4.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; - this.ucGroupBoxEx4.Controls.Add(this.txtScale1); - this.ucGroupBoxEx4.Controls.Add(this.label10); - this.ucGroupBoxEx4.Controls.Add(this.btnStartStockUp); - this.ucGroupBoxEx4.Location = new System.Drawing.Point(272, 2); - this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; - this.ucGroupBoxEx4.Size = new System.Drawing.Size(836, 120); - this.ucGroupBoxEx4.TabIndex = 666; - this.ucGroupBoxEx4.TabStop = false; - this.ucGroupBoxEx4.Text = "拒绝跟价"; + this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.Controls.Add(this.txtScale1); + this.ucGroupBoxEx3.Controls.Add(this.label10); + this.ucGroupBoxEx3.Controls.Add(this.btnStartStockUp); + this.ucGroupBoxEx3.Location = new System.Drawing.Point(272, 2); + this.ucGroupBoxEx3.Name = "ucGroupBoxEx4"; + this.ucGroupBoxEx3.Size = new System.Drawing.Size(836, 120); + this.ucGroupBoxEx3.TabIndex = 666; + this.ucGroupBoxEx3.TabStop = false; + this.ucGroupBoxEx3.Text = "拒绝跟价"; // // txtScale1 // @@ -656,8 +656,8 @@ namespace TemuKJD.KJDForms.ProductForms this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); - this.ucGroupBoxEx4.ResumeLayout(false); - this.ucGroupBoxEx4.PerformLayout(); + this.ucGroupBoxEx3.ResumeLayout(false); + this.ucGroupBoxEx3.PerformLayout(); this.ucGroupBoxEx2.ResumeLayout(false); this.ucGroupBoxEx2.PerformLayout(); this.ucGroupBoxEx1.ResumeLayout(false); @@ -682,7 +682,7 @@ namespace TemuKJD.KJDForms.ProductForms #endregion private System.Windows.Forms.SplitContainer splitContainer1; - private UserComponent.UcGroupBoxEx ucGroupBoxEx4; + private UserComponent.UcGroupBoxEx ucGroupBoxEx3; private DevComponents.DotNetBar.PanelEx btnStartStockUp; private UserComponent.UcGroupBoxEx ucGroupBoxEx2; private DevComponents.DotNetBar.PanelEx btnSearchPrice; diff --git a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs index b98db43..ebda321 100644 --- a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs @@ -40,6 +40,7 @@ namespace TemuKJD.KJDForms.ProductForms this.dgvAdjust.AddSelectorColumn("colCheck"); } + private void chkSelectAll_CheckedChanged(object sender, EventArgs e) { if (!chkSelectAll.Checked) @@ -131,7 +132,10 @@ namespace TemuKJD.KJDForms.ProductForms case "colSelect": dgvShop.CellContentClick -= dgvShop_CellContentClick; dgvShop_CellContentClick(sender, e); - //dgvShop.CellContentClick += dgvShop_CellContentClick; + break; + default: + dgvShop.CellContentClick -= dgvShop_CellContentClick; + dgvShop.CellContentClick += dgvShop_CellContentClick; break; } } @@ -201,7 +205,7 @@ namespace TemuKJD.KJDForms.ProductForms } ucGroupBoxEx2.Enabled = false; - ucGroupBoxEx4.Enabled = false; + ucGroupBoxEx3.Enabled = false; cancellationTokenSource = new CancellationTokenSource(); Task.Run(() => @@ -375,7 +379,7 @@ namespace TemuKJD.KJDForms.ProductForms { chkHasSuccess.Enabled = true; ucGroupBoxEx2.Enabled = true; - ucGroupBoxEx4.Enabled = true; + ucGroupBoxEx3.Enabled = true; string sRst = "查询结束！"; if (cancellationTokenSource.IsCancellationRequested) sRst = "已取消查询！"; @@ -423,7 +427,7 @@ namespace TemuKJD.KJDForms.ProductForms Invoke(new Action(() => { ucGroupBoxEx2.Enabled = true; - ucGroupBoxEx4.Enabled = true; + ucGroupBoxEx3.Enabled = true; })); }); } @@ -446,7 +450,7 @@ namespace TemuKJD.KJDForms.ProductForms } ucGroupBoxEx2.Enabled = false; - ucGroupBoxEx4.Enabled = false; + ucGroupBoxEx3.Enabled = false; cancellationTokenSource = new CancellationTokenSource(); Task.Run(() => @@ -542,7 +546,7 @@ namespace TemuKJD.KJDForms.ProductForms Invoke(new Action(() => { ucGroupBoxEx2.Enabled = true; - ucGroupBoxEx4.Enabled = true; + ucGroupBoxEx3.Enabled = true; string sRst = "操作结束(拒绝跟价)！"; if (cancellationTokenSource.IsCancellationRequested) sRst = "已取消操作(拒绝跟价)！"; diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs index d83644e..a8a850d 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs @@ -66,8 +66,6 @@ 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(); @@ -93,6 +91,8 @@ 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(); @@ -546,29 +546,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 = "选择"; @@ -772,6 +749,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; + // // DbProductSelectListManageForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs new file mode 100644 index 0000000..4dc3fce --- /dev/null +++ b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs @@ -0,0 +1,779 @@ + +namespace TemuKJD.KJDForms.SalesCenterForms +{ + partial class MarketingActivityForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnSearchActivity = new DevComponents.DotNetBar.PanelEx(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); + this.colSelect = new TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components); + this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.splitContainer5 = new System.Windows.Forms.SplitContainer(); + this.dgvActivity = new TemuKJD.UserComponent.DataGridViewEx(); + this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx(); + this.colCheckProduct = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSupplierName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colPic = new System.Windows.Forms.DataGridViewImageColumn(); + this.colProdName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSpuId = new System.Windows.Forms.DataGridViewLinkColumn(); + this.coSkcId = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colRecommendPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colRecommendInventory = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colPrcie = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colInventory = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.btnClear = new DevComponents.DotNetBar.PanelEx(); + this.chkFullShop = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkNoSaleProd = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.colCheckActivity = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colActivityId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colActivityName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colActivityTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSignUpTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDiscount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.ucGroupBoxEx1.SuspendLayout(); + this.ucGroupBoxEx2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); + this.splitContainer3.Panel1.SuspendLayout(); + this.splitContainer3.Panel2.SuspendLayout(); + this.splitContainer3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); + this.splitContainer5.Panel1.SuspendLayout(); + this.splitContainer5.Panel2.SuspendLayout(); + this.splitContainer5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvActivity)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); + this.splitContainer4.Panel1.SuspendLayout(); + this.splitContainer4.Panel2.SuspendLayout(); + this.splitContainer4.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx3); + this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx1); + this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx2); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); + this.splitContainer1.Size = new System.Drawing.Size(978, 544); + this.splitContainer1.SplitterDistance = 120; + this.splitContainer1.TabIndex = 11; + // + // ucGroupBoxEx3 + // + this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.Location = new System.Drawing.Point(272, 2); + this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; + this.ucGroupBoxEx3.Size = new System.Drawing.Size(704, 120); + this.ucGroupBoxEx3.TabIndex = 666; + this.ucGroupBoxEx3.TabStop = false; + this.ucGroupBoxEx3.Text = "活动设置"; + // + // ucGroupBoxEx1 + // + this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); + this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); + this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; + this.ucGroupBoxEx1.Size = new System.Drawing.Size(144, 120); + this.ucGroupBoxEx1.TabIndex = 399; + this.ucGroupBoxEx1.TabStop = false; + this.ucGroupBoxEx1.Text = "基础"; + // + // btnRefreshShop + // + this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | 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(17, 31); + this.btnRefreshShop.Name = "btnRefreshShop"; + this.btnRefreshShop.Size = new System.Drawing.Size(110, 24); + this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRefreshShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRefreshShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRefreshShop.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRefreshShop.Style.GradientAngle = 90; + this.btnRefreshShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefreshShop.TabIndex = 431; + this.btnRefreshShop.Text = "刷新店铺"; + this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click); + // + // ucGroupBoxEx2 + // + this.ucGroupBoxEx2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.Controls.Add(this.btnSearchActivity); + this.ucGroupBoxEx2.Location = new System.Drawing.Point(147, 2); + this.ucGroupBoxEx2.Name = "ucGroupBoxEx2"; + this.ucGroupBoxEx2.Size = new System.Drawing.Size(125, 120); + this.ucGroupBoxEx2.TabIndex = 469; + this.ucGroupBoxEx2.TabStop = false; + this.ucGroupBoxEx2.Text = "读取活动"; + // + // btnSearchActivity + // + this.btnSearchActivity.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSearchActivity.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSearchActivity.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSearchActivity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSearchActivity.Location = new System.Drawing.Point(25, 32); + this.btnSearchActivity.Name = "btnSearchActivity"; + this.btnSearchActivity.Size = new System.Drawing.Size(70, 23); + this.btnSearchActivity.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearchActivity.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearchActivity.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearchActivity.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSearchActivity.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSearchActivity.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSearchActivity.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSearchActivity.Style.GradientAngle = 90; + this.btnSearchActivity.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearchActivity.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearchActivity.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearchActivity.TabIndex = 427; + this.btnSearchActivity.Text = "读取活动"; + this.btnSearchActivity.Click += new System.EventHandler(this.btnSearchActivity_Click); + // + // splitContainer3 + // + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer3.Location = new System.Drawing.Point(0, 0); + this.splitContainer3.Name = "splitContainer3"; + this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer3.Panel1 + // + this.splitContainer3.Panel1.Controls.Add(this.splitContainer2); + // + // splitContainer3.Panel2 + // + this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); + this.splitContainer3.Size = new System.Drawing.Size(978, 420); + this.splitContainer3.SplitterDistance = 390; + this.splitContainer3.TabIndex = 1; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.dgvShop); + this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.splitContainer5); + this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); + this.splitContainer2.Size = new System.Drawing.Size(978, 390); + this.splitContainer2.SplitterDistance = 270; + this.splitContainer2.TabIndex = 0; + // + // dgvShop + // + this.dgvShop.AllowUserToAddRows = false; + this.dgvShop.AllowUserToDeleteRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvShop.BackgroundColor = System.Drawing.Color.White; + this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colSelect, + this.colShopLoginName, + this.colShopId, + this.colShopName, + this.colLoginStatus, + this.colCanUse, + this.colMessage}); + this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvShop.Location = new System.Drawing.Point(4, 0); + this.dgvShop.Name = "dgvShop"; + this.dgvShop.ReadOnly = true; + this.dgvShop.RowHeadersWidth = 30; + this.dgvShop.RowTemplate.Height = 23; + this.dgvShop.Size = new System.Drawing.Size(266, 390); + this.dgvShop.TabIndex = 7; + this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick); + this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); + // + // colSelect + // + this.colSelect.HeaderText = "全选"; + this.colSelect.Name = "colSelect"; + this.colSelect.ReadOnly = true; + this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSelect.Width = 28; + // + // colShopLoginName + // + this.colShopLoginName.HeaderText = "店铺登录名"; + this.colShopLoginName.Name = "colShopLoginName"; + this.colShopLoginName.ReadOnly = true; + this.colShopLoginName.Visible = false; + // + // colShopId + // + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + this.colShopId.Visible = false; + this.colShopId.Width = 55; + // + // colShopName + // + this.colShopName.FillWeight = 150F; + this.colShopName.HeaderText = "店铺名称"; + this.colShopName.Name = "colShopName"; + this.colShopName.ReadOnly = true; + this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colShopName.Width = 75; + // + // colLoginStatus + // + this.colLoginStatus.HeaderText = "登录状态"; + this.colLoginStatus.Name = "colLoginStatus"; + this.colLoginStatus.ReadOnly = true; + this.colLoginStatus.Width = 65; + // + // colCanUse + // + this.colCanUse.HeaderText = "可用"; + this.colCanUse.Name = "colCanUse"; + this.colCanUse.ReadOnly = true; + this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCanUse.Width = 28; + // + // colMessage + // + this.colMessage.HeaderText = "消息"; + this.colMessage.Name = "colMessage"; + this.colMessage.ReadOnly = true; + this.colMessage.Width = 120; + // + // splitContainer5 + // + this.splitContainer5.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer5.Location = new System.Drawing.Point(0, 0); + this.splitContainer5.Name = "splitContainer5"; + this.splitContainer5.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer5.Panel1 + // + this.splitContainer5.Panel1.Controls.Add(this.dgvActivity); + // + // splitContainer5.Panel2 + // + this.splitContainer5.Panel2.Controls.Add(this.dgvProduct); + this.splitContainer5.Size = new System.Drawing.Size(700, 390); + this.splitContainer5.SplitterDistance = 134; + this.splitContainer5.TabIndex = 0; + // + // dgvActivity + // + this.dgvActivity.AllowUserToAddRows = false; + this.dgvActivity.AllowUserToDeleteRows = false; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvActivity.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dgvActivity.BackgroundColor = System.Drawing.Color.White; + this.dgvActivity.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvActivity.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + this.dgvActivity.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvActivity.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colCheckActivity, + this.colActivityId, + this.colActivityName, + this.colActivityTime, + this.colSignUpTime, + this.colDiscount, + this.dataGridViewTextBoxColumn9}); + this.dgvActivity.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvActivity.Location = new System.Drawing.Point(0, 0); + this.dgvActivity.Name = "dgvActivity"; + this.dgvActivity.ReadOnly = true; + this.dgvActivity.RowTemplate.Height = 23; + this.dgvActivity.Size = new System.Drawing.Size(700, 134); + this.dgvActivity.TabIndex = 189; + // + // dgvProduct + // + this.dgvProduct.AllowUserToAddRows = false; + this.dgvProduct.AllowUserToDeleteRows = false; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + this.dgvProduct.BackgroundColor = System.Drawing.Color.White; + this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + 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.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; + this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colCheckProduct, + this.colSupplierId, + this.colSupplierName, + this.colPic, + this.colProdName, + this.colSpuId, + this.coSkcId, + this.colExtCode, + this.colRecommendPrice, + this.colRecommendInventory, + this.colPrcie, + this.colInventory, + this.colMsg}); + this.dgvProduct.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvProduct.Location = new System.Drawing.Point(0, 0); + this.dgvProduct.Name = "dgvProduct"; + this.dgvProduct.ReadOnly = true; + this.dgvProduct.RowTemplate.Height = 23; + this.dgvProduct.Size = new System.Drawing.Size(700, 252); + this.dgvProduct.TabIndex = 188; + // + // colCheckProduct + // + this.colCheckProduct.HeaderText = "选择"; + this.colCheckProduct.Name = "colCheckProduct"; + this.colCheckProduct.ReadOnly = true; + this.colCheckProduct.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCheckProduct.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCheckProduct.Width = 30; + // + // colSupplierId + // + this.colSupplierId.HeaderText = "店铺Id"; + this.colSupplierId.Name = "colSupplierId"; + this.colSupplierId.ReadOnly = true; + // + // colSupplierName + // + this.colSupplierName.HeaderText = "店铺名称"; + this.colSupplierName.Name = "colSupplierName"; + this.colSupplierName.ReadOnly = true; + this.colSupplierName.Width = 110; + // + // colPic + // + this.colPic.HeaderText = "图片"; + this.colPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colPic.Name = "colPic"; + this.colPic.ReadOnly = true; + this.colPic.Visible = false; + this.colPic.Width = 60; + // + // colProdName + // + this.colProdName.HeaderText = "标题"; + this.colProdName.Name = "colProdName"; + this.colProdName.ReadOnly = true; + this.colProdName.Width = 150; + // + // colSpuId + // + this.colSpuId.HeaderText = "商品SPU"; + this.colSpuId.Name = "colSpuId"; + this.colSpuId.ReadOnly = true; + this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // coSkcId + // + this.coSkcId.FillWeight = 150F; + this.coSkcId.HeaderText = "商品SKC"; + this.coSkcId.Name = "coSkcId"; + this.coSkcId.ReadOnly = true; + this.coSkcId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.coSkcId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.coSkcId.Width = 80; + // + // colExtCode + // + this.colExtCode.HeaderText = "货号"; + this.colExtCode.Name = "colExtCode"; + this.colExtCode.ReadOnly = true; + this.colExtCode.Width = 90; + // + // colRecommendPrice + // + this.colRecommendPrice.HeaderText = "推荐价格(折扣)"; + this.colRecommendPrice.Name = "colRecommendPrice"; + this.colRecommendPrice.ReadOnly = true; + this.colRecommendPrice.Width = 70; + // + // colRecommendInventory + // + this.colRecommendInventory.HeaderText = "推荐库存"; + this.colRecommendInventory.Name = "colRecommendInventory"; + this.colRecommendInventory.ReadOnly = true; + this.colRecommendInventory.Width = 65; + // + // colPrcie + // + this.colPrcie.HeaderText = "申报价格"; + this.colPrcie.Name = "colPrcie"; + this.colPrcie.ReadOnly = true; + this.colPrcie.Width = 90; + // + // colInventory + // + this.colInventory.HeaderText = "活动库存"; + this.colInventory.Name = "colInventory"; + this.colInventory.ReadOnly = true; + // + // colMsg + // + this.colMsg.HeaderText = "状态"; + this.colMsg.Name = "colMsg"; + this.colMsg.ReadOnly = true; + this.colMsg.Width = 400; + // + // splitContainer4 + // + this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer4.Location = new System.Drawing.Point(0, 0); + this.splitContainer4.Name = "splitContainer4"; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.statusBar); + // + // splitContainer4.Panel2 + // + this.splitContainer4.Panel2.Controls.Add(this.panelEx1); + this.splitContainer4.Panel2.Controls.Add(this.btnClear); + this.splitContainer4.Size = new System.Drawing.Size(978, 26); + this.splitContainer4.SplitterDistance = 700; + this.splitContainer4.TabIndex = 3; + // + // 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(700, 26); + this.statusBar.TabIndex = 2; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(155, 0); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(115, 21); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + 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.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + 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 = 668; + this.panelEx1.Text = "停止当前操作"; + // + // btnClear + // + this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClear.Location = new System.Drawing.Point(47, 0); + this.btnClear.Name = "btnClear"; + this.btnClear.Size = new System.Drawing.Size(90, 21); + this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.Style.GradientAngle = 90; + this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.TabIndex = 440; + this.btnClear.Text = "清空结果"; + this.btnClear.Visible = false; + // + // chkFullShop + // + this.chkFullShop.AutoSize = true; + this.chkFullShop.Location = new System.Drawing.Point(18, 22); + this.chkFullShop.Name = "chkFullShop"; + this.chkFullShop.Size = new System.Drawing.Size(96, 16); + this.chkFullShop.TabIndex = 684; + this.chkFullShop.Text = "报名全店活动"; + this.chkFullShop.UseVisualStyleBackColor = true; + this.chkFullShop.CheckedChanged += new System.EventHandler(this.chkFullShop_CheckedChanged); + // + // chkNoSaleProd + // + this.chkNoSaleProd.AutoSize = true; + this.chkNoSaleProd.Location = new System.Drawing.Point(18, 44); + this.chkNoSaleProd.Name = "chkNoSaleProd"; + this.chkNoSaleProd.Size = new System.Drawing.Size(96, 16); + this.chkNoSaleProd.TabIndex = 685; + this.chkNoSaleProd.Text = "算法报名活动"; + this.chkNoSaleProd.UseVisualStyleBackColor = true; + this.chkNoSaleProd.CheckedChanged += new System.EventHandler(this.chkNoSaleProd_CheckedChanged); + // + // colCheckActivity + // + this.colCheckActivity.HeaderText = "选择"; + this.colCheckActivity.Name = "colCheckActivity"; + this.colCheckActivity.ReadOnly = true; + this.colCheckActivity.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCheckActivity.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCheckActivity.Width = 30; + // + // colActivityId + // + this.colActivityId.HeaderText = "活动编号"; + this.colActivityId.Name = "colActivityId"; + this.colActivityId.ReadOnly = true; + this.colActivityId.Visible = false; + // + // colActivityName + // + this.colActivityName.HeaderText = "活动主题"; + this.colActivityName.Name = "colActivityName"; + this.colActivityName.ReadOnly = true; + this.colActivityName.Width = 280; + // + // colActivityTime + // + this.colActivityTime.HeaderText = "活动时间"; + this.colActivityTime.Name = "colActivityTime"; + this.colActivityTime.ReadOnly = true; + this.colActivityTime.Width = 320; + // + // colSignUpTime + // + this.colSignUpTime.HeaderText = "报名截止"; + this.colSignUpTime.Name = "colSignUpTime"; + this.colSignUpTime.ReadOnly = true; + this.colSignUpTime.Width = 110; + // + // colDiscount + // + this.colDiscount.HeaderText = "活动折扣"; + this.colDiscount.Name = "colDiscount"; + this.colDiscount.ReadOnly = true; + // + // dataGridViewTextBoxColumn9 + // + this.dataGridViewTextBoxColumn9.HeaderText = "状态"; + this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; + this.dataGridViewTextBoxColumn9.ReadOnly = true; + this.dataGridViewTextBoxColumn9.Width = 400; + // + // MarketingActivityForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(978, 544); + this.Controls.Add(this.splitContainer1); + this.Name = "MarketingActivityForm"; + this.Text = "店铺优化"; + this.Load += new System.EventHandler(this.MarketingActivityForm_Load); + this.VisibleChanged += new System.EventHandler(this.MarketingActivityForm_VisibleChanged); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.ucGroupBoxEx1.ResumeLayout(false); + this.ucGroupBoxEx2.ResumeLayout(false); + this.splitContainer3.Panel1.ResumeLayout(false); + this.splitContainer3.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); + this.splitContainer3.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); + this.splitContainer5.Panel1.ResumeLayout(false); + this.splitContainer5.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).EndInit(); + this.splitContainer5.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dgvActivity)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).EndInit(); + this.splitContainer4.Panel1.ResumeLayout(false); + this.splitContainer4.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit(); + this.splitContainer4.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private UserComponent.UcGroupBoxEx ucGroupBoxEx3; + private DevComponents.DotNetBar.PanelEx btnSearchActivity; + private DevComponents.DotNetBar.PanelEx btnRefreshShop; + private System.Windows.Forms.SplitContainer splitContainer2; + private System.Windows.Forms.SplitContainer splitContainer3; + private System.Windows.Forms.SplitContainer splitContainer4; + private UserControls.StatusBarUserControl statusBar; + private DevComponents.DotNetBar.PanelEx panelEx1; + private DevComponents.DotNetBar.PanelEx btnClear; + private UserComponent.UcCheckBox chkNoSaleProd; + private UserComponent.UcCheckBox chkFullShop; + private UserComponent.UcGroupBoxEx ucGroupBoxEx2; + private UserComponent.UcGroupBoxEx ucGroupBoxEx1; + private System.Windows.Forms.SplitContainer splitContainer5; + private UserComponent.DataGridViewEx dgvShop; + private UserComponent.UcDataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; + private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; + private UserComponent.DataGridViewEx dgvProduct; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCheckProduct; + private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; + private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName; + private System.Windows.Forms.DataGridViewImageColumn colPic; + private System.Windows.Forms.DataGridViewTextBoxColumn colProdName; + private System.Windows.Forms.DataGridViewLinkColumn colSpuId; + private System.Windows.Forms.DataGridViewLinkColumn coSkcId; + private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode; + private System.Windows.Forms.DataGridViewTextBoxColumn colRecommendPrice; + private System.Windows.Forms.DataGridViewTextBoxColumn colRecommendInventory; + private System.Windows.Forms.DataGridViewTextBoxColumn colPrcie; + private System.Windows.Forms.DataGridViewTextBoxColumn colInventory; + private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; + private UserComponent.DataGridViewEx dgvActivity; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCheckActivity; + private System.Windows.Forms.DataGridViewTextBoxColumn colActivityId; + private System.Windows.Forms.DataGridViewTextBoxColumn colActivityName; + private System.Windows.Forms.DataGridViewTextBoxColumn colActivityTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colSignUpTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colDiscount; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; + } +} \ No newline at end of file diff --git a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs new file mode 100644 index 0000000..c6dceb4 --- /dev/null +++ b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.cs @@ -0,0 +1,536 @@ +using AllBase; +using AllBase.Helper; +using AllBase.Model.Result; +using NaiBa.Util.Extension; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.Windows.Forms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.ShopForms; + +namespace TemuKJD.KJDForms.SalesCenterForms +{ + public partial class MarketingActivityForm : Form + { + private CheckBox chkSelectAll = null; + public CancellationTokenSource cancellationTokenSource { get; set; } = null; + public List lstActivityThematic { get; set; } = new List(); + + public MarketingActivityForm() + { + InitializeComponent(); + } + + private void MarketingActivityForm_Load(object sender, EventArgs e) + { + chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false); + dgvShop.Columns["colSelect"].HeaderText = ""; + chkSelectAll.Width = chkSelectAll.Height = 13; + chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged; + + this.dgvActivity.AddSelectorColumn("colCheckActivity"); + this.dgvProduct.AddSelectorColumn("colCheckProduct"); + } + + private void chkSelectAll_CheckedChanged(object sender, EventArgs e) + { + if (!chkSelectAll.Checked) + { + foreach (DataGridViewRow row in dgvShop.Rows) + { + row.Cells["colSelect"].Value = false; + } + } + else + { + var list = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus2 == "国际版在线").Select(ss => ss.ShopId); + foreach (DataGridViewRow row in dgvShop.Rows) + { + if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString())) + row.Cells["colSelect"].Value = true; + } + } + } + + private void MarketingActivityForm_VisibleChanged(object sender, EventArgs e) + { + if (this.Visible) + RefreshShop(); + } + + private void btnRefreshShop_Click(object sender, EventArgs e) + { + RefreshShop(); + } + + private void RefreshShop() + { + // 店铺Id + var selectIds = dgvShop.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); + // 获取被删除的店铺 + List dgvRowList = dgvShop.Rows.Cast().Where(row + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + // 更新被删除的店铺列表 + foreach (var row in dgvRowList) + { + dgvShop.Rows.Remove(row); + } + // 绑定其他店铺（含新导入的店铺） + foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + { + if (!string.IsNullOrEmpty(shopEntity.ShopId)) + BindShop(shopEntity, selectIds); + } + } + + private void BindShop(ShopLoginInfo shopEntity, List selectShopId = null) + { + if (shopEntity == null) + return; + if (selectShopId == null) + selectShopId = new List(); + + bool canUse = shopEntity.LoginStatus2 == "国际版在线"; + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); + if (row == null) + { + this.dgvShop.Rows.Add( + selectShopId.Contains(shopEntity.ShopId) && canUse, + shopEntity.LoginName, + shopEntity.ShopId, + shopEntity.ShopAccount, + shopEntity.LoginStatus2 == "国际版在线" ? "在线" : "未登录", + canUse, + string.Empty + ); + } + else + { + row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopId) && canUse; + row.Cells["colShopLoginName"].Value = shopEntity.LoginName; + row.Cells["colShopName"].Value = shopEntity.ShopAccount; + row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus2 == "国际版在线" ? "在线" : "未登录"; + row.Cells["colCanUse"].Value = canUse; + } + } + + private void dgvShop_CellClick(object sender, DataGridViewCellEventArgs e) + { + if (e.ColumnIndex < 0 || e.RowIndex < 0) + return; + string columnName = dgvShop.Columns[e.ColumnIndex].Name; + switch (columnName) + { + case "colSelect": + dgvShop.CellContentClick -= dgvShop_CellContentClick; + dgvShop_CellContentClick(sender, e); + break; + default: + dgvShop.CellContentClick -= dgvShop_CellContentClick; + dgvShop.CellContentClick += dgvShop_CellContentClick; + break; + } + } + + private void dgvShop_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.ColumnIndex < 0 || e.RowIndex < 0) + return; + string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText; + string columnName = dgvShop.Columns[e.ColumnIndex].Name; + long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); + string shopAccount = dgvShop.Rows[e.RowIndex].Cells["colShopName"].Value.ToString(); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); + var row = dgvShop.Rows[e.RowIndex]; + switch (columnName) + { + case "colSelect": + if (row.Cells["colCanUse"].Value.ParseToBool()) + { + row.Cells["colSelect"].Value = !row.Cells["colSelect"].Value.ParseToBool(); + + chkSelectAll.CheckedChanged -= chkSelectAll_CheckedChanged; + if (dgvShop.Rows.Cast().All(r => r.Cells["colSelect"].Value.ParseToBool())) + chkSelectAll.Checked = true; + else + chkSelectAll.Checked = false; + chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged; + } + else + { + BaseMsgForm.ShowInfo("店铺国际版未登录！"); + } + break; + } + } + + private void chkFullShop_CheckedChanged(object sender, EventArgs e) + { + + } + private void chkNoSaleProd_CheckedChanged(object sender, EventArgs e) + { + + } + + private void btnSearchActivity_Click(object sender, EventArgs e) + { + var lstShopId = dgvShop.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); + if (lstShopId.Count == 0) + { + BaseMsgForm.ShowInfo("请选择店铺！"); + return; + } + + #region 重置控件 + lstActivityThematic.Clear(); + dgvActivity.Rows.Clear(); + var dgvRows = this.dgvShop.Rows.Cast(); + foreach (var row in dgvRows) + { + row.Cells["colMessage"].Value = ""; + } + ucGroupBoxEx2.Enabled = false; + ucGroupBoxEx3.Enabled = false; + cancellationTokenSource = new CancellationTokenSource(); + #endregion + + Task.Run(() => + { + var lstShopIdTemp = new List(); + lstShopIdTemp.AddRange(lstShopId); + int i = 0; + + foreach (var shopId in lstShopIdTemp) + { + if (lstActivityThematic.Count > 0) + break; + + this.Invoke(new Action(() => + { + this.statusBar.lblTaskStatus.Text = "正在查询活动..."; + this.statusBar.pgbTaskProgress.Maximum = lstShopIdTemp.Count; + this.statusBar.UpdateProgressBar(i + 1); + i++; + })); + + if (cancellationTokenSource.IsCancellationRequested) + break; + + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + if (shop == null) + continue; + + #region 检测登录 + if (shop.LoginStatus2 != "国际版在线") + { + continue; + } + if (ShopListForm.Instance == null) + ShopListForm.Instance = new ShopListForm(); + ShopListForm.Instance.CheckShopLogin(new string[] { shop.LoginName }, false); + if (shop.LoginStatus2 != "国际版在线") + { + Invoke(new Action(() => + { + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopLoginName"].Value.ToString() == shop.LoginName); + foreach (var row in rows) + { + row.Cells["colMessage"].Value = "店铺掉线"; + row.Cells["colLoginStatus"].Value = "国际版未登录"; + row.Cells["colCanUse"].Value = false; + } + })); + continue; + } + #endregion + + Invoke(new Action(() => + { + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); + foreach (var row in rows) + { + row.Cells["colMessage"].Value = "正在查询"; + } + })); + + int page = 1; + int totalPage = 1; + bool isError = false; + string errMsg = ""; + while (page <= totalPage) + { + if (cancellationTokenSource.IsCancellationRequested) + break; + + int tryCount = 0; + tryAgain: + Thread.Sleep(100 + Randomx.GetId(200)); + string jsonStr = GetActivityList(shop); + if (jsonStr.Contains("指定的值含有无效的控制字符")) + { + Invoke(new Action(() => + { + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopLoginName"].Value.ToString() == shop.LoginName); + foreach (var row in rows) + { + row.Cells["colMessage"].Value = "店铺掉线"; + row.Cells["colLoginStatus"].Value = "国际版未登录"; + row.Cells["colCanUse"].Value = false; + } + })); + errMsg = "店铺可能已掉线，指定的值含有无效的控制字符"; + isError = true; + break; + } + if (jsonStr.Contains("当前操作人数太多，请稍后重试") && tryCount < 5) + { + tryCount++; + goto tryAgain; + } + + if (!jsonStr.Contains("\"success\":true")) + { + isError = true; + string sErr = BaseRegex.GetStringJson(ref jsonStr, "errorMsg"); + if (!string.IsNullOrWhiteSpace(sErr) && !errMsg.Contains(sErr)) + errMsg += sErr + " "; + page++; + continue; + } + + if (jsonStr.Contains("\"success\":true")) + { + var jArr = new JArray(); + try + { + var jObj = JObject.Parse(jsonStr); + jArr = jObj["result"]?["activityList"] as JArray; + if (jArr == null) + jArr = new JArray(); + } + catch (Exception ex) { BaseMsgForm.ShowError(ex.Message); } + foreach (var item in jArr) + { + string sItem = item.ToString(); + TemuActivityInfo pActivity = JsonHelper.DeserializeJsonToObject(sItem); // 反序列化得到类 + if (pActivity == null || pActivity.activityName != "大促进阶-限时活动") + continue; + + foreach (var pInfo in pActivity.thematicList) + { + lstActivityThematic.Add(pInfo); + string name = pInfo.activityThematicName; + pInfo.discount = BaseRegex.GetMatchRegexString(ref name, "(\\d{1,3}折)"); + pInfo.discount = string.IsNullOrWhiteSpace(pInfo.discount) ? "-" : pInfo.discount; + } + } + + int total = BaseRegex.GetStringJson(ref jsonStr, "total").ParseToInt(); + totalPage = Math.Ceiling(total / 10.0).ParseToInt(); + } + page++; + } + + Invoke(new Action(() => + { + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); + + if (!isError) + { + foreach (var row in rows) + { + row.Cells["colMessage"].Value = "已查询"; + } + } + else + { + foreach (var row in rows) + { + row.Cells["colMessage"].Value = "查询失败 " + errMsg; + } + } + })); + } + + foreach (var shopId in lstShopIdTemp) + { + if (cancellationTokenSource.IsCancellationRequested) + break; + + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + if (shop == null) + continue; + shop.LastRefreshDate = ""; + } + + i = 0; + // 查询所有活动是否有店铺可以报名，可报名的才显示 + foreach (var pInfo in lstActivityThematic) + { + this.Invoke(new Action(() => + { + this.statusBar.lblTaskStatus.Text = "正在查询活动" + (i + 1) + "..."; + this.statusBar.pgbTaskProgress.Maximum = lstActivityThematic.Count; + this.statusBar.UpdateProgressBar(i + 1); + i++; + })); + foreach (var shopId in lstShopIdTemp) + { + if (cancellationTokenSource.IsCancellationRequested) + break; + + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + if (shop == null) + continue; + + #region 检测登录 + if (shop.LoginStatus2 != "国际版在线") + { + continue; + } + if (ShopListForm.Instance == null) + ShopListForm.Instance = new ShopListForm(); + if (shop.LastRefreshDate == "") + ShopListForm.Instance.CheckShopLogin(new string[] { shop.LoginName }, false); + if (shop.LoginStatus2 != "国际版在线") + { + Invoke(new Action(() => + { + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopLoginName"].Value.ToString() == shop.LoginName); + foreach (var row in rows) + { + row.Cells["colMessage"].Value = "店铺掉线"; + row.Cells["colLoginStatus"].Value = "国际版未登录"; + row.Cells["colCanUse"].Value = false; + } + })); + continue; + } + #endregion + + int tryCount = 0; + tryAgain: + Thread.Sleep(100 + Randomx.GetId(200)); + string jsonStr = GetActivityMatch(shop, pInfo.activityThematicId.ParseToLong()); + if (jsonStr.Contains("指定的值含有无效的控制字符")) + { + Invoke(new Action(() => + { + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopLoginName"].Value.ToString() == shop.LoginName); + foreach (var row in rows) + { + row.Cells["colMessage"].Value = "店铺掉线"; + row.Cells["colLoginStatus"].Value = "国际版未登录"; + row.Cells["colCanUse"].Value = false; + } + })); + continue; + } + if (jsonStr.Contains("当前操作人数太多，请稍后重试") && tryCount < 5) + { + tryCount++; + goto tryAgain; + } + if (jsonStr.Contains("当前操作人数太多，请稍后重试")) + { + } + if (!jsonStr.Contains("\"success\":true")) + { + //isError = true; + //string sErr = BaseRegex.GetStringJson(ref jsonStr, "errorMsg"); + //if (!string.IsNullOrWhiteSpace(sErr) && !errMsg.Contains(sErr)) + // errMsg += sErr + " "; + //page++; + continue; + } + + if (jsonStr.Contains("\"success\":true")) + { + //var jArr = new JArray(); + //try + //{ + // var jObj = JObject.Parse(jsonStr); + // jArr = jObj["result"]?["activityList"] as JArray; + // if (jArr == null) + // jArr = new JArray(); + //} + //catch (Exception ex) { BaseMsgForm.ShowError(ex.Message); } + //foreach (var item in jArr) + //{ + //} + break; + } + } + + Invoke(new Action(() => + { + int rowId = this.dgvActivity.Rows.Add( + false, + pInfo.activityThematicId, + pInfo.activityThematicName, + BaseClass.StampToDateTime((int)(pInfo.startTime.ParseToLong() / 1000)).ToString("yyyy/MM/dd HH:mm:ss") + "～" + + BaseClass.StampToDateTime((int)(pInfo.endTime.ParseToLong() / 1000)).ToString("yyyy/MM/dd HH:mm:ss") + "（" + + pInfo.durationDays + "天）", + (BaseClass.StampToDateTime((int)(pInfo.enrollDeadLine.ParseToLong() / 1000)) - DateTime.Now).Days + "天后截止", + pInfo.discount + ); + + dgvActivity.Rows[rowId].Height = 40; + })); + } + + Invoke(new Action(() => + { + ucGroupBoxEx2.Enabled = true; + ucGroupBoxEx3.Enabled = true; + string sRst = "查询结束！"; + if (cancellationTokenSource.IsCancellationRequested) + sRst = "已取消查询！"; + + BaseMsgForm.ShowInfo(sRst); + this.statusBar.lblTaskStatus.Text = sRst; + })); + }, cancellationTokenSource.Token); + } + + /// + /// 获取活动列表 + /// + /// + /// + private string GetActivityList(ShopLoginInfo shop) + { + string url = "https://agentseller.temu.com/api/kiana/gamblers/marketing/enroll/activity/list"; + string body; + body = @"{""needCanEnrollCnt"":true}"; + string refere = "https://agentseller.temu.com/activity/marketing-activity"; + return KJDHttpResponse.PostResponse2(shop, url, body, refere); + } + + /// + /// 获取符合店铺的活动 + /// + /// + /// + private string GetActivityMatch(ShopLoginInfo shop, long? thematicId) + { + string url = "https://agentseller.temu.com/api/kiana/gamblers/marketing/enroll/scroll/match"; + string body; + body = @"{""activityType"":13,""activityThematicId"":" + thematicId + @",""rowCount"":50}"; + string refere = "https://agentseller.temu.com/activity/marketing-activity/detail-new?type=13&thematicId=" + thematicId; + return KJDHttpResponse.PostResponse2(shop, url, body, refere); + } + } +} diff --git a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.resx new file mode 100644 index 0000000..b4856da --- /dev/null +++ b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.resx @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/CouponForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/CouponForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/CouponForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/CouponForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/CouponForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/CouponForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/CouponForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/CouponForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/CouponMulitAddForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/CouponMulitAddForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/CouponMulitAddForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/CouponMulitAddForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/CouponMulitAddForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/CouponMulitAddForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/CouponShopForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/CouponShopForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/CouponShopForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/CouponShopForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/CouponShopForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/CouponShopForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductProPromotionListSkuInfoForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductProPromotionListSkuInfoForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductProPromotionListSkuInfoForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductProPromotionListSkuInfoForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductProPromotionListSkuInfoForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductProPromotionListSkuInfoForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductPromotionListSkuInfoEditForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductPromotionListSkuInfoEditForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductPromotionListSkuInfoEditForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductPromotionListSkuInfoEditForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductPromotionListSkuInfoEditForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/DouProductPromotionListSkuInfoEditForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusActiveForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusActiveForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusActiveForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusActiveForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusActiveForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusActiveForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusShopForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusShopForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusShopForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusShopForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusShopForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/FullMinusShopForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyCustomActivityNameForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyCustomActivityNameForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyCustomActivityNameForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyCustomActivityNameForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyCustomActivityNameForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyCustomActivityNameForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyMonitorForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyMonitorForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyMonitorForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyMonitorForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyMonitorForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyMonitorForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyShopForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyShopForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyShopForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyShopForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyShopForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/GroupBuyShopForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesActivityNameForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesActivityNameForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesActivityNameForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesActivityNameForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesActivityNameForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesActivityNameForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesManagerActiveForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesManagerActiveForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesManagerActiveForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesManagerActiveForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesManagerActiveForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/LimitedSalesManagerActiveForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesShopForm.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesShopForm.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesShopForm.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesShopForm.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesShopForm.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/SeckillingAndLimitedSalesShopForm.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/UcCouponAddParam.Designer.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.Designer.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/UcCouponAddParam.Designer.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.cs b/TEMUKJD/KJDForms/SalesCenterForms/Old/UcCouponAddParam.cs similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.cs rename to TEMUKJD/KJDForms/SalesCenterForms/Old/UcCouponAddParam.cs diff --git a/TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.resx b/TEMUKJD/KJDForms/SalesCenterForms/Old/UcCouponAddParam.resx similarity index 100% rename from TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.resx rename to TEMUKJD/KJDForms/SalesCenterForms/Old/UcCouponAddParam.resx diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.Designer.cs index f4044a3..9663b15 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.Designer.cs @@ -28,17 +28,19 @@ /// private void InitializeComponent() { - System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("新人券"); - System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("限时限量购"); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("满减"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("拼团"); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("拼团监控"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("营销中心", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("店铺优化"); + System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("新人券"); + System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("限时限量购"); + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("满减"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("拼团"); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("拼团监控"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("营销中心", new System.Windows.Forms.TreeNode[] { treeNode1, treeNode2, treeNode3, treeNode4, - treeNode5}); + treeNode5, + treeNode6}); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tv = new TemuKJD.UserComponent.UcTreeView(); this.panel1 = new System.Windows.Forms.Panel(); @@ -91,20 +93,22 @@ this.tv.Location = new System.Drawing.Point(0, 0); this.tv.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tv.Name = "tv"; - treeNode1.Name = "新人券"; - treeNode1.Text = "新人券"; - treeNode2.Name = "限时限量购"; - treeNode2.Text = "限时限量购"; - treeNode3.Name = "满减"; - treeNode3.Text = "满减"; - treeNode4.Name = "拼团"; - treeNode4.Text = "拼团"; - treeNode5.Name = "拼团监控"; - treeNode5.Text = "拼团监控"; - treeNode6.Name = "营销中心"; - treeNode6.Text = "营销中心"; + treeNode1.Name = "店铺优化"; + treeNode1.Text = "店铺优化"; + treeNode2.Name = "新人券"; + treeNode2.Text = "新人券"; + treeNode3.Name = "限时限量购"; + treeNode3.Text = "限时限量购"; + treeNode4.Name = "满减"; + treeNode4.Text = "满减"; + treeNode5.Name = "拼团"; + treeNode5.Text = "拼团"; + treeNode6.Name = "拼团监控"; + treeNode6.Text = "拼团监控"; + treeNode7.Name = "营销中心"; + treeNode7.Text = "营销中心"; this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode6}); + treeNode7}); this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); this.tv.Size = new System.Drawing.Size(140, 450); this.tv.TabIndex = 4; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs index b9376df..8d167af 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs @@ -18,6 +18,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms public Lazy fullMinusForm = new Lazy(); public Lazy groupBuyFrom = new Lazy(); public Lazy couponForm = new Lazy(); + public Lazy marketingActivityForm = new Lazy(); public SalesCenterForm() { @@ -38,7 +39,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms tv.SelectedNode = tv.Nodes[0].Nodes[0]; tv.ExpandGroup(tv.Nodes[0].Name); - List hideName = new List() { "拼团监控"/*, "清理无流量"*/ }; + List hideName = new List() { "拼团监控", "新人券", "限时限量购", "满减", "拼团"/*, "清理无流量"*/ }; foreach (var item in hideName) { @@ -111,6 +112,9 @@ namespace TemuKJD.KJDForms.SalesCenterForms { switch (e.Node.Name) { + case "店铺优化": + SetForm(marketingActivityForm.Value); + break; case "新人券": SetForm(couponForm.Value); break; diff --git a/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs index 86b1789..e46a16f 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs @@ -83,7 +83,8 @@ namespace TemuKJD.KJDForms.ShopForms this.btnOk.Text = "更新"; this.TitleText = "编辑店铺 - " + shopLoginInfo.ShopAccount; this.txtBuyAccount.Text = shopLoginInfo.BuyAccount; - this.txtChatAccount.Text = shopLoginInfo.ChatAccount; + //this.txtChatAccount.Text = shopLoginInfo.ChatAccount; + this.txtChatAccount.Text = shopLoginInfo.SubUserName; this.txtUploadAccount.Text = shopLoginInfo.UploadAccount; this.label7.Visible = true; this.txtLoginName.Enabled = false; diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs index 9b6b535..757b168 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs @@ -69,7 +69,7 @@ namespace TemuKJD.KJDForms.ShopForms + "&login_name=" + _shop.LoginName + "&login_pass=" + GetHtml.UrlEncodeUtf8(_shop.Password) + "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.GroupName) - + "&sub_user_name=" + GetHtml.UrlEncodeUtf8(_shop.SubUserName) + + "&sub_user_name=" + _shop.SubUserName + "¬es=" + GetHtml.UrlEncodeUtf8(_shop.Notes); var result = GetHtml.PostUtf8(url, data); @@ -656,6 +656,7 @@ namespace TemuKJD.KJDForms.ShopForms foreach (var sc in campanys) { sc.LoginStatus2 = "国际版在线"; + sc.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); } } //if (!string.IsNullOrEmpty(loginResult)) diff --git a/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs b/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs index 2ec8596..1cb3d31 100644 --- a/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs @@ -65,7 +65,7 @@ namespace TemuKJD.KJDForms.ShopForms if (shop != null) { ShopSubAccountList.Clear(); - ShopSubAccountList.AddRange(AllSubAccountList.Where(u=>shop.SubUserName==u.sub_user_name)); + ShopSubAccountList.AddRange(AllSubAccountList.Where(u=>shop.SubUserName.Contains(u.sub_user_name))); shop.ShopSubAccountList.Clear(); shop.ShopSubAccountList.AddRange(ShopSubAccountList); NotShopSubAccountList.AddRange(AllSubAccountList.Where(u => !ShopSubAccountList.Any(bu => bu.id == u.id))); @@ -94,9 +94,9 @@ namespace TemuKJD.KJDForms.ShopForms { if (this.flpShopSubAccount.Controls.Count > 0) { - BaseMsgForm.ShowInfo("只能有一个子账户！"); - s.lblRight_Click(null, null); - return; + //BaseMsgForm.ShowInfo("只能有一个子账户！"); + //s.lblRight_Click(null, null); + //return; } this.flpNotSubAccount.Controls.Remove(s); @@ -178,6 +178,7 @@ namespace TemuKJD.KJDForms.ShopForms } shop.SubUserName = shop.ShopSubAccountList.FirstOrDefault()?.sub_user_name; + shop.SubUserName = string.Join(",", shop.ShopSubAccountList.Select(s => s.sub_user_name)); var shopLst = AllBase.Helper.GlobalConfig.ShopLoginList.Where(s => s.LoginName == shop.LoginName && s.ShopId!= shop.ShopId); foreach(var s in shopLst) { diff --git a/TEMUKJD/MainForm.designer.cs b/TEMUKJD/MainForm.designer.cs index 6bd5ed8..bd45fc5 100644 --- a/TEMUKJD/MainForm.designer.cs +++ b/TEMUKJD/MainForm.designer.cs @@ -247,7 +247,6 @@ namespace TemuKJD this.pnlMarket.StyleMouseOver.MarginTop = 63; this.pnlMarket.TabIndex = 3; this.pnlMarket.Text = "营销中心"; - this.pnlMarket.Visible = false; this.pnlMarket.Click += new System.EventHandler(this.pnlMarket_Click); // // pnlCollect