diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 425259b..ef95fc7 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 969; + public static int VersionCount = 970; //public static int VersionCount = 613; /// diff --git a/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs b/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs index 6a0fc74..3e89925 100644 --- a/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs +++ b/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs @@ -1,4 +1,5 @@ -using System; +using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -67,6 +68,7 @@ namespace AllBase.Model.Result.PDDResult public string order_prompt_color { get; set; } // "#E02E24", public string activity_type { get; set; } // 3, + //[JsonProperty(PropertyName = "extraInfo")] public extra_info extra_info { get; set; } } diff --git a/TEMUKJD/PDDForms/ProductForms/WXProdViolationManage.cs b/TEMUKJD/PDDForms/ProductForms/WXProdViolationManage.cs index d2aa45b..f932612 100644 --- a/TEMUKJD/PDDForms/ProductForms/WXProdViolationManage.cs +++ b/TEMUKJD/PDDForms/ProductForms/WXProdViolationManage.cs @@ -73,9 +73,9 @@ namespace TemuKJD.PDDForms.ProductForms var punishReason = BaseRegex.GetStringJson(ref sVioInfo, "punishReason"); var productId = BaseRegex.GetStringJson(ref sVioInfo, "productId"); var productDesc = BaseRegex.GetStringJson(ref sVioInfo, "productDesc"); - //相似同款低质商品 品牌资质问题 不当使用他人权利 + //相似同款低质商品 不当使用他人权利 if (!punishReason.Contains("发布违禁信息") && !punishReason.Contains("材质夸大宣传") && - !punishReason.Contains("价格违规") && !punishReason.Contains("售假")) + !punishReason.Contains("价格违规") && !punishReason.Contains("售假") && !punishReason.Contains("品牌资质问题")) continue; if (!string.IsNullOrWhiteSpace(productDesc) && !string.IsNullOrWhiteSpace(productId)) { diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs index e51b845..465fecb 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs @@ -30,24 +30,23 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.cmbFilterType = new System.Windows.Forms.ComboBox(); + this.btnFilter = new DevComponents.DotNetBar.PanelEx(); + this.txtFilter = new System.Windows.Forms.TextBox(); this.label11 = new System.Windows.Forms.Label(); this.txtSearchMaxPrice = new System.Windows.Forms.TextBox(); this.txtSearchMinPrice = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); this.cmbCat2 = new System.Windows.Forms.ComboBox(); - this.chkOverride = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.label6 = new System.Windows.Forms.Label(); - this.txtMinPrice = new System.Windows.Forms.TextBox(); this.label9 = new System.Windows.Forms.Label(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.cmbCat1 = new System.Windows.Forms.ComboBox(); @@ -73,10 +72,23 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnRefreshShop = 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(); + this.chkOverride = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.label6 = new System.Windows.Forms.Label(); + this.txtMinPrice = new System.Windows.Forms.TextBox(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.pbShopLoading = new System.Windows.Forms.PictureBox(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.panel2 = new System.Windows.Forms.Panel(); this.dgvChanceProduct = new TemuKJD.UserComponent.DataGridViewEx(); @@ -93,15 +105,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.chk = new TemuKJD.UserComponent.UcCheckBox(this.components); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnSelectNotGetDetail = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -137,7 +141,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Size = new System.Drawing.Size(1344, 635); + this.splitContainer1.Size = new System.Drawing.Size(1424, 635); this.splitContainer1.SplitterDistance = 140; this.splitContainer1.TabIndex = 4; // @@ -148,15 +152,15 @@ 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.btnSelectNotGetDetail); + this.ucGroupBoxEx1.Controls.Add(this.cmbFilterType); + this.ucGroupBoxEx1.Controls.Add(this.btnFilter); + this.ucGroupBoxEx1.Controls.Add(this.txtFilter); this.ucGroupBoxEx1.Controls.Add(this.label11); this.ucGroupBoxEx1.Controls.Add(this.txtSearchMaxPrice); this.ucGroupBoxEx1.Controls.Add(this.txtSearchMinPrice); this.ucGroupBoxEx1.Controls.Add(this.label10); - this.ucGroupBoxEx1.Controls.Add(this.label7); this.ucGroupBoxEx1.Controls.Add(this.cmbCat2); - this.ucGroupBoxEx1.Controls.Add(this.chkOverride); - this.ucGroupBoxEx1.Controls.Add(this.label6); - this.ucGroupBoxEx1.Controls.Add(this.txtMinPrice); this.ucGroupBoxEx1.Controls.Add(this.label9); this.ucGroupBoxEx1.Controls.Add(this.btnClear); this.ucGroupBoxEx1.Controls.Add(this.cmbCat1); @@ -182,17 +186,65 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Controls.Add(this.label4); this.ucGroupBoxEx1.Controls.Add(this.label3); + this.ucGroupBoxEx1.Controls.Add(this.label7); + this.ucGroupBoxEx1.Controls.Add(this.chkOverride); + this.ucGroupBoxEx1.Controls.Add(this.label6); + this.ucGroupBoxEx1.Controls.Add(this.txtMinPrice); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(1339, 138); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(1419, 138); this.ucGroupBoxEx1.TabIndex = 0; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "操作"; // + // cmbFilterType + // + this.cmbFilterType.FormattingEnabled = true; + this.cmbFilterType.Items.AddRange(new object[] { + "过滤所有字段", + "过滤标题"}); + this.cmbFilterType.Location = new System.Drawing.Point(987, 58); + this.cmbFilterType.Name = "cmbFilterType"; + this.cmbFilterType.Size = new System.Drawing.Size(102, 25); + this.cmbFilterType.TabIndex = 1012; + this.cmbFilterType.Text = "过滤所有字段"; + // + // btnFilter + // + this.btnFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnFilter.DisabledBackColor = System.Drawing.Color.Empty; + this.btnFilter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnFilter.Location = new System.Drawing.Point(987, 30); + this.btnFilter.Name = "btnFilter"; + this.btnFilter.Size = new System.Drawing.Size(102, 25); + this.btnFilter.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilter.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnFilter.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnFilter.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnFilter.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnFilter.Style.GradientAngle = 90; + this.btnFilter.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilter.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilter.TabIndex = 978; + this.btnFilter.Text = "移除关键词商品"; + this.btnFilter.Click += new System.EventHandler(this.btnFilter_Click); + // + // txtFilter + // + this.txtFilter.Location = new System.Drawing.Point(759, 31); + this.txtFilter.Multiline = true; + this.txtFilter.Name = "txtFilter"; + this.txtFilter.Size = new System.Drawing.Size(222, 82); + this.txtFilter.TabIndex = 974; + // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(684, 62); + this.label11.Location = new System.Drawing.Point(668, 51); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(20, 17); this.label11.TabIndex = 943; @@ -200,14 +252,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // txtSearchMaxPrice // - this.txtSearchMaxPrice.Location = new System.Drawing.Point(704, 59); + this.txtSearchMaxPrice.Location = new System.Drawing.Point(688, 48); this.txtSearchMaxPrice.Name = "txtSearchMaxPrice"; this.txtSearchMaxPrice.Size = new System.Drawing.Size(40, 23); this.txtSearchMaxPrice.TabIndex = 942; // // txtSearchMinPrice // - this.txtSearchMinPrice.Location = new System.Drawing.Point(644, 59); + this.txtSearchMinPrice.Location = new System.Drawing.Point(628, 48); this.txtSearchMinPrice.Name = "txtSearchMinPrice"; this.txtSearchMinPrice.Size = new System.Drawing.Size(40, 23); this.txtSearchMinPrice.TabIndex = 941; @@ -215,67 +267,27 @@ namespace TemuKJD.PDDForms.ProductSelectForms // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(582, 62); + this.label10.Location = new System.Drawing.Point(566, 51); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(56, 17); this.label10.TabIndex = 940; this.label10.Text = "商品价格"; // - // label7 - // - this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(1007, 93); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(44, 17); - this.label7.TabIndex = 844; - this.label7.Text = "元SKU"; - // // cmbCat2 // this.cmbCat2.FormattingEnabled = true; this.cmbCat2.Items.AddRange(new object[] { "不限"}); - this.cmbCat2.Location = new System.Drawing.Point(644, 30); + this.cmbCat2.Location = new System.Drawing.Point(628, 19); this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Size = new System.Drawing.Size(100, 25); this.cmbCat2.TabIndex = 908; this.cmbCat2.Text = "不限"; // - // chkOverride - // - this.chkOverride.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.chkOverride.AutoSize = true; - this.chkOverride.Location = new System.Drawing.Point(1064, 89); - this.chkOverride.Name = "chkOverride"; - this.chkOverride.Size = new System.Drawing.Size(135, 21); - this.chkOverride.TabIndex = 757; - this.chkOverride.Text = "覆盖库中已存在商品"; - this.chkOverride.UseVisualStyleBackColor = true; - // - // label6 - // - this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(852, 93); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(116, 17); - this.label6.TabIndex = 843; - this.label6.Text = "入库时移除价格低于"; - // - // txtMinPrice - // - this.txtMinPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.txtMinPrice.Location = new System.Drawing.Point(968, 90); - this.txtMinPrice.Name = "txtMinPrice"; - this.txtMinPrice.Size = new System.Drawing.Size(39, 23); - this.txtMinPrice.TabIndex = 842; - this.txtMinPrice.Text = "10"; - // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(582, 34); + this.label9.Location = new System.Drawing.Point(566, 23); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(68, 17); this.label9.TabIndex = 909; @@ -286,7 +298,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(295, 88); + this.btnClear.Location = new System.Drawing.Point(287, 88); this.btnClear.Name = "btnClear"; this.btnClear.Size = new System.Drawing.Size(100, 25); this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -310,7 +322,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbCat1.FormattingEnabled = true; this.cmbCat1.Items.AddRange(new object[] { "不限"}); - this.cmbCat1.Location = new System.Drawing.Point(476, 30); + this.cmbCat1.Location = new System.Drawing.Point(460, 19); this.cmbCat1.Name = "cmbCat1"; this.cmbCat1.Size = new System.Drawing.Size(100, 25); this.cmbCat1.TabIndex = 907; @@ -320,7 +332,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(413, 34); + this.label8.Location = new System.Drawing.Point(397, 23); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(68, 17); this.label8.TabIndex = 906; @@ -333,7 +345,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSelectSuccess.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectSuccess.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectSuccess.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelectSuccess.Location = new System.Drawing.Point(1046, 29); + this.btnSelectSuccess.Location = new System.Drawing.Point(1125, 61); this.btnSelectSuccess.Name = "btnSelectSuccess"; this.btnSelectSuccess.Size = new System.Drawing.Size(153, 25); this.btnSelectSuccess.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -353,7 +365,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // txtSearchCount // - this.txtSearchCount.Location = new System.Drawing.Point(811, 31); + this.txtSearchCount.Location = new System.Drawing.Point(518, 103); this.txtSearchCount.Name = "txtSearchCount"; this.txtSearchCount.Size = new System.Drawing.Size(40, 23); this.txtSearchCount.TabIndex = 738; @@ -364,7 +376,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStop.Location = new System.Drawing.Point(295, 26); + this.btnStop.Location = new System.Drawing.Point(287, 26); this.btnStop.Name = "btnStop"; this.btnStop.Size = new System.Drawing.Size(100, 25); this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -386,7 +398,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(750, 34); + this.label5.Location = new System.Drawing.Point(457, 106); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(68, 17); this.label5.TabIndex = 737; @@ -397,7 +409,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnStopStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStopStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStopStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStopStop.Location = new System.Drawing.Point(295, 57); + this.btnStopStop.Location = new System.Drawing.Point(287, 57); this.btnStopStop.Name = "btnStopStop"; this.btnStopStop.Size = new System.Drawing.Size(100, 25); this.btnStopStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -426,7 +438,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "全网热销", "潜力商品", "热门商品"}); - this.cmbSearchLabel.Location = new System.Drawing.Point(476, 58); + this.cmbSearchLabel.Location = new System.Drawing.Point(460, 47); this.cmbSearchLabel.Name = "cmbSearchLabel"; this.cmbSearchLabel.Size = new System.Drawing.Size(100, 25); this.cmbSearchLabel.TabIndex = 653; @@ -439,7 +451,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnAddToDb.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddToDb.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddToDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddToDb.Location = new System.Drawing.Point(1205, 85); + this.btnAddToDb.Location = new System.Drawing.Point(1284, 61); this.btnAddToDb.Name = "btnAddToDb"; this.btnAddToDb.Size = new System.Drawing.Size(116, 25); this.btnAddToDb.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -464,7 +476,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(1205, 29); + this.btnGetDetail.Location = new System.Drawing.Point(1284, 30); this.btnGetDetail.Name = "btnGetDetail"; this.btnGetDetail.Size = new System.Drawing.Size(116, 25); this.btnGetDetail.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -491,7 +503,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // txtSearchChance // - this.txtSearchChance.Location = new System.Drawing.Point(476, 86); + this.txtSearchChance.Location = new System.Drawing.Point(460, 75); this.txtSearchChance.Name = "txtSearchChance"; this.txtSearchChance.Size = new System.Drawing.Size(268, 23); this.txtSearchChance.TabIndex = 679; @@ -508,7 +520,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(426, 89); + this.label1.Location = new System.Drawing.Point(410, 78); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(56, 17); this.label1.TabIndex = 678; @@ -551,7 +563,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(855, 30); + this.btnSearch.Location = new System.Drawing.Point(562, 102); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(106, 25); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -574,7 +586,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(965, 30); + this.pnlEmpty.Location = new System.Drawing.Point(672, 102); this.pnlEmpty.Name = "pnlEmpty"; this.pnlEmpty.Size = new System.Drawing.Size(56, 25); this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -603,7 +615,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // lblGroupFilter // this.lblGroupFilter.AutoSize = true; - this.lblGroupFilter.Location = new System.Drawing.Point(413, 62); + this.lblGroupFilter.Location = new System.Drawing.Point(397, 51); this.lblGroupFilter.Name = "lblGroupFilter"; this.lblGroupFilter.Size = new System.Drawing.Size(68, 17); this.lblGroupFilter.TabIndex = 641; @@ -651,6 +663,46 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.label3.TabIndex = 707; this.label3.Text = "店铺名称："; // + // label7 + // + this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(1225, 106); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(44, 17); + this.label7.TabIndex = 844; + this.label7.Text = "元SKU"; + // + // chkOverride + // + this.chkOverride.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkOverride.AutoSize = true; + this.chkOverride.Location = new System.Drawing.Point(1277, 105); + this.chkOverride.Name = "chkOverride"; + this.chkOverride.Size = new System.Drawing.Size(135, 21); + this.chkOverride.TabIndex = 757; + this.chkOverride.Text = "覆盖库中已存在商品"; + this.chkOverride.UseVisualStyleBackColor = true; + // + // label6 + // + this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(1075, 106); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(116, 17); + this.label6.TabIndex = 843; + this.label6.Text = "入库时移除价格低于"; + // + // txtMinPrice + // + this.txtMinPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.txtMinPrice.Location = new System.Drawing.Point(1191, 103); + this.txtMinPrice.Name = "txtMinPrice"; + this.txtMinPrice.Size = new System.Drawing.Size(33, 23); + this.txtMinPrice.TabIndex = 842; + this.txtMinPrice.Text = "10"; + // // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -669,7 +721,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer2.Panel2.Controls.Add(this.chk); this.splitContainer2.Panel2.Controls.Add(this.statusBar); this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); - this.splitContainer2.Size = new System.Drawing.Size(1344, 491); + this.splitContainer2.Size = new System.Drawing.Size(1424, 491); this.splitContainer2.SplitterDistance = 462; this.splitContainer2.TabIndex = 0; // @@ -690,7 +742,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer3.Panel2.Controls.Add(this.pbLoading); this.splitContainer3.Panel2.Controls.Add(this.panel2); this.splitContainer3.Panel2.Controls.Add(this.dgvChanceProduct); - this.splitContainer3.Size = new System.Drawing.Size(1336, 462); + this.splitContainer3.Size = new System.Drawing.Size(1416, 462); this.splitContainer3.SplitterDistance = 290; this.splitContainer3.TabIndex = 9; // @@ -709,19 +761,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle15.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle15; 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; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -744,189 +796,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dgvShop.TabIndex = 7; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // - // 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(496, 206); - this.pbLoading.Name = "pbLoading"; - this.pbLoading.Size = new System.Drawing.Size(50, 50); - this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pbLoading.TabIndex = 7; - this.pbLoading.TabStop = false; - this.pbLoading.Visible = false; - // - // panel2 - // - this.panel2.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.panel2.Location = new System.Drawing.Point(409, 355); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(610, 87); - this.panel2.TabIndex = 8; - // - // dgvChanceProduct - // - this.dgvChanceProduct.AllowUserToAddRows = false; - this.dgvChanceProduct.AllowUserToDeleteRows = false; - 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))))); - 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, - this.colChanceId, - this.colImgUrl, - this.colImg, - this.colGoodsName, - this.colHotValue, - this.colCate, - this.colPrice, - this.colDel, - this.colMsg}); - this.dgvChanceProduct.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvChanceProduct.Location = new System.Drawing.Point(0, 0); - this.dgvChanceProduct.MultiSelectCheckBox = true; - this.dgvChanceProduct.Name = "dgvChanceProduct"; - this.dgvChanceProduct.ReadOnly = true; - this.dgvChanceProduct.RowTemplate.Height = 23; - this.dgvChanceProduct.Size = new System.Drawing.Size(1042, 462); - this.dgvChanceProduct.TabIndex = 6; - this.dgvChanceProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvChanceProduct_CellContentClick); - // - // colCheck - // - this.colCheck.FillWeight = 26F; - this.colCheck.HeaderText = "选"; - this.colCheck.Name = "colCheck"; - this.colCheck.ReadOnly = true; - this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // colChanceId - // - this.colChanceId.FillWeight = 50F; - this.colChanceId.HeaderText = "机会Id"; - this.colChanceId.Name = "colChanceId"; - this.colChanceId.ReadOnly = true; - // - // colImgUrl - // - this.colImgUrl.FillWeight = 300F; - this.colImgUrl.HeaderText = "图片路径"; - this.colImgUrl.Name = "colImgUrl"; - this.colImgUrl.ReadOnly = true; - this.colImgUrl.Visible = false; - // - // colImg - // - this.colImg.FillWeight = 40F; - this.colImg.HeaderText = "图片"; - this.colImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colImg.Name = "colImg"; - this.colImg.ReadOnly = true; - this.colImg.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // colGoodsName - // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle5; - this.colGoodsName.FillWeight = 120F; - this.colGoodsName.HeaderText = "商品名称"; - this.colGoodsName.Name = "colGoodsName"; - this.colGoodsName.ReadOnly = true; - // - // colHotValue - // - this.colHotValue.FillWeight = 60F; - this.colHotValue.HeaderText = "热度"; - this.colHotValue.Name = "colHotValue"; - this.colHotValue.ReadOnly = true; - // - // colCate - // - this.colCate.HeaderText = "类目"; - this.colCate.Name = "colCate"; - this.colCate.ReadOnly = true; - // - // colPrice - // - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colPrice.DefaultCellStyle = dataGridViewCellStyle6; - this.colPrice.FillWeight = 70F; - this.colPrice.HeaderText = "价格"; - this.colPrice.Name = "colPrice"; - this.colPrice.ReadOnly = true; - // - // colDel - // - this.colDel.FillWeight = 35F; - this.colDel.HeaderText = "删除"; - this.colDel.Name = "colDel"; - this.colDel.ReadOnly = true; - // - // colMsg - // - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colMsg.DefaultCellStyle = dataGridViewCellStyle7; - this.colMsg.FillWeight = 200F; - this.colMsg.HeaderText = "操作结果"; - this.colMsg.Name = "colMsg"; - this.colMsg.ReadOnly = true; - // - // chk - // - this.chk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.chk.AutoSize = true; - this.chk.Checked = true; - this.chk.CheckState = System.Windows.Forms.CheckState.Checked; - this.chk.Location = new System.Drawing.Point(1277, 3); - this.chk.Name = "chk"; - this.chk.Size = new System.Drawing.Size(63, 21); - this.chk.TabIndex = 671; - this.chk.Text = "多选框"; - this.chk.UseVisualStyleBackColor = true; - this.chk.Visible = false; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Left; - 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(296, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(743, 25); - this.statusBar.TabIndex = 5; - // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; - this.ucSplitPage1.IsShowPageSize = false; - this.ucSplitPage1.Location = new System.Drawing.Point(0, 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 = 50; - this.ucSplitPage1.Size = new System.Drawing.Size(296, 25); - this.ucSplitPage1.TabIndex = 6; - this.ucSplitPage1.TotalPage = 1; - this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); - // // colSelect // this.colSelect.HeaderText = "全选"; @@ -999,10 +868,218 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colMessage.Name = "colMessage"; this.colMessage.ReadOnly = true; // + // 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(536, 206); + this.pbLoading.Name = "pbLoading"; + this.pbLoading.Size = new System.Drawing.Size(50, 50); + this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading.TabIndex = 7; + this.pbLoading.TabStop = false; + this.pbLoading.Visible = false; + // + // panel2 + // + this.panel2.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.panel2.Location = new System.Drawing.Point(409, 355); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(690, 87); + this.panel2.TabIndex = 8; + // + // dgvChanceProduct + // + this.dgvChanceProduct.AllowUserToAddRows = false; + this.dgvChanceProduct.AllowUserToDeleteRows = false; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvChanceProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17; + 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))))); + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvChanceProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18; + this.dgvChanceProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvChanceProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colCheck, + this.colChanceId, + this.colImgUrl, + this.colImg, + this.colGoodsName, + this.colHotValue, + this.colCate, + this.colPrice, + this.colDel, + this.colMsg}); + this.dgvChanceProduct.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvChanceProduct.Location = new System.Drawing.Point(0, 0); + this.dgvChanceProduct.MultiSelectCheckBox = true; + this.dgvChanceProduct.Name = "dgvChanceProduct"; + this.dgvChanceProduct.ReadOnly = true; + this.dgvChanceProduct.RowTemplate.Height = 23; + this.dgvChanceProduct.Size = new System.Drawing.Size(1122, 462); + this.dgvChanceProduct.TabIndex = 6; + this.dgvChanceProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvChanceProduct_CellContentClick); + // + // colCheck + // + this.colCheck.FillWeight = 26F; + this.colCheck.HeaderText = "选"; + this.colCheck.Name = "colCheck"; + this.colCheck.ReadOnly = true; + this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colChanceId + // + this.colChanceId.FillWeight = 50F; + this.colChanceId.HeaderText = "机会Id"; + this.colChanceId.Name = "colChanceId"; + this.colChanceId.ReadOnly = true; + // + // colImgUrl + // + this.colImgUrl.FillWeight = 300F; + this.colImgUrl.HeaderText = "图片路径"; + this.colImgUrl.Name = "colImgUrl"; + this.colImgUrl.ReadOnly = true; + this.colImgUrl.Visible = false; + // + // colImg + // + this.colImg.FillWeight = 40F; + this.colImg.HeaderText = "图片"; + this.colImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colImg.Name = "colImg"; + this.colImg.ReadOnly = true; + this.colImg.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colGoodsName + // + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle19; + this.colGoodsName.FillWeight = 120F; + this.colGoodsName.HeaderText = "商品名称"; + this.colGoodsName.Name = "colGoodsName"; + this.colGoodsName.ReadOnly = true; + // + // colHotValue + // + this.colHotValue.FillWeight = 60F; + this.colHotValue.HeaderText = "热度"; + this.colHotValue.Name = "colHotValue"; + this.colHotValue.ReadOnly = true; + // + // colCate + // + this.colCate.HeaderText = "类目"; + this.colCate.Name = "colCate"; + this.colCate.ReadOnly = true; + // + // colPrice + // + dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colPrice.DefaultCellStyle = dataGridViewCellStyle20; + this.colPrice.FillWeight = 70F; + this.colPrice.HeaderText = "价格"; + this.colPrice.Name = "colPrice"; + this.colPrice.ReadOnly = true; + // + // colDel + // + this.colDel.FillWeight = 35F; + this.colDel.HeaderText = "删除"; + this.colDel.Name = "colDel"; + this.colDel.ReadOnly = true; + // + // colMsg + // + dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMsg.DefaultCellStyle = dataGridViewCellStyle21; + this.colMsg.FillWeight = 200F; + this.colMsg.HeaderText = "操作结果"; + this.colMsg.Name = "colMsg"; + this.colMsg.ReadOnly = true; + // + // chk + // + this.chk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chk.AutoSize = true; + this.chk.Checked = true; + this.chk.CheckState = System.Windows.Forms.CheckState.Checked; + this.chk.Location = new System.Drawing.Point(1357, 3); + this.chk.Name = "chk"; + this.chk.Size = new System.Drawing.Size(63, 21); + this.chk.TabIndex = 671; + this.chk.Text = "多选框"; + this.chk.UseVisualStyleBackColor = true; + this.chk.Visible = false; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Left; + 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(296, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(743, 25); + this.statusBar.TabIndex = 5; + // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; + this.ucSplitPage1.IsShowPageSize = false; + this.ucSplitPage1.Location = new System.Drawing.Point(0, 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 = 50; + this.ucSplitPage1.Size = new System.Drawing.Size(296, 25); + this.ucSplitPage1.TabIndex = 6; + this.ucSplitPage1.TotalPage = 1; + this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); + // + // btnSelectNotGetDetail + // + this.btnSelectNotGetDetail.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnSelectNotGetDetail.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSelectNotGetDetail.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSelectNotGetDetail.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSelectNotGetDetail.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSelectNotGetDetail.Location = new System.Drawing.Point(1125, 30); + this.btnSelectNotGetDetail.Name = "btnSelectNotGetDetail"; + this.btnSelectNotGetDetail.Size = new System.Drawing.Size(153, 25); + this.btnSelectNotGetDetail.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSelectNotGetDetail.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSelectNotGetDetail.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSelectNotGetDetail.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSelectNotGetDetail.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSelectNotGetDetail.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSelectNotGetDetail.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSelectNotGetDetail.Style.GradientAngle = 90; + this.btnSelectNotGetDetail.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSelectNotGetDetail.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSelectNotGetDetail.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSelectNotGetDetail.TabIndex = 790; + this.btnSelectNotGetDetail.Text = "一键勾选未采集详情商品"; + this.btnSelectNotGetDetail.Click += new System.EventHandler(this.btnSelectNotGetDetail_Click); + // // PDDGetChanceProdForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1344, 635); + this.ClientSize = new System.Drawing.Size(1424, 635); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.KeyPreview = true; @@ -1100,5 +1177,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus; private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; + private DevComponents.DotNetBar.PanelEx btnFilter; + private System.Windows.Forms.TextBox txtFilter; + private System.Windows.Forms.ComboBox cmbFilterType; + private DevComponents.DotNetBar.PanelEx btnSelectNotGetDetail; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs index 8a0ba8a..8c30d98 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs @@ -1023,6 +1023,45 @@ namespace TemuKJD.PDDForms.ProductSelectForms NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_chance_product_list_" + MainForm.ProcessCount, lstChanceProductResult); } } + + private void btnFilter_Click(object sender, EventArgs e) + { + var filters = txtFilter.Text.Trim().Split(new string[] { ",", "，", " ", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries); + + // 含敏感词商品 + List filterChanceProdLst = null; + if (cmbFilterType.Text.Trim() == "过滤标题") + filterChanceProdLst = lstChanceProductResult.Where(p => filters + .Any(f => (p?.dbProduct?.product_name).ParseToString().Contains(f) || (p?.keywords).ParseToString().Contains(f))).ToList(); + else + filterChanceProdLst = lstChanceProductResult.Where(p => filters.Any(f => JsonHelper.SerializeObject(p).Contains(f))).ToList(); + + foreach (var chanceProd in filterChanceProdLst) + { + var row = dgvChanceProduct.Rows.Cast().ToList().FirstOrDefault(r => r.Cells["colChanceId"].Value.ParseToString() == chanceProd.chance_id); + lstChanceProductResult.Remove(chanceProd); + dgvChanceProduct.Rows.Remove(row); + } + NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_chance_product_list_" + MainForm.ProcessCount, lstChanceProductResult); + } + + private void btnSelectNotGetDetail_Click(object sender, EventArgs e) + { + foreach (DataGridViewRow row in dgvChanceProduct.Rows) + { + var chanceId = row.Cells["colChanceId"].Value.ParseToString(); + var chanceProd = lstChanceProductResult.FirstOrDefault(p => p.chance_id == chanceId); + + if (chanceProd != null && chanceProd.dbProduct != null) + { + row.Cells["colCheck"].Value = false; + } + else + { + row.Cells["colCheck"].Value = true; + } + } + } } public class ChanceProductConfig diff --git a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs index 6e2534c..6d3e76e 100644 --- a/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs +++ b/TEMUKJD/WXForms/TalkForms/BuyerOrderListForm.cs @@ -173,21 +173,55 @@ namespace TemuKJD.WXForms.TalkForms } if (url.StartsWith("https://mobile.yangkeduo.com/orders.html?type=3")) { - + Task.Run(() => + { + var data = responseData; + if (data.Contains("display_amount")) + { + var jsonData = BaseRegex.GetJsonObjStrJson(ref data, "ordersStore")?.FirstOrDefault(); + var nickName = BaseRegex.GetStringJson(ref data, "nickName"); + var buyerId = GlobalConfig.BuyerLoginList.FirstOrDefault(b => b.buyer_nick == nickName)?.buyer_id; + if (!string.IsNullOrEmpty(jsonData) && !string.IsNullOrEmpty(nickName) && !string.IsNullOrEmpty(buyerId)) + { + var ordersStr = BaseRegex.GetJsonObjStrJson(ref jsonData, "initOdersList")?.FirstOrDefault(); + if (ordersStr != null && ordersStr.StartsWith("{\"3\":")) + { + ordersStr = "{\"orders\":" + ordersStr.Substring(5); + CefReadBuyerOrder(buyerId, ordersStr); + } + } + } + }); } if (url.StartsWith("https://mobile.yangkeduo.com/orders.html?type=2")) { - + Task.Run(() => + { + var data = responseData; + if (data.Contains("display_amount")) + { + var jsonData = BaseRegex.GetJsonObjStrJson(ref data, "ordersStore")?.FirstOrDefault(); + var nickName = BaseRegex.GetStringJson(ref data, "nickName"); + var buyerId = GlobalConfig.BuyerLoginList.FirstOrDefault(b => b.buyer_nick == nickName)?.buyer_id; + if (!string.IsNullOrEmpty(jsonData) && !string.IsNullOrEmpty(nickName) && !string.IsNullOrEmpty(buyerId)) + { + var ordersStr = BaseRegex.GetJsonObjStrJson(ref jsonData, "initOdersList")?.FirstOrDefault(); + if (ordersStr != null && ordersStr.StartsWith("{\"2\":")) + { + ordersStr = "{\"orders\":" + ordersStr.Substring(5); + CefReadBuyerOrder(buyerId, ordersStr); + } + } + } + }); } if (url.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/aristotle/order_list_v3")) { - Task.Run(() => + Task.Run(() => { CefReadBuyerOrder(url, responseData); }); } - //if (url.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/caterham/v3/query/my_order_group") && !string.IsNullOrEmpty(currentReadBuyer)) - // currentReadBuyer = ""; } string currentReadBuyer = ""; @@ -417,7 +451,7 @@ namespace TemuKJD.WXForms.TalkForms Thread.Sleep(1000); Invoke(new Action(() => { - btnSearch.Text = "暂停自动刷新"; + btnSearch.Text = "自动刷新暂停中"; })); continue; } @@ -473,6 +507,9 @@ namespace TemuKJD.WXForms.TalkForms var cookieLst = JsonHelper.DeserializeJsonToList(buyer?.cookie); var t = CEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), cefWebBrowser.GetCookieManager(null)); + cefWebBrowser.Load("https://mobile.yangkeduo.com/personal.html"); + Thread.Sleep(Randomx.GetId(2000, 3000)); + string readBuyer = buyer.buyer_id; currentReadBuyer = buyer.buyer_id; cefWebBrowser.Load("https://mobile.yangkeduo.com/orders.html?type=2"); diff --git a/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs b/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs index e200549..7fd63bd 100644 --- a/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs +++ b/TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs @@ -86,6 +86,7 @@ namespace TemuKJD.WXForms.TalkForms this.btnPrev = new DevComponents.DotNetBar.PanelEx(); this.txtAddress = new System.Windows.Forms.TextBox(); this.pnlTalk = new System.Windows.Forms.Panel(); + this.lblAutoReplyStatus = new System.Windows.Forms.Label(); this.chkShowAutoReplyNum = new System.Windows.Forms.CheckBox(); this.chkShowShopStatistics = new System.Windows.Forms.CheckBox(); this.chkIsAutoReLogin = new System.Windows.Forms.CheckBox(); @@ -102,7 +103,6 @@ namespace TemuKJD.WXForms.TalkForms this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewLinkColumn2 = new System.Windows.Forms.DataGridViewLinkColumn(); - this.lblAutoReplyStatus = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pbLogo)).BeginInit(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -136,7 +136,7 @@ namespace TemuKJD.WXForms.TalkForms // lblVersionName // this.lblVersionName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblVersionName.Location = new System.Drawing.Point(31695, 33); + this.lblVersionName.Location = new System.Drawing.Point(32229, 33); // // panel3 // @@ -962,6 +962,17 @@ namespace TemuKJD.WXForms.TalkForms this.pnlTalk.Size = new System.Drawing.Size(985, 544); this.pnlTalk.TabIndex = 1; // + // lblAutoReplyStatus + // + this.lblAutoReplyStatus.AutoSize = true; + this.lblAutoReplyStatus.Dock = System.Windows.Forms.DockStyle.Bottom; + this.lblAutoReplyStatus.Location = new System.Drawing.Point(0, 527); + this.lblAutoReplyStatus.Name = "lblAutoReplyStatus"; + this.lblAutoReplyStatus.Size = new System.Drawing.Size(43, 17); + this.lblAutoReplyStatus.TabIndex = 207; + this.lblAutoReplyStatus.Text = "label5"; + this.lblAutoReplyStatus.Visible = false; + // // chkShowAutoReplyNum // this.chkShowAutoReplyNum.AutoSize = true; @@ -1112,17 +1123,6 @@ namespace TemuKJD.WXForms.TalkForms this.dataGridViewLinkColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; this.dataGridViewLinkColumn2.Width = 106; // - // label5 - // - this.lblAutoReplyStatus.AutoSize = true; - this.lblAutoReplyStatus.Dock = System.Windows.Forms.DockStyle.Bottom; - this.lblAutoReplyStatus.Location = new System.Drawing.Point(0, 527); - this.lblAutoReplyStatus.Name = "label5"; - this.lblAutoReplyStatus.Size = new System.Drawing.Size(43, 17); - this.lblAutoReplyStatus.TabIndex = 207; - this.lblAutoReplyStatus.Text = "label5"; - this.lblAutoReplyStatus.Visible = false; - // // WxTalkForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;