diff --git a/src/main/ui/login.html b/src/main/ui/login.html index b164924f9..b3b1a4de0 100644 --- a/src/main/ui/login.html +++ b/src/main/ui/login.html @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ - + -
+
-

+

-

Easy Business,Easy Payment

-
diff --git a/src/main/ui/login_v1.html b/src/main/ui/login_v1.html new file mode 100644 index 000000000..b164924f9 --- /dev/null +++ b/src/main/ui/login_v1.html @@ -0,0 +1,374 @@ + + + + + + + + + + + + + + + + + + + + + + + RoyalPay | Sign in + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + diff --git a/src/main/ui/m_login.html b/src/main/ui/m_login.html index 52841f779..07f55f910 100644 --- a/src/main/ui/m_login.html +++ b/src/main/ui/m_login.html @@ -1,5 +1,5 @@ - + @@ -30,70 +30,158 @@ - + - - - -
+ + + + + + + + + + + + + + +
+ + + @@ -162,26 +250,53 @@ $(this).attr("src", "/global/userstatus/captcha-login?" + Math.floor(Math.random() * 100)); }); + var ua = navigator.userAgent.toLowerCase(); + if (ua.indexOf('micromessenger') >= 0) { + $('#wechat-btn-div').show(); + $('#app-btn').hide(); + $('#wechat-btn').click(function () { + location.href = '/global/userstatus/partner_signin_wechat'; + }); + } + + $('#app-btn').click(function () { + if ($('#qrdiv').is(":visible")) { + $('#app-btn').attr('class', 'qrcode-target qrcode-target-show'); + $('#loginForm').show(); + $('#qrdiv').hide(); + return; + } + if ($('#qrdiv').is(":hidden")) { + $('#app-btn').attr('class', 'qrcode-target qrcode-target-hide'); + getNewQRCode(); + } + }); + + function getNewQRCode() { + $.ajax({ + url: '/global/userstatus/manager_signin_wechat_qrcode', + method: 'get', + dataType: 'json', + success: function (data) { + $('#qrimgdev').attr('src', data.code_img); + $('#qrdiv').show(); + $('#loginForm').hide(); + setTimeout(function () { + checkQRStatus(data.code_id) + }, 2000); + }, + error: function (jqXHR) { + alert(jqXHR.responseJSON.message); + } + }) + } + $('#wechat-btn').click(function () { var ua = navigator.userAgent.toLowerCase(); if (ua.indexOf('micromessenger') >= 0) { location.href = '/global/userstatus/manager_signin_wechat' } else { - $.ajax({ - url: '/global/userstatus/manager_signin_wechat_qrcode', - method: 'get', - dataType: 'json', - success: function (data) { - $('#qrmodal').find('img#qrimg').attr('src', data.code_img); - $('#qrmodal').show(); - setTimeout(function () { - checkQRStatus(data.code_id) - }, 2000); - }, - error: function (jqXHR) { - alert(jqXHR.responseJSON.message); - } - }) + getNewQRCode(); } }); $('#qrmodal').click(function () { diff --git a/src/main/ui/m_login_v1.html b/src/main/ui/m_login_v1.html new file mode 100644 index 000000000..52841f779 --- /dev/null +++ b/src/main/ui/m_login_v1.html @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + RoyalPay | 管理登录 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/ui/static/css/login.css b/src/main/ui/static/css/login.css new file mode 100644 index 000000000..bd66ebaa2 --- /dev/null +++ b/src/main/ui/static/css/login.css @@ -0,0 +1,253 @@ +/***login***/ + +@media (min-width: 768px) { + + .login-box-right { + width: 42.2%; + height: 100%; + background-color: black; + opacity: 0.8; + position: relative; + left: 57.8% + } + + .login-page-bg { + + width: 100%; + height: 100%; + background-color: #d2d6de; + background: url(../images/bg2.png); + /*background: url(../images/logonbg.jpg) ;*/ + position: relative; + background-size: 100% 100%; + } + + .login-container { + text-align: center; + } + + .ad { + text-align: center; + font-size: 20px; + color: #FFFFFF; + } + + .qrdiv { + width: 50%; + margin-left: 26%; + color: #FFFFFF; + } + + .form { + padding: 4% 25% + } + + .login-box-bg { + /*background-color: rgba(255,255,255,0.5);*/ + /*box-shadow: 0px 2px 20px 2px rgba(0, 0, 0, 0.3);*/ + /*filter: alpha(opacity=40);*/ + /*opacity: 0.8;*/ + + } + .login-info{ + /*height: 45px;*/ + background-color: black; + font-size: 18px; + color: white; + } + + .captcha { + width: 30%; + display: inline; + height: 34px; + float: right + } + + .login-submit{ + background-color: #f06010; + font-size: 18px; + } + + .login-submit-margin{ + margin-top: 10%; + } + + + .forget{ + color: #f06010; + font-size: 18px; + } + + .download-app{ + color: #FFFFFF; + font-size: 15px; + } + + .download-app img{ + width: 100px; + } + + .divloginbox { + animation: loginbox 1s; + -moz-animation: loginbox 1s; + -webkit-animation: loginbox 1s; + -o-animation: loginbox 1s; + } + + @keyframes loginbox { + from { + margin-right: -30% + } + to { + margin-right: 35% + } + } + + @-moz-keyframes loginbox { + from { + margin-right: -30% + } + to { + margin-right: 35% + } + } + + @-webkit-keyframes loginbox { + from { + margin-right: -30% + } + to { + margin-right: 35% + } + } + + @-o-keyframes loginbox { + from { + margin-right: -30% + } + to { + margin-right: 35% + } + } + +} + +@media (max-width: 768px) { + .login-page-bg { + background: url(''); + background-color: #d2d6de; + } + + .login-box-right { + margin-top: 20%; + margin: 7% auto; + width: 90%; + } + + .login-box-bg { + /*background-color: rgba(255,255,255,0.5);*/ + box-shadow: 0px 2px 20px 2px rgba(0, 0, 0, 0.3); + filter: alpha(opacity=40); + opacity: 0.7; + + } + + .login-container { + text-align: center; + background: #fff; + padding: 20px; + border-top: 0; + color: #666; + } + + .ad { + text-align: center; + font-size: 20px; + color: #000000; + } + + .qrdiv { + width: 50%; + margin-left: 26%; + } + + .form { + } + + .login-info{ + } + + .captcha { + width: 30%; + display: inline; + height: 34px; + float: right + } + + .login-submit{ + background-color: #f06010; + } + + .login-submit-margin{ + margin-bottom: 20px; + margin-top:20px; + } + + .forget{ + } + + .download-app{ + color: #000000; + font-size: 15px; + } + + .download-app img{ + width: 50px; + } + + .divloginbox { + animation: loginboxtop 1s; + -moz-animation: loginboxtop 1s; + -webkit-animation: loginboxtop 1s; + -o-animation: loginboxtop 1s; + } + + @keyframes loginboxtop { + from { + margin-top: 0 + } + to { + margin-top: 20% + } + } + + @-moz-keyframes loginboxtop { + from { + margin-top: 0 + } + to { + margin-top: 20% + } + } + + @-webkit-keyframes loginboxtop { + from { + margin-top: 0 + } + to { + margin-top: 20% + } + } + + @-o-keyframes loginboxtop { + from { + margin-top: 0 + } + to { + margin-top: 20% + } + } + +} + +/***login***/ diff --git a/src/main/ui/static/css/m_login.css b/src/main/ui/static/css/m_login.css new file mode 100644 index 000000000..0753dfb38 --- /dev/null +++ b/src/main/ui/static/css/m_login.css @@ -0,0 +1,215 @@ +/***login***/ + +@media (min-width: 768px) { + .login-container { + width: 800px; + margin: 12% auto; + margin-bottom: 0; + } + + .login-info{ + background-color: black; + opacity: 0.8; + color: white; + border-radius:4px + } + + .login-box-right { + margin-right: 35%; + } + + .login-page-bg { + + width: 100%; + height: 100%; + background-color: #d2d6de; + background: url(../images/bg3.png); + /*background: url(../images/logonbg.jpg) ;*/ + position: relative; + background-size: 100% 100%; + } + + .login-box-bg { + /*background-color: rgba(255,255,255,0.5);*/ + /*box-shadow: 0px 2px 20px 2px rgba(0, 0, 0, 0.3);*/ + filter: alpha(opacity=40); + opacity: 0.8; + + } + + .ad { + text-align: center; + font-size: 20px; + color: #FFFFFF; + } + + .login-submit{ + background-color: #54C7FF; + border-color: #54C7FF; + margin-top: 10%; + color: white; + } + + .qrdiv { + color: #FFFFFF; + } + + .login-submit-margin{ + margin-top: 45%; + color: #FFFFFF; + } + + .download-app { + font-size: 15px; + } + + .download-app img{ + width: 100px; + } + + .divloginbox { + animation: loginbox 1s; + -moz-animation: loginbox 1s; + -webkit-animation: loginbox 1s; + -o-animation: loginbox 1s; + } + + @keyframes loginbox { + from { + margin-right: -30% + } + to { + margin-right: 35% + } + } + + @-moz-keyframes loginbox { + from { + margin-right: -30% + } + to { + margin-right: 35% + } + } + + @-webkit-keyframes loginbox { + from { + margin-right: -30% + } + to { + margin-right: 35% + } + } + + @-o-keyframes loginbox { + from { + margin-right: -30% + } + to { + margin-right: 35% + } + } + +} + +@media (max-width: 768px) { + .login-container { + width: 90%; + margin: 7% auto; + } + + .login-info{ + } + + .login-page-bg { + background: url(''); + background-color: #d2d6de; + } + + .login-box-right { + margin-top: 20%; + margin-right: auto; + } + + .login-box-bg { + /*background-color: rgba(255,255,255,0.5);*/ + box-shadow: 0px 2px 20px 2px rgba(0, 0, 0, 0.3); + filter: alpha(opacity=40); + opacity: 0.7; + background-color: white; + + } + + .login-submit{ + background-color: #e08e0b; + border-color: #e08e0b; + } + + .ad { + text-align: center; + font-size: 20px; + color: #000000; + } + + .qrdiv { + color: #000000; + } + + .login-submit-margin{ + margin-top: 10%; + } + + .download-app { + font-size: 15px; + } + + .download-app img{ + width: 50px; + } + + .divloginbox { + animation: loginboxtop 1s; + -moz-animation: loginboxtop 1s; + -webkit-animation: loginboxtop 1s; + -o-animation: loginboxtop 1s; + } + + @keyframes loginboxtop { + from { + margin-top: 0 + } + to { + margin-top: 20% + } + } + + @-moz-keyframes loginboxtop { + from { + margin-top: 0 + } + to { + margin-top: 20% + } + } + + @-webkit-keyframes loginboxtop { + from { + margin-top: 0 + } + to { + margin-top: 20% + } + } + + @-o-keyframes loginboxtop { + from { + margin-top: 0 + } + to { + margin-top: 20% + } + } + +} + +/***login***/ diff --git a/src/main/ui/static/images/Bitmap.png b/src/main/ui/static/images/Bitmap.png new file mode 100644 index 000000000..6a89dd7dc Binary files /dev/null and b/src/main/ui/static/images/Bitmap.png differ diff --git a/src/main/ui/static/images/Bitmap1.png b/src/main/ui/static/images/Bitmap1.png new file mode 100644 index 000000000..cd365d3b6 Binary files /dev/null and b/src/main/ui/static/images/Bitmap1.png differ diff --git a/src/main/ui/static/images/bg2.png b/src/main/ui/static/images/bg2.png new file mode 100644 index 000000000..c333fc297 Binary files /dev/null and b/src/main/ui/static/images/bg2.png differ diff --git a/src/main/ui/static/images/bg3.png b/src/main/ui/static/images/bg3.png new file mode 100644 index 000000000..c371f4b5e Binary files /dev/null and b/src/main/ui/static/images/bg3.png differ diff --git a/src/main/ui/static/images/rp_login_logo.png b/src/main/ui/static/images/rp_login_logo.png new file mode 100644 index 000000000..30c593655 Binary files /dev/null and b/src/main/ui/static/images/rp_login_logo.png differ