Merge remote-tracking branch 'origin/master'

src/main/resources/static/js/register/login.js

@@ -2,18 +2,35 @@
 $(function () {
     // 提交表单
     $('#login').click(function () {
+        var username = $("#username").val(), password = $("#password").val(),
+            code = $("#j_captcha").val();
+        if ("" == $.trim(username)) {
+            layer.msg("请输入您的账号！");
+            return;
+        }
+        if ("" == $.trim(password)) {
+            layer.msg("请输入您的密码！");
+            return;
+        }
+        if ("" == $.trim(code)) {
+            layer.msg("请输入验证码！");
+            return;
+        }
         show_loading();
         // ajax提交表单，#login_form为表单的ID。如：$('#login_form').ajaxSubmit(function(data)
         $.post("/login", {
-            "username": $("#username").val(),
-            "password": $("#password").val(),
-            "verifyCode": $("#j_captcha").val()
+            "username": username,
+            "password": password,
+            "verifyCode": code
         }, function (data) {
             var obj = eval(data);
             if (obj.code == 200) {
-                show_msg(obj.msg, "/tuiyijunren/4");
+                layer.msg(obj.msg);
+                setTimeout(function () {
+                    window.location.href = "/tuiyijunren/4";
+                }, 3000);
             } else {
-                show_err_msg(obj.msg);
+                layer.msg(obj.msg);
                 setTimeout(function () {
                     location.reload();
                 }, 3000);

src/main/resources/static/js/register/register.js

@@ -4,8 +4,16 @@ $(function () {
     $('.sqzc').click(function () {
         var username = $("input[name='username']").val(), password = $("input[name='password']").val(),
             nickname = $("input[name='nickname']").val();
-        if ("" == $.trim(username) || "" == $.trim(password) || "" == $.trim(nickname)) {
-            show_err_msg("请检查必填项！");
+        if ("" == $.trim(username)) {
+            layer.msg("请输入账号！");
+            return;
+        }
+        if ("" == $.trim(password)) {
+            layer.msg("请输入密码！");
+            return;
+        }
+        if ("" == $.trim(nickname)) {
+            layer.msg("请输入姓名！");
             return;
         }
         show_loading();
@@ -28,9 +36,12 @@ $(function () {
         }, function (data) {
             var obj = eval(data);
             if (obj.code == 200) {
-                show_msg(obj.msg, "/login");
+                layer.msg(obj.msg);
+                setTimeout(function () {
+                    window.location.href = "/login";
+                }, 3000);
             } else {
-                show_err_msg(obj.msg);
+                layer.msg(obj.msg);
                 setTimeout(function () {
                     location.reload();
                 }, 3000);

src/main/resources/templates/www/tuiyijunren/login.html

@@ -5,8 +5,8 @@
     <title>退伍军人就业创业综合服务平台</title>
     <link href="${resPath}/tuiyijunren/images/base.css" rel="stylesheet"/>
     <link href="${resPath}/tuiyijunren/images/basic.css" rel="stylesheet"/>
-    <script type="text/javascript" language="javascript"
-            src="${resPath}/tuiyijunren/images/jquery-1.7.2.min.js"></script>
+    <script src="${ctxPath}/static/layer/jquery-1.11.0.min.js"></script>
+    <script src="${ctxPath}/static/layer/layer.js"></script>
     <script src="${ctxPath}/static/js/register/login.js"></script>
     <script src="${ctxPath}/static/js/login/login_tooltips.js"></script>
 </head>

src/main/resources/templates/www/tuiyijunren/register.html

@@ -5,8 +5,8 @@
     <title>退伍军人就业创业综合服务平台</title>
     <link href="${resPath}/tuiyijunren/images/base.css" rel="stylesheet"/>
     <link href="${resPath}/tuiyijunren/images/basic.css" rel="stylesheet"/>
-    <script type="text/javascript" language="javascript"
-            src="${resPath}/tuiyijunren/images/jquery-1.7.2.min.js"></script>
+    <script src="${ctxPath}/static/layer/jquery-1.11.0.min.js"></script>
+    <script src="${ctxPath}/static/layer/layer.js"></script>
     <script src="${ctxPath}/static/js/register/register.js"></script>
     <script src="${ctxPath}/static/js/login/login_tooltips.js"></script>
 </head>