From 3739bd2dfd694499666145c705313bc0f1b7901b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?=
 <852955+jishenghua@users.noreply.gitee.com>
Date: Fri, 3 May 2019 15:53:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B3=A8=E5=86=8C=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/css/css.css                           |  19 ++++++++++++------
 .../{bg_loginmain.jpg => bg_login_main.jpg}   | Bin
 erp_web/images/bg_register_main.jpg           | Bin 0 -> 6978 bytes
 erp_web/pages/common/main.html                |   9 ++++++---
 erp_web/register.html                         |  11 +++++-----
 5 files changed, 25 insertions(+), 14 deletions(-)
 rename erp_web/images/{bg_loginmain.jpg => bg_login_main.jpg} (100%)
 create mode 100644 erp_web/images/bg_register_main.jpg

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 0000000000000000000000000000000000000000..3dfaa729514e8cdbbb991ec3eef8dcc8226bba24
GIT binary patch
literal 6978
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

literal 0
HcmV?d00001

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);
                             }