市场活动功能调整

Areas/Admin/Controllers/BsServer/AdvertismentController.cs

@@ -32,11 +32,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 根据条件查询广告位列表
         /// </summary>
         /// <returns></returns>
-        public IActionResult Index(Advertisment data, string right)
+        public IActionResult Index(Advertisment data, string right, string CurColId)
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
             ViewBag.SysUserName = SysUserName;
+            ViewBag.CurColId = CurColId;
 
             string Condition = "";
             Condition += "Title:\"" + data.Title + "\",";
@@ -58,17 +59,22 @@ namespace MySystem.Areas.Admin.Controllers
         /// 广告位列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(Advertisment data, int page = 1, int limit = 30)
+        public JsonResult IndexData(Advertisment data, string CurColId, int page = 1, int limit = 30)
         {
-            Dictionary<string, string> ColDic = new DictionaryClass().getColDic("003");
+            Dictionary<string, string> ColDic = new DictionaryClass().getColDic(CurColId);
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("Title", "2"); //标题
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).IndexData("Advertisment", Fields, "Id desc", "False", page, limit);
+            string condition = " and ColId like '" + CurColId + "%'";
+            // Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).IndexData("Advertisment", Fields, "Id desc", "False", page, limit);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).IndexData("Advertisment", Fields, "Id desc", "False", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
                 dic["ColId"] = new DictionaryClass().getDictionaryNameByKey(ColDic, dic["ColId"].ToString());
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["StatusName"] = "已下架";
+                if (Status == 1) dic["StatusName"] = "已上架";
             }
             return Json(obj);
         }
@@ -81,11 +87,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 增加或修改广告位信息
         /// </summary>
         /// <returns></returns>
-        public IActionResult Add()
+        public IActionResult Add(string right, string CurColId)
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = _accessor.HttpContext.Request.Query["right"];
             ViewBag.SysUserName = SysUserName;
+            ViewBag.CurColId = CurColId;
 
             return View();
         }
@@ -99,7 +106,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public string Add(Advertisment data)
+        public string Add(Advertisment data, string CurColId = "")
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Fields.Add("Title", data.Title); //标题
@@ -114,8 +121,6 @@ namespace MySystem.Areas.Admin.Controllers
             AddSysLog(data.Id.ToString(), "Advertisment", "add");
             bsdb.SaveChanges();
 
-            SetRedis(data.ColId, Id);
-
             return "success";
         }
 
@@ -127,11 +132,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 增加或修改广告位信息
         /// </summary>
         /// <returns></returns>
-        public IActionResult Edit(int Id = 0)
+        public IActionResult Edit(string right, string CurColId, int Id = 0)
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = _accessor.HttpContext.Request.Query["right"];
             ViewBag.SysUserName = SysUserName;
+            ViewBag.CurColId = CurColId;
 
             Advertisment editData = bsdb.Advertisment.FirstOrDefault(m => m.Id == Id) ?? new Advertisment();
             ViewBag.data = editData;
@@ -147,7 +153,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public string Edit(Advertisment data)
+        public string Edit(Advertisment data, string CurColId = "")
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Fields.Add("Title", data.Title); //标题
@@ -161,8 +167,6 @@ namespace MySystem.Areas.Admin.Controllers
             AddSysLog(data.Id.ToString(), "Advertisment", "update");
             bsdb.SaveChanges();
 
-            SetRedis(data.ColId, data.Id);
-
             return "success";
         }
 
@@ -183,12 +187,11 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 string ColId = "";
                 Advertisment ad = bsdb.Advertisment.FirstOrDefault(m => m.Id == id);
-                if(ad != null)
+                if (ad != null)
                 {
                     ColId = ad.ColId;
                 }
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Delete("Advertisment", id);
-                SetRedis(ColId);
             }
             bsdb.SaveChanges();
 
@@ -254,10 +257,6 @@ namespace MySystem.Areas.Admin.Controllers
 
             AddSysLog(Id.ToString(), "Advertisment", "sort");
             Advertisment ad = bsdb.Advertisment.FirstOrDefault(m => m.Id == Id);
-            if(ad != null)
-            {
-                SetRedis(ad.ColId);
-            }
             return "success";
         }
         #endregion
@@ -333,4 +332,4 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
     }
-}
+}

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

@@ -2,6 +2,7 @@
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
     string SysUserName = ViewBag.SysUserName as string;
+    string CurColId = ViewBag.CurColId as string;
 }
 <!DOCTYPE html>
 <html>
@@ -28,16 +29,16 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">标题</label>
                         <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="Title" name="Title" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入标题">
+                            <input class="layui-input" type="text" id="Title" name="Title" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入标题">
                         </div>
                     </div>
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label">分类</label>
                             <div class="layui-input-inline">
-                                <select id="ColId" name="ColId" lay-search="">
+                                <select id="ColId" name="ColId" lay-search="" lay-verify="required|" placeholder="请选择分类">
                                     <option value="">请选择</option>
-                                    @{Dictionary<string, string> ColDic = new MySystem.DictionaryClass().getColDic("003");}
+                                    @{Dictionary<string, string> ColDic = new MySystem.DictionaryClass().getColDic(CurColId);}
                                     @foreach (string key in ColDic.Keys)
                                     {
                                         string kg = "";
@@ -55,7 +56,7 @@
                         <label class="layui-form-label">图片</label>
                         <div class="layui-input-block">
                             <div class="layui-upload">
-                                <input type="hidden" id="PicPath" name="PicPath" value="">
+                                <input type="hidden" id="PicPath" name="PicPath" value="" lay-verify="required|">
                                 <button class="layui-btn" type="button" id="PicPathBtn">选择图片</button>
                                 <div class="layui-inline layui-word-aux"></div>
                             </div>
@@ -66,7 +67,7 @@
                     <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>
+                            <textarea class="layui-textarea" id="Contents" name="Contents" style="width:100%;height:500px;"></textarea>
                         </div>
                     </div>
                     <div class="layui-form-item">
@@ -227,4 +228,4 @@
 
     </script>
 </body>
-</html>
+</html>

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

@@ -4,6 +4,7 @@
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
     string SysUserName = ViewBag.SysUserName as string;
+    string CurColId = ViewBag.CurColId as string;
 }
 <!DOCTYPE html>
 <html>
@@ -31,16 +32,16 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">标题</label>
                         <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="Title" name="Title" value="@editData.Title" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入标题">
+                            <input class="layui-input" type="text" id="Title" name="Title" value="@editData.Title" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入标题">
                         </div>
                     </div>
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label">分类</label>
                             <div class="layui-input-inline">
-                                <select id="ColId" name="ColId" lay-search="">
+                                <select id="ColId" name="ColId" lay-search="" lay-verify="required|" placeholder="请选择分类">
                                     <option value="">请选择</option>
-                                    @{Dictionary<string, string> ColDic = new MySystem.DictionaryClass().getColDic("003");}
+                                    @{Dictionary<string, string> ColDic = new MySystem.DictionaryClass().getColDic(CurColId);}
                                     @foreach (string key in ColDic.Keys)
                                     {
                                         string kg = "";
@@ -59,7 +60,7 @@
                         <label class="layui-form-label">图片</label>
                         <div class="layui-input-block">
                             <div class="layui-upload">
-                                <input type="hidden" id="PicPath" name="PicPath" value="@editData.PicPath">
+                                <input type="hidden" id="PicPath" name="PicPath" value="@editData.PicPath" lay-verify="required|" placeholder="请输入图片">
                                 <button class="layui-btn" type="button" id="PicPathBtn">选择图片</button>
                                 <div class="layui-inline layui-word-aux"></div>
                             </div>

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

@@ -1,6 +1,7 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
+    string CurColId = ViewBag.CurColId as string;
 }
 <!DOCTYPE html>
 <html>
@@ -66,6 +67,18 @@
                     {
                         <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 + "_open,"))
+                    {
+                        @Html.Raw("{{#if (d.Status == 0){ }}")
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="open"><i class="layui-icon layui-icon-up"></i>上架</a>
+                        @("{{#} }}")
+                    }
+                    @if (RightInfo.Contains("," + right + "_close,"))
+                    {
+                        @("{{#if (d.Status == 1){ }}")
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="close"><i class="layui-icon layui-icon-down"></i>下架</a>
+                        @("{{#} }}")
+                    }
                 </script>
             </div>
         </div>
@@ -92,5 +105,9 @@
 
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules/Advertisment_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script>
+        var CurColId = '@CurColId';
+        var right = '@right';
+    </script>
 </body>
 </html>

wwwroot/layuiadmin/modules/Advertisment_Admin.js

@@ -61,10 +61,11 @@ layui.config({
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
-        , url: '/Admin/Advertisment/IndexData' //模拟接口
+        , url: '/Admin/Advertisment/IndexData?CurColId=' + CurColId //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'StatusName', width: 150, title: '状态', sort: true }
             , { field: 'Title', title: '标题', sort: true }
             , { field: 'ColId', title: '分类', sort: true }
             , { field: 'PicPath', title: '图片', width: 60, templet: '#imgTpl', unresize: true }
@@ -106,7 +107,7 @@ layui.config({
             var perContent = layer.open({
                 type: 2
                 , title: '广告位-编辑'
-                , content: 'Edit?Id=' + data.Id
+                , content: 'Edit?Id=' + data.Id + '&CurColId=' + CurColId
                 , maxmin: true
                 , area: ['500px', '450px']
                 , btn: ['确定', '取消']
@@ -118,9 +119,6 @@ layui.config({
                     //内容
                     iframeWindow.Contentsedit.sync();
 
-
-
-
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                         var field = data.field; //获取提交的字段
@@ -154,6 +152,34 @@ layui.config({
                 }
             });
             layer.full(perContent);
+        } else if (obj.event === 'open') {
+            $.ajax({
+                type: "POST",
+                url: "/Admin/Advertisment/Open?r=" + Math.random(1),
+                data: "Id=" + data.Id,
+                dataType: "text",
+                success: function (data) {
+                    if (data == "success") {
+                        table.reload('LAY-list-manage'); //数据刷新
+                    } else {
+                        parent.layer.msg(data);
+                    }
+                }
+            });
+        } else if (obj.event === 'close') {
+            $.ajax({
+                type: "POST",
+                url: "/Admin/Advertisment/Close?r=" + Math.random(1),
+                data: "Id=" + data.Id,
+                dataType: "text",
+                success: function (data) {
+                    if (data == "success") {
+                        table.reload('LAY-list-manage'); //数据刷新
+                    } else {
+                        parent.layer.msg(data);
+                    }
+                }
+            });
         }
     });
 
@@ -208,7 +234,7 @@ layui.config({
             var perContent = layer.open({
                 type: 2
                 , title: '广告位-添加'
-                , content: 'Add'
+                , content: 'Add?CurColId=' + CurColId
                 , maxmin: true
                 , area: ['500px', '450px']
                 , btn: ['确定', '取消']