From 5b46930255ec185a906d07165f9d0dc91c300ab8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 02 四月 2024 10:56:30 +0800
Subject: [PATCH] 提交
---
CoreCms.Net.Web.Admin/wwwroot/views/applymodel/details.html | 108 ++++---
CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editParentId.html | 5
CoreCms.Net.Model/Entities/baifenbingfa/apply/applyModel.cs | 61 ++++
CoreCms.Net.Model/FromBody/FMUpdate.cs | 18 +
CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editPoint.html | 5
CoreCms.Net.Repository/apply/applyModelRepository.cs | 23 +
CoreCms.Net.Web.Admin/wwwroot/views/applymodel/edit.html | 122 ++++----
CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs | 234 ++++++++++++++++
CoreCms.Net.Model/ViewModels/baifenbingfa/applyModelDTO.cs | 120 ++++++++
CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs | 121 ++++++++
CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html | 8
CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editBalance.html | 5
12 files changed, 700 insertions(+), 130 deletions(-)
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/apply/applyModel.cs b/CoreCms.Net.Model/Entities/baifenbingfa/apply/applyModel.cs
index 13b288c..78c8335 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/apply/applyModel.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/apply/applyModel.cs
@@ -6,6 +6,7 @@
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Linq;
+using System.Reflection;
using System.Text;
using System.Threading.Tasks;
@@ -31,6 +32,13 @@
public string managerID { get; set; }
/// <summary>
+ /// 瀹℃壒浜哄悕绉扮敤,鍒嗗壊
+ /// </summary>
+ [Display(Name = "瀹℃壒浜哄悕绉扮敤,鍒嗗壊")]
+ [SugarColumn(ColumnDescription = "瀹℃壒浜哄悕绉�", IsNullable = true)]
+ public string managerName { get; set; }
+
+ /// <summary>
/// 瀹℃壒瑙掕壊ID锛屽彿鍒嗗壊
/// </summary>
[Display(Name = "瀹℃壒瑙掕壊ID")]
@@ -50,6 +58,21 @@
[Display(Name = "绫诲瀷")]
[SugarColumn(ColumnDescription = "绫诲瀷")]
public applyType aType { get; set; }
+
+ /// <summary>
+ /// 绫诲瀷
+ /// </summary>
+ [Display(Name = "瀹℃壒鐘舵��")]
+ [SugarColumn(ColumnDescription = "瀹℃壒鐘舵��")]
+ public applyStataType ayStataType { get; set; }
+
+
+ /// <summary>
+ /// 鐢ㄦ埛ID
+ /// </summary>
+ [Display(Name = "鐢ㄦ埛ID")]
+ [SugarColumn(ColumnDescription = "鐢ㄦ埛ID")]
+ public int userID { get; set; }
/// <summary>
@@ -80,6 +103,18 @@
[Display(Name = "璋冩暣鏁版嵁")]
[SugarColumn(ColumnDescription = "璋冩暣鏁版嵁")]
public string data { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍒涘缓浜�", IsNullable = true)]
+ public int createById { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "淇敼浜�", IsNullable = true)]
+ public int upDataById { get; set; }
}
/// <summary>
@@ -128,4 +163,30 @@
}
+
+ /// <summary>
+ /// 鑾峰彇Description
+ /// </summary>
+ public static class EnumExtensions
+ {
+ /// <summary>
+ /// 鑾峰彇Description
+ /// </summary>
+ public static string GetDescription(this Enum value, bool nameInstead = true)
+ {
+ Type type = value.GetType();
+ string name = Enum.GetName(type, value);
+ if (name == null)
+ {
+ return null;
+ }
+ FieldInfo field = type.GetField(name);
+ DescriptionAttribute attribute = field.GetCustomAttribute(typeof(DescriptionAttribute)) as DescriptionAttribute;
+ if (attribute == null && nameInstead == true)
+ {
+ return name;
+ }
+ return attribute?.Description;
+ }
+ }
}
diff --git a/CoreCms.Net.Model/FromBody/FMUpdate.cs b/CoreCms.Net.Model/FromBody/FMUpdate.cs
index ea828f6..9426f2a 100644
--- a/CoreCms.Net.Model/FromBody/FMUpdate.cs
+++ b/CoreCms.Net.Model/FromBody/FMUpdate.cs
@@ -142,6 +142,12 @@
public int id { get; set; }
/// <summary>
+ /// 鍘熺Н鍒�
+ /// </summary>
+ [Required(ErrorMessage = "璇疯緭鍏ュ師绉垎")]
+ public int oldpoint { get; set; }
+
+ /// <summary>
/// 绉垎
/// </summary>
[Required(ErrorMessage = "璇疯緭鍏ョН鍒�")]
@@ -165,6 +171,12 @@
/// </summary>
[Required(ErrorMessage = "璇疯緭鍏ュ簭鍒�")]
public int id { get; set; }
+
+ /// <summary>
+ /// 鍘熶綑棰�
+ /// </summary>
+ [Required(ErrorMessage = "璇疯緭鍏ュ師浣欓")]
+ public decimal oldbalance { get; set; }
/// <summary>
/// 浣欓
@@ -197,6 +209,12 @@
[Required(ErrorMessage = "璇疯緭鍏ヤ笂绾у簭鍒�")]
public int parentId { get; set; }
+ /// <summary>
+ /// 鍘熶笂绾у簭鍒�
+ /// </summary>
+ [Required(ErrorMessage = "璇疯緭鍏ュ師涓婄骇搴忓垪")]
+ public int oldparentId { get; set; }
+
}
#endregion
diff --git a/CoreCms.Net.Model/ViewModels/baifenbingfa/applyModelDTO.cs b/CoreCms.Net.Model/ViewModels/baifenbingfa/applyModelDTO.cs
new file mode 100644
index 0000000..fcc3b6a
--- /dev/null
+++ b/CoreCms.Net.Model/ViewModels/baifenbingfa/applyModelDTO.cs
@@ -0,0 +1,120 @@
+锘縰sing CoreCms.Net.Model.Entities.baifenbingfa.apply;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CoreCms.Net.Model.ViewModels.baifenbingfa
+{
+ /// <summary>
+ /// 鏌ヨ瀹℃壒杩斿洖瀹炰綋
+ /// </summary>
+ public class applyModelDTO
+ {
+ /// <summary>
+ /// id
+ /// </summary>
+ public int id { get; set; }
+ /// <summary>
+ /// 瀹℃壒浜篒D鐢�,鍒嗗壊
+ /// </summary>
+ public string managerID { get; set; }
+
+ /// <summary>
+ /// 瀹℃壒浜哄悕绉扮敤,鍒嗗壊
+ /// </summary>
+ public string managerName { get; set; }
+
+ /// <summary>
+ /// 瀹℃壒瑙掕壊ID锛屽彿鍒嗗壊
+ /// </summary>
+ public string roleID { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳浜烘暟鏁伴噺
+ /// </summary>
+ public int managerApplyCount { get; set; }
+
+ /// <summary>
+ /// 绫诲瀷
+ /// </summary>
+ public int aType { get; set; }
+ /// <summary>
+ /// 绫诲瀷
+ /// </summary>
+ public string aTypeName { get; set; }
+
+ /// <summary>
+ /// 绫诲瀷
+ /// </summary>
+ public int ayStataType { get; set; }
+ /// <summary>
+ /// 绫诲瀷
+ /// </summary>
+ public string ayStataTypeName { get; set; }
+
+
+ /// <summary>
+ /// 鐢ㄦ埛ID
+ /// </summary>
+ public int userID { get; set; }
+
+
+ /// <summary>
+ /// 鍐呭
+ /// </summary>
+ public string dec { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string reMake { get; set; }
+
+ /// <summary>
+ /// 璋冩暣鍓嶆暟鎹�
+ /// </summary>
+ public string oldData { get; set; }
+
+
+ /// <summary>
+ /// 璋冩暣鏁版嵁
+ /// </summary>
+ public string data { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public int createById { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public int upDataById { get; set; }
+
+ /// <summary>
+ /// 寤虹珛鏃堕棿
+ public DateTime? createTime { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? upDataTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string createBy { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public string upDataBy { get; set; }
+ /// <summary>
+ /// 鍒犻櫎鏍囧織
+ /// </summary>
+ public bool isdelete { get; set; } = false;
+ }
+}
diff --git a/CoreCms.Net.Repository/apply/applyModelRepository.cs b/CoreCms.Net.Repository/apply/applyModelRepository.cs
index 43df6d7..c584b6d 100644
--- a/CoreCms.Net.Repository/apply/applyModelRepository.cs
+++ b/CoreCms.Net.Repository/apply/applyModelRepository.cs
@@ -71,9 +71,12 @@
//浜嬬墿澶勭悊杩囩▼寮�濮�
oldModel.id = entity.id;
oldModel.managerID = entity.managerID;
+ oldModel.managerName = entity.managerName;
oldModel.roleID = entity.roleID;
oldModel.managerApplyCount = entity.managerApplyCount;
oldModel.aType = entity.aType;
+ oldModel.ayStataType = entity.ayStataType;
+ oldModel.userID = entity.userID;
oldModel.dec = entity.dec;
oldModel.reMake = entity.reMake;
oldModel.oldData = entity.oldData;
@@ -82,6 +85,8 @@
oldModel.upDataTime = entity.upDataTime;
oldModel.createBy = entity.createBy;
oldModel.upDataBy = entity.upDataBy;
+ oldModel.createById = entity.createById;
+ oldModel.upDataById = entity.upDataById;
oldModel.isdelete = entity.isdelete;
//浜嬬墿澶勭悊杩囩▼缁撴潫
@@ -182,9 +187,12 @@
{
id = p.id,
managerID = p.managerID,
+ managerName = p.managerName,
roleID = p.roleID,
managerApplyCount = p.managerApplyCount,
aType = p.aType,
+ ayStataType = p.ayStataType,
+ userID = p.userID,
dec = p.dec,
reMake = p.reMake,
oldData = p.oldData,
@@ -193,8 +201,10 @@
upDataTime = p.upDataTime,
createBy = p.createBy,
upDataBy = p.upDataBy,
- isdelete = p.isdelete,
-
+ createById = p.createById,
+ upDataById = p.upDataById,
+ isdelete = p.isdelete,
+
}).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount);
}
else
@@ -205,9 +215,12 @@
{
id = p.id,
managerID = p.managerID,
- roleID = p.roleID,
+ managerName = p.managerName,
+ roleID = p.roleID,
managerApplyCount = p.managerApplyCount,
aType = p.aType,
+ ayStataType = p.ayStataType,
+ userID = p.userID,
dec = p.dec,
reMake = p.reMake,
oldData = p.oldData,
@@ -216,7 +229,9 @@
upDataTime = p.upDataTime,
createBy = p.createBy,
upDataBy = p.upDataBy,
- isdelete = p.isdelete,
+ createById = p.createById,
+ upDataById = p.upDataById,
+ isdelete = p.isdelete,
}).ToPageListAsync(pageIndex, pageSize, totalCount);
}
diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs
index 3f2a814..d4b76cf 100644
--- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs
@@ -14,13 +14,16 @@
using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
+using CoreCms.Net.Auth.HttpContextUser;
using CoreCms.Net.Configuration;
using CoreCms.Net.Filter;
using CoreCms.Net.IServices;
using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.Entities.baifenbingfa.apply;
using CoreCms.Net.Model.Entities.Expression;
using CoreCms.Net.Model.FromBody;
using CoreCms.Net.Model.ViewModels.UI;
+using CoreCms.Net.Services;
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Utility.Helper;
using CoreCms.Net.Web.Admin.Infrastructure;
@@ -47,6 +50,8 @@
private readonly ICoreCmsUserPointLogServices _coreCmsUserPointLogServices;
private readonly ICoreCmsUserServices _coreCmsUserServices;
private readonly IWebHostEnvironment _webHostEnvironment;
+ private readonly IHttpContextUser _httpContextUser;
+ private readonly IapplyModelServices _applyModelServices;
/// <summary>
@@ -57,12 +62,16 @@
/// <param name="coreCmsUserGradeServices"></param>
/// <param name="coreCmsUserBalanceServices"></param>
/// <param name="coreCmsUserPointLogServices"></param>
+ /// <param name="httpContextUser"></param>
+ /// <param name="applyModelServices"></param>
public CoreCmsUserController(
IWebHostEnvironment webHostEnvironment
, ICoreCmsUserServices coreCmsUserServices
, ICoreCmsUserGradeServices coreCmsUserGradeServices
, ICoreCmsUserBalanceServices coreCmsUserBalanceServices
, ICoreCmsUserPointLogServices coreCmsUserPointLogServices
+ , IHttpContextUser httpContextUser
+ , IapplyModelServices applyModelServices
)
{
_webHostEnvironment = webHostEnvironment;
@@ -70,6 +79,8 @@
_coreCmsUserGradeServices = coreCmsUserGradeServices;
_coreCmsUserBalanceServices = coreCmsUserBalanceServices;
_coreCmsUserPointLogServices = coreCmsUserPointLogServices;
+ _httpContextUser = httpContextUser;
+ _applyModelServices = applyModelServices;
}
#region 鑾峰彇鍒楄〃============================================================
@@ -994,7 +1005,43 @@
[Description("淇敼浣欓鎻愪氦")]
public async Task<AdminUiCallBack> DoEditBalance([FromBody] FMUpdateUserBalance entity)
{
- var jm = await _coreCmsUserServices.UpdateBalance(entity.id, entity.balance, entity.memo);
+ var jm = new AdminUiCallBack();
+ var model = await _coreCmsUserServices.QueryByIdAsync(entity.id);
+ if (model == null)
+ {
+ jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
+ return jm;
+ }
+ var id = _httpContextUser.ID;
+ var name = _httpContextUser.Name;
+
+ applyModel entity1 = new applyModel();
+ //entity1.id = 0;
+ entity1.managerID = null;
+ entity1.roleID = "shenpi";
+ entity1.managerApplyCount = 2;
+
+ entity1.aType = applyType.Balance;
+ entity1.ayStataType = applyStataType.applying;
+ entity1.userID = entity.id;
+ entity1.dec = "鐢ㄦ埛"+ model.nickName + "浣欓璋冩暣";
+ entity1.reMake = entity.memo;
+ entity1.oldData = entity.oldbalance+"";
+ entity1.data = entity.balance+"";
+ entity1.createTime = DateTime.Now;
+ entity1.upDataTime = entity1.createTime;
+ entity1.createBy = name;
+ entity1.upDataBy = name;
+ entity1.createById = id;
+ entity1.upDataById = id;
+ entity1.isdelete = false;
+
+ jm = await _applyModelServices.InsertAsync(entity1);
+
+
+
+ // var jm = await _coreCmsUserServices.UpdateBalance(entity.id, entity.balance, entity.memo);
+ jm.msg = "鏁版嵁鎻愪氦瀹℃牳鎴愬姛";
return jm;
}
@@ -1041,7 +1088,41 @@
[Description("淇敼绉垎鎻愪氦")]
public async Task<AdminUiCallBack> DoEditPoint([FromBody] FMUpdateUserPoint entity)
{
- var jm = await _coreCmsUserServices.UpdatePiont(entity);
+ var jm = new AdminUiCallBack();
+ var model = await _coreCmsUserServices.QueryByIdAsync(entity.id);
+ if (model == null)
+ {
+ jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
+ return jm;
+ }
+
+ var id = _httpContextUser.ID;
+ var name = _httpContextUser.Name;
+
+ applyModel entity1 = new applyModel();
+ //entity1.id = 0;
+ entity1.managerID = null;
+ entity1.roleID = "shenpi";
+ entity1.managerApplyCount = 2;
+
+ entity1.aType = applyType.points;
+ entity1.ayStataType = applyStataType.applying;
+ entity1.userID = entity.id;
+ entity1.dec = "鐢ㄦ埛" + model.nickName + "绉垎璋冩暣";
+ entity1.reMake = entity.memo;
+ entity1.oldData = entity.oldpoint + "";
+ entity1.data = entity.point + "";
+ entity1.createTime = DateTime.Now;
+ entity1.upDataTime = entity1.createTime;
+ entity1.createBy = name;
+ entity1.upDataBy = name;
+ entity1.createById = id;
+ entity1.upDataById = id;
+ entity1.isdelete = false;
+
+ jm = await _applyModelServices.InsertAsync(entity1);
+ jm.msg = "鏁版嵁鎻愪氦瀹℃牳鎴愬姛";
+ // var jm = await _coreCmsUserServices.UpdatePiont(entity);
return jm;
}
@@ -1137,10 +1218,40 @@
entity.parentId = 0;
}
- var bl = await _coreCmsUserServices.UpdateAsync(p => new CoreCmsUser() { parentId = entity.parentId }, p => p.id == model.id);
+ // var bl = await _coreCmsUserServices.UpdateAsync(p => new CoreCmsUser() { parentId = entity.parentId }, p => p.id == model.id);
- jm.code = bl ? 0 : 1;
- jm.msg = bl ? "鏇存柊鎴愬姛" : "鏇存柊澶辫触";
+
+ var id = _httpContextUser.ID;
+ var name = _httpContextUser.Name;
+
+ applyModel entity1 = new applyModel();
+ //entity1.id = 0;
+ entity1.managerID = null;
+ entity1.roleID = "shenpi";
+ entity1.managerApplyCount = 2;
+
+ entity1.aType = applyType.Referrer;
+ entity1.ayStataType = applyStataType.applying;
+ entity1.userID = entity.id;
+ entity1.dec = "鐢ㄦ埛" + model.nickName + "鎺ㄨ崘浜鸿皟鏁�";
+ entity1.reMake = "";
+ entity1.oldData = entity.oldparentId + "";
+ entity1.data = entity.parentId + "";
+ entity1.createTime = DateTime.Now;
+ entity1.upDataTime = entity1.createTime;
+ entity1.createBy = name;
+ entity1.upDataBy = name;
+ entity1.createById = id;
+ entity1.upDataById = id;
+ entity1.isdelete = false;
+
+ jm = await _applyModelServices.InsertAsync(entity1);
+
+ jm.msg = "鏁版嵁鎻愪氦瀹℃牳鎴愬姛";
+
+
+
+
return jm;
}
diff --git a/CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs b/CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs
index d2443ff..db418df 100644
--- a/CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs
@@ -32,6 +32,11 @@
using SqlSugar;
using CoreCms.Net.Web.Admin.Infrastructure;
using CoreCms.Net.Model.Entities.baifenbingfa.apply;
+using CoreCms.Net.Model.ViewModels.baifenbingfa;
+using CoreCms.Net.Auth.HttpContextUser;
+using Essensoft.Paylink.Alipay.Domain;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using K4os.Compression.LZ4.Internal;
namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -47,16 +52,28 @@
{
private readonly IWebHostEnvironment _webHostEnvironment;
private readonly IapplyModelServices _applyModelServices;
+ private readonly IHttpContextUser _httpContextUser;
+ private readonly ICoreCmsUserServices _coreCmsUserServices;
+ private readonly ISysRoleServices _sysRoleServices;
+ private readonly ISysUserRoleServices _sysUserRoleServices;
/// <summary>
/// 鏋勯�犲嚱鏁�
///</summary>
public applyModelController(IWebHostEnvironment webHostEnvironment
,IapplyModelServices applyModelServices
+ , IHttpContextUser httpContextUser
+ , ICoreCmsUserServices coreCmsUserServices
+ , ISysRoleServices sysRoleServices
+ , ISysUserRoleServices sysUserRoleServices
)
{
_webHostEnvironment = webHostEnvironment;
_applyModelServices = applyModelServices;
+ _httpContextUser = httpContextUser;
+ _coreCmsUserServices = coreCmsUserServices;
+ _sysRoleServices = sysRoleServices;
+ _sysUserRoleServices = sysUserRoleServices;
}
#region 鑾峰彇鍒楄〃============================================================
@@ -282,8 +299,77 @@
jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
return jm;
}
+ //瀹℃壒閫昏緫
+ //鍒ゆ柇瀹℃壒鐘舵�佹槸鍚﹀彲浠ュ鎵�
+ if (model.ayStataType != applyStataType.applying)
+ {
+ jm.msg = "淇℃伅宸茬粡瀹℃壒缁撴潫";
+ return jm;
+ }
+ //鏌ヨ瀹℃壒瑙掕壊閲岃竟鏄惁鏈夊綋鍓嶄汉锛屽綋鍓嶄汉鏄惁宸茬粡瀹℃壒杩囦簡
+ var id = _httpContextUser.ID;
+ var name = _httpContextUser.Name;
+
+ var shenpirole = _sysRoleServices.QueryListByClause(x=>x.roleCode == model.roleID).FirstOrDefault();
+ if (shenpirole != null)
+ {
+ var shenpiren = _sysUserRoleServices.QueryListByClause(x => x.roleId == shenpirole.id && x.userId == id).FirstOrDefault();
+ if(shenpiren == null)
+ {
+ jm.msg = "浣犱笉鏄鎵逛汉";
+ return jm;
+ }
+ }
+ else
+ {
+ jm.msg = "娌℃湁瀹℃壒瑙掕壊";
+ return jm;
+ }
+
+
+ if (!string.IsNullOrEmpty(model.managerID))
+ {
+ var managerID = model.managerID.Split(',');
+ var sid = id + "";
+ var managerIDs = managerID.Where(x => x == sid).FirstOrDefault();
+
+ if (!string.IsNullOrEmpty(managerIDs))
+ {
+ jm.msg = "浣犲凡缁忓鎵硅繃浜�";
+ return jm;
+ }
+ }
+
+
+
+
+ var modelDTO = new applyModelDTO();
+ modelDTO.id = model.id;
+
+ modelDTO.id = model.id;
+ modelDTO.managerID = model.managerID;
+ modelDTO.managerName = model.managerName;
+ modelDTO.roleID = model.roleID;
+ modelDTO.managerApplyCount = model.managerApplyCount;
+ modelDTO.aType = (int)model.aType;
+ modelDTO.aTypeName = model.aType.GetDescription();
+ modelDTO.ayStataType = (int)model.ayStataType;
+ modelDTO.ayStataTypeName = model.ayStataType.GetDescription();
+ modelDTO.userID = model.userID;
+ modelDTO.dec = model.dec;
+ modelDTO.reMake = model.reMake;
+ modelDTO.oldData = model.oldData;
+ modelDTO.data = model.data;
+ modelDTO.createById = model.createById;
+ modelDTO.upDataById = model.upDataById;
+ modelDTO.createTime = model.createTime;
+ modelDTO.upDataTime = model.upDataTime;
+ modelDTO.createBy = model.createBy;
+ modelDTO.upDataBy = model.upDataBy;
+ modelDTO.isdelete = model.isdelete;
+ modelDTO.isdelete = true;
jm.code = 0;
- jm.data = model;
+ jm.data = modelDTO;
return jm;
}
@@ -300,7 +386,120 @@
[Description("缂栬緫鎻愪氦")]
public async Task<AdminUiCallBack> DoEdit([FromBody]applyModel entity)
{
- var jm = await _applyModelServices.UpdateAsync(entity);
+
+
+ var applyModel = await _applyModelServices.QueryByIdAsync(entity.id, false);
+ var jm = new AdminUiCallBack();
+ if (applyModel == null)
+ {
+ jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
+ return jm;
+ }
+ //瀹℃壒閫昏緫
+ //鍒ゆ柇瀹℃壒鐘舵�佹槸鍚﹀彲浠ュ鎵�
+ if (applyModel.ayStataType != applyStataType.applying)
+ {
+ jm.msg = "淇℃伅宸茬粡瀹℃壒缁撴潫";
+ return jm;
+ }
+ var id = _httpContextUser.ID;
+ var name = _httpContextUser.Name;
+ if (!string.IsNullOrEmpty(applyModel.managerID))
+ {
+ var managerID = applyModel.managerID.Split(',');
+ var sid = id + "";
+ var managerIDs = managerID.Where(x => x == sid).FirstOrDefault();
+
+ if (!string.IsNullOrEmpty(managerIDs))
+ {
+ jm.msg = "浣犲凡缁忓鎵硅繃浜�";
+ return jm;
+ }
+ }
+
+ //鍚屾剰杩樻槸鎷掔粷
+
+ if (entity.isdelete == true)
+ {
+ if (string.IsNullOrEmpty(applyModel.managerID))
+ {
+ if(applyModel.managerApplyCount == 1)
+ {
+ applyModel.ayStataType = applyStataType.ok;
+ }
+ else
+ {
+ applyModel.ayStataType = applyStataType.applying;
+ }
+ applyModel.managerID = id + "";
+ applyModel.managerName = name + "";
+ }
+ else
+ {
+ var managerID = applyModel.managerID.Split(',');
+ if(managerID.Length +1 < applyModel.managerApplyCount)
+ {
+ applyModel.ayStataType = applyStataType.applying;
+ }
+ else
+ {
+ applyModel.ayStataType = applyStataType.ok;
+ }
+ applyModel.managerID += "," +id ;
+ applyModel.managerName += "," + name;
+ }
+ }
+ else
+ {
+ applyModel.ayStataType = applyStataType.no;
+ if (string.IsNullOrEmpty(applyModel.managerID))
+ {
+ applyModel.managerID = id + "";
+ applyModel.managerName = name + "";
+ }
+ else
+ {
+ applyModel.managerID += "," + id;
+ applyModel.managerName += "," + name;
+ }
+ }
+ applyModel.upDataBy = name;
+ applyModel.upDataById = id;
+ applyModel.upDataTime = DateTime.Now;
+ //淇敼瀹℃壒浜猴紝瀹℃壒鐘舵��
+ jm = await _applyModelServices.UpdateAsync(applyModel);
+ //濡傛灉瀹℃壒宸茬粡閫氳繃锛屾墽琛屼慨鏀广��
+ if (applyModel.ayStataType == applyStataType.ok)
+ {
+ if (applyModel.aType == applyType.points)
+ {
+ FMUpdateUserPoint entityjifen = new FMUpdateUserPoint();
+ entityjifen.id = applyModel.userID;
+ int data;
+ int.TryParse(entity.data, out data);
+ entityjifen.point = data;
+ entityjifen.memo = applyModel.reMake;
+ jm = await _coreCmsUserServices.UpdatePiont(entityjifen);
+ }
+ else if (applyModel.aType == applyType.Balance)
+ {
+ decimal data;
+ decimal.TryParse(entity.data, out data);
+
+ jm = await _coreCmsUserServices.UpdateBalance(applyModel.userID, data, applyModel.reMake);
+ }
+ else if (applyModel.aType == applyType.Referrer)
+ {
+ int data;
+ int.TryParse(entity.data, out data);
+ var bl = await _coreCmsUserServices.UpdateAsync(p => new CoreCmsUser() { parentId = data }, p => p.id == applyModel.userID);
+ }
+ }
+ if(jm.code == 0)
+ {
+ jm.msg = "瀹℃壒鎴愬姛";
+ }
+
return jm;
}
#endregion
@@ -361,13 +560,42 @@
var jm = new AdminUiCallBack();
var model = await _applyModelServices.QueryByIdAsync(entity.id, false);
+
+
if (model == null)
{
jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
return jm;
}
+
+ var modelDTO = new applyModelDTO();
+ modelDTO.id = model.id;
+
+ modelDTO.id = model.id;
+ modelDTO.managerID = model.managerID;
+ modelDTO.managerName = model.managerName;
+ modelDTO.roleID = model.roleID;
+ modelDTO.managerApplyCount = model.managerApplyCount;
+ modelDTO.aType = (int)model.aType;
+ modelDTO.aTypeName = model.aType.GetDescription();
+ modelDTO.ayStataType = (int)model.ayStataType;
+ modelDTO.ayStataTypeName = model.ayStataType.GetDescription();
+ modelDTO.userID = model.userID;
+ modelDTO.dec = model.dec;
+ modelDTO.reMake = model.reMake;
+ modelDTO.oldData = model.oldData;
+ modelDTO.data = model.data;
+ modelDTO.createById = model.createById;
+ modelDTO.upDataById = model.upDataById;
+ modelDTO.createTime = model.createTime;
+ modelDTO.upDataTime = model.upDataTime;
+ modelDTO.createBy = model.createBy;
+ modelDTO.upDataBy = model.upDataBy;
+ modelDTO.isdelete = model.isdelete;
+
+
jm.code = 0;
- jm.data = model;
+ jm.data = modelDTO;
return jm;
}
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/details.html
index a5fa823..05be2b7 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/details.html
@@ -5,53 +5,53 @@
<col>
</colgroup>
<tbody>
-
- <tr>
+
+ <!--<tr>
+ <td>
+ <label for="id">id</label>
+ </td>
+ <td>
+ {{ d.params.data.id || '' }}
+ </td>
+ </tr>-->
+
+ <tr>
<td>
- <label for="id">id</label>
+ <label for="managerName">瀹℃壒浜�</label>
</td>
<td>
- {{ d.params.data.id || '' }}
+ {{ d.params.data.managerName || '' }}
</td>
</tr>
-
- <tr>
+
+ <!--<tr>
+ <td>
+ <label for="roleID">瀹℃壒瑙掕壊ID</label>
+ </td>
+ <td>
+ {{ d.params.data.roleID || '' }}
+ </td>
+ </tr>-->
+
+ <tr>
<td>
- <label for="managerID">瀹℃壒浜篒D</label>
- </td>
- <td>
- {{ d.params.data.managerID || '' }}
- </td>
- </tr>
-
- <tr>
- <td>
- <label for="roleID">瀹℃壒瑙掕壊ID</label>
- </td>
- <td>
- {{ d.params.data.roleID || '' }}
- </td>
- </tr>
-
- <tr>
- <td>
- <label for="managerApplyCount">瀹℃牳浜烘暟鏁伴噺</label>
+ <label for="managerApplyCount">瀹℃壒浜烘暟閲�</label>
</td>
<td>
{{ d.params.data.managerApplyCount || '' }}
</td>
</tr>
-
- <tr>
+
+ <tr>
<td>
- <label for="aType">绫诲瀷</label>
+ <label for="aTypeName">绫诲瀷</label>
</td>
<td>
- {{ d.params.data.aType || '' }}
+ {{ d.params.data.aTypeName || '' }}
</td>
</tr>
-
- <tr>
+
+ <tr>
<td>
<label for="dec">鍐呭</label>
</td>
@@ -59,8 +59,8 @@
{{ d.params.data.dec || '' }}
</td>
</tr>
-
- <tr>
+
+ <tr>
<td>
<label for="reMake">澶囨敞</label>
</td>
@@ -68,8 +68,8 @@
{{ d.params.data.reMake || '' }}
</td>
</tr>
-
- <tr>
+
+ <tr>
<td>
<label for="oldData">璋冩暣鍓嶆暟鎹�</label>
</td>
@@ -77,8 +77,8 @@
{{ d.params.data.oldData || '' }}
</td>
</tr>
-
- <tr>
+
+ <tr>
<td>
<label for="data">璋冩暣鏁版嵁</label>
</td>
@@ -86,8 +86,8 @@
{{ d.params.data.data || '' }}
</td>
</tr>
-
- <tr>
+
+ <tr>
<td>
<label for="createTime">寤虹珛鏃堕棿</label>
</td>
@@ -95,8 +95,8 @@
{{ d.params.data.createTime || '' }}
</td>
</tr>
-
- <tr>
+
+ <tr>
<td>
<label for="upDataTime">淇敼鏃堕棿</label>
</td>
@@ -104,8 +104,8 @@
{{ d.params.data.upDataTime || '' }}
</td>
</tr>
-
- <tr>
+
+ <tr>
<td>
<label for="createBy">鍒涘缓浜�</label>
</td>
@@ -113,8 +113,8 @@
{{ d.params.data.createBy || '' }}
</td>
</tr>
-
- <tr>
+
+ <tr>
<td>
<label for="upDataBy">淇敼浜�</label>
</td>
@@ -122,16 +122,24 @@
{{ d.params.data.upDataBy || '' }}
</td>
</tr>
-
- <tr>
+ <tr>
<td>
- <label for="isdelete">鍒犻櫎鏍囧織</label>
+ <label for="ayStataTypeName">瀹℃壒鐘舵��</label>
</td>
<td>
- <input type="checkbox" disabled name="isdelete" value="{{d.params.data.isdelete}}" lay-skin="switch" lay-text="寮�鍚瘄鍏抽棴" lay-filter="isdelete" {{ d.params.data.isdelete ? 'checked' : '' }}>
+ {{ d.params.data.ayStataTypeName || '' }}
</td>
</tr>
-
+
+ <!--<tr>
+ <td>
+ <label for="isdelete">鍒犻櫎鏍囧織</label>
+ </td>
+ <td>
+ <input type="checkbox" disabled name="isdelete" value="{{d.params.data.isdelete}}" lay-skin="switch" lay-text="寮�鍚瘄鍏抽棴" lay-filter="isdelete" {{ d.params.data.isdelete ? 'checked' : '' }}>
+ </td>
+ </tr>-->
+
</tbody>
</table>
</script>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/edit.html
index 179aa34..f280ef3 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/edit.html
@@ -1,106 +1,106 @@
<script type="text/html" template lay-done="layui.data.sendParams(d);">
<div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-applyModel-editForm" id="LAY-app-applyModel-editForm">
- <input type="hidden" name="id" value="{{d.params.data.id || '' }}" />
- <div class="layui-form-item">
- <label for="id" class="layui-form-label layui-form-required">id</label>
+ <input type="hidden" name="id" value="{{d.params.data.id || '' }}" />
+ <!--<div class="layui-form-item">
+ <label for="id" class="layui-form-label layui-form-required">id</label>
+ <div class="layui-input-block">
+ <input type="number" min="0" max="999999" name="id" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.id || '' }}" placeholder="璇疯緭鍏d" lay-reqText="璇疯緭鍏d骞朵负鏁板瓧" />
+ </div>
+ </div>-->
+ <input type="hidden" name="roleID" value="{{d.params.data.roleID || '' }}" />
+ <div class="layui-form-item">
+ <label for="managerID" class="layui-form-label">瀹℃壒浜�</label>
<div class="layui-input-block">
- <input type="number" min="0" max="999999" name="id" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.id || '' }}" placeholder="璇疯緭鍏d" lay-reqText="璇疯緭鍏d骞朵负鏁板瓧" />
+ <input name="managerID" lay-verType="tips" class="layui-input" readonly="readonly" value="{{d.params.data.managerName || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="managerID" class="layui-form-label layui-form-required">瀹℃壒浜篒D</label>
+ <div class="layui-form-item">
+ <label for="aType" class="layui-form-label">瀹℃壒鐘舵��</label>
<div class="layui-input-block">
- <input name="managerID" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ鎵逛汉ID" lay-reqText="璇疯緭鍏ュ鎵逛汉ID" value="{{d.params.data.managerID || '' }}" />
+ <input name="ayStataTypeName" readonly="readonly" lay-verType="tips" class="layui-input" value="{{d.params.data.ayStataTypeName || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="roleID" class="layui-form-label layui-form-required">瀹℃壒瑙掕壊ID</label>
+
+
+ <div class="layui-form-item">
+ <label for="managerApplyCount" class="layui-form-label">瀹℃牳浜烘暟鏁伴噺</label>
<div class="layui-input-block">
- <input name="roleID" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ鎵硅鑹睮D" lay-reqText="璇疯緭鍏ュ鎵硅鑹睮D" value="{{d.params.data.roleID || '' }}" />
+ <input type="number" min="0" max="999999" name="managerApplyCount" readonly="readonly" lay-verType="tips" class="layui-input" value="{{d.params.data.managerApplyCount || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="managerApplyCount" class="layui-form-label layui-form-required">瀹℃牳浜烘暟鏁伴噺</label>
+
+ <div class="layui-form-item">
+ <label for="aType" class="layui-form-label">绫诲瀷</label>
<div class="layui-input-block">
- <input type="number" min="0" max="999999" name="managerApplyCount" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.managerApplyCount || '' }}" placeholder="璇疯緭鍏ュ鏍镐汉鏁版暟閲�" lay-reqText="璇疯緭鍏ュ鏍镐汉鏁版暟閲忓苟涓烘暟瀛�" />
+ <input name="aTypeName" readonly="readonly" lay-verType="tips" class="layui-input" value="{{d.params.data.aTypeName || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="aType" class="layui-form-label layui-form-required">绫诲瀷</label>
+
+ <div class="layui-form-item">
+ <label for="dec" class="layui-form-label">鍐呭</label>
<div class="layui-input-block">
- <input type="number" min="0" max="999999" name="aType" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.aType || '' }}" placeholder="璇疯緭鍏ョ被鍨�" lay-reqText="璇疯緭鍏ョ被鍨嬪苟涓烘暟瀛�" />
+ <input name="dec" lay-verType="tips" readonly="readonly" class="layui-input" value="{{d.params.data.dec || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="dec" class="layui-form-label layui-form-required">鍐呭</label>
+
+ <div class="layui-form-item">
+ <label for="reMake" class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
- <input name="dec" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ唴瀹�" lay-reqText="璇疯緭鍏ュ唴瀹�" value="{{d.params.data.dec || '' }}" />
+ <input name="reMake" lay-verType="tips" class="layui-input" readonly="readonly" value="{{d.params.data.reMake || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="reMake" class="layui-form-label layui-form-required">澶囨敞</label>
+
+ <div class="layui-form-item">
+ <label for="oldData" class="layui-form-label">璋冩暣鍓嶆暟鎹�</label>
<div class="layui-input-block">
- <input name="reMake" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ娉�" lay-reqText="璇疯緭鍏ュ娉�" value="{{d.params.data.reMake || '' }}" />
+ <input name="oldData" lay-verType="tips" class="layui-input" readonly="readonly" value="{{d.params.data.oldData || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="oldData" class="layui-form-label layui-form-required">璋冩暣鍓嶆暟鎹�</label>
+
+ <div class="layui-form-item">
+ <label for="data" class="layui-form-label">璋冩暣鏁版嵁</label>
<div class="layui-input-block">
- <input name="oldData" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ヨ皟鏁村墠鏁版嵁" lay-reqText="璇疯緭鍏ヨ皟鏁村墠鏁版嵁" value="{{d.params.data.oldData || '' }}" />
+ <input name="data" lay-verType="tips" class="layui-input" readonly="readonly" value="{{d.params.data.data || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="data" class="layui-form-label layui-form-required">璋冩暣鏁版嵁</label>
+
+ <div class="layui-form-item">
+ <label for="createTime" class="layui-form-label">寤虹珛鏃堕棿</label>
<div class="layui-input-block">
- <input name="data" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ヨ皟鏁存暟鎹�" lay-reqText="璇疯緭鍏ヨ皟鏁存暟鎹�" value="{{d.params.data.data || '' }}" />
+ <input name="createTime" id="createTime" type="text" readonly="readonly" lay-verType="tips" class="layui-input" value="{{d.params.data.createTime || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="createTime" class="layui-form-label layui-form-required">寤虹珛鏃堕棿</label>
+
+ <div class="layui-form-item">
+ <label for="upDataTime" class="layui-form-label">淇敼鏃堕棿</label>
<div class="layui-input-block">
- <input name="createTime" id="editTime-applyModel-createTime" type="text" lay-verType="tips" lay-verify="required|datetime" class="layui-input" placeholder="璇疯緭鍏ュ缓绔嬫椂闂�" lay-reqText="璇疯緭鍏ュ缓绔嬫椂闂�" value="{{d.params.data.createTime || '' }}"/>
+ <input name="upDataTime" id="upDataTime" type="text" readonly="readonly" lay-verType="tips" class="layui-input" value="{{d.params.data.upDataTime || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="upDataTime" class="layui-form-label layui-form-required">淇敼鏃堕棿</label>
+
+ <div class="layui-form-item">
+ <label for="createBy" class="layui-form-label">鍒涘缓浜�</label>
<div class="layui-input-block">
- <input name="upDataTime" id="editTime-applyModel-upDataTime" type="text" lay-verType="tips" lay-verify="required|datetime" class="layui-input" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�" lay-reqText="璇疯緭鍏ヤ慨鏀规椂闂�" value="{{d.params.data.upDataTime || '' }}"/>
+ <input name="createBy" lay-verType="tips" class="layui-input" readonly="readonly" value="{{d.params.data.createBy || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="createBy" class="layui-form-label layui-form-required">鍒涘缓浜�</label>
+
+ <div class="layui-form-item">
+ <label for="upDataBy" class="layui-form-label">淇敼浜�</label>
<div class="layui-input-block">
- <input name="createBy" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ュ垱寤轰汉" lay-reqText="璇疯緭鍏ュ垱寤轰汉" value="{{d.params.data.createBy || '' }}" />
+ <input name="upDataBy" lay-verType="tips" class="layui-input" readonly="readonly" value="{{d.params.data.upDataBy || '' }}" />
</div>
</div>
-
- <div class="layui-form-item">
- <label for="upDataBy" class="layui-form-label layui-form-required">淇敼浜�</label>
+
+ <div class="layui-form-item" pane>
+ <label for="isdelete" class="layui-form-label layui-form-required">鍚屾剰鎷掔粷</label>
<div class="layui-input-block">
- <input name="upDataBy" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="璇疯緭鍏ヤ慨鏀逛汉" lay-reqText="璇疯緭鍏ヤ慨鏀逛汉" value="{{d.params.data.upDataBy || '' }}" />
+ <input type="checkbox" lay-filter="switch" name="isdelete" {{ d.params.data.isdelete ? 'checked' : '' }} lay-skin="switch" lay-text="鍚屾剰|鎷掔粷">
</div>
</div>
-
- <div class="layui-form-item" pane>
- <label for="isdelete" class="layui-form-label layui-form-required">鍒犻櫎鏍囧織</label>
- <div class="layui-input-block">
- <input type="checkbox" lay-filter="switch" name="isdelete" {{ d.params.data.isdelete ? 'checked' : '' }} lay-skin="switch" lay-text="寮�鍚瘄鍏抽棴">
- </div>
- </div>
-
+
<div class="layui-form-item text-right core-hidden">
- <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-applyModel-editForm-submit" id="LAY-app-applyModel-editForm-submit" value="纭缂栬緫">
+ <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-applyModel-editForm-submit" id="LAY-app-applyModel-editForm-submit" value="纭瀹℃壒">
</div>
</div>
</script>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html
index ac4337b..a83d58b 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html
@@ -118,8 +118,8 @@
<script type="text/html" id="LAY-app-applyModel-pagebar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" lay-event="addData"><i class="layui-icon layui-icon-add-1"></i>娣诲姞鏁版嵁</button>
- <button class="layui-btn layui-btn-sm" lay-event="batchDelete"><i class="layui-icon layui-icon-delete"></i>鎵归噺鍒犻櫎</button>
+ <!--<button class="layui-btn layui-btn-sm" lay-event="addData"><i class="layui-icon layui-icon-add-1"></i>娣诲姞鏁版嵁</button>-->
+ <!--<button class="layui-btn layui-btn-sm" lay-event="batchDelete"><i class="layui-icon layui-icon-delete"></i>鎵归噺鍒犻櫎</button>-->
<button class="layui-btn layui-btn-sm" lay-event="selectExportExcel"><i class="layui-icon layui-icon-add-circle"></i>閫夋嫨瀵煎嚭</button>
<button class="layui-btn layui-btn-sm" lay-event="queryExportExcel"><i class="layui-icon layui-icon-download-circle"></i>鏌ヨ瀵煎嚭</button>
</div>
@@ -127,8 +127,8 @@
<script type="text/html" id="LAY-app-applyModel-tableBox-bar">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">鏌ョ湅</a>
- <a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#applyModelTbDelDrop{{d.LAY_INDEX}}" no-shade="true">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-xs" lay-event="edit">瀹℃壒</a>
+ <!--<a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#applyModelTbDelDrop{{d.LAY_INDEX}}" no-shade="true">鍒犻櫎</a>-->
<div class="dropdown-menu-nav dropdown-popconfirm dropdown-top-right layui-hide" id="applyModelTbDelDrop{{d.LAY_INDEX}}"
style="max-width: 200px;white-space: normal;min-width: auto;margin-left: 10px;">
<div class="dropdown-anchor"></div>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editBalance.html b/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editBalance.html
index c05c02a..f4b7179 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editBalance.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editBalance.html
@@ -5,7 +5,10 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">褰撳墠浣欓锛�</label>
- <div class="layui-form-mid">{{d.params.data.balance}}</div>
+ <!--<div class="layui-form-mid">{{d.params.data.balance}}</div>-->
+ <div class="layui-input-inline layui-inline-3">
+ <input type="text" name="oldbalance" id="oldbalance" readonly="readonly" class="layui-input" value="{{d.params.data.balance}}" lay-verify="required|verifybalance">
+ </div>
</div>
</div>
<div class="layui-form-item">
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editParentId.html b/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editParentId.html
index 340c6d6..b58f07d 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editParentId.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editParentId.html
@@ -5,7 +5,10 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">褰撳墠涓婄骇锛�</label>
- <div class="layui-form-mid">{{d.params.data.model.parentId}}</div>
+ <!--<div class="layui-form-mid">{{d.params.data.model.parentId}}</div>-->
+ <div class="layui-input-inline layui-inline-3">
+ <input type="number" name="oldparentId" id="oldparentId" readonly="readonly" class="layui-input" value="{{d.params.data.model.parentId}}" lay-verify="required|number">
+ </div>
<div class="layui-form-mid">
褰撳墠鐢ㄦ埛涓婄骇鐨勫簭鍒楀彿
</div>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editPoint.html b/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editPoint.html
index c63ef61..fa4fc4f 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editPoint.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editPoint.html
@@ -5,7 +5,10 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">褰撳墠绉垎锛�</label>
- <div class="layui-form-mid">{{d.params.data.point}}</div>
+ <!--<div class="layui-form-mid">{{d.params.data.point}}</div>-->
+ <div class="layui-input-inline layui-inline-3">
+ <input type="text" name="oldpoint" id="oldpoint" readonly="readonly" class="layui-input" value="{{d.params.data.point}}" lay-verify="required|number">
+ </div>
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1