定向品牌

This commit is contained in:
wule committed 2026-08-12 11:25:15 +08:00
1 parent c4a36b1956
commit 4d38059e72
4 files changed
+132 -107

No files matched your search

+50 -38
View File
@@ -30,9 +30,9 @@ namespace TemuKJD.WXForms.AdminForms
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer5 = new System.Windows.Forms.SplitContainer(); this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.pnlSuperManage = new System.Windows.Forms.Panel(); this.pnlSuperManage = new System.Windows.Forms.Panel();
this.label10 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label();
@@ -111,6 +111,8 @@ namespace TemuKJD.WXForms.AdminForms
this.btnShopPointsPerMonthCancel = new DevComponents.DotNetBar.PanelEx(); this.btnShopPointsPerMonthCancel = new DevComponents.DotNetBar.PanelEx();
this.btnShopPointsPerMonth = new DevComponents.DotNetBar.PanelEx(); this.btnShopPointsPerMonth = new DevComponents.DotNetBar.PanelEx();
this.pnlTopUp = new System.Windows.Forms.Panel(); this.pnlTopUp = new System.Windows.Forms.Panel();
this.lblTopUpNickName = new System.Windows.Forms.Label();
this.lblTopUpUserId = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label();
this.lblUserInfo = new System.Windows.Forms.Label(); this.lblUserInfo = new System.Windows.Forms.Label();
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
@@ -145,8 +147,7 @@ namespace TemuKJD.WXForms.AdminForms
this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn();
this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn();
this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx();
this.lblTopUpNickName = new System.Windows.Forms.Label(); this.chkSpBrand = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.lblTopUpUserId = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit();
this.splitContainer5.Panel1.SuspendLayout(); this.splitContainer5.Panel1.SuspendLayout();
this.splitContainer5.Panel2.SuspendLayout(); this.splitContainer5.Panel2.SuspendLayout();
@@ -202,6 +203,7 @@ namespace TemuKJD.WXForms.AdminForms
this.pnlSuperManage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.pnlSuperManage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.pnlSuperManage.Controls.Add(this.chkSpBrand);
this.pnlSuperManage.Controls.Add(this.label10); this.pnlSuperManage.Controls.Add(this.label10);
this.pnlSuperManage.Controls.Add(this.label5); this.pnlSuperManage.Controls.Add(this.label5);
this.pnlSuperManage.Controls.Add(this.txtOemId); this.pnlSuperManage.Controls.Add(this.txtOemId);
@@ -552,7 +554,7 @@ namespace TemuKJD.WXForms.AdminForms
this.btnOpUser.Cursor = System.Windows.Forms.Cursors.Hand; this.btnOpUser.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnOpUser.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpUser.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpUser.ForeColor = System.Drawing.Color.White; this.btnOpUser.ForeColor = System.Drawing.Color.White;
this.btnOpUser.Location = new System.Drawing.Point(157, 571); this.btnOpUser.Location = new System.Drawing.Point(157, 580);
this.btnOpUser.Name = "btnOpUser"; this.btnOpUser.Name = "btnOpUser";
this.btnOpUser.Size = new System.Drawing.Size(86, 25); this.btnOpUser.Size = new System.Drawing.Size(86, 25);
this.btnOpUser.TabIndex = 34; this.btnOpUser.TabIndex = 34;
@@ -577,7 +579,7 @@ namespace TemuKJD.WXForms.AdminForms
this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand; this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCancel.ForeColor = System.Drawing.Color.White; this.btnCancel.ForeColor = System.Drawing.Color.White;
this.btnCancel.Location = new System.Drawing.Point(42, 571); this.btnCancel.Location = new System.Drawing.Point(42, 580);
this.btnCancel.Name = "btnCancel"; this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(86, 25); this.btnCancel.Size = new System.Drawing.Size(86, 25);
this.btnCancel.TabIndex = 35; this.btnCancel.TabIndex = 35;
@@ -599,7 +601,7 @@ namespace TemuKJD.WXForms.AdminForms
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.SystemColors.ButtonShadow; this.label1.ForeColor = System.Drawing.SystemColors.ButtonShadow;
this.label1.Location = new System.Drawing.Point(30, 490); this.label1.Location = new System.Drawing.Point(30, 500);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(236, 68); this.label1.Size = new System.Drawing.Size(236, 68);
this.label1.TabIndex = 37; this.label1.TabIndex = 37;
@@ -1181,6 +1183,26 @@ namespace TemuKJD.WXForms.AdminForms
this.pnlTopUp.TabIndex = 8; this.pnlTopUp.TabIndex = 8;
this.pnlTopUp.Visible = false; this.pnlTopUp.Visible = false;
// //
// lblTopUpNickName
//
this.lblTopUpNickName.AutoSize = true;
this.lblTopUpNickName.Location = new System.Drawing.Point(259, 19);
this.lblTopUpNickName.Name = "lblTopUpNickName";
this.lblTopUpNickName.Size = new System.Drawing.Size(69, 17);
this.lblTopUpNickName.TabIndex = 461;
this.lblTopUpNickName.Text = "NickName";
this.lblTopUpNickName.Visible = false;
//
// lblTopUpUserId
//
this.lblTopUpUserId.AutoSize = true;
this.lblTopUpUserId.Location = new System.Drawing.Point(212, 19);
this.lblTopUpUserId.Name = "lblTopUpUserId";
this.lblTopUpUserId.Size = new System.Drawing.Size(47, 17);
this.lblTopUpUserId.TabIndex = 460;
this.lblTopUpUserId.Text = "UserId";
this.lblTopUpUserId.Visible = false;
//
// label14 // label14
// //
this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -1291,20 +1313,20 @@ namespace TemuKJD.WXForms.AdminForms
// //
this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToAddRows = false;
this.dgvUser.AllowUserToDeleteRows = false; this.dgvUser.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
this.dgvUser.AutoRowNumber = true; this.dgvUser.AutoRowNumber = true;
this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvUser.BackgroundColor = System.Drawing.Color.White; this.dgvUser.BackgroundColor = System.Drawing.Color.White;
this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck, this.colCheck,
@@ -1449,8 +1471,8 @@ namespace TemuKJD.WXForms.AdminForms
// //
// colPlus // colPlus
// //
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.colPlus.DefaultCellStyle = dataGridViewCellStyle3; this.colPlus.DefaultCellStyle = dataGridViewCellStyle6;
this.colPlus.FillWeight = 22F; this.colPlus.FillWeight = 22F;
this.colPlus.HeaderText = "+"; this.colPlus.HeaderText = "+";
this.colPlus.Name = "colPlus"; this.colPlus.Name = "colPlus";
@@ -1548,25 +1570,14 @@ namespace TemuKJD.WXForms.AdminForms
this.btnExportShopErp.Visible = false; this.btnExportShopErp.Visible = false;
this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click);
// //
// lblTopUpNickName // chkSpBrand
// //
this.lblTopUpNickName.AutoSize = true; this.chkSpBrand.Location = new System.Drawing.Point(95, 478);
this.lblTopUpNickName.Location = new System.Drawing.Point(259, 19); this.chkSpBrand.Name = "chkSpBrand";
this.lblTopUpNickName.Name = "lblTopUpNickName"; this.chkSpBrand.Size = new System.Drawing.Size(68, 21);
this.lblTopUpNickName.Size = new System.Drawing.Size(69, 17); this.chkSpBrand.TabIndex = 848;
this.lblTopUpNickName.TabIndex = 461; this.chkSpBrand.Text = "定向品牌";
this.lblTopUpNickName.Text = "NickName"; this.chkSpBrand.UseVisualStyleBackColor = true;
this.lblTopUpNickName.Visible = false;
//
// lblTopUpUserId
//
this.lblTopUpUserId.AutoSize = true;
this.lblTopUpUserId.Location = new System.Drawing.Point(212, 19);
this.lblTopUpUserId.Name = "lblTopUpUserId";
this.lblTopUpUserId.Size = new System.Drawing.Size(47, 17);
this.lblTopUpUserId.TabIndex = 460;
this.lblTopUpUserId.Text = "UserId";
this.lblTopUpUserId.Visible = false;
// //
// WXAdminAccountForm // WXAdminAccountForm
// //
@@ -1731,5 +1742,6 @@ namespace TemuKJD.WXForms.AdminForms
private System.Windows.Forms.Label lblBalanceNickName; private System.Windows.Forms.Label lblBalanceNickName;
private System.Windows.Forms.Label lblTopUpNickName; private System.Windows.Forms.Label lblTopUpNickName;
private System.Windows.Forms.Label lblTopUpUserId; private System.Windows.Forms.Label lblTopUpUserId;
private UserComponent.UcCheckBox chkSpBrand;
} }
} }
@@ -99,6 +99,8 @@ namespace TemuKJD.WXForms.AdminForms
authority += chkProdFission.Text + ","; // 裂变调试 authority += chkProdFission.Text + ","; // 裂变调试
if (chkTraineeData.Checked) if (chkTraineeData.Checked)
authority += chkTraineeData.Text + ","; // 学员数据 authority += chkTraineeData.Text + ","; // 学员数据
if (chkSpBrand.Checked)
authority += chkSpBrand.Text + ","; // 定向品牌
data.Append("&authority=" + authority.Trim(',')); data.Append("&authority=" + authority.Trim(','));
string url = BaseClass.BuildObjString("user/add_user"); string url = BaseClass.BuildObjString("user/add_user");
@@ -225,6 +227,7 @@ namespace TemuKJD.WXForms.AdminForms
chkWXShowProdGetFromType.Checked = false; chkWXShowProdGetFromType.Checked = false;
chkChanceProdCollect.Checked = false; chkChanceProdCollect.Checked = false;
chkTraineeData.Checked = false; chkTraineeData.Checked = false;
chkSpBrand.Checked = false;
chkShopOptimize.Checked = false; chkShopOptimize.Checked = false;
chkEcWaybill.Checked = false; chkEcWaybill.Checked = false;
chkCommissionUpdate.Checked = false; chkCommissionUpdate.Checked = false;
@@ -274,6 +277,7 @@ namespace TemuKJD.WXForms.AdminForms
chkProdFission.Checked = authority.Contains(chkProdFission.Text); chkProdFission.Checked = authority.Contains(chkProdFission.Text);
chkChanceProdCollect.Checked = authority.Contains(chkChanceProdCollect.Text); chkChanceProdCollect.Checked = authority.Contains(chkChanceProdCollect.Text);
chkTraineeData.Checked = authority.Contains(chkTraineeData.Text); chkTraineeData.Checked = authority.Contains(chkTraineeData.Text);
chkSpBrand.Checked = authority.Contains(chkSpBrand.Text);
chkShopOptimize.Checked = authority.Contains(chkShopOptimize.Text); chkShopOptimize.Checked = authority.Contains(chkShopOptimize.Text);
chkEcWaybill.Checked = authority.Contains(chkEcWaybill.Text); chkEcWaybill.Checked = authority.Contains(chkEcWaybill.Text);
chkCommissionUpdate.Checked = authority.Contains(chkCommissionUpdate.Text); chkCommissionUpdate.Checked = authority.Contains(chkCommissionUpdate.Text);
+27 -27
View File
@@ -103,8 +103,8 @@ namespace TemuKJD.WXForms.ProductForms
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.label39 = new System.Windows.Forms.Label(); this.label39 = new System.Windows.Forms.Label();
this.chkSkipReplaceText = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkSkipReplaceText = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.上传参数2 = new System.Windows.Forms.TabPage(); this.特殊参数 = new System.Windows.Forms.TabPage();
this.label40 = new System.Windows.Forms.Label(); this.lblSpBrand = new System.Windows.Forms.Label();
this.cmbSpBrandName = new System.Windows.Forms.ComboBox(); this.cmbSpBrandName = new System.Windows.Forms.ComboBox();
this.佣金上货 = new System.Windows.Forms.TabPage(); this.佣金上货 = new System.Windows.Forms.TabPage();
this.label31 = new System.Windows.Forms.Label(); this.label31 = new System.Windows.Forms.Label();
@@ -261,7 +261,7 @@ namespace TemuKJD.WXForms.ProductForms
this.fPnlPriceRule.SuspendLayout(); this.fPnlPriceRule.SuspendLayout();
this.ucTabControlMetro1.SuspendLayout(); this.ucTabControlMetro1.SuspendLayout();
this.上传参数1.SuspendLayout(); this.上传参数1.SuspendLayout();
this.上传参数2.SuspendLayout(); this.特殊参数.SuspendLayout();
this.佣金上货.SuspendLayout(); this.佣金上货.SuspendLayout();
this.裂变调试.SuspendLayout(); this.裂变调试.SuspendLayout();
this.ucGroupBoxEx4.SuspendLayout(); this.ucGroupBoxEx4.SuspendLayout();
@@ -762,7 +762,7 @@ namespace TemuKJD.WXForms.ProductForms
this.ucTabControlMetro1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(251)))), ((int)(((byte)(251))))); this.ucTabControlMetro1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(251)))), ((int)(((byte)(251)))));
this.ucTabControlMetro1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(174)))), ((int)(((byte)(157))))); this.ucTabControlMetro1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(174)))), ((int)(((byte)(157)))));
this.ucTabControlMetro1.Controls.Add(this.上传参数1); this.ucTabControlMetro1.Controls.Add(this.上传参数1);
this.ucTabControlMetro1.Controls.Add(this.上传参数2); this.ucTabControlMetro1.Controls.Add(this.特殊参数);
this.ucTabControlMetro1.Controls.Add(this.佣金上货); this.ucTabControlMetro1.Controls.Add(this.佣金上货);
this.ucTabControlMetro1.Controls.Add(this.裂变调试); this.ucTabControlMetro1.Controls.Add(this.裂变调试);
this.ucTabControlMetro1.ItemSize = new System.Drawing.Size(72, 24); this.ucTabControlMetro1.ItemSize = new System.Drawing.Size(72, 24);
@@ -1182,28 +1182,28 @@ namespace TemuKJD.WXForms.ProductForms
this.chkSkipReplaceText.UseVisualStyleBackColor = true; this.chkSkipReplaceText.UseVisualStyleBackColor = true;
this.chkSkipReplaceText.CheckedChanged += new System.EventHandler(this.chkSkipReplaceText_CheckedChanged); this.chkSkipReplaceText.CheckedChanged += new System.EventHandler(this.chkSkipReplaceText_CheckedChanged);
// //
// 上传参数2 // 特殊参数
// //
this.上传参数2.Controls.Add(this.label40); this.特殊参数.Controls.Add(this.lblSpBrand);
this.上传参数2.Controls.Add(this.cmbSpBrandName); this.特殊参数.Controls.Add(this.cmbSpBrandName);
this.上传参数2.Location = new System.Drawing.Point(4, 28); this.特殊参数.Location = new System.Drawing.Point(4, 28);
this.上传参数2.Name = "上传参数2"; this.特殊参数.Name = "特殊参数";
this.上传参数2.Padding = new System.Windows.Forms.Padding(3); this.特殊参数.Padding = new System.Windows.Forms.Padding(3);
this.上传参数2.Size = new System.Drawing.Size(611, 118); this.特殊参数.Size = new System.Drawing.Size(611, 118);
this.上传参数2.TabIndex = 4; this.特殊参数.TabIndex = 4;
this.上传参数2.Text = "特殊参数"; this.特殊参数.Text = "特殊参数";
this.上传参数2.UseVisualStyleBackColor = true; this.特殊参数.UseVisualStyleBackColor = true;
// //
// label40 // lblSpBrand
// //
this.label40.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblSpBrand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label40.AutoSize = true; this.lblSpBrand.AutoSize = true;
this.label40.Location = new System.Drawing.Point(7, 15); this.lblSpBrand.Location = new System.Drawing.Point(7, 15);
this.label40.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblSpBrand.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label40.Name = "label40"; this.lblSpBrand.Name = "lblSpBrand";
this.label40.Size = new System.Drawing.Size(56, 17); this.lblSpBrand.Size = new System.Drawing.Size(56, 17);
this.label40.TabIndex = 825; this.lblSpBrand.TabIndex = 825;
this.label40.Text = "定向品牌"; this.lblSpBrand.Text = "定向品牌";
// //
// cmbSpBrandName // cmbSpBrandName
// //
@@ -3229,8 +3229,8 @@ namespace TemuKJD.WXForms.ProductForms
this.ucTabControlMetro1.ResumeLayout(false); this.ucTabControlMetro1.ResumeLayout(false);
this.上传参数1.ResumeLayout(false); this.上传参数1.ResumeLayout(false);
this.上传参数1.PerformLayout(); this.上传参数1.PerformLayout();
this.上传参数2.ResumeLayout(false); this.特殊参数.ResumeLayout(false);
this.上传参数2.PerformLayout(); this.特殊参数.PerformLayout();
this.佣金上货.ResumeLayout(false); this.佣金上货.ResumeLayout(false);
this.佣金上货.PerformLayout(); this.佣金上货.PerformLayout();
this.裂变调试.ResumeLayout(false); this.裂变调试.ResumeLayout(false);
@@ -3473,8 +3473,8 @@ namespace TemuKJD.WXForms.ProductForms
private System.Windows.Forms.NumericUpDown numFilterViewUv; private System.Windows.Forms.NumericUpDown numFilterViewUv;
private UserComponent.UcCheckBox chkFilterViewUv; private UserComponent.UcCheckBox chkFilterViewUv;
private UserComponent.UcCheckBox chkUseShanghaiReturnOrderAddress; private UserComponent.UcCheckBox chkUseShanghaiReturnOrderAddress;
private System.Windows.Forms.TabPage 上传参数2; private System.Windows.Forms.TabPage 特殊参数;
private System.Windows.Forms.Label label40; private System.Windows.Forms.Label lblSpBrand;
private System.Windows.Forms.ComboBox cmbSpBrandName; private System.Windows.Forms.ComboBox cmbSpBrandName;
} }
} }
@@ -81,6 +81,14 @@ namespace TemuKJD.WXForms.ProductForms
{ {
Instance = this; Instance = this;
if (!BaseClass.UserAuthority.Contains("定向品牌"))
{
cmbSpBrandName.Visible = lblSpBrand.Visible = false;
this.ucTabControlMetro1.TabPages.Remove(特殊参数);
}
else
cmbSpBrandName.Visible = lblSpBrand.Visible = true;
if (!BaseClass.UserAuthority.Contains("佣金上货")) if (!BaseClass.UserAuthority.Contains("佣金上货"))
this.ucTabControlMetro1.TabPages.Remove(佣金上货); this.ucTabControlMetro1.TabPages.Remove(佣金上货);
else else
@@ -288,7 +296,7 @@ namespace TemuKJD.WXForms.ProductForms
break; break;
} }
if (dgvSelectProduct.Rows.Count % 100 == 0) if (dgvSelectProduct.Rows.Count % 100 == 0)
Thread.Sleep(1); Thread.Sleep(1);
Invoke(new Action(() => Invoke(new Action(() =>
{ {
int rowIndex = this.dgvSelectProduct.Rows.Add( int rowIndex = this.dgvSelectProduct.Rows.Add(
@@ -383,7 +391,7 @@ namespace TemuKJD.WXForms.ProductForms
this.lblSourceType.Visible = true; this.lblSourceType.Visible = true;
this.cmbSourceType.Visible = true; this.cmbSourceType.Visible = true;
this.cmbSourceType.Items.Clear(); this.cmbSourceType.Items.Clear();
cmbSourceType.Items.Add(""); cmbSourceType.Items.Add("");
if (BaseClass.UserAuthority.Contains("学员数据") || BaseClass.ParentAuthority.Contains("学员数据")) if (BaseClass.UserAuthority.Contains("学员数据") || BaseClass.ParentAuthority.Contains("学员数据"))
{ {
cmbSourceType.Items.Add("学员数据"); cmbSourceType.Items.Add("学员数据");
@@ -427,7 +435,7 @@ namespace TemuKJD.WXForms.ProductForms
{ {
if (ctrlLst[i].Visible == false) if (ctrlLst[i].Visible == false)
{ {
for (int j= ctrlLst.Count - 2; j > i; j-=2) for (int j = ctrlLst.Count - 2; j > i; j -= 2)
{ {
ctrlLst[j].Parent = ucGroupBoxEx4; ctrlLst[j].Parent = ucGroupBoxEx4;
ctrlLst[j].Location = new Point(ctrlLst[j - 2].Location.X + ctrlLst[j - 2].Width - ctrlLst[j].Width, ctrlLst[j - 2].Location.Y); ctrlLst[j].Location = new Point(ctrlLst[j - 2].Location.X + ctrlLst[j - 2].Width - ctrlLst[j].Width, ctrlLst[j - 2].Location.Y);
@@ -567,7 +575,7 @@ namespace TemuKJD.WXForms.ProductForms
foreach (DataGridViewRow row in dgvShop.Rows) foreach (DataGridViewRow row in dgvShop.Rows)
{ {
//if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString())) //if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString()))
if(row.Visible == true) if (row.Visible == true)
row.Cells["colSelect"].Value = true; row.Cells["colSelect"].Value = true;
} }
} }
@@ -1174,29 +1182,29 @@ namespace TemuKJD.WXForms.ProductForms
Invoke(new Action(() => Invoke(new Action(() =>
{ {
int rowIndex = 0; int rowIndex = 0;
this.dgvSelectProduct.Rows.Insert(rowIndex, this.dgvSelectProduct.Rows.Insert(rowIndex,
true, true,
selectProd.id, selectProd.id,
selectProd.shop_id, selectProd.shop_id,
selectProd.shop_account, selectProd.shop_account,
"登录", "登录",
"进店", "进店",
BaseClass.SaLevel > 0 ? selectProd.spu_id : selectProd.spu_id.ParseToString().GetHashCode().ParseToString().Trim('-'), BaseClass.SaLevel > 0 ? selectProd.spu_id : selectProd.spu_id.ParseToString().GetHashCode().ParseToString().Trim('-'),
selectProd.skc_id, selectProd.skc_id,
selectProd.main_img, selectProd.main_img,
DataGridViewExtension.defaultBitmap, DataGridViewExtension.defaultBitmap,
"", "",
null, null,
selectProd.product_name, // 用户端显示商品原名 selectProd.product_name, // 用户端显示商品原名
selectProd.cat_name, selectProd.cat_name,
BaseClass.SaLevel > 0 ? selectProd.ext_code : selectProd.ext_code.ParseToString().GetHashCode().ParseToString().Trim('-'), BaseClass.SaLevel > 0 ? selectProd.ext_code : selectProd.ext_code.ParseToString().GetHashCode().ParseToString().Trim('-'),
selectProd.status, selectProd.status,
selectProd.draft_id, selectProd.draft_id,
selectProd.notes, selectProd.notes,
(selectProd.user_notes + " 编辑").Trim(), (selectProd.user_notes + " 编辑").Trim(),
"删除", "删除",
"", "",
""); "");
dgvSelectProduct.Rows[rowIndex].Height = 60; dgvSelectProduct.Rows[rowIndex].Height = 60;
@@ -1548,7 +1556,8 @@ namespace TemuKJD.WXForms.ProductForms
if (BaseClass.UserAuthority.Contains("裂变调试") && chkFissionGoodsName.Checked) if (BaseClass.UserAuthority.Contains("裂变调试") && chkFissionGoodsName.Checked)
{ {
bool isFinish = false; bool isFinish = false;
Invoke(new Action(() => { Invoke(new Action(() =>
{
var titles = txtFissionTitle.Text.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).ToList(); var titles = txtFissionTitle.Text.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).ToList();
if (titles.Count == 0) if (titles.Count == 0)
{ {
@@ -1895,7 +1904,7 @@ namespace TemuKJD.WXForms.ProductForms
if (!string.IsNullOrEmpty(dbProd.sku_edit_json)) if (!string.IsNullOrEmpty(dbProd.sku_edit_json))
prodJObj["detail"]["sku"] = JArray.Parse(JsonHelper.SerializeObject(JsonHelper.DeserializeJsonToList<sku_item>(dbProd.sku_edit_json))); prodJObj["detail"]["sku"] = JArray.Parse(JsonHelper.SerializeObject(JsonHelper.DeserializeJsonToList<sku_item>(dbProd.sku_edit_json)));
// 过滤sku敏感词 // 过滤sku敏感词
if (lstTitleReplaceText.Count> 0) if (lstTitleReplaceText.Count > 0)
{ {
var skuJArr = prodJObj["detail"]["sku"] as JArray; var skuJArr = prodJObj["detail"]["sku"] as JArray;
try try
@@ -2701,7 +2710,7 @@ namespace TemuKJD.WXForms.ProductForms
return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"获取类目保证金失败\"}"; return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"获取类目保证金失败\"}";
var maxBount = txtFilterBoundMax.Text.Trim().ParseToInt(); var maxBount = txtFilterBoundMax.Text.Trim().ParseToInt();
var minBount = txtFilterBoundMin.Text.Trim().ParseToInt(); var minBount = txtFilterBoundMin.Text.Trim().ParseToInt();
if (bound.cat_bound < minBount || bound.cat_bound > maxBount ) if (bound.cat_bound < minBount || bound.cat_bound > maxBount)
return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"类目保证金(" + bound.cat_bound + ")超过过滤限制(" + minBount + "-" + maxBount + ")\"}"; return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"类目保证金(" + bound.cat_bound + ")超过过滤限制(" + minBount + "-" + maxBount + ")\"}";
// 定向类目需指定品牌Id // 定向类目需指定品牌Id
@@ -3179,7 +3188,7 @@ namespace TemuKJD.WXForms.ProductForms
return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"运费模板获取失败 " + ex.Message + "\"}"; return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"运费模板获取失败 " + ex.Message + "\"}";
} }
} }
if (shipPrice <=0) if (shipPrice <= 0)
{ {
return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"运费模板获取失败 未获取到\"}"; return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"运费模板获取失败 未获取到\"}";
} }
@@ -3419,7 +3428,7 @@ namespace TemuKJD.WXForms.ProductForms
// 直接转换微信回采 // 直接转换微信回采
if (BaseClass.UserAuthority.ParseToString().Contains("微信回采") && chkUseWXComplateProd.Checked && dbProd.has_wx_format == "1" && wxEditProdInfo != null) if (BaseClass.UserAuthority.ParseToString().Contains("微信回采") && chkUseWXComplateProd.Checked && dbProd.has_wx_format == "1" && wxEditProdInfo != null)
{ {
foreach(var wxEditPropParam in wxEditProdInfo.product.info.param) foreach (var wxEditPropParam in wxEditProdInfo.product.info.param)
{ {
var wxPropParam = new wxPropParam(); var wxPropParam = new wxPropParam();
upProdParam.product.info.param.Add(wxPropParam); upProdParam.product.info.param.Add(wxPropParam);
@@ -3644,7 +3653,7 @@ namespace TemuKJD.WXForms.ProductForms
} }
else if (attr.name == "产地") else if (attr.name == "产地")
{ {
if(attr.type == "select_one") if (attr.type == "select_one")
{ {
//北京;天津;上海;重庆;河北石家庄;河北唐山;河北秦皇岛;河北邯郸;河北邢台;河北保定;河北张家口;河北承德;河北沧州;河北廊坊;河北衡水;山西太原;山西大同;山西阳泉;山西长治;山西晋城;山西朔州;山西晋中;山西运城;山西忻州;山西临汾;山西吕梁;内蒙古呼和浩特;内蒙古包头;内蒙古乌海;内蒙古赤峰;内蒙古通辽;内蒙古鄂尔多斯;内蒙古呼伦贝尔;内蒙古巴彦淖尔;内蒙古乌兰察布;内蒙古兴安;内蒙古锡林郭勒;内蒙古阿拉善;辽宁沈阳;辽宁大连;辽宁鞍山;辽宁抚顺;辽宁本溪;辽宁丹东;辽宁锦州;辽宁营口;辽宁阜新;辽宁辽阳;辽宁盘锦;辽宁铁岭;辽宁朝阳;辽宁葫芦岛;吉林长春;吉林吉林;吉林四平;吉林辽源;吉林通化;吉林白山;吉林松原;吉林白城;吉林延边;黑龙江哈尔滨;黑龙江齐齐哈尔;黑龙江鸡西;黑龙江鹤岗;黑龙江双鸭山;黑龙江大庆;黑龙江伊春;黑龙江佳木斯;黑龙江七台河;黑龙江牡丹江;黑龙江黑河;黑龙江绥化;黑龙江大兴安岭;江苏南京;江苏无锡;江苏徐州;江苏常州;江苏苏州;江苏南通;江苏连云港;江苏淮安;江苏盐城;江苏扬州;江苏镇江;江苏泰州;江苏宿迁;浙江杭州;浙江宁波;浙江温州;浙江嘉兴;浙江湖州;浙江绍兴;浙江金华;浙江衢州;浙江舟山;浙江台州;浙江丽水;安徽合肥;安徽芜湖;安徽蚌埠;安徽淮南;安徽马鞍山;安徽淮北;安徽铜陵;安徽安庆;安徽黄山;安徽滁州;安徽阜阳;安徽宿州;安徽六安;安徽亳州;安徽池州;安徽宣城;福建福州;福建厦门;福建莆田;福建三明;福建泉州;福建漳州;福建南平;福建龙岩;福建宁德;江西南昌;江西景德镇;江西萍乡;江西九江;江西新余;江西鹰潭;江西赣州;江西吉安;江西宜春;江西抚州;江西上饶;山东济南;山东青岛;山东淄博;山东枣庄;山东东营;山东烟台;山东潍坊;山东济宁;山东泰安;山东威海;山东日照;山东临沂;山东德州;山东聊城;山东滨州;山东菏泽;河南郑州;河南开封;河南洛阳;河南平顶山;河南安阳;河南鹤壁;河南新乡;河南焦作;河南濮阳;河南许昌;河南漯河;河南三门峡;河南南阳;河南商丘;河南信阳;河南周口;河南驻马店;河南济源;湖北武汉;湖北黄石;湖北十堰;湖北宜昌;湖北襄阳;湖北鄂州;湖北荆门;湖北孝感;湖北荆州;湖北黄冈;湖北咸宁;湖北随州;湖北恩施;湖北仙桃;湖北潜江;湖北天门;湖北神农架;湖南长沙;湖南株洲;湖南湘潭;湖南衡阳;湖南邵阳;湖南岳阳;湖南常德;湖南张家界;湖南益阳;湖南郴州;湖南永州;湖南怀化;湖南娄底;湖南湘西;广东广州;广东韶关;广东深圳;广东珠海;广东汕头;广东佛山;广东江门;广东湛江;广东茂名;广东肇庆;广东惠州;广东梅州;广东汕尾;广东河源;广东阳江;广东清远;广东东莞;广东中山;广东潮州;广东揭阳;广东云浮;广西南宁;广西柳州;广西桂林;广西梧州;广西北海;广西防城港;广西钦州;广西贵港;广西玉林;广西百色;广西贺州;广西河池;广西来宾;广西崇左;海南海口;海南三亚;海南三沙;海南儋州;海南五指山;海南琼海;海南文昌;海南万宁;海南东方;海南定安;海南屯昌;海南澄迈;海南临高;海南白沙;海南昌江;海南乐东;海南陵水;海南保亭;海南琼中;四川成都;四川自贡;四川攀枝花;四川泸州;四川德阳;四川绵阳;四川广元;四川遂宁;四川内江;四川乐山;四川南充;四川眉山;四川宜宾;四川广安;四川达州;四川雅安;四川巴中;四川资阳;四川阿坝;四川甘孜;四川凉山;贵州贵阳;贵州六盘水;贵州遵义;贵州安顺;贵州毕节;贵州铜仁;贵州黔西南;贵州黔东南;贵州黔南;云南昆明;云南曲靖;云南玉溪;云南保山;云南昭通;云南丽江;云南普洱;云南临沧;云南楚雄;云南红河;云南文山;云南西双版纳;云南大理;云南德宏;云南怒江;云南迪庆;西藏拉萨;西藏日喀则;西藏昌都;西藏林芝;西藏山南;西藏那曲;西藏阿里;陕西西安;陕西铜川;陕西宝鸡;陕西咸阳;陕西渭南;陕西延安;陕西汉中;陕西榆林;陕西安康;陕西商洛;甘肃兰州;甘肃嘉峪关;甘肃金昌;甘肃白银;甘肃天水;甘肃武威;甘肃张掖;甘肃平凉;甘肃酒泉;甘肃庆阳;甘肃定西;甘肃陇南;甘肃临夏;甘肃甘南;青海西宁;青海海东;青海海北;青海黄南;青海海南;青海果洛;青海玉树;青海海西;宁夏银川;宁夏石嘴山;宁夏吴忠;宁夏固原;宁夏中卫;新疆乌鲁木齐;新疆克拉玛依;新疆吐鲁番;新疆哈密;新疆昌吉;新疆博尔塔拉;新疆巴音郭楞;新疆阿克苏;新疆克孜勒苏;新疆喀什;新疆和田;新疆伊犁;新疆塔城;新疆阿勒泰;新疆石河子;新疆阿拉尔;新疆图木舒克;新疆五家渠;新疆北屯;新疆铁门关;新Line truncated //北京;天津;上海;重庆;河北石家庄;河北唐山;河北秦皇岛;河北邯郸;河北邢台;河北保定;河北张家口;河北承德;河北沧州;河北廊坊;河北衡水;山西太原;山西大同;山西阳泉;山西长治;山西晋城;山西朔州;山西晋中;山西运城;山西忻州;山西临汾;山西吕梁;内蒙古呼和浩特;内蒙古包头;内蒙古乌海;内蒙古赤峰;内蒙古通辽;内蒙古鄂尔多斯;内蒙古呼伦贝尔;内蒙古巴彦淖尔;内蒙古乌兰察布;内蒙古兴安;内蒙古锡林郭勒;内蒙古阿拉善;辽宁沈阳;辽宁大连;辽宁鞍山;辽宁抚顺;辽宁本溪;辽宁丹东;辽宁锦州;辽宁营口;辽宁阜新;辽宁辽阳;辽宁盘锦;辽宁铁岭;辽宁朝阳;辽宁葫芦岛;吉林长春;吉林吉林;吉林四平;吉林辽源;吉林通化;吉林白山;吉林松原;吉林白城;吉林延边;黑龙江哈尔滨;黑龙江齐齐哈尔;黑龙江鸡西;黑龙江鹤岗;黑龙江双鸭山;黑龙江大庆;黑龙江伊春;黑龙江佳木斯;黑龙江七台河;黑龙江牡丹江;黑龙江黑河;黑龙江绥化;黑龙江大兴安岭;江苏南京;江苏无锡;江苏徐州;江苏常州;江苏苏州;江苏南通;江苏连云港;江苏淮安;江苏盐城;江苏扬州;江苏镇江;江苏泰州;江苏宿迁;浙江杭州;浙江宁波;浙江温州;浙江嘉兴;浙江湖州;浙江绍兴;浙江金华;浙江衢州;浙江舟山;浙江台州;浙江丽水;安徽合肥;安徽芜湖;安徽蚌埠;安徽淮南;安徽马鞍山;安徽淮北;安徽铜陵;安徽安庆;安徽黄山;安徽滁州;安徽阜阳;安徽宿州;安徽六安;安徽亳州;安徽池州;安徽宣城;福建福州;福建厦门;福建莆田;福建三明;福建泉州;福建漳州;福建南平;福建龙岩;福建宁德;江西南昌;江西景德镇;江西萍乡;江西九江;江西新余;江西鹰潭;江西赣州;江西吉安;江西宜春;江西抚州;江西上饶;山东济南;山东青岛;山东淄博;山东枣庄;山东东营;山东烟台;山东潍坊;山东济宁;山东泰安;山东威海;山东日照;山东临沂;山东德州;山东聊城;山东滨州;山东菏泽;河南郑州;河南开封;河南洛阳;河南平顶山;河南安阳;河南鹤壁;河南新乡;河南焦作;河南濮阳;河南许昌;河南漯河;河南三门峡;河南南阳;河南商丘;河南信阳;河南周口;河南驻马店;河南济源;湖北武汉;湖北黄石;湖北十堰;湖北宜昌;湖北襄阳;湖北鄂州;湖北荆门;湖北孝感;湖北荆州;湖北黄冈;湖北咸宁;湖北随州;湖北恩施;湖北仙桃;湖北潜江;湖北天门;湖北神农架;湖南长沙;湖南株洲;湖南湘潭;湖南衡阳;湖南邵阳;湖南岳阳;湖南常德;湖南张家界;湖南益阳;湖南郴州;湖南永州;湖南怀化;湖南娄底;湖南湘西;广东广州;广东韶关;广东深圳;广东珠海;广东汕头;广东佛山;广东江门;广东湛江;广东茂名;广东肇庆;广东惠州;广东梅州;广东汕尾;广东河源;广东阳江;广东清远;广东东莞;广东中山;广东潮州;广东揭阳;广东云浮;广西南宁;广西柳州;广西桂林;广西梧州;广西北海;广西防城港;广西钦州;广西贵港;广西玉林;广西百色;广西贺州;广西河池;广西来宾;广西崇左;海南海口;海南三亚;海南三沙;海南儋州;海南五指山;海南琼海;海南文昌;海南万宁;海南东方;海南定安;海南屯昌;海南澄迈;海南临高;海南白沙;海南昌江;海南乐东;海南陵水;海南保亭;海南琼中;四川成都;四川自贡;四川攀枝花;四川泸州;四川德阳;四川绵阳;四川广元;四川遂宁;四川内江;四川乐山;四川南充;四川眉山;四川宜宾;四川广安;四川达州;四川雅安;四川巴中;四川资阳;四川阿坝;四川甘孜;四川凉山;贵州贵阳;贵州六盘水;贵州遵义;贵州安顺;贵州毕节;贵州铜仁;贵州黔西南;贵州黔东南;贵州黔南;云南昆明;云南曲靖;云南玉溪;云南保山;云南昭通;云南丽江;云南普洱;云南临沧;云南楚雄;云南红河;云南文山;云南西双版纳;云南大理;云南德宏;云南怒江;云南迪庆;西藏拉萨;西藏日喀则;西藏昌都;西藏林芝;西藏山南;西藏那曲;西藏阿里;陕西西安;陕西铜川;陕西宝鸡;陕西咸阳;陕西渭南;陕西延安;陕西汉中;陕西榆林;陕西安康;陕西商洛;甘肃兰州;甘肃嘉峪关;甘肃金昌;甘肃白银;甘肃天水;甘肃武威;甘肃张掖;甘肃平凉;甘肃酒泉;甘肃庆阳;甘肃定西;甘肃陇南;甘肃临夏;甘肃甘南;青海西宁;青海海东;青海海北;青海黄南;青海海南;青海果洛;青海玉树;青海海西;宁夏银川;宁夏石嘴山;宁夏吴忠;宁夏固原;宁夏中卫;新疆乌鲁木齐;新疆克拉玛依;新疆吐鲁番;新疆哈密;新疆昌吉;新疆博尔塔拉;新疆巴音郭楞;新疆阿克苏;新疆克孜勒苏;新疆喀什;新疆和田;新疆伊犁;新疆塔城;新疆阿勒泰;新疆石河子;新疆阿拉尔;新疆图木舒克;新疆五家渠;新疆北屯;新疆铁门关;新Line truncated
//北京;天津;上海;重庆;河北;山西;内蒙古;辽宁;吉林;黑龙江;江苏;浙江;安徽;福建;江西;山东;河南;湖北;湖南;广东;广西;海南;四川;贵州;云南;西藏;陕西;甘肃;青海;宁夏;新疆 //北京;天津;上海;重庆;河北;山西;内蒙古;辽宁;吉林;黑龙江;江苏;浙江;安徽;福建;江西;山东;河南;湖北;湖南;广东;广西;海南;四川;贵州;云南;西藏;陕西;甘肃;青海;宁夏;新疆
@@ -3898,7 +3907,7 @@ namespace TemuKJD.WXForms.ProductForms
{ {
if (wxPropParam.categorys.Count > 0 && if (wxPropParam.categorys.Count > 0 &&
wxPropParam.categorys.FirstOrDefault().name == "作者" && (wxPropParam.categorys.LastOrDefault().name == "无" || wxPropParam.categorys.FirstOrDefault().name == "作者" && (wxPropParam.categorys.LastOrDefault().name == "无" ||
wxPropParam.categorys.LastOrDefault().name == "-" || wxPropParam.categorys.LastOrDefault().name == "/") ) wxPropParam.categorys.LastOrDefault().name == "-" || wxPropParam.categorys.LastOrDefault().name == "/"))
{ {
wxPropParam.categorys.LastOrDefault().name = upProdParam.product.info.param.FirstOrDefault(p => p.categorys.FirstOrDefault()?.name == "出版社名称").categorys.LastOrDefault()?.name; wxPropParam.categorys.LastOrDefault().name = upProdParam.product.info.param.FirstOrDefault(p => p.categorys.FirstOrDefault()?.name == "出版社名称").categorys.LastOrDefault()?.name;
} }
@@ -4150,11 +4159,11 @@ namespace TemuKJD.WXForms.ProductForms
if (prodInfo.detail.sku == null) if (prodInfo.detail.sku == null)
prodInfo.detail.sku = new List<sku_item>(); prodInfo.detail.sku = new List<sku_item>();
if (prodInfo.detail.sku.Count == 0) if (prodInfo.detail.sku.Count == 0)
prodInfo.detail.sku.Add(new sku_item() { spec = new List<spec_item>() }); prodInfo.detail.sku.Add(new sku_item() { spec = new List<spec_item>() });
if (prodInfo.detail.sku.FirstOrDefault().spec == null) if (prodInfo.detail.sku.FirstOrDefault().spec == null)
prodInfo.detail.sku.FirstOrDefault().spec = new List<spec_item>(); prodInfo.detail.sku.FirstOrDefault().spec = new List<spec_item>();
if (prodInfo.detail.sku.FirstOrDefault().spec.Count == 0) if (prodInfo.detail.sku.FirstOrDefault().spec.Count == 0)
prodInfo.detail.sku.FirstOrDefault().spec.Add(new spec_item() { parent_name = "规格", spec_name = "默认" }); prodInfo.detail.sku.FirstOrDefault().spec.Add(new spec_item() { parent_name = "规格", spec_name = "默认" });
if (prodInfo.detail.sku.FirstOrDefault().thumb_url.IsNullOrEmpty()) if (prodInfo.detail.sku.FirstOrDefault().thumb_url.IsNullOrEmpty())
prodInfo.detail.sku.FirstOrDefault().thumb_url = prodInfo.detail.galleries.FirstOrDefault(g => g.type == 1)?.url; prodInfo.detail.sku.FirstOrDefault().thumb_url = prodInfo.detail.galleries.FirstOrDefault(g => g.type == 1)?.url;
@@ -5550,7 +5559,7 @@ namespace TemuKJD.WXForms.ProductForms
var error = BaseRegex.GetStringJson(ref uploadDraftRst, "msg"); var error = BaseRegex.GetStringJson(ref uploadDraftRst, "msg");
if (string.IsNullOrEmpty(error)) if (string.IsNullOrEmpty(error))
{ {
if(uploadDraftRst.Contains("\"errcode\":9401043")) if (uploadDraftRst.Contains("\"errcode\":9401043"))
error = "sku价格异常,请检查加价比例"; error = "sku价格异常,请检查加价比例";
else else
error = uploadDraftRst; error = uploadDraftRst;
@@ -5672,7 +5681,7 @@ namespace TemuKJD.WXForms.ProductForms
//productJson = productJson.Replace("999", "1005"); //productJson = productJson.Replace("999", "1005");
jObj["product"]["status"] = 1; //默认为5 jObj["product"]["status"] = 1; //默认为5
foreach(var sku in jObj["product"]["productSkus"]) foreach (var sku in jObj["product"]["productSkus"])
{ {
sku["productSkuInfo"]["stockInfo"]["stockNum"] = "1000"; sku["productSkuInfo"]["stockInfo"]["stockNum"] = "1000";
sku["productSkuInfo"]["stockInfo"]["totalNum"] = "1000"; sku["productSkuInfo"]["stockInfo"]["totalNum"] = "1000";
@@ -5721,7 +5730,7 @@ namespace TemuKJD.WXForms.ProductForms
var jObj = JsonHelper.JObjectParse(productJson); var jObj = JsonHelper.JObjectParse(productJson);
foreach(JObject skuObj in jObj["product"]["productSkus"]) foreach (JObject skuObj in jObj["product"]["productSkus"])
{ {
skuObj["productSkuInfo"]["stockInfo"]["stockNum"] = 1005; skuObj["productSkuInfo"]["stockInfo"]["stockNum"] = 1005;
@@ -6524,7 +6533,7 @@ namespace TemuKJD.WXForms.ProductForms
var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString()); var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString());
if (shop == null) if (shop == null)
continue; continue;
var t =Task.Run(() => var t = Task.Run(() =>
{ {
UploadSameTime(shop, prodParam, row.Cells["colOpResult"]); UploadSameTime(shop, prodParam, row.Cells["colOpResult"]);
}); });
@@ -6863,7 +6872,7 @@ namespace TemuKJD.WXForms.ProductForms
private void btnReverse_Click(object sender, EventArgs e) private void btnReverse_Click(object sender, EventArgs e)
{ {
foreach(DataGridViewRow row in dgvShop.Rows) foreach (DataGridViewRow row in dgvShop.Rows)
{ {
if (row.Visible == true) if (row.Visible == true)
row.Cells["colSelect"].Value = !row.Cells["colSelect"].Value.ParseToBool(); row.Cells["colSelect"].Value = !row.Cells["colSelect"].Value.ParseToBool();
@@ -7280,7 +7289,7 @@ Content-Type: image/jpeg
/// </summary> /// </summary>
/// <param name="shop"></param> /// <param name="shop"></param>
/// <returns></returns> /// <returns></returns>
public static string getAddress(ShopLoginInfo shop, string searchText="") public static string getAddress(ShopLoginInfo shop, string searchText = "")
{ {
string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeexpress/cgi/getAddress?token=&lang=zh_CN"; string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeexpress/cgi/getAddress?token=&lang=zh_CN";
if (!string.IsNullOrEmpty(searchText)) if (!string.IsNullOrEmpty(searchText))