diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index f748e04..873fa30 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -31,7 +31,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 1281;
+ public static int VersionCount = 1285;
public static string MainPath = "29wx";
//public static string MainPath = "29wx";
//public static string MainPath = "29pdd";
diff --git a/AllBase/Model/Result/PDDResult/PDDFrontProductInfo2.cs b/AllBase/Model/Result/PDDResult/PDDFrontProductInfo2.cs
index ca213be..ba2875a 100644
--- a/AllBase/Model/Result/PDDResult/PDDFrontProductInfo2.cs
+++ b/AllBase/Model/Result/PDDResult/PDDFrontProductInfo2.cs
@@ -166,6 +166,7 @@ namespace AllBase.Model.Result.PDDResult
public long? id { get; set; } // 1324122714994,
public long? goods_id { get; set; } // 740124855378,
public string url { get; set; } // "https://img.pddpic.com/mms-material-img/2025-04-28/8e85227f-458d-452d-b4ba-e6f720b4b8e8.jpeg",
+ public string video_url { get; set; } // "https://video3.pddpic.com/i1/2020-06-06/bec95fd51b79e5c572153f7cb923a1c3.mp4.f30.mp4"
public int? width { get; set; } // 800,
public int? height { get; set; } // 800,
public int? priority { get; set; } // -1,
diff --git a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs
index 6105181..a8964a3 100644
--- a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs
+++ b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs
@@ -2787,7 +2787,7 @@ namespace KJD_Web.BLL.BXX
JObject obj = new JObject();
obj["order_id"] = order_id;
obj["supplier_appid"] = "wxfc630d60a1af6c6f";
- JArray array = (JArray.Parse(dropship_product_list));
+ JArray array = JArray.Parse(dropship_product_list);
obj["dropship_product_list"] = array;
return HttpUtils.WxApiPostResponse("https://api.weixin.qq.com/channels/ec/order/dropship/assign?access_token=" + token, JsonUtils.SerializeObject(obj), "");
@@ -2800,6 +2800,36 @@ namespace KJD_Web.BLL.BXX
return "{\"code\":19999,\"msg\":\"输入为空\"}";
}
+ public string WxApiDropshipCancel(string inputData)
+ {
+ if (!string.IsNullOrEmpty(inputData))
+ {
+ if (!WXUserManage.GetSign(inputData))
+ return "{\"code\":999,\"msg\":\"校验失败\"}";
+ var token = RegexUtils.GetStringQuery(ref inputData, "token")?.Replace("'", "\\'");
+ var order_id = RegexUtils.GetStringQuery(ref inputData, "order_id")?.Replace("'", "\\'");
+ var ds_order_id = RegexUtils.GetStringQuery(ref inputData, "ds_order_id")?.Replace("'", "\\'");
+ var dropship_product_list = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "dropship_product_list"))?.Replace("'", "\\'");
+
+ try
+ {
+ JObject obj = new JObject();
+ obj["order_id"] = order_id;
+ obj["ds_order_id"] = ds_order_id;
+ JArray array = JArray.Parse(dropship_product_list);
+ obj["dropship_product_list"] = array;
+
+ return HttpUtils.WxApiPostResponse("https://api.weixin.qq.com/channels/ec/order/dropship/cancel?access_token=" + token, JsonUtils.SerializeObject(obj), "");
+ }
+ catch
+ {
+
+ }
+ }
+ return "{\"code\":19999,\"msg\":\"输入为空\"}";
+ }
+
+
public string WxApiCategoryClassify(string inputData)
{
if (!string.IsNullOrEmpty(inputData))
diff --git a/KJDService/KJD_WebService/WXProductService.asmx.cs b/KJDService/KJD_WebService/WXProductService.asmx.cs
index 8831b26..b554a04 100644
--- a/KJDService/KJD_WebService/WXProductService.asmx.cs
+++ b/KJDService/KJD_WebService/WXProductService.asmx.cs
@@ -409,6 +409,19 @@ namespace KJD_Web
Context.Response.End();
}
+ ///
+ /// 添加代发
+ ///
+ [WebMethod]
+ public void wx_api_dropship_cancel()
+ {
+ string jsontext = GetRequestJsonString();
+ var result = new BXXProductManage().WxApiDropshipCancel(jsontext);
+
+ Context.Response.Write(result);
+ Context.Response.End();
+ }
+
[WebMethod]
public void wx_api_category_classify()
{
diff --git a/TEMUKJD/BLL/PDDProdFormConverter.cs b/TEMUKJD/BLL/PDDProdFormConverter.cs
index 0df3a65..19014d7 100644
--- a/TEMUKJD/BLL/PDDProdFormConverter.cs
+++ b/TEMUKJD/BLL/PDDProdFormConverter.cs
@@ -549,8 +549,21 @@ namespace TemuKJD.BLL
width = 0,
height = 0,
});
- }
- else
+ }
+ else if (frontGallery.type==9 && !string.IsNullOrEmpty(frontGallery.video_url))
+ {
+ //"url": "http://video3.yangkeduo.com/i1/2020-06-06/bec95fd51b79e5c572153f7cb923a1c3.mp4.0_0.p0.jpg",
+ //"video_url": "https://video3.pddpic.com/i1/2020-06-06/bec95fd51b79e5c572153f7cb923a1c3.mp4.f30.mp4",
+
+ prodInfo.detail.galleries.Add(new gallery_item()
+ {
+ url = frontGallery.video_url,
+ type = 6,
+ width = 0,
+ height = 0,
+ });
+ }
+ else
{
//string getImgError;
//var image = GetHtml.GetUrlImg(frontGallery.url.Replace("https://", "http://"), out getImgError);
@@ -722,7 +735,7 @@ namespace TemuKJD.BLL
shipment_limit_second_list = null,
sku69_code = "",
};
- if ((int)frontSku.sku_price?.ParseToDecimal() > 0)
+ if (frontSku?.sku_price != null && frontSku.sku_price > 0)
skuInfo.multi_price = Math.Min(skuInfo.multi_price.ParseToInt(), (int)frontSku.sku_price.ParseToDecimal());
//List specIds = frontSku.spec.Split(',').ToList();
diff --git a/TEMUKJD/BLL/WXVideoUploader.cs b/TEMUKJD/BLL/WXVideoUploader.cs
index ce7d287..39e43f0 100644
--- a/TEMUKJD/BLL/WXVideoUploader.cs
+++ b/TEMUKJD/BLL/WXVideoUploader.cs
@@ -50,8 +50,8 @@ namespace TemuKJD.BLL
{
_http = new HttpClient(new HttpClientHandler
{
- Proxy = new WebProxy("http://127.0.0.1:8080"),
- UseProxy = true,
+ //Proxy = new WebProxy("http://127.0.0.1:8080"),
+ //UseProxy = true,
UseCookies=false,
AutomaticDecompression = System.Net.DecompressionMethods.GZip
| System.Net.DecompressionMethods.Deflate
diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj
index 084eb92..d3a7847 100644
--- a/TEMUKJD/KJD.csproj
+++ b/TEMUKJD/KJD.csproj
@@ -254,6 +254,12 @@
WXProdNoCheckEditAddressForm.cs
+
+ Form
+
+
+ WXUserCollectAuthProdEditCatesForm.cs
+
Form
@@ -1459,6 +1465,9 @@
WXProdNoCheckEditAddressForm.cs
+
+ WXUserCollectAuthProdEditCatesForm.cs
+
WXUserCollectAuthProdEditNotesForm.cs
diff --git a/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs b/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs
index bc3270d..069e6cd 100644
--- a/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs
+++ b/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs
@@ -544,8 +544,8 @@ namespace TemuKJD.WXForms.ProductForms
DataGridViewExtension.defaultBitmap,
prod.productName,
prod.skuName + "(" + prod.skuId + ")", //"sku数量：" + prod.productSkus.Count + "个" + signCntStr,
- prod.beforePlatformDiscountCommPrice, //prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m,
- prod.afterPlatformDiscountCommPrice, //prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m,
+ prod.originPrice, //prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m,
+ prod.activityPrice + "(" + prod.afterPlatformDiscountMinPrice + ")", //prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m,
prod.totalStockNum,
"已报名",
""
diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
index 27a6302..6083a0e 100644
--- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
@@ -2773,11 +2773,22 @@ namespace TemuKJD.WXForms.ProductForms
if (!string.IsNullOrEmpty(spBrandName) && rst.Contains("\"code\":0"))
{
var jObj = JsonHelper.JObjectParse(rst);
- foreach (var jItem in jObj["mixBrandList"]) // bizuinBrandList mixBrandList
+ if (rst.Contains("mixBrandList"))
{
- if (jItem["chName"].ParseToString() == spBrandName)
- spBrandId = jItem["brandId"].ParseToString();
+ foreach (var jItem in jObj["mixBrandList"]) // bizuinBrandList mixBrandList
+ {
+ if (jItem["chName"].ParseToString() == spBrandName)
+ spBrandId = jItem["brandId"].ParseToString();
+ }
}
+ if (rst.Contains("bizuinBrandList"))
+ {
+ foreach (var jItem in jObj["bizuinBrandList"]) // bizuinBrandList mixBrandList
+ {
+ if (jItem["chName"].ParseToString() == spBrandName)
+ spBrandId = jItem["brandId"].ParseToString();
+ }
+ }
}
if (spBrandId.IsNullOrEmpty())
diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.Designer.cs
new file mode 100644
index 0000000..9d8d6ff
--- /dev/null
+++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.Designer.cs
@@ -0,0 +1,411 @@
+using System.Windows.Forms;
+
+namespace TemuKJD.WXForms.ProductForms
+{
+ partial class WXUserCollectAuthProdEditCatesForm
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXUserCollectAuthProdEditCatesForm));
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.lblBound = new System.Windows.Forms.Label();
+ this.btnCloseLst = new DevComponents.DotNetBar.PanelEx();
+ this.lstSelectCateList = new System.Windows.Forms.ListBox();
+ this.btnDelCate = new DevComponents.DotNetBar.PanelEx();
+ this.label5 = new System.Windows.Forms.Label();
+ this.txtCateSearch = new DevComponents.DotNetBar.Controls.TextBoxX();
+ this.cmbCateFilter4Leaf = new System.Windows.Forms.ComboBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.cmbCateFilter1 = new System.Windows.Forms.ComboBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.cmbCateFilter2 = new System.Windows.Forms.ComboBox();
+ this.label17 = new System.Windows.Forms.Label();
+ this.cmbCateFilter3 = new System.Windows.Forms.ComboBox();
+ this.btnOK1 = new DevComponents.DotNetBar.PanelEx();
+ this.txtProductName = new System.Windows.Forms.TextBox();
+ this.txtSpuId = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.lblStatus = new System.Windows.Forms.Label();
+ this.panel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // panel2
+ //
+ this.panel2.BackColor = System.Drawing.Color.White;
+ this.panel2.Controls.Add(this.lblStatus);
+ this.panel2.Controls.Add(this.lblBound);
+ this.panel2.Controls.Add(this.btnCloseLst);
+ this.panel2.Controls.Add(this.lstSelectCateList);
+ this.panel2.Controls.Add(this.btnDelCate);
+ this.panel2.Controls.Add(this.label5);
+ this.panel2.Controls.Add(this.txtCateSearch);
+ this.panel2.Controls.Add(this.cmbCateFilter4Leaf);
+ this.panel2.Controls.Add(this.label4);
+ this.panel2.Controls.Add(this.label2);
+ this.panel2.Controls.Add(this.cmbCateFilter1);
+ this.panel2.Controls.Add(this.label14);
+ this.panel2.Controls.Add(this.cmbCateFilter2);
+ this.panel2.Controls.Add(this.label17);
+ this.panel2.Controls.Add(this.cmbCateFilter3);
+ this.panel2.Controls.Add(this.btnOK1);
+ this.panel2.Controls.Add(this.txtProductName);
+ this.panel2.Controls.Add(this.txtSpuId);
+ this.panel2.Controls.Add(this.label3);
+ this.panel2.Controls.Add(this.label1);
+ this.panel2.Controls.Add(this.pictureBox1);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel2.Location = new System.Drawing.Point(1, 33);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(567, 445);
+ this.panel2.TabIndex = 1;
+ //
+ // lblBound
+ //
+ this.lblBound.AutoSize = true;
+ this.lblBound.Location = new System.Drawing.Point(456, 327);
+ this.lblBound.Name = "lblBound";
+ this.lblBound.Size = new System.Drawing.Size(56, 17);
+ this.lblBound.TabIndex = 884;
+ this.lblBound.Text = "保证金：";
+ //
+ // btnCloseLst
+ //
+ this.btnCloseLst.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnCloseLst.CanvasColor = System.Drawing.SystemColors.Control;
+ this.btnCloseLst.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnCloseLst.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnCloseLst.Location = new System.Drawing.Point(510, 280);
+ this.btnCloseLst.Name = "btnCloseLst";
+ this.btnCloseLst.Size = new System.Drawing.Size(16, 17);
+ this.btnCloseLst.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnCloseLst.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnCloseLst.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnCloseLst.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.btnCloseLst.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnCloseLst.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.btnCloseLst.Style.GradientAngle = 90;
+ this.btnCloseLst.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnCloseLst.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnCloseLst.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnCloseLst.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnCloseLst.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.btnCloseLst.TabIndex = 871;
+ this.btnCloseLst.Text = "X";
+ this.btnCloseLst.Visible = false;
+ this.btnCloseLst.Click += new System.EventHandler(this.btnCloseLst_Click);
+ //
+ // lstSelectCateList
+ //
+ this.lstSelectCateList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lstSelectCateList.FormattingEnabled = true;
+ this.lstSelectCateList.ItemHeight = 17;
+ this.lstSelectCateList.Location = new System.Drawing.Point(90, 276);
+ this.lstSelectCateList.Name = "lstSelectCateList";
+ this.lstSelectCateList.Size = new System.Drawing.Size(440, 21);
+ this.lstSelectCateList.TabIndex = 858;
+ this.lstSelectCateList.Visible = false;
+ this.lstSelectCateList.SelectedIndexChanged += new System.EventHandler(this.lstSelectCateList_SelectedIndexChanged);
+ //
+ // btnDelCate
+ //
+ this.btnDelCate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnDelCate.CanvasColor = System.Drawing.SystemColors.Control;
+ this.btnDelCate.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnDelCate.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnDelCate.Location = new System.Drawing.Point(474, 253);
+ this.btnDelCate.Name = "btnDelCate";
+ this.btnDelCate.Size = new System.Drawing.Size(56, 23);
+ this.btnDelCate.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnDelCate.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnDelCate.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnDelCate.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.btnDelCate.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnDelCate.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.btnDelCate.Style.GradientAngle = 90;
+ this.btnDelCate.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnDelCate.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnDelCate.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnDelCate.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnDelCate.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.btnDelCate.TabIndex = 848;
+ this.btnDelCate.Text = "删除类目";
+ this.btnDelCate.Click += new System.EventHandler(this.btnDelCate_Click);
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(34, 256);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(56, 17);
+ this.label5.TabIndex = 834;
+ this.label5.Text = "类目搜索";
+ //
+ // txtCateSearch
+ //
+ this.txtCateSearch.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ //
+ //
+ //
+ this.txtCateSearch.Border.Class = "TextBoxBorder";
+ this.txtCateSearch.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.txtCateSearch.Location = new System.Drawing.Point(90, 253);
+ this.txtCateSearch.Name = "txtCateSearch";
+ this.txtCateSearch.PreventEnterBeep = true;
+ this.txtCateSearch.Size = new System.Drawing.Size(378, 23);
+ this.txtCateSearch.TabIndex = 833;
+ this.txtCateSearch.TextChanged += new System.EventHandler(this.txtCateSearch_TextChanged);
+ //
+ // cmbCateFilter4Leaf
+ //
+ this.cmbCateFilter4Leaf.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.cmbCateFilter4Leaf.FormattingEnabled = true;
+ this.cmbCateFilter4Leaf.IntegralHeight = false;
+ this.cmbCateFilter4Leaf.Location = new System.Drawing.Point(310, 323);
+ this.cmbCateFilter4Leaf.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.cmbCateFilter4Leaf.Name = "cmbCateFilter4Leaf";
+ this.cmbCateFilter4Leaf.Size = new System.Drawing.Size(145, 25);
+ this.cmbCateFilter4Leaf.TabIndex = 822;
+ this.cmbCateFilter4Leaf.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter4Leaf_SelectedIndexChanged);
+ this.cmbCateFilter4Leaf.TextChanged += new System.EventHandler(this.cmbCateFilter4Leaf_TextChanged);
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(254, 327);
+ this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(56, 17);
+ this.label4.TabIndex = 821;
+ this.label4.Text = "叶子类目";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(47, 291);
+ this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(43, 17);
+ this.label2.TabIndex = 812;
+ this.label2.Text = " 类目1";
+ //
+ // cmbCateFilter1
+ //
+ this.cmbCateFilter1.FormattingEnabled = true;
+ this.cmbCateFilter1.IntegralHeight = false;
+ this.cmbCateFilter1.Location = new System.Drawing.Point(90, 287);
+ this.cmbCateFilter1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.cmbCateFilter1.Name = "cmbCateFilter1";
+ this.cmbCateFilter1.Size = new System.Drawing.Size(161, 25);
+ this.cmbCateFilter1.TabIndex = 815;
+ this.cmbCateFilter1.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter1_SelectedIndexChanged);
+ this.cmbCateFilter1.TextChanged += new System.EventHandler(this.cmbCateFilter1_TextChanged);
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Location = new System.Drawing.Point(267, 291);
+ this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(43, 17);
+ this.label14.TabIndex = 813;
+ this.label14.Text = " 类目2";
+ //
+ // cmbCateFilter2
+ //
+ this.cmbCateFilter2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.cmbCateFilter2.FormattingEnabled = true;
+ this.cmbCateFilter2.IntegralHeight = false;
+ this.cmbCateFilter2.Location = new System.Drawing.Point(310, 287);
+ this.cmbCateFilter2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.cmbCateFilter2.Name = "cmbCateFilter2";
+ this.cmbCateFilter2.Size = new System.Drawing.Size(220, 25);
+ this.cmbCateFilter2.TabIndex = 814;
+ this.cmbCateFilter2.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter2_SelectedIndexChanged);
+ this.cmbCateFilter2.TextChanged += new System.EventHandler(this.cmbCateFilter2_TextChanged);
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.Location = new System.Drawing.Point(47, 327);
+ this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(43, 17);
+ this.label17.TabIndex = 816;
+ this.label17.Text = " 类目3";
+ //
+ // cmbCateFilter3
+ //
+ this.cmbCateFilter3.FormattingEnabled = true;
+ this.cmbCateFilter3.IntegralHeight = false;
+ this.cmbCateFilter3.Location = new System.Drawing.Point(90, 323);
+ this.cmbCateFilter3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.cmbCateFilter3.Name = "cmbCateFilter3";
+ this.cmbCateFilter3.Size = new System.Drawing.Size(161, 25);
+ this.cmbCateFilter3.TabIndex = 817;
+ this.cmbCateFilter3.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter3_SelectedIndexChanged);
+ this.cmbCateFilter3.TextChanged += new System.EventHandler(this.cmbCateFilter3_TextChanged);
+ //
+ // btnOK1
+ //
+ this.btnOK1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnOK1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnOK1.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnOK1.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnOK1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnOK1.Location = new System.Drawing.Point(484, 401);
+ this.btnOK1.Name = "btnOK1";
+ this.btnOK1.Size = new System.Drawing.Size(46, 26);
+ this.btnOK1.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnOK1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnOK1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnOK1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnOK1.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnOK1.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnOK1.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnOK1.Style.GradientAngle = 90;
+ this.btnOK1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnOK1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnOK1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnOK1.TabIndex = 651;
+ this.btnOK1.Text = "提交";
+ this.btnOK1.Click += new System.EventHandler(this.btnOk_Click);
+ //
+ // txtProductName
+ //
+ this.txtProductName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtProductName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.txtProductName.Location = new System.Drawing.Point(90, 196);
+ this.txtProductName.Multiline = true;
+ this.txtProductName.Name = "txtProductName";
+ this.txtProductName.ReadOnly = true;
+ this.txtProductName.Size = new System.Drawing.Size(440, 46);
+ this.txtProductName.TabIndex = 397;
+ //
+ // txtSpuId
+ //
+ this.txtSpuId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtSpuId.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.txtSpuId.Location = new System.Drawing.Point(90, 162);
+ this.txtSpuId.Name = "txtSpuId";
+ this.txtSpuId.ReadOnly = true;
+ this.txtSpuId.Size = new System.Drawing.Size(440, 23);
+ this.txtSpuId.TabIndex = 395;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(34, 196);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(56, 17);
+ this.label3.TabIndex = 392;
+ this.label3.Text = "商品标题";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(34, 165);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(56, 17);
+ this.label1.TabIndex = 390;
+ this.label1.Text = " SPU ID";
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
+ this.pictureBox1.Location = new System.Drawing.Point(216, 15);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(136, 136);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.TabIndex = 389;
+ this.pictureBox1.TabStop = false;
+ this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
+ //
+ // lblStatus
+ //
+ this.lblStatus.AutoSize = true;
+ this.lblStatus.Location = new System.Drawing.Point(34, 371);
+ this.lblStatus.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.lblStatus.Name = "lblStatus";
+ this.lblStatus.Size = new System.Drawing.Size(56, 17);
+ this.lblStatus.TabIndex = 894;
+ this.lblStatus.Text = "准备就绪";
+ //
+ // WXUserCollectAuthProdEditCatesForm
+ //
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+ this.ClientSize = new System.Drawing.Size(569, 479);
+ this.Controls.Add(this.panel2);
+ this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.Name = "WXUserCollectAuthProdEditCatesForm";
+ this.Text = "编辑商品备注/货号";
+ this.TitleText = "编辑商品备注/货号";
+ this.Load += new System.EventHandler(this.ProductSelectListForm_Load);
+ this.Controls.SetChildIndex(this.panel2, 0);
+ this.panel2.ResumeLayout(false);
+ this.panel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.TextBox txtSpuId;
+ public System.Windows.Forms.TextBox txtProductName;
+ private DevComponents.DotNetBar.PanelEx btnOK1;
+ private ComboBox cmbCateFilter4Leaf;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label label2;
+ private ComboBox cmbCateFilter1;
+ private System.Windows.Forms.Label label14;
+ private ComboBox cmbCateFilter2;
+ private System.Windows.Forms.Label label17;
+ private ComboBox cmbCateFilter3;
+ private System.Windows.Forms.Label label5;
+ private DevComponents.DotNetBar.Controls.TextBoxX txtCateSearch;
+ private DevComponents.DotNetBar.PanelEx btnDelCate;
+ private ListBox lstSelectCateList;
+ private DevComponents.DotNetBar.PanelEx btnCloseLst;
+ private Label lblBound;
+ private Label lblStatus;
+ }
+}
\ No newline at end of file
diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.cs
new file mode 100644
index 0000000..ace8687
--- /dev/null
+++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.cs
@@ -0,0 +1,393 @@
+using AllBase;
+using AllBase.Helper;
+using AllBase.Model.Result;
+using AllBase.Model.Result.WXResult;
+using CefSharp;
+using NaiBa.Util.Extension;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TemuKJD.BaseForms;
+using TemuKJD.BLL;
+using TemuKJD.PDDForms.ProductSelectForms;
+using TemuKJD.ToolForms;
+using Work;
+
+namespace TemuKJD.WXForms.ProductForms
+{
+ public partial class WXUserCollectAuthProdEditCatesForm : BaseGeneralForm
+ {
+ KJDDBProduct dbProd = null;
+ List lstDbProduct = new List();
+
+ List selectCate1 = new List();
+ List selectCate2 = new List();
+ List selectCate3 = new List();
+ List selectCate4 = new List();
+
+ public WXUserCollectAuthProdEditCatesForm(List prods)
+ {
+ InitializeComponent();
+
+ if (prods != null)
+ lstDbProduct = prods;
+ dbProd = prods.FirstOrDefault();
+ }
+
+ private void ProductSelectListForm_Load(object sender, EventArgs e)
+ {
+ lblStatus.Text = "";
+ lstSelectCateList.Height = 180;
+ if (dbProd != null)
+ {
+ txtProductName.Text = dbProd.product_name;
+ txtSpuId.Text = dbProd.spu_id;
+ this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http");
+
+ fillWxCate();
+ string catName = (dbProd.cat_name ?? dbProd.cat_id) + "(未识别)";
+ if (dbProd.wx_cat_1 != null)
+ {
+ var catN = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == dbProd.wx_cat_1.ParseToString())?.name;
+ cmbCateFilter1.Text = catN.ParseToString();
+ if (!string.IsNullOrEmpty(catN))
+ {
+ catName = catN;
+ }
+ }
+ if (dbProd.wx_cat_2 != null)
+ {
+ var catN = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == dbProd.wx_cat_2.ParseToString())?.name;
+ cmbCateFilter2.Text = catN.ParseToString();
+ if (!string.IsNullOrEmpty(catN))
+ {
+ catName = catName + " >> " + catN;
+ }
+ }
+ if (dbProd.wx_cat_3 != null)
+ {
+ var catN = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == dbProd.wx_cat_3.ParseToString())?.name;
+ cmbCateFilter3.Text = catN.ParseToString();
+ if (!string.IsNullOrEmpty(catN))
+ {
+ catName = catName + " >> " + catN;
+ }
+ }
+ if (dbProd.wx_cat_leaf != null)
+ {
+ var catN = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == dbProd.wx_cat_leaf.ParseToString())?.name;
+ cmbCateFilter4Leaf.Text = catN.ParseToString();
+ if (!string.IsNullOrEmpty(catN))
+ {
+ catName = catName + " >> " + catN;
+ }
+ }
+ txtCateSearch.WatermarkText = catName.Replace(">>", ">");
+ if (!dbProd.wx_cat_1.IsNullOrZero() && !dbProd.wx_cat_2.IsNullOrZero() && !dbProd.wx_cat_3.IsNullOrZero() && !dbProd.wx_cat_leaf.IsNullOrZero())
+ {
+ //this.cmbCateFilter1.Text =
+ }
+ }
+ }
+
+ void fillWxCate()
+ {
+ cmbCateFilter1.Items.Clear();
+ cmbCateFilter2.Items.Clear();
+ cmbCateFilter3.Items.Clear();
+ cmbCateFilter4Leaf.Items.Clear();
+ cmbCateFilter1.Text = "";
+ cmbCateFilter2.Text = "";
+ cmbCateFilter3.Text = "";
+ cmbCateFilter4Leaf.Text = "";
+ foreach (var cate in GlobalConfig.WxCatList.Where(c => c.level == 1).ToList())
+ {
+ cmbCateFilter1.Items.Add(cate.name);
+ }
+ }
+
+ private async void btnOk_Click(object sender, EventArgs e)
+ {
+ int index = 0;
+ foreach (var prod in lstDbProduct)
+ {
+ index++;
+ var url = BaseClass.BuildPDDObjString("product/mdy_db_product");
+ var data = UserLogin.GetSignaturex();
+ data += "&db_id=" + prod.id;
+ lblStatus.Text = "正在修改类目 " + index + "/" + lstDbProduct.Count;
+ Thread.Sleep(200);
+
+ data += "&wx_cat_1=" + (selectCate1.FirstOrDefault()?.cat_id == null ? "null" : selectCate1.FirstOrDefault()?.cat_id.ParseToString());
+ data += "&wx_cat_2=" + (selectCate2.FirstOrDefault()?.cat_id == null ? "null" : selectCate2.FirstOrDefault()?.cat_id.ParseToString());
+ data += "&wx_cat_3=" + (selectCate3.FirstOrDefault()?.cat_id == null ? "null" : selectCate3.FirstOrDefault()?.cat_id.ParseToString());
+ data += "&wx_cat_leaf=" + (selectCate4.FirstOrDefault()?.cat_id == null ? "null" : selectCate4.FirstOrDefault()?.cat_id.ParseToString());
+
+ if (selectCate1.FirstOrDefault()?.cat_id != null)
+ {
+ data += "&main_cat_id=" + selectCate1.FirstOrDefault()?.cat_id +
+ "&main_cat_name=" + HttpUtility.UrlEncode(selectCate1.FirstOrDefault()?.name, Encoding.UTF8);
+ }
+ if (selectCate4.FirstOrDefault()?.cat_id != null)
+ {
+ data += "&cat_id=" + selectCate4.FirstOrDefault()?.cat_id +
+ "&cat_name=" + HttpUtility.UrlEncode(selectCate4.FirstOrDefault()?.name, Encoding.UTF8);
+ }
+
+ string html = "";
+ await Task.Run(() =>
+ {
+ var html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ });
+
+ if (!html.Contains("\"code\":200"))
+ {
+ //BaseMsgForm.ShowError("商品类目编辑失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg"));
+ }
+ else
+ {
+ dbProd.product_name = this.txtProductName.Text.Trim();
+ dbProd.wx_cat_1 = selectCate1.FirstOrDefault()?.cat_id == null ? null : selectCate1.FirstOrDefault()?.cat_id.ParseToLong();
+ dbProd.wx_cat_2 = selectCate2.FirstOrDefault()?.cat_id == null ? null : selectCate2.FirstOrDefault()?.cat_id.ParseToLong();
+ dbProd.wx_cat_3 = selectCate3.FirstOrDefault()?.cat_id == null ? null : selectCate3.FirstOrDefault()?.cat_id.ParseToLong();
+ dbProd.wx_cat_leaf = selectCate4.FirstOrDefault()?.cat_id == null ? null : selectCate4.FirstOrDefault()?.cat_id.ParseToLong();
+ if (selectCate1.FirstOrDefault()?.cat_id != null)
+ {
+ dbProd.main_cat_id = selectCate1.FirstOrDefault()?.cat_id;
+ dbProd.main_cat_name = selectCate1.FirstOrDefault()?.name;
+ }
+ if (selectCate4.FirstOrDefault()?.cat_id != null)
+ {
+ dbProd.cat_id = selectCate4.FirstOrDefault()?.cat_id;
+ dbProd.cat_name = selectCate4.FirstOrDefault()?.name;
+ }
+ }
+ }
+ this.Close();
+ }
+
+ private void pictureBox1_Click(object sender, EventArgs e)
+ {
+ ShowImgForm imgFrom = new ShowImgForm(pictureBox1.ImageLocation);
+ imgFrom.ShowDialog();
+ }
+
+ public static KJDDBProduct GetPddProductDetail(string prodDbId)
+ {
+ if (string.IsNullOrEmpty(prodDbId))
+ return new KJDDBProduct();
+
+ List list = new List();
+
+ var url = BaseClass.BuildPDDObjString("product/get_product_detail_list");
+ var data = "";
+
+ data = UserLogin.GetSignaturex() + "&search_db_ids=" + prodDbId;
+ if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.Contains("爆款数据"))
+ data += "&special_prod_type=普通商品,书籍,爆款数据";
+
+ var html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(url, data);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ {
+ return null;
+ }
+
+ var jArr = JObject.Parse(html)["data"];
+ if (jArr.Count() == 0)
+ return null;
+ var sProd = JsonHelper.SerializeObject(jArr);
+
+ try
+ {
+ list = JsonHelper.DeserializeJsonToList(sProd);
+ var item = list.FirstOrDefault();
+ if (item == null)
+ item = new KJDDBProduct();
+ return item;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+ }
+
+ private void cmbCateFilter1_TextChanged(object sender, EventArgs e)
+ {
+ //if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
+ //if (btnSwitchCatType.Text != "W")
+ // return;
+
+ cmbCateFilter2.Text = "";
+ cmbCateFilter2.Items.Clear();
+ cmbCateFilter3.Text = "";
+ cmbCateFilter3.Items.Clear();
+ selectCate1 = GlobalConfig.WxCatList
+ .Where(c => c.level == 1 && (";" + cmbCateFilter1.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
+ var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList();
+ cmbCateFilter2.Items.AddRange(cates2.Select(c => c.name).ToArray());
+ }
+
+ private void cmbCateFilter2_TextChanged(object sender, EventArgs e)
+ {
+ //if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
+ //if (btnSwitchCatType.Text != "W")
+ // return;
+
+ cmbCateFilter3.Text = "";
+ cmbCateFilter3.Items.Clear();
+ selectCate1 = GlobalConfig.WxCatList
+ .Where(c => c.level == 1 && (";" + cmbCateFilter1.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
+ var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList();
+ selectCate2 = cates2
+ .Where(c => c.level == 2 && (";" + cmbCateFilter2.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
+ var cates3 = GlobalConfig.WxCatList.Where(c => selectCate2.Any(c2 => c.f_cat_id == c2.cat_id)).ToList();
+ cmbCateFilter3.Items.AddRange(cates3.Select(c => c.name).ToArray());
+ }
+
+ private void cmbCateFilter3_TextChanged(object sender, EventArgs e)
+ {
+ cmbCateFilter4Leaf.Text = "";
+ cmbCateFilter4Leaf.Items.Clear();
+
+ selectCate1 = GlobalConfig.WxCatList
+ .Where(c => c.level == 1 && (";" + cmbCateFilter1.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
+ var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList();
+ selectCate2 = cates2
+ .Where(c => c.level == 2 && (";" + cmbCateFilter2.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
+ var cates3 = GlobalConfig.WxCatList.Where(c => selectCate2.Any(c2 => c.f_cat_id == c2.cat_id)).ToList();
+ selectCate3 = cates3
+ .Where(c => c.level == 3 && (";" + cmbCateFilter3.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
+ var cates4 = GlobalConfig.WxCatList.Where(c => selectCate3.Any(c3 => c.f_cat_id == c3.cat_id) || selectCate3.Any(c3 => c.cat_id == c3.cat_id && c.leaf)).ToList();
+ if (cates4.Count == 1)
+ cmbCateFilter4Leaf.Text = cates4.FirstOrDefault().name;
+ cmbCateFilter4Leaf.Items.AddRange(cates4.Select(c => c.name).ToArray());
+ }
+
+ private void cmbCateFilter4Leaf_TextChanged(object sender, EventArgs e)
+ {
+ selectCate1 = GlobalConfig.WxCatList
+ .Where(c => c.level == 1 && (";" + cmbCateFilter1.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
+ var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList();
+ selectCate2 = cates2
+ .Where(c => c.level == 2 && (";" + cmbCateFilter2.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
+ var cates3 = GlobalConfig.WxCatList.Where(c => selectCate2.Any(c2 => c.f_cat_id == c2.cat_id)).ToList();
+ selectCate3 = cates3
+ .Where(c => c.level == 3 && (";" + cmbCateFilter3.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
+ var cates4 = GlobalConfig.WxCatList.Where(c => selectCate3.Any(c3 => c.f_cat_id == c3.cat_id) || selectCate3.Any(c3 => c.cat_id == c3.cat_id && c.leaf)).ToList();
+ selectCate4 = cates4
+ .Where(c => c.leaf && (";" + cmbCateFilter4Leaf.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
+ var selCat = selectCate4.FirstOrDefault();
+ lblBound.Text = "保证金：" + GlobalConfig.WxCatBoundList.FirstOrDefault(cb => cb.leaf_id == selCat?.cat_id.ParseToLong())?.cat_bound;
+ }
+
+ private void cmbCateFilter1_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void cmbCateFilter2_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void cmbCateFilter3_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void cmbCateFilter4Leaf_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ private void btnDelCate_Click(object sender, EventArgs e)
+ {
+ cmbCateFilter1.Text = "";
+ txtCateSearch.WatermarkText = "(未识别)";
+ }
+
+
+ private void txtCateSearch_TextChanged(object sender, EventArgs e)
+ {
+ var searchTxt = txtCateSearch.Text.Trim();
+ List wxCatList = new List();
+ if (!string.IsNullOrEmpty(searchTxt))
+ {
+ wxCatList.AddRange(GlobalConfig.WxCatList.Where(c => c.leaf && c.name.Contains(searchTxt)));
+ wxCatList.AddRange(GlobalConfig.WxCatList.Where(c => c.level == 3 && !c.leaf && c.name.Contains(searchTxt)));
+ wxCatList.AddRange(GlobalConfig.WxCatList.Where(c => c.level == 2 && !c.leaf && c.name.Contains(searchTxt)));
+ wxCatList.AddRange(GlobalConfig.WxCatList.Where(c => c.level == 1 && !c.leaf && c.name.Contains(searchTxt)));
+ }
+ wxCatList = wxCatList.Take(50).ToList();
+
+ lstSelectCateList.Items.Clear();
+ foreach (var cate in wxCatList)
+ {
+ var cateTmp = cate;
+ string cateName = cateTmp.name;
+ var parent = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == cateTmp.f_cat_id);
+ while (parent != null)
+ {
+ cateTmp = parent;
+ cateName = cateTmp.name + " >> " + cateName;
+ parent = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == cateTmp.f_cat_id);
+ }
+ string bountStr = " 保证金：" + GlobalConfig.WxCatBoundList.FirstOrDefault(cb => cb.leaf_id == cate.cat_id.ParseToLong())?.cat_bound;
+ lstSelectCateList.Items.Add(cateName + bountStr);
+ }
+
+ if (lstSelectCateList.Items.Count > 0)
+ {
+ lstSelectCateList.Visible = true;
+ btnCloseLst.Visible = true;
+ lstSelectCateList.BringToFront();
+ btnCloseLst.BringToFront();
+ }
+ else
+ {
+ lstSelectCateList.Visible = false;
+ btnCloseLst.Visible = false;
+ }
+ }
+
+ private void lstSelectCateList_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ var cateStr = lstSelectCateList.SelectedItem.ParseToString().Split(new string[] { "保证金" }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault()?.Trim();
+ var cateItems = cateStr.Split(new string[] { ">", " " }, StringSplitOptions.RemoveEmptyEntries).ToList();
+ if (cateItems.Count > 0)
+ cmbCateFilter1.Text = cateItems[0];
+ if (cateItems.Count > 1)
+ cmbCateFilter2.Text = cateItems[1];
+ if (cateItems.Count > 2)
+ cmbCateFilter3.Text = cateItems[2];
+ if (cateItems.Count > 3)
+ cmbCateFilter4Leaf.Text = cateItems[3];
+
+ txtCateSearch.WatermarkText = lstSelectCateList.SelectedItem.ParseToString();
+
+ lstSelectCateList.Visible = false;
+ btnCloseLst.Visible = false;
+ }
+
+ private void btnCloseLst_Click(object sender, EventArgs e)
+ {
+ lstSelectCateList.Visible = false;
+ btnCloseLst.Visible = false;
+ }
+ }
+}
diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.resx b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.resx
new file mode 100644
index 0000000..c963c3c
--- /dev/null
+++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdEditCatesForm.resx
@@ -0,0 +1,298 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+
+ AAABAAEAgIAQYAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
+ AAD///8AAAAAAAAAAAAAAAAABEZmbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMZmZkQAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAZszMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMxmAAAAAAAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMxkAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMzMzMzGQAAAAAAAAAAAAAAAAAAAbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMYAAAAAAAAAAAAAAAAARszMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAABszMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAAAAAGzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAAAAbMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMx3d4iIiIiIiIh3fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAABszMzMzMzMzMzM
+ zMzMzMzMzMzHeIiIiIj/////////iIiIiId8zMzMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAAAGzMzMzMzM
+ zMzMzMzMzMzMzMeIiI/////////////////////4iIh8zMzMzMzMzMzMzMzMzMzMzMxgAAAAAAAATMzM
+ zMzMzMzMzMzMzMzMzHiI////////////////////////////iIfMzMzMzMzMzMzMzMzMzMzMxAAAAAAA
+ AGzMzMzMzMzMzMzMzMzMx3iP///////////////////////////////4iHzMzMzMzMzMzMzMzMzMzMYA
+ AAAAAAbMzMzMzMzMzMzMzMzMx3iP//////////////////////////////////+IfMzMzMzMzMzMzMzM
+ zMzMYAAAAABMzMzMzMzMzMzMzMzMx3iP/////////////////////////////////////4h8zMzMzMzM
+ zMzMzMzMzMQAAAAAbMzMzMzMzMzMzMzMzHiP////////////////////////////////////////h3zM
+ zMzMzMzMzMzMzMzGAAAABMzMzMzMzMzMzMzMzHiP////////////////////////////////////////
+ //iHzMzMzMzMzMzMzMzMzEAAAAbMzMzMzMzMzMzMzMeI////////////////////////////////////
+ ////////+IfMzMzMzMzMzMzMzMxgAABMzMzMzMzMzMzMzMx4////////////////////////////////
+ //////////////+IfMzMzMzMzMzMzMzMxAAAbMzMzMzMzMzMzMzHj///////////////////////////
+ /////////////////////4fMzMzMzMzMzMzMzMYAAMzMzMzMzMzMzMzMeP//////////////////////
+ ///////////////////////////4fMzMzMzMzMzMzMzMAAbMzMzMzMzMzMzMx4//////////////////
+ /////////////////////////////////4fMzMzMzMzMzMzMzGAGzMzMzMzMzMzMzHj/////////////
+ ///////////////////////////////////////4fMzMzMzMzMzMzMxgDMzMzMzMzMzMzMyI////////
+ /////////////////////////////////////////////4zMzMzMzMzMzMzMwEzMzMzMzMzMzMzHj///
+ //////////////////////////////////////////////////+HzMzMzMzMzMzMzMRszMzMzMzMzMzM
+ eP//////////////////////////////////////////////////////+HzMzMzMzMzMzMzGbMzMzMzM
+ zMzMzHj///////////////////////////////////////////////////////+MzMzMzMzMzMzMxmzM
+ zMzMzMzMzMyP////+IiP////////////////////////////////////////+I//////h8zMzMzMzMzM
+ zMZszMzMzMzMzMzHj////4iIiI//////////////////////////////////////+IiIj/////jMzMzM
+ zMzMzMzGbMzMzMzMzMzMyP////iIiIiI/////////////////////////////////////4iIiIj////4
+ fMzMzMzMzMzMxszMzMzMzMzMzHj////4iIiIiP////////////////////////////////////+IiIiI
+ j////4zMzMzMzMzMzMbMzMzMzMzMzMx4////iIiIiIj////////////////////////////////////4
+ iIiIiI////+HzMzMzMzMzMzMzMzMzMzMzMzMj////4iIiIiI//////////////+IiP//iI//////////
+ ////+IiIiIiP////h8zMzMzMzMzMzMzMzMzMzMzMzI/////4iIiIiP/////////////4d3eIiIeIj///
+ //////////+IiIiIj/////jMzMzMzMzMzMzMzMzMzMzMzMyP////+IiIiIj/////////////iIiId3eI
+ iI//////////////iIiIiI/////4zMzMzMzMzMzMzMzMzMzMzMzHj/////+IiIiP/////////////4//
+ /4d4j/+P//////////////iIiIj/////+MzMzMzMzMzMzMzMzMzMzMzMx4//////+IiP////////////
+ ///////4j///////////////////iIiP//////jMzMzMzMzMzMzMzMzMzMzMzMeP//////////+IiIj/
+ ///////////////////////////////////////////4fMzMzMzMzMzMzMzMzMzMzMzH//////////+H
+ fMx8eP//////////////////////////iId3iP//////////+HzMzMzMzMzMzMzMzMzMzMzMyP//////
+ ///4fMzHh8eP////////////////////////+MzMzMd4//////////h8zMzMzMzMzMzMzMzMzMzMzMf/
+ ////////+MzMePjMeP///////////////////////4zMzMeHx4/////////4fMzMzMzMzMzMzMzMzMzM
+ zMzH/////////4fMd3eHzMeP//////////////////////iMzMzIiHx4////////+HzMzMzMzMzMzMzM
+ zMzMzMzMx/////////+Hx4iIfMzMj//////////////////////4h3d8x4h8yP////////jMzMzMzMzM
+ zMzMzMzMzMzMzMeP////////+HiP+IfMzI//////////////////////+HiIiHd3zHj////////4zMzM
+ zMzMzMzMzMzMzMzMzMzHj/////////h4//+HzMeP//////////////////////h4//h8zMyP////////
+ +MzMzMzMzMzMzMzMzMzMzMzMzI/////////4iP//h8x4///////////////////////4j//4fMzHj///
+ //////jMzMzMzMzMzMzMzMzMzMzMzMyP///////4iIiP+IfHj///////////////////////+Ij/+HzM
+ eP/////////4zMzMzMzMzMzMzMzMzMzMzMzMj///////iIiIiIh3eP////////////////////////+I
+ j4h8x3iI////////h8zMzMzMzMzMzMzMzMzMzMzMzH//////+Hj///iIiI//////////////////////
+ /////4iId4iIiIj//////4zMzMzMzMzMzMzMzMzMzMzMzMx4//////iP////iP//////////////////
+ /////////////4iP//iI//////+MzMzMzMzMzMzMzMzMzMzMzMzMyP//////////+I//////////////
+ ///////////////////4eP//iP//////jMzMzMzMzMzMzMzMzMzMzMzMzMj///////////iP////////
+ /////////////////////////4j/////////+HzMzMzMzMzMzMzMzMzMzMzMzMzHj///////////////
+ //////////////////////////////+I//////////jMzMzMzMzMzMzMzMzMzMzMzMzMzI//////////
+ //////////////////////////////////////////////+HzMzMzMzMzMzMzMzMzMzMzMzMzMyP////
+ ////////////////////////////////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzM
+ eP///////////////////////////////////////////////////////4zMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMj///////////////////////////////////////////////////////h8zMzMzMzMzMzMzMzM
+ zMzMzMzMzMzHj//////////////////////////////////////////////////////4zMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzI//////////////////////////////////////////////////////h8zMzMzM
+ zMzMzMzMzMzMzMzMzMzMzMx4////////////////////////////////////////////////////+HzM
+ zMzMzMzMzMzMzMzMzMzMzMzMzMzMyI////+I////////////////////////////////////////////
+ //h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP////+Ij/////////////////////////////////////
+ //////+HzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP////+IiIiIj//////////////////////////4
+ ////iI/////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMiP/////4iIiP//////////////////////
+ ////+IiIiIj/////iHzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiP//////////////////////////
+ ///////////4iIj//////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiP////////////////////
+ //////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiP//////////////
+ //////////////////////////////+HzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHj/////////
+ ///////////////////////////////////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP////
+ ////////////////////////////////////////+MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzI
+ j/////////////////////////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMeP//////////////////////////////////////////////h8zMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMx4////////+I//////////////////////////////////////jMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMeP///////4iIj///////////////////////////iP///////4fMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMx4////////iIiIiP///////////////////////4iIiP///////4zMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMzMzMzMj///////+IiIiIiI////////////////////+IiIiIj///////+HzMzM
+ zMzMzMzMzMzMzMzMzMzMzMzMzMzMx4////////iIiIiIj////////////////////4iIiIiIj///////
+ +MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMj///////+IiIiIiI////////////////////+IiIiIiI//
+ //////h8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx4////////iIiIiIiP////////////////////iIiI
+ iIiI///////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMj///////+IiIiIiIj/////iIiIiIiIj/////
+ /4iIiIiIiP///////4zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx4////////iIiIiIiI/////4zMzMzMzM
+ j/////+IiIiIiIiP//////+HzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP//////+IiIiIiIj/////+MzM
+ zMzMzI//////+IiIiIiIj///////+MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzI////////iIiIiIiI////
+ //jMzMzMzMyP//////iIiIiIiIj///////jMzMzMzMzMzMzMzMzMzMzMzMzMzMzMeP///////4iIiIiI
+ iP/////4zMzMzMzMj//////4iIiIiIiI///////4fMzMzMzMzMzMzMzMzMzMzMzMzMzMzI////////iI
+ iIiIiI//////+MzMzMzMzI//////+IiIiIiIiP///////4zMzMzMzMzMzMzMzMzMzMzMzMzMzMyP////
+ ///4iIiIiIiP//////fMzMzMzMyP//////+IiIiIiIj///////+MzMzMzMzMzMzMzMzMzMzMzMzMzMzH
+ j///////+IiIiIiI//////+HzMzMzMzMeP//////iIiIiIiIj///////jMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMyP////////iIiIiIiP//////jMzMzMzMzHj///////iIiIiIiI///////4fMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMj///////+IiIiIiI///////4zMzMzMzMzI///////4iIiIiIiI///////3zMzMzMzMzMzM
+ zMzMzMzMzMzMzMzI////////iIiIiIiP//////+MzMzMzMzMyP//////+IiIiIiIiP//////+MzMzMzM
+ zMzMzMzMzMzMzMzMzMzMeP///////4iIiIiIj///////jMzMzMzMzMj///////+IiIiIiIj///////jM
+ zMzMzMzMzMzMzMzMzMzMzMzMzI////////+IiIiIiP//////+HzMzMzMzMzHj///////iIiIiIiI////
+ ///4zMzMzMzMzMzMzMzMzMzMzMzMzMyP////////iIiIiI////////jMzMzMzMzMzI///////4iIiIiI
+ iI//////+MzMzMzMzMzMzMzMzMzMzMzMzMzMj////////4iIiIiP///////4zMzMzMzMzMyP///////4
+ iIiIiIiP//////jMzMzMzMzMzMzMzMzMzMzMzMzMzI////////+IiIiI////////h8zMzMzMzMzMeP//
+ /////4iIiIiIj//////4fMzMzMzMzMzMzMzMzMzMzMzMzMyP////////iIiIj////////4fMzMzMzMzM
+ zHj///////+IiIiIiI//////+HzMzMzMzMzMzMzMzMzMzMzMzMzHj/////////iIiP////////+MzMzM
+ zMzMzMzI////////+IiIiIiP//////h8zMzMzMzMzMzMxmzMzMzMzMzMx4/////////4iP/////////4
+ fMzMzMzMzMzMx4////////+IiIiIj//////4fMzMzMzMzMzMzMZszMzMzMzMzMeP////////////////
+ ////+MzMzMzMzMzMzMyP////////iIiIiP//////+HzMzMzMzMzMzMzGbMzMzMzMzMzH////////////
+ //////////fMzMzMzMzMzMzMeP////////iIiIj///////98zMzMzMzMzMzMxmzMzMzMzMzMyP//////
+ //////////////+HzMzMzMzMzMzMzHj/////////+IiP////////jMzMzMzMzMzMzMZszMzMzMzMzMj/
+ ////////////////////jMzMzMzMzMzMzMzIj////////////////////4zMzMzMzMzMzMzGTMzMzMzM
+ zMzH////////////////////+HzMzMzMzMzMzMzMx4////////////////////+MzMzMzMzMzMzMxAzM
+ zMzMzMzMx/////////////////////jMzMzMzMzMzMzMzMyI///////////////////4fMzMzMzMzMzM
+ zMAGzMzMzMzMzMeP//////////////////+HzMzMzMzMzMzMzMzMeP//////////////////+HzMzMzM
+ zMzMzMxgBszMzMzMzMzHj//////////////////4fMzMzMzMzMzMzMzMzMeP//////////////////h8
+ zMzMzMzMzMzMYADMzMzMzMzMzI//////////////////+HzMzMzMzMzMzMzMzMzHj///////////////
+ ///4zMzMzMzMzMzMzAAAbMzMzMzMzMyP/////////////////4fMzMzMzMzMzMzMzMzMzHj/////////
+ ////////+MzMzMzMzMzMzMYAAEzMzMzMzMzMj/////////////////+MzMzMzMzMzMzMzMzMzMzIj///
+ /////////////4fMzMzMzMzMzMzEAAAGzMzMzMzMzHj////////////////4fMzMzMzMzMzMzMzMzMzM
+ x4////////////////+MzMzMzMzMzMzMYAAABMzMzMzMzMx4////////////////h8zMzMzMzMzMzMzM
+ zMzMzMx4///////////////4fMzMzMzMzMzMzEAAAABszMzMzMzMx4//////////////+HzMzMzMzMzM
+ zMzMzMzMzMzMx4//////////////+MzMzMzMzMzMzMYAAAAATMzMzMzMzMyP/////////////4fMzMzM
+ zMzMzMzMzMzMzMzMzMeI/////////////4fMzMzMzMzMzMzEAAAAAAbMzMzMzMzMeP////////////h8
+ zMzMzMzMzMzMzMzMzMzMzMzMeI////////////h8zMzMzMzMzMzMYAAAAAAAbMzMzMzMzMeP////////
+ //iHzMzMzMzMzMzMzMzMzMzMzMzMzMyI//////////+HzMzMzMzMzMzMxgAAAAAAAEzMzMzMzMzMeP//
+ //////iHfMzMzMzMzMzMzMzMzMzMzMzMzMzMx4/////////4fMzMzMzMzMzMzMQAAAAAAAAGzMzMzMzM
+ zMeI//////iHfMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx4j//////4h8zMzMzMzMzMzMxgAAAAAAAAAGzM
+ zMzMzMzMx4iIiIiHzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzHiIj/+Ih3zMzMzMzMzMzMzGAAAAAAAA
+ AAAGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMx3iId8zMzMzMzMzMzMzMYAAA
+ AAAAAAAAAGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ xgAAAAAAAAAAAAAGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzGAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzGQAAAAAAAAAAAAAAAAAbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMYAAAAAAAAAAAAAAAAAAARszMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAABGzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAAAAAEbMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMzMzMzMzMZAAAAAAAAAAAAAAAAAAAAAAAAAAABmzMzMzMzMzMzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMzMzMzMzMzMzGYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARGZmzMzMzMzMzMzMzM
+ zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMZmZEAAAAAAAAAAAAAAAAD////+AAAAAAAAAAD/////////AAAA
+ AAAAAAAAAP//////+AAAAAAAAAAAAAAf/////+AAAAAAAAAAAAAAB/////+AAAAAAAAAAAAAAAH////+
+ AAAAAAAAAAAAAAAAf////AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAAP///gAAAAAAAAAAAAAAAA
+ B///wAAAAAAAAAAAAAAAAAP//4AAAAAAAAAAAAAAAAAB//8AAAAAAAAAAAAAAAAAAP/+AAAAAAAAAAAA
+ AAAAAAB//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAAAAAAAAAf+AAAAAAA
+ AAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAAAAAAAAAAAAAAB+AA
+ AAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AAAAAAAAAAAAAAAAAA
+ AAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABAAAAAAAA
+ AAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+ AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+ AAAAAAABgAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAADwAAAAAAA
+ AAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AA
+ AAAAAAAAAAAAAAAAAA/4AAAAAAAAAAAAAAAAAAAf+AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAA
+ AD/+AAAAAAAAAAAAAAAAAAB//gAAAAAAAAAAAAAAAAAAf/8AAAAAAAAAAAAAAAAAAP//gAAAAAAAAAAA
+ AAAAAAH//8AAAAAAAAAAAAAAAAAD///gAAAAAAAAAAAAAAAAB///8AAAAAAAAAAAAAAAAA////wAAAAA
+ AAAAAAAAAAA////+AAAAAAAAAAAAAAAAf////4AAAAAAAAAAAAAAAf/////gAAAAAAAAAAAAAAf/////
+ +AAAAAAAAAAAAAAf//////8AAAAAAAAAAAAA/////////gAAAAAAAAAAf////w==
+
+
+
\ No newline at end of file
diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs
index ca2739b..c897a5b 100644
--- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs
@@ -49,6 +49,7 @@ namespace TemuKJD.WXForms.ProductForms
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXUserCollectAuthProdListForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+ this.btnBatchEditCate = new DevComponents.DotNetBar.PanelEx();
this.cmbBatchEditNotes = new System.Windows.Forms.ComboBox();
this.btnEditNotes = new DevComponents.DotNetBar.PanelEx();
this.btnBatchEditNotes = new DevComponents.DotNetBar.PanelEx();
@@ -175,6 +176,7 @@ namespace TemuKJD.WXForms.ProductForms
//
// splitContainer1.Panel1
//
+ this.splitContainer1.Panel1.Controls.Add(this.btnBatchEditCate);
this.splitContainer1.Panel1.Controls.Add(this.cmbBatchEditNotes);
this.splitContainer1.Panel1.Controls.Add(this.btnEditNotes);
this.splitContainer1.Panel1.Controls.Add(this.btnBatchEditNotes);
@@ -199,6 +201,31 @@ namespace TemuKJD.WXForms.ProductForms
this.splitContainer1.SplitterDistance = 115;
this.splitContainer1.TabIndex = 1;
//
+ // btnBatchEditCate
+ //
+ this.btnBatchEditCate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnBatchEditCate.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnBatchEditCate.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnBatchEditCate.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnBatchEditCate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnBatchEditCate.Location = new System.Drawing.Point(1345, 78);
+ this.btnBatchEditCate.Name = "btnBatchEditCate";
+ this.btnBatchEditCate.Size = new System.Drawing.Size(84, 25);
+ this.btnBatchEditCate.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnBatchEditCate.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnBatchEditCate.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnBatchEditCate.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnBatchEditCate.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnBatchEditCate.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnBatchEditCate.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnBatchEditCate.Style.GradientAngle = 90;
+ this.btnBatchEditCate.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnBatchEditCate.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnBatchEditCate.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnBatchEditCate.TabIndex = 1307;
+ this.btnBatchEditCate.Text = "批量修改类目";
+ this.btnBatchEditCate.Click += new System.EventHandler(this.btnBatchEditCate_Click);
+ //
// cmbBatchEditNotes
//
this.cmbBatchEditNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -312,9 +339,9 @@ namespace TemuKJD.WXForms.ProductForms
this.btnOut1688ProdSaveDb.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnOut1688ProdSaveDb.DisabledBackColor = System.Drawing.Color.Empty;
this.btnOut1688ProdSaveDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnOut1688ProdSaveDb.Location = new System.Drawing.Point(1328, 78);
+ this.btnOut1688ProdSaveDb.Location = new System.Drawing.Point(1221, 78);
this.btnOut1688ProdSaveDb.Name = "btnOut1688ProdSaveDb";
- this.btnOut1688ProdSaveDb.Size = new System.Drawing.Size(101, 25);
+ this.btnOut1688ProdSaveDb.Size = new System.Drawing.Size(105, 25);
this.btnOut1688ProdSaveDb.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnOut1688ProdSaveDb.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnOut1688ProdSaveDb.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -337,7 +364,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnImportPddOutData.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnImportPddOutData.DisabledBackColor = System.Drawing.Color.Empty;
this.btnImportPddOutData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnImportPddOutData.Location = new System.Drawing.Point(1221, 78);
+ this.btnImportPddOutData.Location = new System.Drawing.Point(1115, 78);
this.btnImportPddOutData.Name = "btnImportPddOutData";
this.btnImportPddOutData.Size = new System.Drawing.Size(105, 25);
this.btnImportPddOutData.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1721,5 +1748,6 @@ namespace TemuKJD.WXForms.ProductForms
private DevComponents.DotNetBar.PanelEx btnEditNotes;
public System.Windows.Forms.ComboBox cmbNotes;
public System.Windows.Forms.ComboBox cmbBatchEditNotes;
+ private DevComponents.DotNetBar.PanelEx btnBatchEditCate;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs
index 52abea7..f2f84ee 100644
--- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs
@@ -1274,6 +1274,21 @@ namespace TemuKJD.WXForms.ProductForms
PDDDBProdListForm.GetPDDProductNotes(new List { cmbBatchEditNotes }, addUserName);
}
+ private void btnBatchEditCate_Click(object sender, EventArgs e)
+ {
+ var rows = dgvDbProduct.Rows.Cast().Where(row
+ => row.Cells["colSelect"]?.Value.ParseToBool() == true);
+ var prodIdList = rows.Select(r => r.Cells["col_spu_id"]?.Value.ToString()).ToList();
+ var prodList = lstTemuDbProduct.Where(p => prodIdList.Contains(p.spu_id)).ToList();
+ if (prodList.Count == 0)
+ {
+ BaseMsgForm.ShowError("请选择要修改类目的商品");
+ return;
+ }
- }
+ WXUserCollectAuthProdEditCatesForm form = new WXUserCollectAuthProdEditCatesForm(prodList);
+ form.ShowDialog();
+ SearchDbProd(this.ucSplitPage1.CurrentPage);
+ }
+ }
}
diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.resx b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.resx
index 1d37d6e..8ae7193 100644
--- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.resx
+++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.resx
@@ -117,39 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 17, 17
-
-
- 148, 17
-
-
- 311, 17
-
-
- 460, 17
-
-
- 655, 17
-
-
- 840, 17
-
-
- 948, 17
-
-
- 1061, 17
-
-
- 1189, 17
-
-
- 1299, 17
-
-
- 17, 55
-
True
diff --git a/test/KJD.Test/KJD.Test.csproj b/test/KJD.Test/KJD.Test.csproj
index 26ad990..a4631bb 100644
--- a/test/KJD.Test/KJD.Test.csproj
+++ b/test/KJD.Test/KJD.Test.csproj
@@ -1,7 +1,7 @@
- net10.0
+ net9.0
latest
enable
enable