diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs index 0587f79..3298a3f 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs @@ -29,14 +29,14 @@ namespace TemuKJD.WXForms.ShopForms /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); this.pnlSuperManage = new System.Windows.Forms.Panel(); this.label10 = new System.Windows.Forms.Label(); @@ -115,6 +115,7 @@ namespace TemuKJD.WXForms.ShopForms this.btnTopUpCancel = new DevComponents.DotNetBar.PanelEx(); this.btnTopUpOK = new DevComponents.DotNetBar.PanelEx(); this.dgvUser = new TemuKJD.UserComponent.DataGridViewEx(); + this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.UserIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.UserNickNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -143,7 +144,6 @@ namespace TemuKJD.WXForms.ShopForms this.colChangeGiftOemAmountPerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); - this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); this.splitContainer5.Panel1.SuspendLayout(); this.splitContainer5.Panel2.SuspendLayout(); @@ -1249,20 +1249,20 @@ namespace TemuKJD.WXForms.ShopForms // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; + 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))))); - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; + 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.colCheck, @@ -1304,6 +1304,31 @@ namespace TemuKJD.WXForms.ShopForms this.dgvUser.TabIndex = 1; this.dgvUser.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvUser_CellContentClick); // + // btnExportShopErp + // + this.btnExportShopErp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnExportShopErp.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnExportShopErp.DisabledBackColor = System.Drawing.Color.Empty; + this.btnExportShopErp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnExportShopErp.Location = new System.Drawing.Point(0, 1); + this.btnExportShopErp.Name = "btnExportShopErp"; + this.btnExportShopErp.Size = new System.Drawing.Size(140, 25); + this.btnExportShopErp.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnExportShopErp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExportShopErp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExportShopErp.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnExportShopErp.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnExportShopErp.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnExportShopErp.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnExportShopErp.Style.GradientAngle = 90; + this.btnExportShopErp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnExportShopErp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnExportShopErp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnExportShopErp.TabIndex = 439; + this.btnExportShopErp.Text = "导出用户到后台系统"; + this.btnExportShopErp.Visible = false; + this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); + // // colCheck // this.colCheck.FillWeight = 30F; @@ -1417,12 +1442,13 @@ namespace TemuKJD.WXForms.ShopForms // // colPlus // - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colPlus.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colPlus.DefaultCellStyle = dataGridViewCellStyle3; this.colPlus.FillWeight = 22F; this.colPlus.HeaderText = "+"; this.colPlus.Name = "colPlus"; this.colPlus.ReadOnly = true; + this.colPlus.Visible = false; // // colShopPointsPerMonth // @@ -1433,8 +1459,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangePointsPerMonth // - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangePointsPerMonth.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangePointsPerMonth.DefaultCellStyle = dataGridViewCellStyle4; this.colChangePointsPerMonth.FillWeight = 25F; this.colChangePointsPerMonth.HeaderText = "改"; this.colChangePointsPerMonth.Name = "colChangePointsPerMonth"; @@ -1450,8 +1476,8 @@ namespace TemuKJD.WXForms.ShopForms // // colBalancePlus // - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colBalancePlus.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colBalancePlus.DefaultCellStyle = dataGridViewCellStyle5; this.colBalancePlus.FillWeight = 22F; this.colBalancePlus.HeaderText = "+"; this.colBalancePlus.Name = "colBalancePlus"; @@ -1467,8 +1493,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangePostagePerOrder // - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangePostagePerOrder.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangePostagePerOrder.DefaultCellStyle = dataGridViewCellStyle6; this.colChangePostagePerOrder.FillWeight = 25F; this.colChangePostagePerOrder.HeaderText = "改"; this.colChangePostagePerOrder.Name = "colChangePostagePerOrder"; @@ -1483,8 +1509,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangeRefundPostagePerOrder // - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangeRefundPostagePerOrder.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangeRefundPostagePerOrder.DefaultCellStyle = dataGridViewCellStyle7; this.colChangeRefundPostagePerOrder.FillWeight = 25F; this.colChangeRefundPostagePerOrder.HeaderText = "改"; this.colChangeRefundPostagePerOrder.Name = "colChangeRefundPostagePerOrder"; @@ -1501,8 +1527,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangeGiftOemAmountPerOrder // - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangeGiftOemAmountPerOrder.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangeGiftOemAmountPerOrder.DefaultCellStyle = dataGridViewCellStyle8; this.colChangeGiftOemAmountPerOrder.FillWeight = 25F; this.colChangeGiftOemAmountPerOrder.HeaderText = "改"; this.colChangeGiftOemAmountPerOrder.Name = "colChangeGiftOemAmountPerOrder"; @@ -1528,31 +1554,6 @@ namespace TemuKJD.WXForms.ShopForms this.deleteColumn.ReadOnly = true; this.deleteColumn.Visible = false; // - // btnExportShopErp - // - this.btnExportShopErp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnExportShopErp.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnExportShopErp.DisabledBackColor = System.Drawing.Color.Empty; - this.btnExportShopErp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnExportShopErp.Location = new System.Drawing.Point(0, 1); - this.btnExportShopErp.Name = "btnExportShopErp"; - this.btnExportShopErp.Size = new System.Drawing.Size(140, 25); - this.btnExportShopErp.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnExportShopErp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExportShopErp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExportShopErp.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnExportShopErp.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnExportShopErp.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnExportShopErp.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnExportShopErp.Style.GradientAngle = 90; - this.btnExportShopErp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnExportShopErp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnExportShopErp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnExportShopErp.TabIndex = 439; - this.btnExportShopErp.Text = "导出用户到后台系统"; - this.btnExportShopErp.Visible = false; - this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); - // // WXOemAccountForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1691,33 +1692,33 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.Label label7; private DevComponents.DotNetBar.PanelEx btnGiftOemAmountPerOrderCancel; private DevComponents.DotNetBar.PanelEx btnGiftOemAmountPerOrder; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; - private System.Windows.Forms.DataGridViewTextBoxColumn UserIdColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn UserNickNameColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn mobileColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn colParentUserName; - private System.Windows.Forms.DataGridViewTextBoxColumn groupIdColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn groupNameColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn colCompany; - private System.Windows.Forms.DataGridViewTextBoxColumn shopCountColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevel; - private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevelName; - private System.Windows.Forms.DataGridViewTextBoxColumn colAuthority; - private System.Windows.Forms.DataGridViewTextBoxColumn colOemId; - private System.Windows.Forms.DataGridViewTextBoxColumn colOemName; - private System.Windows.Forms.DataGridViewTextBoxColumn colPoints; - private System.Windows.Forms.DataGridViewTextBoxColumn colPlus; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopPointsPerMonth; - private System.Windows.Forms.DataGridViewLinkColumn colChangePointsPerMonth; - private System.Windows.Forms.DataGridViewTextBoxColumn colBalance; - private System.Windows.Forms.DataGridViewTextBoxColumn colBalancePlus; - private System.Windows.Forms.DataGridViewTextBoxColumn colPostagePerOrder; - private System.Windows.Forms.DataGridViewLinkColumn colChangePostagePerOrder; - private System.Windows.Forms.DataGridViewTextBoxColumn colRefundPostagePerOrder; - private System.Windows.Forms.DataGridViewLinkColumn colChangeRefundPostagePerOrder; - private System.Windows.Forms.DataGridViewTextBoxColumn colGiftOemAmountPerOrder; - private System.Windows.Forms.DataGridViewLinkColumn colChangeGiftOemAmountPerOrder; - private System.Windows.Forms.DataGridViewLinkColumn editColumn; - private System.Windows.Forms.DataGridViewLinkColumn deleteColumn; - } + private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; + private System.Windows.Forms.DataGridViewTextBoxColumn UserIdColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn UserNickNameColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn mobileColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn colParentUserName; + private System.Windows.Forms.DataGridViewTextBoxColumn groupIdColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn groupNameColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn colCompany; + private System.Windows.Forms.DataGridViewTextBoxColumn shopCountColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevel; + private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevelName; + private System.Windows.Forms.DataGridViewTextBoxColumn colAuthority; + private System.Windows.Forms.DataGridViewTextBoxColumn colOemId; + private System.Windows.Forms.DataGridViewTextBoxColumn colOemName; + private System.Windows.Forms.DataGridViewTextBoxColumn colPoints; + private System.Windows.Forms.DataGridViewTextBoxColumn colPlus; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopPointsPerMonth; + private System.Windows.Forms.DataGridViewLinkColumn colChangePointsPerMonth; + private System.Windows.Forms.DataGridViewTextBoxColumn colBalance; + private System.Windows.Forms.DataGridViewTextBoxColumn colBalancePlus; + private System.Windows.Forms.DataGridViewTextBoxColumn colPostagePerOrder; + private System.Windows.Forms.DataGridViewLinkColumn colChangePostagePerOrder; + private System.Windows.Forms.DataGridViewTextBoxColumn colRefundPostagePerOrder; + private System.Windows.Forms.DataGridViewLinkColumn colChangeRefundPostagePerOrder; + private System.Windows.Forms.DataGridViewTextBoxColumn colGiftOemAmountPerOrder; + private System.Windows.Forms.DataGridViewLinkColumn colChangeGiftOemAmountPerOrder; + private System.Windows.Forms.DataGridViewLinkColumn editColumn; + private System.Windows.Forms.DataGridViewLinkColumn deleteColumn; + } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs index a6de26c..61f43f3 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs @@ -332,8 +332,11 @@ namespace TemuKJD.WXForms.ShopForms this.txtSearch.GotFocus += TxtSearch_GotFocus; this.txtSearch.LostFocus += TxtSearch_LostFocus; - this.dgvUser.AddMergeColumn(new List { "colPoints", "colPlus" }); - this.dgvUser.AddMergeColumnHeader(new List { "colPoints", "colPlus" }, "积分点数"); + if (colPoints.Visible == true && colPlus.Visible == true) + { + this.dgvUser.AddMergeColumn(new List { "colPoints", "colPlus" }); + this.dgvUser.AddMergeColumnHeader(new List { "colPoints", "colPlus" }, "积分点数"); + } this.dgvUser.AddMergeColumn(new List { "colShopPointsPerMonth", "colChangePointsPerMonth" }); this.dgvUser.AddMergeColumnHeader(new List { "colShopPointsPerMonth", "colChangePointsPerMonth" }, "月费耗点"); this.dgvUser.AddMergeColumn(new List { "colBalance", "colBalancePlus" }); diff --git a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs index e017b4e..08068ab 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs @@ -76,10 +76,11 @@ namespace TemuKJD.WXForms.ShopForms if (BaseClass.UserAuthority.Contains("评分考核")) { hideNames.Remove("评分考核"); - } - if (BaseClass.UserAuthority.Contains("充值用户") && BaseClass.GroupId == 3 && BaseClass.AgentCode.IsNullOrEmpty() && BaseClass.OemId.IsNullOrEmpty()) - { - //hideNames.Remove("积分充值"); + } + //if (BaseClass.UserAuthority.Contains("充值用户") && BaseClass.GroupId == 3 && BaseClass.AgentCode.IsNullOrEmpty() && BaseClass.OemId.IsNullOrEmpty()) + if (BaseClass.UserAuthority.Contains("充值用户") && BaseClass.GroupId == 3) + { + hideNames.Remove("积分充值"); } if (!BaseClass.OemId.IsNullOrEmpty() && BaseClass.IsOemOwner) {