合并

Areas/Admin/Controllers/MainServer/ConsumerOrdersController.cs

@@ -37,7 +37,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
             return View();
         }
 
@@ -51,35 +51,35 @@ namespace MySystem.Areas.Admin.Controllers
         /// <returns></returns>
         public JsonResult IndexData(ConsumerOrders data, string MerchantIdSelect, string ConsumerIdNickName, string ConsumerIdMobile, string PayModeSelect, int page = 1, int limit = 30)
         {
-            
+
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            
+
             Fields.Add("CreateDate", "3"); //时间
-Fields.Add("OrderNo", "1"); //订单号
-Fields.Add("SnNo", "1"); //SN号
+            Fields.Add("OrderNo", "1"); //订单号
+            Fields.Add("SnNo", "1"); //SN号
 
 
             string condition = " and Status>-1";
             //商户
-if (!string.IsNullOrEmpty(MerchantIdSelect))
-{
-condition += " and MerchantId=" + MerchantIdSelect;
-}
-//消费者昵称
-if (!string.IsNullOrEmpty(ConsumerIdNickName))
-{
-condition += " and ConsumerId in (select ConsumerId from ConsumersForNickName where NickName='" + ConsumerIdNickName + "')";
-}
-//消费者手机号
-if (!string.IsNullOrEmpty(ConsumerIdMobile))
-{
-condition += " and ConsumerId in (select ConsumerId from ConsumersForMobile where Mobile='" + ConsumerIdMobile + "')";
-}
-//支付方式
-if (!string.IsNullOrEmpty(PayModeSelect))
-{
-condition += " and PayMode=" + PayModeSelect;
-}
+            if (!string.IsNullOrEmpty(MerchantIdSelect))
+            {
+                condition += " and MerchantId=" + MerchantIdSelect;
+            }
+            //消费者昵称
+            if (!string.IsNullOrEmpty(ConsumerIdNickName))
+            {
+                condition += " and ConsumerId in (select ConsumerId from ConsumersForNickName where NickName='" + ConsumerIdNickName + "')";
+            }
+            //消费者手机号
+            if (!string.IsNullOrEmpty(ConsumerIdMobile))
+            {
+                condition += " and ConsumerId in (select ConsumerId from ConsumersForMobile where Mobile='" + ConsumerIdMobile + "')";
+            }
+            //支付方式
+            if (!string.IsNullOrEmpty(PayModeSelect))
+            {
+                condition += " and PayMode=" + PayModeSelect;
+            }
 
 
             Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ConsumerOrders", Fields, "Id desc", "0", page, limit, condition);
@@ -87,18 +87,18 @@ condition += " and PayMode=" + PayModeSelect;
             foreach (Dictionary<string, object> dic in diclist)
             {
                 //商户
-dic["MerchantId"] = RelationClass.GetMerchantInfoInfo(int.Parse(dic["MerchantId"].ToString()));
-//消费者
-int ConsumerId = int.Parse(function.CheckInt(dic["ConsumerId"].ToString()));
-Consumers consumerid_Consumers = db.Consumers.FirstOrDefault(m => m.Id == ConsumerId) ?? new Consumers();
-dic["ConsumerIdNickName"] = consumerid_Consumers.NickName;
-dic["ConsumerIdMobile"] = consumerid_Consumers.Mobile;
-dic.Remove("ConsumerId");
-//支付方式
-int PayMode = int.Parse(dic["PayMode"].ToString());
-if(PayMode == 1) dic["PayMode"] = "支付宝";
-if(PayMode == 2) dic["PayMode"] = "微信";
-if(PayMode == 0) dic["PayMode"] = "";
+                dic["MerchantId"] = RelationClass.GetMerchantInfoInfo(int.Parse(dic["MerchantId"].ToString()));
+                //消费者
+                int ConsumerId = int.Parse(function.CheckInt(dic["ConsumerId"].ToString()));
+                Consumers consumerid_Consumers = db.Consumers.FirstOrDefault(m => m.Id == ConsumerId) ?? new Consumers();
+                dic["ConsumerIdNickName"] = consumerid_Consumers.NickName;
+                dic["ConsumerIdMobile"] = consumerid_Consumers.Mobile;
+                dic.Remove("ConsumerId");
+                //支付方式
+                int PayMode = int.Parse(dic["PayMode"].ToString());
+                if (PayMode == 1) dic["PayMode"] = "支付宝";
+                if (PayMode == 2) dic["PayMode"] = "微信";
+                if (PayMode == 0) dic["PayMode"] = "";
 
             }
             return Json(obj);
@@ -116,7 +116,7 @@ if(PayMode == 0) dic["PayMode"] = "";
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             return View();
         }
@@ -133,15 +133,15 @@ if(PayMode == 0) dic["PayMode"] = "";
         public string Add(ConsumerOrders data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
-            
+
+
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
             int Id = new AdminContent(_accessor.HttpContext, PublicFunction.MainTables).Add("ConsumerOrders", Fields, 0);
             AddSysLog(data.Id.ToString(), "ConsumerOrders", "add");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -157,7 +157,7 @@ if(PayMode == 0) dic["PayMode"] = "";
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             ConsumerOrders editData = db.ConsumerOrders.FirstOrDefault(m => m.Id == Id) ?? new ConsumerOrders();
             ViewBag.data = editData;
@@ -176,15 +176,15 @@ if(PayMode == 0) dic["PayMode"] = "";
         public string Edit(ConsumerOrders data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
-            
+
+
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
             new AdminContent(_accessor.HttpContext, PublicFunction.MainTables).Edit("ConsumerOrders", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"ConsumerOrders","update");
+            AddSysLog(data.Id.ToString(), "ConsumerOrders", "update");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -199,7 +199,7 @@ if(PayMode == 0) dic["PayMode"] = "";
         public string Delete(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ConsumerOrders","del");
+            AddSysLog(Id, "ConsumerOrders", "del");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
@@ -208,7 +208,7 @@ if(PayMode == 0) dic["PayMode"] = "";
                 new AdminContent(_accessor.HttpContext, PublicFunction.MainTables).Edit("ConsumerOrders", Fields, id);
             }
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -223,7 +223,7 @@ if(PayMode == 0) dic["PayMode"] = "";
         public string Open(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ConsumerOrders","open");
+            AddSysLog(Id, "ConsumerOrders", "open");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
@@ -246,7 +246,7 @@ if(PayMode == 0) dic["PayMode"] = "";
         public string Close(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ConsumerOrders","close");
+            AddSysLog(Id, "ConsumerOrders", "close");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
@@ -268,7 +268,7 @@ if(PayMode == 0) dic["PayMode"] = "";
         public string Sort(int Id, int Sort)
         {
             new AdminContent(_accessor.HttpContext, PublicFunction.MainTables).Sort("ConsumerOrders", Sort, Id);
-            
+
             AddSysLog(Id.ToString(), "ConsumerOrders", "sort");
             return "success";
         }
@@ -283,15 +283,15 @@ if(PayMode == 0) dic["PayMode"] = "";
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
+            for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                
+
                 db.ConsumerOrders.Add(new ConsumerOrders()
                 {
                     CreateDate = DateTime.Now,
                     UpdateDate = DateTime.Now,
-                    
+
                 });
                 db.SaveChanges();
             }
@@ -310,31 +310,31 @@ if(PayMode == 0) dic["PayMode"] = "";
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("CreateDate", "3"); //时间
-Fields.Add("OrderNo", "1"); //订单号
-Fields.Add("SnNo", "1"); //SN号
+            Fields.Add("OrderNo", "1"); //订单号
+            Fields.Add("SnNo", "1"); //SN号
 
 
             string condition = " and Status>-1";
             //商户
-if (!string.IsNullOrEmpty(MerchantIdSelect))
-{
-condition += " and MerchantId=" + MerchantIdSelect;
-}
-//消费者昵称
-if (!string.IsNullOrEmpty(ConsumerIdNickName))
-{
-condition += " and ConsumerId in (select ConsumerId from ConsumersForNickName where NickName='" + ConsumerIdNickName + "')";
-}
-//消费者手机号
-if (!string.IsNullOrEmpty(ConsumerIdMobile))
-{
-condition += " and ConsumerId in (select ConsumerId from ConsumersForMobile where Mobile='" + ConsumerIdMobile + "')";
-}
-//支付方式
-if (!string.IsNullOrEmpty(PayModeSelect))
-{
-condition += " and PayMode=" + PayModeSelect;
-}
+            if (!string.IsNullOrEmpty(MerchantIdSelect))
+            {
+                condition += " and MerchantId=" + MerchantIdSelect;
+            }
+            //消费者昵称
+            if (!string.IsNullOrEmpty(ConsumerIdNickName))
+            {
+                condition += " and ConsumerId in (select ConsumerId from ConsumersForNickName where NickName='" + ConsumerIdNickName + "')";
+            }
+            //消费者手机号
+            if (!string.IsNullOrEmpty(ConsumerIdMobile))
+            {
+                condition += " and ConsumerId in (select ConsumerId from ConsumersForMobile where Mobile='" + ConsumerIdMobile + "')";
+            }
+            //支付方式
+            if (!string.IsNullOrEmpty(PayModeSelect))
+            {
+                condition += " and PayMode=" + PayModeSelect;
+            }
 
 
             Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ConsumerOrders", Fields, "Id desc", "0", 1, 20000, condition, "", false);
@@ -342,18 +342,18 @@ condition += " and PayMode=" + PayModeSelect;
             foreach (Dictionary<string, object> dic in diclist)
             {
                 //商户
-dic["MerchantId"] = RelationClass.GetMerchantInfoInfo(int.Parse(dic["MerchantId"].ToString()));
-//消费者
-int ConsumerId = int.Parse(function.CheckInt(dic["ConsumerId"].ToString()));
-Consumers consumerid_Consumers = db.Consumers.FirstOrDefault(m => m.Id == ConsumerId) ?? new Consumers();
-dic["ConsumerIdNickName"] = consumerid_Consumers.NickName;
-dic["ConsumerIdMobile"] = consumerid_Consumers.Mobile;
-dic.Remove("ConsumerId");
-//支付方式
-int PayMode = int.Parse(dic["PayMode"].ToString());
-if(PayMode == 1) dic["PayMode"] = "支付宝";
-if(PayMode == 2) dic["PayMode"] = "微信";
-if(PayMode == 0) dic["PayMode"] = "";
+                dic["MerchantId"] = RelationClass.GetMerchantInfoInfo(int.Parse(dic["MerchantId"].ToString()));
+                //消费者
+                int ConsumerId = int.Parse(function.CheckInt(dic["ConsumerId"].ToString()));
+                Consumers consumerid_Consumers = db.Consumers.FirstOrDefault(m => m.Id == ConsumerId) ?? new Consumers();
+                dic["ConsumerIdNickName"] = consumerid_Consumers.NickName;
+                dic["ConsumerIdMobile"] = consumerid_Consumers.Mobile;
+                dic.Remove("ConsumerId");
+                //支付方式
+                int PayMode = int.Parse(dic["PayMode"].ToString());
+                if (PayMode == 1) dic["PayMode"] = "支付宝";
+                if (PayMode == 2) dic["PayMode"] = "微信";
+                if (PayMode == 0) dic["PayMode"] = "";
 
             }
 
@@ -362,7 +362,7 @@ if(PayMode == 0) dic["PayMode"] = "";
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            
+
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "ConsumerOrders", "ExportExcel");
             return Json(result);

Areas/Admin/Controllers/MainServer/FluxProfitDetailController.cs

@@ -40,6 +40,9 @@ namespace MySystem.Areas.Admin.Controllers
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
 
+            List<KqProducts> Brands = db.KqProducts.OrderBy(m => m.Id).ToList();
+            ViewBag.Brands = Brands;
+
             return View();
         }
 
@@ -58,6 +61,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("MerNo", "1"); //渠道商户编号
             Fields.Add("SnNo", "1"); //渠道SN号
+            Fields.Add("BrandId", "1"); //渠道SN号
             Fields.Add("FluxOrderNo", "1"); //流量扣费单号
             Fields.Add("TradeOrderNo", "1"); //交易流水号
 
@@ -72,6 +76,10 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
+            if (data.BrandId > 0)
+            { 
+                condition += " and BrandId=" + data.BrandId;
+            }
             //顶级创客编号
             if (!string.IsNullOrEmpty(TopMakerCode))
             {
@@ -95,10 +103,10 @@ namespace MySystem.Areas.Admin.Controllers
             //交易时间
             if(!string.IsNullOrEmpty(CreateDateData))
             {
-                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and TradeDate>=" + start + " and TradeDate>=" + end + "";
+               string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0].Replace("-", "");
+                string end = datelist[1].Replace("-", "");
+                condition += " and TradeDate >= '" + start + "' and TradeDate <= '" + end + "' ";
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("FluxProfitDetail", Fields, "Id desc", "0", page, limit, condition);
@@ -115,6 +123,9 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["TopMakerCode"] = tuser.MakerCode;
                 dic["TopRealName"] = tuser.RealName;
 
+                int BrandId = int.Parse(dic["BrandId"].ToString());
+                dic["BrandName"] = RelationClass.GetKqProductBrandInfo(BrandId);
+
                 int MerchantId = int.Parse(dic["MerchantId"].ToString());
                 MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == MerchantId) ?? new MerchantInfo();
                 dic["MerchantMobile"] = merchant.Mobile;

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -470,12 +470,12 @@ namespace MySystem.Areas.Admin.Controllers
                 PosMachinesTwo posMachinesTwo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo && m.StoreId == FromStoreId);
                 if (posMachinesTwo == null)
                 {
-                    error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '|' + '\n';
+                    error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '\n';
                 }
             }
             if(!string.IsNullOrEmpty(error))
             {
-                return "Warning" + error;
+                return "Warning|" + error;
             }
             Dictionary<string, int> storeData = new Dictionary<string, int>();
             Dictionary<string, int> toStoreData = new Dictionary<string, int>();

Areas/Admin/Views/MainServer/FluxProfitDetail/Index.cshtml

@@ -1,7 +1,10 @@
+@using MySystem.Models;
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
     
+    List<KqProducts> Brands = ViewBag.Brands as List<KqProducts>;
+    
 }
 <!DOCTYPE html>
 <html>
@@ -61,7 +64,18 @@
                             <input class="layui-input" type="text" name="TopRealName" autocomplete="off">
                         </div>
                     </div>
-                
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="BrandId" name="BrandId" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach(KqProducts Brand in Brands)
+                                {
+                                <option value="@Brand.Id">@Brand.Name</option>
+                                }
+                            </select>
+                        </div>
+                    </div> 
                     <div class="layui-inline">
                         <label class="layui-form-label">快钱商户编号</label>
                         <div class="layui-input-inline">

wwwroot/layuiadmin/modules_main/FluxProfitDetail_Admin.js

@@ -91,23 +91,24 @@ $('#CreateDate').val(value);
         , url: '/Admin/FluxProfitDetail/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            ,{field:'MakerCode', width: 200, title:'创客编号', sort: true}
-            ,{field:'RealName', width: 200, title:'创客姓名', sort: true}
-            ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
-            ,{field:'TopRealName', width: 200, title:'顶级创客姓名', sort: true}
-            ,{field:'TradeDate', width: 200, title:'交易日期', sort: true}
-            ,{field:'MerUserType', width: 200, title:'商户创客类型', sort: true}
-            ,{field:'MerchantMobile', width: 200, title:'商户手机号', sort: true}
-            ,{field:'MerNo', width: 200, title:'快钱商户编号', sort: true}
-            ,{field:'SnNo', width: 200, title:'快钱SN号', sort: true}
-            ,{field:'ProfitType', width: 200, title:'分润类型', sort: true}
-            ,{field:'FluxOrderNo', width: 200, title:'流量扣费单号', sort: true}
-            ,{field:'TradeOrderNo', width: 200, title:'交易流水号', sort: true}
-            ,{field:'TradeAmt', width: 200, title:'商户交易额(元)', sort: true}
-            ,{field:'FluxFeeAmt', width: 200, title:'流量费(元)', sort: true}
-            ,{field:'FluxProfitAmt', width: 200, title:'流量分润总金额(元)', sort: true}
-            ,{field:'FluxStartDate', width: 200, title:'流量扣费开始日期', sort: true}
-            ,{field:'FluxEndDate', width: 200, title:'流量扣费结束日期', sort: true}
+            ,{field:'MakerCode', width: 105, title:'创客编号', sort: true}
+            ,{field:'RealName', width: 105, title:'创客姓名', sort: true}
+            ,{field:'TopMakerCode', width: 130, title:'顶级创客编号', sort: true}
+            ,{field:'TopRealName', width: 130, title:'顶级创客姓名', sort: true}
+            ,{field:'BrandName', width: 105, title:'产品类型', sort: true}
+            ,{field:'TradeDate', width: 105, title:'交易日期', sort: true}
+            ,{field:'MerUserType', width: 130, title:'商户创客类型', sort: true}
+            ,{field:'MerchantMobile', width: 120, title:'商户手机号', sort: true}
+            ,{field:'MerNo', width: 130, title:'快钱商户编号', sort: true}
+            ,{field:'SnNo', width: 110, title:'快钱SN号', sort: true}
+            ,{field:'ProfitType', width: 105, title:'分润类型', sort: true}
+            ,{field:'FluxOrderNo', width: 130, title:'流量扣费单号', sort: true}
+            ,{field:'TradeOrderNo', width: 115, title:'交易流水号', sort: true}
+            ,{field:'TradeAmt', width: 140, title:'商户交易额(元)', sort: true}
+            ,{field:'FluxFeeAmt', width: 120, title:'流量费(元)', sort: true}
+            ,{field:'FluxProfitAmt', width: 165, title:'流量分润总金额(元)', sort: true}
+            ,{field:'FluxStartDate', width: 160, title:'流量扣费开始日期', sort: true}
+            ,{field:'FluxEndDate', width: 160, title:'流量扣费结束日期', sort: true}
         ]]
         , where: {
             

wwwroot/layuiadmin/modules_main/StoreMachineApply_Admin.js

@@ -264,9 +264,9 @@ layui.config({
                                     }, function () {
                                         table.reload('LAY-list-manage'); //数据刷新
                                     });
-                                } else if (data == "Warning") {
+                                } else if (data.indexOf("Warning") == 0) {
                                     var datalist = data.split('|');
-                                    layer.alert(datalist[0], { time: 20000 }, function () {
+                                    layer.alert(datalist[1], { time: 20000 }, function () {
                                         window.location.reload();
                                     });
                                 } else {

wwwroot/layuiadmin/modules_main/UserAccountRecord_Admin.js

@@ -91,22 +91,22 @@ $('#CreateDate').val(value);
         , url: '/Admin/UserAccountRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            ,{field:'MakerCode', width: 200, title:'创客编号', sort: true}
-            ,{field:'RealName', width: 200, title:'创客姓名', sort: true}
-            ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
-            ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
-            ,{field:'ProductTypeName', width: 200, title:'产品类型', sort: true}
-            ,{field:'TransRecordNo', width: 200, title:'交易流水编号', sort: true}
-            ,{field:'ChangeTypeName', width: 200, title:'交易类型', sort: true}
-            ,{field:'ChangeAmount', width: 200, title:'交易金额', sort: true}
-            ,{field:'Remark', width: 200, title:'备注', sort: true}
-            ,{field:'BeforeTotalAmount', width: 200, title:'交易前总金额', sort: true}
-            ,{field:'AfterTotalAmount', width: 200, title:'交易后总金额', sort: true}
-            ,{field:'BeforeFreezeAmount', width: 200, title:'交易前冻结金额', sort: true}
-            ,{field:'AfterFreezeAmount', width: 200, title:'交易后冻结金额', sort: true}
-            ,{field:'BeforeBalanceAmount', width: 200, title:'交易前余额', sort: true}
-            ,{field:'AfterBalanceAmount', width: 200, title:'交易后余额', sort: true}
-            ,{field:'CreateDate', width: 200, title:'交易时间', sort: true}
+            ,{field:'MakerCode', width: 105, title:'创客编号', sort: true}
+            ,{field:'RealName', width: 105, title:'创客姓名', sort: true}
+            // ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
+            // ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
+            ,{field:'ProductTypeName', width: 105, title:'产品类型', sort: true}
+            // ,{field:'TransRecordNo', width: 200, title:'交易流水编号', sort: true}
+            ,{field:'ChangeTypeName', width: 110, title:'交易类型', sort: true}
+            ,{field:'ChangeAmount', width: 110, title:'交易金额', sort: true}
+            ,{field:'Remark', width: 100, title:'备注', sort: true}
+            ,{field:'BeforeTotalAmount', width: 130, title:'交易前总金额', sort: true}
+            ,{field:'AfterTotalAmount', width: 130, title:'交易后总金额', sort: true}
+            ,{field:'BeforeFreezeAmount', width: 150, title:'交易前冻结金额', sort: true}
+            ,{field:'AfterFreezeAmount', width: 150, title:'交易后冻结金额', sort: true}
+            ,{field:'BeforeBalanceAmount', width: 120, title:'交易前余额', sort: true}
+            ,{field:'AfterBalanceAmount', width: 120, title:'交易后余额', sort: true}
+            ,{field:'CreateDate', width: 110, title:'交易时间', sort: true}
         ]]
         , where: {
             UserId: UserId

wwwroot/layuiadmin/modules_main/UserAccount_Admin.js

@@ -99,17 +99,17 @@ layui.config({
                     type: 'checkbox',
                     fixed: 'left'
             },
-                { field: 'MakerCode', width: 200, title: '创客编号' ,sort: true},
-                { field: 'RealName', width: 200, title: '创客姓名' ,sort: true},
-                { field: 'TopMakerCode', width: 200, title: '顶级创客编号' ,sort: true},
-                { field: 'TopRealName', width: 200, title: '顶级创客姓名' ,sort: true},
-                { field: 'TotalAmount', width: 200, title: '账户总金额' ,sort: true},
-                { field: 'FreezeAmount', width: 200, title: '冻结金额' ,sort: true},
-                { field: 'BalanceAmount', width: 200, title: '余额' ,sort: true},
-                { field: 'AccountStatusName', width: 200, title: '账户状态' ,sort: true},
-                { field: 'SeoDescription', width: 200, title: '备注' ,sort: true},
-                { field: 'CreateDate', width: 200, title: '创建时间' ,sort: true},
-                { field: 'UpdateDate', width: 200, title: '冻结/解冻时间' ,sort: true},
+                { field: 'MakerCode', width: 110, title: '创客编号' ,sort: true},
+                { field: 'RealName', width: 110, title: '创客姓名' ,sort: true},
+                // { field: 'TopMakerCode', width: 200, title: '顶级创客编号' ,sort: true},
+                // { field: 'TopRealName', width: 200, title: '顶级创客姓名' ,sort: true},
+                { field: 'TotalAmount', width: 120, title: '账户总金额' ,sort: true},
+                { field: 'FreezeAmount', width: 110, title: '冻结金额' ,sort: true},
+                { field: 'BalanceAmount', width: 110, title: '余额' ,sort: true},
+                { field: 'AccountStatusName', width: 110, title: '账户状态' ,sort: true},
+                { field: 'SeoDescription', width: 100, title: '备注' ,sort: true},
+                // { field: 'CreateDate', width: 200, title: '创建时间' ,sort: true},
+                { field: 'UpdateDate', width: 160, title: '冻结/解冻时间' ,sort: true},
                 {
                     title: '操作',
                     width: 400,