DuGuYang 3 лет назад
Родитель
Сommit
040afb275b

+ 15 - 10
Areas/Admin/Controllers/BsServer/AdvertismentController.cs

@@ -32,11 +32,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 根据条件查询广告位列表
         /// 根据条件查询广告位列表
         /// </summary>
         /// </summary>
         /// <returns></returns>
         /// <returns></returns>
-        public IActionResult Index(Advertisment data, string right)
+        public IActionResult Index(Advertisment data, string right, string CurColId)
         {
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
             ViewBag.right = right;
             ViewBag.SysUserName = SysUserName;
             ViewBag.SysUserName = SysUserName;
+            ViewBag.CurColId = CurColId;
 
 
             string Condition = "";
             string Condition = "";
             Condition += "Title:\"" + data.Title + "\",";
             Condition += "Title:\"" + data.Title + "\",";
@@ -58,13 +59,15 @@ namespace MySystem.Areas.Admin.Controllers
         /// 广告位列表
         /// 广告位列表
         /// </summary>
         /// </summary>
         /// <returns></returns>
         /// <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>();
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("Title", "2"); //标题
             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>>;
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             foreach (Dictionary<string, object> dic in diclist)
             {
             {
@@ -81,11 +84,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 增加或修改广告位信息
         /// 增加或修改广告位信息
         /// </summary>
         /// </summary>
         /// <returns></returns>
         /// <returns></returns>
-        public IActionResult Add()
+        public IActionResult Add(string right, string CurColId)
         {
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = _accessor.HttpContext.Request.Query["right"];
             ViewBag.right = _accessor.HttpContext.Request.Query["right"];
             ViewBag.SysUserName = SysUserName;
             ViewBag.SysUserName = SysUserName;
+            ViewBag.CurColId = CurColId;
 
 
             return View();
             return View();
         }
         }
@@ -99,7 +103,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// </summary>
         /// </summary>
         /// <returns></returns>
         /// <returns></returns>
         [HttpPost]
         [HttpPost]
-        public string Add(Advertisment data)
+        public string Add(Advertisment data, string CurColId = "")
         {
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Fields.Add("Title", data.Title); //标题
             Fields.Add("Title", data.Title); //标题
@@ -127,11 +131,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 增加或修改广告位信息
         /// 增加或修改广告位信息
         /// </summary>
         /// </summary>
         /// <returns></returns>
         /// <returns></returns>
-        public IActionResult Edit(int Id = 0)
+        public IActionResult Edit(string right, string CurColId, int Id = 0)
         {
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = _accessor.HttpContext.Request.Query["right"];
             ViewBag.right = _accessor.HttpContext.Request.Query["right"];
             ViewBag.SysUserName = SysUserName;
             ViewBag.SysUserName = SysUserName;
+            ViewBag.CurColId = CurColId;
 
 
             Advertisment editData = bsdb.Advertisment.FirstOrDefault(m => m.Id == Id) ?? new Advertisment();
             Advertisment editData = bsdb.Advertisment.FirstOrDefault(m => m.Id == Id) ?? new Advertisment();
             ViewBag.data = editData;
             ViewBag.data = editData;
@@ -147,7 +152,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// </summary>
         /// </summary>
         /// <returns></returns>
         /// <returns></returns>
         [HttpPost]
         [HttpPost]
-        public string Edit(Advertisment data)
+        public string Edit(Advertisment data, string CurColId = "")
         {
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Fields.Add("Title", data.Title); //标题
             Fields.Add("Title", data.Title); //标题
@@ -183,7 +188,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 int id = int.Parse(subid);
                 string ColId = "";
                 string ColId = "";
                 Advertisment ad = bsdb.Advertisment.FirstOrDefault(m => m.Id == id);
                 Advertisment ad = bsdb.Advertisment.FirstOrDefault(m => m.Id == id);
-                if(ad != null)
+                if (ad != null)
                 {
                 {
                     ColId = ad.ColId;
                     ColId = ad.ColId;
                 }
                 }
@@ -254,7 +259,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             AddSysLog(Id.ToString(), "Advertisment", "sort");
             AddSysLog(Id.ToString(), "Advertisment", "sort");
             Advertisment ad = bsdb.Advertisment.FirstOrDefault(m => m.Id == Id);
             Advertisment ad = bsdb.Advertisment.FirstOrDefault(m => m.Id == Id);
-            if(ad != null)
+            if (ad != null)
             {
             {
                 SetRedis(ad.ColId);
                 SetRedis(ad.ColId);
             }
             }

+ 6 - 5
Areas/Admin/Views/BsServer/Advertisment/Add.cshtml

@@ -2,6 +2,7 @@
     string RightInfo = ViewBag.RightInfo as string;
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
     string right = ViewBag.right as string;
     string SysUserName = ViewBag.SysUserName as string;
     string SysUserName = ViewBag.SysUserName as string;
+    string CurColId = ViewBag.CurColId as string;
 }
 }
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html>
 <html>
@@ -28,16 +29,16 @@
                     <div class="layui-form-item">
                     <div class="layui-form-item">
                         <label class="layui-form-label">标题</label>
                         <label class="layui-form-label">标题</label>
                         <div class="layui-input-block">
                         <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>
                     </div>
                     <div class="layui-form-item">
                     <div class="layui-form-item">
                         <div class="layui-inline">
                         <div class="layui-inline">
                             <label class="layui-form-label">分类</label>
                             <label class="layui-form-label">分类</label>
                             <div class="layui-input-inline">
                             <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>
                                     <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)
                                     @foreach (string key in ColDic.Keys)
                                     {
                                     {
                                         string kg = "";
                                         string kg = "";
@@ -55,7 +56,7 @@
                         <label class="layui-form-label">图片</label>
                         <label class="layui-form-label">图片</label>
                         <div class="layui-input-block">
                         <div class="layui-input-block">
                             <div class="layui-upload">
                             <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>
                                 <button class="layui-btn" type="button" id="PicPathBtn">选择图片</button>
                                 <div class="layui-inline layui-word-aux"></div>
                                 <div class="layui-inline layui-word-aux"></div>
                             </div>
                             </div>
@@ -66,7 +67,7 @@
                     <div class="layui-form-item layui-form-text">
                     <div class="layui-form-item layui-form-text">
                         <label class="layui-form-label">内容</label>
                         <label class="layui-form-label">内容</label>
                         <div class="layui-input-block">
                         <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>
                     </div>
                     <div class="layui-form-item">
                     <div class="layui-form-item">

+ 5 - 4
Areas/Admin/Views/BsServer/Advertisment/Edit.cshtml

@@ -4,6 +4,7 @@
     string RightInfo = ViewBag.RightInfo as string;
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
     string right = ViewBag.right as string;
     string SysUserName = ViewBag.SysUserName as string;
     string SysUserName = ViewBag.SysUserName as string;
+    string CurColId = ViewBag.CurColId as string;
 }
 }
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html>
 <html>
@@ -31,16 +32,16 @@
                     <div class="layui-form-item">
                     <div class="layui-form-item">
                         <label class="layui-form-label">标题</label>
                         <label class="layui-form-label">标题</label>
                         <div class="layui-input-block">
                         <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>
                     </div>
                     <div class="layui-form-item">
                     <div class="layui-form-item">
                         <div class="layui-inline">
                         <div class="layui-inline">
                             <label class="layui-form-label">分类</label>
                             <label class="layui-form-label">分类</label>
                             <div class="layui-input-inline">
                             <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>
                                     <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)
                                     @foreach (string key in ColDic.Keys)
                                     {
                                     {
                                         string kg = "";
                                         string kg = "";
@@ -59,7 +60,7 @@
                         <label class="layui-form-label">图片</label>
                         <label class="layui-form-label">图片</label>
                         <div class="layui-input-block">
                         <div class="layui-input-block">
                             <div class="layui-upload">
                             <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>
                                 <button class="layui-btn" type="button" id="PicPathBtn">选择图片</button>
                                 <div class="layui-inline layui-word-aux"></div>
                                 <div class="layui-inline layui-word-aux"></div>
                             </div>
                             </div>

+ 5 - 0
Areas/Admin/Views/BsServer/Advertisment/Index.cshtml

@@ -1,6 +1,7 @@
 @{
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
     string right = ViewBag.right as string;
+    string CurColId = ViewBag.CurColId as string;
 }
 }
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html>
 <html>
@@ -92,5 +93,9 @@
 
 
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules/Advertisment_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/layuiadmin/modules/Advertisment_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script>
+        var CurColId = '@CurColId';
+        var right = '@right';
+    </script>
 </body>
 </body>
 </html>
 </html>

+ 2 - 2
wwwroot/layuiadmin/modules/Advertisment_Admin.js

@@ -61,7 +61,7 @@ layui.config({
     //列表数据
     //列表数据
     table.render({
     table.render({
         elem: '#LAY-list-manage'
         elem: '#LAY-list-manage'
-        , url: '/Admin/Advertisment/IndexData' //模拟接口
+        , url: '/Admin/Advertisment/IndexData?CurColId=' + CurColId //模拟接口
         , cols: [[
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
@@ -208,7 +208,7 @@ layui.config({
             var perContent = layer.open({
             var perContent = layer.open({
                 type: 2
                 type: 2
                 , title: '广告位-添加'
                 , title: '广告位-添加'
-                , content: 'Add'
+                , content: 'Add?CurColId=' + CurColId
                 , maxmin: true
                 , maxmin: true
                 , area: ['500px', '450px']
                 , area: ['500px', '450px']
                 , btn: ['确定', '取消']
                 , btn: ['确定', '取消']