DuGuYang 3 лет назад
Родитель
Сommit
17d1352f61

+ 3 - 3
Areas/Admin/Controllers/MainServer/LeadersController.cs

@@ -84,7 +84,7 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                     }
                     Ids = Ids.TrimEnd(',');
-                    condition += " and Id in (" + Ids + ")";
+                    condition += " and UserId in (" + Ids + ")";
                 }
                 else
                 {
@@ -135,7 +135,7 @@ namespace MySystem.Areas.Admin.Controllers
                     }
                 }
                 Ids = Ids.TrimEnd(',');
-                condition += " and Id in (" + Ids + ")";
+                condition += " and UserId in (" + Ids + ")";
             }
 
 
@@ -162,7 +162,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     dic["LeaderStatus"] = "已过期";
                 }
-                dic["LeaderTimeOutDate"] = userRankWhite.UpdateDate;
+                dic["LeaderTimeOutDate"] = userRankWhite.UpdateDate == null ? "": userRankWhite.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 dic.Remove("UserId");
                 //盟主等级
                 int LeaderLevel = int.Parse(dic["LeaderLevel"].ToString());

+ 2 - 2
Areas/Admin/Views/MainServer/Leaders/Index.cshtml

@@ -60,14 +60,14 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">最后购买时间</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" readonly name="UpateDateData" id="CreateDate"
+                            <input class="layui-input" type="text" readonly name="UpateDateData" id="UpateDateData"
                                 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" readonly name="LeaderTimeOutDateData" id="CreateDate"
+                            <input class="layui-input" type="text" readonly name="LeaderTimeOutDateData" id="LeaderTimeOutDateData"
                                 placeholder="" autocomplete="off">
                         </div>
                     </div>

+ 56 - 0
wwwroot/layuiadmin/modules_main/Leaders_Admin.js

@@ -58,6 +58,62 @@ layui.config({
         }
     });
 
+    var layUpateDateData = laydate.render({
+        elem: '#UpateDateData',
+        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;
+                    layUpateDateData.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layUpateDateData.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#UpateDateData').val(value);
+            }
+        }
+    });
+
+    var layLeaderTimeOutDateData = laydate.render({
+        elem: '#LeaderTimeOutDateData',
+        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;
+                    layLeaderTimeOutDateData.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layLeaderTimeOutDateData.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#LeaderTimeOutDateData').val(value);
+            }
+        }
+    });
+
 
     //excel导入
     excel = layui.excel;