diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 4f86d88..3af0dbe 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 623;
+ public static int VersionCount = 627;
//public static int VersionCount = 613;
///
diff --git a/TEMUKJD/InitForm.cs b/TEMUKJD/InitForm.cs
index 7b23c9d..66daca7 100644
--- a/TEMUKJD/InitForm.cs
+++ b/TEMUKJD/InitForm.cs
@@ -62,15 +62,20 @@ namespace TemuKJD
{
btnOK.Visible = true;
}));
+
+#if DEBUG
+ Thread.Sleep(2500);
+#else
if (File.Exists(System.Environment.CurrentDirectory + "\\YkdChoice.dll"))
{
Thread.Sleep(2500);
}
+#endif
if (initFormSettings.Remember)
Thread.Sleep(500);
Invoke(new Action(() =>
{
- if(initFormSettings.Remember)
+ if(initFormSettings.Remember && isChangeType == false)
{
OpenNewMainForm();
}
@@ -108,7 +113,8 @@ namespace TemuKJD
private void btnOK_Click(object sender, EventArgs e)
{
- OpenNewMainForm();
+ if (isChangeType == false)
+ OpenNewMainForm();
}
private void chkRemember_CheckedChanged(object sender, EventArgs e)
@@ -117,13 +123,26 @@ namespace TemuKJD
ConfigHelper.SaveConfig("initFormSettings", initFormSettings);
}
+ bool isChangeType = false;
private void rbTemu_CheckedChanged(object sender, EventArgs e)
{
+ string newLoginType;
if (rbTemu.Checked)
- initFormSettings.LoginType = "Temu";
+ newLoginType = "Temu";
else
- initFormSettings.LoginType = "Pdd";
- ConfigHelper.SaveConfig("initFormSettings", initFormSettings);
+ newLoginType = "Pdd";
+ if (initFormSettings.LoginType != newLoginType)
+ {
+ isChangeType = true;
+ initFormSettings.LoginType = newLoginType;
+ ConfigHelper.SaveConfig("initFormSettings", initFormSettings);
+
+ BaseMsgForm.ShowInfo("更改了平台，需要重新启动");
+ {
+ System.Diagnostics.Process.Start(Process.GetCurrentProcess().MainModule.FileName);
+ Application.Exit();
+ }
+ }
}
}
diff --git a/TEMUKJD/KJD.csproj.user b/TEMUKJD/KJD.csproj.user
index cebb4cf..7a74901 100644
--- a/TEMUKJD/KJD.csproj.user
+++ b/TEMUKJD/KJD.csproj.user
@@ -1,7 +1,7 @@
- ProjectFiles
+ ShowAllFiles
publish\
diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs
index 3023bf4..07629d1 100644
--- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs
@@ -29,6 +29,8 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -37,8 +39,6 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductThirdSelectListManageForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.label14 = new System.Windows.Forms.Label();
@@ -111,6 +111,14 @@
this.chkUploadProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pbLoading = new System.Windows.Forms.PictureBox();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.dataGridViewEx1 = new TemuKJD.UserComponent.DataGridViewEx();
+ this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+ this.colMapId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colMapShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewLinkColumn5 = new System.Windows.Forms.DataGridViewLinkColumn();
+ this.colToPorductPage = new System.Windows.Forms.DataGridViewLinkColumn();
+ this.colToDraftPage = new System.Windows.Forms.DataGridViewLinkColumn();
this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -140,14 +148,6 @@
this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
- this.panel2 = new System.Windows.Forms.Panel();
- this.dataGridViewEx1 = new TemuKJD.UserComponent.DataGridViewEx();
- this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
- this.colMapId = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.colMapShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewLinkColumn5 = new System.Windows.Forms.DataGridViewLinkColumn();
- this.colToPorductPage = new System.Windows.Forms.DataGridViewLinkColumn();
- this.colToDraftPage = new System.Windows.Forms.DataGridViewLinkColumn();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -173,9 +173,9 @@
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).BeginInit();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridViewEx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).BeginInit();
this.SuspendLayout();
//
// splitContainer1
@@ -223,7 +223,7 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
- this.splitContainer1.Size = new System.Drawing.Size(1558, 638);
+ this.splitContainer1.Size = new System.Drawing.Size(1534, 638);
this.splitContainer1.SplitterDistance = 100;
this.splitContainer1.TabIndex = 2;
//
@@ -245,7 +245,7 @@
this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnAdd.DisabledBackColor = System.Drawing.Color.Empty;
this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnAdd.Location = new System.Drawing.Point(1464, 8);
+ this.btnAdd.Location = new System.Drawing.Point(1440, 8);
this.btnAdd.Name = "btnAdd";
this.btnAdd.Size = new System.Drawing.Size(90, 26);
this.btnAdd.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -270,7 +270,7 @@
this.btnSetSubSa.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSetSubSa.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSetSubSa.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSetSubSa.Location = new System.Drawing.Point(1372, 8);
+ this.btnSetSubSa.Location = new System.Drawing.Point(1348, 8);
this.btnSetSubSa.Name = "btnSetSubSa";
this.btnSetSubSa.Size = new System.Drawing.Size(90, 26);
this.btnSetSubSa.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -295,7 +295,7 @@
this.btnReFission.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnReFission.DisabledBackColor = System.Drawing.Color.Empty;
this.btnReFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnReFission.Location = new System.Drawing.Point(1280, 8);
+ this.btnReFission.Location = new System.Drawing.Point(1256, 8);
this.btnReFission.Name = "btnReFission";
this.btnReFission.Size = new System.Drawing.Size(90, 26);
this.btnReFission.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -629,7 +629,7 @@
this.btnStop.CanvasColor = System.Drawing.SystemColors.Control;
this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnStop.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnStop.Location = new System.Drawing.Point(1464, 39);
+ this.btnStop.Location = new System.Drawing.Point(1440, 39);
this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(90, 26);
@@ -655,7 +655,7 @@
this.btnExport.CanvasColor = System.Drawing.SystemColors.Control;
this.btnExport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnExport.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnExport.Location = new System.Drawing.Point(1372, 39);
+ this.btnExport.Location = new System.Drawing.Point(1348, 39);
this.btnExport.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnExport.Name = "btnExport";
this.btnExport.Size = new System.Drawing.Size(90, 26);
@@ -682,7 +682,7 @@
this.btnDel.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnDel.DisabledBackColor = System.Drawing.Color.Empty;
this.btnDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnDel.Location = new System.Drawing.Point(1280, 39);
+ this.btnDel.Location = new System.Drawing.Point(1256, 39);
this.btnDel.Name = "btnDel";
this.btnDel.Size = new System.Drawing.Size(90, 26);
this.btnDel.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -705,7 +705,7 @@
//
this.pbFissionSetting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.pbFissionSetting.Image = global::TemuKJD.Properties.Resources.齿轮;
- this.pbFissionSetting.Location = new System.Drawing.Point(1260, 8);
+ this.pbFissionSetting.Location = new System.Drawing.Point(1236, 8);
this.pbFissionSetting.Name = "pbFissionSetting";
this.pbFissionSetting.Size = new System.Drawing.Size(26, 26);
this.pbFissionSetting.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -773,7 +773,7 @@
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.Size = new System.Drawing.Size(1268, 66);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(1244, 66);
this.tableLayoutPanel1.TabIndex = 469;
//
// btnSearch
@@ -783,7 +783,7 @@
this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSearch.Location = new System.Drawing.Point(1112, 6);
+ this.btnSearch.Location = new System.Drawing.Point(1091, 6);
this.btnSearch.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(56, 24);
this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -809,10 +809,10 @@
"全部",
"重上",
"已买"});
- this.cmbUserNotes.Location = new System.Drawing.Point(1044, 5);
+ this.cmbUserNotes.Location = new System.Drawing.Point(1026, 8);
this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0);
this.cmbUserNotes.Name = "cmbUserNotes";
- this.cmbUserNotes.Size = new System.Drawing.Size(65, 25);
+ this.cmbUserNotes.Size = new System.Drawing.Size(62, 25);
this.cmbUserNotes.TabIndex = 466;
this.cmbUserNotes.Text = "全部";
//
@@ -826,10 +826,10 @@
"核价成功",
"核价成功（重复）",
"重复"});
- this.cmbNotes.Location = new System.Drawing.Point(917, 5);
+ this.cmbNotes.Location = new System.Drawing.Point(901, 8);
this.cmbNotes.Margin = new System.Windows.Forms.Padding(0);
this.cmbNotes.Name = "cmbNotes";
- this.cmbNotes.Size = new System.Drawing.Size(65, 25);
+ this.cmbNotes.Size = new System.Drawing.Size(63, 25);
this.cmbNotes.TabIndex = 467;
this.cmbNotes.Text = "全部";
//
@@ -837,7 +837,7 @@
//
this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(885, 9);
+ this.label13.Location = new System.Drawing.Point(869, 9);
this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(32, 17);
@@ -853,10 +853,10 @@
"已上传",
"草稿箱",
"全部"});
- this.cmbStatus.Location = new System.Drawing.Point(814, 5);
+ this.cmbStatus.Location = new System.Drawing.Point(800, 8);
this.cmbStatus.Margin = new System.Windows.Forms.Padding(0);
this.cmbStatus.Name = "cmbStatus";
- this.cmbStatus.Size = new System.Drawing.Size(65, 25);
+ this.cmbStatus.Size = new System.Drawing.Size(63, 25);
this.cmbStatus.TabIndex = 465;
this.cmbStatus.Text = "待上传";
//
@@ -879,7 +879,7 @@
this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 36);
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
- this.flowLayoutPanel1.Size = new System.Drawing.Size(982, 30);
+ this.flowLayoutPanel1.Size = new System.Drawing.Size(964, 30);
this.flowLayoutPanel1.TabIndex = 472;
//
// label9
@@ -1042,14 +1042,14 @@
this.txtShopId.Location = new System.Drawing.Point(47, 6);
this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtShopId.Name = "txtShopId";
- this.txtShopId.Size = new System.Drawing.Size(65, 23);
+ this.txtShopId.Size = new System.Drawing.Size(63, 23);
this.txtShopId.TabIndex = 448;
//
// label7
//
this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(118, 9);
+ this.label7.Location = new System.Drawing.Point(116, 9);
this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(56, 17);
@@ -1060,7 +1060,7 @@
//
this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(758, 9);
+ this.label8.Location = new System.Drawing.Point(744, 9);
this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(56, 17);
@@ -1070,17 +1070,17 @@
// txtShopName
//
this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtShopName.Location = new System.Drawing.Point(174, 6);
+ this.txtShopName.Location = new System.Drawing.Point(172, 6);
this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtShopName.Name = "txtShopName";
- this.txtShopName.Size = new System.Drawing.Size(65, 23);
+ this.txtShopName.Size = new System.Drawing.Size(63, 23);
this.txtShopName.TabIndex = 451;
//
// label5
//
this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(245, 9);
+ this.label5.Location = new System.Drawing.Point(241, 9);
this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(31, 17);
@@ -1090,26 +1090,26 @@
// txtSKC
//
this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtSKC.Location = new System.Drawing.Point(378, 6);
+ this.txtSKC.Location = new System.Drawing.Point(372, 6);
this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtSKC.Name = "txtSKC";
- this.txtSKC.Size = new System.Drawing.Size(65, 23);
+ this.txtSKC.Size = new System.Drawing.Size(63, 23);
this.txtSKC.TabIndex = 432;
//
// txtSPU
//
this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtSPU.Location = new System.Drawing.Point(276, 6);
+ this.txtSPU.Location = new System.Drawing.Point(272, 6);
this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtSPU.Name = "txtSPU";
- this.txtSPU.Size = new System.Drawing.Size(65, 23);
+ this.txtSPU.Size = new System.Drawing.Size(63, 23);
this.txtSPU.TabIndex = 434;
//
// label1
//
this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(347, 9);
+ this.label1.Location = new System.Drawing.Point(341, 9);
this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(31, 17);
@@ -1120,7 +1120,7 @@
//
this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(449, 9);
+ this.label2.Location = new System.Drawing.Point(441, 9);
this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(32, 17);
@@ -1130,26 +1130,26 @@
// txtCat
//
this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtCat.Location = new System.Drawing.Point(481, 6);
+ this.txtCat.Location = new System.Drawing.Point(473, 6);
this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtCat.Name = "txtCat";
- this.txtCat.Size = new System.Drawing.Size(65, 23);
+ this.txtCat.Size = new System.Drawing.Size(63, 23);
this.txtCat.TabIndex = 425;
//
// txtExtCode
//
this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtExtCode.Location = new System.Drawing.Point(687, 6);
+ this.txtExtCode.Location = new System.Drawing.Point(675, 6);
this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtExtCode.Name = "txtExtCode";
- this.txtExtCode.Size = new System.Drawing.Size(65, 23);
+ this.txtExtCode.Size = new System.Drawing.Size(63, 23);
this.txtExtCode.TabIndex = 429;
//
// label3
//
this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(552, 9);
+ this.label3.Location = new System.Drawing.Point(542, 9);
this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(32, 17);
@@ -1160,7 +1160,7 @@
//
this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(655, 9);
+ this.label4.Location = new System.Drawing.Point(643, 9);
this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(32, 17);
@@ -1170,10 +1170,10 @@
// txtProdName
//
this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtProdName.Location = new System.Drawing.Point(584, 6);
+ this.txtProdName.Location = new System.Drawing.Point(574, 6);
this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtProdName.Name = "txtProdName";
- this.txtProdName.Size = new System.Drawing.Size(65, 23);
+ this.txtProdName.Size = new System.Drawing.Size(63, 23);
this.txtProdName.TabIndex = 427;
//
// pnlEmpty
@@ -1182,7 +1182,7 @@
this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
- this.pnlEmpty.Location = new System.Drawing.Point(1113, 40);
+ this.pnlEmpty.Location = new System.Drawing.Point(1092, 40);
this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.pnlEmpty.Name = "pnlEmpty";
this.pnlEmpty.Size = new System.Drawing.Size(56, 22);
@@ -1206,7 +1206,7 @@
//
this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(988, 9);
+ this.label12.Location = new System.Drawing.Point(970, 9);
this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(56, 17);
@@ -1217,10 +1217,10 @@
//
this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.chkNoSubSa.AutoSize = true;
- this.chkNoSubSa.Location = new System.Drawing.Point(1177, 7);
+ this.chkNoSubSa.Location = new System.Drawing.Point(1156, 7);
this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.chkNoSubSa.Name = "chkNoSubSa";
- this.chkNoSubSa.Size = new System.Drawing.Size(91, 21);
+ this.chkNoSubSa.Size = new System.Drawing.Size(88, 21);
this.chkNoSubSa.TabIndex = 470;
this.chkNoSubSa.Text = "未分配超管";
this.chkNoSubSa.UseVisualStyleBackColor = true;
@@ -1229,10 +1229,10 @@
//
this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.chkShowDel.AutoSize = true;
- this.chkShowDel.Location = new System.Drawing.Point(1177, 40);
+ this.chkShowDel.Location = new System.Drawing.Point(1156, 40);
this.chkShowDel.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.chkShowDel.Name = "chkShowDel";
- this.chkShowDel.Size = new System.Drawing.Size(91, 21);
+ this.chkShowDel.Size = new System.Drawing.Size(88, 21);
this.chkShowDel.TabIndex = 471;
this.chkShowDel.Text = "显示删除";
this.chkShowDel.UseVisualStyleBackColor = true;
@@ -1244,7 +1244,7 @@
this.chkUploadProd.Checked = true;
this.chkUploadProd.CheckState = System.Windows.Forms.CheckState.Checked;
this.tableLayoutPanel1.SetColumnSpan(this.chkUploadProd, 2);
- this.chkUploadProd.Location = new System.Drawing.Point(1019, 40);
+ this.chkUploadProd.Location = new System.Drawing.Point(998, 40);
this.chkUploadProd.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.chkUploadProd.Name = "chkUploadProd";
this.chkUploadProd.Size = new System.Drawing.Size(90, 21);
@@ -1271,7 +1271,7 @@
//
this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1);
this.splitContainer2.Panel2.Controls.Add(this.statusBar);
- this.splitContainer2.Size = new System.Drawing.Size(1558, 534);
+ this.splitContainer2.Size = new System.Drawing.Size(1534, 534);
this.splitContainer2.SplitterDistance = 505;
this.splitContainer2.TabIndex = 0;
//
@@ -1279,13 +1279,106 @@
//
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pbLoading.Location = new System.Drawing.Point(754, 227);
+ this.pbLoading.Location = new System.Drawing.Point(742, 227);
this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(50, 50);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pbLoading.TabIndex = 7;
this.pbLoading.TabStop = false;
//
+ // panel2
+ //
+ this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel2.Controls.Add(this.dataGridViewEx1);
+ this.panel2.Location = new System.Drawing.Point(501, 75);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(557, 342);
+ this.panel2.TabIndex = 191;
+ this.panel2.Visible = false;
+ //
+ // dataGridViewEx1
+ //
+ this.dataGridViewEx1.AllowUserToAddRows = false;
+ this.dataGridViewEx1.AllowUserToDeleteRows = false;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dataGridViewEx1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ this.dataGridViewEx1.BackgroundColor = System.Drawing.Color.White;
+ this.dataGridViewEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dataGridViewEx1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ this.dataGridViewEx1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridViewEx1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.dataGridViewCheckBoxColumn1,
+ this.colMapId,
+ this.colMapShopId,
+ this.dataGridViewLinkColumn5,
+ this.colToPorductPage,
+ this.colToDraftPage});
+ this.dataGridViewEx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.dataGridViewEx1.Location = new System.Drawing.Point(0, 0);
+ this.dataGridViewEx1.Name = "dataGridViewEx1";
+ this.dataGridViewEx1.ReadOnly = true;
+ this.dataGridViewEx1.RowHeadersWidth = 40;
+ this.dataGridViewEx1.RowTemplate.Height = 23;
+ this.dataGridViewEx1.Size = new System.Drawing.Size(555, 340);
+ this.dataGridViewEx1.TabIndex = 192;
+ //
+ // dataGridViewCheckBoxColumn1
+ //
+ this.dataGridViewCheckBoxColumn1.HeaderText = "选择";
+ this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1";
+ this.dataGridViewCheckBoxColumn1.ReadOnly = true;
+ this.dataGridViewCheckBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridViewCheckBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.dataGridViewCheckBoxColumn1.Width = 30;
+ //
+ // colMapId
+ //
+ this.colMapId.HeaderText = "映射Id";
+ this.colMapId.Name = "colMapId";
+ this.colMapId.ReadOnly = true;
+ this.colMapId.Visible = false;
+ this.colMapId.Width = 125;
+ //
+ // colMapShopId
+ //
+ this.colMapShopId.HeaderText = "映射店铺Id";
+ this.colMapShopId.Name = "colMapShopId";
+ this.colMapShopId.ReadOnly = true;
+ this.colMapShopId.Width = 120;
+ //
+ // dataGridViewLinkColumn5
+ //
+ this.dataGridViewLinkColumn5.HeaderText = "商品SPU";
+ this.dataGridViewLinkColumn5.Name = "dataGridViewLinkColumn5";
+ this.dataGridViewLinkColumn5.ReadOnly = true;
+ this.dataGridViewLinkColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridViewLinkColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.dataGridViewLinkColumn5.Width = 86;
+ //
+ // colToPorductPage
+ //
+ this.colToPorductPage.HeaderText = "访问商品页";
+ this.colToPorductPage.Name = "colToPorductPage";
+ this.colToPorductPage.ReadOnly = true;
+ this.colToPorductPage.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colToPorductPage.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ this.colToPorductPage.Width = 62;
+ //
+ // colToDraftPage
+ //
+ this.colToDraftPage.HeaderText = "访问草稿页";
+ this.colToDraftPage.Name = "colToDraftPage";
+ this.colToDraftPage.ReadOnly = true;
+ this.colToDraftPage.Visible = false;
+ this.colToDraftPage.Width = 38;
+ //
// dgvSelectProduct
//
this.dgvSelectProduct.AllowUserToAddRows = false;
@@ -1336,7 +1429,7 @@
this.dgvSelectProduct.ReadOnly = true;
this.dgvSelectProduct.RowHeadersWidth = 40;
this.dgvSelectProduct.RowTemplate.Height = 23;
- this.dgvSelectProduct.Size = new System.Drawing.Size(1550, 505);
+ this.dgvSelectProduct.Size = new System.Drawing.Size(1526, 505);
this.dgvSelectProduct.TabIndex = 190;
this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll);
@@ -1559,7 +1652,7 @@
this.ucSplitPage1.CurrentPage = 1;
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
this.ucSplitPage1.IsShowPageSize = true;
- this.ucSplitPage1.Location = new System.Drawing.Point(1158, 0);
+ this.ucSplitPage1.Location = new System.Drawing.Point(1134, 0);
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
this.ucSplitPage1.Name = "ucSplitPage1";
this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
@@ -1576,106 +1669,13 @@
this.statusBar.Location = new System.Drawing.Point(0, 0);
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
this.statusBar.Name = "statusBar";
- this.statusBar.Size = new System.Drawing.Size(1558, 25);
+ this.statusBar.Size = new System.Drawing.Size(1534, 25);
this.statusBar.TabIndex = 5;
//
- // panel2
- //
- this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel2.Controls.Add(this.dataGridViewEx1);
- this.panel2.Location = new System.Drawing.Point(501, 75);
- this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(557, 342);
- this.panel2.TabIndex = 191;
- this.panel2.Visible = false;
- //
- // dataGridViewEx1
- //
- this.dataGridViewEx1.AllowUserToAddRows = false;
- this.dataGridViewEx1.AllowUserToDeleteRows = false;
- dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dataGridViewEx1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
- this.dataGridViewEx1.BackgroundColor = System.Drawing.Color.White;
- this.dataGridViewEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dataGridViewEx1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
- this.dataGridViewEx1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dataGridViewEx1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
- this.dataGridViewCheckBoxColumn1,
- this.colMapId,
- this.colMapShopId,
- this.dataGridViewLinkColumn5,
- this.colToPorductPage,
- this.colToDraftPage});
- this.dataGridViewEx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.dataGridViewEx1.Location = new System.Drawing.Point(0, 0);
- this.dataGridViewEx1.Name = "dataGridViewEx1";
- this.dataGridViewEx1.ReadOnly = true;
- this.dataGridViewEx1.RowHeadersWidth = 40;
- this.dataGridViewEx1.RowTemplate.Height = 23;
- this.dataGridViewEx1.Size = new System.Drawing.Size(555, 340);
- this.dataGridViewEx1.TabIndex = 192;
- //
- // dataGridViewCheckBoxColumn1
- //
- this.dataGridViewCheckBoxColumn1.HeaderText = "选择";
- this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1";
- this.dataGridViewCheckBoxColumn1.ReadOnly = true;
- this.dataGridViewCheckBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridViewCheckBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.dataGridViewCheckBoxColumn1.Width = 30;
- //
- // colMapId
- //
- this.colMapId.HeaderText = "映射Id";
- this.colMapId.Name = "colMapId";
- this.colMapId.ReadOnly = true;
- this.colMapId.Visible = false;
- this.colMapId.Width = 125;
- //
- // colMapShopId
- //
- this.colMapShopId.HeaderText = "映射店铺Id";
- this.colMapShopId.Name = "colMapShopId";
- this.colMapShopId.ReadOnly = true;
- this.colMapShopId.Width = 120;
- //
- // dataGridViewLinkColumn5
- //
- this.dataGridViewLinkColumn5.HeaderText = "商品SPU";
- this.dataGridViewLinkColumn5.Name = "dataGridViewLinkColumn5";
- this.dataGridViewLinkColumn5.ReadOnly = true;
- this.dataGridViewLinkColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridViewLinkColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.dataGridViewLinkColumn5.Width = 86;
- //
- // colToPorductPage
- //
- this.colToPorductPage.HeaderText = "访问商品页";
- this.colToPorductPage.Name = "colToPorductPage";
- this.colToPorductPage.ReadOnly = true;
- this.colToPorductPage.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.colToPorductPage.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colToPorductPage.Width = 62;
- //
- // colToDraftPage
- //
- this.colToDraftPage.HeaderText = "访问草稿页";
- this.colToDraftPage.Name = "colToDraftPage";
- this.colToDraftPage.ReadOnly = true;
- this.colToDraftPage.Visible = false;
- this.colToDraftPage.Width = 38;
- //
// ProductThirdSelectListManageForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.ClientSize = new System.Drawing.Size(1560, 672);
+ this.ClientSize = new System.Drawing.Size(1536, 672);
this.Controls.Add(this.splitContainer1);
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")));
@@ -1713,9 +1713,9 @@
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).EndInit();
this.panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridViewEx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).EndInit();
this.ResumeLayout(false);
}
diff --git a/TEMUKJD/MainForm.cs b/TEMUKJD/MainForm.cs
index 225353e..ca9f5a1 100644
--- a/TEMUKJD/MainForm.cs
+++ b/TEMUKJD/MainForm.cs
@@ -152,11 +152,15 @@ namespace TemuKJD
instance = this;
this.MaximumSize = new Size(Screen.PrimaryScreen.WorkingArea.Width, Screen.PrimaryScreen.WorkingArea.Height);
- CefInit();
+ //CefInit();
}
public static void CefInit()
{
+ var initFormSettings = NaiBa.Util.Helper.ConfigHelper.LoadConfig("initFormSettings");
+ if (initFormSettings == null)
+ initFormSettings = new InitFormSettings();
+
var usePddWorkbanch = NaiBa.Util.Helper.ConfigHelper.LoadConfig("use_pdd_workbanch");
if (usePddWorkbanch == null)
usePddWorkbanch = true;
@@ -171,7 +175,8 @@ namespace TemuKJD
//settings.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.67 Safari/537.36";
//settings.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36";
settings.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36";
- if (BaseClass.MainPath == "binxixi" && BaseClass.UsePddWorkbanch)
+ //if (BaseClass.MainPath == "binxixi" && BaseClass.UsePddWorkbanch)
+ if (initFormSettings.LoginType.ToLower() == "pdd")
settings.UserAgent = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.5.40.8 Safari/537.36 PddWorkbench-Online PddBrowser pdd_windows_version/3.0.3.12";
settings.CefCommandLineArgs.Add("disable-gpu", "1"); // 禁止显卡加速
settings.IgnoreCertificateErrors = true;
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
index 62bb1c6..21eaffc 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
@@ -1512,9 +1512,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
prodParam.second_hand = prodInfo.detail.second_hand;
prodParam.service_time = BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now); // 尝试使用当前系统时间提交
prodParam.shang_men_an_zhuang = prodInfo.detail.shang_men_an_zhuang;
- prodParam.shipment_limit_second = prodInfo.detail.shipment_limit_second; //发货时间
- if (prodParam.shipment_limit_second == 0)
- prodParam.shipment_limit_second = 86400 * 2;
+ prodParam.shipment_limit_second = prodInfo.detail.shipment_limit_second; //发货时间 86400 = 24 小时 一般设置成2天
+ //if (prodParam.shipment_limit_second == 0)
+ prodParam.shipment_limit_second = 86400 * 2;
prodParam.shipment_limit_second_origin_value = 0;
prodParam.shop_group_id = prodInfo.detail.shop_group_id.ParseToInt();
prodParam.showGoodsInstruction = true;
diff --git a/TEMUKJD/Program.cs b/TEMUKJD/Program.cs
index b7fe03f..d09d4e9 100644
--- a/TEMUKJD/Program.cs
+++ b/TEMUKJD/Program.cs
@@ -17,7 +17,7 @@ namespace TemuKJD
[STAThread]
static void Main()
{
- //MainForm.CefInit();
+ MainForm.CefInit();
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);