From 4ae8e4f1b28bd3c924ed1c0cd0043aad505b233c Mon Sep 17 00:00:00 2001 From: wule Date: Tue, 2 Jun 2026 16:09:57 +0800 Subject: [PATCH] =?UTF-8?q?1=E6=8B=BC=E5=A4=9A=E5=A4=9A=E4=B9=B0=E6=89=8B?= =?UTF-8?q?=E8=AF=BB=E5=8D=95=E4=BC=98=E5=8C=96=20=202=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=B1=BB=E7=9B=AE=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TEMUKJD/BLL/HttpResponseBLL.cs | 2 + TEMUKJD/BLL/PDDProdFormConverter.cs | 38 +- TEMUKJD/Extension/DataGridViewExtension.cs | 2 +- TEMUKJD/InitForm.Designer.cs | 3 +- TEMUKJD/InitForm.cs | 21 +- TEMUKJD/KJD.csproj | 18 + .../PDDDBProdListForm.Designer.cs | 54 +- .../ProductSelectForms/PDDDBProdListForm.cs | 38 +- .../PDDDBProdUserSelectForm.Designer.cs | 2 +- .../PDDDBProdUserSelectForm.cs | 2 +- .../PDDGetChanceProdForm.Designer.cs | 428 ++++-- .../PDDGetChanceProdForm.cs | 622 +++++++-- .../ShopForms/PDDShopListForm.Designer.cs | 110 +- TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs | 8 +- .../PDDForms/ShopForms/PDDShopLoginForm.cs | 2 +- .../DouBaoTitleFissionCefForm.Designer.cs | 669 ++++++++++ .../ToolForms/DouBaoTitleFissionCefForm.cs | 153 +++ .../ToolForms/DouBaoTitleFissionCefForm.resx | 370 +++++ .../ToolForms/Get1688ProductForm.Designer.cs | 124 +- TEMUKJD/ToolForms/Get1688ProductForm.cs | 5 +- TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs | 6 +- .../WXDBProdUploadForm.Designer.cs | 308 +++-- .../ProductForms/WXDBProdUploadForm.cs | 106 +- .../WXFinderSquareForm.Designer.cs | 22 +- .../ProductForms/WXFinderSquareForm.cs | 34 +- .../WXUserCollectAuthProdListForm.Designer.cs | 155 ++- .../WXUserCollectAuthProdListForm.cs | 85 +- .../WXUserCollectAuthProdListForm.resx | 3 + .../WXUserProdListForm.Designer.cs | 66 +- .../ProductForms/WXUserProdListForm.cs | 22 +- .../ShopForms/WXPDDShopLoginForm.Designer.cs | 294 ++++ .../WXForms/ShopForms/WXPDDShopLoginForm.cs | 1187 +++++++++++++++++ .../WXForms/ShopForms/WXPDDShopLoginForm.resx | 298 +++++ .../ShopForms/WXShopDefaultAddressListForm.cs | 20 +- TEMUKJD/WXForms/ShopForms/WXShopListForm.cs | 53 +- .../WxShopStatisticsForm.Designer.cs | 80 +- .../WXForms/ShopForms/WxShopStatisticsForm.cs | 43 +- .../TalkForms/PDDBuyerOrderListForm.cs | 5 + .../WXForms/TalkForms/WxTalkForm.Designer.cs | 4 +- TEMUKJD/WXForms/TalkForms/WxTalkForm.cs | 26 +- 40 files changed, 4743 insertions(+), 745 deletions(-) create mode 100644 TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.Designer.cs create mode 100644 TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs create mode 100644 TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.resx create mode 100644 TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.Designer.cs create mode 100644 TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.cs create mode 100644 TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.resx diff --git a/TEMUKJD/BLL/HttpResponseBLL.cs b/TEMUKJD/BLL/HttpResponseBLL.cs index 4ea4e9e..9272856 100644 --- a/TEMUKJD/BLL/HttpResponseBLL.cs +++ b/TEMUKJD/BLL/HttpResponseBLL.cs @@ -444,6 +444,8 @@ namespace TemuKJD.BLL try { var cookieLst = JsonHelper.DeserializeJsonToList(shop.Cookies); + if (cookieLst == null) + cookieLst = new List(); foreach (var cook in cookieLst) { cookies += cook.Name + "=" + cook.Value + ";"; diff --git a/TEMUKJD/BLL/PDDProdFormConverter.cs b/TEMUKJD/BLL/PDDProdFormConverter.cs index 2e8efba..c4c2e51 100644 --- a/TEMUKJD/BLL/PDDProdFormConverter.cs +++ b/TEMUKJD/BLL/PDDProdFormConverter.cs @@ -23,7 +23,7 @@ namespace TemuKJD.BLL /// /// /// - public string PddFrontToPddBackConvert(string outProdJson, bool UpdateOldData = true, string specialProdType = null) + public string PddFrontToPddBackConvert(string outProdJson, bool UpdateOldData = true, string specialProdType = null, bool IsAuthorityUser = false) { PDDFrontProductInfo frontProdInfo = null; try @@ -326,9 +326,14 @@ namespace TemuKJD.BLL dbProd.main_img = prodInfo.detail.galleries.FirstOrDefault(g => g.type == 1).url; dbProd.product_json = JsonHelper.SerializeObject(prodInfo); + // 商品采集权限用户采集的数据加上用户前缀（商品前缀显示给用户的时候隐藏） + string collectAuthorityTag = ""; + if (IsAuthorityUser) + collectAuthorityTag = "-" + BaseClass.UserName; + bool isExist = false; var existUrl = BaseClass.BuildPDDObjString("product/get_product_list"); - string existData = UserLogin.GetSignaturex() + "&search_spu=" + prodInfo.detail.goods_id; + string existData = UserLogin.GetSignaturex() + "&search_spu=" + prodInfo.detail.goods_id + collectAuthorityTag; string html = GetHtml.PostUtf8(existUrl, existData); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(existUrl, existData); @@ -359,7 +364,7 @@ namespace TemuKJD.BLL var data = Work.UserLogin.GetSignaturex() + "&from_shop_id=" + frontProdInfo.mall?.mall_id + - "&spu_id=" + prodInfo.detail.goods_id.ParseToString() + + "&spu_id=" + prodInfo.detail.goods_id.ParseToString() + collectAuthorityTag + "&skc_id=" + prodInfo.detail.goods_id.ParseToString() + "&price_text=" + prodInfo.detail.sku.Min(s => s.multi_price).ParseToInt() * 0.01m + "-" + prodInfo.detail.sku.Max(s => s.multi_price).ParseToInt() * 0.01m + "&main_cat_id=" + (prodInfo.detail.cat_ids?.FirstOrDefault(c => c != null)).ParseToString() + @@ -373,9 +378,14 @@ namespace TemuKJD.BLL "&main_img=" + HttpUtility.UrlEncode(dbProd.main_img, Encoding.UTF8) + "&sale_count=" + HttpUtility.UrlEncode(prodInfo.sale_count, Encoding.UTF8) + "&sale_count_text=" + HttpUtility.UrlEncode(prodInfo.sale_count_text, Encoding.UTF8) + - "&product_get_type=" + HttpUtility.UrlEncode("外部数据", Encoding.UTF8); + "&product_get_type=" + HttpUtility.UrlEncode("多多外部数据", Encoding.UTF8); if (!string.IsNullOrEmpty(specialProdType)) data += "&special_prod_type=" + HttpUtility.UrlEncode(specialProdType, Encoding.UTF8); + if (IsAuthorityUser) + { + data += "&add_user_name=" + BaseClass.UserName; + data += "&group=用户" + BaseClass.UserName; + } html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -394,7 +404,7 @@ namespace TemuKJD.BLL /// /// /// - public string PddFrontToPddBackConvert2(string outProdJson, bool UpdateOldData = true, string specialProdType = null) + public string PddFrontToPddBackConvert2(string outProdJson, bool UpdateOldData = true, string specialProdType = null, bool IsAuthorityUser = false) { PDDFrontProductInfo2 frontProdInfo = null; try @@ -707,9 +717,14 @@ namespace TemuKJD.BLL dbProd.main_img = prodInfo.detail.galleries.FirstOrDefault(g => g.type == 1).url; dbProd.product_json = JsonHelper.SerializeObject(prodInfo); + // 商品采集权限用户采集的数据加上用户前缀（商品前缀显示给用户的时候隐藏） + string collectAuthorityTag = ""; + if (IsAuthorityUser) + collectAuthorityTag = "-" + BaseClass.UserName; + bool isExist = false; var existUrl = BaseClass.BuildPDDObjString("product/get_product_list"); - string existData = UserLogin.GetSignaturex() + "&search_spu=" + prodInfo.detail.goods_id; + string existData = UserLogin.GetSignaturex() + "&search_spu=" + prodInfo.detail.goods_id + collectAuthorityTag; string html = GetHtml.PostUtf8(existUrl, existData); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(existUrl, existData); @@ -740,7 +755,7 @@ namespace TemuKJD.BLL var data = Work.UserLogin.GetSignaturex() + "&from_shop_id=" + frontProdInfo.goods?.mall_id + - "&spu_id=" + prodInfo.detail.goods_id.ParseToString() + + "&spu_id=" + prodInfo.detail.goods_id.ParseToString() + collectAuthorityTag + "&skc_id=" + prodInfo.detail.goods_id.ParseToString() + "&price_text=" + prodInfo.detail.sku.Min(s => s.multi_price).ParseToInt() * 0.01m + "-" + prodInfo.detail.sku.Max(s => s.multi_price).ParseToInt() * 0.01m + "&main_cat_id=" + (prodInfo.detail.cat_ids?.FirstOrDefault(c => c != null)).ParseToString() + @@ -754,9 +769,14 @@ namespace TemuKJD.BLL "&main_img=" + HttpUtility.UrlEncode(dbProd.main_img, Encoding.UTF8) + "&sale_count=" + HttpUtility.UrlEncode(prodInfo.sale_count, Encoding.UTF8) + "&sale_count_text=" + HttpUtility.UrlEncode(prodInfo.sale_count_text, Encoding.UTF8) + - "&product_get_type=" + HttpUtility.UrlEncode("外部数据", Encoding.UTF8); + "&product_get_type=" + HttpUtility.UrlEncode("多多外部数据", Encoding.UTF8); if (!string.IsNullOrEmpty(specialProdType)) data += "&special_prod_type=" + HttpUtility.UrlEncode(specialProdType, Encoding.UTF8); + if (IsAuthorityUser) + { + data += "&add_user_name=" + BaseClass.UserName; + data += "&group=用户" + BaseClass.UserName; + } html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -1228,7 +1248,7 @@ namespace TemuKJD.BLL // "&main_img=" + HttpUtility.UrlEncode(dbProd.main_img, Encoding.UTF8) + // "&sale_count=" + HttpUtility.UrlEncode(prodInfo.sale_count, Encoding.UTF8) + // "&sale_count_text=" + HttpUtility.UrlEncode(prodInfo.sale_count_text, Encoding.UTF8) + - // "&product_get_type=" + HttpUtility.UrlEncode("外部数据", Encoding.UTF8); + // "&product_get_type=" + HttpUtility.UrlEncode("多多外部数据", Encoding.UTF8); //html = GetHtml.PostUtf8(url, data); //if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) diff --git a/TEMUKJD/Extension/DataGridViewExtension.cs b/TEMUKJD/Extension/DataGridViewExtension.cs index d738fc2..2a70ada 100644 --- a/TEMUKJD/Extension/DataGridViewExtension.cs +++ b/TEMUKJD/Extension/DataGridViewExtension.cs @@ -902,7 +902,7 @@ namespace TemuKJD.Extension })); } } - catch + catch (Exception ex) { } } diff --git a/TEMUKJD/InitForm.Designer.cs b/TEMUKJD/InitForm.Designer.cs index c21b965..ec1535c 100644 --- a/TEMUKJD/InitForm.Designer.cs +++ b/TEMUKJD/InitForm.Designer.cs @@ -108,8 +108,9 @@ this.flowLayoutPanel1.Controls.Add(this.chkRemember); this.flowLayoutPanel1.Location = new System.Drawing.Point(9, 1); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(263, 48); + this.flowLayoutPanel1.Size = new System.Drawing.Size(263, 19); this.flowLayoutPanel1.TabIndex = 757; + this.flowLayoutPanel1.Visible = false; // // rbTemu // diff --git a/TEMUKJD/InitForm.cs b/TEMUKJD/InitForm.cs index 29a2d70..d4c0675 100644 --- a/TEMUKJD/InitForm.cs +++ b/TEMUKJD/InitForm.cs @@ -29,7 +29,26 @@ namespace TemuKJD private void InitForm_Load(object sender, EventArgs e) { - OpenNewMainForm(); + Task.Run(() => + { + while (!Work.Initialization.IsCheckFilesFinish || !Program.IsInit || this.progressBarX1.Value < 50) + { + Thread.Sleep(new Random().Next(10, 50)); + + Invoke(new Action(() => + { + this.progressBarX1.Value = Work.Initialization.InitPercent++; + this.progressBarX1.Maximum = 50; + })); + if (this.progressBarX1.Value >= 50) + Thread.Sleep(300); + } + + Invoke(new Action(() => + { + OpenNewMainForm(); + })); + }); return; // if (File.Exists(System.Environment.CurrentDirectory + "\\YkdChoice.dll")) diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index fdc1135..05f3379 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -196,6 +196,12 @@ True Resources.resx + + Form + + + DouBaoTitleFissionCefForm.cs + Form @@ -348,6 +354,12 @@ WXFinderSquareForm.cs + + Form + + + WXPDDShopLoginForm.cs + Form @@ -1336,6 +1348,9 @@ PDDGetChanceProdByImgForm.cs + + DouBaoTitleFissionCefForm.cs + GetJuShuitanAuthForm.cs @@ -1447,6 +1462,9 @@ WXProductForm.cs + + WXPDDShopLoginForm.cs + WXGetTopUpQrCode.cs diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs index 53e8060..3537dd6 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs @@ -51,6 +51,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.btnTitleFission = new DevComponents.DotNetBar.PanelEx(); this.btnExportIdImg = new DevComponents.DotNetBar.PanelEx(); this.btnSetGroup = new DevComponents.DotNetBar.PanelEx(); this.btnDelSelect = new DevComponents.DotNetBar.PanelEx(); @@ -240,6 +241,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // tabPage1 // + this.tabPage1.Controls.Add(this.btnTitleFission); this.tabPage1.Controls.Add(this.btnExportIdImg); this.tabPage1.Controls.Add(this.btnSetGroup); this.tabPage1.Controls.Add(this.btnDelSelect); @@ -255,6 +257,31 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage1.Text = "数据操作"; this.tabPage1.UseVisualStyleBackColor = true; // + // btnTitleFission + // + this.btnTitleFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnTitleFission.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnTitleFission.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnTitleFission.DisabledBackColor = System.Drawing.Color.Empty; + this.btnTitleFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnTitleFission.Location = new System.Drawing.Point(6, 39); + this.btnTitleFission.Name = "btnTitleFission"; + this.btnTitleFission.Size = new System.Drawing.Size(82, 25); + this.btnTitleFission.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnTitleFission.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnTitleFission.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnTitleFission.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnTitleFission.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnTitleFission.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnTitleFission.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnTitleFission.Style.GradientAngle = 90; + this.btnTitleFission.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnTitleFission.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnTitleFission.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnTitleFission.TabIndex = 784; + this.btnTitleFission.Text = "标题裂变"; + this.btnTitleFission.Click += new System.EventHandler(this.btnTitleFission_Click); + // // btnExportIdImg // this.btnExportIdImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -827,7 +854,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbPddRelation.Location = new System.Drawing.Point(693, 5); + this.cmbPddRelation.Location = new System.Drawing.Point(693, 7); this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbPddRelation.Name = "cmbPddRelation"; this.cmbPddRelation.Size = new System.Drawing.Size(38, 25); @@ -882,7 +909,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat2.FormattingEnabled = true; - this.cmbCat2.Location = new System.Drawing.Point(262, 75); + this.cmbCat2.Location = new System.Drawing.Point(262, 77); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Size = new System.Drawing.Size(38, 25); @@ -961,14 +988,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "厂商直采", "1688厂家", - "1688外部数据", + "已采集数据", "微信小店", "微信店采", "母店采集", "机会商品", "以图搜品", - "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(262, 40); + "多多外部数据"}); + this.cmbSourceType.Location = new System.Drawing.Point(262, 42); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(38, 25); @@ -1014,7 +1041,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(581, 5); + this.cmbWxCat.Location = new System.Drawing.Point(581, 7); this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxCat.Name = "cmbWxCat"; this.cmbWxCat.Size = new System.Drawing.Size(38, 25); @@ -1036,7 +1063,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbSort.Items.AddRange(new object[] { "入库时间", "曝光量"}); - this.cmbSort.Location = new System.Drawing.Point(357, 40); + this.cmbSort.Location = new System.Drawing.Point(357, 42); this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSort.Name = "cmbSort"; this.cmbSort.Size = new System.Drawing.Size(38, 25); @@ -1100,7 +1127,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbGroupFilter.FormattingEnabled = true; - this.cmbGroupFilter.Location = new System.Drawing.Point(167, 40); + this.cmbGroupFilter.Location = new System.Drawing.Point(167, 42); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Size = new System.Drawing.Size(38, 25); @@ -1115,7 +1142,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "导出未拉回"}); - this.cmbExportToOutServer.Location = new System.Drawing.Point(581, 40); + this.cmbExportToOutServer.Location = new System.Drawing.Point(581, 42); this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbExportToOutServer.Name = "cmbExportToOutServer"; this.cmbExportToOutServer.Size = new System.Drawing.Size(38, 25); @@ -1151,7 +1178,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "安全商品", "违规商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(469, 40); + this.cmbWxSafe.Location = new System.Drawing.Point(469, 42); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Size = new System.Drawing.Size(38, 25); @@ -1193,7 +1220,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat1.FormattingEnabled = true; - this.cmbCat1.Location = new System.Drawing.Point(167, 75); + this.cmbCat1.Location = new System.Drawing.Point(167, 77); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; this.cmbCat1.Size = new System.Drawing.Size(38, 25); @@ -1215,7 +1242,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat3.FormattingEnabled = true; - this.cmbCat3.Location = new System.Drawing.Point(357, 75); + this.cmbCat3.Location = new System.Drawing.Point(357, 77); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; this.cmbCat3.Size = new System.Drawing.Size(38, 25); @@ -1311,7 +1338,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "普通商品", "爆款数据"}); - this.cmbSpProdType.Location = new System.Drawing.Point(805, 5); + this.cmbSpProdType.Location = new System.Drawing.Point(805, 7); this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSpProdType.Name = "cmbSpProdType"; this.cmbSpProdType.Size = new System.Drawing.Size(38, 25); @@ -2102,5 +2129,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DataGridViewLinkColumn col_select_product; private System.Windows.Forms.TextBox txtViewUvMin; private UserComponent.UcCheckBox chkViewUvMin; + private DevComponents.DotNetBar.PanelEx btnTitleFission; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index 07997b8..571c191 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -242,7 +242,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms prod.head_words, prod.end_words, prod.fission_words, - prod.product_get_type_text == "厂商直采" ? (prod.product_get_type_text + " " + prod.skc_id).Trim() : prod.product_get_type_text, + (prod.product_get_type_text == "厂商直采" ? (prod.product_get_type_text + " " + prod.skc_id).Trim() : prod.product_get_type_text)?.Replace("1688外部数据", "已采集数据"), prod.special_prod_type == "爆款数据" ? "爆款数据" : "普通商品", prod.wx_safe_status, prod.add_time.ToString("yy-MM-dd HH:mm"), @@ -407,7 +407,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms if (cmbSourceType.Text.Trim() != "全部") { - data += "&product_get_type=" + cmbSourceType.Text.Trim(); + data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据"); } if (shop != null && !string.IsNullOrEmpty(shop.ShopId)) { @@ -821,7 +821,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms var url = BaseClass.BuildPDDObjString("product/get_product_groups"); var data = UserLogin.GetSignaturex(); if (!string.IsNullOrWhiteSpace(product_get_type)) - data += "&product_get_type=" + product_get_type.Replace("多多商品", "机会商品").Replace("1688商品", "1688厂家,1688外部数据"); + { + data += "&product_get_type=" + product_get_type.Replace("已采集数据", "1688外部数据") + .Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据"); + } if (!string.IsNullOrWhiteSpace(group_add_user_name)) data += "&add_user_name=" + group_add_user_name; var html = GetHtml.PostUtf8(url, data); @@ -1146,7 +1149,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms using (StreamReader sr = new StreamReader(path)) { content = sr.ReadToEnd(); - } if (content.Contains("\"spec_keys\"") && content.Contains("\"spec_values\"") && content.Contains("\"is_sku_pre_sale\"")) @@ -1322,9 +1324,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms string productTitle = ""; if (dbProd.product_get_type_text == "厂商直采" || dbProd.product_get_type_text == "1688厂家" || dbProd.product_get_type_text == "1688外部数据" || - dbProd.product_get_type_text == "微信小店" || dbProd.product_get_type_text == "机会商品") + dbProd.product_get_type_text == "微信小店" || dbProd.product_get_type_text == "微信店采" || dbProd.product_get_type_text == "机会商品" || + dbProd.product_get_type_text == "多多外部数据") { - if (dbProd.product_get_type_text == "微信小店" && dbProd.wx_cat_leaf != null) + if ((dbProd.product_get_type_text == "微信小店" || dbProd.product_get_type_text == "微信店采") && dbProd.wx_cat_leaf != null) { List catInfoLst = new List(); var cat = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == dbProd.wx_cat_leaf.ParseToString()); @@ -1395,6 +1398,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms mainImgLst3 = pInfo.detail.galleries.Where(g => g.type == 1).Take(3).Select(s => s.url).ToList(); productTitle = pInfo.detail.goods_name; } + if (dbProd.product_get_type_text == "机会商品" || dbProd.product_get_type_text == "多多外部数据") + { + string convertRst = ""; + var pInfo = JsonHelper.DeserializeJsonToObject(dbProd.product_json); + mainImgLst3 = pInfo.detail.galleries.Where(g => g.type == 1).Take(3).Select(s => s.url).ToList(); + productTitle = pInfo.detail.goods_name; + } //bool is404 = false; foreach (var img in mainImgLst3) @@ -1513,8 +1523,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms mdyWxCat: if ((dbProd.product_get_type_text == "厂商直采" || dbProd.product_get_type_text == "1688厂家" || dbProd.product_get_type_text == "1688外部数据" || - dbProd.product_get_type_text == "微信小店" || dbProd.product_get_type_text == "机会商品") && - dbProd.wx_cat_1 != null && dbProd.wx_cat_leaf != null) + dbProd.product_get_type_text == "微信小店" || dbProd.product_get_type_text == "微信店采" || dbProd.product_get_type_text == "机会商品" || + dbProd.product_get_type_text == "多多外部数据") && dbProd.wx_cat_1 != null && dbProd.wx_cat_leaf != null) { var url = BaseClass.BuildPDDObjString("product/mdy_product"); var data = Work.UserLogin.GetSignaturex() + @@ -2379,5 +2389,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms File.WriteAllText(dialog.FileName, data); BaseMsgForm.ShowInfo("导出成功！"); } + + private void btnTitleFission_Click(object sender, EventArgs e) + { + var lstProdId = dgvDbProduct.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["col_spu_id"]?.Value.ToString()).ToList(); + if (lstProdId.Count == 0) + return; + var prodList = lstTemuDbProduct.Where(p => lstProdId.Contains(p.spu_id)).ToList(); + + DouBaoTitleFissionCefForm fissionCefForm = new DouBaoTitleFissionCefForm(prodList); + fissionCefForm.ShowDialog(); + } } } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs index 0da520d..e3d15eb 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs @@ -1212,7 +1212,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "厂商直采", "母店采集", "机会商品", - "外部数据"}); + "多多外部数据"}); this.cmbSourceType.Location = new System.Drawing.Point(39, 74); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(88, 25); diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs index d9a5299..dba3ebe 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs @@ -6294,7 +6294,7 @@ Content-Type: image/jpeg data += "&wx_cat_3=" + string.Join(",", selectCate3.Select(c => c.cat_id).ToList()); } - data += "&product_get_type=" + cmbSourceType.Text.Trim(); + data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据"); if (cmbSourceType.Text.Trim() == "厂商直采") { // 聚水潭商品 // 分销已设置，类目已识别 diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs index 302f8bb..be7fbde 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs @@ -30,15 +30,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnImportShop = new DevComponents.DotNetBar.PanelEx(); + this.btnAddShop = new DevComponents.DotNetBar.PanelEx(); + this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); this.btnShowMyCollect = new DevComponents.DotNetBar.PanelEx(); this.btnSelectNotGetDetail = new DevComponents.DotNetBar.PanelEx(); this.cmbFilterType = new System.Windows.Forms.ComboBox(); @@ -61,17 +64,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbSearchLabel = new System.Windows.Forms.ComboBox(); this.btnAddToDb = new DevComponents.DotNetBar.PanelEx(); this.btnGetDetail = new DevComponents.DotNetBar.PanelEx(); - this.txtShopId = new System.Windows.Forms.TextBox(); + this.txtFilterShopId = new System.Windows.Forms.TextBox(); this.txtSearchChance = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); - this.txtShopName = new System.Windows.Forms.TextBox(); + this.txtFilterShopName = new System.Windows.Forms.TextBox(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.btnRestoreEmpty = new DevComponents.DotNetBar.PanelEx(); - this.txtNotes = new System.Windows.Forms.TextBox(); + this.txtFilterNotes = new System.Windows.Forms.TextBox(); this.lblGroupFilter = new System.Windows.Forms.Label(); - this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); + this.btnSearchShop = new DevComponents.DotNetBar.PanelEx(); this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); @@ -80,6 +83,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.txtMinPrice = new System.Windows.Forms.TextBox(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.pnlAddEditShop = new System.Windows.Forms.Panel(); + this.btnCancelAddEditShop = new DevComponents.DotNetBar.PanelEx(); + this.btnAddEditShop = new DevComponents.DotNetBar.PanelEx(); + this.label12 = new System.Windows.Forms.Label(); + this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label13 = new System.Windows.Forms.Label(); + this.txtShopPassword = new System.Windows.Forms.TextBox(); + this.label17 = new System.Windows.Forms.Label(); + this.txtShopLoginName = new System.Windows.Forms.TextBox(); + this.label18 = new System.Windows.Forms.Label(); this.pbShopLoading = new System.Windows.Forms.PictureBox(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); @@ -120,6 +133,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer3.Panel1.SuspendLayout(); this.splitContainer3.Panel2.SuspendLayout(); this.splitContainer3.SuspendLayout(); + this.pnlAddEditShop.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); @@ -153,6 +167,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms | System.Windows.Forms.AnchorStyles.Right))); 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.btnImportShop); + this.ucGroupBoxEx1.Controls.Add(this.btnAddShop); + this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Controls.Add(this.btnShowMyCollect); this.ucGroupBoxEx1.Controls.Add(this.btnSelectNotGetDetail); this.ucGroupBoxEx1.Controls.Add(this.cmbFilterType); @@ -175,17 +192,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucGroupBoxEx1.Controls.Add(this.cmbSearchLabel); this.ucGroupBoxEx1.Controls.Add(this.btnAddToDb); this.ucGroupBoxEx1.Controls.Add(this.btnGetDetail); - this.ucGroupBoxEx1.Controls.Add(this.txtShopId); + this.ucGroupBoxEx1.Controls.Add(this.txtFilterShopId); this.ucGroupBoxEx1.Controls.Add(this.txtSearchChance); this.ucGroupBoxEx1.Controls.Add(this.label2); this.ucGroupBoxEx1.Controls.Add(this.label1); this.ucGroupBoxEx1.Controls.Add(this.btnEmpty); - this.ucGroupBoxEx1.Controls.Add(this.txtShopName); + this.ucGroupBoxEx1.Controls.Add(this.txtFilterShopName); this.ucGroupBoxEx1.Controls.Add(this.btnSearch); this.ucGroupBoxEx1.Controls.Add(this.btnRestoreEmpty); - this.ucGroupBoxEx1.Controls.Add(this.txtNotes); + this.ucGroupBoxEx1.Controls.Add(this.txtFilterNotes); this.ucGroupBoxEx1.Controls.Add(this.lblGroupFilter); - this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); + this.ucGroupBoxEx1.Controls.Add(this.btnSearchShop); this.ucGroupBoxEx1.Controls.Add(this.label4); this.ucGroupBoxEx1.Controls.Add(this.label3); this.ucGroupBoxEx1.Controls.Add(this.label7); @@ -199,6 +216,81 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "操作"; // + // btnImportShop + // + this.btnImportShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnImportShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnImportShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnImportShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnImportShop.Location = new System.Drawing.Point(201, 13); + this.btnImportShop.Name = "btnImportShop"; + this.btnImportShop.Size = new System.Drawing.Size(58, 23); + this.btnImportShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnImportShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImportShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImportShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnImportShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnImportShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnImportShop.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnImportShop.Style.GradientAngle = 90; + this.btnImportShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnImportShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImportShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImportShop.TabIndex = 1142; + this.btnImportShop.Text = "导入店铺"; + this.btnImportShop.Visible = false; + this.btnImportShop.Click += new System.EventHandler(this.btnImportShop_Click); + // + // btnAddShop + // + this.btnAddShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAddShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnAddShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAddShop.Location = new System.Drawing.Point(141, 13); + this.btnAddShop.Name = "btnAddShop"; + this.btnAddShop.Size = new System.Drawing.Size(58, 23); + this.btnAddShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnAddShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnAddShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnAddShop.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnAddShop.Style.GradientAngle = 90; + this.btnAddShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddShop.TabIndex = 1141; + this.btnAddShop.Text = "添加店铺"; + this.btnAddShop.Visible = false; + this.btnAddShop.Click += new System.EventHandler(this.btnAddShop_Click); + // + // btnRefreshShop + // + 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(103, 109); + this.btnRefreshShop.Name = "btnRefreshShop"; + this.btnRefreshShop.Size = new System.Drawing.Size(58, 23); + 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 = 1092; + this.btnRefreshShop.Text = "过滤店铺"; + this.btnRefreshShop.Visible = false; + this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click); + // // btnShowMyCollect // this.btnShowMyCollect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -546,12 +638,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnGetDetail.Text = "获取机会商品详情"; this.btnGetDetail.Click += new System.EventHandler(this.btnGetDetail_Click); // - // txtShopId + // txtFilterShopId // - this.txtShopId.Location = new System.Drawing.Point(76, 28); - this.txtShopId.Name = "txtShopId"; - this.txtShopId.Size = new System.Drawing.Size(183, 23); - this.txtShopId.TabIndex = 704; + this.txtFilterShopId.Location = new System.Drawing.Point(76, 37); + this.txtFilterShopId.Name = "txtFilterShopId"; + this.txtFilterShopId.Size = new System.Drawing.Size(183, 23); + this.txtFilterShopId.TabIndex = 704; // // txtSearchChance // @@ -563,7 +655,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(30, 31); + this.label2.Location = new System.Drawing.Point(30, 40); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(57, 17); this.label2.TabIndex = 705; @@ -583,7 +675,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmpty.Location = new System.Drawing.Point(223, 100); + this.btnEmpty.Location = new System.Drawing.Point(223, 109); this.btnEmpty.Name = "btnEmpty"; this.btnEmpty.Size = new System.Drawing.Size(36, 23); this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -602,12 +694,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnEmpty.Text = "重置"; this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click); // - // txtShopName + // txtFilterShopName // - this.txtShopName.Location = new System.Drawing.Point(76, 52); - this.txtShopName.Name = "txtShopName"; - this.txtShopName.Size = new System.Drawing.Size(183, 23); - this.txtShopName.TabIndex = 706; + this.txtFilterShopName.Location = new System.Drawing.Point(76, 61); + this.txtFilterShopName.Name = "txtFilterShopName"; + this.txtFilterShopName.Size = new System.Drawing.Size(183, 23); + this.txtFilterShopName.TabIndex = 706; // // btnSearch // @@ -657,12 +749,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnRestoreEmpty.Text = "清空条件"; this.btnRestoreEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // - // txtNotes + // txtFilterNotes // - this.txtNotes.Location = new System.Drawing.Point(76, 76); - this.txtNotes.Name = "txtNotes"; - this.txtNotes.Size = new System.Drawing.Size(183, 23); - this.txtNotes.TabIndex = 708; + this.txtFilterNotes.Location = new System.Drawing.Point(76, 85); + this.txtFilterNotes.Name = "txtFilterNotes"; + this.txtFilterNotes.Size = new System.Drawing.Size(183, 23); + this.txtFilterNotes.TabIndex = 708; // // lblGroupFilter // @@ -673,34 +765,34 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.lblGroupFilter.TabIndex = 641; this.lblGroupFilter.Text = "热门主题："; // - // btnRefreshShop + // btnSearchShop // - 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(163, 100); - this.btnRefreshShop.Name = "btnRefreshShop"; - this.btnRefreshShop.Size = new System.Drawing.Size(58, 23); - 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 = 710; - this.btnRefreshShop.Text = "查询店铺"; - this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click); + this.btnSearchShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSearchShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSearchShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSearchShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSearchShop.Location = new System.Drawing.Point(163, 109); + this.btnSearchShop.Name = "btnSearchShop"; + this.btnSearchShop.Size = new System.Drawing.Size(58, 23); + this.btnSearchShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearchShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearchShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearchShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSearchShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSearchShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSearchShop.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSearchShop.Style.GradientAngle = 90; + this.btnSearchShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearchShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearchShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearchShop.TabIndex = 710; + this.btnSearchShop.Text = "查询店铺"; + this.btnSearchShop.Click += new System.EventHandler(this.btnSearchShop_Click); // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(19, 79); + this.label4.Location = new System.Drawing.Point(19, 88); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(68, 17); this.label4.TabIndex = 709; @@ -709,7 +801,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(19, 55); + this.label3.Location = new System.Drawing.Point(19, 64); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(68, 17); this.label3.TabIndex = 707; @@ -786,6 +878,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // splitContainer3.Panel1 // + this.splitContainer3.Panel1.Controls.Add(this.pnlAddEditShop); this.splitContainer3.Panel1.Controls.Add(this.pbShopLoading); this.splitContainer3.Panel1.Controls.Add(this.dgvShop); // @@ -798,6 +891,154 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer3.SplitterDistance = 290; this.splitContainer3.TabIndex = 9; // + // pnlAddEditShop + // + this.pnlAddEditShop.BackColor = System.Drawing.Color.White; + this.pnlAddEditShop.Controls.Add(this.btnCancelAddEditShop); + this.pnlAddEditShop.Controls.Add(this.btnAddEditShop); + this.pnlAddEditShop.Controls.Add(this.label12); + this.pnlAddEditShop.Controls.Add(this.txtNotes); + this.pnlAddEditShop.Controls.Add(this.label13); + this.pnlAddEditShop.Controls.Add(this.txtShopPassword); + this.pnlAddEditShop.Controls.Add(this.label17); + this.pnlAddEditShop.Controls.Add(this.txtShopLoginName); + this.pnlAddEditShop.Controls.Add(this.label18); + this.pnlAddEditShop.Location = new System.Drawing.Point(21, 57); + this.pnlAddEditShop.Name = "pnlAddEditShop"; + this.pnlAddEditShop.Size = new System.Drawing.Size(240, 220); + this.pnlAddEditShop.TabIndex = 9; + this.pnlAddEditShop.Visible = false; + // + // btnCancelAddEditShop + // + this.btnCancelAddEditShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnCancelAddEditShop.CanvasColor = System.Drawing.SystemColors.Control; + this.btnCancelAddEditShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancelAddEditShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnCancelAddEditShop.Location = new System.Drawing.Point(101, 175); + this.btnCancelAddEditShop.Name = "btnCancelAddEditShop"; + this.btnCancelAddEditShop.Size = new System.Drawing.Size(55, 26); + this.btnCancelAddEditShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnCancelAddEditShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnCancelAddEditShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnCancelAddEditShop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnCancelAddEditShop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCancelAddEditShop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnCancelAddEditShop.Style.GradientAngle = 90; + this.btnCancelAddEditShop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnCancelAddEditShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnCancelAddEditShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCancelAddEditShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCancelAddEditShop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnCancelAddEditShop.TabIndex = 811; + this.btnCancelAddEditShop.Text = "取消"; + this.btnCancelAddEditShop.Click += new System.EventHandler(this.btnCancelAddEditShop_Click); + // + // btnAddEditShop + // + this.btnAddEditShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnAddEditShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddEditShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAddEditShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnAddEditShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAddEditShop.Location = new System.Drawing.Point(158, 175); + this.btnAddEditShop.Name = "btnAddEditShop"; + this.btnAddEditShop.Size = new System.Drawing.Size(55, 26); + this.btnAddEditShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddEditShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddEditShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAddEditShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnAddEditShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnAddEditShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnAddEditShop.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnAddEditShop.Style.GradientAngle = 90; + this.btnAddEditShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnAddEditShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddEditShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAddEditShop.TabIndex = 804; + this.btnAddEditShop.Text = "新增"; + this.btnAddEditShop.Click += new System.EventHandler(this.btnAddEditShop_Click); + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(29, 102); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(56, 17); + this.label12.TabIndex = 386; + this.label12.Text = " 备注"; + // + // txtNotes + // + this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + // + // + // + this.txtNotes.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtNotes.Border.Class = "CrumbBarBackgroundKey"; + this.txtNotes.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txtNotes.Border.PaddingBottom = 2; + this.txtNotes.Border.PaddingLeft = 2; + this.txtNotes.Border.PaddingRight = 2; + this.txtNotes.Border.PaddingTop = 2; + this.txtNotes.Location = new System.Drawing.Point(91, 100); + this.txtNotes.Name = "txtNotes"; + this.txtNotes.Size = new System.Drawing.Size(122, 23); + this.txtNotes.TabIndex = 385; + // + // label13 + // + this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label13.AutoSize = true; + this.label13.ForeColor = System.Drawing.Color.DarkGray; + this.label13.Location = new System.Drawing.Point(25, 136); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(188, 17); + this.label13.TabIndex = 384; + this.label13.Text = "注：登录密码为空表示不更新密码"; + this.label13.Visible = false; + // + // txtShopPassword + // + this.txtShopPassword.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtShopPassword.Location = new System.Drawing.Point(91, 64); + this.txtShopPassword.Name = "txtShopPassword"; + this.txtShopPassword.PasswordChar = '●'; + this.txtShopPassword.Size = new System.Drawing.Size(122, 23); + this.txtShopPassword.TabIndex = 338; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(29, 67); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(56, 17); + this.label17.TabIndex = 337; + this.label17.Text = "登录密码"; + // + // txtShopLoginName + // + this.txtShopLoginName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtShopLoginName.Location = new System.Drawing.Point(91, 29); + this.txtShopLoginName.Name = "txtShopLoginName"; + this.txtShopLoginName.Size = new System.Drawing.Size(122, 23); + this.txtShopLoginName.TabIndex = 336; + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(29, 32); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(56, 17); + this.label18.TabIndex = 0; + this.label18.Text = "登录账号"; + // // pbShopLoading // this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -813,19 +1054,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvShop.AutoRowNumber = true; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; + 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, @@ -946,20 +1187,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.dgvChanceProduct.AllowUserToAddRows = false; this.dgvChanceProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvChanceProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvChanceProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvChanceProduct.AutoRowNumber = true; this.dgvChanceProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvChanceProduct.BackgroundColor = System.Drawing.Color.White; this.dgvChanceProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvChanceProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; + 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.dgvChanceProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvChanceProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvChanceProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1025,8 +1266,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // colGoodsName // - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle5; this.colGoodsName.FillWeight = 120F; this.colGoodsName.HeaderText = "商品名称"; this.colGoodsName.Name = "colGoodsName"; @@ -1047,8 +1288,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // colPrice // - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colPrice.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colPrice.DefaultCellStyle = dataGridViewCellStyle6; this.colPrice.FillWeight = 70F; this.colPrice.HeaderText = "价格"; this.colPrice.Name = "colPrice"; @@ -1056,8 +1297,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // colMsg // - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colMsg.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMsg.DefaultCellStyle = dataGridViewCellStyle7; this.colMsg.FillWeight = 200F; this.colMsg.HeaderText = "操作结果"; this.colMsg.Name = "colMsg"; @@ -1129,6 +1370,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer3.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); this.splitContainer3.ResumeLayout(false); + this.pnlAddEditShop.ResumeLayout(false); + this.pnlAddEditShop.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); @@ -1157,11 +1400,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms private DevComponents.DotNetBar.PanelEx btnGetDetail; private System.Windows.Forms.TextBox txtSearchChance; private DevComponents.DotNetBar.PanelEx btnEmpty; - private System.Windows.Forms.TextBox txtNotes; + private System.Windows.Forms.TextBox txtFilterNotes; private System.Windows.Forms.Label label4; - private DevComponents.DotNetBar.PanelEx btnRefreshShop; - private System.Windows.Forms.TextBox txtShopId; - private System.Windows.Forms.TextBox txtShopName; + private DevComponents.DotNetBar.PanelEx btnSearchShop; + private System.Windows.Forms.TextBox txtFilterShopId; + private System.Windows.Forms.TextBox txtFilterShopName; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label2; private UserComponent.UcGroupBoxEx ucGroupBoxEx1; @@ -1209,5 +1452,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DataGridViewTextBoxColumn colPrice; private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; private DevComponents.DotNetBar.PanelEx btnShowMyCollect; + private DevComponents.DotNetBar.PanelEx btnRefreshShop; + private DevComponents.DotNetBar.PanelEx btnImportShop; + private DevComponents.DotNetBar.PanelEx btnAddShop; + private System.Windows.Forms.Panel pnlAddEditShop; + private DevComponents.DotNetBar.PanelEx btnCancelAddEditShop; + private DevComponents.DotNetBar.PanelEx btnAddEditShop; + private System.Windows.Forms.Label label12; + private DevComponents.DotNetBar.Controls.TextBoxX txtNotes; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.TextBox txtShopPassword; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.TextBox txtShopLoginName; + private System.Windows.Forms.Label label18; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs index 0b57830..040fa54 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs @@ -1,4 +1,5 @@ using AllBase; +using AllBase.Helper; using AllBase.Model.Result; using AllBase.Model.Result.PDDResult; using NaiBa.Util; @@ -22,6 +23,7 @@ using TemuKJD.Extension; using TemuKJD.PDDForms.AdminForms; using TemuKJD.PDDForms.ShopForms; using TemuKJD.ToolForms; +using TemuKJD.UserControls; using TemuKJD.WXForms.ProductForms; using Work; @@ -40,6 +42,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms public ConcurrentList lstAdminPddShopInfo { get; set; } = new ConcurrentList(); public ConcurrentList lstChanceProductResult { get; set; } = new ConcurrentList(); public List lstChanceCateInfo { get; set; } = new List(); + + bool isInit = false; + /// /// 查找机会商品 /// @@ -50,8 +55,15 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void PDDGetChanceProd_Load(object sender, EventArgs e) { + pnlAddEditShop.Dock = DockStyle.Fill; //if (IsAuthorityUser) // btnShowMyCollect.Visible = true; + if (IsAuthorityUser) + { + btnRefreshShop.Visible = true; + btnAddShop.Visible = true; + btnImportShop.Visible = true; + } this.panel2.Location = new Point(45, 55); this.panel2.Width = Math.Max(10, this.panel2.Parent.Width - 90); @@ -66,15 +78,15 @@ namespace TemuKJD.PDDForms.ProductSelectForms chanceProductConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig("pdd_chance_product_config"); if (chanceProductConfig == null) chanceProductConfig = new ChanceProductConfig(); - this.txtNotes.Text = chanceProductConfig.SearchNotes; - this.txtShopId.Text = chanceProductConfig.SearchShopId; - this.txtShopName.Text = chanceProductConfig.SearchShopName; + this.txtFilterNotes.Text = chanceProductConfig.SearchNotes; + this.txtFilterShopId.Text = chanceProductConfig.SearchShopId; + this.txtFilterShopName.Text = chanceProductConfig.SearchShopName; - this.txtNotes.TextChanged += Txt_TextChanged; - this.txtShopId.TextChanged += Txt_TextChanged; - this.txtShopName.TextChanged += Txt_TextChanged; + this.txtFilterNotes.TextChanged += Txt_TextChanged; + this.txtFilterShopId.TextChanged += Txt_TextChanged; + this.txtFilterShopName.TextChanged += Txt_TextChanged; - Task.Run(() => { ReacCate(); }); + Task.Run(() => { ReadCate(); }); var tmpChanceProductLst = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("pdd_chance_product_list_" + MainForm.ProcessCount); if (tmpChanceProductLst == null) @@ -122,7 +134,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms }); } - void ReacCate() + void ReadCate() { string filePath = Path.Combine(Environment.CurrentDirectory, "temp\\pdd_chance_cate.cty"); if (!File.Exists(filePath)) @@ -170,9 +182,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void Txt_TextChanged(object sender, EventArgs e) { - chanceProductConfig.SearchNotes = this.txtNotes.Text.Trim(); - chanceProductConfig.SearchShopId = this.txtShopId.Text.Trim(); - chanceProductConfig.SearchShopName = this.txtShopName.Text.Trim(); + chanceProductConfig.SearchNotes = this.txtFilterNotes.Text.Trim(); + chanceProductConfig.SearchShopId = this.txtFilterShopId.Text.Trim(); + chanceProductConfig.SearchShopName = this.txtFilterShopName.Text.Trim(); NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_chance_product_config", chanceProductConfig); } @@ -188,7 +200,15 @@ namespace TemuKJD.PDDForms.ProductSelectForms } else { - var list = lstAdminPddShopInfo.Where(s => s.LoginStatus == "登录成功").ToList(); + List list = new List(); + if (this.IsAuthorityUser && BaseClass.MainPath == "29wx") + { + list = GlobalConfig._29WxPddShopLoginList.Where(s => s.LoginStatus == "登录成功").ToList(); + } + else + { + list = lstAdminPddShopInfo.Where(s => s.LoginStatus == "登录成功").ToList(); + } foreach (DataGridViewRow row in dgvShop.Rows) { if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString())) @@ -200,21 +220,99 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void PDDGetChanceProdForm_VisibleChanged(object sender, EventArgs e) { - this.pbShopLoading.Visible = true; - SearchShop(this.ucSplitPage1.CurrentPage); + if (!isInit && this.Visible == true) + { + btnSearchShop_Click(null, null); + isInit = true; + } } - private void btnRefreshShop_Click(object sender, EventArgs e) + private void btnSearchShop_Click(object sender, EventArgs e) { - if (this.ucSplitPage1.CurrentPage != 1) - this.ucSplitPage1.CurrentPage = 1; + if (IsAuthorityUser && BaseClass.MainPath == "29wx") + { + Search29WxPddShop(); + } else - SearchShop(1); + { + this.pbShopLoading.Visible = true; + if (this.ucSplitPage1.CurrentPage != 1) + this.ucSplitPage1.CurrentPage = 1; + else + SearchAdminShop(1); + } } - public void SearchShop(int page) + public void Search29WxPddShop() { - List userShopIdList = dgvShop.Rows.Cast() + Invoke(new Action(() => + { + this.pbShopLoading.Visible = true; + })); + + Task.Run(() => + { + List selectShopIdList = dgvShop.Rows.Cast() + .Where(r => r.Cells["colSelect"].Value.ParseToBool()) + .Select(r => r.Cells["colShopId"].Value.ParseToString() + r.Cells["colUserName"].Value.ParseToString()).ToList(); + // 获取微信小店用户服务端拼多多店铺 + var serverShopList = _29WxPddShopManage.Get29WxPddShop(); + GlobalConfig._29WxPddShopLoginList.RemoveAll(s => !serverShopList.Any(ss => ss.UserName == s.UserName && ss.ShopId == s.ShopId)); + foreach (var serverShop in serverShopList) + { + var localShop = GlobalConfig._29WxPddShopLoginList.FirstOrDefault(s => s.LoginName == serverShop.LoginName && s.ShopId == serverShop.ShopId); + if (localShop != null) + { + localShop.ShopAccount = serverShop.ShopAccount; + localShop.LoginName = serverShop.LoginName; + localShop.Password = serverShop.Password; + localShop.Cookies = serverShop.Cookies; + localShop.DbId = serverShop.DbId; + localShop.UserName = serverShop.UserName; + localShop.SubUserName = serverShop.SubUserName; + if (serverShop.ApiAuthInfoList != null && serverShop.ApiAuthInfoList.Count > 0) + { + localShop.ApiAuthInfoList = new List(); + localShop.ApiAuthInfoList.AddRange(serverShop.ApiAuthInfoList); + } + localShop.BuyApiAuth.AccessToken = serverShop.BuyApiAuth.AccessToken; + localShop.BuyApiAuth.UpdateTime = serverShop.BuyApiAuth.UpdateTime; + localShop.BuyApiAuth.AppKey = serverShop.BuyApiAuth.AppKey; + localShop.BuyApiAuth.ExpiresTime = serverShop.BuyApiAuth.ExpiresTime; + localShop.BuyApiAuth.RefreshToken = serverShop.BuyApiAuth.RefreshToken; + localShop.PayStatus = serverShop.PayStatus; + localShop.GroupName = serverShop.GroupName; + localShop.Notes = serverShop.Notes; + localShop.LoginStatus = serverShop.LoginStatus; + localShop.LoginStatus2 = serverShop.LoginStatus2; + localShop.AntiContents = serverShop.AntiContents; + localShop.AddProductRemaining = serverShop.AddProductRemaining; + localShop.OperateSubSaName = serverShop.OperateSubSaName; + localShop.TrialUploadCount = Math.Max(0, serverShop.TrialUploadCount); + } + else + { + GlobalConfig._29WxPddShopLoginList.Add(serverShop); + } + } + Invoke(new Action(() => + { + this.dgvShop.Rows.Clear(); + })); + foreach (var shop in GlobalConfig._29WxPddShopLoginList) + { + displayShop(shop, selectShopIdList); + } + Invoke(new Action(() => + { + this.pbShopLoading.Visible = false; + })); + }); + } + + public void SearchAdminShop(int page) + { + List selectShopIdList = dgvShop.Rows.Cast() .Where(r => r.Cells["colSelect"].Value.ParseToBool()) .Select(r => r.Cells["colShopId"].Value.ParseToString() + r.Cells["colUserName"].Value.ParseToString()).ToList(); if (InvokeRequired) @@ -243,22 +341,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms foreach (var shop in lstAdminPddShopInfo) { - bool canUse = shop.LoginStatus2 == "国际版在线"; - Invoke(new Action(() => - { - int rowIndex = this.dgvShop.Rows.Add( - userShopIdList.Contains(shop.ShopId + shop.UserName), - shop.UserName, - shop.LoginName, - shop.ShopId, - shop.ShopAccount, - shop.Notes, - canUse ? "在线" : "掉线", - canUse, - string.Empty - ); - displayShopStatus(shop); - })); + displayShop(shop, selectShopIdList); } Invoke(new Action(() => @@ -268,6 +351,26 @@ namespace TemuKJD.PDDForms.ProductSelectForms }, cancellationTokenSource.Token); } + void displayShop(ShopLoginInfo shop, List selectShopIdList) + { + bool canUse = shop.LoginStatus == "登录成功"; + Invoke(new Action(() => + { + int rowIndex = this.dgvShop.Rows.Add( + selectShopIdList?.Contains(shop.ShopId + shop.UserName), + shop.UserName, + shop.LoginName, + shop.ShopId, + shop.ShopAccount.IsNullOrEmpty() ? shop.LoginName : shop.ShopAccount, + shop.Notes, + canUse ? "在线" : "掉线", + canUse, + string.Empty + ); + displayShopStatus(shop); + })); + } + void displayShopStatus(ShopLoginInfo shop) { bool canUse = shop.LoginStatus == "登录成功"; @@ -293,9 +396,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms var data = UserLogin.GetSignaturex() + "&page=" + page + "&page_size=" + pageSize + - "&shop_ids=" + string.Join(",", txtShopId.Text.Trim().Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + - "&shop_names=" + string.Join(",", txtShopName.Text.Trim().Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + - "&search_notes=" + txtNotes.Text.Trim().Trim(','); + "&shop_ids=" + string.Join(",", txtFilterShopId.Text.Trim().Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + + "&shop_names=" + string.Join(",", txtFilterShopName.Text.Trim().Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + + "&search_notes=" + txtFilterNotes.Text.Trim().Trim(','); var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(url, data); @@ -316,12 +419,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void ucSplitPage1_PageChange(object obj) { - SearchShop(this.ucSplitPage1.CurrentPage); + SearchAdminShop(this.ucSplitPage1.CurrentPage); } private void btnEmpty_Click(object sender, EventArgs e) { - txtNotes.Text = txtShopId.Text = txtShopName.Text = ""; + txtFilterNotes.Text = txtFilterShopId.Text = txtFilterShopName.Text = ""; + btnRefreshShop_Click(null, null); } private void dgvShop_CellContentClick(object sender, DataGridViewCellEventArgs e) @@ -332,18 +436,43 @@ namespace TemuKJD.PDDForms.ProductSelectForms string loginName = dgvShop.Rows[e.RowIndex].Cells["colShopLoginName"].Value.ParseToString(); string accountId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString(); ShopLoginInfo shop = null; - shop = lstAdminPddShopInfo.FirstOrDefault(s => s.LoginName == loginName && s.ShopId == accountId); + if (IsAuthorityUser && BaseClass.MainPath == "29wx") + shop = GlobalConfig._29WxPddShopLoginList.FirstOrDefault(s => s.LoginName == loginName && s.ShopId == accountId); + else + shop = lstAdminPddShopInfo.FirstOrDefault(s => s.LoginName == loginName && s.ShopId == accountId); switch (headerText) { case "登录": case "状态": { + if (shop == null) + return; + if (IsAuthorityUser && BaseClass.MainPath == "29wx") + { + _29WxPddShopManage.Check29WxPddShopLogin(new ShopLoginInfo[] { shop }, this.statusBar); + if (shop.LoginStatus == "登录成功") + { + WXForms.ShopForms.WXPDDShopLoginForm shopLoginForm = new WXForms.ShopForms.WXPDDShopLoginForm(shop); + shopLoginForm.openType = WXForms.ShopForms.EnumOpenType.manage; + shopLoginForm.WindowState = FormWindowState.Maximized; + shopLoginForm.InitUrl = "https://mms.pinduoduo.com/home/"; + shopLoginForm.Show(); + } + else + { + WXForms.ShopForms.WXPDDShopLoginForm shopLoginForm = new WXForms.ShopForms.WXPDDShopLoginForm(shop); + shopLoginForm.openType = WXForms.ShopForms.EnumOpenType.login; + shopLoginForm.ShowDialog(); + _29WxPddShopManage.Update29WxPddShopCookie(shop); + btnSearchShop_Click(null, null); + } + displayShopStatus(shop); + } + else { PDDAdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - if (IsAuthorityUser) - displayShopStatus(shop); - else if (shop.LoginStatus == "登录成功") + if (shop.LoginStatus == "登录成功") { PDDAdminShopLoginForm shopLoginForm = new PDDAdminShopLoginForm(shop); shopLoginForm.openType = EnumOpenType.manage; @@ -355,7 +484,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms { PDDAdminShopLoginForm shopLoginForm = new PDDAdminShopLoginForm(shop); shopLoginForm.openType = EnumOpenType.login; - //shopLoginForm.SaveComplete += shopLoginForm_SaveComplete; shopLoginForm.ShowDialog(); displayShopStatus(shop); } @@ -369,14 +497,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms break; } } - private void shopLoginForm_SaveComplete(object obj) - { - //var shop = obj as ShopLoginInfo; - //if (shop == null) - // return; - - //displayShopStatus(shop); - } private void btnSearch_Click(object sender, EventArgs e) { @@ -437,27 +557,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms if ((page - 1) % 10 == 0) { - PDDShopLoginForm loginForm = null; - Invoke(new Action(() => - { - this.panel2.SendToBack(); - //this.panel2.BringToFront(); - loginForm = new PDDShopLoginForm(shop); - loginForm.TopLevel = false; - loginForm.openType = EnumOpenType.manage; - loginForm.WindowState = FormWindowState.Maximized; - loginForm.InitUrl = "https://mms.pinduoduo.com/goods/goods_list/chance?sourcePage=goodsListTopButton"; - loginForm.Dock = DockStyle.Fill; - this.panel2.Controls.Add(loginForm); - loginForm.Show(); - })); - Thread.Sleep(Randomx.GetId(3000, 5000)); - Invoke(new Action(() => - { - this.panel2.SendToBack(); - if (loginForm != null) - loginForm.Close(); - })); + GetAntiContent(shop); } else { @@ -481,7 +581,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms var rst = GetChanceGoodsList(shop, searchTxt, searchLabels, "hot_index", page, cat1, cat2, price1, price2); if (!rst.Contains("success\":true")) { - PDDAdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + if (IsAuthorityUser && BaseClass.MainPath == "29wx") + _29WxPddShopManage.Check29WxPddShopLogin(new ShopLoginInfo[] { shop }, this.statusBar); + else + PDDAdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); while (shop == null || shop.LoginStatus != "登录成功") { shop = GetOneShop(shopIds); @@ -560,6 +663,58 @@ namespace TemuKJD.PDDForms.ProductSelectForms }, cancellationTokenSource.Token); } + void GetAntiContent(ShopLoginInfo shop) + { + if (IsAuthorityUser && BaseClass.MainPath == "29wx") + { + WXForms.ShopForms.WXPDDShopLoginForm loginForm = null; + Invoke(new Action(() => + { + this.panel2.SendToBack(); + //this.panel2.BringToFront(); + loginForm = new WXForms.ShopForms.WXPDDShopLoginForm(shop); + loginForm.TopLevel = false; + loginForm.openType = WXForms.ShopForms.EnumOpenType.manage; + loginForm.WindowState = FormWindowState.Maximized; + loginForm.InitUrl = "https://mms.pinduoduo.com/goods/goods_list/chance?sourcePage=goodsListTopButton"; + loginForm.Dock = DockStyle.Fill; + this.panel2.Controls.Add(loginForm); + loginForm.Show(); + })); + Thread.Sleep(Randomx.GetId(3000, 5000)); + Invoke(new Action(() => + { + this.panel2.SendToBack(); + if (loginForm != null) + loginForm.Close(); + })); + } + else + { + PDDShopLoginForm loginForm = null; + Invoke(new Action(() => + { + this.panel2.SendToBack(); + //this.panel2.BringToFront(); + loginForm = new PDDShopLoginForm(shop); + loginForm.TopLevel = false; + loginForm.openType = EnumOpenType.manage; + loginForm.WindowState = FormWindowState.Maximized; + loginForm.InitUrl = "https://mms.pinduoduo.com/goods/goods_list/chance?sourcePage=goodsListTopButton"; + loginForm.Dock = DockStyle.Fill; + this.panel2.Controls.Add(loginForm); + loginForm.Show(); + })); + Thread.Sleep(Randomx.GetId(3000, 5000)); + Invoke(new Action(() => + { + this.panel2.SendToBack(); + if (loginForm != null) + loginForm.Close(); + })); + } + } + private void dgvChanceProduct_CellContentClick(object sender, DataGridViewCellEventArgs e) { if (e.ColumnIndex < 0 || e.RowIndex < 0) @@ -670,28 +825,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms } if (shop == null) break; - - PDDShopLoginForm loginForm = null; - Invoke(new Action(() => - { - this.panel2.SendToBack(); - //this.panel2.BringToFront(); - loginForm = new PDDShopLoginForm(shop); - loginForm.TopLevel = false; - loginForm.openType = EnumOpenType.manage; - loginForm.WindowState = FormWindowState.Maximized; - loginForm.InitUrl = "https://mms.pinduoduo.com/goods/goods_list/chance?sourcePage=goodsListTopButton"; - loginForm.Dock = DockStyle.Fill; - this.panel2.Controls.Add(loginForm); - loginForm.Show(); - })); - Thread.Sleep(Randomx.GetId(3000, 5000)); - Invoke(new Action(() => - { - this.panel2.SendToBack(); - if (loginForm != null) - loginForm.Close(); - })); + GetAntiContent(shop); } else { @@ -784,7 +918,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms { try { - var shopList = lstAdminPddShopInfo.Where(s => shopIds.Contains(s.ShopId) && s.LoginStatus == "登录成功").ToList(); + var shopList = new List(); + if (IsAuthorityUser && BaseClass.MainPath == "29wx") + shopList = GlobalConfig._29WxPddShopLoginList.Where(s => shopIds.Contains(s.ShopId) && s.LoginStatus == "登录成功").ToList(); + else + shopList = lstAdminPddShopInfo.Where(s => shopIds.Contains(s.ShopId) && s.LoginStatus == "登录成功").ToList(); if (shopList.Count == 0) { Invoke(new Action(() => @@ -794,7 +932,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms return null; } var shop = shopList[Randomx.GetId(shopList.Count)]; - PDDAdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + if (IsAuthorityUser && BaseClass.MainPath == "29wx") + _29WxPddShopManage.Check29WxPddShopLogin(new ShopLoginInfo[] { shop }, this.statusBar); + else + PDDAdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); return shop; } catch (Exception ex) @@ -1146,6 +1287,287 @@ namespace TemuKJD.PDDForms.ProductSelectForms //WXUserCollectAuthProdListForm userCollectAuthProdListForm = new WXUserCollectAuthProdListForm(); //userCollectAuthProdListForm.ShowDialog(); } + + private void btnRefreshShop_Click(object sender, EventArgs e) + { + foreach (DataGridViewRow row in dgvShop.Rows) + { + if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text)) + { + row.Visible = false; + continue; + } + if (!row.Cells["colShopNotes"].Value.ParseToString().Contains(txtFilterNotes.Text)) + { + row.Visible = false; + continue; + } + if (!row.Cells["colShopId"].Value.ParseToString().Contains(txtFilterShopId.Text)) + { + row.Visible = false; + continue; + } + row.Visible = true; + } + } + + private void btnImportShop_Click(object sender, EventArgs e) + { + Import29WxPddShop(); + } + void Import29WxPddShop() + { + this.btnImportShop.Enabled = false; + string text = "店铺导入格式：\r\n\r\n1.店铺账号(手机/用户名/邮箱)-----店铺密码\r\n2.店铺账号-----密码-----备注\r\n\r\n多个店铺请每个店铺新起一行。"; + BaseMsgForm.ShowInfo(text, "", FormLevel.LARGE); + + OpenFileDialog openFileDialog = new OpenFileDialog(); + openFileDialog.Filter = "文本文件(*.txt)|*.txt"; + openFileDialog.RestoreDirectory = true; + openFileDialog.FilterIndex = 1; + if (openFileDialog.ShowDialog() == DialogResult.OK) + { + using (StreamReader sr = new StreamReader(openFileDialog.FileName, System.Text.Encoding.UTF8)) + { + string fileName = openFileDialog.FileName; + string importStr = sr.ReadToEnd().Trim(); + var strArr = importStr.Replace("\r", "").Split('\n'); + for (int i = 0; i < strArr.Length; i++) + { + try + { + // 通用格式 + if (strArr[i].Contains("-----")) + { + var productArr = strArr[i].Split(new string[] { "-----" }, StringSplitOptions.RemoveEmptyEntries); + if (productArr.Length > 1) + { + ShopLoginInfo shop = new ShopLoginInfo + { + LoginName = productArr[0], + Password = DataOpenSSL.EncryptString(productArr[1]), + }; + if (productArr.Length > 2) + { + shop.Notes = productArr[2]; + } + + var shopInfo = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.LoginName == shop.LoginName); + if (shopInfo != null) + { + shopInfo.Password = shop.Password; + shopInfo.GroupName = shop.GroupName; + } + else + GlobalConfig.ShopLoginList.Add(shop); + _29WxPddShopManage.AddMdf29WxPddShop(shop); + } + } + } + catch (Exception ex) + { + } + } + } + btnSearchShop_Click(null, null); + } + this.btnImportShop.Enabled = true; + } + + private void btnAddShop_Click(object sender, EventArgs e) + { + this.pnlAddEditShop.Visible = true; + txtShopLoginName.Text = ""; + txtShopPassword.Text = ""; + txtNotes.Text = ""; + btnAddEditShop.Text = "新增"; + } + + private void btnAddEditShop_Click(object sender, EventArgs e) + { + btnAddEditShop.Enabled = false; + + var shop = new ShopLoginInfo(); + shop.LoginName = txtShopLoginName.Text.Trim(); + shop.Password = DataOpenSSL.EncryptString(this.txtShopPassword.Text.Trim()); + shop.Notes = txtNotes.Text.Trim(); + if (shop.LoginName.IsNullOrEmpty()) + { + BaseMsgForm.ShowError("店铺登录名不能为空"); + btnAddEditShop.Enabled = true; + return; + } + + var addMdyRst = _29WxPddShopManage.AddMdf29WxPddShop(shop); + if (!addMdyRst.Contains("success")) + { + BaseMsgForm.ShowError(addMdyRst); + } + + Task.Run(() => + { + Thread.Sleep(500); + Invoke(new Action(() => + { + btnAddEditShop.Enabled = true; + if (addMdyRst.Contains("success")) + pnlAddEditShop.Visible = false; + })); + btnSearchShop_Click(null, null); + }); + } + + private void btnCancelAddEditShop_Click(object sender, EventArgs e) + { + + } + } + + public class _29WxPddShopManage + { + public static string AddMdf29WxPddShop(ShopLoginInfo shop) + { + var url = BaseClass.BuildObjString("shop/wx_add_mdy_29wx_pdd_shop"); + var data = UserLogin.GetSignaturex() + + "&login_name=" + shop.LoginName + + "&login_pass=" + GetHtml.UrlEncodeUtf8(shop.Password) + + "&shop_id=" + shop.ShopId + + "&shop_account=" + shop.ShopAccount + + "&mall_id" + shop.MallId + + "&cookie=" + shop.Cookies + + "&cookie2=" + shop.Cookies2 + + "&group_name=" + GetHtml.UrlEncodeUtf8(shop.GroupName) + + "&sub_user_name=" + GetHtml.UrlEncodeUtf8(shop.SubUserName) + + "¬es=" + GetHtml.UrlEncodeUtf8(shop.Notes) + + "&login_status=" + shop.LoginStatus + + "&anti_contents=" + JsonHelper.SerializeObject(shop.AntiContents); + + var result = GetHtml.PostUtf8(url, data); + if (!result.Contains("\"code\":200") && !result.Contains("已达上限")) + result = GetHtml.PostUtf8(url, data); + if (!result.Contains("\"code\":200") && !result.Contains("已达上限")) + result = GetHtml.PostUtf8(url, data); + if (!result.Contains("\"code\":200")) + { + var msg = BaseRegex.GetStringJson(ref result, "msg"); + if (string.IsNullOrEmpty(msg)) + msg = "店铺保存失败！"; + return msg; + } + return "success"; + } + + public static string Update29WxPddShopCookie(ShopLoginInfo shop) + { + var url = BaseClass.BuildObjString("shop/wx_mdy_29wx_pdd_cookie_and_login_status"); + var data = UserLogin.GetSignaturex() + + "&login_name=" + shop.LoginName + + "&cookie=" + shop.Cookies + + "&login_status=" + shop.LoginStatus; + + var result = GetHtml.PostUtf8(url, data); + if (!result.Contains("\"code\":200") && !result.Contains("已达上限")) + result = GetHtml.PostUtf8(url, data); + if (!result.Contains("\"code\":200") && !result.Contains("已达上限")) + result = GetHtml.PostUtf8(url, data); + if (!result.Contains("\"code\":200")) + { + var msg = BaseRegex.GetStringJson(ref result, "msg"); + if (string.IsNullOrEmpty(msg)) + msg = "店铺cookie保存失败！"; + return msg; + } + return "success"; + } + + public static List Get29WxPddShop(List shop_ids = null) + { + List list = new List(); + + int page = 0; + while (true) + { + page++; + + var url = BaseClass.BuildObjString("shop/wx_get_29wx_pdd_shop"); + var data = UserLogin.GetSignaturex() + "&page=" + page; + if (shop_ids != null && shop_ids.Count > 0) + data += "&shop_ids=" + string.Join(",", shop_ids); + var html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) + || !html.Contains("shop_id") || !html.Contains("shop_account") || !html.Contains("login_pass")) + { + break; + } + + var jArr = JObject.Parse(html)["data"]; + if (jArr.Count() == 0) + break; + + list.AddRange(ShopBLL.DeserializationShop(html)); + } + return list; + } + + public static void Check29WxPddShopLogin(ShopLoginInfo[] shops, StatusBarUserControl statusBar) + { + for (int i = 0; i < shops.Length; i++) + { + var shop = shops[i]; + var localShops = shops.Where(s => s.ShopId == shop.ShopId); + + // 先从服务端取最新cookie + var serverShops = Get29WxPddShop(new List() { shop.ShopId }); + var serverShop = serverShops.FirstOrDefault(); + if (shop != null && serverShop != null) + { + shop.Cookies = serverShop.Cookies; + shop.Cookies2 = serverShop.Cookies2; + foreach (var sh in localShops) + { + sh.Cookies = serverShop.Cookies; + sh.Cookies2 = serverShop.Cookies2; + } + } + + if (shop != null) + { + var loginResult = PDDShopListForm.CheckShopLogin(shop); + if (loginResult.Contains("\"success\":true") && !loginResult.Contains("\"login\":true")) + { + shop.Cookies = "[]"; + foreach (var sh in localShops) + { + sh.LoginStatus = "未登录"; + shop.Cookies = "[]"; + } + } + else + { + foreach (var sh in localShops) + { + sh.LoginStatus = "登录成功"; + sh.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); + } + } + Update29WxPddShopCookie(shop); // 店铺cookie写入服务端 + } + if (statusBar != null && statusBar.Created) + { + statusBar.Invoke(new Action(() => + { + statusBar.lblTaskStatus.Text = "正在检测..."; + statusBar.pgbTaskProgress.Value = i + 1; + statusBar.pgbTaskProgress.Maximum = shops.Length; + statusBar.pgbTaskProgress.Text = statusBar.pgbTaskProgress.Value + "/" + shops.Length; + })); + } + } + } } public class ChanceProductConfig diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs index 5a702ba..57e803e 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); @@ -39,8 +39,9 @@ this.btnLoginSelect = new TemuKJD.UserControls.ButtonEx(); this.btnCheck = new TemuKJD.UserControls.ButtonEx(); this.panel4 = new System.Windows.Forms.Panel(); + this.btnRefreshOrderApi = new TemuKJD.UserControls.ButtonEx(); this.label5 = new System.Windows.Forms.Label(); - this.btnImport = new DevComponents.DotNetBar.PanelEx(); + this.btnImportShop = new DevComponents.DotNetBar.PanelEx(); this.btnAddShop = new DevComponents.DotNetBar.PanelEx(); this.btnOpenOrder = new TemuKJD.UserControls.ButtonEx(); this.chkUsePddWorkbanch = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -86,7 +87,6 @@ this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); this.chkAutoDrag = new System.Windows.Forms.CheckBox(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.btnRefreshOrderApi = new TemuKJD.UserControls.ButtonEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -209,7 +209,7 @@ // this.panel4.Controls.Add(this.btnRefreshOrderApi); this.panel4.Controls.Add(this.label5); - this.panel4.Controls.Add(this.btnImport); + this.panel4.Controls.Add(this.btnImportShop); this.panel4.Controls.Add(this.btnAddShop); this.panel4.Controls.Add(this.btnOpenOrder); this.panel4.Controls.Add(this.chkUsePddWorkbanch); @@ -227,6 +227,23 @@ this.panel4.Size = new System.Drawing.Size(1035, 60); this.panel4.TabIndex = 0; // + // btnRefreshOrderApi + // + this.btnRefreshOrderApi.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnRefreshOrderApi.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshOrderApi.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRefreshOrderApi.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnRefreshOrderApi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRefreshOrderApi.ForeColor = System.Drawing.Color.White; + this.btnRefreshOrderApi.Location = new System.Drawing.Point(924, 35); + this.btnRefreshOrderApi.Margin = new System.Windows.Forms.Padding(2); + this.btnRefreshOrderApi.Name = "btnRefreshOrderApi"; + this.btnRefreshOrderApi.Size = new System.Drawing.Size(93, 25); + this.btnRefreshOrderApi.TabIndex = 832; + this.btnRefreshOrderApi.Text = "刷新订单Api"; + this.btnRefreshOrderApi.UseVisualStyleBackColor = false; + this.btnRefreshOrderApi.Click += new System.EventHandler(this.btnRefreshOrderApi_Click); + // // label5 // this.label5.AutoSize = true; @@ -237,29 +254,29 @@ this.label5.TabIndex = 822; this.label5.Text = "注：订单授权到期后无法读取订单、自动发货、读取售后；上传授权到期后无法进行发布商品和上下架等操作。"; // - // btnImport + // btnImportShop // - this.btnImport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnImport.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnImport.DisabledBackColor = System.Drawing.Color.Empty; - this.btnImport.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnImport.Location = new System.Drawing.Point(72, 8); - this.btnImport.Name = "btnImport"; - this.btnImport.Size = new System.Drawing.Size(66, 26); - this.btnImport.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnImport.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnImport.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnImport.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnImport.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnImport.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnImport.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnImport.Style.GradientAngle = 90; - this.btnImport.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnImport.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnImport.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnImport.TabIndex = 812; - this.btnImport.Text = "导入店铺"; - this.btnImport.Click += new System.EventHandler(this.btnImport_Click); + this.btnImportShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnImportShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnImportShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnImportShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnImportShop.Location = new System.Drawing.Point(72, 8); + this.btnImportShop.Name = "btnImportShop"; + this.btnImportShop.Size = new System.Drawing.Size(66, 26); + this.btnImportShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnImportShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImportShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImportShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnImportShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnImportShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnImportShop.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnImportShop.Style.GradientAngle = 90; + this.btnImportShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnImportShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImportShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImportShop.TabIndex = 812; + this.btnImportShop.Text = "导入店铺"; + this.btnImportShop.Click += new System.EventHandler(this.btnImportShop_Click); // // btnAddShop // @@ -460,20 +477,20 @@ // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvShop.AutoRowNumber = true; this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -766,23 +783,6 @@ this.statusBar.Size = new System.Drawing.Size(1264, 29); this.statusBar.TabIndex = 1; // - // btnRefreshOrderApi - // - this.btnRefreshOrderApi.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnRefreshOrderApi.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnRefreshOrderApi.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnRefreshOrderApi.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnRefreshOrderApi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshOrderApi.ForeColor = System.Drawing.Color.White; - this.btnRefreshOrderApi.Location = new System.Drawing.Point(924, 35); - this.btnRefreshOrderApi.Margin = new System.Windows.Forms.Padding(2); - this.btnRefreshOrderApi.Name = "btnRefreshOrderApi"; - this.btnRefreshOrderApi.Size = new System.Drawing.Size(93, 25); - this.btnRefreshOrderApi.TabIndex = 832; - this.btnRefreshOrderApi.Text = "刷新订单Api"; - this.btnRefreshOrderApi.UseVisualStyleBackColor = false; - this.btnRefreshOrderApi.Click += new System.EventHandler(this.btnRefreshOrderApi_Click); - // // PDDShopListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -844,7 +844,7 @@ private UserComponent.UcCheckBox chkUsePddWorkbanch; public UserControls.ButtonEx btnOpenOrder; private DevComponents.DotNetBar.PanelEx btnAddShop; - private DevComponents.DotNetBar.PanelEx btnImport; + private DevComponents.DotNetBar.PanelEx btnImportShop; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName; private System.Windows.Forms.DataGridViewTextBoxColumn colMallId; diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs index f8e22a5..9106a2d 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs @@ -296,7 +296,7 @@ namespace TemuKJD.PDDForms.ShopForms }); } - private void btnImport_Click(object sender, EventArgs e) + private void btnImportShop_Click(object sender, EventArgs e) { IsOperate = true; ImportShop(); @@ -305,7 +305,7 @@ namespace TemuKJD.PDDForms.ShopForms void ImportShop() { - this.btnImport.Enabled = false; + this.btnImportShop.Enabled = false; string text = "店铺导入格式：\r\n\r\n1.店铺账号(手机/用户名/邮箱)-----店铺密码\r\n2.店铺账号-----密码-----备注\r\n\r\n多个店铺请每个店铺新起一行。"; BaseMsgForm.ShowInfo(text, "", FormLevel.LARGE); @@ -366,7 +366,7 @@ namespace TemuKJD.PDDForms.ShopForms } } IsOperate = false; - this.btnImport.Enabled = true; + this.btnImportShop.Enabled = true; } private void RefreshDataGridView(bool updateStatus=true) @@ -726,7 +726,7 @@ namespace TemuKJD.PDDForms.ShopForms this.dgvShop.Columns["ColEdit"].Visible = false; this.dgvShop.Columns["colDelete"].Visible = false; this.dgvShop.Columns["colSubUser"].Visible = false; - this.btnImport.Visible = false; + this.btnImportShop.Visible = false; this.btnAddShop.Visible = false; } diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs index be1e668..5cb88c9 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs @@ -254,7 +254,7 @@ namespace TemuKJD.PDDForms.ShopForms oldShop.SubUserName = newShop.SubUserName; oldShop.Notes = newShop.Notes; oldShop.AntiContents.AddRange(newShop.AntiContents); - while (oldShop.AntiContents.Count > 50) + while (oldShop.AntiContents.Count > 200) oldShop.AntiContents.RemoveAt(0); // 店铺更新写入到服务端 diff --git a/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.Designer.cs b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.Designer.cs new file mode 100644 index 0000000..6c8b977 --- /dev/null +++ b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.Designer.cs @@ -0,0 +1,669 @@ + +namespace TemuKJD.ToolForms +{ + partial class DouBaoTitleFissionCefForm + { + /// + /// 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() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DouBaoTitleFissionCefForm)); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.btnGoTo = new DevComponents.DotNetBar.PanelEx(); + this.txtUrl = new System.Windows.Forms.TextBox(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pnlMsg = new DevComponents.DotNetBar.PanelEx(); + this.lblMsg = new System.Windows.Forms.Label(); + this.pbLoading = new System.Windows.Forms.PictureBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.btnBatchCreateFissionTitle = new DevComponents.DotNetBar.PanelEx(); + this.pbLoading2 = new System.Windows.Forms.PictureBox(); + this.dgvDbProduct = new TemuKJD.UserComponent.DataGridViewEx(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.col_db_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colFromShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colFromShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colMainImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colMainImg = new System.Windows.Forms.DataGridViewImageColumn(); + this.col_product_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.col_spu_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.col_skc_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colMainCate = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.col_cat_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.col_ext_code = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colPriceText = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colExtCodePrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn(); + this.col_notes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colHeadWords = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colEndWords = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colFissionWords = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.col_edit = new System.Windows.Forms.DataGridViewLinkColumn(); + this.col_delete = new System.Windows.Forms.DataGridViewLinkColumn(); + this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); + this.splitContainer4.Panel1.SuspendLayout(); + this.splitContainer4.Panel2.SuspendLayout(); + this.splitContainer4.SuspendLayout(); + this.panel2.SuspendLayout(); + this.pnlMsg.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); + this.splitContainer3.Panel1.SuspendLayout(); + this.splitContainer3.Panel2.SuspendLayout(); + this.splitContainer3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvDbProduct)).BeginInit(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.BackColor = System.Drawing.Color.White; + 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.btnGoTo); + this.splitContainer1.Panel1.Controls.Add(this.txtUrl); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.splitContainer4); + this.splitContainer1.Size = new System.Drawing.Size(1137, 626); + this.splitContainer1.SplitterDistance = 27; + this.splitContainer1.TabIndex = 3; + // + // btnGoTo + // + this.btnGoTo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnGoTo.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGoTo.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnGoTo.DisabledBackColor = System.Drawing.Color.Empty; + this.btnGoTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnGoTo.Location = new System.Drawing.Point(1074, 4); + this.btnGoTo.Name = "btnGoTo"; + this.btnGoTo.Size = new System.Drawing.Size(61, 23); + this.btnGoTo.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnGoTo.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGoTo.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGoTo.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnGoTo.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnGoTo.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnGoTo.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnGoTo.Style.GradientAngle = 90; + this.btnGoTo.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnGoTo.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGoTo.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGoTo.TabIndex = 1124; + this.btnGoTo.Text = "跳转"; + this.btnGoTo.Click += new System.EventHandler(this.btnGoTo_Click); + // + // txtUrl + // + this.txtUrl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtUrl.Location = new System.Drawing.Point(0, 4); + this.txtUrl.Name = "txtUrl"; + this.txtUrl.Size = new System.Drawing.Size(1072, 23); + this.txtUrl.TabIndex = 0; + // + // 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"; + this.splitContainer4.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.panel2); + // + // splitContainer4.Panel2 + // + this.splitContainer4.Panel2.Controls.Add(this.textBox1); + this.splitContainer4.Size = new System.Drawing.Size(1137, 595); + this.splitContainer4.SplitterDistance = 534; + this.splitContainer4.TabIndex = 2; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.White; + this.panel2.Controls.Add(this.pnlMsg); + this.panel2.Controls.Add(this.pbLoading); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1137, 534); + this.panel2.TabIndex = 1; + // + // pnlMsg + // + this.pnlMsg.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.pnlMsg.CanvasColor = System.Drawing.SystemColors.Control; + this.pnlMsg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlMsg.Controls.Add(this.lblMsg); + this.pnlMsg.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlMsg.Location = new System.Drawing.Point(368, 72); + this.pnlMsg.Name = "pnlMsg"; + this.pnlMsg.Size = new System.Drawing.Size(401, 110); + this.pnlMsg.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlMsg.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.pnlMsg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); + this.pnlMsg.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pnlMsg.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.pnlMsg.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pnlMsg.Style.GradientAngle = 90; + this.pnlMsg.TabIndex = 496; + this.pnlMsg.Visible = false; + // + // lblMsg + // + this.lblMsg.ForeColor = System.Drawing.SystemColors.HotTrack; + this.lblMsg.Location = new System.Drawing.Point(29, 20); + this.lblMsg.Name = "lblMsg"; + this.lblMsg.Size = new System.Drawing.Size(345, 69); + this.lblMsg.TabIndex = 0; + this.lblMsg.Text = "消息tip"; + // + // pbLoading + // + this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbLoading.Location = new System.Drawing.Point(543, 242); + this.pbLoading.Name = "pbLoading"; + this.pbLoading.Size = new System.Drawing.Size(50, 50); + this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading.TabIndex = 8; + this.pbLoading.TabStop = false; + // + // textBox1 + // + this.textBox1.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.textBox1.Location = new System.Drawing.Point(13, 8); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(1115, 42); + this.textBox1.TabIndex = 0; + this.textBox1.Text = "这个产品生成一百二十个标题，TXT 文本，然后一行一个，不要加一二三四五六七八九这个序号，标题长度30个字，标题不要出现一模一样的。"; + // + // splitContainer2 + // + this.splitContainer2.BackColor = System.Drawing.Color.White; + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer2.Location = new System.Drawing.Point(1, 33); + this.splitContainer2.Name = "splitContainer2"; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.splitContainer3); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.splitContainer1); + this.splitContainer2.Size = new System.Drawing.Size(1498, 626); + this.splitContainer2.SplitterDistance = 357; + this.splitContainer2.TabIndex = 4; + // + // splitContainer3 + // + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + 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.btnBatchCreateFissionTitle); + this.splitContainer3.Panel1MinSize = 0; + // + // splitContainer3.Panel2 + // + this.splitContainer3.Panel2.AutoScroll = true; + this.splitContainer3.Panel2.Controls.Add(this.pbLoading2); + this.splitContainer3.Panel2.Controls.Add(this.dgvDbProduct); + this.splitContainer3.Panel2MinSize = 0; + this.splitContainer3.Size = new System.Drawing.Size(357, 626); + this.splitContainer3.SplitterDistance = 94; + this.splitContainer3.TabIndex = 0; + // + // btnBatchCreateFissionTitle + // + this.btnBatchCreateFissionTitle.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnBatchCreateFissionTitle.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnBatchCreateFissionTitle.DisabledBackColor = System.Drawing.Color.Empty; + this.btnBatchCreateFissionTitle.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnBatchCreateFissionTitle.Location = new System.Drawing.Point(21, 17); + this.btnBatchCreateFissionTitle.Name = "btnBatchCreateFissionTitle"; + this.btnBatchCreateFissionTitle.Size = new System.Drawing.Size(135, 23); + this.btnBatchCreateFissionTitle.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnBatchCreateFissionTitle.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnBatchCreateFissionTitle.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnBatchCreateFissionTitle.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnBatchCreateFissionTitle.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnBatchCreateFissionTitle.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnBatchCreateFissionTitle.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnBatchCreateFissionTitle.Style.GradientAngle = 90; + this.btnBatchCreateFissionTitle.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnBatchCreateFissionTitle.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnBatchCreateFissionTitle.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnBatchCreateFissionTitle.TabIndex = 1128; + this.btnBatchCreateFissionTitle.Text = "批量生成裂变标题"; + // + // pbLoading2 + // + this.pbLoading2.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pbLoading2.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbLoading2.Location = new System.Drawing.Point(153, 241); + this.pbLoading2.Name = "pbLoading2"; + this.pbLoading2.Size = new System.Drawing.Size(50, 50); + this.pbLoading2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading2.TabIndex = 9; + this.pbLoading2.TabStop = false; + // + // dgvDbProduct + // + this.dgvDbProduct.AllowUserToAddRows = false; + this.dgvDbProduct.AllowUserToDeleteRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvDbProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvDbProduct.AutoRowNumber = true; + this.dgvDbProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dgvDbProduct.BackgroundColor = System.Drawing.Color.White; + this.dgvDbProduct.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.dgvDbProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvDbProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvDbProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colSelect, + this.col_db_id, + this.colFromShopId, + this.colFromShopName, + this.colMainImgUrl, + this.colMainImg, + this.col_product_name, + this.col_spu_id, + this.col_skc_id, + this.colMainCate, + this.col_cat_name, + this.col_ext_code, + this.colGroup, + this.colPriceText, + this.colExtCodePrice, + this.colEdit, + this.col_notes, + this.colHeadWords, + this.colEndWords, + this.colFissionWords, + this.colOpResult, + this.col_edit, + this.col_delete, + this.col_select_product}); + this.dgvDbProduct.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvDbProduct.Location = new System.Drawing.Point(0, 0); + this.dgvDbProduct.MultiSelectCheckBox = true; + this.dgvDbProduct.Name = "dgvDbProduct"; + this.dgvDbProduct.ReadOnly = true; + this.dgvDbProduct.RowHeadersWidth = 30; + this.dgvDbProduct.RowTemplate.Height = 23; + this.dgvDbProduct.Size = new System.Drawing.Size(357, 528); + this.dgvDbProduct.TabIndex = 10; + // + // colSelect + // + this.colSelect.FillWeight = 25F; + 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; + // + // col_db_id + // + this.col_db_id.FillWeight = 60F; + this.col_db_id.HeaderText = "数据库Id"; + this.col_db_id.Name = "col_db_id"; + this.col_db_id.ReadOnly = true; + this.col_db_id.Visible = false; + // + // colFromShopId + // + this.colFromShopId.HeaderText = "来源店铺Id"; + this.colFromShopId.Name = "colFromShopId"; + this.colFromShopId.ReadOnly = true; + this.colFromShopId.Visible = false; + // + // colFromShopName + // + this.colFromShopName.HeaderText = "来源店铺名称"; + this.colFromShopName.Name = "colFromShopName"; + this.colFromShopName.ReadOnly = true; + this.colFromShopName.Visible = false; + // + // colMainImgUrl + // + this.colMainImgUrl.FillWeight = 110F; + this.colMainImgUrl.HeaderText = "主图路径"; + this.colMainImgUrl.Name = "colMainImgUrl"; + this.colMainImgUrl.ReadOnly = true; + this.colMainImgUrl.Visible = false; + // + // colMainImg + // + this.colMainImg.FillWeight = 60F; + this.colMainImg.HeaderText = "主图"; + this.colMainImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colMainImg.Name = "colMainImg"; + this.colMainImg.ReadOnly = true; + this.colMainImg.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colMainImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // col_product_name + // + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.col_product_name.DefaultCellStyle = dataGridViewCellStyle3; + this.col_product_name.FillWeight = 140F; + this.col_product_name.HeaderText = "标题"; + this.col_product_name.Name = "col_product_name"; + this.col_product_name.ReadOnly = true; + // + // col_spu_id + // + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.col_spu_id.DefaultCellStyle = dataGridViewCellStyle4; + this.col_spu_id.HeaderText = "商品Id"; + this.col_spu_id.Name = "col_spu_id"; + this.col_spu_id.ReadOnly = true; + this.col_spu_id.Visible = false; + // + // col_skc_id + // + this.col_skc_id.HeaderText = "SKC Id"; + this.col_skc_id.Name = "col_skc_id"; + this.col_skc_id.ReadOnly = true; + this.col_skc_id.Visible = false; + // + // colMainCate + // + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMainCate.DefaultCellStyle = dataGridViewCellStyle5; + this.colMainCate.FillWeight = 50F; + this.colMainCate.HeaderText = "主类目"; + this.colMainCate.Name = "colMainCate"; + this.colMainCate.ReadOnly = true; + this.colMainCate.Visible = false; + // + // col_cat_name + // + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.col_cat_name.DefaultCellStyle = dataGridViewCellStyle6; + this.col_cat_name.FillWeight = 70F; + this.col_cat_name.HeaderText = "类目"; + this.col_cat_name.Name = "col_cat_name"; + this.col_cat_name.ReadOnly = true; + this.col_cat_name.Visible = false; + // + // col_ext_code + // + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.col_ext_code.DefaultCellStyle = dataGridViewCellStyle7; + this.col_ext_code.HeaderText = "货号"; + this.col_ext_code.Name = "col_ext_code"; + this.col_ext_code.ReadOnly = true; + this.col_ext_code.Visible = false; + // + // colGroup + // + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colGroup.DefaultCellStyle = dataGridViewCellStyle8; + this.colGroup.HeaderText = "分组"; + this.colGroup.Name = "colGroup"; + this.colGroup.ReadOnly = true; + this.colGroup.Visible = false; + // + // colPriceText + // + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colPriceText.DefaultCellStyle = dataGridViewCellStyle9; + this.colPriceText.FillWeight = 65F; + this.colPriceText.HeaderText = "母店价格"; + this.colPriceText.Name = "colPriceText"; + this.colPriceText.ReadOnly = true; + this.colPriceText.Visible = false; + // + // colExtCodePrice + // + this.colExtCodePrice.FillWeight = 60F; + this.colExtCodePrice.HeaderText = "货号价格"; + this.colExtCodePrice.Name = "colExtCodePrice"; + this.colExtCodePrice.ReadOnly = true; + this.colExtCodePrice.Visible = false; + // + // colEdit + // + this.colEdit.FillWeight = 40F; + this.colEdit.HeaderText = "编辑"; + this.colEdit.Name = "colEdit"; + this.colEdit.ReadOnly = true; + this.colEdit.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colEdit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colEdit.Visible = false; + // + // col_notes + // + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.col_notes.DefaultCellStyle = dataGridViewCellStyle10; + this.col_notes.FillWeight = 70F; + this.col_notes.HeaderText = "备注"; + this.col_notes.Name = "col_notes"; + this.col_notes.ReadOnly = true; + this.col_notes.Visible = false; + // + // colHeadWords + // + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colHeadWords.DefaultCellStyle = dataGridViewCellStyle11; + this.colHeadWords.HeaderText = "标题前缀"; + this.colHeadWords.Name = "colHeadWords"; + this.colHeadWords.ReadOnly = true; + this.colHeadWords.Visible = false; + // + // colEndWords + // + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colEndWords.DefaultCellStyle = dataGridViewCellStyle12; + this.colEndWords.HeaderText = "标题后缀"; + this.colEndWords.Name = "colEndWords"; + this.colEndWords.ReadOnly = true; + this.colEndWords.Visible = false; + // + // colFissionWords + // + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colFissionWords.DefaultCellStyle = dataGridViewCellStyle13; + this.colFissionWords.HeaderText = "裂变词"; + this.colFissionWords.Name = "colFissionWords"; + this.colFissionWords.ReadOnly = true; + this.colFissionWords.Visible = false; + // + // colOpResult + // + this.colOpResult.FillWeight = 80F; + this.colOpResult.HeaderText = "状态"; + this.colOpResult.Name = "colOpResult"; + this.colOpResult.ReadOnly = true; + // + // col_edit + // + this.col_edit.FillWeight = 40F; + this.col_edit.HeaderText = "详情"; + this.col_edit.Name = "col_edit"; + this.col_edit.ReadOnly = true; + this.col_edit.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.col_edit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.col_edit.Visible = false; + // + // col_delete + // + this.col_delete.FillWeight = 40F; + this.col_delete.HeaderText = "删除"; + this.col_delete.Name = "col_delete"; + this.col_delete.ReadOnly = true; + this.col_delete.Visible = false; + // + // col_select_product + // + this.col_select_product.FillWeight = 42F; + this.col_select_product.HeaderText = "认领"; + this.col_select_product.Name = "col_select_product"; + this.col_select_product.ReadOnly = true; + this.col_select_product.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.col_select_product.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.col_select_product.Visible = false; + // + // DouBaoTitleFissionCefForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(1500, 660); + this.Controls.Add(this.splitContainer2); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.KeyPreview = true; + this.Name = "DouBaoTitleFissionCefForm"; + this.ShowMaximizeBox = true; + this.Text = "豆包生成SKU图"; + this.TitleText = "豆包生成SKU图"; + this.Load += new System.EventHandler(this.DouBaoCefForm_Load); + this.VisibleChanged += new System.EventHandler(this.DouBaoTitleFissionCefForm_VisibleChanged); + this.Controls.SetChildIndex(this.splitContainer2, 0); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.splitContainer4.Panel1.ResumeLayout(false); + this.splitContainer4.Panel2.ResumeLayout(false); + this.splitContainer4.Panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit(); + this.splitContainer4.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.pnlMsg.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + this.splitContainer3.Panel1.ResumeLayout(false); + this.splitContainer3.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); + this.splitContainer3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvDbProduct)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.TextBox txtUrl; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.SplitContainer splitContainer2; + private System.Windows.Forms.PictureBox pbLoading; + private System.Windows.Forms.SplitContainer splitContainer3; + private System.Windows.Forms.PictureBox pbLoading2; + private System.Windows.Forms.SplitContainer splitContainer4; + private System.Windows.Forms.TextBox textBox1; + private DevComponents.DotNetBar.PanelEx pnlMsg; + private System.Windows.Forms.Label lblMsg; + private UserComponent.DataGridViewEx dgvDbProduct; + private DevComponents.DotNetBar.PanelEx btnGoTo; + private DevComponents.DotNetBar.PanelEx btnBatchCreateFissionTitle; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id; + private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colMainImgUrl; + private System.Windows.Forms.DataGridViewImageColumn colMainImg; + private System.Windows.Forms.DataGridViewTextBoxColumn col_product_name; + private System.Windows.Forms.DataGridViewTextBoxColumn col_spu_id; + private System.Windows.Forms.DataGridViewTextBoxColumn col_skc_id; + private System.Windows.Forms.DataGridViewTextBoxColumn colMainCate; + private System.Windows.Forms.DataGridViewTextBoxColumn col_cat_name; + private System.Windows.Forms.DataGridViewTextBoxColumn col_ext_code; + private System.Windows.Forms.DataGridViewTextBoxColumn colGroup; + private System.Windows.Forms.DataGridViewTextBoxColumn colPriceText; + private System.Windows.Forms.DataGridViewTextBoxColumn colExtCodePrice; + private System.Windows.Forms.DataGridViewLinkColumn colEdit; + private System.Windows.Forms.DataGridViewTextBoxColumn col_notes; + private System.Windows.Forms.DataGridViewTextBoxColumn colHeadWords; + private System.Windows.Forms.DataGridViewTextBoxColumn colEndWords; + private System.Windows.Forms.DataGridViewTextBoxColumn colFissionWords; + private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; + private System.Windows.Forms.DataGridViewLinkColumn col_edit; + private System.Windows.Forms.DataGridViewLinkColumn col_delete; + private System.Windows.Forms.DataGridViewLinkColumn col_select_product; + } +} \ No newline at end of file diff --git a/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs new file mode 100644 index 0000000..d04f6e5 --- /dev/null +++ b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs @@ -0,0 +1,153 @@ +using AllBase; +using AllBase.Model.Result; +using AllBase.Model.Result.TemuResult; +using CefSharp; +using CefSharp.WinForms; +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.IO; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.Windows.Forms; +using TemuKJD.BaseForms; +using TemuKJD.Extension; +using TemuKJD.Helper; +using TemuKJD.KJDForms.ProductSelectForms; +using Work; +using Work.BLL.Tools; + +namespace TemuKJD.ToolForms +{ + public partial class DouBaoTitleFissionCefForm : BaseGeneralForm + { + ChromiumWebBrowser cefWebBrowser = null; + List lstDbProd = new List(); + + string Url { get; set; } = "https://www.doubao.com/chat/"; + List Cookies = new List(); + public DouBaoTitleFissionCefForm(List dbProdList, string url = "", List cookies = null) + { + InitializeComponent(); + + if (dbProdList != null) + lstDbProd.AddRange(dbProdList); + if (!string.IsNullOrEmpty(url)) + Url = url; + if (cookies != null) + Cookies = cookies; + + this.Width = Math.Min(1600, Screen.PrimaryScreen.Bounds.Width); + this.Height = Math.Min(900, Screen.PrimaryScreen.Bounds.Height); + this.StartPosition = FormStartPosition.CenterScreen; + + + } + + private void DouBaoCefForm_Load(object sender, EventArgs e) + { + this.dgvDbProduct.AddSelectorColumn("colSelect"); + this.dgvDbProduct.AddImgColumn("colMainImg", "colMainImgUrl"); + + cefWebBrowser = NaiBa.CefHelper.CEFBrowser.CreateChromiumWebBrowser(Url); + cefWebBrowser.AutoSize = true; + cefWebBrowser.Dock = DockStyle.Fill; + //cefWebBrowser.RequestContext = new RequestContext(requestContextSettings); + cefWebBrowser.KeyboardHandler = new KJDForms.ToolForms.CefKeyboardHandler(); + cefWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd; + cefWebBrowser.AddressChanged += CefWebBrowser_AddressChanged; + CustomDownloadHandler downloadHandler = new CustomDownloadHandler(); + downloadHandler.DownloadCompleteEvent += DownloadHandler_DownloadComplete; + cefWebBrowser.DownloadHandler = downloadHandler; + panel2.Controls.Add(cefWebBrowser); + + //this.splitContainer3.Panel2.Controls.Clear(); + ShopProduct(); + } + + private void DouBaoTitleFissionCefForm_VisibleChanged(object sender, EventArgs e) + { + } + + void ShopProduct() + { + dgvDbProduct.Rows.Clear(); + foreach (var prod in this.lstDbProd) + { + var rowId = this.dgvDbProduct.Rows.Add( + false, + prod?.id, + prod?.from_shop_id, + prod?.from_shop_name, + prod?.main_img?.Replace("https", "http") + "?imageView2/2/w/90/h/90", + DataGridViewExtension.defaultBitmap, + prod?.product_name, + prod?.spu_id, + "" + ); + var row = this.dgvDbProduct.Rows[rowId]; + row.Height = 60; + } + pbLoading2.Visible = false; + } + + private void DownloadHandler_DownloadComplete(object browser, DownloadItem downloadItem) + { + //BaseMsgForm.ShowInfo(downloadItem.FullPath + "下载完成"); + //Invoke(new Action(() => + //{ + // if(currentSkuImgItem == null) + // { + // BaseMsgForm.ShowInfo("当前未选择sku，点击选择sku再下载，图片将直接上传到服务端！"); + // this.lblMsg.Text = downloadItem.FullPath + "下载完成"; + // } + // else + // { + // if (UpdateSkuImg(currentSkuImgItem, downloadItem.FullPath)) + // { + // this.lblMsg.Text = downloadItem.FullPath + "下载并上传服务端完成"; + // } + // else + // { + // this.lblMsg.Text = downloadItem.FullPath + "下载完成"; + // } + // } + // this.pnlMsg.Visible = true; + //})); + //Task.Run(() => + //{ + // Thread.Sleep(2000); + // Invoke(new Action(() => + // { + // this.pnlMsg.Visible = false; + // })); + //}); + } + + private void CefWebBrowser_AddressChanged(object sender, CefSharp.AddressChangedEventArgs e) + { + if (this.Created) + { + Invoke(new Action(() => + { + txtUrl.Text = e.Address; + })); + } + } + + private void CefWebBrowser_FrameLoadEnd(object sender, CefSharp.FrameLoadEndEventArgs e) + { + } + + private void btnGoTo_Click(object sender, EventArgs e) + { + this.cefWebBrowser.Load(txtUrl.Text.Trim()); + } + } +} diff --git a/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.resx b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.resx new file mode 100644 index 0000000..a80f0f0 --- /dev/null +++ b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.resx @@ -0,0 +1,370 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ + AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA + OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT + AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj/////// + ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP// + //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ + mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4 + mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ + mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ + mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ + mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ + mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ + mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY + //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ + mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf + //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/ + //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv/// + //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP// + if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ + mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz + MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn/// + iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ + mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4 + kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP// + /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ + mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ + mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ + mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ + mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ + //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ + mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ + mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ + mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT + mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj/////// + ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn/// + //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ + mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ + mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ + mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ + mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj/////////// + ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY////// + ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP + //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4 + /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ + mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ + mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7 + mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4 + eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb//// + ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ + mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj///// + /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/ + ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ + mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ + mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ + mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ + mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ + mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA + AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA + AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz + MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA + AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w + AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA + Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA + AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA + AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA + AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA + AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA + AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA + AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA + AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD///// + wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w== + + + \ No newline at end of file diff --git a/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs b/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs index 41d85fa..ae3e4d2 100644 --- a/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs +++ b/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs @@ -30,16 +30,16 @@ namespace TemuKJD.ToolForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); this.line1 = new DevComponents.DotNetBar.Controls.Line(); this.label2 = new System.Windows.Forms.Label(); this.btnImportCookie = new DevComponents.DotNetBar.PanelEx(); @@ -282,9 +282,9 @@ namespace TemuKJD.ToolForms this.btnSaveDb.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSaveDb.DisabledBackColor = System.Drawing.Color.Empty; this.btnSaveDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSaveDb.Location = new System.Drawing.Point(1227, 58); + this.btnSaveDb.Location = new System.Drawing.Point(1212, 58); this.btnSaveDb.Name = "btnSaveDb"; - this.btnSaveDb.Size = new System.Drawing.Size(82, 23); + this.btnSaveDb.Size = new System.Drawing.Size(97, 23); this.btnSaveDb.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSaveDb.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSaveDb.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -401,7 +401,7 @@ namespace TemuKJD.ToolForms this.btnGetGoods.Cursor = System.Windows.Forms.Cursors.Hand; this.btnGetGoods.DisabledBackColor = System.Drawing.Color.Empty; this.btnGetGoods.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnGetGoods.Location = new System.Drawing.Point(1059, 58); + this.btnGetGoods.Location = new System.Drawing.Point(1044, 58); this.btnGetGoods.Name = "btnGetGoods"; this.btnGetGoods.Size = new System.Drawing.Size(82, 23); this.btnGetGoods.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -593,7 +593,7 @@ namespace TemuKJD.ToolForms this.splitContainer1.Panel2.Controls.Add(this.label2); this.splitContainer1.Panel2.Controls.Add(this.line1); this.splitContainer1.Size = new System.Drawing.Size(1404, 561); - this.splitContainer1.SplitterDistance = 462; + this.splitContainer1.SplitterDistance = 463; this.splitContainer1.SplitterWidth = 3; this.splitContainer1.TabIndex = 4; // @@ -611,7 +611,7 @@ namespace TemuKJD.ToolForms this.ucTabControlMetro1.Name = "ucTabControlMetro1"; this.ucTabControlMetro1.SelectedIndex = 0; this.ucTabControlMetro1.ShowCloseButton = false; - this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 462); + this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 463); this.ucTabControlMetro1.TabIndex = 462; this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray; @@ -625,7 +625,7 @@ namespace TemuKJD.ToolForms this.tabPage1.Margin = new System.Windows.Forms.Padding(5); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1396, 430); + this.tabPage1.Size = new System.Drawing.Size(1396, 431); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "商品页面"; this.tabPage1.UseVisualStyleBackColor = true; @@ -644,7 +644,7 @@ namespace TemuKJD.ToolForms this.splitContainer2.Panel1.Controls.Add(this.btnNext); this.splitContainer2.Panel1.Controls.Add(this.btnPrev); this.splitContainer2.Panel1.Controls.Add(this.txtAddress); - this.splitContainer2.Size = new System.Drawing.Size(1390, 424); + this.splitContainer2.Size = new System.Drawing.Size(1390, 425); this.splitContainer2.SplitterDistance = 26; this.splitContainer2.TabIndex = 6; // @@ -686,7 +686,7 @@ namespace TemuKJD.ToolForms this.tabPage2.Location = new System.Drawing.Point(4, 28); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1396, 443); + this.tabPage2.Size = new System.Drawing.Size(1396, 430); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "采集商品列表"; this.tabPage2.UseVisualStyleBackColor = true; @@ -695,7 +695,7 @@ namespace TemuKJD.ToolForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(673, 194); + this.pbLoading.Location = new System.Drawing.Point(673, 188); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -707,20 +707,20 @@ namespace TemuKJD.ToolForms // this.dgvProduct.AllowUserToAddRows = false; this.dgvProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; this.dgvProduct.AutoRowNumber = true; this.dgvProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvProduct.BackgroundColor = System.Drawing.Color.White; this.dgvProduct.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.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -746,7 +746,7 @@ namespace TemuKJD.ToolForms this.dgvProduct.Name = "dgvProduct"; this.dgvProduct.ReadOnly = true; this.dgvProduct.RowTemplate.Height = 23; - this.dgvProduct.Size = new System.Drawing.Size(1390, 437); + this.dgvProduct.Size = new System.Drawing.Size(1390, 424); this.dgvProduct.TabIndex = 7; this.dgvProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProduct_CellContentClick); // @@ -782,8 +782,8 @@ namespace TemuKJD.ToolForms // // colGoodsName // - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle13; this.colGoodsName.HeaderText = "商品名称"; this.colGoodsName.Name = "colGoodsName"; this.colGoodsName.ReadOnly = true; @@ -815,8 +815,8 @@ namespace TemuKJD.ToolForms // // colPrice // - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colPrice.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colPrice.DefaultCellStyle = dataGridViewCellStyle14; this.colPrice.FillWeight = 40F; this.colPrice.HeaderText = "供货价"; this.colPrice.Name = "colPrice"; @@ -875,8 +875,8 @@ namespace TemuKJD.ToolForms // // colMsg // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colMsg.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMsg.DefaultCellStyle = dataGridViewCellStyle15; this.colMsg.FillWeight = 160F; this.colMsg.HeaderText = "操作结果"; this.colMsg.Name = "colMsg"; @@ -888,7 +888,7 @@ namespace TemuKJD.ToolForms this.tabPage3.Location = new System.Drawing.Point(4, 28); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(1396, 443); + this.tabPage3.Size = new System.Drawing.Size(1396, 430); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "1688地址管理"; this.tabPage3.UseVisualStyleBackColor = true; @@ -898,7 +898,7 @@ namespace TemuKJD.ToolForms this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(3, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1390, 437); + this.panel1.Size = new System.Drawing.Size(1390, 424); this.panel1.TabIndex = 0; // // tabPage4 @@ -907,9 +907,9 @@ namespace TemuKJD.ToolForms this.tabPage4.Location = new System.Drawing.Point(4, 28); this.tabPage4.Name = "tabPage4"; this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(1396, 443); + this.tabPage4.Size = new System.Drawing.Size(1396, 430); this.tabPage4.TabIndex = 3; - this.tabPage4.Text = "1688外部数据"; + this.tabPage4.Text = "已采集数据"; this.tabPage4.UseVisualStyleBackColor = true; // // panel2 @@ -918,27 +918,27 @@ namespace TemuKJD.ToolForms this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(3, 3); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1390, 437); + this.panel2.Size = new System.Drawing.Size(1390, 424); this.panel2.TabIndex = 1; // // dgvOut1688Prod // this.dgvOut1688Prod.AllowUserToAddRows = false; this.dgvOut1688Prod.AllowUserToDeleteRows = false; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvOut1688Prod.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle16.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvOut1688Prod.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16; this.dgvOut1688Prod.AutoRowNumber = true; this.dgvOut1688Prod.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvOut1688Prod.BackgroundColor = System.Drawing.Color.White; this.dgvOut1688Prod.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvOut1688Prod.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvOut1688Prod.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; this.dgvOut1688Prod.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvOut1688Prod.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewCheckBoxColumn1, @@ -960,7 +960,7 @@ namespace TemuKJD.ToolForms this.dgvOut1688Prod.Name = "dgvOut1688Prod"; this.dgvOut1688Prod.ReadOnly = true; this.dgvOut1688Prod.RowTemplate.Height = 23; - this.dgvOut1688Prod.Size = new System.Drawing.Size(1390, 437); + this.dgvOut1688Prod.Size = new System.Drawing.Size(1390, 424); this.dgvOut1688Prod.TabIndex = 839; // // dataGridViewCheckBoxColumn1 @@ -1002,8 +1002,8 @@ namespace TemuKJD.ToolForms // // colOutGoodsName // - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colOutGoodsName.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colOutGoodsName.DefaultCellStyle = dataGridViewCellStyle18; this.colOutGoodsName.FillWeight = 150F; this.colOutGoodsName.HeaderText = "商品名称"; this.colOutGoodsName.Name = "colOutGoodsName"; @@ -1036,8 +1036,8 @@ namespace TemuKJD.ToolForms // // colOutPrice // - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colOutPrice.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colOutPrice.DefaultCellStyle = dataGridViewCellStyle19; this.colOutPrice.FillWeight = 40F; this.colOutPrice.HeaderText = "供货价"; this.colOutPrice.Name = "colOutPrice"; @@ -1061,8 +1061,8 @@ namespace TemuKJD.ToolForms // // colOutMsg // - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colOutMsg.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colOutMsg.DefaultCellStyle = dataGridViewCellStyle20; this.colOutMsg.FillWeight = 160F; this.colOutMsg.HeaderText = "操作结果"; this.colOutMsg.Name = "colOutMsg"; @@ -1075,9 +1075,9 @@ namespace TemuKJD.ToolForms this.btnOutProdSaveDb.Cursor = System.Windows.Forms.Cursors.Hand; this.btnOutProdSaveDb.DisabledBackColor = System.Drawing.Color.Empty; this.btnOutProdSaveDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOutProdSaveDb.Location = new System.Drawing.Point(956, 58); + this.btnOutProdSaveDb.Location = new System.Drawing.Point(929, 58); this.btnOutProdSaveDb.Name = "btnOutProdSaveDb"; - this.btnOutProdSaveDb.Size = new System.Drawing.Size(82, 23); + this.btnOutProdSaveDb.Size = new System.Drawing.Size(97, 23); this.btnOutProdSaveDb.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnOutProdSaveDb.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnOutProdSaveDb.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1090,7 +1090,7 @@ namespace TemuKJD.ToolForms this.btnOutProdSaveDb.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnOutProdSaveDb.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnOutProdSaveDb.TabIndex = 1150; - this.btnOutProdSaveDb.Text = "外部商品入库"; + this.btnOutProdSaveDb.Text = "已采集数据入库"; this.btnOutProdSaveDb.Visible = false; this.btnOutProdSaveDb.Click += new System.EventHandler(this.btnOutProdSaveDb_Click); // @@ -1114,7 +1114,7 @@ namespace TemuKJD.ToolForms this.btnGetDetail.Cursor = System.Windows.Forms.Cursors.Hand; this.btnGetDetail.DisabledBackColor = System.Drawing.Color.Empty; this.btnGetDetail.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnGetDetail.Location = new System.Drawing.Point(1143, 58); + this.btnGetDetail.Location = new System.Drawing.Point(1128, 58); this.btnGetDetail.Name = "btnGetDetail"; this.btnGetDetail.Size = new System.Drawing.Size(82, 23); this.btnGetDetail.Style.Alignment = System.Drawing.StringAlignment.Center; diff --git a/TEMUKJD/ToolForms/Get1688ProductForm.cs b/TEMUKJD/ToolForms/Get1688ProductForm.cs index 3318035..555f61b 100644 --- a/TEMUKJD/ToolForms/Get1688ProductForm.cs +++ b/TEMUKJD/ToolForms/Get1688ProductForm.cs @@ -987,7 +987,7 @@ namespace TemuKJD.ToolForms })); }, cancellationTokenSource.Token); } - else if (btnSaveDb.Text == "外部商品入库") + else if (btnSaveDb.Text == "外部商品入库" || btnSaveDb.Text == "已采集数据入库") { Out1688ProductImport(); } @@ -1149,9 +1149,10 @@ namespace TemuKJD.ToolForms private void ucTabControlMetro1_SelectedIndexChanged(object sender, EventArgs e) { - if (ucTabControlMetro1.SelectedTab.Text == "1688外部数据") + if (ucTabControlMetro1.SelectedTab.Text == "1688外部数据" || ucTabControlMetro1.SelectedTab.Text == "已采集数据") { btnSaveDb.Text = "外部商品入库"; + btnSaveDb.Text = "已采集数据入库"; btnGetDetail.Visible = false; btnGetGoods.Visible = false; } diff --git a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs index a6c1d1d..03ffed5 100644 --- a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs +++ b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs @@ -630,7 +630,7 @@ namespace TemuKJD.WXForms.OrderForms rw.Cells["colOrderStatus"].Value = currentStatus; } })); - if (currentStatus != "待发货" && currentStatus != "已发货") + if (currentStatus != "待发货" && currentStatus != "已发货" && currentStatus != "超时未发货") { Invoke(new Action(() => { pbLoading.Visible = false; })); BaseMsgForm.ShowError("订单状态已变化，请勿拍单"); @@ -693,7 +693,7 @@ namespace TemuKJD.WXForms.OrderForms rw.Cells["colOrderStatus"].Value = currentStatus; } })); - if (currentStatus != "待发货" && currentStatus != "已发货") + if (currentStatus != "待发货" && currentStatus != "已发货" && currentStatus != "超时未发货") { BaseMsgForm.ShowError("订单状态已变化，请勿拍单"); return; @@ -739,7 +739,7 @@ namespace TemuKJD.WXForms.OrderForms } pbLoading.Visible = false; })); - if (currentStatus != "待发货" && currentStatus != "已发货") + if (currentStatus != "待发货" && currentStatus != "已发货" && currentStatus != "超时未发货") { BaseMsgForm.ShowError("订单状态已变化，请勿拍单"); return; diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs index 2bab6cf..779e803 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs @@ -109,9 +109,15 @@ namespace TemuKJD.WXForms.ProductForms this.chkCommission = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnLoginAssistant = new DevComponents.DotNetBar.PanelEx(); this.商品裂变 = new System.Windows.Forms.TabPage(); + this.line2 = new DevComponents.DotNetBar.Controls.Line(); + this.label38 = new System.Windows.Forms.Label(); + this.txtFissionRandomPriceChange = new System.Windows.Forms.TextBox(); + this.chkFissionRandomPriceChange = new TemuKJD.UserComponent.UcCheckBox(this.components); this.txtDetailBorderImgCount = new System.Windows.Forms.TextBox(); + this.label35 = new System.Windows.Forms.Label(); this.label36 = new System.Windows.Forms.Label(); this.txtMainBorderImgCount = new System.Windows.Forms.TextBox(); + this.label34 = new System.Windows.Forms.Label(); this.label33 = new System.Windows.Forms.Label(); this.label32 = new System.Windows.Forms.Label(); this.txtAiImgCount = new System.Windows.Forms.TextBox(); @@ -122,6 +128,8 @@ namespace TemuKJD.WXForms.ProductForms this.chkFissionGoodsName = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkRandomImgBorder = new TemuKJD.UserComponent.UcCheckBox(this.components); this.txtFissionTitle = new System.Windows.Forms.TextBox(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.label37 = new System.Windows.Forms.Label(); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbHot = new System.Windows.Forms.ComboBox(); this.btnProdDb = new DevComponents.DotNetBar.PanelEx(); @@ -137,7 +145,6 @@ namespace TemuKJD.WXForms.ProductForms this.cmbGroupFilter = new System.Windows.Forms.ComboBox(); this.txtIdFilter = new System.Windows.Forms.TextBox(); this.cmbCateFilter2 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); - this.label19 = new System.Windows.Forms.Label(); this.btnClearFilter = new DevComponents.DotNetBar.PanelEx(); this.lblGoodsCount = new System.Windows.Forms.Label(); this.cmbWxSafe = new System.Windows.Forms.ComboBox(); @@ -154,6 +161,7 @@ namespace TemuKJD.WXForms.ProductForms this.label20 = new System.Windows.Forms.Label(); this.lblIdFilter = new System.Windows.Forms.Label(); this.lblHot = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); this.label24 = new System.Windows.Forms.Label(); @@ -224,14 +232,7 @@ namespace TemuKJD.WXForms.ProductForms this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.label35 = new System.Windows.Forms.Label(); - this.label34 = new System.Windows.Forms.Label(); - this.line1 = new DevComponents.DotNetBar.Controls.Line(); - this.chkFissionRandomPriceChange = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.txtFissionRandomPriceChange = new System.Windows.Forms.TextBox(); - this.label37 = new System.Windows.Forms.Label(); - this.label38 = new System.Windows.Forms.Label(); - this.line2 = new DevComponents.DotNetBar.Controls.Line(); + this.btnSwitchCatType = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -754,7 +755,7 @@ namespace TemuKJD.WXForms.ProductForms this.上传参数.Location = new System.Drawing.Point(4, 28); this.上传参数.Name = "上传参数"; this.上传参数.Padding = new System.Windows.Forms.Padding(3); - this.上传参数.Size = new System.Drawing.Size(531, 118); + this.上传参数.Size = new System.Drawing.Size(583, 118); this.上传参数.TabIndex = 1; this.上传参数.Text = "上传参数"; this.上传参数.UseVisualStyleBackColor = true; @@ -901,7 +902,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtReplaceText.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtReplaceText.Multiline = true; this.txtReplaceText.Name = "txtReplaceText"; - this.txtReplaceText.Size = new System.Drawing.Size(458, 40); + this.txtReplaceText.Size = new System.Drawing.Size(510, 40); this.txtReplaceText.TabIndex = 740; this.txtReplaceText.Text = "真丝,蚕丝,香云纱,羊绒,羊毛,羊羔绒,羊羔毛,羽绒,皮草"; this.txtReplaceText.TextChanged += new System.EventHandler(this.txtReplaceText_TextChanged); @@ -1073,7 +1074,7 @@ namespace TemuKJD.WXForms.ProductForms this.佣金上货.Location = new System.Drawing.Point(4, 28); this.佣金上货.Name = "佣金上货"; this.佣金上货.Padding = new System.Windows.Forms.Padding(3); - this.佣金上货.Size = new System.Drawing.Size(531, 118); + this.佣金上货.Size = new System.Drawing.Size(583, 118); this.佣金上货.TabIndex = 2; this.佣金上货.Text = "佣金上货"; this.佣金上货.UseVisualStyleBackColor = true; @@ -1246,6 +1247,47 @@ namespace TemuKJD.WXForms.ProductForms this.商品裂变.Text = "商品裂变"; this.商品裂变.UseVisualStyleBackColor = true; // + // line2 + // + this.line2.ForeColor = System.Drawing.SystemColors.ControlDark; + this.line2.Location = new System.Drawing.Point(435, 90); + this.line2.Name = "line2"; + this.line2.Size = new System.Drawing.Size(10, 23); + this.line2.TabIndex = 909; + this.line2.Text = "line2"; + this.line2.VerticalLine = true; + // + // label38 + // + this.label38.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label38.AutoSize = true; + this.label38.Location = new System.Drawing.Point(259, 93); + this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label38.Name = "label38"; + this.label38.Size = new System.Drawing.Size(80, 17); + this.label38.TabIndex = 908; + this.label38.Text = "随机图片顺序"; + // + // txtFissionRandomPriceChange + // + this.txtFissionRandomPriceChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.txtFissionRandomPriceChange.Location = new System.Drawing.Point(513, 90); + this.txtFissionRandomPriceChange.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtFissionRandomPriceChange.Name = "txtFissionRandomPriceChange"; + this.txtFissionRandomPriceChange.Size = new System.Drawing.Size(24, 23); + this.txtFissionRandomPriceChange.TabIndex = 906; + this.txtFissionRandomPriceChange.Text = "2"; + // + // chkFissionRandomPriceChange + // + this.chkFissionRandomPriceChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.chkFissionRandomPriceChange.Location = new System.Drawing.Point(446, 91); + this.chkFissionRandomPriceChange.Name = "chkFissionRandomPriceChange"; + this.chkFissionRandomPriceChange.Size = new System.Drawing.Size(75, 21); + this.chkFissionRandomPriceChange.TabIndex = 905; + this.chkFissionRandomPriceChange.Text = "价格波动"; + this.chkFissionRandomPriceChange.UseVisualStyleBackColor = true; + // // txtDetailBorderImgCount // this.txtDetailBorderImgCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -1256,6 +1298,17 @@ namespace TemuKJD.WXForms.ProductForms this.txtDetailBorderImgCount.TabIndex = 902; this.txtDetailBorderImgCount.Text = "0"; // + // label35 + // + this.label35.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label35.AutoSize = true; + this.label35.Location = new System.Drawing.Point(171, 93); + this.label35.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label35.Name = "label35"; + this.label35.Size = new System.Drawing.Size(44, 17); + this.label35.TabIndex = 904; + this.label35.Text = "详情图"; + // // label36 // this.label36.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -1277,6 +1330,17 @@ namespace TemuKJD.WXForms.ProductForms this.txtMainBorderImgCount.TabIndex = 899; this.txtMainBorderImgCount.Text = "9"; // + // label34 + // + this.label34.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label34.AutoSize = true; + this.label34.Location = new System.Drawing.Point(101, 93); + this.label34.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label34.Name = "label34"; + this.label34.Size = new System.Drawing.Size(32, 17); + this.label34.TabIndex = 901; + this.label34.Text = "主图"; + // // label33 // this.label33.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -1386,12 +1450,34 @@ namespace TemuKJD.WXForms.ProductForms this.txtFissionTitle.TabIndex = 0; this.txtFissionTitle.TextChanged += new System.EventHandler(this.txtFissionTitle_TextChanged); // + // line1 + // + this.line1.ForeColor = System.Drawing.SystemColors.ControlDark; + this.line1.Location = new System.Drawing.Point(250, 90); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(10, 23); + this.line1.TabIndex = 822; + this.line1.Text = "line1"; + this.line1.VerticalLine = true; + // + // label37 + // + this.label37.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label37.AutoSize = true; + this.label37.Location = new System.Drawing.Point(536, 93); + this.label37.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label37.Name = "label37"; + this.label37.Size = new System.Drawing.Size(20, 17); + this.label37.TabIndex = 907; + this.label37.Text = "元"; + // // ucGroupBoxEx4 // this.ucGroupBoxEx4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx4.Controls.Add(this.btnSwitchCatType); this.ucGroupBoxEx4.Controls.Add(this.cmbHot); this.ucGroupBoxEx4.Controls.Add(this.btnProdDb); this.ucGroupBoxEx4.Controls.Add(this.chkWXComplateProd); @@ -1406,7 +1492,6 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.Controls.Add(this.cmbGroupFilter); this.ucGroupBoxEx4.Controls.Add(this.txtIdFilter); this.ucGroupBoxEx4.Controls.Add(this.cmbCateFilter2); - this.ucGroupBoxEx4.Controls.Add(this.label19); this.ucGroupBoxEx4.Controls.Add(this.btnClearFilter); this.ucGroupBoxEx4.Controls.Add(this.lblGoodsCount); this.ucGroupBoxEx4.Controls.Add(this.cmbWxSafe); @@ -1423,6 +1508,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.Controls.Add(this.label20); this.ucGroupBoxEx4.Controls.Add(this.lblIdFilter); this.ucGroupBoxEx4.Controls.Add(this.lblHot); + this.ucGroupBoxEx4.Controls.Add(this.label19); this.ucGroupBoxEx4.Location = new System.Drawing.Point(186, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; this.ucGroupBoxEx4.Size = new System.Drawing.Size(410, 165); @@ -1437,7 +1523,7 @@ namespace TemuKJD.WXForms.ProductForms "", "爆款数据", "普通商品"}); - this.cmbHot.Location = new System.Drawing.Point(309, 73); + this.cmbHot.Location = new System.Drawing.Point(312, 73); this.cmbHot.Name = "cmbHot"; this.cmbHot.Size = new System.Drawing.Size(92, 25); this.cmbHot.TabIndex = 837; @@ -1452,9 +1538,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnProdDb.Cursor = System.Windows.Forms.Cursors.Hand; this.btnProdDb.DisabledBackColor = System.Drawing.Color.Empty; this.btnProdDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnProdDb.Location = new System.Drawing.Point(368, 131); + this.btnProdDb.Location = new System.Drawing.Point(372, 131); this.btnProdDb.Name = "btnProdDb"; - this.btnProdDb.Size = new System.Drawing.Size(33, 25); + this.btnProdDb.Size = new System.Drawing.Size(32, 25); this.btnProdDb.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnProdDb.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnProdDb.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1472,7 +1558,7 @@ namespace TemuKJD.WXForms.ProductForms // // chkWXComplateProd // - this.chkWXComplateProd.Location = new System.Drawing.Point(277, 102); + this.chkWXComplateProd.Location = new System.Drawing.Point(282, 102); this.chkWXComplateProd.Name = "chkWXComplateProd"; this.chkWXComplateProd.Size = new System.Drawing.Size(87, 21); this.chkWXComplateProd.TabIndex = 807; @@ -1482,11 +1568,12 @@ namespace TemuKJD.WXForms.ProductForms // // txtAddCount // + this.txtAddCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtAddCount.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtAddCount.Location = new System.Drawing.Point(273, 131); + this.txtAddCount.Location = new System.Drawing.Point(278, 131); this.txtAddCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddCount.Name = "txtAddCount"; - this.txtAddCount.Size = new System.Drawing.Size(35, 25); + this.txtAddCount.Size = new System.Drawing.Size(33, 25); this.txtAddCount.TabIndex = 536; this.txtAddCount.Text = "500"; // @@ -1497,7 +1584,7 @@ namespace TemuKJD.WXForms.ProductForms "", "已设置", "未设置"}); - this.cmbJstInitSet.Location = new System.Drawing.Point(178, 100); + this.cmbJstInitSet.Location = new System.Drawing.Point(184, 100); this.cmbJstInitSet.Name = "cmbJstInitSet"; this.cmbJstInitSet.Size = new System.Drawing.Size(92, 25); this.cmbJstInitSet.TabIndex = 697; @@ -1506,17 +1593,18 @@ namespace TemuKJD.WXForms.ProductForms // // txtSearchGoodsName // + this.txtSearchGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtSearchGoodsName.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtSearchGoodsName.Location = new System.Drawing.Point(178, 46); + this.txtSearchGoodsName.Location = new System.Drawing.Point(184, 46); this.txtSearchGoodsName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSearchGoodsName.Name = "txtSearchGoodsName"; - this.txtSearchGoodsName.Size = new System.Drawing.Size(223, 25); + this.txtSearchGoodsName.Size = new System.Drawing.Size(220, 25); this.txtSearchGoodsName.TabIndex = 795; // // lblJstInitSet // this.lblJstInitSet.AutoSize = true; - this.lblJstInitSet.Location = new System.Drawing.Point(147, 104); + this.lblJstInitSet.Location = new System.Drawing.Point(155, 104); this.lblJstInitSet.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblJstInitSet.Name = "lblJstInitSet"; this.lblJstInitSet.Size = new System.Drawing.Size(32, 17); @@ -1543,14 +1631,14 @@ namespace TemuKJD.WXForms.ProductForms "", "厂商直采", "1688厂家", - "1688外部数据", + "已采集数据", "微信小店", "微信店采", "母店采集", "机会商品", "以图搜品", - "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(47, 73); + "多多外部数据"}); + this.cmbSourceType.Location = new System.Drawing.Point(56, 73); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(92, 25); this.cmbSourceType.TabIndex = 673; @@ -1566,7 +1654,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCateFilter3.DropDownWidth = 1; this.cmbCateFilter3.FormattingEnabled = true; this.cmbCateFilter3.IntegralHeight = false; - this.cmbCateFilter3.Location = new System.Drawing.Point(309, 19); + this.cmbCateFilter3.Location = new System.Drawing.Point(312, 19); this.cmbCateFilter3.Name = "cmbCateFilter3"; this.cmbCateFilter3.Size = new System.Drawing.Size(92, 25); this.cmbCateFilter3.TabIndex = 710; @@ -1577,7 +1665,7 @@ namespace TemuKJD.WXForms.ProductForms // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(271, 23); + this.label21.Location = new System.Drawing.Point(276, 23); this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(39, 17); @@ -1587,7 +1675,7 @@ namespace TemuKJD.WXForms.ProductForms // cmbGroupFilter // this.cmbGroupFilter.FormattingEnabled = true; - this.cmbGroupFilter.Location = new System.Drawing.Point(178, 73); + this.cmbGroupFilter.Location = new System.Drawing.Point(184, 73); this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Size = new System.Drawing.Size(92, 25); this.cmbGroupFilter.TabIndex = 641; @@ -1596,8 +1684,9 @@ namespace TemuKJD.WXForms.ProductForms // // txtIdFilter // + this.txtIdFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtIdFilter.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtIdFilter.Location = new System.Drawing.Point(47, 100); + this.txtIdFilter.Location = new System.Drawing.Point(56, 100); this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtIdFilter.Name = "txtIdFilter"; this.txtIdFilter.Size = new System.Drawing.Size(92, 25); @@ -1611,7 +1700,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCateFilter2.DropDownWidth = 1; this.cmbCateFilter2.FormattingEnabled = true; this.cmbCateFilter2.IntegralHeight = false; - this.cmbCateFilter2.Location = new System.Drawing.Point(178, 19); + this.cmbCateFilter2.Location = new System.Drawing.Point(184, 19); this.cmbCateFilter2.Name = "cmbCateFilter2"; this.cmbCateFilter2.Size = new System.Drawing.Size(92, 25); this.cmbCateFilter2.TabIndex = 708; @@ -1619,26 +1708,16 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCateFilter2.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter2_SelectedIndexChanged); this.cmbCateFilter2.TextChanged += new System.EventHandler(this.cmbCateFilter2_TextChanged); // - // label19 - // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(140, 23); - this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(39, 17); - this.label19.TabIndex = 707; - this.label19.Text = "类目2"; - // // btnClearFilter // this.btnClearFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnClearFilter.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearFilter.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearFilter.Location = new System.Drawing.Point(368, 100); + this.btnClearFilter.Location = new System.Drawing.Point(372, 100); this.btnClearFilter.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearFilter.Name = "btnClearFilter"; - this.btnClearFilter.Size = new System.Drawing.Size(33, 25); + this.btnClearFilter.Size = new System.Drawing.Size(32, 25); this.btnClearFilter.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnClearFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnClearFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -1673,7 +1752,7 @@ namespace TemuKJD.WXForms.ProductForms "安全+未校验", "安全商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(47, 46); + this.cmbWxSafe.Location = new System.Drawing.Point(56, 46); this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Size = new System.Drawing.Size(92, 25); this.cmbWxSafe.TabIndex = 675; @@ -1685,10 +1764,10 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearUpload.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearUpload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearUpload.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearUpload.Location = new System.Drawing.Point(238, 131); + this.btnClearUpload.Location = new System.Drawing.Point(244, 131); this.btnClearUpload.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearUpload.Name = "btnClearUpload"; - this.btnClearUpload.Size = new System.Drawing.Size(33, 25); + this.btnClearUpload.Size = new System.Drawing.Size(32, 25); this.btnClearUpload.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnClearUpload.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnClearUpload.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -1712,7 +1791,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCateFilter1.DropDownWidth = 1; this.cmbCateFilter1.FormattingEnabled = true; this.cmbCateFilter1.IntegralHeight = false; - this.cmbCateFilter1.Location = new System.Drawing.Point(47, 19); + this.cmbCateFilter1.Location = new System.Drawing.Point(56, 19); this.cmbCateFilter1.Name = "cmbCateFilter1"; this.cmbCateFilter1.Size = new System.Drawing.Size(92, 25); this.cmbCateFilter1.TabIndex = 663; @@ -1723,7 +1802,7 @@ namespace TemuKJD.WXForms.ProductForms // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(9, 23); + this.label2.Location = new System.Drawing.Point(21, 23); this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(39, 17); @@ -1750,9 +1829,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnRandomAdd.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRandomAdd.DisabledBackColor = System.Drawing.Color.Empty; this.btnRandomAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRandomAdd.Location = new System.Drawing.Point(310, 131); + this.btnRandomAdd.Location = new System.Drawing.Point(313, 131); this.btnRandomAdd.Name = "btnRandomAdd"; - this.btnRandomAdd.Size = new System.Drawing.Size(56, 25); + this.btnRandomAdd.Size = new System.Drawing.Size(57, 25); this.btnRandomAdd.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRandomAdd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRandomAdd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -1789,7 +1868,7 @@ namespace TemuKJD.WXForms.ProductForms // lblSourceType // this.lblSourceType.AutoSize = true; - this.lblSourceType.Location = new System.Drawing.Point(16, 77); + this.lblSourceType.Location = new System.Drawing.Point(28, 77); this.lblSourceType.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblSourceType.Name = "lblSourceType"; this.lblSourceType.Size = new System.Drawing.Size(32, 17); @@ -1800,7 +1879,7 @@ namespace TemuKJD.WXForms.ProductForms // lblGroupFilter // this.lblGroupFilter.AutoSize = true; - this.lblGroupFilter.Location = new System.Drawing.Point(147, 77); + this.lblGroupFilter.Location = new System.Drawing.Point(155, 77); this.lblGroupFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblGroupFilter.Name = "lblGroupFilter"; this.lblGroupFilter.Size = new System.Drawing.Size(32, 17); @@ -1814,14 +1893,14 @@ namespace TemuKJD.WXForms.ProductForms this.lblWxSafe.Location = new System.Drawing.Point(4, 49); this.lblWxSafe.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblWxSafe.Name = "lblWxSafe"; - this.lblWxSafe.Size = new System.Drawing.Size(44, 17); + this.lblWxSafe.Size = new System.Drawing.Size(56, 17); this.lblWxSafe.TabIndex = 674; - this.lblWxSafe.Text = "微安检"; + this.lblWxSafe.Text = "微信安检"; // // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(147, 50); + this.label20.Location = new System.Drawing.Point(155, 50); this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(32, 17); @@ -1831,7 +1910,7 @@ namespace TemuKJD.WXForms.ProductForms // lblIdFilter // this.lblIdFilter.AutoSize = true; - this.lblIdFilter.Location = new System.Drawing.Point(27, 104); + this.lblIdFilter.Location = new System.Drawing.Point(39, 104); this.lblIdFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblIdFilter.Name = "lblIdFilter"; this.lblIdFilter.Size = new System.Drawing.Size(21, 17); @@ -1842,7 +1921,7 @@ namespace TemuKJD.WXForms.ProductForms // lblHot // this.lblHot.AutoSize = true; - this.lblHot.Location = new System.Drawing.Point(278, 77); + this.lblHot.Location = new System.Drawing.Point(283, 77); this.lblHot.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblHot.Name = "lblHot"; this.lblHot.Size = new System.Drawing.Size(32, 17); @@ -1850,6 +1929,16 @@ namespace TemuKJD.WXForms.ProductForms this.lblHot.Text = "爆品"; this.lblHot.Visible = false; // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(148, 23); + this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(39, 17); + this.label19.TabIndex = 707; + this.label19.Text = "类目2"; + // // ucGroupBoxEx1 // this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -2830,89 +2919,29 @@ namespace TemuKJD.WXForms.ProductForms this.panelEx1.Text = "停止当前操作"; this.panelEx1.Visible = false; // - // label35 + // btnSwitchCatType // - this.label35.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(171, 93); - this.label35.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(44, 17); - this.label35.TabIndex = 904; - this.label35.Text = "详情图"; - // - // label34 - // - this.label34.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(101, 93); - this.label34.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(32, 17); - this.label34.TabIndex = 901; - this.label34.Text = "主图"; - // - // line1 - // - this.line1.ForeColor = System.Drawing.SystemColors.ControlDark; - this.line1.Location = new System.Drawing.Point(250, 90); - this.line1.Name = "line1"; - this.line1.Size = new System.Drawing.Size(10, 23); - this.line1.TabIndex = 822; - this.line1.Text = "line1"; - this.line1.VerticalLine = true; - // - // chkFissionPriceChange - // - this.chkFissionRandomPriceChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.chkFissionRandomPriceChange.Location = new System.Drawing.Point(446, 91); - this.chkFissionRandomPriceChange.Name = "chkFissionPriceChange"; - this.chkFissionRandomPriceChange.Size = new System.Drawing.Size(75, 21); - this.chkFissionRandomPriceChange.TabIndex = 905; - this.chkFissionRandomPriceChange.Text = "价格波动"; - this.chkFissionRandomPriceChange.UseVisualStyleBackColor = true; - // - // txtFissionPriceChange - // - this.txtFissionRandomPriceChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtFissionRandomPriceChange.Location = new System.Drawing.Point(513, 90); - this.txtFissionRandomPriceChange.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtFissionRandomPriceChange.Name = "txtFissionPriceChange"; - this.txtFissionRandomPriceChange.Size = new System.Drawing.Size(24, 23); - this.txtFissionRandomPriceChange.TabIndex = 906; - this.txtFissionRandomPriceChange.Text = "2"; - // - // label37 - // - this.label37.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(536, 93); - this.label37.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(20, 17); - this.label37.TabIndex = 907; - this.label37.Text = "元"; - // - // label38 - // - this.label38.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(259, 93); - this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(80, 17); - this.label38.TabIndex = 908; - this.label38.Text = "随机图片顺序"; - // - // line2 - // - this.line2.ForeColor = System.Drawing.SystemColors.ControlDark; - this.line2.Location = new System.Drawing.Point(435, 90); - this.line2.Name = "line2"; - this.line2.Size = new System.Drawing.Size(10, 23); - this.line2.TabIndex = 909; - this.line2.Text = "line2"; - this.line2.VerticalLine = true; + this.btnSwitchCatType.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSwitchCatType.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSwitchCatType.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSwitchCatType.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSwitchCatType.Location = new System.Drawing.Point(6, 21); + this.btnSwitchCatType.Name = "btnSwitchCatType"; + this.btnSwitchCatType.Size = new System.Drawing.Size(17, 21); + this.btnSwitchCatType.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSwitchCatType.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSwitchCatType.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSwitchCatType.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSwitchCatType.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSwitchCatType.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSwitchCatType.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSwitchCatType.Style.GradientAngle = 90; + this.btnSwitchCatType.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSwitchCatType.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSwitchCatType.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSwitchCatType.TabIndex = 856; + this.btnSwitchCatType.Text = "W"; + this.btnSwitchCatType.Click += new System.EventHandler(this.btnSwitchCatType_Click); // // WXDBProdUploadForm // @@ -3165,5 +3194,6 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.Label label34; private DevComponents.DotNetBar.Controls.Line line1; private System.Windows.Forms.Label label37; + private DevComponents.DotNetBar.PanelEx btnSwitchCatType; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index bd9d4fe..20d2315 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -405,7 +405,7 @@ namespace TemuKJD.WXForms.ProductForms List tList = new List(); if (idRefreshTodayHasGet) GlobalConfig.lstWxShopAuthInfo.RemoveAll(s => updateIds.Contains(s.ShopId)); - foreach (var shop in GlobalConfig.ShopLoginList.Where(s => updateIds.Contains(s.ShopId))) + foreach (var shop in GlobalConfig.ValidShopLoginList.Where(s => updateIds.Contains(s.ShopId))) { Invoke(new Action(() => { BindShop(shop, selectIds, ""); })); var t = Task.Run(() => @@ -477,7 +477,7 @@ namespace TemuKJD.WXForms.ProductForms } else { - //var list = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus == "登录成功").Select(ss => ss.ShopId); + //var list = GlobalConfig.ValidShopLoginList.Where(s => s.LoginStatus == "登录成功").Select(ss => ss.ShopId); foreach (DataGridViewRow row in dgvShop.Rows) { //if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString())) @@ -512,7 +512,7 @@ namespace TemuKJD.WXForms.ProductForms { Task.Run(() => { - foreach (var shop in GlobalConfig.ShopLoginList) + foreach (var shop in GlobalConfig.ValidShopLoginList) { //if (shop.LoginStatus == "登录成功") //{ @@ -554,6 +554,8 @@ namespace TemuKJD.WXForms.ProductForms GetPddProductCate(); Invoke(new Action(() => { + this.btnSwitchCatType.Text = "P"; + btnSwitchCatType_Click(null, null); pbLoadingShop.Visible = false; })); }); @@ -578,17 +580,17 @@ namespace TemuKJD.WXForms.ProductForms pdd_product_cates = BaseRegex.GetStringJson(ref html, "data"); } - Invoke(new Action(() => - { - if (cmbSourceType.Text.Trim() != "厂商直采" && cmbSourceType.Text.Trim() != "微信店采" && cmbSourceType.Text.Trim() != "微信小店") - { - fillPddCate(); - } - else - { - fillWxCate(); - } - })); + //Invoke(new Action(() => + //{ + // if (cmbSourceType.Text.Trim() != "厂商直采" && cmbSourceType.Text.Trim() != "微信店采" && cmbSourceType.Text.Trim() != "微信小店") + // { + // fillPddCate(); + // } + // else + // { + // fillWxCate(); + // } + //})); } void fillPddCate() @@ -627,25 +629,25 @@ namespace TemuKJD.WXForms.ProductForms => 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(); + => !GlobalConfig.ValidShopLoginList.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) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ValidShopLoginList) { if (!string.IsNullOrEmpty(shopEntity.ShopId)) BindShop(shopEntity, selectIds); } cmbFilterShopNotes.Items.Clear(); - foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) + foreach (var note in GlobalConfig.ValidShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) { cmbFilterShopNotes.Items.Add(note); } cmbFilterShopGroup.Items.Clear(); - foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) + foreach (var note in GlobalConfig.ValidShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) { cmbFilterShopGroup.Items.Add(note); } @@ -725,12 +727,17 @@ namespace TemuKJD.WXForms.ProductForms { if (e.ColumnIndex < 0 || e.RowIndex < 0) return; + var row = dgvShop.Rows[e.RowIndex]; string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText; string columnName = dgvShop.Columns[e.ColumnIndex].Name; string shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString(); 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]; + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); + if (shop == null) + { + BaseMsgForm.ShowError("店铺不存在或已过期"); + return; + } switch (columnName) { case "colSelect": @@ -746,9 +753,9 @@ namespace TemuKJD.WXForms.ProductForms chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged; } //else - { - //BaseMsgForm.ShowInfo("店铺未登录！"); - } + //{ + // BaseMsgForm.ShowInfo("店铺未登录！"); + //} dicCheckedShopId[row.Cells["colShopId"].Value.ParseToString()] = row.Cells["colSelect"].Value.ParseToBool(); NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_checked_shop_dic", dicCheckedShopId); @@ -801,13 +808,18 @@ namespace TemuKJD.WXForms.ProductForms { if (e.ColumnIndex < 0 || e.RowIndex < 0) return; - string headerText = dgvSelectProduct.Columns[e.ColumnIndex].HeaderText; + var row = dgvShop.Rows[e.RowIndex]; + var headerText = dgvSelectProduct.Columns[e.ColumnIndex].HeaderText; var dbId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSelectId"].Value.ParseToString(); var dbProduct = lstTemuDBProductSelect.FirstOrDefault(p => p.id.ToString() == dbId); var shopId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString(); var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString(); - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); - + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + if (shop == null) + { + BaseMsgForm.ShowError("店铺不存在或已过期"); + return; + } switch (headerText) { case "删除": @@ -862,7 +874,6 @@ namespace TemuKJD.WXForms.ProductForms } } - private void btnUpload_Click(object sender, EventArgs e) { var shopIdLst = dgvShop.Rows.Cast().Where(row @@ -973,7 +984,7 @@ namespace TemuKJD.WXForms.ProductForms continue; } var randomShopLst = new ConcurrentList(); - randomShopLst.AddRange(GlobalConfig.ShopLoginList.Where(s => shopIdLst.Contains(s.ShopId) && s.LoginStatus == "登录成功")); + randomShopLst.AddRange(GlobalConfig.ValidShopLoginList.Where(s => shopIdLst.Contains(s.ShopId) && s.LoginStatus == "登录成功")); if (randomShopLst.Count <= 0) { Invoke(new Action(() => @@ -1113,7 +1124,7 @@ namespace TemuKJD.WXForms.ProductForms DateTime startTime = DateTime.Now; for (int j = 0; j < 1; j++) { - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == selectProd.shop_id); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == selectProd.shop_id); if (shop == null) continue; @@ -5048,10 +5059,15 @@ namespace TemuKJD.WXForms.ProductForms else data += "&add_user_name=" + addUserName; - // 采集来源判断 - data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("多多商品","机会商品").Replace("1688商品", "1688厂家,1688外部数据"); + if (!string.IsNullOrWhiteSpace(cmbSourceType.Text.Trim())) + { + // 采集来源判断 + data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据") + .Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据"); + } - if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + //if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + if (btnSwitchCatType.Text == "P") data += "&in_cates=" + (cmbCateFilter1.Text == "全部" ? "" : cmbCateFilter1.Text); else { @@ -5397,7 +5413,7 @@ namespace TemuKJD.WXForms.ProductForms var row = this.dgvSelectProduct.Rows.Cast().FirstOrDefault(r => r.Cells["colDraftId"].Value.ParseToString() == prodParam.product.productKey.productId); if (row == null) continue; - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); if (shop == null) continue; var t =Task.Run(() => @@ -5548,10 +5564,10 @@ namespace TemuKJD.WXForms.ProductForms private void cmbSourceType_SelectedIndexChanged(object sender, EventArgs e) { - if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") - fillPddCate(); - else - fillWxCate(); + //if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + // fillPddCate(); + //else + // fillWxCate(); if (cmbSourceType.Text != "厂商直采"/* && cmbSourceType.Text != "1688厂家"*/) { @@ -5562,7 +5578,7 @@ namespace TemuKJD.WXForms.ProductForms cmbJstInitSet.Text = "已设置"; } - string sourceType = cmbSourceType.Text.Trim(); + string sourceType = cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据"); Task.Run(() => { // 同时刷新下商品分组 @@ -5948,6 +5964,20 @@ namespace TemuKJD.WXForms.ProductForms NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_prod_fission_title", txtFissionTitle.Text); lblFissionTitleCount.Text = "标题数：" + txtFissionTitle.Text.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).ToList().Count(); } + + private void btnSwitchCatType_Click(object sender, EventArgs e) + { + if (btnSwitchCatType.Text == "W") + { + btnSwitchCatType.Text = "P"; + fillPddCate(); + } + else + { + btnSwitchCatType.Text = "W"; + fillWxCate(); + } + } } public class WXUpload diff --git a/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.Designer.cs index eff7c04..1533587 100644 --- a/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.Designer.cs @@ -42,7 +42,7 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.label5 = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.txtCurrentShop = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.txtPageEnd = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); @@ -184,7 +184,7 @@ namespace TemuKJD.WXForms.ProductForms 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.label5); - this.ucGroupBoxEx4.Controls.Add(this.textBox1); + this.ucGroupBoxEx4.Controls.Add(this.txtCurrentShop); this.ucGroupBoxEx4.Controls.Add(this.label3); this.ucGroupBoxEx4.Controls.Add(this.txtPageEnd); this.ucGroupBoxEx4.Controls.Add(this.label1); @@ -210,15 +210,15 @@ namespace TemuKJD.WXForms.ProductForms this.label5.TabIndex = 818; this.label5.Text = "达人广场页面上选好查询\r\n条件后点击达人搜索按钮"; // - // textBox1 + // txtCurrentShop // - this.textBox1.Font = new System.Drawing.Font("微软雅黑", 10F); - this.textBox1.ForeColor = System.Drawing.Color.Red; - this.textBox1.Location = new System.Drawing.Point(59, 64); - this.textBox1.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(114, 25); - this.textBox1.TabIndex = 830; + this.txtCurrentShop.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtCurrentShop.ForeColor = System.Drawing.Color.Red; + this.txtCurrentShop.Location = new System.Drawing.Point(59, 64); + this.txtCurrentShop.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtCurrentShop.Name = "txtCurrentShop"; + this.txtCurrentShop.Size = new System.Drawing.Size(114, 25); + this.txtCurrentShop.TabIndex = 830; // // label3 // @@ -1416,7 +1416,7 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.PictureBox pbLoading; private System.Windows.Forms.TextBox txtPageEnd; private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox txtCurrentShop; private System.Windows.Forms.Label label3; private System.Windows.Forms.TextBox txtMobile; private System.Windows.Forms.Label label7; diff --git a/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.cs b/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.cs index f44ab38..4f0bbd0 100644 --- a/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.cs @@ -100,11 +100,11 @@ namespace TemuKJD.WXForms.ProductForms // 直到店铺加载完后再加载客服内容 while (!StartUp.IsShopInit) Thread.Sleep(100); - currentShop = GlobalConfig.ShopLoginList.FirstOrDefault(); + currentShop = GlobalConfig.ValidShopLoginList.FirstOrDefault(); Invoke(new Action(() => { - this.textBox1.Text = currentShop?.ShopAccount; - this.textBox1.Tag = currentShop?.ShopId; + this.txtCurrentShop.Text = currentShop?.ShopAccount; + this.txtCurrentShop.Tag = currentShop?.ShopId; })); if (currentShop != null) SetMainBrowserUrl(currentShop); @@ -185,7 +185,7 @@ namespace TemuKJD.WXForms.ProductForms } else { - //var list = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus == "登录成功").Select(ss => ss.ShopId); + //var list = GlobalConfig.ValidShopLoginList.Where(s => s.LoginStatus == "登录成功").Select(ss => ss.ShopId); foreach (DataGridViewRow row in dgvShop.Rows) { //if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString())) @@ -222,25 +222,25 @@ namespace TemuKJD.WXForms.ProductForms => 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(); + => !GlobalConfig.ValidShopLoginList.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) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ValidShopLoginList) { if (!string.IsNullOrEmpty(shopEntity.ShopId)) BindShop(shopEntity, selectIds); } cmbFilterShopNotes.Items.Clear(); - foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) + foreach (var note in GlobalConfig.ValidShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) { cmbFilterShopNotes.Items.Add(note); } cmbFilterShopGroup.Items.Clear(); - foreach (var group in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) + foreach (var group in GlobalConfig.ValidShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) { cmbFilterShopGroup.Items.Add(group); } @@ -325,7 +325,7 @@ namespace TemuKJD.WXForms.ProductForms string columnName = dgvShop.Columns[e.ColumnIndex].Name; string shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString(); string shopAccount = dgvShop.Rows[e.RowIndex].Cells["colShopName"].Value.ToString(); - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); var row = dgvShop.Rows[e.RowIndex]; foreach(DataGridViewRow r in dgvShop.Rows) { @@ -338,8 +338,8 @@ namespace TemuKJD.WXForms.ProductForms if (currentShop != shop) { - this.textBox1.Text = shopAccount; - this.textBox1.Tag = shopId; + this.txtCurrentShop.Text = shopAccount; + this.txtCurrentShop.Tag = shopId; currentShop = shop; Task.Run(() => @@ -356,11 +356,11 @@ namespace TemuKJD.WXForms.ProductForms string columnName = dgvShop.Columns[e.ColumnIndex].Name; string shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString(); string shopAccount = dgvShop.Rows[e.RowIndex].Cells["colShopName"].Value.ToString(); - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); var row = dgvShop.Rows[e.RowIndex]; - this.textBox1.Text = shopAccount; - this.textBox1.Tag = shopId; + this.txtCurrentShop.Text = shopAccount; + this.txtCurrentShop.Tag = shopId; currentShop = shop; switch (columnName) @@ -424,7 +424,7 @@ namespace TemuKJD.WXForms.ProductForms return; string headerText = dgvTalent.Columns[e.ColumnIndex].HeaderText; var shopId = dgvTalent.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString(); - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId); var talentAppid = dgvTalent.Rows[e.RowIndex].Cells["colTalentAppid"].Value.ParseToString(); var talent = this.lstWXFinderTalentInfo.FirstOrDefault(t => t.talentAppid == talentAppid); @@ -906,7 +906,7 @@ namespace TemuKJD.WXForms.ProductForms if (string.IsNullOrEmpty(prodIds)) { var shopId = selectRows.FirstOrDefault().Cells["colSupplierId"].Value.ParseToString(); - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if(chkReUse.Visible && chkReUse.Checked) shop = currentShop; var talentAppid = selectRows.FirstOrDefault().Cells["colTalentAppid"].Value.ParseToString(); @@ -949,7 +949,7 @@ namespace TemuKJD.WXForms.ProductForms break; var shopId = row.Cells["colSupplierId"].Value.ParseToString(); - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (chkReUse.Visible && chkReUse.Checked) shop = currentShop; var talentAppid = row.Cells["colTalentAppid"].Value.ParseToString(); diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs index 61b6234..8df8a23 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs @@ -49,6 +49,7 @@ namespace TemuKJD.WXForms.ProductForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXUserCollectAuthProdListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.btnImportPddOutData = new DevComponents.DotNetBar.PanelEx(); this.btnSelect = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.btnStopStop = new DevComponents.DotNetBar.PanelEx(); @@ -98,6 +99,8 @@ namespace TemuKJD.WXForms.ProductForms this.cmbSort = new System.Windows.Forms.ComboBox(); this.label6 = new System.Windows.Forms.Label(); this.dgvDbProduct = new TemuKJD.UserComponent.DataGridViewEx(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.col_db_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colFromShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -108,6 +111,7 @@ namespace TemuKJD.WXForms.ProductForms this.colSkuReplaceImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSkuReplaceImg = new System.Windows.Forms.DataGridViewImageColumn(); this.col_spu_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSpuIdShow = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.col_skc_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMainCate = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.col_cat_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -133,8 +137,6 @@ namespace TemuKJD.WXForms.ProductForms this.col_edit = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_delete = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); - 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(); @@ -159,6 +161,7 @@ namespace TemuKJD.WXForms.ProductForms // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.btnImportPddOutData); this.splitContainer1.Panel1.Controls.Add(this.btnSelect); this.splitContainer1.Panel1.Controls.Add(this.btnSearch); this.splitContainer1.Panel1.Controls.Add(this.btnStopStop); @@ -174,6 +177,31 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer1.SplitterDistance = 74; this.splitContainer1.TabIndex = 1; // + // btnImportPddOutData + // + this.btnImportPddOutData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnImportPddOutData.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnImportPddOutData.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnImportPddOutData.DisabledBackColor = System.Drawing.Color.Empty; + this.btnImportPddOutData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnImportPddOutData.Location = new System.Drawing.Point(1176, 44); + this.btnImportPddOutData.Name = "btnImportPddOutData"; + this.btnImportPddOutData.Size = new System.Drawing.Size(105, 25); + this.btnImportPddOutData.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnImportPddOutData.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImportPddOutData.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnImportPddOutData.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnImportPddOutData.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnImportPddOutData.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnImportPddOutData.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnImportPddOutData.Style.GradientAngle = 90; + this.btnImportPddOutData.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnImportPddOutData.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImportPddOutData.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnImportPddOutData.TabIndex = 919; + this.btnImportPddOutData.Text = "导入外部多多数据"; + this.btnImportPddOutData.Click += new System.EventHandler(this.btnImportPddOutData_Click); + // // btnSelect // this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -377,17 +405,17 @@ namespace TemuKJD.WXForms.ProductForms // txtCatBoundLessThan // this.txtCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundLessThan.Location = new System.Drawing.Point(759, 41); + this.txtCatBoundLessThan.Location = new System.Drawing.Point(763, 41); this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundLessThan.Name = "txtCatBoundLessThan"; - this.txtCatBoundLessThan.Size = new System.Drawing.Size(108, 23); + this.txtCatBoundLessThan.Size = new System.Drawing.Size(109, 23); this.txtCatBoundLessThan.TabIndex = 883; this.txtCatBoundLessThan.Text = "100000"; // // chkCatBoundLessThan // this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundLessThan.Location = new System.Drawing.Point(692, 42); + this.chkCatBoundLessThan.Location = new System.Drawing.Point(696, 42); this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3); this.chkCatBoundLessThan.Name = "chkCatBoundLessThan"; this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21); @@ -402,7 +430,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtSPU.Location = new System.Drawing.Point(52, 6); this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtSPU.Name = "txtSPU"; - this.txtSPU.Size = new System.Drawing.Size(108, 23); + this.txtSPU.Size = new System.Drawing.Size(109, 23); this.txtSPU.TabIndex = 434; // // label5 @@ -424,27 +452,27 @@ namespace TemuKJD.WXForms.ProductForms "", "是", "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(933, 7); + this.cmbWxCat.Location = new System.Drawing.Point(938, 7); this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxCat.Name = "cmbWxCat"; - this.cmbWxCat.Size = new System.Drawing.Size(108, 25); + this.cmbWxCat.Size = new System.Drawing.Size(109, 25); this.cmbWxCat.TabIndex = 802; // // txtProdName // this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.tableLayoutPanel1.SetColumnSpan(this.txtProdName, 3); - this.txtProdName.Location = new System.Drawing.Point(226, 6); + this.txtProdName.Location = new System.Drawing.Point(227, 6); this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(265, 23); + this.txtProdName.Size = new System.Drawing.Size(267, 23); this.txtProdName.TabIndex = 427; // // label12 // this.label12.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(873, 9); + this.label12.Location = new System.Drawing.Point(878, 9); this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(60, 17); @@ -455,7 +483,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(166, 9); + this.label3.Location = new System.Drawing.Point(167, 9); this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(60, 17); @@ -484,7 +512,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat1.Location = new System.Drawing.Point(52, 42); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; - this.cmbCat1.Size = new System.Drawing.Size(108, 25); + this.cmbCat1.Size = new System.Drawing.Size(109, 25); this.cmbCat1.TabIndex = 805; this.cmbCat1.Text = "全部"; this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged); @@ -493,17 +521,17 @@ namespace TemuKJD.WXForms.ProductForms // txtCatBoundMoreThan // this.txtCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundMoreThan.Location = new System.Drawing.Point(571, 41); + this.txtCatBoundMoreThan.Location = new System.Drawing.Point(574, 41); this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan"; - this.txtCatBoundMoreThan.Size = new System.Drawing.Size(108, 23); + this.txtCatBoundMoreThan.Size = new System.Drawing.Size(109, 23); this.txtCatBoundMoreThan.TabIndex = 882; this.txtCatBoundMoreThan.Text = "1000"; // // chkCatBoundMoreThan // this.chkCatBoundMoreThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundMoreThan.Location = new System.Drawing.Point(504, 42); + this.chkCatBoundMoreThan.Location = new System.Drawing.Point(507, 42); this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3); this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan"; this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21); @@ -516,7 +544,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(183, 44); + this.label14.Location = new System.Drawing.Point(184, 44); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(43, 17); @@ -531,10 +559,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat2.DropDownWidth = 1; this.cmbCat2.FormattingEnabled = true; this.cmbCat2.IntegralHeight = false; - this.cmbCat2.Location = new System.Drawing.Point(226, 42); + this.cmbCat2.Location = new System.Drawing.Point(227, 42); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; - this.cmbCat2.Size = new System.Drawing.Size(108, 25); + this.cmbCat2.Size = new System.Drawing.Size(109, 25); this.cmbCat2.TabIndex = 804; this.cmbCat2.Text = "全部"; this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCat2_SelectedIndexChanged); @@ -544,7 +572,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(340, 44); + this.label17.Location = new System.Drawing.Point(342, 44); this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(43, 17); @@ -559,10 +587,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat3.DropDownWidth = 1; this.cmbCat3.FormattingEnabled = true; this.cmbCat3.IntegralHeight = false; - this.cmbCat3.Location = new System.Drawing.Point(383, 42); + this.cmbCat3.Location = new System.Drawing.Point(385, 42); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; - this.cmbCat3.Size = new System.Drawing.Size(108, 25); + this.cmbCat3.Size = new System.Drawing.Size(109, 25); this.cmbCat3.TabIndex = 811; this.cmbCat3.Text = "全部"; this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged); @@ -572,7 +600,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblWxSafe.AutoSize = true; - this.lblWxSafe.Location = new System.Drawing.Point(873, 44); + this.lblWxSafe.Location = new System.Drawing.Point(878, 44); this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblWxSafe.Name = "lblWxSafe"; this.lblWxSafe.Size = new System.Drawing.Size(60, 17); @@ -588,27 +616,27 @@ namespace TemuKJD.WXForms.ProductForms "安全+未校验", "安全商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(933, 42); + this.cmbWxSafe.Location = new System.Drawing.Point(938, 42); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; - this.cmbWxSafe.Size = new System.Drawing.Size(108, 25); + this.cmbWxSafe.Size = new System.Drawing.Size(109, 25); this.cmbWxSafe.TabIndex = 676; this.cmbWxSafe.Text = "安全+未校验"; // // txtNotes // this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtNotes.Location = new System.Drawing.Point(759, 6); + this.txtNotes.Location = new System.Drawing.Point(763, 6); this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtNotes.Name = "txtNotes"; - this.txtNotes.Size = new System.Drawing.Size(108, 23); + this.txtNotes.Size = new System.Drawing.Size(109, 23); this.txtNotes.TabIndex = 439; // // lblNotes // this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblNotes.AutoSize = true; - this.lblNotes.Location = new System.Drawing.Point(723, 9); + this.lblNotes.Location = new System.Drawing.Point(727, 9); this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblNotes.Name = "lblNotes"; this.lblNotes.Size = new System.Drawing.Size(36, 17); @@ -623,10 +651,10 @@ namespace TemuKJD.WXForms.ProductForms "", "多多商品", "1688商品"}); - this.cmbSourceType.Location = new System.Drawing.Point(571, 7); + this.cmbSourceType.Location = new System.Drawing.Point(574, 7); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; - this.cmbSourceType.Size = new System.Drawing.Size(108, 25); + this.cmbSourceType.Size = new System.Drawing.Size(109, 25); this.cmbSourceType.TabIndex = 654; this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged); this.cmbSourceType.TextChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged); @@ -635,7 +663,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblSourceType.AutoSize = true; - this.lblSourceType.Location = new System.Drawing.Point(527, 9); + this.lblSourceType.Location = new System.Drawing.Point(530, 9); this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblSourceType.Name = "lblSourceType"; this.lblSourceType.Size = new System.Drawing.Size(44, 17); @@ -927,6 +955,7 @@ namespace TemuKJD.WXForms.ProductForms this.colSkuReplaceImgUrl, this.colSkuReplaceImg, this.col_spu_id, + this.colSpuIdShow, this.col_skc_id, this.colMainCate, this.col_cat_name, @@ -963,6 +992,31 @@ namespace TemuKJD.WXForms.ProductForms this.dgvDbProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDbProduct_CellContentClick); this.dgvDbProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvDbProduct_Scroll); // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.IsShowPageSize = true; + this.ucSplitPage1.Location = new System.Drawing.Point(985, 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.PageSize = 100; + this.ucSplitPage1.Size = new System.Drawing.Size(453, 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.FillWeight = 26F; @@ -1042,9 +1096,17 @@ namespace TemuKJD.WXForms.ProductForms // dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.col_spu_id.DefaultCellStyle = dataGridViewCellStyle4; - this.col_spu_id.HeaderText = "商品Id"; + this.col_spu_id.HeaderText = "真实商品Id"; this.col_spu_id.Name = "col_spu_id"; this.col_spu_id.ReadOnly = true; + this.col_spu_id.Visible = false; + // + // colSpuIdShow + // + this.colSpuIdShow.FillWeight = 70F; + this.colSpuIdShow.HeaderText = "商品Id"; + this.colSpuIdShow.Name = "colSpuIdShow"; + this.colSpuIdShow.ReadOnly = true; // // col_skc_id // @@ -1261,31 +1323,6 @@ namespace TemuKJD.WXForms.ProductForms this.col_select_product.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; this.col_select_product.Visible = false; // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.IsShowPageSize = true; - this.ucSplitPage1.Location = new System.Drawing.Point(985, 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.PageSize = 100; - this.ucSplitPage1.Size = new System.Drawing.Size(453, 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; - // // WXUserCollectAuthProdListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1373,6 +1410,8 @@ namespace TemuKJD.WXForms.ProductForms public System.Windows.Forms.ComboBox cmbRelation; public System.Windows.Forms.Label lblRelation; private DevComponents.DotNetBar.PanelEx btnGetProdWxCate; + private DevComponents.DotNetBar.PanelEx btnSelect; + private DevComponents.DotNetBar.PanelEx btnImportPddOutData; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id; private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopId; @@ -1383,6 +1422,7 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewTextBoxColumn colSkuReplaceImgUrl; private System.Windows.Forms.DataGridViewImageColumn colSkuReplaceImg; private System.Windows.Forms.DataGridViewTextBoxColumn col_spu_id; + private System.Windows.Forms.DataGridViewTextBoxColumn colSpuIdShow; private System.Windows.Forms.DataGridViewTextBoxColumn col_skc_id; private System.Windows.Forms.DataGridViewTextBoxColumn colMainCate; private System.Windows.Forms.DataGridViewTextBoxColumn col_cat_name; @@ -1408,6 +1448,5 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewLinkColumn col_edit; private System.Windows.Forms.DataGridViewLinkColumn col_delete; private System.Windows.Forms.DataGridViewLinkColumn col_select_product; - private DevComponents.DotNetBar.PanelEx btnSelect; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs index 80dc437..5b9583d 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs @@ -228,6 +228,9 @@ namespace TemuKJD.WXForms.ProductForms price2 += Math.Max(100, price2 * 0.1m).ParseToInt(); price1 = price1 * 0.01m; price2 = price2 * 0.01m; + var collectAuthorityTag = "-" + BaseClass.UserName; + if (BaseClass.GroupId != 3) + collectAuthorityTag = "-" + BaseClass.ParentUserName; int rowIndex = this.dgvDbProduct.Rows.Add( false, @@ -239,7 +242,8 @@ namespace TemuKJD.WXForms.ProductForms defaultBitmap, // prod.main_img, prod.sku_img_replace_url, DataGridViewExtension.defaultBitmap, - (prod.spu_id).Trim(), + prod.spu_id, + prod.spu_id.Replace(collectAuthorityTag, ""), prod.skc_id, prod.main_cat_name ?? prod.main_cat_id, catName, //catName.Split('>').LastOrDefault()?.Trim(), @@ -258,7 +262,8 @@ namespace TemuKJD.WXForms.ProductForms prod.end_words, prod.fission_words, prod.product_get_type_text == "厂商直采" ? (prod.product_get_type_text + " " + prod.skc_id).Trim() : - prod.product_get_type_text.Replace("1688厂家", "1688商品").Replace("1688外部数据", "1688商品").Replace("机会商品", "多多商品"), + prod.product_get_type_text.Replace("1688厂家", "1688商品").Replace("1688外部数据", "1688商品") + .Replace("已采集数据", "1688商品").Replace("机会商品", "多多商品").Replace("多多外部数据", "多多商品"), prod.special_prod_type, prod.wx_safe_status, prod.add_time.ToString("yy-MM-dd HH:mm"), @@ -344,10 +349,13 @@ namespace TemuKJD.WXForms.ProductForms Invoke(new Action(() => { + var collectAuthorityTag = "-" + BaseClass.UserName; + if (BaseClass.GroupId != 3) + collectAuthorityTag = "-" + BaseClass.ParentUserName; data = UserLogin.GetSignaturex() + "&page=" + page + "&page_size=" + pageSize + - "&search_spu=" + txtSPU.Text.Trim() + + "&search_spu=" + string.Join(",", txtSPU.Text.Trim().Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries).Select(s => s + collectAuthorityTag)) + "&search_skc=" + txtSKC.Text.Trim() + "&search_notes=" + txtNotes.Text.Trim() + "&search_ext_code=" + txtExtCode.Text.Trim() + @@ -431,13 +439,11 @@ namespace TemuKJD.WXForms.ProductForms data += "&send_to_out_server=2"; } - if (cmbSourceType.Text.Trim() == "多多商品") + if (!string.IsNullOrEmpty(cmbSourceType.Text.Trim())) { - data += "&product_get_type=机会商品"; - } - else if (cmbSourceType.Text.Trim() == "1688商品") - { - data += "&product_get_type=1688厂家,1688外部数据"; + // 采集来源判断 + data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据") + .Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据"); } if (shop != null && !string.IsNullOrEmpty(shop.ShopId)) @@ -1022,5 +1028,66 @@ namespace TemuKJD.WXForms.ProductForms WXDBProdUploadForm.Instance.dbProdList_SaveComplete(WXDBProdUploadForm.Instance.lstTemuDBProductSelect); } } + + private void btnImportPddOutData_Click(object sender, EventArgs e) + { + OpenFileDialog openFileDialog = new OpenFileDialog(); + openFileDialog.Multiselect = true; + // 设置过滤条件，只显示文本文件 + openFileDialog.Filter = "文本文件 (*.txt)|*.txt|All files (*.*)|*.*"; + // 显示对话框并获取结果 + if (openFileDialog.ShowDialog() == DialogResult.OK) + { + var filePathLst = openFileDialog.FileNames.ToList(); + pbLoading.Visible = true; + this.statusBar.pgbTaskProgress.Maximum = filePathLst.Count; + this.statusBar.UpdateProgressBar(0); + Task.Run(() => + { + int successNum = 0; + int failedNum = 0; + foreach (var path in filePathLst) + { + string content = ""; + string rst = ""; + try + { + using (StreamReader sr = new StreamReader(path)) + { + content = sr.ReadToEnd(); + } + + if (content.Contains("\"spec_keys\"") && content.Contains("\"spec_values\"") && content.Contains("\"is_sku_pre_sale\"")) + { + rst = new PDDProdFormConverter().PddFrontToPddBackConvert(content, true, null, true); + } + else if (content.Contains("\"destination_url\"") && content.Contains("\"destination_type\"") && content.Contains("\"pre_render_url\"")) + { + rst = new PDDProdFormConverter().PddFrontToPddBackConvert2(content, true, null, true); + } + } + catch (Exception ex) + { + rst = ex.Message; + } + if (string.IsNullOrEmpty(rst)) + successNum++; + else + failedNum++; + Invoke(new Action(() => + { + this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1); + this.statusBar.lblTaskStatus.Text = "正在导入"; + })); + } + Invoke(new Action(() => + { + pbLoading.Visible = false; + this.statusBar.lblTaskStatus.Text = "导入完成"; + BaseMsgForm.ShowInfo("导入完成！"); + })); + }); + } + } } } diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.resx b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.resx index 0aa8297..8ae7193 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.resx +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.resx @@ -147,6 +147,9 @@ True + + True + True diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs index aa31452..d0f9162 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs @@ -330,16 +330,16 @@ namespace TemuKJD.WXForms.ProductForms // txtViewUvMin // this.txtViewUvMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtViewUvMin.Location = new System.Drawing.Point(1128, 41); + this.txtViewUvMin.Location = new System.Drawing.Point(1132, 41); this.txtViewUvMin.Name = "txtViewUvMin"; - this.txtViewUvMin.Size = new System.Drawing.Size(62, 23); + this.txtViewUvMin.Size = new System.Drawing.Size(58, 23); this.txtViewUvMin.TabIndex = 882; this.txtViewUvMin.Visible = false; // // chkViewUvMin // this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkViewUvMin.Location = new System.Drawing.Point(1074, 42); + this.chkViewUvMin.Location = new System.Drawing.Point(1078, 42); this.chkViewUvMin.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkViewUvMin.Name = "chkViewUvMin"; this.chkViewUvMin.Size = new System.Drawing.Size(48, 21); @@ -356,10 +356,10 @@ namespace TemuKJD.WXForms.ProductForms "", "爆款数据", "普通商品"}); - this.cmbHot.Location = new System.Drawing.Point(918, 7); + this.cmbHot.Location = new System.Drawing.Point(921, 7); this.cmbHot.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbHot.Name = "cmbHot"; - this.cmbHot.Size = new System.Drawing.Size(147, 25); + this.cmbHot.Size = new System.Drawing.Size(148, 25); this.cmbHot.TabIndex = 882; this.cmbHot.Text = "普通商品"; this.cmbHot.Visible = false; @@ -369,7 +369,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblHot.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblHot.AutoSize = true; - this.lblHot.Location = new System.Drawing.Point(874, 9); + this.lblHot.Location = new System.Drawing.Point(877, 9); this.lblHot.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblHot.Name = "lblHot"; this.lblHot.Size = new System.Drawing.Size(44, 17); @@ -384,7 +384,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(1071, 5); + this.btnSearch.Location = new System.Drawing.Point(1075, 5); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(51, 25); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -408,9 +408,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmpty.Location = new System.Drawing.Point(1128, 5); + this.btnEmpty.Location = new System.Drawing.Point(1132, 5); this.btnEmpty.Name = "btnEmpty"; - this.btnEmpty.Size = new System.Drawing.Size(62, 25); + this.btnEmpty.Size = new System.Drawing.Size(58, 25); this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -435,10 +435,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat3.DropDownWidth = 1; this.cmbCat3.FormattingEnabled = true; this.cmbCat3.IntegralHeight = false; - this.cmbCat3.Location = new System.Drawing.Point(721, 7); + this.cmbCat3.Location = new System.Drawing.Point(723, 7); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; - this.cmbCat3.Size = new System.Drawing.Size(147, 25); + this.cmbCat3.Size = new System.Drawing.Size(148, 25); this.cmbCat3.TabIndex = 811; this.cmbCat3.Text = "全部"; this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged); @@ -448,7 +448,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(670, 9); + this.label17.Location = new System.Drawing.Point(672, 9); this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(51, 17); @@ -463,7 +463,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat2.DropDownWidth = 1; this.cmbCat2.FormattingEnabled = true; this.cmbCat2.IntegralHeight = false; - this.cmbCat2.Location = new System.Drawing.Point(517, 7); + this.cmbCat2.Location = new System.Drawing.Point(519, 7); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Size = new System.Drawing.Size(147, 25); @@ -476,7 +476,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(466, 9); + this.label14.Location = new System.Drawing.Point(468, 9); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(51, 17); @@ -491,10 +491,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat1.DropDownWidth = 1; this.cmbCat1.FormattingEnabled = true; this.cmbCat1.IntegralHeight = false; - this.cmbCat1.Location = new System.Drawing.Point(294, 7); + this.cmbCat1.Location = new System.Drawing.Point(295, 5); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; - this.cmbCat1.Size = new System.Drawing.Size(147, 25); + this.cmbCat1.Size = new System.Drawing.Size(148, 25); this.cmbCat1.TabIndex = 805; this.cmbCat1.Text = "全部"; this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged); @@ -504,7 +504,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(243, 9); + this.label2.Location = new System.Drawing.Point(244, 9); this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(51, 17); @@ -517,7 +517,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtProdName.Location = new System.Drawing.Point(71, 6); this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(147, 23); + this.txtProdName.Size = new System.Drawing.Size(148, 23); this.txtProdName.TabIndex = 427; // // label3 @@ -551,17 +551,17 @@ namespace TemuKJD.WXForms.ProductForms "安全+未校验", "安全商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(71, 42); + this.cmbWxSafe.Location = new System.Drawing.Point(71, 40); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; - this.cmbWxSafe.Size = new System.Drawing.Size(147, 25); + this.cmbWxSafe.Size = new System.Drawing.Size(148, 25); this.cmbWxSafe.TabIndex = 676; this.cmbWxSafe.Text = "安全+未校验"; // // chkCatBoundMoreThan // this.chkCatBoundMoreThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundMoreThan.Location = new System.Drawing.Point(227, 42); + this.chkCatBoundMoreThan.Location = new System.Drawing.Point(228, 42); this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan"; this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21); @@ -573,10 +573,10 @@ namespace TemuKJD.WXForms.ProductForms // txtCatBoundMoreThan // this.txtCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundMoreThan.Location = new System.Drawing.Point(294, 41); + this.txtCatBoundMoreThan.Location = new System.Drawing.Point(295, 41); this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan"; - this.txtCatBoundMoreThan.Size = new System.Drawing.Size(147, 23); + this.txtCatBoundMoreThan.Size = new System.Drawing.Size(148, 23); this.txtCatBoundMoreThan.TabIndex = 882; this.txtCatBoundMoreThan.Text = "1000"; this.txtCatBoundMoreThan.Visible = false; @@ -584,7 +584,7 @@ namespace TemuKJD.WXForms.ProductForms // chkCatBoundLessThan // this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundLessThan.Location = new System.Drawing.Point(450, 42); + this.chkCatBoundLessThan.Location = new System.Drawing.Point(452, 42); this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkCatBoundLessThan.Name = "chkCatBoundLessThan"; this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21); @@ -596,7 +596,7 @@ namespace TemuKJD.WXForms.ProductForms // txtCatBoundLessThan // this.txtCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundLessThan.Location = new System.Drawing.Point(517, 41); + this.txtCatBoundLessThan.Location = new System.Drawing.Point(519, 41); this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundLessThan.Name = "txtCatBoundLessThan"; this.txtCatBoundLessThan.Size = new System.Drawing.Size(147, 23); @@ -608,10 +608,10 @@ namespace TemuKJD.WXForms.ProductForms // this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbGroupFilter.FormattingEnabled = true; - this.cmbGroupFilter.Location = new System.Drawing.Point(918, 42); + this.cmbGroupFilter.Location = new System.Drawing.Point(921, 42); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; - this.cmbGroupFilter.Size = new System.Drawing.Size(147, 25); + this.cmbGroupFilter.Size = new System.Drawing.Size(148, 25); this.cmbGroupFilter.TabIndex = 653; this.cmbGroupFilter.Visible = false; this.cmbGroupFilter.SelectedIndexChanged += new System.EventHandler(this.cmbGroupFilter_SelectedIndexChanged); @@ -620,7 +620,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblSourceType.AutoSize = true; - this.lblSourceType.Location = new System.Drawing.Point(677, 44); + this.lblSourceType.Location = new System.Drawing.Point(679, 44); this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblSourceType.Name = "lblSourceType"; this.lblSourceType.Size = new System.Drawing.Size(44, 17); @@ -632,7 +632,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblGroupFilter.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblGroupFilter.AutoSize = true; - this.lblGroupFilter.Location = new System.Drawing.Point(874, 44); + this.lblGroupFilter.Location = new System.Drawing.Point(877, 44); this.lblGroupFilter.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblGroupFilter.Name = "lblGroupFilter"; this.lblGroupFilter.Size = new System.Drawing.Size(44, 17); @@ -648,17 +648,17 @@ namespace TemuKJD.WXForms.ProductForms "", "厂商直采", "1688厂家", - "1688外部数据", + "已采集数据", "微信小店", "微信店采", "母店采集", "机会商品", "以图搜品", - "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(721, 42); + "多多外部数据"}); + this.cmbSourceType.Location = new System.Drawing.Point(723, 42); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; - this.cmbSourceType.Size = new System.Drawing.Size(147, 25); + this.cmbSourceType.Size = new System.Drawing.Size(148, 25); this.cmbSourceType.TabIndex = 654; this.cmbSourceType.Text = "厂商直采"; this.cmbSourceType.Visible = false; diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs index d536ec4..d2a0a73 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs @@ -503,22 +503,24 @@ namespace TemuKJD.WXForms.ProductForms } if (!string.IsNullOrEmpty(cmbWxCat.Text)) { - data += "&has_wx_cat=" + (cmbWxCat.Text.Trim() == "是").ParseToString().ToLower(); + //data += "&has_wx_cat=" + (cmbWxCat.Text.Trim() == "是").ParseToString().ToLower(); } if (!string.IsNullOrEmpty(cmbExportToOutServer.Text) && cmbGroupFilter.Text != "我的商品") // 用户自己的商品没有聚水潭商品，不用考虑是否导出 { - //data += "&has_send_to_out_server=" + (cmbExportToOutServer.Text.Trim() == "是").ParseToString().ToLower(); - if (cmbExportToOutServer.Text.Trim() == "是") - data += "&send_to_out_server=1"; - else if (cmbExportToOutServer.Text.Trim() == "否") - data += "&send_to_out_server=0"; - else if (cmbExportToOutServer.Text.Trim() == "导出未拉回") - data += "&send_to_out_server=2"; + ////data += "&has_send_to_out_server=" + (cmbExportToOutServer.Text.Trim() == "是").ParseToString().ToLower(); + //if (cmbExportToOutServer.Text.Trim() == "是") + // data += "&send_to_out_server=1"; + //else if (cmbExportToOutServer.Text.Trim() == "否") + // data += "&send_to_out_server=0"; + //else if (cmbExportToOutServer.Text.Trim() == "导出未拉回") + // data += "&send_to_out_server=2"; } - if (cmbSourceType.Text.Trim() != "全部") + if (!string.IsNullOrEmpty(cmbSourceType.Text.Trim())) { - data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("多多商品", "机会商品").Replace("1688商品", "1688厂家,1688外部数据"); + // 采集来源判断 + data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据") + .Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据"); } if (shop != null && !string.IsNullOrEmpty(shop.ShopId)) { diff --git a/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.Designer.cs new file mode 100644 index 0000000..31ad69d --- /dev/null +++ b/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.Designer.cs @@ -0,0 +1,294 @@ +namespace TemuKJD.WXForms.ShopForms +{ + partial class WXPDDShopLoginForm + { + /// + /// 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() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXPDDShopLoginForm)); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.btnLoginAgain = new TemuKJD.UserControls.ButtonEx(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.btnCopyPassword = new TemuKJD.UserControls.ButtonEx(); + this.btnCopyUserName = new TemuKJD.UserControls.ButtonEx(); + this.txtPassWord = new System.Windows.Forms.TextBox(); + this.txtUserName = new System.Windows.Forms.TextBox(); + this.btnStop = new TemuKJD.UserControls.ButtonEx(); + this.btnReload = new TemuKJD.UserControls.ButtonEx(); + this.chkCloseAfterLogin = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.txtAddress = new System.Windows.Forms.TextBox(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White; + this.splitContainer1.Panel2.Controls.Add(this.btnLoginAgain); + this.splitContainer1.Panel2.Controls.Add(this.label2); + this.splitContainer1.Panel2.Controls.Add(this.label1); + this.splitContainer1.Panel2.Controls.Add(this.btnCopyPassword); + this.splitContainer1.Panel2.Controls.Add(this.btnCopyUserName); + this.splitContainer1.Panel2.Controls.Add(this.txtPassWord); + this.splitContainer1.Panel2.Controls.Add(this.txtUserName); + this.splitContainer1.Panel2.Controls.Add(this.btnStop); + this.splitContainer1.Panel2.Controls.Add(this.btnReload); + this.splitContainer1.Panel2.Controls.Add(this.chkCloseAfterLogin); + this.splitContainer1.Size = new System.Drawing.Size(1438, 736); + this.splitContainer1.SplitterDistance = 670; + this.splitContainer1.SplitterWidth = 3; + this.splitContainer1.TabIndex = 4; + // + // btnLoginAgain + // + this.btnLoginAgain.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnLoginAgain.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnLoginAgain.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnLoginAgain.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnLoginAgain.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnLoginAgain.ForeColor = System.Drawing.Color.White; + this.btnLoginAgain.Location = new System.Drawing.Point(1155, 31); + this.btnLoginAgain.Margin = new System.Windows.Forms.Padding(2); + this.btnLoginAgain.Name = "btnLoginAgain"; + this.btnLoginAgain.Size = new System.Drawing.Size(91, 25); + this.btnLoginAgain.TabIndex = 462; + this.btnLoginAgain.Text = "重新登录"; + this.btnLoginAgain.UseVisualStyleBackColor = false; + this.btnLoginAgain.Click += new System.EventHandler(this.btnLoginAgain_Click); + // + // label2 + // + this.label2.Location = new System.Drawing.Point(9, 35); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(44, 17); + this.label2.TabIndex = 378; + this.label2.Text = "密码"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(9, 8); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(44, 17); + this.label1.TabIndex = 377; + this.label1.Text = "用户名"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // btnCopyPassword + // + this.btnCopyPassword.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCopyPassword.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnCopyPassword.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCopyPassword.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCopyPassword.ForeColor = System.Drawing.Color.White; + this.btnCopyPassword.Location = new System.Drawing.Point(191, 31); + this.btnCopyPassword.Margin = new System.Windows.Forms.Padding(2); + this.btnCopyPassword.Name = "btnCopyPassword"; + this.btnCopyPassword.Size = new System.Drawing.Size(57, 25); + this.btnCopyPassword.TabIndex = 376; + this.btnCopyPassword.Text = "复制"; + this.btnCopyPassword.UseVisualStyleBackColor = false; + this.btnCopyPassword.Click += new System.EventHandler(this.btnCopyPassword_Click); + // + // btnCopyUserName + // + this.btnCopyUserName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCopyUserName.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnCopyUserName.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCopyUserName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCopyUserName.ForeColor = System.Drawing.Color.White; + this.btnCopyUserName.Location = new System.Drawing.Point(191, 4); + this.btnCopyUserName.Margin = new System.Windows.Forms.Padding(2); + this.btnCopyUserName.Name = "btnCopyUserName"; + this.btnCopyUserName.Size = new System.Drawing.Size(57, 25); + this.btnCopyUserName.TabIndex = 375; + this.btnCopyUserName.Text = "复制"; + this.btnCopyUserName.UseVisualStyleBackColor = false; + this.btnCopyUserName.Click += new System.EventHandler(this.btnCopyUserName_Click); + // + // txtPassWord + // + this.txtPassWord.Location = new System.Drawing.Point(53, 32); + this.txtPassWord.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txtPassWord.Name = "txtPassWord"; + this.txtPassWord.PasswordChar = '●'; + this.txtPassWord.ReadOnly = true; + this.txtPassWord.Size = new System.Drawing.Size(135, 23); + this.txtPassWord.TabIndex = 374; + // + // txtUserName + // + this.txtUserName.Location = new System.Drawing.Point(53, 5); + this.txtUserName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txtUserName.Name = "txtUserName"; + this.txtUserName.ReadOnly = true; + this.txtUserName.Size = new System.Drawing.Size(135, 23); + this.txtUserName.TabIndex = 373; + // + // btnStop + // + this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnStop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnStop.ForeColor = System.Drawing.Color.White; + this.btnStop.Location = new System.Drawing.Point(1342, 31); + this.btnStop.Margin = new System.Windows.Forms.Padding(2); + this.btnStop.Name = "btnStop"; + this.btnStop.Size = new System.Drawing.Size(91, 25); + this.btnStop.TabIndex = 372; + this.btnStop.Text = "停止操作"; + this.btnStop.UseVisualStyleBackColor = false; + this.btnStop.Click += new System.EventHandler(this.btnStop_Click); + // + // btnReload + // + this.btnReload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnReload.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnReload.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnReload.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnReload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnReload.ForeColor = System.Drawing.Color.White; + this.btnReload.Location = new System.Drawing.Point(1249, 31); + this.btnReload.Margin = new System.Windows.Forms.Padding(2); + this.btnReload.Name = "btnReload"; + this.btnReload.Size = new System.Drawing.Size(91, 25); + this.btnReload.TabIndex = 371; + this.btnReload.Text = "重新加载"; + this.btnReload.UseVisualStyleBackColor = false; + this.btnReload.Click += new System.EventHandler(this.btnReload_Click); + // + // chkCloseAfterLogin + // + this.chkCloseAfterLogin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + // + // + // + this.chkCloseAfterLogin.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.chkCloseAfterLogin.Checked = true; + this.chkCloseAfterLogin.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkCloseAfterLogin.CheckValue = "Y"; + this.chkCloseAfterLogin.Location = new System.Drawing.Point(1306, 6); + this.chkCloseAfterLogin.Name = "chkCloseAfterLogin"; + this.chkCloseAfterLogin.Size = new System.Drawing.Size(135, 23); + this.chkCloseAfterLogin.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.chkCloseAfterLogin.TabIndex = 8; + this.chkCloseAfterLogin.Text = "登录成功后关闭窗口"; + // + // splitContainer2 + // + this.splitContainer2.BackColor = System.Drawing.Color.White; + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer2.Location = new System.Drawing.Point(1, 33); + this.splitContainer2.Name = "splitContainer2"; + this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.txtAddress); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.splitContainer1); + this.splitContainer2.Size = new System.Drawing.Size(1438, 766); + this.splitContainer2.SplitterDistance = 26; + this.splitContainer2.TabIndex = 5; + // + // txtAddress + // + this.txtAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtAddress.Location = new System.Drawing.Point(3, 3); + this.txtAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.txtAddress.Name = "txtAddress"; + this.txtAddress.Size = new System.Drawing.Size(1432, 23); + this.txtAddress.TabIndex = 7; + this.txtAddress.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtAddress_KeyDown); + // + // WXPDDShopLoginForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(1440, 800); + this.Controls.Add(this.splitContainer2); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "WXPDDShopLoginForm"; + this.ShowMaximizeBox = true; + this.Text = "店铺登录"; + this.TitleText = "店铺登录"; + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ShopLoginForm_FormClosed); + this.Load += new System.EventHandler(this.ShopLoginForm_Load); + this.Controls.SetChildIndex(this.splitContainer2, 0); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.Panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel1.PerformLayout(); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private UserControls.ButtonEx btnStop; + private UserControls.ButtonEx btnReload; + private System.Windows.Forms.SplitContainer splitContainer2; + private System.Windows.Forms.TextBox txtAddress; + private UserControls.ButtonEx btnLoginAgain; + public DevComponents.DotNetBar.Controls.CheckBoxX chkCloseAfterLogin; + public System.Windows.Forms.TextBox txtPassWord; + public System.Windows.Forms.TextBox txtUserName; + public System.Windows.Forms.Label label2; + public System.Windows.Forms.Label label1; + public UserControls.ButtonEx btnCopyPassword; + public UserControls.ButtonEx btnCopyUserName; + } +} \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.cs b/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.cs new file mode 100644 index 0000000..ef94e74 --- /dev/null +++ b/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.cs @@ -0,0 +1,1187 @@ +using AllBase; +using AllBase.Helper; +using AllBase.Model.Result; +using CefSharp; +using CefSharp.WinForms; +//using TemuKJD.DashBoardForms; +using TemuKJD.Helper; +using TemuKJD.BaseForms; +using Microsoft.Win32; +using NaiBa.CefHelper; +using NaiBa.CefHelper.Handler; +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.Web.Hosting; +using System.Windows.Forms; +using Work; +using Work.BLL.Tools; +using TemuKJD.BLL; +using AllBase.Model.Result.PDDResult; +using AllBase.Model.Param.PDDProdParam; +using TemuKJD.BLL.PddApi; +using TemuKJD.PDDForms.ShopForms; + +namespace TemuKJD.WXForms.ShopForms +{ + public partial class WXPDDShopLoginForm : BaseGeneralForm + { + public static WXPDDShopLoginForm shopLoginInstance { get; set; } = null; + + public string pddUploadGoodsData = ""; + public string pddSourceGoodsDetail = ""; + public string pddSourceGoodsDetailTemp = ""; + public string pddSourceGoodsDecorationTemp = ""; + public string pddSourceGoodsChanceId = ""; + public string pddGetChanceGoodsRefere = ""; + public string pddEditChanceGoodsRefereChanceTab = ""; + + public int CloseAfterSecond { get; set; } + public EnumOpenType openType = EnumOpenType.manage; + public bool isMultiLogin = false; + public string MultiLoginCookieName = ""; + public string InitUrl = ""; + private string shopCookieHead = "pinduoduo.com"; + private string shopLoginUrl = "https://mms.pinduoduo.com/login"; + private string shopMainUrl = "https://mms.pinduoduo.com/home"; + public ChromiumWebBrowser cefWebBrowser = null; + private ShopLoginInfo shop = null; + private List lstShopCompany = new List(); + private string currentUrl = ""; + // 绑定授权的时候传进来和回调信息封装好传到数据库端 + public string AuthClientId = ""; + + public WXPDDShopLoginForm(ShopLoginInfo shopInfo) + { + shopLoginInstance = this; + + InitializeComponent(); + + this.shop = shopInfo; + this.txtUserName.Text = shopInfo.LoginName; + this.txtPassWord.Text = DataOpenSSL.DecryptString(shopInfo.Password); + } + + private void ShopLoginForm_Load(object sender, EventArgs e) + { + this.splitContainer1.SplitterDistance = this.splitContainer1.Height - 62; + pddSourceGoodsDetailTemp = ""; + pddSourceGoodsDecorationTemp = ""; // 详情装修 + pddSourceGoodsChanceId = ""; + pddGetChanceGoodsRefere = ""; + pddEditChanceGoodsRefereChanceTab = ""; + + if (CloseAfterSecond > 0) + { + Task.Run(() => + { + Thread.Sleep(1000 * CloseAfterSecond); + if (this.Created) + { + Invoke(new Action(() => + { + this.Close(); + })); + } + }); + } + + if (!isMultiLogin) + AutoLogin(); + + CheckAndSaveShop(); //判断登录是否成功，成功则保存店铺信息和店铺cookie + //ClosePopWindow(); //自动关闭弹窗 + } + + /// + /// 判断登录，保存店铺 + /// + private void CheckAndSaveShop() + { + Task.Run(() => + { + // 自动判断是否登录成功，登录成功后记录cookie保存到服务端。 + while (this.Created) + { + Thread.Sleep(3000); + + if (!this.Created) + break; + + if (this.shop != null && currentUrl.TrimEnd('/') == shopMainUrl) + { + if (!cefWebBrowser.GetBrowser().MainFrame.IsValid) + continue; + + // 刷新cookie + if (openType == EnumOpenType.refresh_cookie) + { + string cookies = ""; + List cookieList = CEFBrowser.GetCookieList(shopCookieHead, cefWebBrowser.GetCookieManager(null)); + foreach (var cookie in cookieList) + { + cookie.Domain = cookie.Domain.Replace(".mms.pinduoduo.com", "mms.pinduoduo.com"); + } + List cookieListNew = new List(); + if (cookieList != null && cookieList.Count > 0) + { + foreach (var cookie in cookieList) + { + //PASS_ID同时出现两个，domain是mms.pinduoduo.com才是能登录店铺后台的 + if (cookie.Name == "PASS_ID" && cookie.Domain != "mms.pinduoduo.com" + && cookieList.Any(c => c.Name == "PASS_ID" && c.Domain == "mms.pinduoduo.com")) + continue; + + cookies += cookie.Name + "=" + cookie.Value + "; "; + cookieListNew.Add(cookie); + } + + if (cookieListNew.Any(c => c.Name == "PASS_ID" && c.Value.StartsWith("windows_1")) && + !cookieListNew.Any(c => c.Name == "PddBrowser")) + { + cookieList.Add(new Cookie() { Domain = ".pinduoduo.com", Name = "PddBrowser", Value = "1", Expires = DateTime.Now.AddYears(1), }); + } + cookies = JsonHelper.SerializeObject(cookieListNew); + + if (!string.IsNullOrEmpty(cookies)) + { + shop.Cookies = cookies; + shop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); + //PDDShopListForm.UpdateServerShopCookies(shop); // 店铺cookie写入服务端 + PDDForms.ProductSelectForms._29WxPddShopManage.Update29WxPddShopCookie(shop); + if (this.Created && this.chkCloseAfterLogin.Checked) + { + Invoke(new Action(() => + { + this.Close(); + })); + } + else + { + break; + } + } + } + } + + if (openType!= EnumOpenType.login) + continue; + + if (!lstShopCompany.Any(c => c.LoginName == shop.LoginName)) + continue; + else // 检测到登录成功后 + { + string cookies = ""; + List cookieList = CEFBrowser.GetCookieList(shopCookieHead, cefWebBrowser.GetCookieManager(null)); + foreach (var cookie in cookieList) + { + cookie.Domain = cookie.Domain.Replace(".mms.pinduoduo.com", "mms.pinduoduo.com"); + } + List cookieListNew = new List(); + if (cookieList != null && cookieList.Count > 0) + { + foreach (var cookie in cookieList) + { + //PASS_ID同时出现两个，domain是mms.pinduoduo.com才是能登录店铺后台的 + if (cookie.Name == "PASS_ID" && cookie.Domain != "mms.pinduoduo.com" + && cookieList.Any(c => c.Name == "PASS_ID" && c.Domain == "mms.pinduoduo.com")) + continue; + + cookies += cookie.Name + "=" + cookie.Value + "; "; + cookieListNew.Add(cookie); + } + //cookies = cookies.Trim().TrimEnd(';'); + cookies = JsonHelper.SerializeObject(cookieListNew); + } + + if (!string.IsNullOrEmpty(cookies) + && lstShopCompany.Any(c => c.LoginName == shop.LoginName)) + { + var lstShopCompanyCopy = lstShopCompany.ToList(); + lstShopCompanyCopy = lstShopCompanyCopy.Where(l => l.LoginName == shop.LoginName).ToList(); + + foreach (ShopCompany sc in lstShopCompanyCopy) + { + ShopLoginInfo newShop = new ShopLoginInfo() + { + LoginName = shop.LoginName, + Password = shop.Password, + GroupName = shop.GroupName, + ShopAccount = sc.AccountName, + ShopId = sc.AccountId, + MallId = sc.MallId, + SubUserName = shop.SubUserName, + Notes = shop.Notes, + AntiContents = new NaiBa.Util.ConcurrentList { sc.AntiContent }, + }; + + var oldShop = GlobalConfig._29WxPddShopLoginList.FirstOrDefault(l => + l.LoginName == newShop.LoginName); + if (oldShop == null) + { + GlobalConfig._29WxPddShopLoginList.Add(newShop); + PDDForms.ProductSelectForms._29WxPddShopManage.AddMdf29WxPddShop(shop); //店铺写入到服务端 + } + else + { + oldShop.LoginName = newShop.LoginName; + oldShop.Password = newShop.Password; + oldShop.GroupName = newShop.GroupName; + oldShop.ShopAccount = newShop.ShopAccount; + oldShop.ShopId = newShop.ShopId; + oldShop.MallId = newShop.MallId; + oldShop.SubUserName = newShop.SubUserName; + oldShop.Notes = newShop.Notes; + oldShop.AntiContents.AddRange(newShop.AntiContents); + while (oldShop.AntiContents.Count > 200) + oldShop.AntiContents.RemoveAt(0); + + // 店铺更新写入到服务端 + var url = BaseClass.BuildObjString("shop/wx_add_mdy_29wx_pdd_shop"); + var data = UserLogin.GetSignaturex() + + "&login_name=" + newShop.LoginName + + "&new_shop_id=" + newShop.ShopId + + "&shop_account=" + newShop.ShopAccount + + "&mall_id=" + newShop.MallId; + var result = GetHtml.PostUtf8(url, data); + //PDDForms.ProductSelectForms._29WxPddShopManage.Mdy29WxPddAntiContent(oldShop); + } + } + var lstShop = GlobalConfig._29WxPddShopLoginList.Where(l => l.LoginName == shop.LoginName).ToList(); + foreach (var s in lstShop) + { + s.LoginStatus = "登录成功"; + s.Cookies = cookies; + s.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); + s.pddid = ""; // 网页登录无拼多多id（pddid） + } + //PDDShopListForm.UpdateServerShopCookies(shop); // 店铺cookie写入服务端，多店共用一个登录账号一组cookie + PDDForms.ProductSelectForms._29WxPddShopManage.Update29WxPddShopCookie(shop); + + OnSaveComplete(shop); + if (this.Created && this.chkCloseAfterLogin.Checked) + { + Invoke(new Action(() => { this.Close(); })); + } + else + { + break; + } + } + } + } + } + }); + } + + /// + /// 自动关闭弹窗 + /// + private void ClosePopWindow() + { + // 关闭弹窗 + Task.Run(() => + { + var sleepTime = 2500; + int i = 0; + while (true && i++ < 50) + { + try + { + Thread.Sleep(sleepTime); + var jsStr1 = "function ClosePopWindow(txt) {\r\n" + + " var result = 'no_pop'\r\n" + + " var item = document.getElementsByClassName(txt);\r\n" + + " for(i = 0; i < item.length; i++) {\r\n" + + " item[i].click();\r\n" + + " result = 'success'\r\n" + + " }\r\n" + + " return result;\r\n" + + "}\r\n" + + "ClosePopWindow('anticon-close-circle');\r\n" + + "ClosePopWindow('ant-modal-close-x');\r\n"; + var jsStr2 = "function clickPopWindow(txt) {\r\n" + + "var child = document.body.firstElementChild;\r\n" + + "var element1 = null;\r\n" + + " while (child) {\r\n" + + " if (child.innerHTML.indexOf(txt) >= 0) {\r\n" + + " element1 = child;\r\n" + + " if (child.firstElementChild) {\r\n" + + " child = child.firstElementChild; continue;\r\n" + + " } else break;\r\n" + + " }\r\n" + + " child = child.nextElementSibling;\r\n" + + " }\r\n" + + " if (element1) {\r\n" + + " element1.click(); return 'success';\r\n" + + " } else return 'no_pop';\r\n" + + "}\r\n" + + "clickPopWindow('我知道了');\r\n" + + "clickPopWindow('知道了');\r\n"; + if (cefWebBrowser != null && cefWebBrowser.IsBrowserInitialized) + { + var t1 = cefWebBrowser.GetMainFrame().EvaluateScriptAsync(jsStr1); + t1.Wait(); + var t2 = cefWebBrowser.GetMainFrame().EvaluateScriptAsync(jsStr2); + t2.Wait(); + if (t1.Result?.Result?.ToString() == "success" || t2.Result?.Result?.ToString() == "success") + sleepTime = Randomx.GetId(550, 650); + else + sleepTime = Randomx.GetId(1500, 2000); + } + } + catch (Exception ex) { } + } + }); + } + + /// + /// 自动登录店铺后台 + /// + private void AutoLogin() + { + if (shop == null) + return; + + if (cefWebBrowser == null) + { + //cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false); + if (!string.IsNullOrEmpty(InitUrl)) //temu国际版不支持无痕模式多开，此处改为true，每次创建cefwebbrowser时删除cookie + cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(InitUrl, false); + else + cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(shopMainUrl, false); + CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal(); + resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete; + resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad; + cefWebBrowser.RequestHandler = new CustomRequestHandler(resourceRequestHandler); + var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow); + cefWebBrowser.LifeSpanHandler = lifeSapnHandler; + cefWebBrowser.KeyboardHandler = new KeyboardHandler(); + cefWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd; + cefWebBrowser.AddressChanged += CefWebBrowser_AddressChanged; + cefWebBrowser.LoadError += CefWebBrowser_LoadError; + cefWebBrowser.Dock = DockStyle.Fill; + + //js绑定C#对象 + PDDShopBrowserObject shopObj = new PDDShopBrowserObject(); + shopObj.OnInfoReceived += ShopObj_OnInfoReceived; + CefSharpSettings.WcfEnabled = true; + cefWebBrowser.JavascriptObjectRepository.Register( + name: "shopObj", + objectToBind: shopObj, + isAsync: false, + options: new BindingOptions { Binder = BindingOptions.DefaultBinder.Binder /*CamelCaseJavascriptNames = false*/ /*cef79*/ } + ); + + if (shop.Cookies == null) + shop.Cookies = ""; + if (shop.Cookies2 == null) + shop.Cookies2 = ""; + + //var cookie = shop.Cookies; + //if (isMultiLogin) + // cookie = shop.DictMultiCookies.Keys.Contains(MultiLoginCookieName) ? shop.DictMultiCookies[MultiLoginCookieName] : ""; + List cookieLst = new List(); + try + { + cookieLst = JsonHelper.DeserializeJsonToList(shop.Cookies); + if (cookieLst == null) + cookieLst = new List(); + } + catch + { + } + + Task.Run(() => + { + Invoke(new Action(() => + { + splitContainer1.Panel1.Controls.Add(cefWebBrowser); + //cefWebBrowser.Load(shopMainUrl); + })); + // cef138必须init后方可设置或删除cookie + while (!cefWebBrowser.IsBrowserInitialized || !cefWebBrowser.GetBrowser().MainFrame.IsValid) + Thread.Sleep(20); + CEFBrowser.DeleteCookie(cefWebBrowser.GetCookieManager(null)); + + //if (cookieLst.Any(c => c.Value.StartsWith("windows_1"))) + // cefWebBrowser.ExecuteScriptAsync("navigator.__defineGetter__('userAgent', function() { return 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.5.40.8 Safari/537.36 PddWorkbench-Online PddBrowser pdd_windows_version/3.0.3.12'; });"); + + //cef 138 如果没有设置RequestContext 可能为空，直接getCookieManager + //if (this.openType != EnumOpenType.login) + { + //var t = CEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), cefWebBrowser.GetCookieManager(null)); + foreach (var cook in cookieLst) + { + var t = CEFBrowser.SetCookieAsync(cook.Domain, cook.Name + "=" + cook.Value + ";", cefWebBrowser.GetCookieManager(null)); + t.Wait(5000); + } + } + + if (this.openType != EnumOpenType.login) + { + //var cookie2 = shop.Cookies2; + //var t2 = CEFBrowser.SetCookieAsync(shopCookieHead2, cookie2, cefWebBrowser.GetCookieManager(null)); + //t2.Wait(5000); + } + + //根据登录的具体店铺设置local storage + if (!string.IsNullOrEmpty(shop.ShopId)) + { + //var storageJsCode = "window.localStorage.setItem('" + "mall-info-id" + "', '" + shop.ShopId + "');\r\n"; + //storageJsCode += "window.localStorage.setItem('" + "agentseller-mall-info-id" + "', '" + shop.ShopId + "');\r\n"; + //while (!cefWebBrowser.IsBrowserInitialized || !cefWebBrowser.GetBrowser().MainFrame.IsValid) + // Thread.Sleep(20); + //cefWebBrowser.GetBrowser().MainFrame.ExecuteJavaScriptAsync(storageJsCode); + } + + if (!string.IsNullOrEmpty(InitUrl)) + cefWebBrowser.Load(InitUrl); + else + cefWebBrowser.Load(shopMainUrl); + + //不是登录的话就此返回 + if (openType != EnumOpenType.login) + { + Invoke(new Action(() => + { + chkCloseAfterLogin.Visible = false; + btnLoginAgain.Visible = false; + })); + return; + } + + for (int i = 0; i < 50; i++) + { + if (cefWebBrowser.IsLoading) + Thread.Sleep(100); + } + Thread.Sleep(Randomx.GetId(1500,2000)); + + if (!this.Created) + return; + + while (!cefWebBrowser.Address.StartsWith(shopLoginUrl)) + { + Thread.Sleep(1000); + if (!this.Created) + return; + } + + CEFBrowser.DeleteCookie(cefWebBrowser.GetCookieManager(null)); + InputUserNameAndPassword(cefWebBrowser, shop.LoginName, DataOpenSSL.DecryptString(shop.Password)); + }); + } + } + private void ShopObj_OnInfoReceived(string information) + { + //BaseMsgForm.ShowInfo(information); + if (!string.IsNullOrEmpty(information)) + cefWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync("alert('" + information + "');"); + } + + private void CefWebBrowser_LoadError(object sender, CefSharp.LoadErrorEventArgs e) + { + } + + private void CefWebBrowser_AddressChanged(object sender, CefSharp.AddressChangedEventArgs e) + { + if (this.Created && !this.Disposing && !this.IsDisposed) + { + Invoke(new Action(() => + { + currentUrl = e.Address; + txtAddress.Text = e.Address; + })); + } + if (e.Address == "https://po.e57.cn/login?redirect=%2Findex" && openType == EnumOpenType.manage) + { + Task.Run(() => + { + Thread.Sleep(2000); + Invoke(new Action(() => + { + if (this.Created && !this.IsDisposed && !this.Disposing) + this.Close(); + })); + }); + }} + + private void CefWebBrowser_FrameLoadEnd(object sender, CefSharp.FrameLoadEndEventArgs e) + { + //js绑定C#对象 html页面内声明绑定的C#对象 + StringBuilder sb = new StringBuilder(); + sb.Append("(function(){"); + sb.Append("CefSharp.BindObjectAsync('shopObj');"); + sb.Append("})();"); + cefWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sb.ToString()); + + // 库存上传按钮 pdd不需要 + if (1 == 2 && currentUrl.StartsWith("https://mms.pinduoduo.com/goods/goods_list")) + { + Task.Run(() => { + string sAddInputJs = @" + document.addEventListener('wheel', function(event) { + // 检查滚动方向 + //if (event.deltaY < 0) { + // console.log('向上滚动'); + //} else { + // console.log('向下滚动'); + //} + // 或者使用 event.deltaX 来检查水平滚动 + //if (event.deltaX < 0) { + // console.log('向左滚动'); + //} else if (event.deltaX > 0) { + // console.log('向右滚动'); + //} + + // 阻止默认的滚动行为（如果有需要） + //event.preventDefault(); + + addGetProdButton(); + }); + addGetProdButton(); + + function addGetProdButton() { + var productLst = document.getElementsByClassName('goods-id'); + for(i=0; i= 0) { + var sSpuId = addBtnItem.innerText.replace('\r','').replace('\n','').replace('ID: ', ''); + addBtnItem.outerHTML = addBtnItem.outerHTML.replace(""
"",""
"") + .replace(""
"", ""
""); + } + } + }"; + cefWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sAddInputJs); + }); + } + } + + //public Func BeforeResourceLoadEvent; // sender, requestUrl, postData, request, true(表示取消执行） + private bool RequestHandler_BeforeResourceLoad(object sender, string url, string postData, IRequest request) + { + if (BaseClass.MainPath == "29pdd" && BaseClass.UsePddWorkbanch && !shop.Cookies.Contains("windows_1")) + { + var ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36"; + //ua = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.5.40.8 Safari/537.36"; + request.SetHeaderByName("User-Agent", ua, true); + + //var ua = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.5.40.8 Safari/537.36 PddWorkbench-Online PddBrowser pdd_windows_version/3.0.3.12"; + //request.SetHeaderByName("User-Agent", ua, true); + ////if (request.Method == "POST") + //request.SetHeaderByName("pddid", shop.pddid, true); + //request.SetHeaderByName("Accept-Encoding", "gzip, deflate, br", true); + //var headers = request.Headers; + //headers.Remove("sec-ch-ua"); + //headers.Remove("sec-ch-ua-mobile"); + //headers.Remove("sec-ch-ua-platform"); + //headers.Remove("Accept-Language"); + //headers.Remove("Origin"); + ////headers["User-Agent"] = ua; + ////headers["Accept-Encoding"] = "gzip, deflate, br"; + //request.Headers = headers; + } + if (url == "https://mms.pinduoduo.com/glide/mms/goodsCommit/action/edit" && prodParam != null) + { + //postData = postData.Replace( + // "https://img.pddpic.com/mms-goods-image/2025-12-27/e7d145cb-1147-46b5-a673-e3df4b93cd02.jpeg.a.jpeg", + // "https://img.pddpic.com/mms-material-img/2025-12-26/748ae660-53f4-4806-9e88-2712a7b5114b.jpeg.a.jpeg"); + + //postData = postData.Replace( + // "https://img.pddpic.com/mms-material-img/2025-12-26/748ae660-53f4-4806-9e88-2712a7b5114b.jpeg.a.jpeg", + // "https://img.pddpic.com/mms-goods-image/2025-12-26/1a788e0c-468a-4b6d-9389-cc2dab1f69a0.jpeg.a.jpeg?imageView2/2/w/1700/q/85"); + + JObject jObj = JObject.Parse(postData); + var skuStr = JsonHelper.SerializeObject(jObj["skus"]); + var skuStrNew = JsonHelper.SerializeObject(prodParam.skus); + foreach(JObject skuObj in jObj["skus"]) + { + var skuName = ""; + foreach (JObject specObj in skuObj["spec"]) + { + skuName += specObj["spec_name"].ParseToString() + ";"; + } + skuName = skuName.TrimEnd(';'); + var skuBase = prodParam.skus.FirstOrDefault(s => string.Join(";", s.spec.Select(sp => sp.spec_name)) == skuName); + if (skuBase != null) + skuObj["thumb_url"] = skuBase.thumb_url; + + //skuObj["thumb_url"] = "https://img.pddpic.com/mms-material-img/2025-12-27/23e40222-1a08-4ba1-a6a3-65588c75e0cd.jpeg.a.jpeg"; + } + + //skuStrNew = skuStrNew.Replace("\"thumb_url_file_id\":null,", ""); + //postData = postData.Replace(skuStr, skuStrNew); + + postData = JsonHelper.SerializeObject(jObj); + request.PostData.Elements[0].Bytes = System.Text.Encoding.UTF8.GetBytes(postData); + } + return false; + } + public PDDProductUploadParam prodParam = null; + + static int GetAntiContentsTimes = 40; + private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request) + { + var responseDataTmp = responseData; + if (responseDataTmp.Contains("活动权益失效")) + { + + }//修改后恢复活动权益 + if (responseDataTmp.Contains("修改后恢复活动权益")) + { + + }//修改后恢复活动权益 + if (responseDataTmp.Contains("结婚男方主卧洞房喜联女方出嫁新婚房门挂联入户门贴婚庆用品批发")) + { + + } + + var antiContent = request.Headers.AllKeys.Contains("Anti-Content") ? request.Headers["Anti-Content"] : ""; + var refere = request.ReferrerUrl; + if (shop != null && !url.StartsWith("https://mms.pinduoduo.com/janus/api/userinfo") && !string.IsNullOrEmpty(antiContent) && request.Method == "POST") + { + Task.Run(() => + { + GetAntiContentsTimes++; + if (this.Created && !this.Disposing && !this.IsDisposed) + Invoke(new Action(() => + { + if (this.Created && !this.Disposing && !this.IsDisposed) + try { this.TitleText = "店铺登录 - " + GetAntiContentsTimes; } catch { return; } + })); + shop.AntiContents.Add(antiContent); + while (shop.AntiContents.Count > 200) + shop.AntiContents.RemoveAt(0); + if (!string.IsNullOrEmpty(shop.ShopId) && GetAntiContentsTimes > 500) + { + GetAntiContentsTimes = 0; + ShopBLL.MdyAntiContent(shop); + } + }); + } + + if (url.Contains("https://mms.pinduoduo.com/home")) + { + Task.Run(() => + { + var data = responseData; + if (this.shop != null && data.Contains("\"success\":true")) + { + var username = BaseRegex.GetStringJson(ref data, "username"); + var maskMobile = BaseRegex.GetStringJson(ref data, "mobile"); + + if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(maskMobile)) + { + maskMobile = maskMobile.Split('*').Last(); + if (string.IsNullOrWhiteSpace(maskMobile) || string.IsNullOrWhiteSpace(username)) + return; + + if (shop.LoginName.EndsWith(maskMobile) || shop.LoginName == username) + { + lstShopCompany.Clear(); + //var jObj = JObject.Parse(data); + //var jArr = jObj["result"] as JArray; + //if (jArr == null) + // jArr = new JArray(); + + Thread.Sleep(500); + + ShopCompany sc = new ShopCompany() + { + MallId = BaseRegex.GetStringJson(ref data, "mall_id"), + AccountId = BaseRegex.GetStringJson(ref data, "username"), + AccountName = BaseRegex.GetStringJson(ref data, "mall_name"), + LoginName = shop.LoginName, + UserName = BaseClass.UserName, + LoginStatus = "登录成功", + AntiContent = antiContent, + }; + this.lstShopCompany.Add(sc); + } + } + + if (openType == EnumOpenType.manage && string.IsNullOrWhiteSpace(shop.MallId)) + { + shop.MallId = BaseRegex.GetStringJson(ref data, "mall_id"); + shop.ShopId = BaseRegex.GetStringJson(ref data, "username"); + shop.ShopAccount = BaseRegex.GetStringJson(ref data, "mall_name"); + var mdyShopUrl = BaseClass.BuildObjString("shop/wx_add_mdy_29wx_pdd_shop"); + var mdyShopData = UserLogin.GetSignaturex() + + "&login_name=" + shop.LoginName + + "&new_shop_id=" + shop.ShopId + + "&shop_account=" + shop.ShopAccount + + "&mall_id=" + shop.MallId; + var result = GetHtml.PostUtf8(mdyShopUrl, mdyShopData); + } + } + }); + } + // 有些店铺mall_id未获取，补救（260401，临时，后面等店铺重新登录后就可以移除） + if (url.Contains("https://mms.pinduoduo.com/janus/api/new/userinfo") && responseData.Contains("mall_id")) + { + if (openType == EnumOpenType.manage && string.IsNullOrWhiteSpace(shop.MallId)) + { + var data = responseData; + shop.MallId = BaseRegex.GetStringJson(ref data, "mall_id"); + shop.ShopId = BaseRegex.GetStringJson(ref data, "username"); + var mdyShopUrl = BaseClass.BuildObjString("shop/wx_add_mdy_29wx_pdd_shop"); + var mdyShopData = UserLogin.GetSignaturex() + + "&login_name=" + shop.LoginName + + "&new_shop_id=" + shop.ShopId + + "&shop_account=" + shop.ShopAccount + + "&mall_id=" + shop.MallId; + var result = GetHtml.PostUtf8(mdyShopUrl, mdyShopData); + } + } + + if (url.Contains("https://xtjpd.jiaotian.vip/") && responseData.Contains("access_token")) + { + Task.Run(() => + { + var pddClientData = responseData; + pddClientData = GetHtml.Unicode2String(pddClientData); + // {"id":"2","cid":"2","company_id":"0","site_id":"2","main_sid":"0","shop_id":"490943134","shop_name":"pdd49094313446","mall_name":"阿杰小铺浦哈哈","mall_desc":"您的小店已开启，为了更方便消费者了解您的店铺，快来补充店铺详情吧~","logo":"http:\/\/t16img.yangkeduo.com\/pdd_ims\/img_check\/v2\/E62F2CFFFFFF0720200112155452281\/7a235545414b40deaa2a90ab8eaebfd3.png","merchant_type":"1","mall_character":"2","access_token":"3f66557920e0481697325b46c73299e76e3d9e7e","refresh_token":"aa163da98e944063abbbe57a5365fad2fa90fe50","expires_at":"1776264848","expires_in":"26259","refresh_token_expires_at":"1776264848","refresh_token_expires_in":"26259","buy_sku_id":"435494","spec_name":"服务版本:专业版,周期:15天","spec_value":"专业版","goods_get_time":null,"order_get_time":null,"addtime":"2026-03-31 22:54:29","add_user_id":"2","add_user_name":"授权","update_time":"2026-04-15 15:36:27","update_user_id":"0","delete_user_id":"0"} + var access_token = BaseRegex.GetStringJson(ref pddClientData, "access_token"); + var refresh_token = BaseRegex.GetStringJson(ref pddClientData, "refresh_token"); + var mall_id = BaseRegex.GetStringJson(ref pddClientData, "shop_id"); + var shop_id = BaseRegex.GetStringJson(ref pddClientData, "shop_name"); + var mall_name = BaseRegex.GetStringJson(ref pddClientData, "mall_name"); // 阿杰小铺浦哈哈 + var expires_at = BaseRegex.GetStringJson(ref pddClientData, "expires_at"); + if (shop?.MallId == mall_id && !string.IsNullOrWhiteSpace(AuthClientId)) + { + var auth = shop.ApiAuthInfoList.FirstOrDefault(a => a.AppKey == AuthClientId); + if (auth == null) + { + auth = new AuthInfo(); + shop.ApiAuthInfoList.Add(auth); + } + auth.ShopId = shop_id; + auth.AccessToken = access_token; + auth.RefreshToken = refresh_token; + auth.AppKey = AuthClientId; + auth.ExpiresTime = BaseClass.StampToDateTime(expires_at.ParseToInt()); + auth.UpdateTime = DateTime.Now; + auth.ApiAuthStatus = "授权成功"; + auth.AppSecret = ""; + + var rst = PddApiHelper.SaveShopClientInfo(auth); + + Invoke(new Action(() => + { + if (this.Created && !this.IsDisposed && !this.Disposing) + this.Close(); + })); + } + }); + } + } + + /// + /// 自动登录 + /// + /// + /// + /// + private void InputUserNameAndPassword(ChromiumWebBrowser webBrowser, string _account, string _password) + { + webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sGetElementWithText); + + var jsStr0 = "var clickBox1 = getElementWithText('账号登录'); clickBox1.click()"; + var response0 = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr0); + response0.Wait(1000); + Thread.Sleep(Randomx.GetId(500, 1000)); + + string jsStr1 = "function getInputItem () {var usernameId = document.getElementById('usernameId'); if (usernameId) return 'true';} getInputItem();"; + Task response1 = null; + while (response1?.Result?.Result == null || !response1.Result.Result.ParseToString().Contains("true")) + { + Thread.Sleep(250); + if (!this.Created) + return; + + response1 = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr1); + response1.Wait(5000); + + if (!this.Created) + return; + } + + webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sInputValueChange2); + + jsStr1 = "var usernameId = document.getElementById('usernameId'); " + + "changeReactInputValue(usernameId,'" + _account + "');"; + response1 = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr1); + response1.Wait(1000); + Thread.Sleep(Randomx.GetId(500, 1000)); + + string jsStr = "var passwordId = document.getElementById('passwordId'); "+ + "changeReactInputValue(passwordId,'" + _password + "');"; + var response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(1000); + Thread.Sleep(Randomx.GetId(500, 1000)); + + jsStr = "var clickBox = getElementWithText('我已阅读并同意'); " + + "clickBox.click()"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(1000); + Thread.Sleep(Randomx.GetId(500, 1000)); + + jsStr = "var clickBox = getElementWithText('登录'); " + + "clickBox.click()"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(1000); + Thread.Sleep(Randomx.GetId(500, 1000)); + return; + //下面代码原抖音使用，废弃 + + #region 输入用js + string jsSetValue = @" +function keyboardInput(dom, st) { + var evt = new InputEvent('input', { + //var evt = new Event('input', { // cef57 + inputType: 'insertText', + data: st, + dataTransfer: null, + isComposing: false + }); + dom.value = st; + dom.dispatchEvent(evt); + dom.focus(); +};"; + + string jsInputKey = @" +function fireKeyEvent(el, evtType, keyCode) { + var evtObj; + if (document.createEvent) + { + if (window.KeyEvent) + { + //firefox 浏览器下模拟事件 + evtObj = document.createEvent('KeyEvents'); + evtObj.initKeyEvent(evtType, true, true, window, true, false, false, false, keyCode, 0); + } + else + { + //chrome 浏览器下模拟事件 + evtObj = document.createEvent('UIEvents'); + evtObj.initUIEvent(evtType, true, true, window, 1); + + delete evtObj.keyCode; + if (typeof evtObj.keyCode === 'undefined') + { + //为了模拟keycode + Object.defineProperty(evtObj, 'keyCode', { value: keyCode }); + } + else + { + evtObj.key = String.fromCharCode(keyCode); + } + + if (typeof evtObj.ctrlKey === 'undefined') + { + //为了模拟ctrl键 + Object.defineProperty(evtObj, 'ctrlKey', { value: true }); + } + else + { + evtObj.ctrlKey = true; + } + } + el.dispatchEvent(evtObj); + } + else if (document.createEventObject) + { + //IE 浏览器下模拟事件 + evtObj = document.createEventObject(); + evtObj.keyCode = keyCode + el.fireEvent('on' + evtType, evtObj); + } +}"; + #endregion + + #region 输入用户名 + jsStr = @"var txt1 = document.getElementsByName('email')[0]; txt1.focus(); txt1.click(); keyboardInput(txt1, '" + _account + "');" + + "var uname = '" + _account + "';" + + "for(var i = 0; i < uname.length; i++) {" + + " cCode = uname.charCodeAt(i);" + + " fireKeyEvent(txt1, 'keydown', cCode);" + + " fireKeyEvent(txt1, 'keypress', cCode);" + + " fireKeyEvent(txt1, 'keyup', cCode);" + + "}"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsSetValue + jsInputKey + jsStr); + response.Wait(2000); + Thread.Sleep(Randomx.GetId(400, 800)); + #endregion + + #region 输入密码 + jsStr = @"var txt2 = document.getElementsByName('password')[0]; txt2.focus(); txt2.click(); keyboardInput(txt2, '" + _password + "');" + + "var pwd = '" + _password + "';" + + "for(var i = 0; i < pwd.length; i++) {" + + " cCode = pwd.charCodeAt(i);" + + " fireKeyEvent(txt2, 'keydown', cCode);" + + " fireKeyEvent(txt2, 'keypress', cCode);" + + " fireKeyEvent(txt2, 'keyup', cCode);" + + "}"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsInputKey + jsStr); + response.Wait(2000); + Thread.Sleep(Randomx.GetId(400, 800)); + #endregion + + #region 点击登录按钮 + jsStr = "var btn = document.getElementsByClassName('account-center-action-button')[0]; btn.click(); //btn.dispatchEvent(new Event('change'));"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(2000); + Thread.Sleep(1500 + Randomx.GetId(1000)); + #endregion + + #region 获取验证码 + int getImageCount = 0; + getImageAgain: + if (!this.Created) + return; + + jsStr = "function getImg() { return document.getElementsByClassName('captcha_verify_img--wrapper')[0].innerHTML; }"; + jsStr += "getImg();"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(2000); + if (response.Result?.Result == null) + { + if (getImageCount < 50) + { + Thread.Sleep(2500); + getImageCount++; + goto getImageAgain; + } + } + if (response.Result?.Result != null) + { + var imgStr = response.Result.Result.ToString(); + var src = BaseRegex.GetMatchRegexString(ref imgStr, "src=\"([\\s\\S]*?)\""); + Bitmap bt = (Bitmap)GetHtml.LoadImage(src); + if (bt != null) + { + int Stopxt = 0; + int dragButtonWidth = 53; + //Stopxt = new Base64ChangeImgUrl().CalculateNick(bt, dragButtonWidth); + Thread.Sleep(500 + Randomx.GetId(1000)); + Stopxt = new Base64ChangeImgUrl().CalculateNickNew(bt, dragButtonWidth); + if (Stopxt > 0) + { + jsStr = "function getImgPos() { return document.getElementsByClassName('secsdk-captcha-drag-icon')[0].getBoundingClientRect().left + '|' " + + " + document.getElementsByClassName('secsdk-captcha-drag-icon')[0].getBoundingClientRect().top;} getImgPos();"; + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(2000); + if (response.Result?.Result != null) + { + var xy = response.Result?.Result.ToString(); + var xyArr = xy.Split('|'); + if (xyArr.Length == 2) + { + try + { + int x = (int)Convert.ToDecimal(xyArr[0]) + 25; + int y = (int)Convert.ToDecimal(xyArr[1]) + 25; + + // 自动滑块图形验证 + if (GlobalConfig.TemuShopSettingParam.IsAutoDragLogin) + { + PDDShopLoginForm.CefMouseDragDou(cefWebBrowser, x, y, Convert.ToInt32((x + Stopxt * 340m / 552m) - 15), y); + for (int i = 0; i < 1; i++) + Thread.Sleep(2000 + Randomx.GetId(1000)); + response = webBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(jsStr); + response.Wait(2000); + if (response.Result?.Result != null && getImageCount < 50) + { + getImageCount++; + goto getImageAgain; + } + } + } + catch + { + } + } + } + for (int i = 0; i < 1; i++) + Thread.Sleep(2000 + Randomx.GetId(1000)); + } + } + } + Thread.Sleep(1500 + Randomx.GetId(1000)); + #endregion + } + + // 鼠标左键按下,移动,移动...左键抬起。 + public static void CefMouseDrag(ChromiumWebBrowser webBrowser, int x1, int y1, int x2, int y2) + { + Thread.Sleep(100); + var host = webBrowser.GetBrowser().GetHost(); + + var rx = -6 + Randomx.GetId(13); + x2 = x2 + rx; + // 随机按下点的位置（正负6像素），提高仿真性 + int x = x1 + rx; + int y = y1 - 6 + Randomx.GetId(13); + + // 按下鼠标左键 + host.SendMouseClickEvent(x, y, MouseButtonType.Left, false, 1, CefEventFlags.None); + Thread.Sleep(100 + Randomx.GetId(300)); + + // 滑动光标 + int times = -20; + while (x < x2 + 4 - Randomx.GetId(9)) + { + times++; + x += (15 + Randomx.GetId(15)) / 8; + if (times % 5 == 0) + y = y - 1 + Randomx.GetId(3); + Thread.Sleep(6 + Math.Abs(times) / 5 + Randomx.GetId(16)); + host.SendMouseMoveEvent((int)x, (int)y, false, CefEventFlags.LeftMouseButton); + } + if (x < x2 - 1) + while (x < x2) + { + times++; + x += (8 + Randomx.GetId(8)) / 8; + if (times % 5 == 0) + y = y - 1 + Randomx.GetId(3); + Thread.Sleep(6 + Math.Abs(times) / 5 + Randomx.GetId(16)); + host.SendMouseMoveEvent((int)x, (int)y, false, CefEventFlags.LeftMouseButton); + } + else if (x > x2 + 1) + while (x > x2) + { + times++; + x -= (8 + Randomx.GetId(8)) / 8; + if (times % 5 == 0) + y = y - 1 + Randomx.GetId(3); + Thread.Sleep(6 + Math.Abs(times) / 5 + Randomx.GetId(16)); + host.SendMouseMoveEvent((int)x, (int)y, false, CefEventFlags.LeftMouseButton); + } + + // 如果最后位置偏差较多，再做一次调整 + x = x2 - 1 + Randomx.GetId(3); + x = x2; + Thread.Sleep(18 + Math.Abs(times) / 5 + Randomx.GetId(16)); + Thread.Sleep(18 + Math.Abs(times) / 5 + Randomx.GetId(16)); + host.SendMouseMoveEvent((int)x, (int)y, false, CefEventFlags.LeftMouseButton); + + // 抬起鼠标左键 + Thread.Sleep(300 + Randomx.GetId(500)); + host.SendMouseClickEvent(x, y, MouseButtonType.Left, true, 1, CefEventFlags.None); + host.SendMouseClickEvent(x, y, MouseButtonType.Left, true, 1, CefEventFlags.None); + } + + private void btnStop_Click(object sender, EventArgs e) + { + + } + + private void btnCopyUserName_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(txtUserName.Text)) + Clipboard.SetDataObject(txtUserName.Text); + } + + private void btnCopyPassword_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(txtPassWord.Text)) + Clipboard.SetDataObject(txtPassWord.Text); + } + + private void btnReload_Click(object sender, EventArgs e) + { + if (cefWebBrowser != null) + { + if (txtAddress.Text != "about:blank") + cefWebBrowser.Load(txtAddress.Text); + else + cefWebBrowser.Load(shopMainUrl); + } + } + + private void ShopLoginForm_FormClosed(object sender, FormClosedEventArgs e) + { + //OnSaveComplete(shop); + Task.Run(() => { + Thread.Sleep(500); + if (!this.Disposing && !this.IsDisposed) + { + MainForm.instance.Invoke(new Action(() => { this.Dispose(); })); + } + }); + } + + private void txtAddress_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + if (cefWebBrowser != null) + { + cefWebBrowser.Load(txtAddress.Text); + } + } + } + + string sInputValueChange = @" +let usernameId = document.getElementById('usernameId'); +usernameId.value = '1'; + +var event = document.createEvent('HTMLEvents'); +event.initEvent('input', true, true); +event.eventType = 'message'; +usernameId.dispatchEvent(event); +"; + + public static string sInputValueChange2 = @" +function changeReactInputValue(inputDom,newText){ + let lastValue = inputDom.value; + inputDom.value = newText; + let event = new Event('input', { bubbles: true }); + event.simulated = true; + let tracker = inputDom._valueTracker; + if (tracker) { + tracker.setValue(lastValue); + } + inputDom.dispatchEvent(event); +} +"; + + string sGetElementWithText = @" +function getElementWithText(sText) +{ + var elem=null; + const elements = document.querySelectorAll('*'); // 选择所有元素 + elements.forEach(element => { + if (element.textContent.includes(sText)) { + // 对每个匹配的元素执行操作 + //console.log(element); + elem=element; + } + }); + return elem; +}; +"; + + private void btnLoginAgain_Click(object sender, EventArgs e) + { + if (this.currentUrl != shopLoginUrl) + this.cefWebBrowser.Load(shopLoginUrl); + + + Task.Run(() => + { + InputUserNameAndPassword(cefWebBrowser, shop.LoginName, DataOpenSSL.DecryptString(shop.Password)); + }); + } + } +} diff --git a/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.resx b/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.resx new file mode 100644 index 0000000..c963c3c --- /dev/null +++ b/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.resx @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + AAABAAEAgIAQYAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAABEZmbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMZmZkQAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAZszMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMxmAAAAAAAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMxkAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzGQAAAAAAAAAAAAAAAAAAAbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMYAAAAAAAAAAAAAAAAARszMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAABszMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAAAAAGzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAAAAbMzMzMzMzMzMzMzMzM + zMzMzMzMzMx3d4iIiIiIiIh3fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAABszMzMzMzMzMzM + zMzMzMzMzMzHeIiIiIj/////////iIiIiId8zMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAGzMzMzMzM + zMzMzMzMzMzMzMeIiI/////////////////////4iIh8zMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAATMzM + zMzMzMzMzMzMzMzMzHiI////////////////////////////iIfMzMzMzMzMzMzMzMzMzMzMxAAAAAAA + AGzMzMzMzMzMzMzMzMzMx3iP///////////////////////////////4iHzMzMzMzMzMzMzMzMzMzMYA + AAAAAAbMzMzMzMzMzMzMzMzMx3iP//////////////////////////////////+IfMzMzMzMzMzMzMzM + zMzMYAAAAABMzMzMzMzMzMzMzMzMx3iP/////////////////////////////////////4h8zMzMzMzM + zMzMzMzMzMQAAAAAbMzMzMzMzMzMzMzMzHiP////////////////////////////////////////h3zM + zMzMzMzMzMzMzMzGAAAABMzMzMzMzMzMzMzMzHiP//////////////////////////////////////// + //iHzMzMzMzMzMzMzMzMzEAAAAbMzMzMzMzMzMzMzMeI//////////////////////////////////// + ////////+IfMzMzMzMzMzMzMzMxgAABMzMzMzMzMzMzMzMx4//////////////////////////////// + //////////////+IfMzMzMzMzMzMzMzMxAAAbMzMzMzMzMzMzMzHj/////////////////////////// + /////////////////////4fMzMzMzMzMzMzMzMYAAMzMzMzMzMzMzMzMeP////////////////////// + ///////////////////////////4fMzMzMzMzMzMzMzMAAbMzMzMzMzMzMzMx4////////////////// + /////////////////////////////////4fMzMzMzMzMzMzMzGAGzMzMzMzMzMzMzHj///////////// + ///////////////////////////////////////4fMzMzMzMzMzMzMxgDMzMzMzMzMzMzMyI//////// + /////////////////////////////////////////////4zMzMzMzMzMzMzMwEzMzMzMzMzMzMzHj/// + //////////////////////////////////////////////////+HzMzMzMzMzMzMzMRszMzMzMzMzMzM + eP//////////////////////////////////////////////////////+HzMzMzMzMzMzMzGbMzMzMzM + zMzMzHj///////////////////////////////////////////////////////+MzMzMzMzMzMzMxmzM + zMzMzMzMzMyP////+IiP////////////////////////////////////////+I//////h8zMzMzMzMzM + zMZszMzMzMzMzMzHj////4iIiI//////////////////////////////////////+IiIj/////jMzMzM + zMzMzMzGbMzMzMzMzMzMyP////iIiIiI/////////////////////////////////////4iIiIj////4 + fMzMzMzMzMzMxszMzMzMzMzMzHj////4iIiIiP////////////////////////////////////+IiIiI + j////4zMzMzMzMzMzMbMzMzMzMzMzMx4////iIiIiIj////////////////////////////////////4 + iIiIiI////+HzMzMzMzMzMzMzMzMzMzMzMzMj////4iIiIiI//////////////+IiP//iI////////// + ////+IiIiIiP////h8zMzMzMzMzMzMzMzMzMzMzMzI/////4iIiIiP/////////////4d3eIiIeIj/// + //////////+IiIiIj/////jMzMzMzMzMzMzMzMzMzMzMzMyP////+IiIiIj/////////////iIiId3eI + iI//////////////iIiIiI/////4zMzMzMzMzMzMzMzMzMzMzMzHj/////+IiIiP/////////////4// + /4d4j/+P//////////////iIiIj/////+MzMzMzMzMzMzMzMzMzMzMzMx4//////+IiP//////////// + ///////4j///////////////////iIiP//////jMzMzMzMzMzMzMzMzMzMzMzMeP//////////+IiIj/ + ///////////////////////////////////////////4fMzMzMzMzMzMzMzMzMzMzMzH//////////+H + fMx8eP//////////////////////////iId3iP//////////+HzMzMzMzMzMzMzMzMzMzMzMyP////// + ///4fMzHh8eP////////////////////////+MzMzMd4//////////h8zMzMzMzMzMzMzMzMzMzMzMf/ + ////////+MzMePjMeP///////////////////////4zMzMeHx4/////////4fMzMzMzMzMzMzMzMzMzM + zMzH/////////4fMd3eHzMeP//////////////////////iMzMzIiHx4////////+HzMzMzMzMzMzMzM + zMzMzMzMx/////////+Hx4iIfMzMj//////////////////////4h3d8x4h8yP////////jMzMzMzMzM + zMzMzMzMzMzMzMeP////////+HiP+IfMzI//////////////////////+HiIiHd3zHj////////4zMzM + zMzMzMzMzMzMzMzMzMzHj/////////h4//+HzMeP//////////////////////h4//h8zMyP//////// + +MzMzMzMzMzMzMzMzMzMzMzMzI/////////4iP//h8x4///////////////////////4j//4fMzHj/// + //////jMzMzMzMzMzMzMzMzMzMzMzMyP///////4iIiP+IfHj///////////////////////+Ij/+HzM + eP/////////4zMzMzMzMzMzMzMzMzMzMzMzMj///////iIiIiIh3eP////////////////////////+I + j4h8x3iI////////h8zMzMzMzMzMzMzMzMzMzMzMzH//////+Hj///iIiI////////////////////// + /////4iId4iIiIj//////4zMzMzMzMzMzMzMzMzMzMzMzMx4//////iP////iP////////////////// + /////////////4iP//iI//////+MzMzMzMzMzMzMzMzMzMzMzMzMyP//////////+I////////////// + ///////////////////4eP//iP//////jMzMzMzMzMzMzMzMzMzMzMzMzMj///////////iP//////// + /////////////////////////4j/////////+HzMzMzMzMzMzMzMzMzMzMzMzMzHj/////////////// + //////////////////////////////+I//////////jMzMzMzMzMzMzMzMzMzMzMzMzMzI////////// + //////////////////////////////////////////////+HzMzMzMzMzMzMzMzMzMzMzMzMzMyP//// + ////////////////////////////////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzM + eP///////////////////////////////////////////////////////4zMzMzMzMzMzMzMzMzMzMzM + zMzMzMj///////////////////////////////////////////////////////h8zMzMzMzMzMzMzMzM + zMzMzMzMzMzHj//////////////////////////////////////////////////////4zMzMzMzMzMzM + zMzMzMzMzMzMzMzMzI//////////////////////////////////////////////////////h8zMzMzM + zMzMzMzMzMzMzMzMzMzMzMx4////////////////////////////////////////////////////+HzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMyI////+I//////////////////////////////////////////// + //h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP////+Ij///////////////////////////////////// + //////+HzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP////+IiIiIj//////////////////////////4 + ////iI/////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMiP/////4iIiP////////////////////// + ////+IiIiIj/////iHzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiP////////////////////////// + ///////////4iIj//////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiP//////////////////// + //////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiP////////////// + //////////////////////////////+HzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHj///////// + ///////////////////////////////////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP//// + ////////////////////////////////////////+MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzI + j/////////////////////////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMeP//////////////////////////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMx4////////+I//////////////////////////////////////jMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMeP///////4iIj///////////////////////////iP///////4fMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMx4////////iIiIiP///////////////////////4iIiP///////4zMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMj///////+IiIiIiI////////////////////+IiIiIj///////+HzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMx4////////iIiIiIj////////////////////4iIiIiIj/////// + +MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMj///////+IiIiIiI////////////////////+IiIiIiI// + //////h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx4////////iIiIiIiP////////////////////iIiI + iIiI///////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMj///////+IiIiIiIj/////iIiIiIiIj///// + /4iIiIiIiP///////4zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx4////////iIiIiIiI/////4zMzMzMzM + j/////+IiIiIiIiP//////+HzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP//////+IiIiIiIj/////+MzM + zMzMzI//////+IiIiIiIj///////+MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzI////////iIiIiIiI//// + //jMzMzMzMyP//////iIiIiIiIj///////jMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP///////4iIiIiI + iP/////4zMzMzMzMj//////4iIiIiIiI///////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzI////////iI + iIiIiI//////+MzMzMzMzI//////+IiIiIiIiP///////4zMzMzMzMzMzMzMzMzMzMzMzMzMzMyP//// + ///4iIiIiIiP//////fMzMzMzMyP//////+IiIiIiIj///////+MzMzMzMzMzMzMzMzMzMzMzMzMzMzH + j///////+IiIiIiI//////+HzMzMzMzMeP//////iIiIiIiIj///////jMzMzMzMzMzMzMzMzMzMzMzM + zMzMyP////////iIiIiIiP//////jMzMzMzMzHj///////iIiIiIiI///////4fMzMzMzMzMzMzMzMzM + zMzMzMzMzMj///////+IiIiIiI///////4zMzMzMzMzI///////4iIiIiIiI///////3zMzMzMzMzMzM + zMzMzMzMzMzMzMzI////////iIiIiIiP//////+MzMzMzMzMyP//////+IiIiIiIiP//////+MzMzMzM + zMzMzMzMzMzMzMzMzMzMeP///////4iIiIiIj///////jMzMzMzMzMj///////+IiIiIiIj///////jM + zMzMzMzMzMzMzMzMzMzMzMzMzI////////+IiIiIiP//////+HzMzMzMzMzHj///////iIiIiIiI//// + ///4zMzMzMzMzMzMzMzMzMzMzMzMzMyP////////iIiIiI////////jMzMzMzMzMzI///////4iIiIiI + iI//////+MzMzMzMzMzMzMzMzMzMzMzMzMzMj////////4iIiIiP///////4zMzMzMzMzMyP///////4 + iIiIiIiP//////jMzMzMzMzMzMzMzMzMzMzMzMzMzI////////+IiIiI////////h8zMzMzMzMzMeP// + /////4iIiIiIj//////4fMzMzMzMzMzMzMzMzMzMzMzMzMyP////////iIiIj////////4fMzMzMzMzM + zHj///////+IiIiIiI//////+HzMzMzMzMzMzMzMzMzMzMzMzMzHj/////////iIiP////////+MzMzM + zMzMzMzI////////+IiIiIiP//////h8zMzMzMzMzMzMxmzMzMzMzMzMx4/////////4iP/////////4 + fMzMzMzMzMzMx4////////+IiIiIj//////4fMzMzMzMzMzMzMZszMzMzMzMzMeP//////////////// + ////+MzMzMzMzMzMzMyP////////iIiIiP//////+HzMzMzMzMzMzMzGbMzMzMzMzMzH//////////// + //////////fMzMzMzMzMzMzMeP////////iIiIj///////98zMzMzMzMzMzMxmzMzMzMzMzMyP////// + //////////////+HzMzMzMzMzMzMzHj/////////+IiP////////jMzMzMzMzMzMzMZszMzMzMzMzMj/ + ////////////////////jMzMzMzMzMzMzMzIj////////////////////4zMzMzMzMzMzMzGTMzMzMzM + zMzH////////////////////+HzMzMzMzMzMzMzMx4////////////////////+MzMzMzMzMzMzMxAzM + zMzMzMzMx/////////////////////jMzMzMzMzMzMzMzMyI///////////////////4fMzMzMzMzMzM + zMAGzMzMzMzMzMeP//////////////////+HzMzMzMzMzMzMzMzMeP//////////////////+HzMzMzM + zMzMzMxgBszMzMzMzMzHj//////////////////4fMzMzMzMzMzMzMzMzMeP//////////////////h8 + zMzMzMzMzMzMYADMzMzMzMzMzI//////////////////+HzMzMzMzMzMzMzMzMzHj/////////////// + ///4zMzMzMzMzMzMzAAAbMzMzMzMzMyP/////////////////4fMzMzMzMzMzMzMzMzMzHj///////// + ////////+MzMzMzMzMzMzMYAAEzMzMzMzMzMj/////////////////+MzMzMzMzMzMzMzMzMzMzIj/// + /////////////4fMzMzMzMzMzMzEAAAGzMzMzMzMzHj////////////////4fMzMzMzMzMzMzMzMzMzM + x4////////////////+MzMzMzMzMzMzMYAAABMzMzMzMzMx4////////////////h8zMzMzMzMzMzMzM + zMzMzMx4///////////////4fMzMzMzMzMzMzEAAAABszMzMzMzMx4//////////////+HzMzMzMzMzM + zMzMzMzMzMzMx4//////////////+MzMzMzMzMzMzMYAAAAATMzMzMzMzMyP/////////////4fMzMzM + zMzMzMzMzMzMzMzMzMeI/////////////4fMzMzMzMzMzMzEAAAAAAbMzMzMzMzMeP////////////h8 + zMzMzMzMzMzMzMzMzMzMzMzMeI////////////h8zMzMzMzMzMzMYAAAAAAAbMzMzMzMzMeP//////// + //iHzMzMzMzMzMzMzMzMzMzMzMzMzMyI//////////+HzMzMzMzMzMzMxgAAAAAAAEzMzMzMzMzMeP// + //////iHfMzMzMzMzMzMzMzMzMzMzMzMzMzMx4/////////4fMzMzMzMzMzMzMQAAAAAAAAGzMzMzMzM + zMeI//////iHfMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx4j//////4h8zMzMzMzMzMzMxgAAAAAAAAAGzM + zMzMzMzMx4iIiIiHzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiIj/+Ih3zMzMzMzMzMzMzGAAAAAAAA + AAAGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx3iId8zMzMzMzMzMzMzMYAAA + AAAAAAAAAGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + xgAAAAAAAAAAAAAGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzGAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzGQAAAAAAAAAAAAAAAAAbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMYAAAAAAAAAAAAAAAAAAARszMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAABGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAAAAAAAABmzMzMzMzMzMzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzGYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARGZmzMzMzMzMzMzMzM + zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMZmZEAAAAAAAAAAAAAAAAD////+AAAAAAAAAAD/////////AAAA + AAAAAAAAAP//////+AAAAAAAAAAAAAAf/////+AAAAAAAAAAAAAAB/////+AAAAAAAAAAAAAAAH////+ + AAAAAAAAAAAAAAAAf////AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAAP///gAAAAAAAAAAAAAAAA + B///wAAAAAAAAAAAAAAAAAP//4AAAAAAAAAAAAAAAAAB//8AAAAAAAAAAAAAAAAAAP/+AAAAAAAAAAAA + AAAAAAB//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAAAAAAAAAf+AAAAAAA + AAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAAAAAAAAAAAAAAB+AA + AAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAA + AAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABAAAAAAAA + AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAADwAAAAAAA + AAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AA + AAAAAAAAAAAAAAAAAA/4AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAA + AD/+AAAAAAAAAAAAAAAAAAB//gAAAAAAAAAAAAAAAAAAf/8AAAAAAAAAAAAAAAAAAP//gAAAAAAAAAAA + AAAAAAH//8AAAAAAAAAAAAAAAAAD///gAAAAAAAAAAAAAAAAB///8AAAAAAAAAAAAAAAAA////wAAAAA + AAAAAAAAAAA////+AAAAAAAAAAAAAAAAf////4AAAAAAAAAAAAAAAf/////gAAAAAAAAAAAAAAf///// + +AAAAAAAAAAAAAAf//////8AAAAAAAAAAAAA/////////gAAAAAAAAAAf////w== + + + \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.cs index f6c4ec2..2e4ac66 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopDefaultAddressListForm.cs @@ -57,16 +57,16 @@ namespace TemuKJD.WXForms.ShopForms Invoke(new Action(() => { cmbNotes.Items.Clear(); - var notes = GlobalConfig.ShopLoginList.Select(s => s.Notes).Distinct(); + var notes = GlobalConfig.ValidShopLoginList.Select(s => s.Notes).Distinct(); cmbNotes.Items.AddRange(notes.Where(n => !n.IsNullOrEmpty()).ToArray()); cmbGroup.Items.Clear(); - var groups = GlobalConfig.ShopLoginList.Select(s => s.GroupName).Distinct(); + var groups = GlobalConfig.ValidShopLoginList.Select(s => s.GroupName).Distinct(); cmbGroup.Items.AddRange(groups.Where(n => !n.IsNullOrEmpty()).ToArray()); })); - var shopList = GlobalConfig.ShopLoginList.Where(s => !string.IsNullOrEmpty(s.ShopId) - || GlobalConfig.ShopLoginList.Where(ss=>ss.LoginName == s.LoginName).Count() == 1) + var shopList = GlobalConfig.ValidShopLoginList.Where(s => !string.IsNullOrEmpty(s.ShopId) + || GlobalConfig.ValidShopLoginList.Where(ss=>ss.LoginName == s.LoginName).Count() == 1) /*.OrderBy(s=>s.LoginName)*/.ToList(); Invoke(new Action(() => @@ -142,6 +142,8 @@ namespace TemuKJD.WXForms.ShopForms { if (!this.Created) return; + if (param.is_point_shop_expire) + return; this.Invoke(new Action(() => { DataGridViewRow dgvr = dgvShop.Rows.Cast().Where(p => @@ -233,7 +235,7 @@ namespace TemuKJD.WXForms.ShopForms this.dgvShop.AddSelectorColumn("colSelect"); this.splitContainer2.FixedPanel = FixedPanel.Panel2; - //foreach (var shop in GlobalConfig.ShopLoginList) + //foreach (var shop in GlobalConfig.ValidShopLoginList) //{ // shop.ShopSubAccountList.Clear(); // if (!string.IsNullOrWhiteSpace(shop.SubUserName)) @@ -267,7 +269,7 @@ namespace TemuKJD.WXForms.ShopForms string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText; string loginName = dgvShop.Rows[e.RowIndex].Cells["colLoginName"].Value.ParseToString(); string accountId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString(); - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.LoginName == loginName && v.ShopId == accountId); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(v => v.LoginName == loginName && v.ShopId == accountId); switch (headerText) { @@ -307,7 +309,7 @@ namespace TemuKJD.WXForms.ShopForms foreach(var row in dgvRows) dgvShop.Rows.Remove(row); - GlobalConfig.ShopLoginList.RemoveAll(v => v.LoginName == shopLoginName); + GlobalConfig.ValidShopLoginList.RemoveAll(v => v.LoginName == shopLoginName); } private void btnRefreshCookie_Click(object sender, EventArgs e) @@ -350,7 +352,7 @@ namespace TemuKJD.WXForms.ShopForms if (shopGetAddressList == null) { shopGetAddressList = new List(); - shopGetAddressList.AddRange(GlobalConfig.ShopLoginList); + shopGetAddressList.AddRange(GlobalConfig.ValidShopLoginList); } while (shopGetAddressList.Count > 0) @@ -478,7 +480,7 @@ namespace TemuKJD.WXForms.ShopForms private void btnEdit_Click(object sender, EventArgs e) { List shopNameList = GetCheckedList(); - List shops = GlobalConfig.ShopLoginList.Where(s => shopNameList.Contains(s.ShopId)).ToList(); + List shops = GlobalConfig.ValidShopLoginList.Where(s => shopNameList.Contains(s.ShopId)).ToList(); WXShopDefaultAddressEditForm editForm = new WXShopDefaultAddressEditForm(shops); editForm.SaveCompleteWithDescribe += Sae_SaveComplete; editForm.ShowDialog(); diff --git a/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs index 66a616a..0776c46 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs @@ -571,19 +571,19 @@ namespace TemuKJD.WXForms.ShopForms param.BuyAccount, param.ChatAccount, "", - "进入", - "检测", - string.IsNullOrWhiteSpace(param.LoginStatus) ? "未登录" : param.LoginStatus.Trim(), - "批量登录", - string.IsNullOrWhiteSpace(param.LoginStatus2) ? "国际版未登录" : param.LoginStatus2.Trim(), - "购买", - "多重登录", - param.ApiAuthStatus, - param.BuyApiAuth.ApiAuthStatus, - "导入Cookie", - "复制Cookie", - "编辑", - "删除"); + param.is_point_shop_expire ? "" : "进入", + param.is_point_shop_expire ? "" : "检测", + param.is_point_shop_expire ? "" : (string.IsNullOrWhiteSpace(param.LoginStatus) ? "未登录" : param.LoginStatus.Trim()), + param.is_point_shop_expire ? "" : "批量登录", + param.is_point_shop_expire ? "" : (string.IsNullOrWhiteSpace(param.LoginStatus2) ? "国际版未登录" : param.LoginStatus2.Trim()), + param.is_point_shop_expire ? "" : "购买", + param.is_point_shop_expire ? "" : "多重登录", + param.is_point_shop_expire ? "" : param.ApiAuthStatus, + param.is_point_shop_expire ? "" : param.BuyApiAuth.ApiAuthStatus, + param.is_point_shop_expire ? "" : "导入Cookie", + param.is_point_shop_expire ? "" : "复制Cookie", + param.is_point_shop_expire ? "" : "编辑", + param.is_point_shop_expire ? "" : "删除"); if (!isRefresh) { // help to scroll to latest checked @@ -602,21 +602,36 @@ namespace TemuKJD.WXForms.ShopForms var subUserNames = param.SubUserName.Split(',').Where(su => !string.IsNullOrEmpty(su)); var subUsers = WXSubAccountShopEditForm.lstAllSubAccount.Where(su => subUserNames.Contains(su.user_name)); - dgvr.Cells["colCookie"].Value = param.Cookies; - dgvr.Cells["colApiAuth"].Value = param.ApiAuthStatus; - dgvr.Cells["colBuyApiAuth"].Value = param.BuyApiAuth.ApiAuthStatus; dgvr.Cells["colLoginName"].Value = param.LoginName; dgvr.Cells["colShopAccount"].Value = param.ShopAccount; + dgvr.Cells["colExpireTime"].Value = param.is_point_shop_expire ? "已过期" : BaseClass.StampToDateTime(param.expire_time.ParseToInt()).ToString("yy-MM-dd HH:mm"); dgvr.Cells["colNotes"].Value = param.Notes; + dgvr.Cells["colGroupName"].Value = param.GroupName; dgvr.Cells["colCookie"].Value = param.Cookies; dgvr.Cells["colSubUser"].Value = string.Join(",", subUsers.Select(s => s.nick_name)); dgvr.Cells["colSubUserAccount"].Value = param.SubUserName; - dgvr.Cells["colGroupName"].Value = param.GroupName; dgvr.Cells["colUploadAccount"].Value = param.UploadAccount; dgvr.Cells["colBuyAccount"].Value = param.BuyAccount; dgvr.Cells["colChatAccount"].Value = param.ChatAccount; - dgvr.Cells["colRelogin"].Value = string.IsNullOrWhiteSpace(param.LoginStatus) ? "未登录" : param.LoginStatus.Trim(); - dgvr.Cells["colExpireTime"].Value = param.is_point_shop_expire ? "已过期" : BaseClass.StampToDateTime(param.expire_time.ParseToInt()).ToString("yy-MM-dd HH:mm"); + dgvr.Cells["colApiAuth"].Value = param.ApiAuthStatus; + dgvr.Cells["colBuyApiAuth"].Value = param.BuyApiAuth.ApiAuthStatus; + + dgvr.Cells["colGotoShop"].Value = param.is_point_shop_expire ? "" : "进入"; + dgvr.Cells["colShopOperate"].Value = param.is_point_shop_expire ? "" : "检测"; + dgvr.Cells["colRelogin"].Value = param.is_point_shop_expire ? "" : (string.IsNullOrWhiteSpace(param.LoginStatus) ? "未登录" : param.LoginStatus.Trim()); + dgvr.Cells["colSwitchLogin"].Value = param.is_point_shop_expire ? "" : "批量登录"; + dgvr.Cells["colReLogin2"].Value = param.is_point_shop_expire ? "" : (string.IsNullOrWhiteSpace(param.LoginStatus2) ? "国际版未登录" : param.LoginStatus2.Trim()); + dgvr.Cells["colBuyApi"].Value = param.is_point_shop_expire ? "" : "购买"; + dgvr.Cells["colMultiLogin"].Value = param.is_point_shop_expire ? "" : "多重登录"; + dgvr.Cells["colApiAuth"].Value = param.is_point_shop_expire ? "" : param.ApiAuthStatus; + dgvr.Cells["colBuyApiAuth"].Value = param.is_point_shop_expire ? "" : param.BuyApiAuth.ApiAuthStatus; + dgvr.Cells["colUpdateCookies"].Value = param.is_point_shop_expire ? "" : "导入Cookie"; + dgvr.Cells["colCopyCookies"].Value = param.is_point_shop_expire ? "" : "复制Cookie"; + dgvr.Cells["colEdit"].Value = param.is_point_shop_expire ? "" : "编辑"; + dgvr.Cells["colDelete"].Value = param.is_point_shop_expire ? "" : "删除"; + + + dgvr.Cells["colExpireTime"].Style.ForeColor = dgvr.Cells["colExpireTime"].Value.ParseToString() == "已过期" ? Color.Red : Color.Blue; } diff --git a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs index 6238dd4..011cae5 100644 --- a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs @@ -30,8 +30,8 @@ namespace TemuKJD.WXForms.ShopForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); @@ -93,7 +93,6 @@ namespace TemuKJD.WXForms.ShopForms this.btnClose = new DevComponents.DotNetBar.PanelEx(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDetail = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -126,6 +125,8 @@ namespace TemuKJD.WXForms.ShopForms this.colAvailableAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPendingAmount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDepositBalance = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.btnRefresh = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -170,6 +171,7 @@ namespace TemuKJD.WXForms.ShopForms | 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.Controls.Add(this.btnRefresh); this.ucGroupBoxEx3.Controls.Add(this.cmbFilterShopGroup); this.ucGroupBoxEx3.Controls.Add(this.label23); this.ucGroupBoxEx3.Controls.Add(this.cmbFilterShopNotes); @@ -259,7 +261,7 @@ namespace TemuKJD.WXForms.ShopForms this.btnClear.CanvasColor = System.Drawing.SystemColors.Control; this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClear.Location = new System.Drawing.Point(186, 49); + this.btnClear.Location = new System.Drawing.Point(186, 77); this.btnClear.Name = "btnClear"; this.btnClear.Size = new System.Drawing.Size(35, 25); this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -310,7 +312,7 @@ namespace TemuKJD.WXForms.ShopForms this.btnFliter.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFliter.DisabledBackColor = System.Drawing.Color.Empty; this.btnFliter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFliter.Location = new System.Drawing.Point(186, 21); + this.btnFliter.Location = new System.Drawing.Point(186, 49); this.btnFliter.Name = "btnFliter"; this.btnFliter.Size = new System.Drawing.Size(35, 25); this.btnFliter.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -987,19 +989,19 @@ namespace TemuKJD.WXForms.ShopForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvShop.AutoRowNumber = true; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -1045,17 +1047,6 @@ namespace TemuKJD.WXForms.ShopForms this.dgvShop.TabIndex = 5; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1350, 26); - this.statusBar.TabIndex = 1; - // // colSelect // this.colSelect.FillWeight = 22F; @@ -1299,6 +1290,42 @@ namespace TemuKJD.WXForms.ShopForms this.colDepositBalance.ReadOnly = true; this.colDepositBalance.Width = 80; // + // 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(1350, 26); + this.statusBar.TabIndex = 1; + // + // btnRefresh + // + this.btnRefresh.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnRefresh.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRefresh.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRefresh.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRefresh.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRefresh.Location = new System.Drawing.Point(186, 21); + this.btnRefresh.Name = "btnRefresh"; + this.btnRefresh.Size = new System.Drawing.Size(35, 25); + this.btnRefresh.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefresh.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefresh.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefresh.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRefresh.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRefresh.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRefresh.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRefresh.Style.GradientAngle = 90; + this.btnRefresh.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefresh.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefresh.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefresh.TabIndex = 873; + this.btnRefresh.Text = "刷新"; + this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click); + // // WxShopStatisticsForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1426,5 +1453,6 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colAvailableAmount; private System.Windows.Forms.DataGridViewTextBoxColumn colPendingAmount; private System.Windows.Forms.DataGridViewTextBoxColumn colDepositBalance; + private DevComponents.DotNetBar.PanelEx btnRefresh; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs index 0ba47bd..3946953 100644 --- a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs @@ -26,6 +26,7 @@ namespace TemuKJD.WXForms.ShopForms public partial class WxShopStatisticsForm : BaseForms.BaseForm { bool isInit = false; + public CancellationTokenSource cancellationTokenSource { get; set; } = null; public List lstShopStatisticsInfo = new List(); public List lstHideColumns = new List(); public WxShopStatisticsForm() @@ -81,9 +82,9 @@ namespace TemuKJD.WXForms.ShopForms { if (Visible == true) { - if (!isInit) + //if (!isInit) { - isInit = true; + //isInit = true; RefreshShop(); } } @@ -98,7 +99,7 @@ namespace TemuKJD.WXForms.ShopForms => 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(); + => !GlobalConfig.ValidShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); // 更新被删除的店铺列表 foreach (var row in dgvRowList) { @@ -106,46 +107,52 @@ namespace TemuKJD.WXForms.ShopForms } // 获取被删除的统计信息并删除 List statisticsDeleteLst = lstShopStatisticsInfo.Where(row - => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.ShopId.ToString())).ToList(); + => !GlobalConfig.ValidShopLoginList.Any(s => s.ShopId == row.ShopId.ToString())).ToList(); foreach (var s in statisticsDeleteLst) { lstShopStatisticsInfo.Remove(s); } // 绑定店铺（含新导入的店铺） - foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + foreach (ShopLoginInfo shopEntity in GlobalConfig.ValidShopLoginList) { if (!string.IsNullOrEmpty(shopEntity.ShopId)) BindShop(shopEntity, selectIds); } cmbFilterShopNotes.Items.Clear(); - foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) + foreach (var note in GlobalConfig.ValidShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) { cmbFilterShopNotes.Items.Add(note); } cmbFilterShopGroup.Items.Clear(); - foreach (var group in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) + foreach (var group in GlobalConfig.ValidShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) { cmbFilterShopGroup.Items.Add(group); } - GetShopStatistics(GlobalConfig.ShopLoginList.ToList(), selectIds); + GetShopStatistics(GlobalConfig.ValidShopLoginList, selectIds); } - private void GetShopStatistics(List shops, List selectIds) + private void GetShopStatistics(NaiBa.Util.ConcurrentList shops, List selectIds) { Invoke(new Action(() => { this.statusBar.pgbTaskProgress.Maximum = shops.Count; this.statusBar.lblTaskStatus.Text = "正在查询"; })); + if (cancellationTokenSource != null) + cancellationTokenSource.Cancel(); + cancellationTokenSource = new CancellationTokenSource(); Task.Run(() => { + var cancellationToken = cancellationTokenSource.Token; List tLst = new List(); foreach (ShopLoginInfo shopEntity in shops) { + if (cancellationToken.IsCancellationRequested) + break; Invoke(new Action(() => { this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1); @@ -181,6 +188,8 @@ namespace TemuKJD.WXForms.ShopForms })); var t = Task.Run(() => { + if (cancellationToken.IsCancellationRequested) + return; if (string.IsNullOrEmpty(shopEntity.ShopId)) return; bool canUse = shopEntity.LoginStatus == "登录成功"; @@ -230,7 +239,7 @@ namespace TemuKJD.WXForms.ShopForms })); }); //t.Wait(); - while(tLst.Where(ta => !ta.IsCompleted && !ta.IsFaulted && !ta.IsCanceled).Count() >= 2) + while(tLst.Where(ta => !ta.IsCompleted && !ta.IsFaulted && !ta.IsCanceled).Count() >= 3) { Thread.Sleep(10); } @@ -246,13 +255,15 @@ namespace TemuKJD.WXForms.ShopForms this.statusBar.lblTaskStatus.Text = "查询结束"; this.pbLoading.Visible = false; })); - }); + }, cancellationTokenSource.Token); } private void BindShop(ShopLoginInfo shopEntity, List selectShopId = null) { if (shopEntity == null) return; + if (shopEntity.is_point_shop_expire) + return; if (selectShopId == null) selectShopId = new List(); @@ -727,7 +738,7 @@ namespace TemuKJD.WXForms.ShopForms string columnName = dgvShop.Columns[e.ColumnIndex].Name; string shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString(); string shopAccount = dgvShop.Rows[e.RowIndex].Cells["colShopAccount"].Value.ToString(); - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); var row = dgvShop.Rows[e.RowIndex]; switch (columnName) { @@ -772,7 +783,8 @@ namespace TemuKJD.WXForms.ShopForms } void ReGetStatistics(List reGetShopIds) { - var shopList = GlobalConfig.ShopLoginList.Where(s => reGetShopIds.Contains(s.ShopId)).ToList(); + var shopList = new NaiBa.Util.ConcurrentList(); + shopList.AddRange(GlobalConfig.ValidShopLoginList.Where(s => reGetShopIds.Contains(s.ShopId))); foreach (var shop in shopList) { WxShopSaleStatisticsGroup statistics = lstShopStatisticsInfo.FirstOrDefault(s => s.ShopId.ToString() == shop.ShopId); @@ -839,5 +851,10 @@ namespace TemuKJD.WXForms.ShopForms cmbFilterShopGroup.Text = "全部"; pnlFliter_Click(null, null); } + + private void btnRefresh_Click(object sender, EventArgs e) + { + RefreshShop(); + } } } diff --git a/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs b/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs index 373a07c..918172e 100644 --- a/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs +++ b/TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs @@ -966,6 +966,7 @@ namespace TemuKJD.WXForms.TalkForms buyer.browser.Load("https://mobile.yangkeduo.com/complaint_list.html?refer_page_name=personal&refer_page_sn=10001&tab=all"); Thread.Sleep(Randomx.GetId(2000, 3000)); + Invoke(new Action(() => { WxTalkForm.instance.TitleText = buyer.buyer_nick + " 售后读取中"; })); BindBuyer(buyer, "正在读取售后"); int top = 0; @@ -1022,6 +1023,7 @@ namespace TemuKJD.WXForms.TalkForms } Thread.Sleep(Randomx.GetId(2000, 3000)); + Invoke(new Action(() => { WxTalkForm.instance.TitleText = buyer.buyer_nick + " 待发货读取中"; })); BindBuyer(buyer, "正在读取待发货"); // 待发货 @@ -1091,6 +1093,7 @@ namespace TemuKJD.WXForms.TalkForms } Thread.Sleep(Randomx.GetId(2000, 3000)); + Invoke(new Action(() => { WxTalkForm.instance.TitleText = buyer.buyer_nick + " 已发货读取中"; })); BindBuyer(buyer, "正在读取已发货"); // 已发货 @@ -1157,6 +1160,8 @@ namespace TemuKJD.WXForms.TalkForms Thread.Sleep(Randomx.GetId(6000, 8000)); } isReadOrder = false; + + Invoke(new Action(() => { WxTalkForm.instance.TitleText = "订单读取已结束，等待下次读取"; })); }, cancellationTokenSource.Token); } diff --git a/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs b/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs index 4debf6e..c530bce 100644 --- a/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs +++ b/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs @@ -1235,8 +1235,8 @@ namespace TemuKJD.WXForms.TalkForms this.KeyPreview = true; this.Name = "WxTalkForm"; this.ShowMaximizeBox = true; - this.Text = "`"; - this.TitleText = "`"; + this.Text = "微信小店客服"; + this.TitleText = "微信小店客服"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.WxTalkForm_FormClosed); this.Load += new System.EventHandler(this.WxTalkForm_Load); this.Controls.SetChildIndex(this.panel3, 0); diff --git a/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs b/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs index 54c72c9..f31a7ad 100644 --- a/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs +++ b/TEMUKJD/WXForms/TalkForms/WxTalkForm.cs @@ -182,18 +182,18 @@ namespace TemuKJD.WXForms.TalkForms while (!StartUp.IsShopInit) Thread.Sleep(100); - SetMainBrowserUrl(GlobalConfig.ShopLoginList.FirstOrDefault()); + SetMainBrowserUrl(GlobalConfig.ValidShopLoginList.FirstOrDefault()); // 网页初始化 LoadShop(); RefreshCookie(true); InitOrderForm(); // 加载店铺确认默认店铺后再初始化订单列表读取 Invoke(new Action(() => { - foreach (var shopNote in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) + foreach (var shopNote in GlobalConfig.ValidShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) { this.cmbFiltNotes.Items.Add(shopNote); } - foreach (var group in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) + foreach (var group in GlobalConfig.ValidShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct()) { this.cmbFiltGroups.Items.Add(group); } @@ -272,7 +272,7 @@ namespace TemuKJD.WXForms.TalkForms { //AutoReplayParam autoReplayParam = lstAutoReplayParam.FirstOrDefault(); var autoReplayParamLst = lstAutoReplayParam.Where(r => r.nickName == autoReplayParam.nickName).ToList(); - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == autoReplayParam.shopId); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == autoReplayParam.shopId); if (shop == null) { lstAutoReplayParam.RemoveAll(r => r.shopId == autoReplayParam.shopId); @@ -449,7 +449,7 @@ namespace TemuKJD.WXForms.TalkForms { for (int i = 0; i < 120; i++) { - foreach (var shop in GlobalConfig.ShopLoginList) + foreach (var shop in GlobalConfig.ValidShopLoginList) { if (shop.Chat?.IsBrowserInitialized != true) continue; @@ -569,7 +569,7 @@ namespace TemuKJD.WXForms.TalkForms if (shopList == null) shopList = new List(); if (shopList.Count == 0) - shopList.AddRange(GlobalConfig.ShopLoginList); + shopList.AddRange(GlobalConfig.ValidShopLoginList); for (int i = 0; i < shopList.Count; i++) { @@ -728,7 +728,7 @@ namespace TemuKJD.WXForms.TalkForms if (cef == null) return; - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.Chat == cef); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.Chat == cef); if (shop == null) return; @@ -1221,7 +1221,7 @@ namespace TemuKJD.WXForms.TalkForms string shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value?.ToString(); if (string.IsNullOrEmpty(shopId)) return; - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) return; @@ -1248,7 +1248,7 @@ namespace TemuKJD.WXForms.TalkForms string shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value?.ToString(); if (string.IsNullOrEmpty(shopId)) return; - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) return; @@ -1298,7 +1298,7 @@ namespace TemuKJD.WXForms.TalkForms string shopId = row.Cells["colShopId"].Value?.ToString(); if (string.IsNullOrEmpty(shopId)) return; - var shop = GlobalConfig.ShopLoginList.Where(s => s.ShopId == shopId).FirstOrDefault(); + var shop = GlobalConfig.ValidShopLoginList.Where(s => s.ShopId == shopId).FirstOrDefault(); if (shop == null) return; @@ -1374,7 +1374,7 @@ namespace TemuKJD.WXForms.TalkForms if (!isAuto) WXShopListForm.UpdateShop(); - foreach (var shop in GlobalConfig.ShopLoginList) + foreach (var shop in GlobalConfig.ValidShopLoginList) { var r = dgvShop.Rows.Cast().FirstOrDefault(x => x.Cells["colShopId"].Value.ToString() == shop.ShopId); Invoke(new Action(() => @@ -1447,7 +1447,7 @@ namespace TemuKJD.WXForms.TalkForms List tList = new List(); if (refreshAll) lstShopAfterSale.Clear(); - foreach (var shop in GlobalConfig.ShopLoginList) + foreach (var shop in GlobalConfig.ValidShopLoginList) { var shopMainInfo = lstShopAfterSale.FirstOrDefault(sa => sa.ShopId == shop.ShopId); if (shopMainInfo == null) @@ -1580,7 +1580,7 @@ namespace TemuKJD.WXForms.TalkForms void RefreshMsgCount() { lstShopKfStatistics.Clear(); - foreach (var shop in GlobalConfig.ShopLoginList) + foreach (var shop in GlobalConfig.ValidShopLoginList) { var kfMsg = new WxShopKfStatistics() { ShopId = shop.ShopId }; var kfMsgRst = GetKfMsgStatistics(shop, BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now.Date), BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now));