Merge branch 'feature-dgy-商学院2' into DuGuYang

Areas/Admin/Controllers/BsServer/ColController.cs

@@ -99,6 +99,7 @@ namespace MySystem.Areas.Admin.Controllers
                 item.Add("title", dic["ColName"].ToString());
                 item.Add("url", UrlString);
                 item.Add("ColId", ColId);
+                item.Add("Sort", int.Parse(dic["Sort"].ToString()));
                 item.Add("Status", dic["Status"].ToString() == "1" ? "正常" : "关闭");
                 result.Add(item);
             }
@@ -183,6 +184,7 @@ namespace MySystem.Areas.Admin.Controllers
             Col add = bsdb.Col.Add(new Col()
             {
                 ColId = code,
+                Sort = col.Sort,
                 ColName = col.ColName,
                 ColEnName = EnName,
                 ColPicPath = col.ColPicPath,
@@ -296,6 +298,7 @@ namespace MySystem.Areas.Admin.Controllers
                     }
                 }
                 editData.ColName = col.ColName;
+                editData.Sort = col.Sort;
                 editData.ColEnName = EnName;
                 editData.ColPicPath = col.ColPicPath;
                 editData.ColDetail = col.ColDetail;   //简介
@@ -306,7 +309,7 @@ namespace MySystem.Areas.Admin.Controllers
                 editData.SeoTitle = col.SeoTitle;
                 editData.SeoKeyword = col.SeoKeyword;
                 editData.SeoDescription = col.SeoDescription;
-                                
+
                 bsdb.SaveChanges();
             }
             else

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -7,6 +7,7 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -51,44 +52,32 @@ namespace MySystem.Areas.Admin.Controllers
         /// 商户退押金申请记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MerchantDepositReturns data, string MerchantIdMerRealName, string MerchantIdMerchantMobile, string MerchantIdMerIdcardNo, string UserIdRealName, string UserIdMakerCode, int page = 1, int limit = 30)
+        public JsonResult IndexData(MerchantDepositReturns data, string StatusSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("AlipayAccountNo", "1"); //支付宝账号
-            Fields.Add("OperateMan", "1"); //操作人
+            Fields.Add("SeoKeyword", "1"); //退押订单号
 
             string condition = " and Status>-1";
-            //商户商户真实姓名
-            if (!string.IsNullOrEmpty(MerchantIdMerRealName))
-            {
-                condition += " and MerchantId in (select MerchantId from PosMerchantInfoForMerRealName where MerRealName='" + MerchantIdMerRealName + "')";
-            }
-            //商户商户手机号
-            if (!string.IsNullOrEmpty(MerchantIdMerchantMobile))
-            {
-                condition += " and MerchantId in (select MerchantId from PosMerchantInfoForMerchantMobile where MerchantMobile='" + MerchantIdMerchantMobile + "')";
-            }
-            //商户商户身份证号
-            if (!string.IsNullOrEmpty(MerchantIdMerIdcardNo))
-            {
-                condition += " and MerchantId in (select MerchantId from PosMerchantInfoForMerIdcardNo where MerIdcardNo='" + MerchantIdMerIdcardNo + "')";
-            }
-            //创客真实姓名
-            if (!string.IsNullOrEmpty(UserIdRealName))
+
+            //提现状态
+            if (!string.IsNullOrEmpty(StatusSelect))
             {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and Status=" + StatusSelect;
             }
-            //创客编号
-            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            //创建时间
+            if (!string.IsNullOrEmpty(CreateDateData))
             {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -99,7 +88,13 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
                 dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
                 dic.Remove("MerchantId");
-                dic["StatusName"] = dic["Status"].ToString() == "1" ? "正常" : "关闭";
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["StatusName"] = "待处理";
+                if (Status == 3) dic["StatusName"] = "处理中";
+                if (Status == 1) dic["StatusName"] = "成功";
+                if (Status == 2) dic["StatusName"] = "失败";
+                if (Status == 4) dic["StatusName"] = "通过";
+                if (Status == 5) dic["StatusName"] = "未通过";
                 //创客
                 int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -145,7 +140,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Add("MerchantDepositReturns", Fields, 0);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("MerchantDepositReturns", Fields, 0);
             AddSysLog(data.Id.ToString(), "MerchantDepositReturns", "add");
             db.SaveChanges();
 
@@ -188,7 +183,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MerchantDepositReturns", Fields, data.Id);
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MerchantDepositReturns", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "MerchantDepositReturns", "update");
             db.SaveChanges();
 
@@ -212,7 +207,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MerchantDepositReturns", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MerchantDepositReturns", Fields, id);
             }
             db.SaveChanges();
 
@@ -236,7 +231,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MerchantDepositReturns", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MerchantDepositReturns", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -259,7 +254,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MerchantDepositReturns", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MerchantDepositReturns", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -274,7 +269,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Sort("MerchantDepositReturns", Sort, Id);
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("MerchantDepositReturns", Sort, Id);
 
             AddSysLog(Id.ToString(), "MerchantDepositReturns", "sort");
             return "success";
@@ -293,18 +288,60 @@ namespace MySystem.Areas.Admin.Controllers
             for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-
-                db.MerchantDepositReturns.Add(new MerchantDepositReturns()
+                int Id = int.Parse(dr[0].ToString()); // 记录Id
+                string SeoDescription = dr[1].ToString(); // 退押订单编号
+                string AlipayAccountNo = dr[2].ToString(); // 支付宝帐号
+                string ReturnAmount = dr[3].ToString(); // 退还金额
+                var s = dr[4].ToString();
+                int Status = int.Parse(dr[4].ToString()); // 审核结果
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.Id == Id && m.Status == 0) ?? new MerchantDepositReturns();
+                if (Status == 1)
+                {
+                    Status = 4;
+                }
+                else if (Status == 2)
                 {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
+                    Status = 5;
+                }
+                else
+                {
+                    Status = 0;
+                }
+                merchantDepositReturns.Status = Status;
+                merchantDepositReturns.UpdateDate = DateTime.Now;
+                merchantDepositReturns.SeoTitle = SysUserName + "-" + SysRealName;
+            }
+            db.SaveChanges();
+            return "success";
+        }
+        #endregion
+
 
-                });
-                db.SaveChanges();
+        #region 提交代付平台
+
+        /// <summary>
+        /// 提交代付平台
+        /// </summary>
+        /// <returns></returns>
+        public string Cash(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            var Ids = "";
+            AddSysLog(Id, "UserCashRecord", "cash");
+            db.SaveChanges();
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.Id == id && m.Status == 4) ?? new MerchantDepositReturns();
+                Ids += Id + ",";
             }
-            AddSysLog("0", "MerchantDepositReturns", "Import");
+            DataTable dt = OtherMySqlConn.dtable("UPDATE MerchantDepositReturns SET `Status`=3  WHERE Id IN(" + Ids.TrimEnd(',') + ")");
+            string text = string.Format("商户押金退还，记录Id: '" + Ids.TrimEnd(',') + "'，操作人: '" + SysUserName + "_" + SysRealName + "'，Time'" + DateTime.Now + "'");
+            function.WriteLog(text, "商户押金退还");
+            RedisDbconn.Instance.AddList("ToAlipayAccountQueue", Ids.TrimEnd(','));
             return "success";
         }
+
         #endregion
 
         #region 导出Excel
@@ -313,43 +350,30 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(MerchantDepositReturns data, string MerchantIdMerRealName, string MerchantIdMerchantMobile, string MerchantIdMerIdcardNo, string UserIdRealName, string UserIdMakerCode)
+        public JsonResult ExportExcel(MerchantDepositReturns data, string StatusSelect, string CreateDateData)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("CreateDate", "3"); //时间
             Fields.Add("AlipayAccountNo", "1"); //支付宝账号
-            Fields.Add("OperateMan", "1"); //操作人
-
+            Fields.Add("OrderNo", "1"); //退押订单号
 
             string condition = " and Status>-1";
-            //商户商户真实姓名
-            if (!string.IsNullOrEmpty(MerchantIdMerRealName))
-            {
-                condition += " and MerchantId in (select MerchantId from PosMerchantInfoForMerRealName where MerRealName='" + MerchantIdMerRealName + "')";
-            }
-            //商户商户手机号
-            if (!string.IsNullOrEmpty(MerchantIdMerchantMobile))
-            {
-                condition += " and MerchantId in (select MerchantId from PosMerchantInfoForMerchantMobile where MerchantMobile='" + MerchantIdMerchantMobile + "')";
-            }
-            //商户商户身份证号
-            if (!string.IsNullOrEmpty(MerchantIdMerIdcardNo))
-            {
-                condition += " and MerchantId in (select MerchantId from PosMerchantInfoForMerIdcardNo where MerIdcardNo='" + MerchantIdMerIdcardNo + "')";
-            }
-            //创客真实姓名
-            if (!string.IsNullOrEmpty(UserIdRealName))
+
+            //提现状态
+            if (!string.IsNullOrEmpty(StatusSelect))
             {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and Status=" + StatusSelect;
             }
-            //创客编号
-            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            //创建时间
+            if (!string.IsNullOrEmpty(CreateDateData))
             {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", 1, 20000, condition, "MerchantId,AlipayAccountNo,ReturnAmount,OperateMan,UserId", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", 1, 20000, condition, "Id,MerchantId,AlipayAccountNo,ReturnAmount,UserId", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -360,7 +384,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
                 dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
                 dic.Remove("MerchantId");
-                dic["StatusName"] = dic["Status"].ToString() == "1" ? "正常" : "关闭";
+                // dic["StatusName"] = dic["Status"].ToString() == "1" ? "正常" : "关闭";
                 //创客
                 int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -371,18 +395,19 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
+            result.Add("Status", "0");
             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>();
-            ReturnFields.Add("MerchantIdMerRealName", "商户商户真实姓名");
-            ReturnFields.Add("MerchantIdMerchantMobile", "商户商户手机号");
-            ReturnFields.Add("MerchantIdMerIdcardNo", "商户商户身份证号");
+            ReturnFields.Add("Id", "记录ID");
+            // ReturnFields.Add("MerchantIdMerRealName", "商户真实姓名");
+            // ReturnFields.Add("MerchantIdMerchantMobile", "商户手机号");
+            // ReturnFields.Add("MerchantIdMerIdcardNo", "商户身份证号");
+            ReturnFields.Add("SeoDescription", "退押订单号");
             ReturnFields.Add("AlipayAccountNo", "支付宝账号");
             ReturnFields.Add("ReturnAmount", "返还金额");
-            ReturnFields.Add("OperateMan", "操作人");
-            ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("UserIdMakerCode", "创客编号");
+            // ReturnFields.Add("UserIdRealName", "创客真实姓名");
+            // ReturnFields.Add("UserIdMakerCode", "创客编号");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "MerchantDepositReturns", "ExportExcel");

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -78,7 +78,7 @@ namespace MySystem.Areas.Admin.Controllers
             if (!string.IsNullOrEmpty(PhoneNo))
             {
                 var PhoneNof = PhoneNo.Substring(0, 3);
-                var PhoneNob = PhoneNo.Substring(PhoneNo.Length- 4);
+                var PhoneNob = PhoneNo.Substring(PhoneNo.Length - 4);
                 condition += " and LEFT(MerchantMobile,3)=" + PhoneNof + " AND RIGHT(MerchantMobile,4)=" + PhoneNob + "";
             }
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMerchantInfo", Fields, "Id desc", "0", page, limit, condition);
@@ -143,6 +143,130 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
+        #region 达标商户列表
+
+        /// <summary>
+        /// 根据条件查询商户列表
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Indexs(PosMerchantInfo data, string right, string BrandId)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+            ViewBag.BrandId = BrandId;
+
+            return View();
+        }
+
+        #endregion
+
+        #region 根据条件查询达标商户列表
+
+        /// <summary>
+        /// 商户列表
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult IndexsData(PosMerchantInfo data, int page = 1, int limit = 30)
+        {
+
+
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+            Fields.Add("MerchantMobile", "1"); //商户手机号
+            Fields.Add("KqSnNo", "1"); //快钱SN号
+            Fields.Add("MerIdcardNo", "1"); //身份证号
+
+            string condition = " and Status>-1 and StandardStatus=4 and StandardMonths=10";
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMerchantInfo", Fields, "Id desc", "0", page, limit, condition);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+                //直属创客
+                int UserId = int.Parse(dic["UserId"].ToString());
+                Users puser = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["MakerCode"] = puser.MakerCode;
+                dic["RealName"] = puser.RealName;
+                //顶级创客
+                int TopUserId = int.Parse(dic["TopUserId"].ToString());
+                Users tuser = db.Users.FirstOrDefault(m => m.Id == TopUserId) ?? new Users();
+                dic["TopMakerCode"] = tuser.MakerCode;
+                dic["TopRealName"] = tuser.RealName;
+                //商户创客
+                int MerUserId = int.Parse(dic["MerUserId"].ToString());
+                Users muser = db.Users.FirstOrDefault(m => m.Id == MerUserId) ?? new Users();
+                dic["MerMakerCode"] = muser.MakerCode;
+                dic["MerRealName"] = muser.RealName;
+                //申请创客
+                int SnApplyUserId = int.Parse(dic["SnApplyUserId"].ToString());
+                Users snuser = db.Users.FirstOrDefault(m => m.Id == SnApplyUserId) ?? new Users();
+                dic["SnApplyMakerCode"] = snuser.MakerCode;
+                dic["SnApplyRealName"] = snuser.RealName;
+                //SN仓库
+                int SnStoreId = int.Parse(dic["SnStoreId"].ToString());
+                StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == SnStoreId) ?? new StoreHouse();
+                dic["StoreNo"] = store.StoreNo;
+                dic["StoreName"] = store.StoreName;
+                //机具类型
+                int SnType = int.Parse(dic["SnType"].ToString());
+                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 1) dic["SnType"] = "赠送机具";
+                //返利资格
+                dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
+                //激活类型
+                int ActType = int.Parse(dic["ActType"].ToString());
+                if (ActType == 0) dic["ActType"] = "正常激活";
+                if (ActType == 1) dic["ActType"] = "首次已激活MPOS";
+                if (ActType == 2) dic["ActType"] = "首次已激活KPOS";
+                if (ActType == 3) dic["ActType"] = "循环机划拨激活";
+                //商户状态
+                int MerStatus = int.Parse(dic["MerStatus"].ToString());
+                if (MerStatus == 0) dic["MerStatus"] = "正常";
+                if (MerStatus == 1) dic["MerStatus"] = "冻结";
+                if (MerStatus == 2) dic["MerStatus"] = "关闭";
+                //商户激活状态
+                int ActiveStatus = int.Parse(dic["ActiveStatus"].ToString());
+                if (ActiveStatus == 0) dic["ActiveStatus"] = "未激活";
+                if (ActiveStatus == 1) dic["ActiveStatus"] = "已激活";
+                if (ActiveStatus == 2) dic["ActiveStatus"] = "SN已返现";
+                //商户创客类型
+                int MerUserType = int.Parse(dic["MerUserType"].ToString());
+                if (MerUserType == 0) dic["MerUserType"] = "非商户型创客";
+                if (MerUserType == 1) dic["MerUserType"] = "商户型创客";
+            }
+            return Json(obj);
+        }
+
+        #endregion
+
+
+        #region 批量通过
+
+        /// <summary>
+        /// 批量通过
+        /// </summary>
+        /// <returns></returns>
+        public string BatchSetting(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "PosMerchantInfo", "BatchSetting");
+            var Ids = "";//商户Id
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                Ids += id + ",";
+                Dictionary<string, object> Fields = new Dictionary<string, object>();
+                Fields.Add("StandardStatus", 101);//设置为可退押状态
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PosMerchantInfo", Fields, id);
+            }
+            string text = string.Format("商户押金退还批量通过，商户Id: '" + Ids.TrimEnd(',') + "'，操作人: '" + SysUserName + "_" + SysRealName + "'，Time'" + DateTime.Now + "'");
+            function.WriteLog(text, "商户押金退还批量通过");
+            db.SaveChanges();
+            return "success";
+        }
+
+        #endregion
+
+
         #region 增加商户
 
         /// <summary>
@@ -320,19 +444,20 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
+            var Ids = "";
             for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-
-                db.PosMerchantInfo.Add(new PosMerchantInfo()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
+                string KqMerNo = dr[0].ToString(); // 商户编号
+                var posMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == KqMerNo) ?? new PosMerchantInfo();
+                posMerchantInfo.StandardStatus = -2;
+                Ids += posMerchantInfo.Id + ",";
                 db.SaveChanges();
             }
             AddSysLog("0", "PosMerchantInfo", "Import");
+            string text = string.Format("导入人工已退，商户Id: '" + Ids.TrimEnd(',') + "'，操作人: '" + SysUserName + "_" + SysRealName + "'，Time'" + DateTime.Now + "'");
+            function.WriteLog(text, "导入人工已退");
+            RedisDbconn.Instance.AddList("ToAlipayAccountQueue", Ids.TrimEnd(','));
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/SchoolMakerStudyController.cs

@@ -61,6 +61,10 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
+            if (!string.IsNullOrEmpty(data.SeoKeyword))
+            {
+                condition += " and SeoKeyword like '" + data.SeoKeyword + "%'";
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("SchoolMakerStudy", Fields, "Id desc", "0", page, limit, condition);
@@ -81,11 +85,34 @@ namespace MySystem.Areas.Admin.Controllers
         /// 增加或修改商学院创客学堂信息
         /// </summary>
         /// <returns></returns>
-        public IActionResult Add(string right)
+        public IActionResult Add(string right, string PColId, string CurColId)
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-
+            ViewBag.CurColId = CurColId;
+            if (string.IsNullOrEmpty(PColId))
+            {
+                PColId = "001";
+            }
+            ViewBag.PColId = PColId;
+            // string code = "";
+            // int len = PColId.Length + 3;
+            // Col model = bsdb.Col.Where(m => m.ColId.StartsWith(PColId) && m.ColId.Length == len).OrderByDescending(m => m.ColId).FirstOrDefault();
+            // if (model != null)
+            // {
+            //     string CurCode = model.ColId;
+            //     int num = int.Parse(CurCode.Substring(CurCode.Length - 3)) + 1;
+            //     code = num.ToString();
+            //     for (int i = 0; i < 3 - num.ToString().Length; i++)
+            //     {
+            //         code = "0" + code;
+            //     }
+            //     code = PColId + code;
+            // }
+            // else
+            // {
+            //     code = PColId + "001";
+            // }
 
             return View();
         }
@@ -99,7 +126,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public string Add(SchoolMakerStudy data)
+        public string Add(SchoolMakerStudy data, string PColId = "", string CurColId = "")
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
 
@@ -127,7 +154,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 增加或修改商学院创客学堂信息
         /// </summary>
         /// <returns></returns>
-        public IActionResult Edit(string right, int Id = 0)
+        public IActionResult Edit(string right, string ColId, string PColId, string CurColId, int Id = 0)
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
@@ -147,7 +174,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public string Edit(SchoolMakerStudy data)
+        public string Edit(SchoolMakerStudy data, string PColId = "", string CurColId = "")
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
 
@@ -263,18 +290,74 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
+            var error = "";
             for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-
-                db.SchoolMakerStudy.Add(new SchoolMakerStudy()
+                string MakerCode = dr[0].ToString(); // 创客编号
+                string Auths = dr[1].ToString(); // 权限
+                string[] Auth = Auths.Split(',');
+                var fAuth = "";
+                var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
+                var userInfo = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId) ?? new Users();
+                var time = 0;
+                if (userInfo.Id == 0)
                 {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                db.SaveChanges();
+                    error += "创客" + MakerCode + "不存在" + '\n';
+                }
+                foreach (var item in Auth)
+                {
+                    var col = bsdb.Col.FirstOrDefault(m => m.ColId == item) ?? new BsModels.Col();
+                    if (col.Id == 0)
+                    {
+                        error += "权限编号" + item + "不存在" + '\n';
+                    }
+                    else
+                    {
+                        time += 1;
+                        if (time == 1)
+                        {
+                            fAuth += "," + item + ",";
+                        }
+                        else
+                        {
+                            fAuth += item + ",";
+                        }
+                    }
+                }
+                if (!string.IsNullOrEmpty(error))
+                {
+                    return "Warning|" + error;
+                }
+                var check = db.UserCardRecord.Any(m => m.Id == userInfo.Id);
+                if (check)
+                {
+                    var auth = db.UserCardRecord.FirstOrDefault(m => m.Id == userInfo.Id) ?? new UserCardRecord();
+                    foreach (var item in Auth)
+                    {
+
+                        if (!auth.SeoDescription.Contains("," + item + ","))
+                        {
+                            auth.SeoDescription += item + ",";
+                        }
+                    }
+                    auth.UpdateDate = DateTime.Now;
+                    auth.UpdateMan = SysUserName + "-" + SysRealName;
+                    db.SaveChanges();
+                }
+                else
+                {
+                    var query = db.UserCardRecord.Add(new UserCardRecord()
+                    {
+                        Id = userInfo.Id,
+                        CreateDate = DateTime.Now, //创建时间
+                        CreateMan = SysUserName + "-" + SysRealName,
+                        SeoDescription = fAuth,
+                    }).Entity;
+                    db.SaveChanges();
+                }
             }
+            db.SaveChanges();
             AddSysLog("0", "SchoolMakerStudy", "Import");
             return "success";
         }

Areas/Admin/Views/BsServer/Col/Add.cshtml

@@ -5,119 +5,133 @@
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>分类设置(增加)</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
         <div class="layui-card">
             <div class="layui-card-body">
-        <div class="layui-tab" lay-filter="mytabbar">
-            <div class="layui-tab-content mt20">
-                <div class="layui-tab-item layui-show">
-                    <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">上级栏目</label>
-                            <div class="layui-input-inline">
-                                <select id="PColId" name="PColId" lay-search="" lay-verify="required">
-                                    <option value="@CurColId">作为顶级栏目</option>
-                                    @{List<MySystem.Models.Col> ColId = new MySystem.Models.WebCMSEntities().Col.Where(m=>m.ColId.StartsWith(CurColId)).OrderBy(m => m.ColId).ToList();}
-                                    @foreach (MySystem.Models.Col subColId in ColId)
-                                    {
-                                        string kg = "";
-                                        for (int i = 1; i < subColId.ColId.Length / 3; i++)
-                                        {
-                                            kg += "　　";
-                                        }
-                                        <option value="@subColId.ColId">@(kg+subColId.ColName)</option>
-                                    }
-                                </select>
-                                <script>$("#PColId").val("@ViewBag.PColId");</script>
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">上级栏目</label>
+                                    <div class="layui-input-inline">
+                                        <select id="PColId" name="PColId" lay-search="" lay-verify="required">
+                                            <option value="@CurColId">作为顶级栏目</option>
+                                            @{
+                                                List<MySystem.BsModels.Col> ColId = new MySystem.BsModels.WebCMSEntities().Col.Where(m => m.ColId.StartsWith(CurColId)).OrderBy(m
+                                              => m.ColId).ToList();
+                                            }
+                                            @foreach (MySystem.BsModels.Col subColId in ColId)
+                                            {
+                                                string kg = "";
+                                                for (int i = 1; i < subColId.ColId.Length / 3; i++)
+                                                {
+                                                    kg += "　　";
+                                                }
+                                                <option value="@subColId.ColId">@(kg+subColId.ColName)</option>
+                                            }
+                                        </select>
+                                        <script>$("#PColId").val("@ViewBag.PColId");</script>
+                                    </div>
+                                </div>
                             </div>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">栏目名</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="ColName" name="ColName" maxlength="50" lay-verify="required;" autocomplete="off" placeholder="请输入名称">
-                        </div>
-                    </div>
-                    @if (CurColId.StartsWith("001") || CurColId.StartsWith("002") || CurColId.StartsWith("003"))
-                    {
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">英文名</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="ColEnName" name="ColEnName" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入英文名">
-                        </div>
-                    </div>
-                    <div class="layui-form-item layui-form-text">
-                        <label class="layui-form-label">简介</label>
-                        <div class="layui-input-block">
-<textarea class="layui-textarea" id="ColDetail" name="ColDetail" lay-verify="" placeholder="请输入简介"></textarea>
-                        </div>
-                    </div>
-                    <div class="layui-form-item layui-form-text">
-                        <label class="layui-form-label">详细内容</label>
-                        <div class="layui-input-block">
-<textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入详细内容" style="width:100%;height:500px;"></textarea>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">图标</label>
-                        <div class="layui-input-block">
-                            <div class="layui-upload">
-                                <input type="hidden" id="ColPicPath" name="ColPicPath" value="">
-                                <button class="layui-btn" type="button" id="ColPicPathBtn">选择图片</button>
-                                <div class="layui-inline layui-word-aux">大小限制为100K</div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">排序</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="num" id="Sort" name="Sort" maxlength="50"
+                                        lay-verify="required;" autocomplete="off" placeholder="">
+                                </div>
                             </div>
-                            <div class="mt10" id="ColPicPathImage">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">栏目名</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="ColName" name="ColName" maxlength="50"
+                                        lay-verify="required|" autocomplete="off" placeholder="请输入名称">
+                                </div>
                             </div>
+                            @if (CurColId.StartsWith("001") || CurColId.StartsWith("002") || CurColId.StartsWith("003") || CurColId.StartsWith("005"))
+                            {
+                                <div class="layui-form-item layui-form-text">
+                                    <label class="layui-form-label">简介</label>
+                                    <div class="layui-input-block">
+                                        <textarea class="layui-textarea" id="ColDetail" name="ColDetail" lay-verify="required|"
+                                        placeholder="请输入简介"></textarea>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">图片</label>
+                                    <div class="layui-input-block">
+                                        <div class="layui-upload">
+                                            <input type="hidden" id="ColPicPath" name="ColPicPath" value="" lay-verify="required|">
+                                            <button class="layui-btn" type="button" id="ColPicPathBtn">选择图片</button>
+                                            <div class="layui-inline layui-word-aux">大小限制为100K</div>
+                                        </div>
+                                        <div class="mt10" id="ColPicPathImage">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item layui-form-text">
+                                    <label class="layui-form-label">详细内容</label>
+                                    <div class="layui-input-block">
+                                        <textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入详细内容"
+                                        style="width:100%;height:500px;"></textarea>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">是否开放</label>
+                                    <div class="layui-input-block">
+                                        <input type="checkbox" id="Recommend" name="Recommend" value="True"
+                                        lay-skin="switch" lay-filter="switchTest" title="开关">
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">第三方链接</label>
+                                    <div class="layui-input-block">
+                                        <input class="layui-input" type="text" id="Url" name="Url" maxlength="max"
+                                        lay-verify="" autocomplete="off" placeholder="请输入第三方链接">
+                                    </div>
+                                </div>
+                            }
                         </div>
+
                     </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">推荐</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="Recommend" name="Recommend" value="True" lay-skin="switch" lay-filter="switchTest" title="开关">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">第三方链接</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="Url" name="Url" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入第三方链接">
-                        </div>
-                    </div>
-                    }
                 </div>
-
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
+                </div>
             </div>
         </div>
-        <div class="layui-form-item layui-hide">
-            <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-        </div>
-    </div>
-    </div>
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         //详细内容
- @(Html.Raw(Library.Control.kindeditorVar("Contents")))
+        @(Html.Raw(Library.Control.kindeditorVar("Contents")))
 
 
-        //编辑器
-        KindEditor.ready(function (K) {
-            //详细内容
- @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
+            //编辑器
+            KindEditor.ready(function (K) {
+                //详细内容
+        @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
 
         });
 
@@ -202,10 +216,10 @@
 
 
             //上传文件
-            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))),  function (filename) {
-$('#ColPicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
-$('#ColPicPath').val(filename);
-});
+            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))), function (filename) {
+                $('#ColPicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                $('#ColPicPath').val(filename);
+            });
 
 
             //穿梭框
@@ -217,4 +231,5 @@ $('#ColPicPath').val(filename);
 
     </script>
 </body>
+
 </html>

Areas/Admin/Views/BsServer/Col/Edit.cshtml

@@ -1,5 +1,7 @@
 @using MySystem.BsModels;
-@{Col editData = ViewBag.data as Col;}
+@{
+    Col editData = ViewBag.data as Col;
+}
 @{
     string SysUserName = ViewBag.SysUserName as string;
     string right = ViewBag.right as string;
@@ -7,125 +9,153 @@
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>分类设置(修改)</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
         <input type="hidden" name="ColId" value="@editData.ColId" />
         <input type="hidden" name="OldEnName" value="@editData.ColEnName" />
         <div class="layui-card">
-          <div class="layui-card-body">
-        <div class="layui-tab" lay-filter="mytabbar">
-            <div class="layui-tab-content mt20">
-                <div class="layui-tab-item layui-show">
-                    <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">上级栏目</label>
-                            <div class="layui-input-inline">
-                                <select id="PColId" name="PColId" lay-search="" lay-verify="required">
-                                    <option value="@CurColId">作为顶级栏目</option>
-                                    @{List<MySystem.Models.Col> ColId = new MySystem.Models.WebCMSEntities().Col.Where(m=>m.ColId.StartsWith(CurColId)).OrderBy(m => m.ColId).ToList();}
-                                    @foreach (MySystem.Models.Col subColId in ColId)
-                                    {
-                                        string kg = "";
-                                        for (int i = 1; i < subColId.ColId.Length / 3; i++)
-                                        {
-                                            kg += "　　";
-                                        }
-                                        <option value="@subColId.ColId">@(kg+subColId.ColName)</option>
-                                    }
-                                </select>
-                                <script>$("#PColId").val("@ViewBag.PColId");</script>
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">上级栏目</label>
+                                    <div class="layui-input-inline">
+                                        <select id="PColId" name="PColId" lay-search="" lay-verify="required">
+                                            <option value="@CurColId">作为顶级栏目</option>
+                                            @{
+                                                List<MySystem.BsModels.Col> ColId = new MySystem.BsModels.WebCMSEntities().Col.Where(m => m.ColId.StartsWith(CurColId)).OrderBy(m
+                                              => m.ColId).ToList();
+                                            }
+                                            @foreach (MySystem.BsModels.Col subColId in ColId)
+                                            {
+                                                string kg = "";
+                                                for (int i = 1; i < subColId.ColId.Length / 3; i++)
+                                                {
+                                                    kg += "　　";
+                                                }
+                                                <option value="@subColId.ColId">@(kg+subColId.ColName)</option>
+                                            }
+                                        </select>
+                                        <script>$("#PColId").val("@ViewBag.PColId");</script>
+                                    </div>
+                                </div>
                             </div>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">栏目名</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="ColName" name="ColName" value="@editData.ColName" maxlength="50" lay-verify="required;" autocomplete="off" placeholder="请输入名称">
-                        </div>
-                    </div>
-                    @if (CurColId.StartsWith("001") || CurColId.StartsWith("002") || CurColId.StartsWith("003"))
-                    {
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">英文名</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="ColEnName" name="ColEnName" value="@editData.ColEnName" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入英文名">
-                        </div>
-                    </div>
-                    <div class="layui-form-item layui-form-text">
-                        <label class="layui-form-label">简介</label>
-                        <div class="layui-input-block">
-<textarea class="layui-textarea" id="ColDetail" name="ColDetail" lay-verify="" placeholder="请输入简介">@editData.ColDetail</textarea>
-                        </div>
-                    </div>
-                    <div class="layui-form-item layui-form-text">
-                        <label class="layui-form-label">详细内容</label>
-                        <div class="layui-input-block">
-<textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入详细内容" style="width:100%;height:500px;">@(MySystem.OssHelper.Instance.CheckOSSPic(editData.Contents))</textarea>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">图标</label>
-                        <div class="layui-input-block">
-                            <div class="layui-upload">
-                                <input type="hidden" id="ColPicPath" name="ColPicPath" value="@editData.ColPicPath">
-                                <button class="layui-btn" type="button" id="ColPicPathBtn">选择图片</button>
-                                <div class="layui-inline layui-word-aux">大小限制为100K</div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">排序</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="Sort" name="Sort"
+                                        value="@editData.Sort" maxlength="50" lay-verify="required;"
+                                        autocomplete="off" placeholder="请输入">
+                                </div>
                             </div>
-                            <div class="mt10" id="ColPicPathImage">
-                                @if (!string.IsNullOrEmpty(editData.ColPicPath))
-                                {
-                                    <img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.ColPicPath" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.ColPicPath')">
-                                }
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">栏目名</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="ColName" name="ColName"
+                                        value="@editData.ColName" maxlength="50" lay-verify="required|"
+                                        autocomplete="off" placeholder="请输入名称">
+                                </div>
                             </div>
+                            @if (CurColId.StartsWith("001") || CurColId.StartsWith("002") || CurColId.StartsWith("003") || CurColId.StartsWith("005"))
+                            {
+                                @* <div class="layui-form-item">
+                                    <label class="layui-form-label">英文名</label>
+                                    <div class="layui-input-block">
+                                        <input class="layui-input" type="text" id="ColEnName" name="ColEnName"
+                                        value="@editData.ColEnName" maxlength="50" lay-verify="" autocomplete="off"
+                                        placeholder="请输入英文名">
+                                    </div>
+                                </div> *@
+                                <div class="layui-form-item layui-form-text">
+                                    <label class="layui-form-label">简介</label>
+                                    <div class="layui-input-block">
+                                        <textarea class="layui-textarea" id="ColDetail" name="ColDetail" lay-verify=""
+                                        placeholder="请输入简介">@editData.ColDetail</textarea>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">图片</label>
+                                    <div class="layui-input-block">
+                                        <div class="layui-upload">
+                                            <input type="hidden" id="ColPicPath" name="ColPicPath"
+                                            value="@editData.ColPicPath">
+                                            <button class="layui-btn" type="button" id="ColPicPathBtn">选择图片</button>
+                                            <div class="layui-inline layui-word-aux">大小限制为100K</div>
+                                        </div>
+                                        <div class="mt10" id="ColPicPathImage">
+                                            @if (!string.IsNullOrEmpty(editData.ColPicPath))
+                                            {
+                                                <img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.ColPicPath"
+                                            class="layui-upload-img" style="max-width:85px; max-height:85px;"
+                                            onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.ColPicPath')">
+                                            }
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item layui-form-text">
+                                    <label class="layui-form-label">详细内容</label>
+                                    <div class="layui-input-block">
+                                        <textarea class="layui-textarea" id="Contents" name="Contents" placeholder="请输入详细内容"
+                                        style="width:100%;height:500px;">@(MySystem.OssHelper.Instance.CheckOSSPic(editData.Contents))</textarea>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">是否开放</label>
+                                    <div class="layui-input-block">
+                                        <input type="checkbox" id="Recommend" name="Recommend" value="1"
+                                        @(editData.Recommend == 1 ? "checked=checked" : "") lay-skin="switch"
+                                        lay-filter="switchTest" title="开关">
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">第三方链接</label>
+                                    <div class="layui-input-block">
+                                        <input class="layui-input" type="text" id="Url" name="Url" value="@editData.Url"
+                                        maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入第三方链接">
+                                    </div>
+                                </div>
+                            }
                         </div>
+
                     </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">推荐</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="Recommend" name="Recommend" value="1" @(editData.Recommend == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">第三方链接</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="Url" name="Url" value="@editData.Url" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入第三方链接">
-                        </div>
-                    </div>
-                    }
                 </div>
-
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
+                </div>
             </div>
         </div>
-        <div class="layui-form-item layui-hide">
-            <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-        </div>
-    </div>
-    </div>
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         //详细内容
- @(Html.Raw(Library.Control.kindeditorVar("Contents")))
+        @(Html.Raw(Library.Control.kindeditorVar("Contents")))
 
 
-        //编辑器
-        KindEditor.ready(function (K) {
-            //详细内容
- @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
+            //编辑器
+            KindEditor.ready(function (K) {
+                //详细内容
+        @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
 
         });
 
@@ -197,7 +227,7 @@
                 , transfer = layui.transfer
                 , util = layui.util
                 , tree = layui.tree;
-                                
+
             upload = layui.upload;
 
             //Hash地址的定位
@@ -211,7 +241,7 @@
 
 
             //上传文件
-            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))),  function (filename) {
+            WebUploadJs('ColPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ColColPicPath"))), function (filename) {
                 $('#ColPicPathImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
                 $('#ColPicPath').val(filename);
             });
@@ -226,4 +256,5 @@
 
     </script>
 </body>
+
 </html>

Areas/Admin/Views/BsServer/Col/Index.cshtml

@@ -33,8 +33,8 @@
                     {
                         <button class="layui-btn" data-type="Unfold">全部展开</button>
                         <button class="layui-btn" data-type="PackUp">全部收起</button>
-                        <button class="layui-btn" data-type="Open">开启</button>
-                        <button class="layui-btn" data-type="Close">关闭</button>
+                        @* <button class="layui-btn" data-type="Open">开启</button> *@
+                        @* <button class="layui-btn" data-type="Close">关闭</button> *@
                     }
                 </div>
 
@@ -55,14 +55,14 @@
                     {
                         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
-                    @if (RightInfo.Contains("," + right + "_browse,"))
+                    @* @if (RightInfo.Contains("," + right + "_browse,"))
                     {
                         <a class="layui-btn layui-btn-normal layui-btn-xs" href="@("{{d.Url}}")" target="_blank">预览</a>
                     }
                     @if (SysUserName == "admin")
                     {
                         <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/ColFields/Index?ColId=@("{{d.Id}}")&right=@right">字段管理</a>
-                    }
+                    } *@
                 </script>
             </div>
         </div>

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

@@ -1,88 +1,83 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>商户退押金申请记录</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-<label class="layui-form-label">商户商户真实姓名</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerchantIdMerRealName" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户商户手机号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerchantIdMerchantMobile" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户商户身份证号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="MerchantIdMerIdcardNo" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创建时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate" placeholder="" autocomplete="off">
-</div></div><div class="layui-inline">
-<label class="layui-form-label">支付宝账号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="AlipayAccountNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">操作人</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="OperateMan" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创客真实姓名</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="UserIdRealName" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创客创客编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="UserIdMakerCode" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">创建时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">退押订单号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="OrderNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">支付宝账号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="AlipayAccountNo" placeholder=""
+                                autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">退押状态</label>
+                        <div class="layui-input-inline">
+                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">待处理</option>
+                                <option value="3">处理中</option>
+                                <option value="2">失败</option>
+                                <option value="1">成功</option>
+                                <option value="4">通过</option>
+                                <option value="5">未通过</option>
+                            </select>
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -99,34 +94,52 @@
                 <div style="padding-bottom: 10px;">
                     @if (RightInfo.Contains("," + right + "_add,"))
                     {
-                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
+                        <button class="layui-btn" data-type="add"><i
+                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i
+                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
-                    @if (RightInfo.Contains("," + right + "_edit,"))
-                    {
-                    <button class="layui-btn" data-type="Open">开启</button>
-<button class="layui-btn" data-type="Close">关闭</button>
-<button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                    @* @if (RightInfo.Contains("," + right + "_edit,"))
+                        {
+                        <button class="layui-btn" data-type="Open">开启</button>
+                        <button class="layui-btn" data-type="Close">关闭</button>
+                        <button class="layui-btn" data-type="ExportExcel"><i
+                        class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
 
+                        } *@
+                    @if (RightInfo.Contains("," + right + "_export,"))
+                    {
+                        <button class="layui-btn" data-type="ExportExcel"><i
+                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                    }
+                    @if (RightInfo.Contains("," + right + "_import,"))
+                    {
+                        <button class="layui-btn" data-type="ImportData"><i
+                            class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>退押结果导入</button>
+                    }
+                    @if (RightInfo.Contains("," + right + "_cash,"))
+                    {
+                        <button class="layui-btn" data-type="Cash"><i
+                            class="layui-icon layui-icon-up layuiadmin-button-btn"></i>提交到代付平台</button>
                     }
                 </div>
-                
+
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    
+
                     }
                 </script>
             </div>
@@ -158,9 +171,11 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules/MerchantDepositReturns_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/layuiadmin/modules_main/MerchantDepositReturns_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

Areas/Admin/Views/MainServer/PosMerchantInfoList/Indexs.cshtml

@@ -0,0 +1,125 @@
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+}
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>达标商户列表</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <style>
+        .layui-input-inline {
+            width: 175px !important;
+        }
+
+        .layui-form-label {
+            width: 85px !important;
+        }
+
+        .layui-inline {
+            margin-right: 0px !important;
+        }
+
+        .w100 {
+            width: 100px !important;
+        }
+
+        .ml50 {
+            margin-left: 50px !important;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+                <input class="layui-input" type="hidden" name="ShowFlag" autocomplete="off">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">身份证号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerIdcardNo" placeholder="请输入身份证号"
+                                autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">手机号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerchantMobile" placeholder="请输入手机号"
+                                autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">机具号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="KqSnNo" placeholder="请输入机具号"
+                                autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline ml50">
+                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
+                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
+                        </button>
+                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
+                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
+                        </button>
+                        @if (RightInfo.Contains("," + right + "_batchset,"))
+                        {
+                            <button class="layui-btn" data-type="BatchSetting">
+                                <i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>批量通过
+                            </button>
+                        }
+                        @if (RightInfo.Contains("," + right + "_import,"))
+                        {
+                            <button class="layui-btn" data-type="ImportData"><i
+                                class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>导入人工已退</button>
+                        }
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-card-body">
+                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
+            </div>
+        </div>
+    </div>
+    <div id="excelForm" style="display:none; padding:20px;">
+        <div class="layui-tab-item layui-show">
+            <div class="layui-form-item">
+                <label class="layui-form-label">模板下载</label>
+                <div class="layui-form-mid layui-word-aux" id="excelTemp">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">excel文件</label>
+                <div class="layui-form-mid layui-word-aux">
+                    <div class="layui-upload">
+                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
+                    </div>
+                    <div class="mt10" id="ExcelFileList">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item ml10">
+            <div class="layui-input-block">
+                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
+            </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script
+        src="/layuiadmin/modules_main/PosMerchantInfosList_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+</body>
+
+</html>

Areas/Admin/Views/MainServer/SchoolMakerStudy/Add.cshtml

@@ -1,7 +1,7 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-
+    string CurColId = ViewBag.CurColId as string;
 }
 <!DOCTYPE html>
 <html>
@@ -30,6 +30,28 @@
                     </ul>
                     <div class="layui-tab-content mt20">
                         <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">分类</label>
+                                    <div class="layui-input-inline">
+                                        <select id="SeoKeyword" name="SeoKeyword" lay-search="" lay-verify="required">
+                                            @{
+                                                List<MySystem.BsModels.Col> ColId = new MySystem.BsModels.WebCMSEntities().Col.Where(m => m.ColId.StartsWith("005")).OrderBy(m
+                                              => m.ColId).ToList();
+                                            }
+                                            @foreach (MySystem.BsModels.Col subColId in ColId)
+                                            {
+                                                string kg = "";
+                                                for (int i = 1; i < subColId.ColId.Length / 3; i++)
+                                                {
+                                                    kg += "　　";
+                                                }
+                                                <option value="@subColId.ColId">@(kg+subColId.ColName)</option>
+                                            }
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="layui-form-item">
                                 <label class="layui-form-label">标题</label>
                                 <div class="layui-input-inline">
@@ -65,8 +87,7 @@
                                     <div class="layui-upload">
                                         <input type="hidden" id="ListPic" name="ListPic" value="">
                                         <button class="layui-btn" type="button" id="ListPicBtn">选择图片</button>
-                                        <div class="layui-inline layui-word-aux">@(new
-                                            MySystem.PublicFunction().GetUploadHint("SchoolMakerStudyListPic"))</div>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("SchoolMakerStudyListPic"))</div>
                                     </div>
                                     <div style="margin-top:10px;" id="ListPicImage">
                                     </div>

Areas/Admin/Views/MainServer/SchoolMakerStudy/Edit.cshtml

@@ -1,11 +1,13 @@
 @using MySystem.Models;
+@using MySystem.BsModels;
 @{
-    SchoolMakerStudy editData = ViewBag.data as SchoolMakerStudy;
+    MySystem.Models.SchoolMakerStudy editData = ViewBag.data as MySystem.Models.SchoolMakerStudy;
+    MySystem.BsModels.Col editDatas = ViewBag.data as MySystem.BsModels.Col;
 }
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-
+    string CurColId = ViewBag.CurColId as string;
 }
 <!DOCTYPE html>
 <html>
@@ -35,6 +37,29 @@
                     </ul>
                     <div class="layui-tab-content mt20">
                         <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">分类</label>
+                                    <div class="layui-input-inline">
+                                        <select id="SeoKeyword" name="SeoKeyword" lay-search="" lay-verify="required">
+                                            @{
+                                                List<MySystem.BsModels.Col> ColId = new MySystem.BsModels.WebCMSEntities().Col.Where(m => m.ColId.StartsWith("005")).OrderBy(m
+                                              => m.ColId).ToList();
+                                            }
+                                            @foreach (MySystem.BsModels.Col subColId in ColId)
+                                            {
+                                                string kg = "";
+                                                for (int i = 1; i < subColId.ColId.Length / 3; i++)
+                                                {
+                                                    kg += "　　";
+                                                }
+                                                <option value="@subColId.ColId">@(kg+subColId.ColName)</option>
+                                            }
+                                        </select>
+                                        <script>$("#SeoKeyword").val("@editData.SeoKeyword");</script>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="layui-form-item">
                                 <label class="layui-form-label">标题</label>
                                 <div class="layui-input-inline">
@@ -72,8 +97,7 @@
                                     <div class="layui-upload">
                                         <input type="hidden" id="ListPic" name="ListPic" value="@editData.ListPic">
                                         <button class="layui-btn" type="button" id="ListPicBtn">选择图片</button>
-                                        <div class="layui-inline layui-word-aux">@(new
-                                            MySystem.PublicFunction().GetUploadHint("SchoolMakerStudyListPic"))</div>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("SchoolMakerStudyListPic"))</div>
                                     </div>
                                     <div style="margin-top:10px;" id="ListPicImage">
                                         @if (!string.IsNullOrEmpty(editData.ListPic))

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

@@ -44,6 +44,26 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">分类</label>
+                        <div class="layui-input-inline">
+                            <select id="SeoKeyword" name="SeoKeyword" lay-search="">
+                                @{
+                                    List<MySystem.BsModels.Col> ColId = new MySystem.BsModels.WebCMSEntities().Col.Where(m => m.ColId.StartsWith("005")).OrderBy(m
+                                    => m.ColId).ToList();
+                                }
+                                @foreach (MySystem.BsModels.Col subColId in ColId)
+                                {
+                                    string kg = "";
+                                    for (int i = 1; i < subColId.ColId.Length / 3; i++)
+                                    {
+                                        kg += "　　";
+                                    }
+                                    <option value="@subColId.ColId">@(kg+subColId.ColName)</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">标题</label>
                         <div class="layui-input-inline">
@@ -80,6 +100,11 @@
                         <button class="layui-btn" data-type="batchdel"><i
                             class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
+                    @if (RightInfo.Contains("," + right + "_import,"))
+                    {
+                        <button class="layui-btn" data-type="ImportData"><i
+                            class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>创客权限导入</button>
+                    }
                     @* @if (RightInfo.Contains("," + right + "_edit,"))
                     {
                         <button class="layui-btn" data-type="Open">开启</button>

wwwroot/layuiadmin/modules/Col_Admin.js

@@ -82,40 +82,53 @@ layui.config({
     //     }
     // });
 
-    var	re = treeTable.render({
+    var re = treeTable.render({
         elem: '#LAY-list-manage',
-        url: '/Admin/Col/IndexData?CurColId='+CurColId,
+        url: '/Admin/Col/IndexData?CurColId=' + CurColId,
         icon_key: 'title',
         is_checkbox: true,
-        end: function(e){
+        end: function (e) {
             form.render();
         },
         cols: [
             {
                 key: 'title',
                 title: '名称',
-                template: function(item){
-                    return '<span style="color:#333;">'+item.title+'</span>';
+                template: function (item) {
+                    return '<span style="color:#333;">' + item.title + '</span>';
                 }
             },
+            // {
+            //     key: 'id',
+            //     title: 'ID',
+            //     width: '100px',
+            //     align: 'center',
+            // },
+            // {
+            //     key: 'pid',
+            //     title: '父ID',
+            //     width: '100px',
+            //     align: 'center',
+            // },
             {
-                key: 'id',
-                title: 'ID',
+                key: 'ColId',
+                title: '分类编码',
                 width: '100px',
                 align: 'center',
             },
             {
-                key: 'pid',
-                title: '父ID',
+                key: 'Sort',
+                title: '排序',
                 width: '100px',
-                align: 'center',
+                edit: 'text'
             },
-            {
-                key: 'Status',
-                title: '状态',
-                width: '100px',
-                align: 'center',
-            },            
+
+            // {
+            //     key: 'Status',
+            //     title: '状态',
+            //     width: '100px',
+            //     align: 'center',
+            // },             
             {
                 title: '操作',
                 width: '350px',
@@ -125,8 +138,8 @@ layui.config({
                     tmp += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-filter="addsub">添加子栏目</a>';
                     tmp += '<a class="layui-btn layui-btn-normal layui-btn-xs" lay-filter="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>';
                     tmp += '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-filter="del"><i class="layui-icon layui-icon-delete"></i>删除</a>';
-                    tmp += '<a class="layui-btn layui-btn-normal layui-btn-xs" href="'+item.url+'" target="_blank">预览</a>';
-                    tmp += '<a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/ColFields/Index?ColId='+item.id+'&right='+right+'">字段管理</a>';
+                    // tmp += '<a class="layui-btn layui-btn-normal layui-btn-xs" href="'+item.url+'" target="_blank">预览</a>';
+                    // tmp += '<a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/ColFields/Index?ColId='+item.id+'&right='+right+'">字段管理</a>';
                     return tmp;
                 }
             }
@@ -152,7 +165,7 @@ layui.config({
                     , submit = layero.find('iframe').contents().find('#' + submitID);
 
                 //详细内容
-                if(iframeWindow.Contentsedit) iframeWindow.Contentsedit.sync();
+                if (iframeWindow.Contentsedit) iframeWindow.Contentsedit.sync();
 
 
                 //监听提交
@@ -186,7 +199,7 @@ layui.config({
         });
         layer.full(perContent);
     });
-    treeTable.on('tree(edit)', function (res) { 
+    treeTable.on('tree(edit)', function (res) {
         var data = res.item;
         var perContent = layer.open({
             type: 2
@@ -199,9 +212,9 @@ layui.config({
                 var iframeWindow = window['layui-layer-iframe' + index]
                     , submitID = 'LAY-list-front-submit'
                     , submit = layero.find('iframe').contents().find('#' + submitID);
-                
+
                 //详细内容
-                if(iframeWindow.Contentsedit) iframeWindow.Contentsedit.sync();
+                if (iframeWindow.Contentsedit) iframeWindow.Contentsedit.sync();
 
                 //监听提交
                 iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -237,7 +250,7 @@ layui.config({
         });
         layer.full(perContent);
     });
-    treeTable.on('tree(del)', function (res) { 
+    treeTable.on('tree(del)', function (res) {
         var data = res.item;
         layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
             $.ajax({

wwwroot/layuiadmin/modules_main/MerchantDepositReturns_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -31,49 +31,49 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
-elem: '#CreateDate',
-type: 'date',
-range: true,
-trigger: 'click',
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#CreateDate').val(value);
-}
-}
-});
+        elem: '#CreateDate',
+        type: 'datetime',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
-            ExcelData = data[0].sheet1;
+        excel.importExcel(files, {}, function (data) {
+            ExcelData = data[0].Sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/MerchantDepositReturns/Sort?r=" + Math.random(1),
@@ -84,30 +84,25 @@ $('#CreateDate').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/MerchantDepositReturns/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'MerchantIdMerRealName', width: 200, title:'商户商户真实姓名', sort: true}
-,{field:'MerchantIdMerchantMobile', width: 200, title:'商户商户手机号', sort: true}
-,{field:'MerchantIdMerIdcardNo', width: 200, title:'商户商户身份证号', sort: true}
-,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
-,{field:'StatusName', width: 200, title:'状态', sort: true}
-,{field:'AlipayAccountNo', width: 200, title:'支付宝账号', sort: true}
-,{field:'ReturnAmount', width: 200, title:'返还金额', sort: true}
-,{field:'OperateMan', width: 200, title:'操作人', sort: true}
-,{field:'UserIdRealName', width: 200, title:'创客真实姓名', sort: true}
-,{field:'UserIdMakerCode', width: 200, title:'创客创客编号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
-            , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'StatusName', width: 200, title: '状态', sort: true }
+            , { field: 'OperateMan', width: 200, title: '操作人', sort: true }
+            , { field: 'SeoKeyword', width: 200, title: '退押订单号', sort: true }
+            , { field: 'AlipayAccountNo', width: 200, title: '支付宝账号', sort: true }
+            , { field: 'ReturnAmount', width: 200, title: '返还金额', sort: true }
+
+            , { title: '操作', align: 'center', width: 400, fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -129,7 +124,7 @@ $('#CreateDate').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -152,20 +147,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -176,7 +171,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/MerchantDepositReturns/Edit?r=" + Math.random(1),
@@ -269,20 +264,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -293,7 +288,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/MerchantDepositReturns/Add?r=" + Math.random(1),
@@ -326,7 +321,7 @@ $('#CreateDate').val(value);
                 cancel: function () {
                 }
             });
-            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
+            $("#excelTemp").html('<a href="/users/退押结果模版.xlsx">点击下载退押结果模版</a>');
         }
         , ExportExcel: function () {
             var userdata = '';
@@ -350,9 +345,9 @@ $('#CreateDate').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -379,9 +374,9 @@ $('#CreateDate').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -404,8 +399,38 @@ $('#CreateDate').val(value);
                     });
                 });
             }
-        }
+        },Cash: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage'),
+                data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要提交代付的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要提交到代付平台申请出款吗？', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/MerchantDepositReturns/Cash?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                layer.msg('提交成功，请等待代付平台处理');
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        },
     };
+    
 
     $('.layui-btn').on('click', function () {
         var type = $(this).data('type');

wwwroot/layuiadmin/modules_main/PosMerchantInfoList_Admin.js

@@ -306,6 +306,8 @@ layui.config({
         }
     });
     form.on('submit(LAY-list-front-searchall)', function (data) {
+        var field = data.field;
+        field.ShowFlag = 1;
         table.reload('LAY-list-manage', {
             where: null,
             page: {

wwwroot/layuiadmin/modules_main/PosMerchantInfosList_Admin.js

@@ -0,0 +1,508 @@
+var ExcelData;
+function ConfirmImport() {
+    $.ajax({
+        type: "POST",
+        url: "/Admin/PosMerchantInfoList/Import?r=" + Math.random(1),
+        data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
+        dataType: "text",
+        success: function (data) {
+            if (data == "success") {
+                layer.msg("导入成功", { time: 2000 }, function () {
+                    window.location.reload();
+                });
+            } else {
+                layer.msg(data);
+            }
+        }
+    });
+}
+
+var excel;
+layui.config({
+    base: '/layuiadmin/' //静态资源所在路径
+}).extend({
+    myexcel: 'layui/lay/modules/excel',
+    index: 'lib/index' //主入口模块
+}).use(['index', 'table', 'excel', 'laydate'], function () {
+    var $ = layui.$
+        , form = layui.form
+        , table = layui.table;
+
+    //- 筛选条件-日期
+    var laydate = layui.laydate;
+    var layCreateDate = laydate.render({
+        elem: '#CreateDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
+    var layKqRegTime = laydate.render({
+        elem: '#KqRegTime',
+        trigger: 'click',
+        type: 'date',
+        range: true,
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layKqRegTime.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layKqRegTime.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#KqRegTime').val(value);
+            }
+        }
+    });
+
+
+    //excel导入
+    excel = layui.excel;
+    $('#ExcelFile').change(function (e) {
+        var files = e.target.files;
+        excel.importExcel(files, {}, function (data) {
+            ExcelData = data[0].Sheet1;
+        });
+    });
+
+    //监听单元格编辑
+    table.on('edit(LAY-list-manage)', function (obj) {
+        var value = obj.value //得到修改后的值
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
+            $.ajax({
+                type: "POST",
+                url: "/Admin/PosMerchantInfoList/Sort?r=" + Math.random(1),
+                data: "Id=" + data.Id + "&Sort=" + value,
+                dataType: "text",
+                success: function (data) {
+                }
+            });
+        }
+    });
+
+
+    //列表数据
+    table.render({
+        elem: '#LAY-list-manage'
+        , url: '/Admin/PosMerchantInfoList/IndexsData' //模拟接口
+        , cols: [[
+            { type: 'checkbox', fixed: 'left' }
+            , { field: 'MerchantNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'MerIdcardNo', width: 200, title: '身份证号', sort: true }
+            , { field: 'MerchantName', width: 200, title: '商户名称', sort: true }
+            , { field: 'MerchantMobile', width: 200, title: '手机号', sort: true }
+            , { field: 'KqSnNo', width: 220, title: '机具SN号', sort: true }
+        ]]
+        , where: {
+        }
+        , page: true
+        , limit: 30
+        , height: 'full-' + String($('.layui-card-header').height() + 130)
+        , text: '对不起，加载出现异常！'
+        , done: function (res, curr, count) {
+            $(".layui-none").text("无数据");
+        }
+    });
+
+    //监听工具条
+    table.on('tool(LAY-list-manage)', function (obj) {
+        var data = obj.data;
+        if (obj.event === 'del') {
+            var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/PosMerchantInfoList/Delete?r=" + Math.random(1),
+                    data: "Id=" + data.Id,
+                    dataType: "text",
+                    success: function (data) {
+                        if (data == "success") {
+                            obj.del();
+                            layer.close(index);
+                        } else {
+                            parent.layer.msg(data);
+                        }
+                    }
+                });
+            });
+        } else if (obj.event === 'edit') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2
+                , title: '商户-编辑'
+                , content: 'Edit?Id=' + data.Id + ''
+                , maxmin: true
+                , area: ['500px', '450px']
+                , btn: ['确定', '取消']
+                , yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index]
+                        , submitID = 'LAY-list-front-submit'
+                        , submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/PosMerchantInfoList/Edit?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(index); //关闭弹层
+                                if (data == "success") {
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+                , success: function (layero, index) {
+
+                }
+            });
+            layer.full(perContent);
+        } else if (obj.event === 'sycntrade') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2
+                , title: '同步交易额'
+                , content: 'SycnTradeAmount?Id=' + data.Id
+                , maxmin: false
+                , area: ['550px', '700px']
+                , btn: ['确定', '取消']
+                , yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index]
+                        , submitID = 'LAY-list-front-submit'
+                        , submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+                        var loadindex = layer.load(1, {
+                            shade: [0.5, '#000']
+                        });
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/PosMerchantInfoList/SycnTradeAmountDo?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(loadindex); //关闭弹层
+                                layer.close(index); //关闭弹层
+                                if (data == "success") {
+                                    layer.alert('重置程序已启动，请稍后核对商户交易额');
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+                , success: function (layero, index) {
+
+                }
+            });
+        }
+    });
+
+
+    //监听搜索
+    form.on('submit(LAY-list-front-search)', function (data) {
+        var field = data.field;
+        //执行重载
+        table.reload('LAY-list-manage', {
+            where: field,
+            page: {
+                curr: 1
+            }
+        });
+    });
+    form.on('submit(LAY-list-front-searchall)', function (data) {
+        var field = data.field;
+        table.reload('LAY-list-manage', {
+            where: null,
+            page: {
+                curr: 1
+            }
+        });
+    });
+
+    //事件
+    var active = {
+        batchdel: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要删除的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/PosMerchantInfoList/Delete?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        }
+        , add: function () {
+            var perContent = layer.open({
+                type: 2
+                , title: '商户-添加'
+                , content: 'Add'
+                , maxmin: true
+                , area: ['500px', '450px']
+                , btn: ['确定', '取消']
+                , yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index]
+                        , submitID = 'LAY-list-front-submit'
+                        , submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+
+
+
+
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/PosMerchantInfoList/Add?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(index); //关闭弹层
+                                if (data == "success") {
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+            });
+            layer.full(perContent);
+        }
+        , ImportData: function () {
+            layer.open({
+                type: 1,
+                title: '导入',
+                maxmin: false,
+                area: ['460px', '280px'],
+                content: $('#excelForm'),
+                cancel: function () {
+                }
+            });
+            $("#excelTemp").html('<a href="/users/人工已退模版.xlsx">点击下载人工已退模版</a>');
+        }
+        , ExportExcel: function () {
+            var userdata = '';
+            $(".layuiadmin-card-header-auto input").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $(".layuiadmin-card-header-auto select").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $.ajax({
+                type: "GET",
+                url: "/Admin/PosMerchantInfoList/ExportExcel?r=" + Math.random(1),
+                data: userdata,
+                dataType: "json",
+                success: function (data) {
+                    data.Obj.unshift(data.Fields);
+                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                }
+            });
+        }
+        , BatchSetting: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要通过的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要通过吗？', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/PosMerchantInfoList/BatchSetting?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                layer.msg('成功', {
+                                    time: 1000
+                                }, function () {
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                });
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        }
+        , Open: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要开启的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要开启吗？', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/PosMerchantInfoList/Open?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        }
+        , Close: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要关闭的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要关闭吗？', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/PosMerchantInfoList/Close?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        }
+    };
+
+    $('.layui-btn').on('click', function () {
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+    });
+});

wwwroot/layuiadmin/modules_main/SchoolMakerStudy_Admin.js

@@ -10,6 +10,11 @@ function ConfirmImport() {
                 layer.msg("导入成功", { time: 2000 }, function () {
                     window.location.reload();
                 });
+            }else if (data.indexOf("Warning") == 0) {
+                var datalist = data.split('|');
+                layer.alert(datalist[1], { time: 20000 }, function () {
+                    window.location.reload();
+                });
             } else {
                 layer.msg(data);
             }
@@ -64,7 +69,7 @@ layui.config({
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
         excel.importExcel(files, {}, function (data) {
-            ExcelData = data[0].sheet1;
+            ExcelData = data[0].Sheet1;
         });
     });
 
@@ -97,7 +102,7 @@ layui.config({
             , { field: 'SeoTitle', width: 200, title: '主讲人', sort: true }
             , { field: 'QueryCount', width: 200, title: '学习人数', sort: true }
             // , { field: 'StatusName', width: 200, title: '状态', sort: true }
-            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
+            , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
@@ -324,7 +329,7 @@ layui.config({
                 cancel: function () {
                 }
             });
-            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
+            $("#excelTemp").html('<a href="/users/商学院创客权限模板.xlsx">点击下载商学院创客权限模板</a>');
         }
         , ExportExcel: function () {
             var userdata = '';