diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index d3369eb..f04c87e 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -1549,7 +1549,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms foreach (var img in mainImgLst3) { // 盗链识别 - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); var upDateRst = ""; @@ -1589,7 +1589,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms //break; } - urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; diff --git a/TEMUKJD/UserForm/LoginForm.cs b/TEMUKJD/UserForm/LoginForm.cs index 7c136f6..fc63834 100644 --- a/TEMUKJD/UserForm/LoginForm.cs +++ b/TEMUKJD/UserForm/LoginForm.cs @@ -161,7 +161,9 @@ namespace TemuKJD.UserForm private void loginPanel_Click(object sender, EventArgs e) { if (rbtDev.Checked) + { BaseClass.LoginApiUrl = "http://localhost:9000"; + } else BaseClass.LoginApiUrl = BaseClass.ServerUrl; //"http://localhost:8000/user/user_login" diff --git a/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs b/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs index 9d83716..e030915 100644 --- a/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs +++ b/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs @@ -187,7 +187,7 @@ namespace TemuKJD.WXForms.AiTalkForms currentShop = GlobalConfig.ValidShopLoginList.FirstOrDefault(); Invoke(new Action(() => { - lblCurrentShop.Text = "当前店铺：" + currentShop.ShopAccount; + lblCurrentShop.Text = "当前店铺：" + currentShop?.ShopAccount; })); SetMainBrowserUrl(currentShop); LoadShop(); @@ -424,7 +424,8 @@ namespace TemuKJD.WXForms.AiTalkForms { if (aiTalkWebBrowser == null) { - aiTalkWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", true); + //aiTalkWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", true); + aiTalkWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false); CustomResourceRequestHandler resourceRequestHandler = new CustomResourceRequestHandler(); var handler = resourceRequestHandler; handler.ResourceLoadCompleteEvent += AiRequestHandler_ResourceLoadComplete; diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs index 96c795a..8b9eabb 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs @@ -144,13 +144,13 @@ namespace TemuKJD.WXForms.ProductForms this.label37 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.cmbUpdateInDays = new System.Windows.Forms.ComboBox(); + this.txtUpdateInDays = new System.Windows.Forms.TextBox(); + this.chkUpdateInDays = new TemuKJD.UserComponent.UcCheckBox(this.components); this.numFilterViewUv = new System.Windows.Forms.NumericUpDown(); this.cmbNotes = new System.Windows.Forms.ComboBox(); this.cmbJstInitSet = new System.Windows.Forms.ComboBox(); - this.pbSelectProd = new System.Windows.Forms.PictureBox(); - this.chkSevenDays = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkSkipQualification = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.lblGoodsCount = new System.Windows.Forms.Label(); this.txtRandomFissionProductCount = new System.Windows.Forms.TextBox(); this.lblJstInitSet = new System.Windows.Forms.Label(); this.btnSwitchCatType = new DevComponents.DotNetBar.PanelEx(); @@ -178,10 +178,13 @@ namespace TemuKJD.WXForms.ProductForms this.lblHot = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label(); this.chkRandomFissionProduct = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.lblWaitToUp = new System.Windows.Forms.Label(); this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components); this.lblNotes = new System.Windows.Forms.Label(); this.chkFilterViewUv = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.lblUpdateInDays = new System.Windows.Forms.Label(); + this.pbSelectProd = new System.Windows.Forms.PictureBox(); + this.lblGoodsCount = new System.Windows.Forms.Label(); + this.lblWaitToUp = 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(); @@ -204,6 +207,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtExtCodeFilter = new System.Windows.Forms.TextBox(); this.pbLoadingShop = new System.Windows.Forms.PictureBox(); this.lblExtCodeFilter = new System.Windows.Forms.Label(); + this.chkSevenDays = new TemuKJD.UserComponent.UcCheckBox(this.components); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -252,8 +256,6 @@ namespace TemuKJD.WXForms.ProductForms this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.chkUpdateInDays = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.txtUpdateInDays = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -307,7 +309,7 @@ namespace TemuKJD.WXForms.ProductForms // this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); this.splitContainer1.Size = new System.Drawing.Size(1710, 641); - this.splitContainer1.SplitterDistance = 165; + this.splitContainer1.SplitterDistance = 175; this.splitContainer1.TabIndex = 11; // // ucGroupBoxEx2 @@ -345,7 +347,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx2.Controls.Add(this.label15); this.ucGroupBoxEx2.Location = new System.Drawing.Point(608, 2); this.ucGroupBoxEx2.Name = "ucGroupBoxEx2"; - this.ucGroupBoxEx2.Size = new System.Drawing.Size(1100, 165); + this.ucGroupBoxEx2.Size = new System.Drawing.Size(1100, 175); this.ucGroupBoxEx2.TabIndex = 667; this.ucGroupBoxEx2.TabStop = false; this.ucGroupBoxEx2.Text = "商品上传"; @@ -424,7 +426,7 @@ namespace TemuKJD.WXForms.ProductForms // txtStockNum // this.txtStockNum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtStockNum.Location = new System.Drawing.Point(378, 135); + this.txtStockNum.Location = new System.Drawing.Point(378, 145); this.txtStockNum.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtStockNum.Name = "txtStockNum"; this.txtStockNum.Size = new System.Drawing.Size(30, 23); @@ -435,7 +437,7 @@ namespace TemuKJD.WXForms.ProductForms // txtShippingPriceTimes // this.txtShippingPriceTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtShippingPriceTimes.Location = new System.Drawing.Point(319, 135); + this.txtShippingPriceTimes.Location = new System.Drawing.Point(319, 145); this.txtShippingPriceTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtShippingPriceTimes.Name = "txtShippingPriceTimes"; this.txtShippingPriceTimes.Size = new System.Drawing.Size(28, 23); @@ -445,7 +447,7 @@ namespace TemuKJD.WXForms.ProductForms // txtAddTimes // this.txtAddTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtAddTimes.Location = new System.Drawing.Point(76, 135); + this.txtAddTimes.Location = new System.Drawing.Point(76, 145); this.txtAddTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddTimes.Name = "txtAddTimes"; this.txtAddTimes.Size = new System.Drawing.Size(28, 23); @@ -456,7 +458,7 @@ namespace TemuKJD.WXForms.ProductForms // txtAddMorePrice // this.txtAddMorePrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtAddMorePrice.Location = new System.Drawing.Point(144, 135); + this.txtAddMorePrice.Location = new System.Drawing.Point(144, 145); this.txtAddMorePrice.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddMorePrice.Name = "txtAddMorePrice"; this.txtAddMorePrice.Size = new System.Drawing.Size(28, 23); @@ -468,7 +470,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(282, 138); + this.label13.Location = new System.Drawing.Point(282, 148); this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(41, 17); @@ -519,7 +521,7 @@ namespace TemuKJD.WXForms.ProductForms // this.chkAddMorePriceFirst.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.chkAddMorePriceFirst.AutoSize = true; - this.chkAddMorePriceFirst.Location = new System.Drawing.Point(190, 136); + this.chkAddMorePriceFirst.Location = new System.Drawing.Point(190, 146); this.chkAddMorePriceFirst.Name = "chkAddMorePriceFirst"; this.chkAddMorePriceFirst.Size = new System.Drawing.Size(99, 21); this.chkAddMorePriceFirst.TabIndex = 625; @@ -558,7 +560,7 @@ namespace TemuKJD.WXForms.ProductForms this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label14.AutoSize = true; this.label14.ForeColor = System.Drawing.SystemColors.GrayText; - this.label14.Location = new System.Drawing.Point(8, 81); + this.label14.Location = new System.Drawing.Point(8, 91); this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(68, 51); @@ -573,7 +575,7 @@ namespace TemuKJD.WXForms.ProductForms this.pnlStep.Controls.Add(this.panel3); this.pnlStep.Location = new System.Drawing.Point(76, 17); this.pnlStep.Name = "pnlStep"; - this.pnlStep.Size = new System.Drawing.Size(332, 114); + this.pnlStep.Size = new System.Drawing.Size(332, 124); this.pnlStep.TabIndex = 577; // // panel3 @@ -586,7 +588,7 @@ namespace TemuKJD.WXForms.ProductForms this.panel3.Controls.Add(this.fPnlPriceRule); this.panel3.Location = new System.Drawing.Point(1, 1); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(330, 112); + this.panel3.Size = new System.Drawing.Size(330, 122); this.panel3.TabIndex = 541; // // fPnlPriceRule @@ -692,7 +694,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(103, 138); + this.label10.Location = new System.Drawing.Point(103, 148); this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(44, 17); @@ -728,7 +730,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(348, 138); + this.label4.Location = new System.Drawing.Point(348, 148); this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(32, 17); @@ -739,7 +741,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(8, 138); + this.label9.Location = new System.Drawing.Point(8, 148); this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(68, 17); @@ -773,7 +775,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucTabControlMetro1.Name = "ucTabControlMetro1"; this.ucTabControlMetro1.SelectedIndex = 0; this.ucTabControlMetro1.ShowCloseButton = false; - this.ucTabControlMetro1.Size = new System.Drawing.Size(619, 150); + this.ucTabControlMetro1.Size = new System.Drawing.Size(619, 160); this.ucTabControlMetro1.TabIndex = 822; this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray; @@ -817,7 +819,7 @@ namespace TemuKJD.WXForms.ProductForms this.上传参数1.Location = new System.Drawing.Point(4, 28); this.上传参数1.Name = "上传参数1"; this.上传参数1.Padding = new System.Windows.Forms.Padding(3); - this.上传参数1.Size = new System.Drawing.Size(611, 118); + this.上传参数1.Size = new System.Drawing.Size(611, 128); this.上传参数1.TabIndex = 1; this.上传参数1.Text = "上传参数"; this.上传参数1.UseVisualStyleBackColor = true; @@ -1203,7 +1205,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(611, 118); + this.特殊参数.Size = new System.Drawing.Size(611, 128); this.特殊参数.TabIndex = 4; this.特殊参数.Text = "特殊参数"; this.特殊参数.UseVisualStyleBackColor = true; @@ -1212,7 +1214,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblSpBrand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblSpBrand.AutoSize = true; - this.lblSpBrand.Location = new System.Drawing.Point(7, 15); + this.lblSpBrand.Location = new System.Drawing.Point(7, 25); this.lblSpBrand.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblSpBrand.Name = "lblSpBrand"; this.lblSpBrand.Size = new System.Drawing.Size(56, 17); @@ -1244,7 +1246,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(611, 118); + this.佣金上货.Size = new System.Drawing.Size(611, 128); this.佣金上货.TabIndex = 2; this.佣金上货.Text = "佣金上货"; this.佣金上货.UseVisualStyleBackColor = true; @@ -1412,7 +1414,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(611, 118); + this.裂变调试.Size = new System.Drawing.Size(611, 128); this.裂变调试.TabIndex = 3; this.裂变调试.Text = "裂变调试"; this.裂变调试.UseVisualStyleBackColor = true; @@ -1426,7 +1428,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtFissionTitle.Multiline = true; this.txtFissionTitle.Name = "txtFissionTitle"; this.txtFissionTitle.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtFissionTitle.Size = new System.Drawing.Size(524, 79); + this.txtFissionTitle.Size = new System.Drawing.Size(524, 89); this.txtFissionTitle.TabIndex = 0; this.txtFissionTitle.TextChanged += new System.EventHandler(this.txtFissionTitle_TextChanged); // @@ -1444,7 +1446,7 @@ namespace TemuKJD.WXForms.ProductForms // 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.Location = new System.Drawing.Point(259, 103); 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); @@ -1454,7 +1456,7 @@ namespace TemuKJD.WXForms.ProductForms // 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.Location = new System.Drawing.Point(513, 100); 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); @@ -1466,7 +1468,7 @@ namespace TemuKJD.WXForms.ProductForms this.chkFissionRandomPriceChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.chkFissionRandomPriceChange.Checked = true; this.chkFissionRandomPriceChange.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkFissionRandomPriceChange.Location = new System.Drawing.Point(446, 91); + this.chkFissionRandomPriceChange.Location = new System.Drawing.Point(446, 101); this.chkFissionRandomPriceChange.Name = "chkFissionRandomPriceChange"; this.chkFissionRandomPriceChange.Size = new System.Drawing.Size(75, 21); this.chkFissionRandomPriceChange.TabIndex = 905; @@ -1476,7 +1478,7 @@ namespace TemuKJD.WXForms.ProductForms // txtDetailBorderImgCount // this.txtDetailBorderImgCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtDetailBorderImgCount.Location = new System.Drawing.Point(212, 90); + this.txtDetailBorderImgCount.Location = new System.Drawing.Point(212, 100); this.txtDetailBorderImgCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtDetailBorderImgCount.Name = "txtDetailBorderImgCount"; this.txtDetailBorderImgCount.Size = new System.Drawing.Size(24, 23); @@ -1487,7 +1489,7 @@ namespace TemuKJD.WXForms.ProductForms // 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.Location = new System.Drawing.Point(171, 103); 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); @@ -1498,7 +1500,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label36.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(235, 93); + this.label36.Location = new System.Drawing.Point(235, 103); this.label36.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label36.Name = "label36"; this.label36.Size = new System.Drawing.Size(20, 17); @@ -1508,7 +1510,7 @@ namespace TemuKJD.WXForms.ProductForms // txtMainBorderImgCount // this.txtMainBorderImgCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtMainBorderImgCount.Location = new System.Drawing.Point(130, 90); + this.txtMainBorderImgCount.Location = new System.Drawing.Point(130, 100); this.txtMainBorderImgCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtMainBorderImgCount.Name = "txtMainBorderImgCount"; this.txtMainBorderImgCount.Size = new System.Drawing.Size(24, 23); @@ -1519,7 +1521,7 @@ namespace TemuKJD.WXForms.ProductForms // 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.Location = new System.Drawing.Point(101, 103); 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); @@ -1530,7 +1532,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label33.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(153, 93); + this.label33.Location = new System.Drawing.Point(153, 103); this.label33.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(20, 17); @@ -1541,7 +1543,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label32.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(577, 57); + this.label32.Location = new System.Drawing.Point(577, 67); this.label32.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(20, 17); @@ -1552,7 +1554,7 @@ namespace TemuKJD.WXForms.ProductForms // txtAiImgCount // this.txtAiImgCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.txtAiImgCount.Location = new System.Drawing.Point(552, 54); + this.txtAiImgCount.Location = new System.Drawing.Point(552, 64); this.txtAiImgCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAiImgCount.Name = "txtAiImgCount"; this.txtAiImgCount.Size = new System.Drawing.Size(24, 23); @@ -1564,7 +1566,7 @@ namespace TemuKJD.WXForms.ProductForms // this.chkAiImage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.chkAiImage.AutoSize = true; - this.chkAiImage.Location = new System.Drawing.Point(483, 55); + this.chkAiImage.Location = new System.Drawing.Point(483, 65); this.chkAiImage.Name = "chkAiImage"; this.chkAiImage.Size = new System.Drawing.Size(74, 21); this.chkAiImage.TabIndex = 892; @@ -1575,7 +1577,7 @@ namespace TemuKJD.WXForms.ProductForms // chkRandomDetailImgOrder // this.chkRandomDetailImgOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.chkRandomDetailImgOrder.Location = new System.Drawing.Point(383, 91); + this.chkRandomDetailImgOrder.Location = new System.Drawing.Point(383, 101); this.chkRandomDetailImgOrder.Name = "chkRandomDetailImgOrder"; this.chkRandomDetailImgOrder.Size = new System.Drawing.Size(54, 21); this.chkRandomDetailImgOrder.TabIndex = 896; @@ -1585,7 +1587,7 @@ namespace TemuKJD.WXForms.ProductForms // chkRandomMainImgOrder // this.chkRandomMainImgOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.chkRandomMainImgOrder.Location = new System.Drawing.Point(339, 91); + this.chkRandomMainImgOrder.Location = new System.Drawing.Point(339, 101); this.chkRandomMainImgOrder.Name = "chkRandomMainImgOrder"; this.chkRandomMainImgOrder.Size = new System.Drawing.Size(42, 21); this.chkRandomMainImgOrder.TabIndex = 895; @@ -1617,7 +1619,7 @@ namespace TemuKJD.WXForms.ProductForms this.chkRandomImgBorder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.chkRandomImgBorder.Checked = true; this.chkRandomImgBorder.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkRandomImgBorder.Location = new System.Drawing.Point(10, 91); + this.chkRandomImgBorder.Location = new System.Drawing.Point(10, 101); this.chkRandomImgBorder.Name = "chkRandomImgBorder"; this.chkRandomImgBorder.Size = new System.Drawing.Size(94, 21); this.chkRandomImgBorder.TabIndex = 890; @@ -1638,7 +1640,7 @@ namespace TemuKJD.WXForms.ProductForms // 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.Location = new System.Drawing.Point(536, 103); 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); @@ -1649,7 +1651,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(171, 138); + this.label15.Location = new System.Drawing.Point(171, 148); this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(20, 17); @@ -1663,13 +1665,12 @@ 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.txtUpdateInDays); + this.ucGroupBoxEx4.Controls.Add(this.cmbUpdateInDays); this.ucGroupBoxEx4.Controls.Add(this.chkUpdateInDays); this.ucGroupBoxEx4.Controls.Add(this.numFilterViewUv); this.ucGroupBoxEx4.Controls.Add(this.cmbNotes); this.ucGroupBoxEx4.Controls.Add(this.cmbJstInitSet); - this.ucGroupBoxEx4.Controls.Add(this.pbSelectProd); this.ucGroupBoxEx4.Controls.Add(this.chkSkipQualification); - this.ucGroupBoxEx4.Controls.Add(this.lblGoodsCount); this.ucGroupBoxEx4.Controls.Add(this.txtRandomFissionProductCount); this.ucGroupBoxEx4.Controls.Add(this.lblJstInitSet); this.ucGroupBoxEx4.Controls.Add(this.btnSwitchCatType); @@ -1697,17 +1698,54 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.Controls.Add(this.lblHot); this.ucGroupBoxEx4.Controls.Add(this.label19); this.ucGroupBoxEx4.Controls.Add(this.chkRandomFissionProduct); - this.ucGroupBoxEx4.Controls.Add(this.lblWaitToUp); this.ucGroupBoxEx4.Controls.Add(this.chkWXComplateProd); this.ucGroupBoxEx4.Controls.Add(this.lblNotes); this.ucGroupBoxEx4.Controls.Add(this.chkFilterViewUv); + this.ucGroupBoxEx4.Controls.Add(this.lblUpdateInDays); + this.ucGroupBoxEx4.Controls.Add(this.pbSelectProd); + this.ucGroupBoxEx4.Controls.Add(this.lblGoodsCount); + this.ucGroupBoxEx4.Controls.Add(this.lblWaitToUp); this.ucGroupBoxEx4.Location = new System.Drawing.Point(186, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; - this.ucGroupBoxEx4.Size = new System.Drawing.Size(423, 165); + this.ucGroupBoxEx4.Size = new System.Drawing.Size(423, 175); this.ucGroupBoxEx4.TabIndex = 666; this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "待传商品"; // + // cmbUpdateInDays + // + this.cmbUpdateInDays.FormattingEnabled = true; + this.cmbUpdateInDays.Items.AddRange(new object[] { + "新增", + "更新"}); + this.cmbUpdateInDays.Location = new System.Drawing.Point(55, 127); + this.cmbUpdateInDays.Name = "cmbUpdateInDays"; + this.cmbUpdateInDays.Size = new System.Drawing.Size(47, 25); + this.cmbUpdateInDays.TabIndex = 970; + this.cmbUpdateInDays.Text = "新增"; + this.cmbUpdateInDays.Visible = false; + // + // txtUpdateInDays + // + this.txtUpdateInDays.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtUpdateInDays.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtUpdateInDays.Location = new System.Drawing.Point(20, 127); + this.txtUpdateInDays.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtUpdateInDays.Name = "txtUpdateInDays"; + this.txtUpdateInDays.Size = new System.Drawing.Size(21, 25); + this.txtUpdateInDays.TabIndex = 912; + this.txtUpdateInDays.Text = "30"; + this.txtUpdateInDays.Visible = false; + // + // chkUpdateInDays + // + this.chkUpdateInDays.Location = new System.Drawing.Point(5, 131); + this.chkUpdateInDays.Name = "chkUpdateInDays"; + this.chkUpdateInDays.Size = new System.Drawing.Size(17, 17); + this.chkUpdateInDays.TabIndex = 950; + this.chkUpdateInDays.UseVisualStyleBackColor = true; + this.chkUpdateInDays.Visible = false; + // // numFilterViewUv // this.numFilterViewUv.Font = new System.Drawing.Font("微软雅黑", 10F); @@ -1748,60 +1786,24 @@ namespace TemuKJD.WXForms.ProductForms "", "是", "否"}); - this.cmbJstInitSet.Location = new System.Drawing.Point(242, 132); + this.cmbJstInitSet.Location = new System.Drawing.Point(246, 140); this.cmbJstInitSet.Name = "cmbJstInitSet"; this.cmbJstInitSet.Size = new System.Drawing.Size(33, 25); this.cmbJstInitSet.TabIndex = 697; this.cmbJstInitSet.Text = "是"; this.cmbJstInitSet.Visible = false; // - // pbSelectProd - // - this.pbSelectProd.BackColor = System.Drawing.Color.Transparent; - this.pbSelectProd.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbSelectProd.Location = new System.Drawing.Point(89, 134); - this.pbSelectProd.Name = "pbSelectProd"; - this.pbSelectProd.Size = new System.Drawing.Size(21, 21); - this.pbSelectProd.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pbSelectProd.TabIndex = 781; - this.pbSelectProd.TabStop = false; - this.pbSelectProd.Visible = false; - this.pbSelectProd.Click += new System.EventHandler(this.pbSelectProd_Click); - // - // chkSevenDays - // - this.chkSevenDays.Location = new System.Drawing.Point(291, 84); - this.chkSevenDays.Name = "chkSevenDays"; - this.chkSevenDays.Size = new System.Drawing.Size(80, 17); - this.chkSevenDays.TabIndex = 805; - this.chkSevenDays.Text = "近七日爆款"; - this.chkSevenDays.UseVisualStyleBackColor = true; - this.chkSevenDays.Visible = false; - // // chkSkipQualification // - this.chkSkipQualification.Location = new System.Drawing.Point(5, 144); + this.chkSkipQualification.Location = new System.Drawing.Point(5, 152); this.chkSkipQualification.Name = "chkSkipQualification"; this.chkSkipQualification.Size = new System.Drawing.Size(80, 17); this.chkSkipQualification.TabIndex = 806; this.chkSkipQualification.Text = "跳过资质品"; this.chkSkipQualification.UseVisualStyleBackColor = true; // - // lblGoodsCount - // - this.lblGoodsCount.AutoSize = true; - this.lblGoodsCount.BackColor = System.Drawing.Color.Transparent; - this.lblGoodsCount.Location = new System.Drawing.Point(106, 127); - this.lblGoodsCount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.lblGoodsCount.Name = "lblGoodsCount"; - this.lblGoodsCount.Size = new System.Drawing.Size(71, 17); - this.lblGoodsCount.TabIndex = 537; - this.lblGoodsCount.Text = "产品库 0 件"; - this.lblGoodsCount.Click += new System.EventHandler(this.lblGoodsCount_Click); - // // txtRandomFissionProductCount // - this.txtRandomFissionProductCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.txtRandomFissionProductCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtRandomFissionProductCount.Font = new System.Drawing.Font("微软雅黑", 10F); this.txtRandomFissionProductCount.Location = new System.Drawing.Point(297, 103); @@ -1816,7 +1818,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblJstInitSet.AutoSize = true; this.lblJstInitSet.BackColor = System.Drawing.Color.Transparent; - this.lblJstInitSet.Location = new System.Drawing.Point(214, 136); + this.lblJstInitSet.Location = new System.Drawing.Point(218, 144); 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); @@ -1870,7 +1872,7 @@ 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(387, 132); + this.btnProdDb.Location = new System.Drawing.Point(387, 140); this.btnProdDb.Name = "btnProdDb"; this.btnProdDb.Size = new System.Drawing.Size(31, 25); this.btnProdDb.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1892,7 +1894,7 @@ namespace TemuKJD.WXForms.ProductForms // this.txtAddCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtAddCount.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtAddCount.Location = new System.Drawing.Point(310, 132); + this.txtAddCount.Location = new System.Drawing.Point(312, 140); this.txtAddCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddCount.Name = "txtAddCount"; this.txtAddCount.Size = new System.Drawing.Size(29, 25); @@ -2039,7 +2041,7 @@ 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(277, 132); + this.btnClearUpload.Location = new System.Drawing.Point(280, 140); this.btnClearUpload.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearUpload.Name = "btnClearUpload"; this.btnClearUpload.Size = new System.Drawing.Size(31, 25); @@ -2090,7 +2092,7 @@ 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(341, 132); + this.btnRandomAdd.Location = new System.Drawing.Point(342, 140); this.btnRandomAdd.Name = "btnRandomAdd"; this.btnRandomAdd.Size = new System.Drawing.Size(44, 25); this.btnRandomAdd.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -2193,21 +2195,6 @@ namespace TemuKJD.WXForms.ProductForms this.chkRandomFissionProduct.UseVisualStyleBackColor = true; this.chkRandomFissionProduct.Visible = false; // - // lblWaitToUp - // - this.lblWaitToUp.AutoSize = true; - this.lblWaitToUp.BackColor = System.Drawing.Color.Transparent; - this.lblWaitToUp.Cursor = System.Windows.Forms.Cursors.Hand; - this.lblWaitToUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblWaitToUp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.lblWaitToUp.Location = new System.Drawing.Point(106, 144); - this.lblWaitToUp.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.lblWaitToUp.Name = "lblWaitToUp"; - this.lblWaitToUp.Size = new System.Drawing.Size(71, 17); - this.lblWaitToUp.TabIndex = 541; - this.lblWaitToUp.Text = "待上传 0 件"; - this.lblWaitToUp.Click += new System.EventHandler(this.lblWaitToUp_Click); - // // chkWXComplateProd // this.chkWXComplateProd.AutoSize = true; @@ -2240,6 +2227,57 @@ namespace TemuKJD.WXForms.ProductForms this.chkFilterViewUv.UseVisualStyleBackColor = true; this.chkFilterViewUv.Visible = false; // + // lblUpdateInDays + // + this.lblUpdateInDays.AutoSize = true; + this.lblUpdateInDays.Location = new System.Drawing.Point(39, 131); + this.lblUpdateInDays.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblUpdateInDays.Name = "lblUpdateInDays"; + this.lblUpdateInDays.Size = new System.Drawing.Size(20, 17); + this.lblUpdateInDays.TabIndex = 969; + this.lblUpdateInDays.Text = "日"; + this.lblUpdateInDays.Visible = false; + // + // pbSelectProd + // + this.pbSelectProd.BackColor = System.Drawing.Color.Transparent; + this.pbSelectProd.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbSelectProd.Location = new System.Drawing.Point(101, 142); + this.pbSelectProd.Name = "pbSelectProd"; + this.pbSelectProd.Size = new System.Drawing.Size(21, 21); + this.pbSelectProd.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbSelectProd.TabIndex = 781; + this.pbSelectProd.TabStop = false; + this.pbSelectProd.Visible = false; + this.pbSelectProd.Click += new System.EventHandler(this.pbSelectProd_Click); + // + // lblGoodsCount + // + this.lblGoodsCount.AutoSize = true; + this.lblGoodsCount.BackColor = System.Drawing.Color.Transparent; + this.lblGoodsCount.Location = new System.Drawing.Point(118, 135); + this.lblGoodsCount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblGoodsCount.Name = "lblGoodsCount"; + this.lblGoodsCount.Size = new System.Drawing.Size(71, 17); + this.lblGoodsCount.TabIndex = 537; + this.lblGoodsCount.Text = "产品库 0 件"; + this.lblGoodsCount.Click += new System.EventHandler(this.lblGoodsCount_Click); + // + // lblWaitToUp + // + this.lblWaitToUp.AutoSize = true; + this.lblWaitToUp.BackColor = System.Drawing.Color.Transparent; + this.lblWaitToUp.Cursor = System.Windows.Forms.Cursors.Hand; + this.lblWaitToUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lblWaitToUp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.lblWaitToUp.Location = new System.Drawing.Point(118, 152); + this.lblWaitToUp.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblWaitToUp.Name = "lblWaitToUp"; + this.lblWaitToUp.Size = new System.Drawing.Size(71, 17); + this.lblWaitToUp.TabIndex = 541; + this.lblWaitToUp.Text = "待上传 0 件"; + this.lblWaitToUp.Click += new System.EventHandler(this.lblWaitToUp_Click); + // // ucGroupBoxEx1 // this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -2263,7 +2301,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx1.Controls.Add(this.label17); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(185, 165); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(185, 175); this.ucGroupBoxEx1.TabIndex = 399; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "店铺筛选"; @@ -2565,8 +2603,8 @@ namespace TemuKJD.WXForms.ProductForms // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer3.Size = new System.Drawing.Size(1710, 472); - this.splitContainer3.SplitterDistance = 442; + this.splitContainer3.Size = new System.Drawing.Size(1710, 462); + this.splitContainer3.SplitterDistance = 432; this.splitContainer3.TabIndex = 1; // // splitContainer2 @@ -2596,7 +2634,7 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer2.Panel2.Controls.Add(this.chkTestNoAuditUpload); this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); - this.splitContainer2.Size = new System.Drawing.Size(1710, 442); + this.splitContainer2.Size = new System.Drawing.Size(1710, 432); this.splitContainer2.SplitterDistance = 410; this.splitContainer2.TabIndex = 0; // @@ -2640,7 +2678,7 @@ namespace TemuKJD.WXForms.ProductForms // this.pbLoadingShop.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoadingShop.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoadingShop.Location = new System.Drawing.Point(180, 196); + this.pbLoadingShop.Location = new System.Drawing.Point(180, 191); this.pbLoadingShop.Name = "pbLoadingShop"; this.pbLoadingShop.Size = new System.Drawing.Size(50, 50); this.pbLoadingShop.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -2659,6 +2697,16 @@ namespace TemuKJD.WXForms.ProductForms this.lblExtCodeFilter.Text = "货号"; this.lblExtCodeFilter.Visible = false; // + // chkSevenDays + // + this.chkSevenDays.Location = new System.Drawing.Point(291, 84); + this.chkSevenDays.Name = "chkSevenDays"; + this.chkSevenDays.Size = new System.Drawing.Size(80, 17); + this.chkSevenDays.TabIndex = 805; + this.chkSevenDays.Text = "近七日爆款"; + this.chkSevenDays.UseVisualStyleBackColor = true; + this.chkSevenDays.Visible = false; + // // dgvShop // this.dgvShop.AllowUserToAddRows = false; @@ -2699,7 +2747,7 @@ namespace TemuKJD.WXForms.ProductForms this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 25; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(406, 442); + this.dgvShop.Size = new System.Drawing.Size(406, 432); this.dgvShop.TabIndex = 6; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // @@ -2823,7 +2871,7 @@ namespace TemuKJD.WXForms.ProductForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(623, 196); + this.pbLoading.Location = new System.Drawing.Point(623, 191); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -2872,7 +2920,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(8, 87); + this.label11.Location = new System.Drawing.Point(8, 77); this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(68, 17); @@ -2883,7 +2931,7 @@ namespace TemuKJD.WXForms.ProductForms // txtSinglePriceAdd // this.txtSinglePriceAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtSinglePriceAdd.Location = new System.Drawing.Point(76, 84); + this.txtSinglePriceAdd.Location = new System.Drawing.Point(76, 74); this.txtSinglePriceAdd.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSinglePriceAdd.Name = "txtSinglePriceAdd"; this.txtSinglePriceAdd.Size = new System.Drawing.Size(31, 23); @@ -2895,7 +2943,7 @@ namespace TemuKJD.WXForms.ProductForms // chkTestNoAuditUpload // this.chkTestNoAuditUpload.AutoSize = true; - this.chkTestNoAuditUpload.Location = new System.Drawing.Point(11, 59); + this.chkTestNoAuditUpload.Location = new System.Drawing.Point(11, 54); this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload"; this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21); this.chkTestNoAuditUpload.TabIndex = 779; @@ -2950,7 +2998,7 @@ namespace TemuKJD.WXForms.ProductForms this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1292, 442); + this.dgvSelectProduct.Size = new System.Drawing.Size(1292, 432); this.dgvSelectProduct.TabIndex = 187; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); // @@ -3221,27 +3269,6 @@ namespace TemuKJD.WXForms.ProductForms this.panelEx1.Text = "停止当前操作"; this.panelEx1.Visible = false; // - // chkUpdateInDays - // - this.chkUpdateInDays.Location = new System.Drawing.Point(5, 126); - this.chkUpdateInDays.Name = "chkUpdateInDays"; - this.chkUpdateInDays.Size = new System.Drawing.Size(88, 17); - this.chkUpdateInDays.TabIndex = 950; - this.chkUpdateInDays.Text = "　　日有更新"; - this.chkUpdateInDays.UseVisualStyleBackColor = true; - // - // txtUpdateInDays - // - this.txtUpdateInDays.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtUpdateInDays.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtUpdateInDays.Location = new System.Drawing.Point(20, 121); - this.txtUpdateInDays.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtUpdateInDays.Name = "txtUpdateInDays"; - this.txtUpdateInDays.Size = new System.Drawing.Size(26, 25); - this.txtUpdateInDays.TabIndex = 912; - this.txtUpdateInDays.Text = "30"; - this.txtUpdateInDays.Visible = false; - // // WXDBProdUploadForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -3518,5 +3545,7 @@ namespace TemuKJD.WXForms.ProductForms private UserComponent.UcCheckBox chkFreightInsurance; private UserComponent.UcCheckBox chkUpdateInDays; private System.Windows.Forms.TextBox txtUpdateInDays; + private System.Windows.Forms.ComboBox cmbUpdateInDays; + private System.Windows.Forms.Label lblUpdateInDays; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index e841d95..e29e08e 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -373,7 +373,11 @@ namespace TemuKJD.WXForms.ProductForms //lblGroupFilter.Visible = true; //cmbGroupFilter.Visible = true; } - } + cmbUpdateInDays.Visible = true; + chkUpdateInDays.Visible = true; + txtUpdateInDays.Visible = true; + lblUpdateInDays.Visible = true; + } if (BaseClass.UserAuthority.Contains("商品采集") || BaseClass.ParentAuthority.Contains("商品采集")) { if (BaseClass.UserAuthority.Contains("学员数据") || BaseClass.ParentAuthority.Contains("学员数据")) @@ -2407,7 +2411,7 @@ namespace TemuKJD.WXForms.ProductForms else { // 使用接口链接传主图 - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; upDate += "&post_data=" + GetHtml.UrlEncodeUtf8("{\"img_url\":\"" + gallery_item.url.Replace("https://", "http://") + "\"}"); @@ -2458,7 +2462,7 @@ namespace TemuKJD.WXForms.ProductForms return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -3325,7 +3329,7 @@ namespace TemuKJD.WXForms.ProductForms else { // 使用接口链接传详情图 - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; upDate += "&post_data=" + GetHtml.UrlEncodeUtf8("{\"img_url\":\"" + gallery_item.url.Replace("https://", "http://") + "\"}"); @@ -3375,7 +3379,7 @@ namespace TemuKJD.WXForms.ProductForms return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -4387,7 +4391,7 @@ namespace TemuKJD.WXForms.ProductForms // 使用接口链接传sku图 if (1 == 1 && !sku.thumb_url.Contains("wst.wxapp.tc.qq.com")) { - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; upDate += "&post_data=" + GetHtml.UrlEncodeUtf8("{\"img_url\":\"" + sku.thumb_url.Replace("https://", "http://") + "\"}"); @@ -4433,7 +4437,7 @@ namespace TemuKJD.WXForms.ProductForms return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -5091,7 +5095,7 @@ namespace TemuKJD.WXForms.ProductForms byte[] imageBytes = memoryStream.ToArray(); var imgBase64 = Convert.ToBase64String(imageBytes); - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -5380,7 +5384,7 @@ namespace TemuKJD.WXForms.ProductForms //return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -5472,7 +5476,7 @@ namespace TemuKJD.WXForms.ProductForms return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -5532,7 +5536,7 @@ namespace TemuKJD.WXForms.ProductForms return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -6301,7 +6305,10 @@ namespace TemuKJD.WXForms.ProductForms //if (chkSevenDays.Checked) // data += "&add_days_less=21"; if (chkUpdateInDays.Checked) + { data += "&add_days_less=" + txtUpdateInDays.Text.Trim(); + data += "&add_days_less_type=" + (cmbUpdateInDays.Text == "更新" ? "mdy" : "add"); + } // 回采数据 if (chkWXComplateProd.Checked)