Merge branch 'master' of http://gitlab.oytour.com/chun/theater

# Conflicts:
#	EheMall.Web/Areas/TicketMall/Views/Login/Index.cshtml

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

@@ -70,6 +70,7 @@
                 layer.msg('请输入密码');
                 return;
             }
+            //测试1·11111
             $.ajax({
                 type: "post",
                 url: "@Url.Action("Index")",