1修复sku有特殊字符被截断的bug 2优化店铺进店/登录逻辑
This commit is contained in:
1 parent
91b1ea7dbc
commit
358bb5490e
21 files changed
+304
-171
No files matched your search
+41
-40
@@ -64,9 +64,6 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.btnRemainOK = new DevComponents.DotNetBar.PanelEx();
|
||||
this.lblAddProdRemaining = new System.Windows.Forms.Label();
|
||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.chkAutoDrag = new System.Windows.Forms.CheckBox();
|
||||
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -97,6 +94,9 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.colSubSa = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.chkAutoDrag = new System.Windows.Forms.CheckBox();
|
||||
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -565,43 +565,6 @@ namespace TemuKJD.KJDForms.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(597, 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 = false;
|
||||
this.ucSplitPage1.Location = new System.Drawing.Point(911, 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(362, 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(1273, 25);
|
||||
this.statusBar.TabIndex = 1;
|
||||
//
|
||||
// colSelect
|
||||
//
|
||||
this.colSelect.FillWeight = 26F;
|
||||
@@ -852,6 +815,44 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.colDelete.ReadOnly = true;
|
||||
this.colDelete.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(597, 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(831, 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(442, 25);
|
||||
this.ucSplitPage1.TabIndex = 4;
|
||||
this.ucSplitPage1.TotalPage = 1;
|
||||
this.ucSplitPage1.Load += new System.EventHandler(this.ucSplitPage1_Load);
|
||||
//
|
||||
// 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(1273, 25);
|
||||
this.statusBar.TabIndex = 1;
|
||||
//
|
||||
// AdminShopListForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
|
||||
@@ -20,6 +20,7 @@ using TemuKJD.Extension;
|
||||
using TemuKJD.BaseForms;
|
||||
using TemuKJD.KJDForms.ShopForms;
|
||||
using Work;
|
||||
using NaiBa.Util;
|
||||
|
||||
namespace TemuKJD.KJDForms.AdminForms
|
||||
{
|
||||
@@ -32,7 +33,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
set { inst = value; }
|
||||
}
|
||||
|
||||
public static List<ShopLoginInfo> lstAdminShopInfo { get; set; } = new List<ShopLoginInfo>();
|
||||
public static ConcurrentList<ShopLoginInfo> lstAdminShopInfo { get; set; } = new ConcurrentList<ShopLoginInfo>();
|
||||
|
||||
public AdminShopListForm()
|
||||
{
|
||||
@@ -101,7 +102,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
Task.Run(() =>
|
||||
{
|
||||
int pageCount;
|
||||
var list = AdminGetServerShopLst(out pageCount, page);
|
||||
var list = AdminGetServerShopLst(out pageCount, page, ucSplitPage1.PageSize) ;
|
||||
lstAdminShopInfo.AddRange(list);
|
||||
this.ucSplitPage1.TotalPage = pageCount;
|
||||
|
||||
@@ -299,8 +300,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
case "编辑":
|
||||
{
|
||||
ShopAddEditForm editForm = new ShopAddEditForm(shop);
|
||||
editForm.txtNotes.ReadOnly = true;
|
||||
editForm.txtNotes.Enabled = false;
|
||||
editForm.lblNotes.Visible = false;
|
||||
editForm.txtNotes.Visible = false;
|
||||
editForm.SaveCompleteWithDescribe += EditForm_SaveCompleteWithDescribe;
|
||||
editForm.ShowDialog();
|
||||
}
|
||||
@@ -308,10 +309,20 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
case "编辑备注":
|
||||
{
|
||||
ShopAddEditForm editForm = new ShopAddEditForm(shop);
|
||||
editForm.txtChatAccount.ReadOnly = true;
|
||||
editForm.txtChatAccount.Enabled = false;
|
||||
|
||||
editForm.txtShopPassword.ReadOnly = true;
|
||||
editForm.txtShopPassword.Enabled = false;
|
||||
editForm.txtShopPassword.Visible = false;
|
||||
editForm.lblShopPassword.Visible = false;
|
||||
|
||||
editForm.txtChatAccount.ReadOnly = true;
|
||||
editForm.txtChatAccount.Enabled = false;
|
||||
editForm.txtChatAccount.Visible = false;
|
||||
editForm.lblChatAccount.Visible = false;
|
||||
|
||||
editForm.lblNotes.Location = editForm.lblShopPassword.Location;
|
||||
editForm.txtNotes.Location = editForm.txtShopPassword.Location;
|
||||
|
||||
editForm.ShowDialog();
|
||||
if (editForm.HasChange)
|
||||
{
|
||||
@@ -1020,5 +1031,10 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
{
|
||||
this.pnlAddProdRemaining.Visible = false;
|
||||
}
|
||||
|
||||
private void ucSplitPage1_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user