diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 571298a..536b7ff 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -31,7 +31,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1290; + public static int VersionCount = 1292; public static string MainPath = "29wx"; //public static string MainPath = "29wx"; //public static string MainPath = "29pdd"; diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditForm.cs index b105c69..6799c0f 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditForm.cs @@ -35,7 +35,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms txtProductName.Text = dbProd.product_name; txtSkcId.Text = dbProd.skc_id; txtSpuId.Text = dbProd.spu_id; - this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http"); + if (dbProd.main_img.Contains("wxapp")) + { + string getImgError = ""; + this.pictureBox1.Image = ImageBuild.LoadBitmapLoadBitmipImageFromUrl(dbProd.main_img, out getImgError); + } + else + this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http"); this.txtNotes.Text = dbProd.notes; this.txtGroup.Text = dbProd.group; this.txtExtCode.Text = dbProd.ext_code; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditDetailForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditDetailForm.cs index 25e759a..d1b1555 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditDetailForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditDetailForm.cs @@ -11,6 +11,7 @@ using System.Data; using System.Drawing; using System.IO; using System.Linq; +using System.Security.Cryptography; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -73,7 +74,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms // 加载主图和详情图 foreach (var image in prodInfo.detail.galleries) { - var imgUrl = image.url.ParseToString().Replace("https", "http") + "?" + Randomx.GetId(10000000, 99999999); + var imgUrl = image.url.ParseToString() + "?" + Randomx.GetId(10000000, 99999999); + if (!imgUrl.Contains("wxapp")) + imgUrl = imgUrl.Replace("https", "http"); imgDic[imgUrl] = imgUrl; var pb = new PictureBox() { @@ -83,6 +86,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms ImageLocation = imgUrl, BorderStyle = BorderStyle.FixedSingle, }; + if (imgUrl.Contains("wxapp")) + { + pb.ImageLocation = null; + string getImgError = ""; + pb.Image = ImageBuild.LoadBitmapLoadBitmipImageFromUrl(imgUrl.Replace("http://", "https://"), out getImgError); + } pb.Click += Pb_Click; if (image.type == 1) @@ -125,7 +134,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms if (pb == null) return; - ShowImgForm imgFrom = new ShowImgForm(pb.ImageLocation, imgDic); + ShowImgForm imgFrom = new ShowImgForm(pb.ImageLocation == null ? pb.Tag.ParseToString() : pb.ImageLocation, imgDic); imgFrom.ShowDialog(); } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs index 8642c68..b570b4d 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs @@ -2,6 +2,7 @@ using AllBase.Helper; using AllBase.Model.Result; using AllBase.Model.Result.PDDResult; +using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; @@ -39,7 +40,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms txtProductName.Text = dbProd.product_name; txtSkcId.Text = dbProd.skc_id; txtSpuId.Text = dbProd.spu_id; - this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http"); + pictureBox1.Tag = dbProd.main_img; + if (dbProd.main_img.Contains("wxapp")) + { + string getImgError = ""; + this.pictureBox1.Image = ImageBuild.LoadBitmapLoadBitmipImageFromUrl(dbProd.main_img, out getImgError); + } + else + this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http"); this.txtNotes.Text = dbProd.notes; this.txtExtCode.Text = dbProd.ext_code; this.txtFissionWords.Text = dbProd.fission_words.Replace("fission_goods_names:", ""); @@ -105,7 +113,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void pictureBox1_Click(object sender, EventArgs e) { - ShowImgForm imgFrom = new ShowImgForm(pictureBox1.ImageLocation); + ShowImgForm imgFrom = new ShowImgForm(pictureBox1.ImageLocation == null ? pictureBox1.Tag.ParseToString() : pictureBox1.ImageLocation); imgFrom.ShowDialog(); } diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs index 6057a99..96c795a 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs @@ -32,14 +32,14 @@ namespace TemuKJD.WXForms.ProductForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtWaitSeconds = new System.Windows.Forms.TextBox(); @@ -252,6 +252,8 @@ 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(); @@ -1660,11 +1662,12 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx4.Controls.Add(this.txtUpdateInDays); + 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.chkSevenDays); this.ucGroupBoxEx4.Controls.Add(this.chkSkipQualification); this.ucGroupBoxEx4.Controls.Add(this.lblGoodsCount); this.ucGroupBoxEx4.Controls.Add(this.txtRandomFissionProductCount); @@ -1756,7 +1759,7 @@ namespace TemuKJD.WXForms.ProductForms // this.pbSelectProd.BackColor = System.Drawing.Color.Transparent; this.pbSelectProd.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbSelectProd.Location = new System.Drawing.Point(80, 134); + 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; @@ -1767,12 +1770,13 @@ namespace TemuKJD.WXForms.ProductForms // // chkSevenDays // - this.chkSevenDays.Location = new System.Drawing.Point(5, 127); + 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 // @@ -1787,7 +1791,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblGoodsCount.AutoSize = true; this.lblGoodsCount.BackColor = System.Drawing.Color.Transparent; - this.lblGoodsCount.Location = new System.Drawing.Point(97, 127); + 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); @@ -2196,7 +2200,7 @@ namespace TemuKJD.WXForms.ProductForms 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(97, 144); + 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); @@ -2578,6 +2582,7 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer2.Panel1.Controls.Add(this.txtExtCodeFilter); this.splitContainer2.Panel1.Controls.Add(this.pbLoadingShop); this.splitContainer2.Panel1.Controls.Add(this.lblExtCodeFilter); + this.splitContainer2.Panel1.Controls.Add(this.chkSevenDays); this.splitContainer2.Panel1.Controls.Add(this.dgvShop); this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); // @@ -2658,19 +2663,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; 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; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -2902,19 +2907,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; this.dgvSelectProduct.AutoRowNumber = true; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.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.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -2976,8 +2981,8 @@ namespace TemuKJD.WXForms.ProductForms // // colSupplierName // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle13; this.colSupplierName.Frozen = true; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; @@ -3057,8 +3062,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductName // - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle14; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -3066,8 +3071,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductCat // - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductCat.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductCat.DefaultCellStyle = dataGridViewCellStyle15; this.colProductCat.HeaderText = "商品类目"; this.colProductCat.Name = "colProductCat"; this.colProductCat.ReadOnly = true; @@ -3122,8 +3127,8 @@ namespace TemuKJD.WXForms.ProductForms // // colAddTime // - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colAddTime.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle16; this.colAddTime.HeaderText = "上传时间"; this.colAddTime.Name = "colAddTime"; this.colAddTime.ReadOnly = true; @@ -3216,6 +3221,27 @@ 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; @@ -3490,5 +3516,7 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.Label lblSpBrand; private System.Windows.Forms.ComboBox cmbSpBrandName; private UserComponent.UcCheckBox chkFreightInsurance; + private UserComponent.UcCheckBox chkUpdateInDays; + private System.Windows.Forms.TextBox txtUpdateInDays; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 585349c..93043d7 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -6295,12 +6295,14 @@ namespace TemuKJD.WXForms.ProductForms // 微信安全商品检测 data += "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验"); - // 7天爆款数据 - if (chkSevenDays.Checked) - data += "&add_days_less=21"; + // 指定天数爆款数据 // 原7天爆款数据 + //if (chkSevenDays.Checked) + // data += "&add_days_less=21"; + if (chkUpdateInDays.Checked) + data += "&add_days_less=" + txtUpdateInDays.Text.Trim(); - // 回采数据 - if (chkWXComplateProd.Checked) + // 回采数据 + if (chkWXComplateProd.Checked) data += "&has_wx_format=1"; // 标题裂变 diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.cs index ace8687..53b5cda 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.cs @@ -51,7 +51,13 @@ namespace TemuKJD.WXForms.ProductForms { txtProductName.Text = dbProd.product_name; txtSpuId.Text = dbProd.spu_id; - this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http"); + if (dbProd.main_img.Contains("wxapp")) + { + string getImgError = ""; + this.pictureBox1.Image = ImageBuild.LoadBitmapLoadBitmipImageFromUrl(dbProd.main_img, out getImgError); + } + else + this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http"); fillWxCate(); string catName = (dbProd.cat_name ?? dbProd.cat_id) + "(未识别)"; diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditNotesForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditNotesForm.cs index 464c8bf..0326e34 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditNotesForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditNotesForm.cs @@ -46,7 +46,14 @@ namespace TemuKJD.WXForms.ProductForms { txtProductName.Text = dbProd.product_name; txtSpuId.Text = dbProd.spu_id; - this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http"); + this.pictureBox1.Tag = dbProd.main_img.Replace("https", "http"); + if (dbProd.main_img.Contains("wxapp")) + { + string getImgError = ""; + this.pictureBox1.Image = ImageBuild.LoadBitmapLoadBitmipImageFromUrl(dbProd.main_img, out getImgError); + } + else + this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http"); this.txtNotes.Text = dbProd.notes; this.txtFissionWords.Text = dbProd.fission_words.Replace("fission_goods_names:", ""); @@ -186,7 +193,7 @@ namespace TemuKJD.WXForms.ProductForms private void pictureBox1_Click(object sender, EventArgs e) { - ShowImgForm imgFrom = new ShowImgForm(pictureBox1.ImageLocation); + ShowImgForm imgFrom = new ShowImgForm(pictureBox1.ImageLocation.IsNullOrEmpty() ? pictureBox1.Tag.ParseToString() : pictureBox1.ImageLocation); imgFrom.ShowDialog(); }