chfei/KJD_WebService
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1拼多多皮肤 2打包编译脚本优化 3.头部选中所有的DataGridView列控件

Browse Source
This commit is contained in:
wule committed 2026-05-08 18:05:54 +08:00
1 parent 05553a3ba3
commit f04c74fa32
34 files changed
+1710 -1135
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/BaseClass.cs
+1 -1
View File
@@ -27,7 +27,7 @@ namespace AllBase
/// <summary>
/// 版本ID
/// </summary>
public static int VersionCount = 1036;
public static int VersionCount = 1051;
//public static int VersionCount = 613;
/// <summary>
AllBase/Helper/GlobalConfig.cs
+1
View File
@@ -70,6 +70,7 @@ namespace AllBase.Helper
public static System.Drawing.Color KJDMainColor = System.Drawing.Color.FromArgb(63, 126, 255);
public static System.Drawing.Color KJDMainColor2 = System.Drawing.Color.FromArgb(185, 215, 255);
public static System.Drawing.Color KJDBorderColor = System.Drawing.Color.FromArgb(25, 98, 200);
public static System.Drawing.Color PddMainColor = System.Drawing.Color.FromArgb(225, 120, 135);
public static System.Drawing.Color PddMainColor2 = System.Drawing.Color.FromArgb(255, 235, 245);
public static System.Drawing.Color PddBorderColor = System.Drawing.Color.FromArgb(195, 112, 135);
PackTools/29pdd.ico
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

PackTools/package250714.nsi
+2 -2
View File
@@ -7,8 +7,8 @@
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\TemuKJD.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
!define BUILD_PATH "D:\Projects\TEMU跨境达后台管理\KJD Cef138\PackTools"
!define BIN_PATH "D:\Projects\TEMU跨境达后台管理\KJD Cef138\Bin"
!define BUILD_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef114\PackTools"
!define BIN_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef114\Bin"
SetCompressor lzma
PackTools/package260507pdd.nsi
+149
View File
@@ -0,0 +1,149 @@
; 该脚本使用 HM VNISEdit 脚本编辑器向导产生
; 安装程序初始定义常量
!define PRODUCT_NAME "29供应链"
!define PRODUCT_VERSION "v11.23"
!define PRODUCT_PUBLISHER "29供应链软件制作组"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\TemuKJD.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
!define BUILD_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef138\PackTools"
!define BIN_PATH "D:\Project\TEMU跨境达后台管理\KJD Cef138\Bin"
SetCompressor lzma
; ------ MUI 现代界面定义 (1.67 版本以上兼容) ------
!include "MUI.nsh"
; MUI 预定义常量
!define MUI_ABORTWARNING
!define MUI_ICON "${BUILD_PATH}\29pdd.ico"
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
; 语言选择窗口常量设置
!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
; 欢迎页面
!insertmacro MUI_PAGE_WELCOME
; 许可协议页面
!define MUI_LICENSEPAGE_CHECKBOX
!insertmacro MUI_PAGE_LICENSE "${BUILD_PATH}\Licence.txt"
; 安装目录选择页面
!insertmacro MUI_PAGE_DIRECTORY
; 安装过程页面
!insertmacro MUI_PAGE_INSTFILES
; 安装完成页面
!define MUI_FINISHPAGE_RUN "$INSTDIR\TemuKJD.exe"
!insertmacro MUI_PAGE_FINISH
; 安装卸载过程页面
!insertmacro MUI_UNPAGE_INSTFILES
; 安装界面包含的语言设置
!insertmacro MUI_LANGUAGE "English"
!insertmacro MUI_LANGUAGE "SimpChinese"
; 安装预释放文件
!insertmacro MUI_RESERVEFILE_LANGDLL
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
; ------ MUI 现代界面定义结束 ------
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "29供应链.exe"
InstallDir "$PROGRAMFILES\29供应链"
InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString"
ShowInstDetails show
ShowUnInstDetails show
BrandingText "29供应链安装程序"
Section "MainSection" SEC01
SetOutPath "$INSTDIR"
;SetOverwrite on|off|try|ifnewer ;强制覆盖|不覆盖|仅覆盖可写文件|仅覆盖旧文件
SetOverwrite on
;/x 排除的目录或文件
;File /r /x "Config.xml" /x "TemuKJD.exe.choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "TemuKJD.pdb" /x "data" "${BIN_PATH}\*.*"
File /r /x "Config.xml" /x "TemuKJD.exe.choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" "${BIN_PATH}\*.*"
CreateDirectory "$SMPROGRAMS\29供应链"
CreateShortCut "$SMPROGRAMS\29供应链\29供应链.lnk" "$INSTDIR\TemuKJD.exe" "" "$INSTDIR\29pdd.ico"
CreateShortCut "$DESKTOP\29供应链.lnk" "$INSTDIR\TemuKJD.exe" "" "$INSTDIR\29pdd.ico"
File "${BIN_PATH}\TemuKJD.exe"
;SetOutPath "$TEMP"
;File "${BUILD_PATH}\bin\VC_redist_2015_2022.x64.exe"
;ExecWait '$TEMP\vc_redist.x86.exe' # 一般(非静默)VC的安装
;ExecWait '"$TEMP\vc_redist.x86.exe" /q' # silent install 静默安装
SectionEnd
Section -AdditionalIcons
SetOutPath $INSTDIR
CreateShortCut "$SMPROGRAMS\29供应链\Uninstall.lnk" "$INSTDIR\uninst.exe"
SectionEnd
Section -Post
WriteUninstaller "$INSTDIR\uninst.exe"
WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\TemuKJD.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\TemuKJD.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
SectionEnd
#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--#
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
FunctionEnd
/******************************
* 以下是安装程序的卸载部分 *
******************************/
Section Uninstall
Delete "$INSTDIR\uninst.exe"
Delete "$TEMP\vc_redist.x86.exe"
Delete "$INSTDIR\TemuKJD.exe"
Delete "$SMPROGRAMS\29供应链\Uninstall.lnk"
Delete "$DESKTOP\29供应链.lnk"
Delete "$SMPROGRAMS\29供应链\29供应链.lnk"
RMDir "$SMPROGRAMS\29供应链"
RMDir /r "$INSTDIR\blob_storage"
RMDir /r "$INSTDIR\Cache"
RMDir /r "$INSTDIR\config"
RMDir /r "$INSTDIR\data"
RMDir /r "$INSTDIR\DawnCache"
RMDir /r "$INSTDIR\GPUCache"
RMDir /r "$INSTDIR\locales"
RMDir /r "$INSTDIR\log"
RMDir /r "$INSTDIR\ru-ru"
RMDir /r "$INSTDIR\static"
RMDir /r "$INSTDIR\taobao"
RMDir /r "$INSTDIR\temp"
RMDir /r "$INSTDIR\upBak"
RMDir /r "$INSTDIR\upTemp"
RMDir /r "$INSTDIR\x64"
RMDir /r "$INSTDIR\x86"
RMDir /r "$INSTDIR"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
SetAutoClose true
SectionEnd
#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--#
Function un.onInit
!insertmacro MUI_UNGETLANGUAGE
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ，及其所有的组件？" IDYES +2
Abort
FunctionEnd
Function un.onUninstSuccess
HideWindow
MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从您的计算机移除。"
FunctionEnd
TEMUKJD/BaseForms/BaseForm.cs
+15 -4
View File
@@ -34,6 +34,8 @@ namespace TemuKJD.BaseForms
private void BaseForm_Load(object sender, EventArgs e)
{
setSkinColor(this);
using (Graphics graphics = Graphics.FromHwnd(IntPtr.Zero))
{
dpi = graphics.DpiX;
@@ -88,6 +90,18 @@ namespace TemuKJD.BaseForms
tree.GroupFont = ngf;
}
if (c.Name == "pnlSA")
{
}
}
}
public void setSkinColor(Control control)
{
foreach (Control c in control.Controls)
{
setSkinColor(c);
// pdd皮肤颜色
if (BaseClass.MainPath == "binxixi")
{
@@ -137,6 +151,7 @@ namespace TemuKJD.BaseForms
{
var dgv = c as UserComponent.DataGridViewEx;
dgv.BorderColor = GlobalConfig.PddMainColor;
dgv.DefaultCellStyle.SelectionBackColor = GlobalConfig.PddMainColor;
}
if (c is UserComponent.UcCheckBox)
{
@@ -152,10 +167,6 @@ namespace TemuKJD.BaseForms
tc.TabSelectTextColor = GlobalConfig.PddMainColor;
}
}
if (c.Name == "pnlSA")
{
}
}
}
}
TEMUKJD/Extension/ControlExtension.cs
+3
View File
@@ -24,6 +24,9 @@ namespace TemuKJD.Extension
}
public static Point GetRelativePosition(this Control control, Control parentControl)
{
if (control == null || parentControl == null)
return new Point(0, 0);
Point location = control.Location;
Control parent = control.Parent;
while (parent != null && parent != parentControl)
TEMUKJD/KJD.csproj
+1
View File
@@ -238,6 +238,7 @@
<Compile Include="ToolForms\GetAddressForm.Designer.cs">
<DependentUpon>GetAddressForm.cs</DependentUpon>
</Compile>
<Compile Include="UserComponent\DataGridViewCheckBoxColumnSelectAll.cs" />
<Compile Include="VDianForms\VDianShopEditForm.cs">
<SubType>Form</SubType>
</Compile>
TEMUKJD/KJDForms/AdminForms/AdminAccountForm.Designer.cs
Generated
+2 -9
View File
@@ -31,7 +31,6 @@ namespace TemuKJD.KJDForms.AdminForms
{
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();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.btnAdd1000 = new DevComponents.DotNetBar.PanelEx();
this.btnAdd100 = new DevComponents.DotNetBar.PanelEx();
@@ -576,17 +575,10 @@ namespace TemuKJD.KJDForms.AdminForms
this.colAuthorizedAmount,
this.editColumn,
this.deleteColumn});
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.DefaultCellStyle = dataGridViewCellStyle3;
this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
this.dgvUser.Location = new System.Drawing.Point(0, 0);
this.dgvUser.MultiSelectCheckBox = true;
this.dgvUser.Name = "dgvUser";
this.dgvUser.ReadOnly = true;
this.dgvUser.RowTemplate.Height = 23;
@@ -678,6 +670,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.ClientSize = new System.Drawing.Size(800, 527);
this.Controls.Add(this.splitContainer5);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.KeyPreview = true;
this.Name = "AdminAccountForm";
this.Text = "AccountForm";
this.Load += new System.EventHandler(this.MainAccountForm_Load);
TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs
Generated
+21 -28
View File
@@ -28,9 +28,8 @@
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.label1 = new System.Windows.Forms.Label();
this.btnRefresh = new TemuKJD.UserControls.ButtonEx();
@@ -185,10 +184,10 @@
this.label31.TabIndex = 32;
this.label31.Text = "*";
//
// repasstextBox
// txtRePass
//
this.txtRePass.Location = new System.Drawing.Point(112, 226);
this.txtRePass.Name = "repasstextBox";
this.txtRePass.Name = "txtRePass";
this.txtRePass.PasswordChar = '*';
this.txtRePass.Size = new System.Drawing.Size(148, 23);
this.txtRePass.TabIndex = 24;
@@ -243,7 +242,7 @@
this.label36.TabIndex = 27;
this.label36.Text = "*";
//
// groupIdcomboBox
// cmbGroup
//
this.cmbGroup.Enabled = false;
this.cmbGroup.FormattingEnabled = true;
@@ -254,7 +253,7 @@
"数据",
"登录"});
this.cmbGroup.Location = new System.Drawing.Point(112, 267);
this.cmbGroup.Name = "groupIdcomboBox";
this.cmbGroup.Name = "cmbGroup";
this.cmbGroup.Size = new System.Drawing.Size(148, 25);
this.cmbGroup.TabIndex = 26;
this.cmbGroup.Text = "客服";
@@ -269,10 +268,10 @@
this.label37.TabIndex = 25;
this.label37.Text = "分组：";
//
// passwordtextBox
// txtPassword
//
this.txtPassword.Location = new System.Drawing.Point(112, 184);
this.txtPassword.Name = "passwordtextBox";
this.txtPassword.Name = "txtPassword";
this.txtPassword.PasswordChar = '*';
this.txtPassword.Size = new System.Drawing.Size(148, 23);
this.txtPassword.TabIndex = 23;
@@ -325,19 +324,20 @@
//
this.dgvUser.AllowUserToAddRows = false;
this.dgvUser.AllowUserToDeleteRows = false;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvUser.AutoRowNumber = true;
this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvUser.BackgroundColor = System.Drawing.Color.White;
this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
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.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.UserIdColumn,
@@ -348,17 +348,10 @@
this.shopCountColumn,
this.editColumn,
this.deleteColumn});
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.DefaultCellStyle = dataGridViewCellStyle6;
this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
this.dgvUser.Location = new System.Drawing.Point(0, 5);
this.dgvUser.MultiSelectCheckBox = true;
this.dgvUser.Name = "dgvUser";
this.dgvUser.ReadOnly = true;
this.dgvUser.RowTemplate.Height = 23;
@@ -421,12 +414,12 @@
//
// SubAccountListForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(933, 445);
this.Controls.Add(this.splitContainer5);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.KeyPreview = true;
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "SubAccountListForm";
this.Text = "子账号管理";
TEMUKJD/MainForm.designer.cs
Generated
+14
View File
@@ -42,6 +42,7 @@ namespace TemuKJD
this.pnlWebBrowserJS = new DevComponents.DotNetBar.PanelEx();
this.btnDyCollect = new DevComponents.DotNetBar.ButtonX();
this.btnTest = new DevComponents.DotNetBar.ButtonX();
this.cefPanel = new System.Windows.Forms.Panel();
this.navPanel = new DevComponents.DotNetBar.PanelEx();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.pnlSA = new DevComponents.DotNetBar.PanelEx();
@@ -151,6 +152,7 @@ namespace TemuKJD
this.bodyPanel.Controls.Add(this.pnlWebBrowserJS);
this.bodyPanel.Controls.Add(this.btnDyCollect);
this.bodyPanel.Controls.Add(this.btnTest);
this.bodyPanel.Controls.Add(this.cefPanel);
this.bodyPanel.DisabledBackColor = System.Drawing.Color.Empty;
this.bodyPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.bodyPanel.Location = new System.Drawing.Point(0, 0);
@@ -214,6 +216,17 @@ namespace TemuKJD
this.btnTest.Visible = false;
this.btnTest.Click += new System.EventHandler(this.btnTest_Click);
//
// cefPanel
//
this.cefPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.cefPanel.BackColor = System.Drawing.Color.White;
this.cefPanel.Location = new System.Drawing.Point(49, 77);
this.cefPanel.Name = "cefPanel";
this.cefPanel.Size = new System.Drawing.Size(1183, 527);
this.cefPanel.TabIndex = 131;
//
// navPanel
//
this.navPanel.CanvasColor = System.Drawing.SystemColors.Control;
@@ -770,6 +783,7 @@ namespace TemuKJD
private System.Windows.Forms.Label lblVersionInfo;
public DevComponents.DotNetBar.PanelEx pnlJit;
public System.Windows.Forms.Label lblVersionName;
public System.Windows.Forms.Panel cefPanel;
}
}
TEMUKJD/PDDForms/AdminForms/PDDAdminAccountForm.Designer.cs
Generated
+45 -54
View File
@@ -30,10 +30,12 @@ namespace TemuKJD.PDDForms.AdminForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.chkSetCats = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkAiImage = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.label7 = new System.Windows.Forms.Label();
this.cmbSaLevel = new System.Windows.Forms.ComboBox();
this.label6 = new System.Windows.Forms.Label();
this.lblWatermark = new System.Windows.Forms.Label();
@@ -66,9 +68,6 @@ namespace TemuKJD.PDDForms.AdminForms
this.label40 = new System.Windows.Forms.Label();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.dgvUser = new TemuKJD.UserComponent.DataGridViewEx();
this.label7 = new System.Windows.Forms.Label();
this.chkAiImage = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkSetCats = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.UserIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.UserNickNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.mobileColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -145,6 +144,36 @@ namespace TemuKJD.PDDForms.AdminForms
this.splitContainer5.SplitterWidth = 1;
this.splitContainer5.TabIndex = 3;
//
// chkSetCats
//
this.chkSetCats.AutoSize = true;
this.chkSetCats.Location = new System.Drawing.Point(194, 432);
this.chkSetCats.Name = "chkSetCats";
this.chkSetCats.Size = new System.Drawing.Size(75, 21);
this.chkSetCats.TabIndex = 51;
this.chkSetCats.Text = "类目指定";
this.chkSetCats.UseVisualStyleBackColor = true;
//
// chkAiImage
//
this.chkAiImage.AutoSize = true;
this.chkAiImage.Location = new System.Drawing.Point(112, 432);
this.chkAiImage.Name = "chkAiImage";
this.chkAiImage.Size = new System.Drawing.Size(62, 21);
this.chkAiImage.TabIndex = 50;
this.chkAiImage.Text = "Ai传图";
this.chkAiImage.UseVisualStyleBackColor = true;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(27, 432);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(79, 20);
this.label7.TabIndex = 49;
this.label7.Text = "功能权限：";
//
// cmbSaLevel
//
this.cmbSaLevel.FormattingEnabled = true;
@@ -481,20 +510,20 @@ namespace TemuKJD.PDDForms.AdminForms
//
this.dgvUser.AllowUserToAddRows = false;
this.dgvUser.AllowUserToDeleteRows = false;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvUser.AutoRowNumber = true;
this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvUser.BackgroundColor = System.Drawing.Color.White;
this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
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.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.UserIdColumn,
@@ -510,14 +539,6 @@ namespace TemuKJD.PDDForms.AdminForms
this.colAddShop,
this.editColumn,
this.deleteColumn});
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.DefaultCellStyle = dataGridViewCellStyle6;
this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
this.dgvUser.Location = new System.Drawing.Point(0, 0);
@@ -529,36 +550,6 @@ namespace TemuKJD.PDDForms.AdminForms
this.dgvUser.TabIndex = 1;
this.dgvUser.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvUser_CellContentClick);
//
// label7
//
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(27, 432);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(79, 20);
this.label7.TabIndex = 49;
this.label7.Text = "功能权限：";
//
// chkAiImage
//
this.chkAiImage.AutoSize = true;
this.chkAiImage.Location = new System.Drawing.Point(112, 432);
this.chkAiImage.Name = "chkAiImage";
this.chkAiImage.Size = new System.Drawing.Size(74, 21);
this.chkAiImage.TabIndex = 50;
this.chkAiImage.Text = "Ai传图";
this.chkAiImage.UseVisualStyleBackColor = true;
//
// chkSetCats
//
this.chkSetCats.AutoSize = true;
this.chkSetCats.Location = new System.Drawing.Point(194, 432);
this.chkSetCats.Name = "chkSetCats";
this.chkSetCats.Size = new System.Drawing.Size(75, 21);
this.chkSetCats.TabIndex = 51;
this.chkSetCats.Text = "类目指定";
this.chkSetCats.UseVisualStyleBackColor = true;
//
// UserIdColumn
//
this.UserIdColumn.HeaderText = "id";
TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.Designer.cs
Generated
+26 -40
View File
@@ -61,7 +61,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
this.chk21365 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.txtAddShippingFeeTimes = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.btnApiUpload = new DevComponents.DotNetBar.PanelEx();
this.btnSignActivity = new DevComponents.DotNetBar.PanelEx();
this.btnStop = new DevComponents.DotNetBar.PanelEx();
this.chk20981 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chk22347 = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -142,7 +142,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.panel1 = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -217,7 +216,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
this.ucGroupBoxEx2.Controls.Add(this.chk21365);
this.ucGroupBoxEx2.Controls.Add(this.txtAddShippingFeeTimes);
this.ucGroupBoxEx2.Controls.Add(this.label12);
this.ucGroupBoxEx2.Controls.Add(this.btnApiUpload);
this.ucGroupBoxEx2.Controls.Add(this.btnSignActivity);
this.ucGroupBoxEx2.Controls.Add(this.btnStop);
this.ucGroupBoxEx2.Controls.Add(this.chk20981);
this.ucGroupBoxEx2.Controls.Add(this.chk22347);
@@ -455,30 +454,30 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
this.label12.TabIndex = 755;
this.label12.Text = "运费×";
//
// btnApiUpload
// btnSignActivity
//
this.btnApiUpload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnApiUpload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnApiUpload.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnApiUpload.DisabledBackColor = System.Drawing.Color.Empty;
this.btnApiUpload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnApiUpload.Location = new System.Drawing.Point(967, 33);
this.btnApiUpload.Name = "btnApiUpload";
this.btnApiUpload.Size = new System.Drawing.Size(66, 23);
this.btnApiUpload.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnApiUpload.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnApiUpload.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnApiUpload.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btnApiUpload.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btnApiUpload.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btnApiUpload.Style.ForeColor.Color = System.Drawing.Color.White;
this.btnApiUpload.Style.GradientAngle = 90;
this.btnApiUpload.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnApiUpload.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnApiUpload.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnApiUpload.TabIndex = 742;
this.btnApiUpload.Text = "批量报名";
this.btnApiUpload.Click += new System.EventHandler(this.btnApiUpload_Click);
this.btnSignActivity.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSignActivity.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnSignActivity.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSignActivity.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSignActivity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSignActivity.Location = new System.Drawing.Point(967, 33);
this.btnSignActivity.Name = "btnSignActivity";
this.btnSignActivity.Size = new System.Drawing.Size(66, 23);
this.btnSignActivity.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSignActivity.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSignActivity.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSignActivity.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btnSignActivity.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btnSignActivity.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btnSignActivity.Style.ForeColor.Color = System.Drawing.Color.White;
this.btnSignActivity.Style.GradientAngle = 90;
this.btnSignActivity.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnSignActivity.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnSignActivity.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnSignActivity.TabIndex = 742;
this.btnSignActivity.Text = "批量报名";
this.btnSignActivity.Click += new System.EventHandler(this.btnApiUpload_Click);
//
// btnStop
//
@@ -1598,24 +1597,12 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
this.panelEx1.Text = "停止当前操作";
this.panelEx1.Visible = false;
//
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.Location = new System.Drawing.Point(699, 552);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(838, 86);
this.panel1.TabIndex = 189;
this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
//
// PDDAddActivityForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1540, 641);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.KeyPreview = true;
this.Name = "PDDAddActivityForm";
@@ -1671,7 +1658,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
private System.Windows.Forms.SplitContainer splitContainer4;
private UserControls.StatusBarUserControl statusBar;
private System.Windows.Forms.PictureBox pbLoading;
private System.Windows.Forms.Panel panel1;
private UserComponent.UcGroupBoxEx ucGroupBoxEx2;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.TextBox txtAddMorePrice;
@@ -1702,7 +1688,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
private UserComponent.UcCheckBox chk20981;
private UserComponent.UcCheckBox chk22347;
private UserComponent.UcCheckBox chkUseExtCodePrice;
private DevComponents.DotNetBar.PanelEx btnApiUpload;
private DevComponents.DotNetBar.PanelEx btnSignActivity;
private DevComponents.DotNetBar.PanelEx btnRefreshApi;
private System.Windows.Forms.TextBox txtAddShippingFeeTimes;
private System.Windows.Forms.Label label12;
TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs
+93 -29
View File
@@ -61,10 +61,10 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
dtpStartDay.Value = DateTime.Now.AddDays(-30);
this.splitContainer1.Dock = DockStyle.Fill;
this.panel1.Location = new Point(40, 30);
this.panel1.Width = this.Width - 80;
this.panel1.Height = this.Height - 60;
this.panel1.SendToBack();
//this.panel1.Location = new Point(40, 30);
//this.panel1.Width = this.Width - 80;
//this.panel1.Height = this.Height - 60;
//this.panel1.SendToBack();
//lstTemuDBProductSelect = NaiBa.Util.Helper.ConfigHelper.LoadConfig<NaiBa.Util.ConcurrentList<TemuDBProductSelect>>("pdd_db_prod_upload_list");
//if (lstTemuDBProductSelect == null)
@@ -117,16 +117,15 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
pddActivityRule = NaiBa.Util.Helper.ConfigHelper.LoadConfig<PddAddActivityRule>("pdd_add_activity_rule");
if (pddActivityRule == null)
pddActivityRule = new PddAddActivityRule();
this.chk22347.Checked = pddActivityRule.sign22347;
this.chk20981.Checked = pddActivityRule.sign20981;
this.chk21365.Checked = pddActivityRule.sign21365;
this.chk15996.Checked = pddActivityRule.sign15996;
this.chk23513.Checked = pddActivityRule.sign23513;
this.chk23730.Checked = pddActivityRule.sign23730;
this.chk23456.Checked = pddActivityRule.sign23456;
this.chk22347.Checked = pddActivityRule.sign22347 = pddActivityRule.sign22347 && this.chk22347.Visible;
this.chk20981.Checked = pddActivityRule.sign20981 = pddActivityRule.sign20981 && this.chk20981.Visible;
this.chk21365.Checked = pddActivityRule.sign21365 = pddActivityRule.sign21365 && this.chk21365.Visible;
this.chk15996.Checked = pddActivityRule.sign15996 = pddActivityRule.sign15996 && this.chk15996.Visible;
this.chk23513.Checked = pddActivityRule.sign23513 = pddActivityRule.sign23513 && this.chk23513.Visible;
this.chk23730.Checked = pddActivityRule.sign23730 = pddActivityRule.sign23730 && this.chk23730.Visible;
this.chk23456.Checked = pddActivityRule.sign23456 = pddActivityRule.sign23456 && this.chk23456.Visible;
this.chkUseExtCodePrice.Checked = pddActivityRule.IsUseExtCodePrice;
this.panel1.SendToBack();
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
dgvShop.Columns["colSelect"].HeaderText = "";
//chkSelectAll.Width = chkSelectAll.Height = 13;
@@ -2101,10 +2100,16 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
if (string.IsNullOrEmpty(out_goods_sn))
return new List<KJDDBProduct>();
List<KJDDBProduct> list = new List<KJDDBProduct>();
var url = BaseClass.BuildObjString("product/get_product_detail_list");
var data = UserLogin.GetSignaturex() + "&search_secret_spu_ids=" + out_goods_sn;
if (out_goods_sn.StartsWith("EC1") && out_goods_sn.EndsWith("A") && out_goods_sn.Length > 4)
{
out_goods_sn = out_goods_sn.Substring(3, out_goods_sn.Length - 4);
data = UserLogin.GetSignaturex() + "&search_spu=" + out_goods_sn;
}
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
@@ -2707,20 +2712,24 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
PDDShopLoginForm loginForm = null;
Invoke(new Action(() =>
{
this.panel1.SendToBack();
if (MainForm.instance.WindowState == FormWindowState.Minimized)
MainForm.instance.WindowState = FormWindowState.Maximized;
MainForm.instance.cefPanel.SendToBack();
MainForm.instance.cefPanel.Visible = true;
loginForm = new PDDShopLoginForm(shop);
loginForm.TopLevel = false;
loginForm.openType = EnumOpenType.manage;
loginForm.WindowState = FormWindowState.Maximized;
loginForm.InitUrl = "https://mms.pinduoduo.com/goods/goods_list?msfrom=mms_sidenav";
loginForm.Dock = DockStyle.Fill;
this.panel1.Controls.Add(loginForm);
MainForm.instance.cefPanel.Controls.Add(loginForm);
loginForm.Show();
}));
Thread.Sleep(Randomx.GetId(3000, 5000));
Invoke(new Action(() =>
{
MainForm.instance.cefPanel.SendToBack();
if (loginForm != null)
loginForm.Close();
}));
@@ -2857,6 +2866,8 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
BaseMsgForm.ShowError("请选择报名商品");
return;
}
AddActivity(dgvRows);
}
@@ -2869,7 +2880,13 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
}
this.statusBar.lblTaskStatus.Text = "正在操作...";
btnGetProd.Enabled = false;
btnSignActivity.Enabled = false;
Task.Run(() =>
{
Thread.Sleep(5000);
Invoke(new Action(() => { btnSignActivity.Enabled = true; }));
});
if (cancellationTokenSource != null)
cancellationTokenSource.Cancel();
cancellationTokenSource = new CancellationTokenSource();
@@ -3005,7 +3022,6 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
try
{
prodInfo = JsonHelper.DeserializeJsonToObject<PDDProductInfo>(dbProd.product_json);
actProd.productInfo = prodInfo;
}
catch (Exception ex)
{
@@ -3020,6 +3036,26 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
continue;
}
// 如果有编辑过的sku使用编辑过的sku
if (!dbProd.sku_edit_json.IsNullOrEmpty() && dbProd.sku_edit_json.Length > 10) // > 10 防止是空数组
{
prodInfo.detail.sku = JsonHelper.DeserializeJsonToList<sku_item>(dbProd.sku_edit_json);
}
// 如果没有货号或有相同货号无法区分sku，自定义货号
if (dbProd.product_get_type_text != "厂商直采")
{
if (prodInfo.detail.sku.Any(s => s.out_sku_sn.IsNullOrEmpty()) ||
prodInfo.detail.sku.Select(s => s.out_sku_sn).ToList().Count > prodInfo.detail.sku.Select(s => s.out_sku_sn).Distinct().ToList().Count)
{
foreach (var sku in prodInfo.detail.sku)
{
sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name));
sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A";
}
}
}
actProd.productInfo = prodInfo;
actProd.dbProduct = dbProd;
#endregion
@@ -3223,7 +3259,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
prodParam.goods_id = actProd.goods_id;
prodParam.gallery = JsonHelper.DeserializeJsonToList<gallery_param>(JsonHelper.SerializeObject(actProd.productInfo.detail.galleries));
// 生成正常加价的sku列表
// 生成正常加价的活动sku列表
int index = -1;
prodParam.skus = new List<sku_param>();
foreach (var skuGetRstInfo in actProd.lstPInfo.sku_list)
@@ -3231,7 +3267,11 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
index++;
var skuInfo = addPriceSkuInfoLst.FirstOrDefault(s => s.out_sku_sn == skuGetRstInfo.outSkuSn);
if (skuInfo == null)
skuInfo = addPriceSkuInfoLst[index];
{
//skuInfo = addPriceSkuInfoLst[index];
prodParam.skus = new List<sku_param>();
break;
}
//var skuParam = JsonHelper.DeserializeJsonToObject<sku_param>(JsonHelper.SerializeObject(skuGetRstInfo));
var skuParam = new sku_param();
@@ -3260,6 +3300,19 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
}
prodParam.skus.Add(skuParam);
}
if (prodParam.skus.Count == 0)
{
Invoke(new Action(() =>
{
row.Cells["colOpResult"].Value = "商品格式化错误，源商品sku不匹配";
}));
if (chkDown981Failed.Checked)
{
DownProd(shop, new List<long?>() { actProd.goods_id });
}
continue;
}
prodParamLst.Add(prodParam);
Invoke(new Action(() =>
{
@@ -3268,23 +3321,34 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
}
// 筛除初始化不符合报名条件的商品所在列表行
rowOperateLst = rowOperateLst.Where(r => prodParamLst.Any(p => p.goods_id == r.Cells["colSpuId"].Value.ParseToLong())).ToList();
// 剩余商品数量大于0才报名活动
if (prodParamLst.Count == 0)
continue;
bool sign22347 = chk22347.Checked && chk22347.Visible;
bool sign20981 = chk20981.Checked && chk20981.Visible;
bool sign21365 = chk21365.Checked && chk21365.Visible;
bool sign15996 = chk15996.Checked && chk15996.Visible;
bool sign23513 = chk23513.Checked && chk23513.Visible;
bool sign23730 = chk23730.Checked && chk23730.Visible;
bool sign23456 = chk23456.Checked && chk23456.Visible;
bool sign22347 = chk22347.Checked;
bool sign20981 = chk20981.Checked;
bool sign21365 = chk21365.Checked;
bool sign15996 = chk15996.Checked;
bool sign23513 = chk23513.Checked;
bool sign23730 = chk23730.Checked;
bool sign23456 = chk23456.Checked;
if ((sign22347 || sign20981 || sign21365 || sign15996 || sign23513 || sign23730 || sign23456) == false)
while ((sign22347 || sign20981 || sign21365 || sign15996 || sign23513 || sign23730 || sign23456) == false)
{
Invoke(new Action(() =>
{
foreach (var row in rowOperateLst)
row.Cells["colOpResult"].Value = "未选择报名活动";
}));
break;
Thread.Sleep(1000);
sign22347 = chk22347.Checked;
sign20981 = chk20981.Checked;
sign21365 = chk21365.Checked;
sign15996 = chk15996.Checked;
sign23513 = chk23513.Checked;
sign23730 = chk23730.Checked;
sign23456 = chk23456.Checked;
}
//任何环节报名失败直接下架，包括频繁
@@ -3587,7 +3651,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
}
Invoke(new Action(() =>
{
btnGetProd.Enabled = true;
btnSignActivity.Enabled = true;
string sRst = "操作结束！";
if (cancellationTokenSource.IsCancellationRequested)
sRst = "已取消操作！";
TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
+91 -4
View File
@@ -1072,6 +1072,28 @@ namespace TemuKJD.PDDForms.ProductSelectForms
PDDProductInfo prodInfo = null;
prodInfo = JsonHelper.DeserializeJsonToObject<PDDProductInfo>(dbProd.product_json);
// 模拟接口在后面有设置自定义sku和sku货号，此处跳过
//if (!dbProd.sku_edit_json.IsNullOrEmpty() && dbProd.sku_edit_json.Length > 10) // > 10 防止是空数组
//{
// //var skuInfoEditLst = JsonHelper.DeserializeJsonToList<sku_edit_item>(dbProd.sku_edit_json);
// // todo: 如果更新了图片，此处先处理图片上传并替换 thumb_url 后再转换 // 暂时搁置
// // 如果有编辑过的sku使用编辑过的sku
// prodInfo.detail.sku = JsonHelper.DeserializeJsonToList<sku_item>(dbProd.sku_edit_json);
//}
//// 如果没有货号或有相同货号无法区分sku，自定义货号
//if (dbProd.product_get_type_text != "厂商直采")
//{
// if (prodInfo.detail.sku.Any(s => s.out_sku_sn.IsNullOrEmpty()) ||
// prodInfo.detail.sku.Select(s => s.out_sku_sn).ToList().Count > prodInfo.detail.sku.Select(s => s.out_sku_sn).Distinct().ToList().Count)
// {
// foreach (var sku in prodInfo.detail.sku)
// {
// sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name));
// sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A";
// }
// }
//}
prodInfo.detail.galleries.RemoveAll(g => g.type == 6); // 视频暂时移除，以后再视情况加上
if (prodInfo.detail.cats == null || prodInfo.detail.cats.Where(c => !string.IsNullOrEmpty(c)).Count() == 0)
@@ -1086,7 +1108,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
}
}
var prodParam = new PDDProductUploadParam();
int currentCount = 0;
@@ -1785,6 +1806,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms
// 否则使用原版sku
skuInfoEditLst = JsonHelper.DeserializeJsonToList<sku_edit_item>(JsonHelper.SerializeObject(prodInfo.detail.sku));
}
// 如果没有货号或有相同货号无法区分sku，自定义货号
if (dbProd.product_get_type_text != "厂商直采")
{
if (skuInfoEditLst.Any(s => s.out_sku_sn.IsNullOrEmpty()) ||
skuInfoEditLst.Select(s => s.out_sku_sn).ToList().Count > skuInfoEditLst.Select(s => s.out_sku_sn).Distinct().ToList().Count)
{
foreach (var sku in skuInfoEditLst)
{
sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name));
sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A";
}
}
}
#endregion
// 如果做活动多倍加价，补全到两个sku规格
@@ -7201,6 +7235,27 @@ Content-Type: image/jpeg
PDDProductInfo prodInfo = null;
prodInfo = JsonHelper.DeserializeJsonToObject<PDDProductInfo>(dbProd.product_json);
if (!dbProd.sku_edit_json.IsNullOrEmpty() && dbProd.sku_edit_json.Length > 10) // > 10 防止是空数组
{
var skuInfoEditLst = JsonHelper.DeserializeJsonToList<sku_edit_item>(dbProd.sku_edit_json);
// todo: 如果更新了图片，此处先处理图片上传并替换 thumb_url 后再转换 // 暂时搁置
// 如果有编辑过的sku使用编辑过的sku
prodInfo.detail.sku = JsonHelper.DeserializeJsonToList<sku_item>(dbProd.sku_edit_json);
}
// 如果没有货号或有相同货号无法区分sku，自定义货号
if (dbProd.product_get_type_text != "厂商直采")
{
if (prodInfo.detail.sku.Any(s => s.out_sku_sn.IsNullOrEmpty()) ||
prodInfo.detail.sku.Select(s => s.out_sku_sn).ToList().Count > prodInfo.detail.sku.Select(s => s.out_sku_sn).Distinct().ToList().Count)
{
foreach (var sku in prodInfo.detail.sku)
{
sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name));
sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A";
}
}
}
if (BaseClass.UserAuthority.Contains("类目指定") && chkSetCats.Checked)
{
@@ -7634,8 +7689,14 @@ Content-Type: image/jpeg
#endregion
#region AI生成sku图片
if (chkActivity.Checked && chkAiImage.Checked)
if (/*chkActivity.Checked && */chkAiImage.Checked)
{
Invoke(new Action(() =>
{
if (cell != null)
cell.Value = "正在Ai生图";
}));
List<Task> tList = new List<Task>();
foreach (var sku in prodInfo.detail.sku)
{
@@ -7673,7 +7734,7 @@ Content-Type: image/jpeg
var pddUpImgApi = new PddApi(shop);
pddUpImgApi.Data["image"] = "data:image/jpeg;base64," + imgBase64;
var pddUpImgApiRst = pddUpImgApi.PddGoodsImageUpload();
if (!pddUpImgApiRst.Contains("\"goods_image_upload_response\""))
if (!pddUpImgApiRst.Contains("\"goods_image_upload_response\""))
pddUpImgApiRst = pddUpImgApi.PddGoodsImageUpload();
if (!pddUpImgApiRst.Contains("\"goods_image_upload_response\""))
{
@@ -7713,6 +7774,11 @@ Content-Type: image/jpeg
#endregion
#region 生成一组高倍率加价后的sku
Invoke(new Action(() =>
{
if (cell != null)
cell.Value = "正在生成sku";
}));
List<sku_item> addPriceFakeSkuInfoLst = new List<sku_item>();
Dictionary<string, string> skuFakeSpecNameDic1 = new Dictionary<string, string>();
Dictionary<string, string> skuFakeSpecNameDic2 = new Dictionary<string, string>();
@@ -7882,7 +7948,7 @@ Content-Type: image/jpeg
}
#endregion
#region // 添加一个多件sku，库存设置为0
#region 添加一个多件sku，库存设置为0
if (chkMultiPcsSku.Checked)
{
var addMulitPcsSkuRst = AddMulitPcsSku(shop, addPriceSkuInfoLst, skuFakeSpecNameDic1);
@@ -9262,6 +9328,27 @@ Content-Type: image/jpeg
{
return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"商品格式转换错误 " + ex.Message + "\"}";
}
if (!dbProd.sku_edit_json.IsNullOrEmpty() && dbProd.sku_edit_json.Length > 10) // > 10 防止是空数组
{
var skuInfoEditLst = JsonHelper.DeserializeJsonToList<sku_edit_item>(dbProd.sku_edit_json);
// todo: 如果更新了图片，此处先处理图片上传并替换 thumb_url 后再转换 // 暂时搁置
// 如果有编辑过的sku使用编辑过的sku
prodInfo.detail.sku = JsonHelper.DeserializeJsonToList<sku_item>(dbProd.sku_edit_json);
}
// 如果没有货号或有相同货号无法区分sku，自定义货号
if (dbProd.product_get_type_text != "厂商直采")
{
if (prodInfo.detail.sku.Any(s => s.out_sku_sn.IsNullOrEmpty()) ||
prodInfo.detail.sku.Select(s => s.out_sku_sn).ToList().Count > prodInfo.detail.sku.Select(s => s.out_sku_sn).Distinct().ToList().Count)
{
foreach (var sku in prodInfo.detail.sku)
{
sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name));
sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A";
}
}
}
// 获取映射关系
List<PddRelationParam> relationLst = new List<PddRelationParam>();
TEMUKJD/PDDForms/ProductSelectForms/PDDFissionProdByChanceImgForm.cs
+1 -1
View File
@@ -26,7 +26,7 @@ using Work;
namespace TemuKJD.PDDForms.ProductSelectForms
{
public partial class PDDFissionProdByChanceImgForm : Form
public partial class PDDFissionProdByChanceImgForm : BaseForm
{
CheckBox chkSelectAll;
ChanceProductConfig chanceProductConfig;
TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdByImgForm.cs
+1 -1
View File
@@ -26,7 +26,7 @@ using Work;
namespace TemuKJD.PDDForms.ProductSelectForms
{
public partial class PDDGetChanceProdByImgForm : Form
public partial class PDDGetChanceProdByImgForm : BaseForm
{
CheckBox chkSelectAll;
ChanceProductConfig chanceProductConfig;
TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs
+1 -1
View File
@@ -27,7 +27,7 @@ using Work;
namespace TemuKJD.PDDForms.ProductSelectForms
{
public partial class PDDGetChanceProdForm : Form
public partial class PDDGetChanceProdForm : BaseForm
{
/// <summary>
/// 是否是普通授权用户
TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs
Generated
+42 -29
View File
@@ -29,8 +29,8 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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();
this.label1 = new System.Windows.Forms.Label();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
@@ -39,6 +39,7 @@
this.btnLoginSelect = new TemuKJD.UserControls.ButtonEx();
this.btnCheck = new TemuKJD.UserControls.ButtonEx();
this.panel4 = new System.Windows.Forms.Panel();
this.label5 = new System.Windows.Forms.Label();
this.btnImport = new DevComponents.DotNetBar.PanelEx();
this.btnAddShop = new DevComponents.DotNetBar.PanelEx();
this.btnOpenOrder = new TemuKJD.UserControls.ButtonEx();
@@ -127,7 +128,7 @@
this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4);
this.splitContainer1.Size = new System.Drawing.Size(1264, 622);
this.splitContainer1.SplitterDistance = 46;
this.splitContainer1.SplitterDistance = 66;
this.splitContainer1.TabIndex = 33;
//
// tableLayoutPanel2
@@ -142,7 +143,7 @@
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 1;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(1264, 46);
this.tableLayoutPanel2.Size = new System.Drawing.Size(1264, 66);
this.tableLayoutPanel2.TabIndex = 37;
//
// panel5
@@ -205,6 +206,7 @@
//
// panel4
//
this.panel4.Controls.Add(this.label5);
this.panel4.Controls.Add(this.btnImport);
this.panel4.Controls.Add(this.btnAddShop);
this.panel4.Controls.Add(this.btnOpenOrder);
@@ -220,9 +222,19 @@
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel4.Location = new System.Drawing.Point(3, 3);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(1035, 40);
this.panel4.Size = new System.Drawing.Size(1035, 60);
this.panel4.TabIndex = 0;
//
// label5
//
this.label5.AutoSize = true;
this.label5.ForeColor = System.Drawing.Color.OrangeRed;
this.label5.Location = new System.Drawing.Point(1, 42);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(596, 17);
this.label5.TabIndex = 822;
this.label5.Text = "注：订单授权到期后无法读取订单、自动发货、读取售后；上传授权到期后无法进行发布商品和上下架等操作。";
//
// btnImport
//
this.btnImport.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -410,8 +422,8 @@
//
this.splitContainer2.Panel2.Controls.Add(this.chkAutoDrag);
this.splitContainer2.Panel2.Controls.Add(this.statusBar);
this.splitContainer2.Size = new System.Drawing.Size(1264, 572);
this.splitContainer2.SplitterDistance = 540;
this.splitContainer2.Size = new System.Drawing.Size(1264, 552);
this.splitContainer2.SplitterDistance = 520;
this.splitContainer2.TabIndex = 0;
//
// btnRefreshAuth
@@ -435,7 +447,7 @@
//
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
this.pbLoading.Location = new System.Drawing.Point(607, 245);
this.pbLoading.Location = new System.Drawing.Point(607, 235);
this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(50, 50);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -446,20 +458,20 @@
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvShop.AutoRowNumber = true;
this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -496,7 +508,7 @@
this.dgvShop.Name = "dgvShop";
this.dgvShop.ReadOnly = true;
this.dgvShop.RowTemplate.Height = 23;
this.dgvShop.Size = new System.Drawing.Size(1256, 540);
this.dgvShop.Size = new System.Drawing.Size(1256, 520);
this.dgvShop.TabIndex = 5;
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
//
@@ -558,7 +570,7 @@
//
// colGroupName
//
this.colGroupName.FillWeight = 69.42599F;
this.colGroupName.FillWeight = 69F;
this.colGroupName.HeaderText = "店铺分组";
this.colGroupName.Name = "colGroupName";
this.colGroupName.ReadOnly = true;
@@ -566,7 +578,7 @@
//
// colUploadAccount
//
this.colUploadAccount.FillWeight = 69.42599F;
this.colUploadAccount.FillWeight = 69F;
this.colUploadAccount.HeaderText = "上货账户";
this.colUploadAccount.Name = "colUploadAccount";
this.colUploadAccount.ReadOnly = true;
@@ -574,7 +586,7 @@
//
// colBuyAccount
//
this.colBuyAccount.FillWeight = 69.42599F;
this.colBuyAccount.FillWeight = 69F;
this.colBuyAccount.HeaderText = "采购账户";
this.colBuyAccount.Name = "colBuyAccount";
this.colBuyAccount.ReadOnly = true;
@@ -582,7 +594,7 @@
//
// colChatAccount
//
this.colChatAccount.FillWeight = 69.42599F;
this.colChatAccount.FillWeight = 69F;
this.colChatAccount.HeaderText = "客服账户";
this.colChatAccount.Name = "colChatAccount";
this.colChatAccount.ReadOnly = true;
@@ -604,7 +616,7 @@
//
// colBindApi
//
this.colBindApi.FillWeight = 48F;
this.colBindApi.FillWeight = 68F;
this.colBindApi.HeaderText = "上传授权";
this.colBindApi.Name = "colBindApi";
this.colBindApi.ReadOnly = true;
@@ -622,7 +634,7 @@
//
// colBindOrderApi
//
this.colBindOrderApi.FillWeight = 48F;
this.colBindOrderApi.FillWeight = 68F;
this.colBindOrderApi.HeaderText = "订单授权";
this.colBindOrderApi.Name = "colBindOrderApi";
this.colBindOrderApi.ReadOnly = true;
@@ -695,7 +707,7 @@
//
// colUpdateCookies
//
this.colUpdateCookies.FillWeight = 67F;
this.colUpdateCookies.FillWeight = 55F;
this.colUpdateCookies.HeaderText = "获取Cookie";
this.colUpdateCookies.Name = "colUpdateCookies";
this.colUpdateCookies.ReadOnly = true;
@@ -704,7 +716,7 @@
//
// colCopyCookies
//
this.colCopyCookies.FillWeight = 70F;
this.colCopyCookies.FillWeight = 55F;
this.colCopyCookies.HeaderText = "复制Cookie";
this.colCopyCookies.Name = "colCopyCookies";
this.colCopyCookies.ReadOnly = true;
@@ -812,6 +824,8 @@
private System.Windows.Forms.ComboBox cmbNotes;
private UserComponent.UcCheckBox chkUsePddWorkbanch;
public UserControls.ButtonEx btnOpenOrder;
private DevComponents.DotNetBar.PanelEx btnAddShop;
private DevComponents.DotNetBar.PanelEx btnImport;
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName;
private System.Windows.Forms.DataGridViewTextBoxColumn colMallId;
@@ -840,7 +854,6 @@
private System.Windows.Forms.DataGridViewLinkColumn colCopyCookies;
private System.Windows.Forms.DataGridViewLinkColumn colEdit;
private System.Windows.Forms.DataGridViewLinkColumn colDelete;
private DevComponents.DotNetBar.PanelEx btnAddShop;
private DevComponents.DotNetBar.PanelEx btnImport;
private System.Windows.Forms.Label label5;
}
}
TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs
+23 -2
View File
@@ -484,7 +484,7 @@ namespace TemuKJD.PDDForms.ShopForms
param.ChatAccount,
"",
"购买授权",
"绑定授权",
"绑定授权" + (param.AuthExpiresTime < DateTime.Now ? " (已过期)" : param.AuthExpiresTime.ToString(" MM-dd")),
"购买授权",
"绑定授权",
"进入",
@@ -504,6 +504,7 @@ namespace TemuKJD.PDDForms.ShopForms
dgvShop.CurrentCell = this.dgvShop.Rows[rowIndex].Cells[2];
}
}
displayShopStatus(param);
}));
}
@@ -521,8 +522,28 @@ namespace TemuKJD.PDDForms.ShopForms
dgvr.Cells["colGroupName"].Value = param.GroupName;
dgvr.Cells["colUploadAccount"].Value = param.UploadAccount;
dgvr.Cells["colBuyAccount"].Value = param.BuyAccount;
dgvr.Cells["colChatAccount"].Value = param.ChatAccount;
dgvr.Cells["colChatAccount"].Value = param.ChatAccount;
dgvr.Cells["colRelogin"].Value = string.IsNullOrWhiteSpace(param.LoginStatus) ? "未登录" : param.LoginStatus.Trim();
dgvr.Cells["colBindApi"].Value = "绑定授权" + (param.AuthExpiresTime < DateTime.Now ? " (已过期)" : param.AuthExpiresTime.ToString(" MM-dd"));
}
void displayShopStatus(ShopLoginInfo shop)
{
bool canUse = shop.LoginStatus == "登录成功";
bool apiAuth = shop.AuthExpiresTime > DateTime.Now;
var rows = this.dgvShop.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colShopId"].Value.ParseToString() == shop?.ShopId);
foreach (var row in rows)
{
(row.Cells["colRelogin"] as DataGridViewLinkCell).Style.ForeColor = canUse ? Color.Blue : Color.Red;
(row.Cells["colRelogin"] as DataGridViewLinkCell).LinkColor = canUse ? Color.Blue : Color.Red;
(row.Cells["colRelogin"] as DataGridViewLinkCell).ActiveLinkColor = canUse ? Color.LightBlue : Color.OrangeRed;
(row.Cells["colRelogin"] as DataGridViewLinkCell).VisitedLinkColor = canUse ? Color.DarkBlue : Color.DarkRed;
(row.Cells["colBindApi"] as DataGridViewLinkCell).Style.ForeColor = apiAuth ? Color.Blue : Color.Red;
(row.Cells["colBindApi"] as DataGridViewLinkCell).LinkColor = apiAuth ? Color.Blue : Color.Red;
(row.Cells["colBindApi"] as DataGridViewLinkCell).ActiveLinkColor = apiAuth ? Color.LightBlue : Color.OrangeRed;
(row.Cells["colBindApi"] as DataGridViewLinkCell).VisitedLinkColor = apiAuth ? Color.DarkBlue : Color.DarkRed;
}
}
/// <summary>
TEMUKJD/PDDForms/ShopForms/PDDSubAccountListForm.Designer.cs
Generated
+23 -30
View File
@@ -28,9 +28,8 @@
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.label1 = new System.Windows.Forms.Label();
this.btnRefresh = new TemuKJD.UserControls.ButtonEx();
@@ -185,10 +184,10 @@
this.label31.TabIndex = 32;
this.label31.Text = "*";
//
// repasstextBox
// txtRePass
//
this.txtRePass.Location = new System.Drawing.Point(112, 226);
this.txtRePass.Name = "repasstextBox";
this.txtRePass.Name = "txtRePass";
this.txtRePass.PasswordChar = '*';
this.txtRePass.Size = new System.Drawing.Size(148, 23);
this.txtRePass.TabIndex = 24;
@@ -243,7 +242,7 @@
this.label36.TabIndex = 27;
this.label36.Text = "*";
//
// groupIdcomboBox
// cmbGroup
//
this.cmbGroup.Enabled = false;
this.cmbGroup.FormattingEnabled = true;
@@ -254,7 +253,7 @@
"数据",
"登录"});
this.cmbGroup.Location = new System.Drawing.Point(112, 267);
this.cmbGroup.Name = "groupIdcomboBox";
this.cmbGroup.Name = "cmbGroup";
this.cmbGroup.Size = new System.Drawing.Size(148, 25);
this.cmbGroup.TabIndex = 26;
this.cmbGroup.Text = "客服";
@@ -269,10 +268,10 @@
this.label37.TabIndex = 25;
this.label37.Text = "分组：";
//
// passwordtextBox
// txtPassword
//
this.txtPassword.Location = new System.Drawing.Point(112, 184);
this.txtPassword.Name = "passwordtextBox";
this.txtPassword.Name = "txtPassword";
this.txtPassword.PasswordChar = '*';
this.txtPassword.Size = new System.Drawing.Size(148, 23);
this.txtPassword.TabIndex = 23;
@@ -325,19 +324,20 @@
//
this.dgvUser.AllowUserToAddRows = false;
this.dgvUser.AllowUserToDeleteRows = false;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvUser.AutoRowNumber = true;
this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvUser.BackgroundColor = System.Drawing.Color.White;
this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
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.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.UserIdColumn,
@@ -348,17 +348,10 @@
this.shopCountColumn,
this.editColumn,
this.deleteColumn});
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.DefaultCellStyle = dataGridViewCellStyle6;
this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
this.dgvUser.Location = new System.Drawing.Point(0, 5);
this.dgvUser.MultiSelectCheckBox = true;
this.dgvUser.Name = "dgvUser";
this.dgvUser.ReadOnly = true;
this.dgvUser.RowTemplate.Height = 23;
@@ -419,16 +412,16 @@
this.deleteColumn.Name = "deleteColumn";
this.deleteColumn.ReadOnly = true;
//
// SubAccountListForm
// PDDSubAccountListForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(933, 445);
this.Controls.Add(this.splitContainer5);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.KeyPreview = true;
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "SubAccountListForm";
this.Name = "PDDSubAccountListForm";
this.Text = "子账号管理";
this.Load += new System.EventHandler(this.SubAccountForm_Load);
this.splitContainer5.Panel1.ResumeLayout(false);
TEMUKJD/UserComponent/DataGridViewCheckBoxColumnSelectAll.cs
+202
View File
@@ -0,0 +1,202 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Windows.Forms.VisualStyles;
namespace TemuKJD.UserComponent
{
public class DataGridViewCheckBoxColumnSelectAll : DataGridViewCheckBoxColumn
{
private DatagridViewCheckBoxHeaderCell headerCell;
private bool loaded;
public event CheckBoxClickedHandler OnCheckBoxClicked;
int TotalCheckedCheckBoxes = 0;
bool IsHeaderCheckBoxClicked = false;
public DataGridViewCheckBoxColumnSelectAll()
{
this.headerCell = new DatagridViewCheckBoxHeaderCell();
base.HeaderCell = this.headerCell;
this.headerCell.OnCheckBoxClicked += new CheckBoxClickedHandler(this.headerCell_OnCheckBoxClicked);
this.loaded = false;
}
public DataGridViewCheckBoxColumnSelectAll(bool threeState)
: base(threeState)
{
this.headerCell = new DatagridViewCheckBoxHeaderCell();
base.HeaderCell = this.headerCell;
}
/// <summary>
/// 在DataGridView改变时进行事件的绑定
/// </summary>
protected override void OnDataGridViewChanged()
{
if (this.DataGridView != null)
{
this.DataGridView.CellValueChanged -= DataGridView_CellValueChanged;
this.DataGridView.CellValueChanged += DataGridView_CellValueChanged;
this.DataGridView.CurrentCellDirtyStateChanged -= DataGridView_CurrentCellDirtyStateChanged;
this.DataGridView.CurrentCellDirtyStateChanged += DataGridView_CurrentCellDirtyStateChanged;
}
}
/// <summary>
/// 在复选的时候进行判断.
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void DataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
{
if (e.RowIndex >= 0 && e.ColumnIndex >= 0)
{
if (!IsHeaderCheckBoxClicked)
RowCheckBoxClick((DataGridViewCheckBoxCell)this.DataGridView[e.ColumnIndex, e.RowIndex]);
}
}
/// <summary>
/// 在复选框被选中的时候触发该事件, 该事件用于触发ValueChanged事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void DataGridView_CurrentCellDirtyStateChanged(object sender, EventArgs e)
{
if (this.DataGridView.CurrentCell is DataGridViewCheckBoxCell)
this.DataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
}
/// <summary>
/// 复选框被点击时所需要做的操作
/// </summary>
/// <param name="checkBox"></param>
private void RowCheckBoxClick(DataGridViewCheckBoxCell checkBox)
{
var head = this.headerCell as DatagridViewCheckBoxHeaderCell;
if (checkBox != null)
{
//计算所有被选中的行的数量
if ((bool)checkBox.Value && TotalCheckedCheckBoxes < this.DataGridView.RowCount)
TotalCheckedCheckBoxes++;
else if (TotalCheckedCheckBoxes > 0)
TotalCheckedCheckBoxes--;
//当所有复选框都被选中的时候,列的头上的复选框被选中, 反之则不被选中.
if (TotalCheckedCheckBoxes < this.DataGridView.RowCount)
head.IsChecked = false;
else if (TotalCheckedCheckBoxes == this.DataGridView.RowCount)
head.IsChecked = true;
//强制repained
head.DataGridView.InvalidateCell(head);
}
}
/// <summary>
/// 头被选中时触发OnCheckBoxClicked事件.
/// </summary>
/// <param name="state"></param>
private void headerCell_OnCheckBoxClicked(bool state)
{
if (this.OnCheckBoxClicked != null)
{
this.OnCheckBoxClicked(state);
}
}
public delegate void CheckBoxClickedHandler(bool state);
internal class DatagridViewCheckBoxHeaderCell : DataGridViewColumnHeaderCell
{
private CheckBoxState _cbState = CheckBoxState.UncheckedNormal;
private Point _cellLocation = new Point();
private bool _checked;
private Point checkBoxLocation;
private Size checkBoxSize;
public bool IsChecked
{
get
{
return _checked;
}
set
{
_checked = value;
if (this._checked)
{
this._cbState = CheckBoxState.CheckedNormal;
}
else
{
this._cbState = CheckBoxState.UncheckedNormal;
}
}
}
public event CheckBoxClickedHandler OnCheckBoxClicked;
/// <summary>
/// 点击列头的时候触发的事件,这里有个判断, 如果点击的位置是复选框则触发OnCheckBoxClicked事件.
/// </summary>
/// <param name="e"></param>
protected override void OnMouseClick(DataGridViewCellMouseEventArgs e)
{
Point point = new Point(e.X + this._cellLocation.X, e.Y + this._cellLocation.Y);
if (((point.X >= this.checkBoxLocation.X) && (point.X <= (this.checkBoxLocation.X + this.checkBoxSize.Width))) && ((point.Y >= this.checkBoxLocation.Y) && (point.Y <= (this.checkBoxLocation.Y + this.checkBoxSize.Height))))
{
this._checked = !this._checked;
bool temp = this._checked;
if (this.OnCheckBoxClicked != null)
{
this.OnCheckBoxClicked(this._checked);
base.DataGridView.InvalidateCell(this);
}
foreach (DataGridViewRow row in base.DataGridView.Rows)
{
((DataGridViewCheckBoxCell)row.Cells[e.ColumnIndex]).Value = temp;
}
base.DataGridView.RefreshEdit();
}
base.OnMouseClick(e);
}
/// <summary>
/// 绘制一个CheckBox
/// </summary>
protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates dataGridViewElementState, object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle, DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
{
base.Paint(graphics, clipBounds, cellBounds, rowIndex, dataGridViewElementState, value, formattedValue, errorText, cellStyle, advancedBorderStyle, paintParts);
Point point = new Point();
Size glyphSize = CheckBoxRenderer.GetGlyphSize(graphics, CheckBoxState.UncheckedNormal);
point.X = (cellBounds.Location.X + (cellBounds.Width / 2)) - (glyphSize.Width / 2) - 1; // x位置补偿一个像素(否则在win11中偏右)
point.Y = (cellBounds.Location.Y + (cellBounds.Height / 2)) - (glyphSize.Height / 2);
//point.X = cellBounds.Location.X + (cellBounds.Width - glyphSize.Width) / 2; // 放一块以后除以2会有抖动
//point.Y = cellBounds.Location.Y + (cellBounds.Height - glyphSize.Height) / 2;
this._cellLocation = cellBounds.Location;
this.checkBoxLocation = point;
this.checkBoxSize = glyphSize;
if (this._checked)
{
this._cbState = CheckBoxState.CheckedNormal;
}
else
{
this._cbState = CheckBoxState.UncheckedNormal;
}
CheckBoxRenderer.DrawCheckBox(graphics, this.checkBoxLocation, this._cbState);
}
}
}
}
TEMUKJD/UserComponent/UcComboBoxMutiSelect .cs
+3 -1
View File
@@ -148,7 +148,9 @@ namespace TemuKJD.UserComponent
lblX.SendToBack();
//Form form = this.FindForm();
//form.Controls.Add(lblX);
this.GetParentNotTable().Controls.Add(lblX);
var p = this.GetParentNotTable();
if (p != null)
p.Controls.Add(lblX);
}
Point relativeLocation = this.GetRelativePosition(this.GetParentNotTable());
lblX.Location = new Point(relativeLocation.X + this.Width - 19 - lblX.Width, relativeLocation.Y + (this.Height - lblX.Height) / 2);
TEMUKJD/UserComponent/UcTabControlMetro.cs
+4 -2
View File
@@ -144,7 +144,8 @@ namespace TemuKJD.UserControls
e.Graphics.DrawLine(new Pen(tabSelectColor), new Point(rect.Left, rect.Top), new Point(rect.Right, rect.Top));
e.Graphics.DrawLine(new Pen(tabSelectColor), new Point(rect.Right, rect.Top), new Point(rect.Right, rect.Bottom));
// 绘制tab标题文字
e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault;
//e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault;
e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
e.Graphics.DrawString(this.TabPages[i].Text, this.Font, new SolidBrush(tabSelectTextColor), textPoint.X, textPoint.Y);
}
else
@@ -152,7 +153,8 @@ namespace TemuKJD.UserControls
// 绘制tab框
e.Graphics.FillRectangle(new SolidBrush(tabSelectColor), this.GetTabRect(i));
// 绘制tab标题文字
e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault;
//e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault;
e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
e.Graphics.DrawString(this.TabPages[i].Text, this.Font, new SolidBrush(tabUnSelectTextColor), textPoint.X, textPoint.Y);
}
TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs
Generated
+22 -31
View File
@@ -30,10 +30,10 @@ namespace TemuKJD.WXForms.AdminForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.chkShopOptimize = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkChanceProdCollect = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkShopPoints = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkWXShowProdGetFromType = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -87,7 +87,6 @@ namespace TemuKJD.WXForms.AdminForms
this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn();
this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn();
this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx();
this.chkShopOptimize = new TemuKJD.UserComponent.UcCheckBox(this.components);
((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit();
this.splitContainer5.Panel1.SuspendLayout();
this.splitContainer5.Panel2.SuspendLayout();
@@ -156,6 +155,15 @@ namespace TemuKJD.WXForms.AdminForms
this.splitContainer5.SplitterWidth = 1;
this.splitContainer5.TabIndex = 3;
//
// chkShopOptimize
//
this.chkShopOptimize.Location = new System.Drawing.Point(112, 422);
this.chkShopOptimize.Name = "chkShopOptimize";
this.chkShopOptimize.Size = new System.Drawing.Size(68, 21);
this.chkShopOptimize.TabIndex = 813;
this.chkShopOptimize.Text = "评分考核";
this.chkShopOptimize.UseVisualStyleBackColor = true;
//
// chkChanceProdCollect
//
this.chkChanceProdCollect.Location = new System.Drawing.Point(192, 422);
@@ -543,20 +551,20 @@ namespace TemuKJD.WXForms.AdminForms
//
this.dgvUser.AllowUserToAddRows = false;
this.dgvUser.AllowUserToDeleteRows = false;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvUser.AutoRowNumber = true;
this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvUser.BackgroundColor = System.Drawing.Color.White;
this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
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.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.UserIdColumn,
@@ -574,14 +582,6 @@ namespace TemuKJD.WXForms.AdminForms
this.colAddShop,
this.editColumn,
this.deleteColumn});
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.DefaultCellStyle = dataGridViewCellStyle6;
this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
this.dgvUser.Location = new System.Drawing.Point(0, 0);
@@ -722,15 +722,6 @@ namespace TemuKJD.WXForms.AdminForms
this.btnExportShopErp.Visible = false;
this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click);
//
// chkShopOptimize
//
this.chkShopOptimize.Location = new System.Drawing.Point(112, 422);
this.chkShopOptimize.Name = "chkShopOptimize";
this.chkShopOptimize.Size = new System.Drawing.Size(68, 21);
this.chkShopOptimize.TabIndex = 813;
this.chkShopOptimize.Text = "评分考核";
this.chkShopOptimize.UseVisualStyleBackColor = true;
//
// WXAdminAccountForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs
Generated
+54 -54
View File
@@ -68,7 +68,11 @@ namespace TemuKJD.WXForms.AdminForms
this.btnRemainOK = new DevComponents.DotNetBar.PanelEx();
this.lblAddProdRemaining = new System.Windows.Forms.Label();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.chkAutoDrag = new System.Windows.Forms.CheckBox();
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.panel3 = new System.Windows.Forms.Panel();
this.colSelect = new TemuKJD.UserComponent.DataGridViewCheckBoxColumnSelectAll();
this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -99,10 +103,6 @@ namespace TemuKJD.WXForms.AdminForms
this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn();
this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn();
this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.chkAutoDrag = new System.Windows.Forms.CheckBox();
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.panel3 = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -670,10 +670,57 @@ namespace TemuKJD.WXForms.AdminForms
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
this.dgvShop.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvShop_CellMouseDown);
//
// chkAutoDrag
//
this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.chkAutoDrag.AutoSize = true;
this.chkAutoDrag.BackColor = System.Drawing.Color.White;
this.chkAutoDrag.Location = new System.Drawing.Point(595, 0);
this.chkAutoDrag.Name = "chkAutoDrag";
this.chkAutoDrag.Size = new System.Drawing.Size(159, 21);
this.chkAutoDrag.TabIndex = 3;
this.chkAutoDrag.Text = "登录时自动滑动拼图验证";
this.chkAutoDrag.UseVisualStyleBackColor = false;
this.chkAutoDrag.Visible = false;
//
// ucSplitPage1
//
this.ucSplitPage1.CurrentPage = 1;
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
this.ucSplitPage1.IsShowPageSize = true;
this.ucSplitPage1.Location = new System.Drawing.Point(882, 0);
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
this.ucSplitPage1.Name = "ucSplitPage1";
this.ucSplitPage1.PageSize = 50;
this.ucSplitPage1.Size = new System.Drawing.Size(389, 25);
this.ucSplitPage1.TabIndex = 4;
this.ucSplitPage1.TotalPage = 1;
//
// statusBar
//
this.statusBar.BackColor = System.Drawing.Color.White;
this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
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(1271, 25);
this.statusBar.TabIndex = 1;
//
// panel3
//
this.panel3.BackColor = System.Drawing.Color.White;
this.panel3.Controls.Add(this.splitContainer1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(1, 33);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(1271, 576);
this.panel3.TabIndex = 35;
//
// colSelect
//
this.colSelect.FillWeight = 26F;
this.colSelect.HeaderText = "选";
this.colSelect.HeaderText = "";
this.colSelect.Name = "colSelect";
this.colSelect.ReadOnly = true;
this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
@@ -930,53 +977,6 @@ namespace TemuKJD.WXForms.AdminForms
this.colMsg.ReadOnly = true;
this.colMsg.Visible = false;
//
// chkAutoDrag
//
this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.chkAutoDrag.AutoSize = true;
this.chkAutoDrag.BackColor = System.Drawing.Color.White;
this.chkAutoDrag.Location = new System.Drawing.Point(595, 0);
this.chkAutoDrag.Name = "chkAutoDrag";
this.chkAutoDrag.Size = new System.Drawing.Size(159, 21);
this.chkAutoDrag.TabIndex = 3;
this.chkAutoDrag.Text = "登录时自动滑动拼图验证";
this.chkAutoDrag.UseVisualStyleBackColor = false;
this.chkAutoDrag.Visible = false;
//
// ucSplitPage1
//
this.ucSplitPage1.CurrentPage = 1;
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
this.ucSplitPage1.IsShowPageSize = true;
this.ucSplitPage1.Location = new System.Drawing.Point(882, 0);
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
this.ucSplitPage1.Name = "ucSplitPage1";
this.ucSplitPage1.PageSize = 50;
this.ucSplitPage1.Size = new System.Drawing.Size(389, 25);
this.ucSplitPage1.TabIndex = 4;
this.ucSplitPage1.TotalPage = 1;
//
// statusBar
//
this.statusBar.BackColor = System.Drawing.Color.White;
this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
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(1271, 25);
this.statusBar.TabIndex = 1;
//
// panel3
//
this.panel3.BackColor = System.Drawing.Color.White;
this.panel3.Controls.Add(this.splitContainer1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(1, 33);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(1271, 576);
this.panel3.TabIndex = 35;
//
// WXAdminShopListForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1055,7 +1055,7 @@ namespace TemuKJD.WXForms.AdminForms
private System.Windows.Forms.Panel panel3;
public System.Windows.Forms.Label lblAddToAccount;
public DevComponents.DotNetBar.PanelEx btnAddToAccount;
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
private UserComponent.DataGridViewCheckBoxColumnSelectAll colSelect;
private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount;
TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs
+1 -1
View File
@@ -47,7 +47,7 @@ namespace TemuKJD.WXForms.AdminForms
{
this.ucSplitPage1.PageChange += UcSplitPage1_PageChange;
this.dgvShop.AddSelectorColumn("colSelect");
//this.dgvShop.AddSelectorColumn("colSelect");
this.dgvShop.AddMergeColumnHeader(new List<string>() { /*"colMinus",*/ "colProductRemaining", "colPlus" }, "选品限额");
this.dgvShop.AddMergeColumn(new List<string>() { /*"colMinus",*/ "colProductRemaining", "colPlus" });
this.dgvShop.Columns["colMinus"].HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
+43 -5
View File
@@ -1650,8 +1650,25 @@ namespace TemuKJD.WXForms.ProductForms
}
#endregion
#region 暂时不上传视频
#region 提取源商品详情，根据需要生成sku货号
var prodInfo = JsonHelper.DeserializeJsonToObject<PDDProductInfo>(dbProd.product_json);
// 如果没有货号或有相同货号无法区分sku，自定义货号
if (dbProd.product_get_type_text != "厂商直采")
{
if (prodInfo.detail.sku.Any(s => s.out_sku_sn.IsNullOrEmpty()) ||
prodInfo.detail.sku.Select(s => s.out_sku_sn).ToList().Count > prodInfo.detail.sku.Select(s => s.out_sku_sn).Distinct().ToList().Count)
{
foreach (var sku in prodInfo.detail.sku)
{
sku.out_sku_sn = string.Join(";", sku.spec.Select(s => s.spec_name));
sku.out_sku_sn = "EC1" + Math.Abs(BaseClass.GetLong(sku.out_sku_sn)) + "A";
}
}
}
#endregion
#region 暂时不上传视频
prodInfo.detail.galleries.RemoveAll(g => g.type == 6); // 视频暂时移除，以后再视情况加上
#endregion
@@ -2852,7 +2869,7 @@ namespace TemuKJD.WXForms.ProductForms
{
if (propInfo.name == "出版社名称")
attr = productAttr.attr.FirstOrDefault(r => r.name == "出版社名称");
else if (propInfo.name == "ISBN编号")
else if (propInfo.name == "ISBN编号" && !prodInfo.property.goods_properties.Any(p => p.name == "ISBN版号/CN刊号"))
attr = productAttr.attr.FirstOrDefault(r => r.name == "ISBN版号/CN刊号");
else if (propInfo.name == "书名")
attr = productAttr.attr.FirstOrDefault(r => r.name == "书名");
@@ -3049,7 +3066,7 @@ namespace TemuKJD.WXForms.ProductForms
if ((propInfo.values.FirstOrDefault()?.value).ParseToString().EndsWith(attr.value))
attrValue = propInfo.values.FirstOrDefault()?.value;
else
attr.value = "100 ml";
attrValue = "100 ml";
}
else if (attr.value == "L")
{
@@ -3062,7 +3079,7 @@ namespace TemuKJD.WXForms.ProductForms
attrValue = "1 L";
}
else
attr.value = "1 L";
attrValue = "1 L";
}
else if (attr.value == "g;kg;ml;L")
{
@@ -3070,7 +3087,26 @@ namespace TemuKJD.WXForms.ProductForms
if (propInfoValue.EndsWith("g") || propInfoValue.EndsWith("kg") || propInfoValue.EndsWith("ml") || propInfoValue.EndsWith("L"))
attrValue = propInfo.values.FirstOrDefault()?.value;
else
attr.value = "100 g";
attrValue = "100 g";
}
else
{
attrValue = propInfo.values.FirstOrDefault()?.value.ParseToString();
var units = attr.value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
foreach (var unit in units)
{
var val = attrValue.Replace(unit, "").Trim();
if (attr.type == "decimal4_unit" && val.ParseToDecimal() != 0m)
{
attrValue = val + " " + unit;
break;
}
if (attr.type == "integer_unit" && val.ParseToInt() != 0)
{
attrValue = val + " " + unit;
break;
}
}
}
}
@@ -3157,6 +3193,8 @@ namespace TemuKJD.WXForms.ProductForms
attrValue = new List<string>() { "李老师", "张老师", "王老师" }[Randomx.GetId(3)];
if (attr.name == "包装")
attrValue = "平装";
if (attr.name == "出版时间")
attrValue = DateTime.Now.AddMonths(0 - Randomx.GetId(3, 7)).ToString("yyyy-MM");
}
if (upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料" || prodInfo.detail.cats.FirstOrDefault() == "食品饮料")
{
TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs
Generated
+789 -769
View File
File diff suppressed because it is too large. Load diff
TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs
+3 -1
View File
@@ -1222,6 +1222,7 @@ namespace TemuKJD.WXForms.ShopForms
orderWaybill.realPickupTime.ParseToInt().IsNullOrZero() ? "" : BaseClass.StampToDateTime(orderWaybill.realPickupTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
orderWaybill.pickupDuration.ParseToInt().IsNullOrZero() ? "" : ((orderWaybill.pickupDuration.ParseToInt() / 3600.0m).ToString("f2") + "小时" + "\r\n" + "[" + (is24 ? "次日" : "48小时") + "]"),
orderWaybill.delivery.deliveryName,
orderWaybill.waybillId,
orderWaybill.optimizeWaybillId + "\r\n" + orderWaybill.optimizeTime,
"补发"
);
@@ -1514,7 +1515,8 @@ namespace TemuKJD.WXForms.ShopForms
orderLinerCgiInfo.orderTime.IsNullOrZero() ? "" : BaseClass.StampToDateTime(orderLinerCgiInfo.orderTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
orderLinerCgiInfo.delivery_name,
BaseClass.StampToDateTime(orderLinerCgiInfo.collect_time.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss") + "\r\n" + BaseClass.StampToDateTime(orderLinerCgiInfo.receipt_time.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
orderLinerCgiInfo.waybill_id,
BaseClass.StampToDateTime(orderLinerCgiInfo.collect_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss") + "\r\n" + BaseClass.StampToDateTime(orderLinerCgiInfo.receipt_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss"),
"发货地：" + orderLinerCgiInfo.ship_city + "\r\n" + "收货地：" + orderLinerCgiInfo.ship_province + orderLinerCgiInfo.receipt_city,
(orderLinerCgiInfo.transport_duration.ParseToInt() / 3600) + "小时" + (orderLinerCgiInfo.transport_duration.ParseToInt() % 3600) / 60 + "分" + "\r\n标准时长" + (orderLinerCgiInfo.transport_std_duration.ParseToInt() / 3600) + "小时",
orderLinerCgiInfo.optimizeWaybillId + "\r\n" + orderLinerCgiInfo.optimizeTime,
TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx
+6
View File
@@ -318,6 +318,9 @@
<metadata name="colDgv3DeliveryName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colDgv3WaybillId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colDgv3OptimizeStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -369,6 +372,9 @@
<metadata name="dataGridViewTextBoxColumn9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colDgv4WaybillId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="dataGridViewTextBoxColumn10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs
Generated
+23 -30
View File
@@ -28,9 +28,8 @@
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.label1 = new System.Windows.Forms.Label();
this.btnRefresh = new TemuKJD.UserControls.ButtonEx();
@@ -185,10 +184,10 @@
this.label31.TabIndex = 32;
this.label31.Text = "*";
//
// repasstextBox
// txtRePass
//
this.txtRePass.Location = new System.Drawing.Point(112, 226);
this.txtRePass.Name = "repasstextBox";
this.txtRePass.Name = "txtRePass";
this.txtRePass.PasswordChar = '*';
this.txtRePass.Size = new System.Drawing.Size(148, 23);
this.txtRePass.TabIndex = 24;
@@ -243,7 +242,7 @@
this.label36.TabIndex = 27;
this.label36.Text = "*";
//
// groupIdcomboBox
// cmbGroup
//
this.cmbGroup.Enabled = false;
this.cmbGroup.FormattingEnabled = true;
@@ -254,7 +253,7 @@
"数据",
"登录"});
this.cmbGroup.Location = new System.Drawing.Point(112, 267);
this.cmbGroup.Name = "groupIdcomboBox";
this.cmbGroup.Name = "cmbGroup";
this.cmbGroup.Size = new System.Drawing.Size(148, 25);
this.cmbGroup.TabIndex = 26;
this.cmbGroup.Text = "客服";
@@ -269,10 +268,10 @@
this.label37.TabIndex = 25;
this.label37.Text = "分组：";
//
// passwordtextBox
// txtPassword
//
this.txtPassword.Location = new System.Drawing.Point(112, 184);
this.txtPassword.Name = "passwordtextBox";
this.txtPassword.Name = "txtPassword";
this.txtPassword.PasswordChar = '*';
this.txtPassword.Size = new System.Drawing.Size(148, 23);
this.txtPassword.TabIndex = 23;
@@ -325,19 +324,20 @@
//
this.dgvUser.AllowUserToAddRows = false;
this.dgvUser.AllowUserToDeleteRows = false;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvUser.AutoRowNumber = true;
this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvUser.BackgroundColor = System.Drawing.Color.White;
this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
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.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.UserIdColumn,
@@ -348,17 +348,10 @@
this.shopCountColumn,
this.editColumn,
this.deleteColumn});
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.DefaultCellStyle = dataGridViewCellStyle6;
this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
this.dgvUser.Location = new System.Drawing.Point(0, 5);
this.dgvUser.MultiSelectCheckBox = true;
this.dgvUser.Name = "dgvUser";
this.dgvUser.ReadOnly = true;
this.dgvUser.RowTemplate.Height = 23;
@@ -419,16 +412,16 @@
this.deleteColumn.Name = "deleteColumn";
this.deleteColumn.ReadOnly = true;
//
// SubAccountListForm
// WXSubAccountListForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(933, 445);
this.Controls.Add(this.splitContainer5);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.KeyPreview = true;
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "SubAccountListForm";
this.Name = "WXSubAccountListForm";
this.Text = "子账号管理";
this.Load += new System.EventHandler(this.SubAccountForm_Load);
this.splitContainer5.Panel1.ResumeLayout(false);
TEMUKJD/WXForms/TalkForms/TalkMessageForm.designer.cs
Generated
+4 -5
View File
@@ -74,15 +74,14 @@
this.panel2.Size = new System.Drawing.Size(254, 110);
this.panel2.TabIndex = 189;
//
// ChatMessageForm
// TalkMessageForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(256, 144);
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.ShowMinimizedBox = true;
this.Name = "ChatMessageForm";
this.Name = "TalkMessageForm";
this.Text = "新消息";
this.TitleText = "新消息";
this.Controls.SetChildIndex(this.panel2, 0);
TEMUKJD/WXForms/TalkForms/WxTalkForm.cs
+1 -1
View File
@@ -1189,7 +1189,7 @@ namespace TemuKJD.WXForms.TalkForms
Invoke(new Action(() =>
{
TalkMessageForm cmf = new TalkMessageForm(shop, this);
cmf.Dragable = false;
//cmf.Dragable = false;
cmf.ShowMinimizedBox = false;
lstChatMessageForm.Add(cmf);
Point p = new Point(Screen.PrimaryScreen.WorkingArea.Width - cmf.Width, Screen.PrimaryScreen.WorkingArea.Height);