diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 6205c86..99e105c 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,8 +27,8 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 369; - //public static int VersionCount = 369; + public static int VersionCount = 372; + //public static int VersionCount = 372; /// /// 版本号 diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index d7933df..cd5a721 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -209,6 +209,12 @@ InitForm.cs + + Form + + + AdminForm.cs + Form @@ -903,6 +909,9 @@ AdminAccountForm.cs + + AdminForm.cs + AdminShopAddSubSaForm.cs @@ -1225,6 +1234,8 @@ + + diff --git a/TEMUKJD/KJDForms/AdminForms/AdminForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminForm.Designer.cs new file mode 100644 index 0000000..59e3e3e --- /dev/null +++ b/TEMUKJD/KJDForms/AdminForms/AdminForm.Designer.cs @@ -0,0 +1,181 @@ +namespace TemuKJD.KJDForms.AdminForms +{ + partial class AdminForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("超级店铺管理"); + System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("超级用户管理"); + System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("选品数据库"); + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("认领待上传"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("库存上传"); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] { + treeNode1, + treeNode2, + treeNode3, + treeNode4, + treeNode5}); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); + this.lblName = new System.Windows.Forms.Label(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.tv = new TemuKJD.UserComponent.UcTreeView(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.panel3); + this.panel1.Controls.Add(this.panel2); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(792, 461); + this.panel1.TabIndex = 2; + // + // panel3 + // + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 28); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(792, 433); + this.panel3.TabIndex = 1; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(244)))), ((int)(((byte)(244)))), ((int)(((byte)(244))))); + this.panel2.Controls.Add(this.lblName); + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(792, 28); + this.panel2.TabIndex = 0; + // + // lblName + // + this.lblName.AutoSize = true; + this.lblName.Location = new System.Drawing.Point(5, 6); + this.lblName.Name = "lblName"; + this.lblName.Size = new System.Drawing.Size(57, 17); + this.lblName.TabIndex = 0; + this.lblName.Text = "lblName"; + // + // splitContainer1 + // + this.splitContainer1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.tv); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.panel1); + this.splitContainer1.Size = new System.Drawing.Size(933, 461); + this.splitContainer1.SplitterDistance = 140; + this.splitContainer1.SplitterWidth = 1; + this.splitContainer1.TabIndex = 3; + // + // tv + // + this.tv.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(251)))), ((int)(((byte)(251))))); + this.tv.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.tv.ChildNodeSelectedBgColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.tv.Cursor = System.Windows.Forms.Cursors.Hand; + this.tv.Dock = System.Windows.Forms.DockStyle.Fill; + this.tv.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawAll; + this.tv.ExpandButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.tv.FullRowSelect = true; + this.tv.GroupBgColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.tv.GroupFont = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.tv.GroupTitleColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); + this.tv.HideCollapsedGroup = false; + this.tv.ItemHeight = 32; + this.tv.Location = new System.Drawing.Point(0, 0); + this.tv.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.tv.Name = "tv"; + treeNode1.Name = "超级店铺管理"; + treeNode1.Text = "超级店铺管理"; + treeNode2.Name = "超级用户管理"; + treeNode2.Text = "超级用户管理"; + treeNode3.Name = "选品数据库"; + treeNode3.Text = "选品数据库"; + treeNode4.Name = "认领待上传"; + treeNode4.Text = "认领待上传"; + treeNode5.Name = "库存上传"; + treeNode5.Text = "库存上传"; + treeNode6.Name = "超级权限管理"; + treeNode6.Text = "超级权限管理"; + this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { + treeNode6}); + this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.tv.Size = new System.Drawing.Size(140, 461); + this.tv.TabIndex = 1; + this.tv.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tv_AfterSelect); + // + // AdminForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(933, 461); + this.Controls.Add(this.splitContainer1); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.Name = "AdminForm"; + this.Text = "AdminForm"; + this.Load += new System.EventHandler(this.ShopForm_Load); + this.panel1.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private UserComponent.UcTreeView tv; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Label lblName; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.SplitContainer splitContainer1; + } +} \ No newline at end of file diff --git a/TEMUKJD/KJDForms/AdminForms/AdminForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminForm.cs new file mode 100644 index 0000000..8c84da8 --- /dev/null +++ b/TEMUKJD/KJDForms/AdminForms/AdminForm.cs @@ -0,0 +1,169 @@ +using AllBase; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.Windows.Forms; +using TemuKJD.KJDForms.AdminForms; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.ProductSelectForms; +using TemuKJD.KJDForms.ProductThirdSelectForms; + +namespace TemuKJD.KJDForms.AdminForms +{ + public partial class AdminForm : BaseForm + { + public Lazy adminAccountForm = new Lazy(); + public Lazy adminShopForm = new Lazy(); + public Lazy dbProductListForm = new Lazy(); + public Lazy dbProductSelectListManageForm = new Lazy(); + public Lazy productThirdSelectListManageForm = new Lazy(); + + public AdminForm() + { + InitializeComponent(); + + try + { + tv.SelectedNode = tv.Nodes[0].Nodes[0]; + tv.ExpandGroup(tv.Nodes[0].Name); + + List hideName = new List() { "超级用户管理", "超级店铺管理", "选品数据库", "认领待上传", "库存上传" }; + + if (BaseClass.GroupId == 3) + { + /*BaseClass.UserName == "18888888888" || BaseClass.UserName == "15333333333"*/ + if (BaseClass.SaLevel==1) + { + hideName.Remove("超级用户管理"); + hideName.Remove("超级店铺管理"); + hideName.Remove("选品数据库"); + hideName.Remove("认领待上传"); + hideName.Remove("库存上传"); + } + if (BaseClass.SaLevel==2) + { + hideName.Remove("超级店铺管理"); + hideName.Remove("认领待上传"); + hideName.Remove("库存上传"); + } + } + + foreach (var item in hideName) + { + var n = tv.Nodes[0].Nodes.Find(item, true); + if (n.Count() > 0) + n[0].Remove(); + } + } + catch { } + } + + private void tv_AfterSelect(object sender, TreeViewEventArgs e) + { + MainForm.sCurrentModule = e.Node.Name; + this.lblName.Text = e.Node.Text; + // 如果是一级菜单，不做任何动作 + if (e.Node.Parent == null) return; + new Thread(() => + { + Thread.Sleep(200); + Invoke(new Action(() => + { + switch (e.Node.Name) + { + case "超级用户管理": + SetForm(adminAccountForm.Value); + break; + case "超级店铺管理": + SetForm(adminShopForm.Value); + break; + case "选品数据库": + SetForm(dbProductListForm.Value); + break; + case "认领待上传": + SetForm(dbProductSelectListManageForm.Value); + break; + case "库存上传": + SetForm(productThirdSelectListManageForm.Value); + break; + } + })); + }).Start(); + } + + /// + /// 显示隐藏层 + /// + /// + private void SetForm(Form f) + { + if (f == null) + { + foreach (Control form in panel3.Controls) + { + form.Visible = false; + if (form is Form) + { + panel3.Controls.Remove(form as Form); + } + } + return; + } + + bool had = false; + string sCurrentFormName = f.Name; + for (int i = 0; i < panel3.Controls.Count; i++) + { + if (sCurrentFormName == panel3.Controls[i].Name) + { + had = true; + panel3.Controls[i].Visible = true; + } + else + { + panel3.Controls[i].Visible = false; + } + } + if (had) + { + f = null; + return; + } + f.TopLevel = false; + f.Left = 0; + f.Top = 0; + f.FormBorderStyle = FormBorderStyle.None; + panel3.Controls.Add(f); + f.AutoSize = true; + f.Dock = DockStyle.Fill; + f.Show(); + } + + private void ShopForm_Load(object sender, EventArgs e) + { + try + { + var ns = tv.Nodes.Find("运费模板", true); + if (ns.Count() > 0) + { + //foreach (var n in ns) + //{ + // tv.Nodes.Remove(n); + //} + + if (AllBase.BaseClass.IsCloudBuyOrder) + this.tv.Nodes[0].Nodes.Insert(ns[0].Index + 1, new TreeNode() { Text = "高级运费模板", Name = "高级运费模板" }); + } + tv.SelectedNode = tv.Nodes[0].Nodes[0]; + tv.ExpandGroup(tv.Nodes[0].Name); + } + catch { } + } + } +} diff --git a/TEMUKJD/KJDForms/AdminForms/AdminForm.resx b/TEMUKJD/KJDForms/AdminForms/AdminForm.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TEMUKJD/KJDForms/AdminForms/AdminForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs index 69209f3..bde1002 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs @@ -297,6 +297,12 @@ namespace TemuKJD.KJDForms.AdminForms //cefWebBrowser.Load(shopMainUrl); })); + + var storageJsCode = "window.localStorage.setItem('" + "mall-info-id" + "', '" + shop.ShopId + "');\r\n"; + while (!cefWebBrowser.IsBrowserInitialized || !cefWebBrowser.GetBrowser().MainFrame.IsValid) + Thread.Sleep(20); + cefWebBrowser.GetBrowser().MainFrame.ExecuteJavaScriptAsync(storageJsCode); + if (openType != EnumOpenType.login) { Invoke(new Action(() => diff --git a/TEMUKJD/KJDForms/AdminForms/ShopBrowserObject.cs b/TEMUKJD/KJDForms/AdminForms/ShopBrowserObject.cs index 18a42dc..9f7bc3f 100644 --- a/TEMUKJD/KJDForms/AdminForms/ShopBrowserObject.cs +++ b/TEMUKJD/KJDForms/AdminForms/ShopBrowserObject.cs @@ -252,7 +252,7 @@ namespace TemuKJD.KJDForms.AdminForms } else { - OnInfoReceived("选品商品保存成功!" + success_err_msg); + OnInfoReceived("库存上传保存成功!" + success_err_msg); } } catch (Exception ex) diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs index 4375794..075050f 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs @@ -57,8 +57,6 @@ this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -78,6 +76,8 @@ this.colSubSa = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn(); this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); + 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(); @@ -101,7 +101,6 @@ // // splitContainer1.Panel1 // - this.splitContainer1.Panel1.Controls.Add(this.chkNoSubSa); this.splitContainer1.Panel1.Controls.Add(this.btnSetSubSa); this.splitContainer1.Panel1.Controls.Add(this.cmbStatus); this.splitContainer1.Panel1.Controls.Add(this.label8); @@ -122,6 +121,7 @@ this.splitContainer1.Panel1.Controls.Add(this.label3); this.splitContainer1.Panel1.Controls.Add(this.txtCat); this.splitContainer1.Panel1.Controls.Add(this.label2); + this.splitContainer1.Panel1.Controls.Add(this.chkNoSubSa); // // splitContainer1.Panel2 // @@ -428,29 +428,6 @@ this.dgvSelectProduct.TabIndex = 188; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.Location = new System.Drawing.Point(1076, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); - this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); - this.ucSplitPage1.TabIndex = 6; - 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(1438, 25); - this.statusBar.TabIndex = 5; - // // colSelect // this.colSelect.HeaderText = "选择"; @@ -614,6 +591,29 @@ this.colOpResult.ReadOnly = true; this.colOpResult.Width = 150; // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.Location = new System.Drawing.Point(1076, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); + this.ucSplitPage1.TabIndex = 6; + 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(1438, 25); + this.statusBar.TabIndex = 5; + // // ProductThirdSelectListManageForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs index 0529cdb..035a3d7 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs @@ -180,7 +180,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms { Invoke(new Action(() => { - BaseMsgForm.ShowError("认领商品查询失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); + BaseMsgForm.ShowError("库存商品查询失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); })); return new List(); } diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/UserSelectThirdProductForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/UserSelectThirdProductForm.Designer.cs index e1fcbc8..5aa6092 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/UserSelectThirdProductForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/UserSelectThirdProductForm.Designer.cs @@ -135,7 +135,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.ucGroupBoxEx4.Size = new System.Drawing.Size(1142, 120); this.ucGroupBoxEx4.TabIndex = 666; this.ucGroupBoxEx4.TabStop = false; - this.ucGroupBoxEx4.Text = "认领商品查询"; + this.ucGroupBoxEx4.Text = "库存商品查询"; // // btnDelSelect // @@ -182,7 +182,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(68, 17); this.label8.TabIndex = 460; - this.label8.Text = "认领状态："; + this.label8.Text = "库存状态："; // // btnSearch // @@ -205,7 +205,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnSearch.TabIndex = 427; - this.btnSearch.Text = "认领商品查询"; + this.btnSearch.Text = "库存商品查询"; this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); // // ucGroupBoxEx1 diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/UserSelectThirdProductForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/UserSelectThirdProductForm.cs index ffcf7ef..1332940 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/UserSelectThirdProductForm.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/UserSelectThirdProductForm.cs @@ -297,7 +297,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms { Invoke(new Action(() => { - BaseMsgForm.ShowError("认领商品查询失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); + BaseMsgForm.ShowError("库存商品查询失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); })); return new List(); } diff --git a/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs index 2018f09..69967d5 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs @@ -29,26 +29,16 @@ private void InitializeComponent() { System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("店铺列表"); - System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("用户管理"); + System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("子账号管理"); System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("运费模板"); System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("高级运费模板"); System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("素材库管理"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("超级店铺管理"); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("超级用户管理"); - System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("选品数据库"); - System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("认领待上传"); - System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("库存上传"); - System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] { treeNode1, treeNode2, treeNode3, treeNode4, - treeNode5, - treeNode6, - treeNode7, - treeNode8, - treeNode9, - treeNode10}); + treeNode5}); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); @@ -141,28 +131,18 @@ this.tv.Name = "tv"; treeNode1.Name = "店铺列表"; treeNode1.Text = "店铺列表"; - treeNode2.Name = "用户管理"; - treeNode2.Text = "用户管理"; + treeNode2.Name = "子账号管理"; + treeNode2.Text = "子账号管理"; treeNode3.Name = "运费模板"; treeNode3.Text = "运费模板"; treeNode4.Name = "高级运费模板"; treeNode4.Text = "高级运费模板"; treeNode5.Name = "素材库管理"; treeNode5.Text = "素材库管理"; - treeNode6.Name = "超级店铺管理"; - treeNode6.Text = "超级店铺管理"; - treeNode7.Name = "超级用户管理"; - treeNode7.Text = "超级用户管理"; - treeNode8.Name = "选品数据库"; - treeNode8.Text = "选品数据库"; - treeNode9.Name = "认领待上传"; - treeNode9.Text = "认领待上传"; - treeNode10.Name = "库存上传"; - treeNode10.Text = "库存上传"; - treeNode11.Name = "店铺管理"; - treeNode11.Text = "店铺管理"; + treeNode6.Name = "店铺管理"; + treeNode6.Text = "店铺管理"; this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode11}); + treeNode6}); this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); this.tv.Size = new System.Drawing.Size(140, 461); this.tv.TabIndex = 1; diff --git a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs index 8e01239..1a9f64a 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs @@ -23,12 +23,7 @@ namespace TemuKJD.KJDForms.ShopForms public Lazy freightForm = new Lazy(); public Lazy freightTemplateForm = new Lazy(); public Lazy materialManageForm = new Lazy(); - public Lazy adminAccountForm = new Lazy(); - public Lazy adminShopForm = new Lazy(); - public Lazy dbProductListForm = new Lazy(); - public Lazy dbProductSelectListManageForm = new Lazy(); - public Lazy productThirdSelectListManageForm = new Lazy(); - + public ShopForm() { InitializeComponent(); @@ -38,26 +33,11 @@ namespace TemuKJD.KJDForms.ShopForms tv.SelectedNode = tv.Nodes[0].Nodes[0]; tv.ExpandGroup(tv.Nodes[0].Name); - List hideName = new List() { "用户管理", "高级运费模板", "运费模板", "素材库管理", "超级用户管理", "超级店铺管理", "选品数据库", "认领待上传", "库存上传" }; + List hideName = new List() { "子账号管理", "高级运费模板", "运费模板", "素材库管理" }; if (BaseClass.GroupId == 3) { - hideName.Remove("用户管理"); - /*BaseClass.UserName == "18888888888" || BaseClass.UserName == "15333333333"*/ - if (BaseClass.SaLevel==1) - { - hideName.Remove("超级用户管理"); - hideName.Remove("超级店铺管理"); - hideName.Remove("选品数据库"); - hideName.Remove("认领待上传"); - hideName.Remove("库存上传"); - } - if (BaseClass.SaLevel==2) - { - hideName.Remove("超级店铺管理"); - hideName.Remove("认领待上传"); - hideName.Remove("库存上传"); - } + hideName.Remove("子账号管理"); } foreach (var item in hideName) @@ -86,7 +66,7 @@ namespace TemuKJD.KJDForms.ShopForms case "店铺列表": SetForm(shopListForm.Value); break; - case "用户管理": + case "子账号管理": SetForm(sbuAccountForm.Value); break; case "运费模板": @@ -98,21 +78,6 @@ namespace TemuKJD.KJDForms.ShopForms case "素材库管理": SetForm(materialManageForm.Value); break; - case "超级用户管理": - SetForm(adminAccountForm.Value); - break; - case "超级店铺管理": - SetForm(adminShopForm.Value); - break; - case "选品数据库": - SetForm(dbProductListForm.Value); - break; - case "认领待上传": - SetForm(dbProductSelectListManageForm.Value); - break; - case "库存上传": - SetForm(productThirdSelectListManageForm.Value); - break; } })); }).Start(); diff --git a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs index d132015..f60101e 100644 --- a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs @@ -429,7 +429,7 @@ this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "SubAccountListForm"; - this.Text = "用户管理"; + this.Text = "子账号管理"; this.Load += new System.EventHandler(this.SubAccountForm_Load); this.splitContainer5.Panel1.ResumeLayout(false); this.splitContainer5.Panel1.PerformLayout(); diff --git a/TEMUKJD/MainForm.cs b/TEMUKJD/MainForm.cs index 75e6a67..dfa0b90 100644 --- a/TEMUKJD/MainForm.cs +++ b/TEMUKJD/MainForm.cs @@ -39,6 +39,7 @@ using NaiBa.Util; using AllBase.Model.Param.ProductManage; using TemuKJD.KJDForms.SalesCenterForms; using NaiBa.CefHelper.Handler; +using TemuKJD.KJDForms.AdminForms; namespace TemuKJD { @@ -206,7 +207,7 @@ namespace TemuKJD Icon = BaseClass.Ico; SetTitle(); - PanelEx[] ps = { pnlMarket, pnlOrder, pnlShop, pnlUpload, pnlTools, pnlCollect }; + PanelEx[] ps = { pnlMarket, pnlOrder, pnlShop, pnlUpload, pnlTools, pnlCollect, pnlSA }; foreach (PanelEx p in ps) p.BackgroundImage = p.Style.BackgroundImage; @@ -390,6 +391,11 @@ namespace TemuKJD PnlWeiDian_Click(null, null); pnlOrder_Click(null, null); pnlShop_Click(pnlShop, null); + if (BaseClass.SaLevel > 0) + { + pnlSA.Visible = true; + pnlSA_Click(pnlSA, null); + } if (BaseClass.GroupId.Equals(10)) { @@ -586,7 +592,7 @@ namespace TemuKJD } if (p == null) return; - PanelEx[] ps = { pnlMarket, pnlOrder, pnlShop, pnlUpload, pnlTools, pnlCollect }; + PanelEx[] ps = { pnlMarket, pnlOrder, pnlShop, pnlUpload, pnlTools, pnlCollect, pnlSA }; foreach (var panel in ps) { if (p.Name == panel.Name) @@ -619,6 +625,16 @@ namespace TemuKJD ShowMainPanel(shopForm, sender as Panel); } + private AdminForm adminForm; + private void pnlSA_Click(object sender, EventArgs e) + { + if (adminForm == null) + { + adminForm = new AdminForm(); + } + ShowMainPanel(adminForm, sender as Panel); + } + private ProductForm uploadForm; public void pnlUpload_Click(object sender, EventArgs e) { diff --git a/TEMUKJD/MainForm.designer.cs b/TEMUKJD/MainForm.designer.cs index 7fec788..6bd5ed8 100644 --- a/TEMUKJD/MainForm.designer.cs +++ b/TEMUKJD/MainForm.designer.cs @@ -35,16 +35,18 @@ namespace TemuKJD System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.navPanel = new DevComponents.DotNetBar.PanelEx(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.pnlSA = new DevComponents.DotNetBar.PanelEx(); this.pnlShop = new DevComponents.DotNetBar.PanelEx(); this.pnlUpload = new DevComponents.DotNetBar.PanelEx(); this.pnlMarket = new DevComponents.DotNetBar.PanelEx(); this.pnlCollect = new DevComponents.DotNetBar.PanelEx(); this.pnlTools = new DevComponents.DotNetBar.PanelEx(); this.pnlOrder = new DevComponents.DotNetBar.PanelEx(); - this.pnlSA = new DevComponents.DotNetBar.PanelEx(); this.pbLogo = new System.Windows.Forms.PictureBox(); this.lklbGetHwCode = new TemuKJD.UserComponent.LinkLabelLc(); this.plTopRight = new System.Windows.Forms.Panel(); + this.lblVersionName = new System.Windows.Forms.Label(); + this.lblVersionInfo = new System.Windows.Forms.Label(); this.lblContactSupport = new DevComponents.DotNetBar.LabelX(); this.picPinDuoDuoToken = new System.Windows.Forms.PictureBox(); this.pbAnnouncement = new System.Windows.Forms.PictureBox(); @@ -58,8 +60,6 @@ namespace TemuKJD this.pnlWebBrowserJS = new DevComponents.DotNetBar.PanelEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tpMainForm = new System.Windows.Forms.ToolTip(this.components); - this.lblVersionInfo = new System.Windows.Forms.Label(); - this.lblVersionName = new System.Windows.Forms.Label(); this.navPanel.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLogo)).BeginInit(); @@ -103,26 +103,60 @@ namespace TemuKJD // this.flowLayoutPanel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(143)))), ((int)(((byte)(255))))); this.flowLayoutPanel1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("flowLayoutPanel1.BackgroundImage"))); + this.flowLayoutPanel1.Controls.Add(this.pnlSA); this.flowLayoutPanel1.Controls.Add(this.pnlShop); this.flowLayoutPanel1.Controls.Add(this.pnlUpload); this.flowLayoutPanel1.Controls.Add(this.pnlMarket); this.flowLayoutPanel1.Controls.Add(this.pnlCollect); this.flowLayoutPanel1.Controls.Add(this.pnlTools); this.flowLayoutPanel1.Controls.Add(this.pnlOrder); - this.flowLayoutPanel1.Controls.Add(this.pnlSA); this.flowLayoutPanel1.Location = new System.Drawing.Point(196, 0); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(701, 91); this.flowLayoutPanel1.TabIndex = 131; // + // pnlSA + // + this.pnlSA.CanvasColor = System.Drawing.SystemColors.Control; + this.pnlSA.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlSA.Cursor = System.Windows.Forms.Cursors.Hand; + this.pnlSA.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlSA.Location = new System.Drawing.Point(0, 0); + this.pnlSA.Margin = new System.Windows.Forms.Padding(0); + this.pnlSA.Name = "pnlSA"; + this.pnlSA.Size = new System.Drawing.Size(80, 91); + this.pnlSA.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlSA.Style.BackColor1.Alpha = ((byte)(0)); + this.pnlSA.Style.BackColor1.Color = System.Drawing.Color.Transparent; + this.pnlSA.Style.BackColor2.Alpha = ((byte)(0)); + this.pnlSA.Style.BackColor2.Color = System.Drawing.Color.Transparent; + this.pnlSA.Style.BackgroundImage = global::TemuKJD.Properties.Resources.main_menu_sa; + this.pnlSA.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pnlSA.Style.BorderColor.Color = System.Drawing.Color.Transparent; + this.pnlSA.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.pnlSA.Style.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.pnlSA.Style.ForeColor.Color = System.Drawing.Color.White; + this.pnlSA.Style.GradientAngle = 90; + this.pnlSA.Style.LineAlignment = System.Drawing.StringAlignment.Near; + this.pnlSA.Style.MarginTop = 63; + this.pnlSA.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.pnlSA.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.main_menu_sa_select; + this.pnlSA.StyleMouseOver.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.pnlSA.StyleMouseOver.LineAlignment = System.Drawing.StringAlignment.Near; + this.pnlSA.StyleMouseOver.MarginTop = 63; + this.pnlSA.TabIndex = 121; + this.pnlSA.Text = "超级管理"; + this.pnlSA.Visible = false; + this.pnlSA.Click += new System.EventHandler(this.pnlSA_Click); + // // pnlShop // this.pnlShop.CanvasColor = System.Drawing.SystemColors.Control; this.pnlShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlShop.Cursor = System.Windows.Forms.Cursors.Hand; this.pnlShop.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlShop.Location = new System.Drawing.Point(0, 0); + this.pnlShop.Location = new System.Drawing.Point(80, 0); this.pnlShop.Margin = new System.Windows.Forms.Padding(0); this.pnlShop.Name = "pnlShop"; this.pnlShop.Size = new System.Drawing.Size(80, 91); @@ -155,7 +189,7 @@ namespace TemuKJD this.pnlUpload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlUpload.Cursor = System.Windows.Forms.Cursors.Hand; this.pnlUpload.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlUpload.Location = new System.Drawing.Point(80, 0); + this.pnlUpload.Location = new System.Drawing.Point(160, 0); this.pnlUpload.Margin = new System.Windows.Forms.Padding(0); this.pnlUpload.Name = "pnlUpload"; this.pnlUpload.Size = new System.Drawing.Size(80, 91); @@ -188,7 +222,7 @@ namespace TemuKJD this.pnlMarket.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlMarket.Cursor = System.Windows.Forms.Cursors.Hand; this.pnlMarket.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlMarket.Location = new System.Drawing.Point(160, 0); + this.pnlMarket.Location = new System.Drawing.Point(240, 0); this.pnlMarket.Margin = new System.Windows.Forms.Padding(0); this.pnlMarket.Name = "pnlMarket"; this.pnlMarket.Size = new System.Drawing.Size(80, 91); @@ -222,7 +256,7 @@ namespace TemuKJD this.pnlCollect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlCollect.Cursor = System.Windows.Forms.Cursors.Hand; this.pnlCollect.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlCollect.Location = new System.Drawing.Point(240, 0); + this.pnlCollect.Location = new System.Drawing.Point(320, 0); this.pnlCollect.Margin = new System.Windows.Forms.Padding(0); this.pnlCollect.Name = "pnlCollect"; this.pnlCollect.Size = new System.Drawing.Size(80, 91); @@ -256,7 +290,7 @@ namespace TemuKJD this.pnlTools.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlTools.Cursor = System.Windows.Forms.Cursors.Hand; this.pnlTools.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlTools.Location = new System.Drawing.Point(320, 0); + this.pnlTools.Location = new System.Drawing.Point(400, 0); this.pnlTools.Margin = new System.Windows.Forms.Padding(0); this.pnlTools.Name = "pnlTools"; this.pnlTools.Size = new System.Drawing.Size(80, 91); @@ -289,7 +323,7 @@ namespace TemuKJD this.pnlOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlOrder.Cursor = System.Windows.Forms.Cursors.Hand; this.pnlOrder.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlOrder.Location = new System.Drawing.Point(400, 0); + this.pnlOrder.Location = new System.Drawing.Point(480, 0); this.pnlOrder.Margin = new System.Windows.Forms.Padding(0); this.pnlOrder.Name = "pnlOrder"; this.pnlOrder.Size = new System.Drawing.Size(80, 91); @@ -317,39 +351,6 @@ namespace TemuKJD this.pnlOrder.Visible = false; this.pnlOrder.Click += new System.EventHandler(this.pnlOrder_Click); // - // pnlSA - // - this.pnlSA.CanvasColor = System.Drawing.SystemColors.Control; - this.pnlSA.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.pnlSA.Cursor = System.Windows.Forms.Cursors.Hand; - this.pnlSA.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlSA.Location = new System.Drawing.Point(480, 0); - this.pnlSA.Margin = new System.Windows.Forms.Padding(0); - this.pnlSA.Name = "pnlSA"; - this.pnlSA.Size = new System.Drawing.Size(80, 91); - this.pnlSA.Style.Alignment = System.Drawing.StringAlignment.Center; - this.pnlSA.Style.BackColor1.Alpha = ((byte)(0)); - this.pnlSA.Style.BackColor1.Color = System.Drawing.Color.Transparent; - this.pnlSA.Style.BackColor2.Alpha = ((byte)(0)); - this.pnlSA.Style.BackColor2.Color = System.Drawing.Color.Transparent; - this.pnlSA.Style.BackgroundImage = global::TemuKJD.Properties.Resources.main_menu_sa; - this.pnlSA.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.pnlSA.Style.BorderColor.Color = System.Drawing.Color.Transparent; - this.pnlSA.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.pnlSA.Style.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.pnlSA.Style.ForeColor.Color = System.Drawing.Color.White; - this.pnlSA.Style.GradientAngle = 90; - this.pnlSA.Style.LineAlignment = System.Drawing.StringAlignment.Near; - this.pnlSA.Style.MarginTop = 63; - this.pnlSA.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.pnlSA.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.main_menu_sa_select; - this.pnlSA.StyleMouseOver.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.pnlSA.StyleMouseOver.LineAlignment = System.Drawing.StringAlignment.Near; - this.pnlSA.StyleMouseOver.MarginTop = 63; - this.pnlSA.TabIndex = 121; - this.pnlSA.Text = "超级管理"; - this.pnlSA.Visible = false; - // // pbLogo // this.pbLogo.Image = global::TemuKJD.Properties.Resources.main_form_logo; @@ -400,6 +401,27 @@ namespace TemuKJD this.plTopRight.MouseMove += new System.Windows.Forms.MouseEventHandler(this.plTopRight_MouseMove); this.plTopRight.MouseUp += new System.Windows.Forms.MouseEventHandler(this.plTopRight_MouseUp); // + // lblVersionName + // + this.lblVersionName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.lblVersionName.Location = new System.Drawing.Point(3, 36); + this.lblVersionName.Name = "lblVersionName"; + this.lblVersionName.Size = new System.Drawing.Size(238, 23); + this.lblVersionName.TabIndex = 78; + this.lblVersionName.Text = "版本类型"; + this.lblVersionName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.lblVersionName.Visible = false; + // + // lblVersionInfo + // + this.lblVersionInfo.ForeColor = System.Drawing.SystemColors.ControlDark; + this.lblVersionInfo.Location = new System.Drawing.Point(3, 60); + this.lblVersionInfo.Name = "lblVersionInfo"; + this.lblVersionInfo.Size = new System.Drawing.Size(238, 23); + this.lblVersionInfo.TabIndex = 77; + this.lblVersionInfo.Text = "版本信息"; + this.lblVersionInfo.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // lblContactSupport // this.lblContactSupport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -641,27 +663,6 @@ namespace TemuKJD // this.tpMainForm.AutomaticDelay = 300; // - // lblVersionInfo - // - this.lblVersionInfo.ForeColor = System.Drawing.SystemColors.ControlDark; - this.lblVersionInfo.Location = new System.Drawing.Point(3, 60); - this.lblVersionInfo.Name = "lblVersionInfo"; - this.lblVersionInfo.Size = new System.Drawing.Size(238, 23); - this.lblVersionInfo.TabIndex = 77; - this.lblVersionInfo.Text = "版本信息"; - this.lblVersionInfo.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // lblVersionName - // - this.lblVersionName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.lblVersionName.Location = new System.Drawing.Point(3, 36); - this.lblVersionName.Name = "lblVersionName"; - this.lblVersionName.Size = new System.Drawing.Size(238, 23); - this.lblVersionName.TabIndex = 78; - this.lblVersionName.Text = "版本类型"; - this.lblVersionName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.lblVersionName.Visible = false; - // // MainForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/TEMUKJD/Properties/Resources.Designer.cs b/TEMUKJD/Properties/Resources.Designer.cs index 8979476..e0ad312 100644 --- a/TEMUKJD/Properties/Resources.Designer.cs +++ b/TEMUKJD/Properties/Resources.Designer.cs @@ -823,6 +823,26 @@ namespace TemuKJD.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap tree_子账号管理 { + get { + object obj = ResourceManager.GetObject("tree_子账号管理", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap tree_子账号管理_select { + get { + object obj = ResourceManager.GetObject("tree_子账号管理_select", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/TEMUKJD/Properties/Resources.resx b/TEMUKJD/Properties/Resources.resx index df9610c..ee29d68 100644 --- a/TEMUKJD/Properties/Resources.resx +++ b/TEMUKJD/Properties/Resources.resx @@ -388,4 +388,10 @@ ..\Resources\main_menu_sa_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\tree_子账号管理.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\tree_子账号管理_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TEMUKJD/Resources/tree_子账号管理.png b/TEMUKJD/Resources/tree_子账号管理.png new file mode 100644 index 0000000..7bfa542 Binary files /dev/null and b/TEMUKJD/Resources/tree_子账号管理.png differ diff --git a/TEMUKJD/Resources/tree_子账号管理_select.png b/TEMUKJD/Resources/tree_子账号管理_select.png new file mode 100644 index 0000000..ff7f88e Binary files /dev/null and b/TEMUKJD/Resources/tree_子账号管理_select.png differ