暂存

Areas/Admin/Controllers/HomeController.cs

@@ -149,60 +149,60 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string Login(string UserName, string Pwd, string CheckCode)
         {
-            string result = "";
-            if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
-            {
-                result = "验证码错误!!";
-            }
-            else
-            {
-                Pwd = function.MD5_32(Pwd);
-                var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-                if (user != null)
-                {
-                    user.LastLoginDate = DateTime.Now;
-                    db.SaveChanges();
-                    function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-                    int RoleId = int.Parse(function.CheckInt(user.Role));
-                    BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-                    string RightInfo = function.CheckNull(Role.RightInfo);
-                    function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-                    string UserId = user.Id.ToString();
-                    function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-                    function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-                    result = "success";
-                }
-                else
-                {
-                    result = "用户名或密码错误";
-                }
-            }
-
             // string result = "";
-            // Pwd = function.MD5_32(Pwd);
-            // var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-            // if (user != null)
+            // if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
             // {
-            //     user.LastLoginDate = DateTime.Now;
-            //     db.SaveChanges();
-            //     function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-            //     int RoleId = int.Parse(function.CheckInt(user.Role));
-            //     BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-            //     string RightInfo = function.CheckNull(Role.RightInfo);
-            //     function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-            //     string UserId = user.Id.ToString();
-            //     function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-            //     function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-            //     result = "success";
+            //     result = "验证码错误!!";
             // }
             // else
             // {
-            //     result = "用户名或密码错误";
+            //     Pwd = function.MD5_32(Pwd);
+            //     var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            //     if (user != null)
+            //     {
+            //         user.LastLoginDate = DateTime.Now;
+            //         db.SaveChanges();
+            //         function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+            //         int RoleId = int.Parse(function.CheckInt(user.Role));
+            //         BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+            //         string RightInfo = function.CheckNull(Role.RightInfo);
+            //         function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+            //         string UserId = user.Id.ToString();
+            //         function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+            //         function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+            //         result = "success";
+            //     }
+            //     else
+            //     {
+            //         result = "用户名或密码错误";
+            //     }
             // }
+
+            string result = "";
+            Pwd = function.MD5_32(Pwd);
+            var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            if (user != null)
+            {
+                user.LastLoginDate = DateTime.Now;
+                db.SaveChanges();
+                function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+                int RoleId = int.Parse(function.CheckInt(user.Role));
+                BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+                string RightInfo = function.CheckNull(Role.RightInfo);
+                function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+                string UserId = user.Id.ToString();
+                function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+                function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+                result = "success";
+            }
+            else
+            {
+                result = "用户名或密码错误";
+            }
             return result;
         }
         #endregion

Areas/Admin/Controllers/MainServer/ProductsController.cs

@@ -135,9 +135,9 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("IsRecommend", data.IsRecommend); //推荐
             Fields.Add("IsRecommend2", data.IsRecommend2);
             Fields.Add("IsRecommend3", data.IsRecommend3);
-            // Fields.Add("StartDate", data.StartDate); //开始时间
-            // Fields.Add("EndDate", data.EndDate); //结束时间
-            Fields.Add("StartDate", DateTime.Now); //开始时间
+            Fields.Add("StartDate", data.StartDate); //上架时间
+            Fields.Add("EndDate", data.EndDate); //下架时间
+            // Fields.Add("StartDate", DateTime.Now); //开始时间
             Fields.Add("EndDate", data.EndDate); //下架时间
             Fields.Add("IsLimit", data.IsLimit); //限时抢购
             Fields.Add("SourcePrice", data.SourcePrice); //原价
@@ -215,9 +215,9 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("IsRecommend", data.IsRecommend); //推荐
             Fields.Add("IsRecommend2", data.IsRecommend2);
             Fields.Add("IsRecommend3", data.IsRecommend3);
-            // Fields.Add("StartDate", data.StartDate); //开始时间
-            // Fields.Add("EndDate", data.EndDate); //结束时间
+            Fields.Add("StartDate", data.StartDate); //上架时间
             Fields.Add("EndDate", data.EndDate); //下架时间
+            // Fields.Add("StartDate", DateTime.Now); //开始时间
             Fields.Add("IsLimit", data.IsLimit); //限时抢购
             Fields.Add("SourcePrice", data.SourcePrice); //原价
             Fields.Add("Price", data.Price); //价格

Areas/Admin/Views/Home/Login.cshtml

@@ -26,11 +26,11 @@
                     <label for="password">密码 / Password</label>
                     <input class="form-input" type="password" name="Pwd" id="Pwd" onKeyUp="if(event.keyCode==13){$('#CheckCode').focus();}" placeholder="请填写密码">
                 </div>
-                <div class="form-group pb10">
+                @* <div class="form-group pb10">
                     <label for="password">验证码 / Verification</label>
                     <input class="form-input" type="text" name="CheckCode" id="CheckCode" onkeyup="if(event.keyCode==13){syslogin();}" placeholder="请填写验证码" style="width: 70%; display: inline-block; margin-right: 2%">
                     <img src="/Api/PublicMethod/CheckCode" onclick="$(this).attr('src','/Api/PublicMethod/CheckCode?r='+Math.random())" style="width: 26%; height:38px;" />
-                </div>
+                </div> *@
                 @*<div class="form-group pb10 cf">
                         <label class="remembermetext fl" for="rememberme">
                             <input type="checkbox" checked name="rememberme">&nbsp;记住我的登录

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

@@ -98,10 +98,16 @@
                             <input class="layui-input" type="text" id="PublishDate" name="PublishDate" lay-verify="" autocomplete="off" placeholder="请输入上架时间">
                         </div>
                     </div> *@
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">上架时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" id="StartDate" name="StartDate" lay-verify="required" autocomplete="off" placeholder="请输入上架时间">
+                        </div>
+                    </div>
                     <div class="layui-form-item">
                         <label class="layui-form-label">下架时间</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" id="EndDate" name="EndDate" lay-verify="" autocomplete="off" placeholder="请输入下架时间">
+                            <input class="layui-input" type="text" id="EndDate" name="EndDate" lay-verify="required" autocomplete="off" placeholder="请输入下架时间">
                         </div>
                     </div>
                     <div class="layui-form-item">

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

@@ -100,10 +100,16 @@
                             <input class="layui-input" type="text" id="PublishDate" name="PublishDate" value="@(editData.PublishDate == null ? "" : editData.PublishDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off" placeholder="请输入上架时间">
                         </div>
                     </div> *@
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">上架时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" id="StartDate" name="StartDate" value="@(editData.StartDate == null ? "" : editData.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off" placeholder="请输入上架时间">
+                        </div>
+                    </div>
                     <div class="layui-form-item">
                         <label class="layui-form-label">下架时间</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" id="EndDate" name="EndDate" value="@(editData.EndDate == null ? "" : editData.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off" placeholder="请输入上架时间">
+                            <input class="layui-input" type="text" id="EndDate" name="EndDate" value="@(editData.EndDate == null ? "" : editData.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off" placeholder="请输入下架时间">
                         </div>
                     </div>
                     <div class="layui-form-item">