Merge branch 'master' of https://gitee.com/liuxing997/hotel-management-system

HMS/src/main/webapp/index.jsp

@@ -115,13 +115,13 @@
             <li>
                 <a href="javascript:;">
                     <i class="iconfont left-nav-li" lay-tips="维修管理">&#xe6ab;</i>
-                    <cite>维修管理</cite>
+                    <cite>代办管理</cite>
                     <i class="iconfont nav_right">&#xe697;</i></a>
                 <ul class="sub-menu">
                     <li>
                         <a onclick="xadmin.add_tab('维修列表','unicode.html')">
                             <i class="iconfont">&#xe6a7;</i>
-                            <cite>维修列表</cite></a>
+                            <cite>代办列表</cite></a>
                     </li>
                 </ul>
             </li>

HMS/src/main/webapp/login.jsp

@@ -97,9 +97,9 @@
                             window.location.href = "index.jsp";
                         });
                     }else if (data.code === -1){
-                        layer.msg('用户不存在,请重试！', {icon: 7, time: 3000});
+                        layer.msg(data.message +',请重试！', {icon: 7, time: 3000});
                     }else if (data.code === -2){
-                        layer.msg('密码错误,请重试！', {icon: 7, time: 3000});
+                        layer.msg(data.message + '密码错误,请重试！', {icon: 7, time: 3000});
                     }
                 },
                 error:function (err) {