基础信息

EheMall.Mvc/Controllers/BaseTicketMallController.cs

@@ -30,7 +30,6 @@ namespace EheMall.Mvc.Controllers
             _eventBus = EngineContext.Current.Resolve<IEventBus>();
             _logManager = EngineContext.Current.Resolve<ILogManager>();
             _auth = EngineContext.Current.Resolve<IAuthenticate>();
-            
         }
 
         public Member CurrentClient

EheMall.Mvc/EheMall.Mvc.csproj

@@ -53,7 +53,10 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -94,6 +97,9 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

EheMall.Mvc/Filters/TicketMallAuthorizeAttribute.cs

@@ -105,6 +105,7 @@ namespace EheMall.Mvc.Filters
             {
                 this.HandleUnauthorizedRequest(filterContext);
             }
+
         }
 
 

EheMall.Web/Areas/TicketMall/Content/css/main.css

@@ -666,7 +666,7 @@ select {
     cursor: pointer;
 }
 
-form-login .btn_Login:hover {
+#form-login .btn_Login:hover {
     background-color: #8c1324;
 }
 

EheMall.Web/Areas/TicketMall/Controllers/HomeController.cs

@@ -42,18 +42,11 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
             _OrderBillingService = EngineContext.Current.ResolveOptional<IOrderBillingService>();
         }
 
-
-     
-
         #region 首页
 
 
         public ActionResult NoticeShow(Guid id)
         {
-            if (CurrentClient==null)
-            {
-                return Redirect("/TicketMall/Login/Index");
-            }
             var model = _NoticeServices.Get(id);
             if (model == null)
             {
@@ -65,10 +58,6 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
 
         public ActionResult Index()
         {
-            if (CurrentClient == null)
-            {
-                return Redirect("/TicketMall/Login/Index");
-            }
             #region 通知公告
             var noticeList = _NoticeServices.GetAllList(5);
             ViewBag.noticeList = noticeList;
@@ -107,13 +96,9 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
         #region 我的账单
         public ActionResult GetTotalBillingCount(string StartTime)
         {
-            if (CurrentClient == null)
-            {
-                return Redirect("/TicketMall/Login/Index");
-            }
             JObject inputs = new JObject();
             inputs["sOrderBy"] = "CreateDate desc";
-            inputs["iBuyID"] =CurrentClient .ID.ToString();
+            inputs["iBuyID"] = CurrentClient.ID.ToString();
             IEnumerable<OrderBilling> list = _OrderBillingService.GetTotalCount(inputs);
             return Json(new { valid = true, message = "获取成功", TotalCount = list.Count() });
         }
@@ -147,12 +132,8 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
         /// <param name="iPageSize"></param>
         /// <returns></returns>
 
-        public ActionResult MyOrder()
+        public ActionResult MyOrder(string OrderState, int PageIndex = 1, int iPageSize = 10)
         {
-            if (CurrentClient == null)
-            {
-                return Redirect("/TicketMall/Login/Index");
-            }
             return View();
         }
 
@@ -238,10 +219,6 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
         /// <returns></returns>
         public ActionResult MyMessage()
         {
-            if (CurrentClient == null)
-            {
-                return Redirect("/TicketMall/Login/Index");
-            }
             return View();
         }
 
@@ -277,10 +254,6 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
         /// <returns></returns>
         public ActionResult MessageShow(Guid id)
         {
-            if (CurrentClient == null)
-            {
-                return Redirect("/TicketMall/Login/Index");
-            }
             var model = _SysMessageService.Get(id);
 
 
@@ -301,10 +274,6 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
 
         public ActionResult Aq()
         {
-            if (CurrentClient == null)
-            {
-                return Redirect("/TicketMall/Login/Index");
-            }
             return View();
         }
         #endregion
@@ -313,10 +282,6 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
         #region 帮助中心
         public ActionResult Help()
         {
-            if (CurrentClient == null)
-            {
-                return Redirect("/TicketMall/Login/Index");
-            }
             var list = _ArticleTypeService.GetAllList(0, 0);
             List<SelectListItem> objArticleTypeList = new List<SelectListItem>();
             objArticleTypeList.Add(new SelectListItem() { Text = "请选择", Value = "" });
@@ -359,10 +324,6 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
 
         public ActionResult MemberInfo()
         {
-            if (CurrentClient == null)
-            {
-                return Redirect("/TicketMall/Login/Index");
-            }
             Member member = CurrentClient;
             return View(member);
         }

EheMall.Web/Areas/TicketMall/Controllers/LoginController.cs

@@ -30,6 +30,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
         {
             if (Request.IsAjaxRequest())
             {
+
                 string sPassWord = pwd.MD5();
                 //排除锁定的用户
                 var list = _MemberService.MemberLogin(uname,sPassWord);
@@ -43,7 +44,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
                     this._auth.SignIn("MemberID", list[0].ID.ToString(), true);
                     return Redirect("/Mobile/Home");
                 }
-                return Json(new { valid = bIsExists, message = bIsExists ? "用户登录成功" : "用户名或密码错误!" });
+                return Json(new { success = bIsExists, message = bIsExists ? "用户登录成功" : "用户名或密码错误!" });
             }
             return View();
         }

EheMall.Web/Areas/TicketMall/Views/Home/Help.cshtml

@@ -87,6 +87,7 @@
                 data: { "Title": FaqTitle, "Email": ContactWay, "Content": Content, "ArticleTypeID": $("#ArticleType ").val() },
                 success: function (data) {
                     if (data.valid) {
+
                         layer.msg('反馈成功', {
                             icon: 1,//提示的样式
                             end: function () {

EheMall.Web/Areas/TicketMall/Views/Home/Index.cshtml

@@ -167,8 +167,8 @@
                      }
                         
                     },
-                    error: function () {
-                        layer.msg('请求超时，请重试', { icon: 2 });
+                error: function () {
+                    alert("请求超时，请重试！");
                 }
             });
         }
@@ -185,7 +185,7 @@
                     $("#hotcont").html(data ? data : "");
                 },
                 error: function () {
-                    layer.msg('请求超时，请重试', { icon: 2 });
+                    layer.msg('请求超时，请重试', { icon: 2 });  
                 }
             });
         };

EheMall.Web/Areas/TicketMall/Views/Login/Index.cshtml

@@ -16,11 +16,7 @@
     <meta name="description" content="芙蓉国粹" />
     <link href="/Areas/TicketMall/Content/css/public.css" rel="stylesheet" />
     <link href="/Areas/TicketMall/Content/css/main.css" rel="stylesheet" />
-    <script src="/Areas/TicketMall/Content/js/jquery.min.js"></script>
-    <script src="/Scripts/jquery.form.min.js"></script>
-    <script type="text/javascript" src="/Areas/TicketMall/Content/js/jquery.ui.js"></script>
     <script src="/Areas/TicketMall/Content/js/layer/layer.js"></script>
-    <script src="/Areas/TicketMall/Content/layui/layui.js"></script>
 </head>
 <body>
 
@@ -37,7 +33,7 @@
                 <h2>欢迎登录芙蓉国粹</h2>
                 <span>没有账号请联系客服</span>
             </div>
-            <div id="form-login">
+            <form id="form-login" name="post" action="">
                 <ul>
                     <li>
                         <input type="text" id="userid" name="userid" placeholder="请输入账户名" value="">
@@ -49,47 +45,42 @@
                         </div>
                     </li>
                 </ul>
-                <button class="btn_Login" onclick="Login()">登 录</button>
+                <a class="btn_Login" onclick="Login()">登 录</a>
 
-            </div>
+            </form>
         </div>
     </div>
 
 
+    <script src="/Areas/TicketMall/Content/js/jquery.min.js"></script>
 
 
     <script type="text/javascript">
         function Login() {
             var uname = $("#userid").val();
             if (uname == "") {
-                layer.msg('请输入账户名');
+                alert("请输入账户名");
                 return;
             }
             var pwd = $("#pwd").val();
             if (pwd == "") {
-                layer.msg('请输入密码');
+                alert("请输入密码");
                 return;
             }
-            //测试1·1111111133333444
             $.ajax({
                 type: "post",
                 url: "@Url.Action("Index")",
                 data: { "uname": uname, "pwd": pwd },
-                dataType: "json",
-                async:"false",
                 success: function (data) {
-                    if (data.valid) {
-                        layer.msg(data.message, {
-                            icon: 1,//提示的样式
-                            end: function () {
-                                location.href = "/TicketMall/Home";
-                            }
-                        });
+                    if (data == "1") {
+                        alert("账号或密码不正确");
+                        return;
+                    } else if (data == "2") {
+                        alert("账号已被禁用，禁止登陆");
+                        return;
+                    } else {
+                        location.href = "/TicketMall/Home";
                     }
-                    else {
-                        layer.msg(data.message, { icon: 2 });
-                    }
-
                 }
             });
         }