diff --git a/erp_web/css/css.css b/erp_web/css/css.css
index 8e01aa8c..8ebc7c1a 100644
--- a/erp_web/css/css.css
+++ b/erp_web/css/css.css
@@ -636,10 +636,10 @@ input.inputstyle:hover{
 	background:#EAF2FD;
 	z-index:90;
 }
-#login_body{
+#login_body,#register_body{
 	background:#93bbe5 url(../images/bg_login.jpg) top center no-repeat;
 }
-#login_main{
+#login_main,#register_main{
 	width:459px;
 	overflow:hidden;
 	margin:160px auto 0 auto;
@@ -649,7 +649,14 @@ input.inputstyle:hover{
 	height:263px;
 	overflow:hidden;
 	position:relative;
-	background:url(../images/bg_loginmain.jpg) no-repeat;
+	background:url(../images/bg_login_main.jpg) no-repeat;
+}
+#register{
+	width:459px;
+	height:300px;
+	overflow:hidden;
+	position:relative;
+	background:url(../images/bg_register_main.jpg) no-repeat;
 }
 #login .login_btn{
 	float:left;
@@ -657,13 +664,13 @@ input.inputstyle:hover{
 	height:50px;
 	margin:160px auto 0 120px;
 }
-#login .register_btn{
+#register .register_btn{
 	float:left;
 	width:230px;
 	height:50px;
-	margin:218px auto 0 120px;
+	margin:228px auto 0px 120px;
 }
-#login_signal{
+#login_signal,#register_signal{
 	position:absolute;
 	left: 63px;
 	top: 19px;
diff --git a/erp_web/images/bg_loginmain.jpg b/erp_web/images/bg_login_main.jpg
similarity index 100%
rename from erp_web/images/bg_loginmain.jpg
rename to erp_web/images/bg_login_main.jpg
diff --git a/erp_web/images/bg_register_main.jpg b/erp_web/images/bg_register_main.jpg
new file mode 100644
index 00000000..3dfaa729
Binary files /dev/null and b/erp_web/images/bg_register_main.jpg differ
diff --git a/erp_web/pages/common/main.html b/erp_web/pages/common/main.html
index 90ec09ad..f4ee2a2c 100644
--- a/erp_web/pages/common/main.html
+++ b/erp_web/pages/common/main.html
@@ -105,9 +105,12 @@
         });
 
         $('#loginOut').click(function () {
-            if (confirm("确认要退出系统吗？"))
-                sessionStorage.removeItem("userId");
-                location.href = '/user/logout';
+            $.messager.confirm("提示","确认要退出系统吗？",function(r){
+                if(r) {
+                    sessionStorage.removeItem("userId");
+                    location.href = '/user/logout';
+                }
+            });
         })
         //IE下禁止选中
         document.body.onselectstart = document.body.ondrag = function () {
diff --git a/erp_web/register.html b/erp_web/register.html
index 636853a9..6cb00a0a 100644
--- a/erp_web/register.html
+++ b/erp_web/register.html
@@ -12,10 +12,10 @@
     <script type="text/javascript" src="/js/md5/md5.js"></script>
     <script type="text/javascript" src="/js/gVerify.js"></script>
 </head>
-<body id="login_body">
-<div id="login_main">
-    <div id="login">
-        <p id="login_signal"><img src="/images/register_tip.jpg" width="108" height="29" alt="login"/></p>
+<body id="register_body">
+<div id="register_main">
+    <div id="register">
+        <p id="register_signal"><img src="/images/register_tip.jpg" width="108" height="29" alt="login"/></p>
         <p id="txt_username">
             <label for="user_name">用户名：</label>
         </p>
@@ -73,7 +73,8 @@
                         }),
                         success: function (res) {
                             if (res && res.code === 200) {
-                                alert("注册成功！");
+                                alert("注册成功，请进行登录！");
+                                location.href = "login.html";
                             } else {
                                 alert(res.msg);
                             }
