From b713f8f1fd3bdefccf6002f866819c002c4c7310 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Wed, 30 May 2018 17:36:40 +0800
Subject: [PATCH] fix~~

---
 src/main/ui/merchant_application.html         | 24 +++++++++----------
 .../ui/static/css/merchant_application.css    | 11 ++++++---
 .../merchant_application.js                   |  2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html
index c01a9782e..e3c70ec95 100644
--- a/src/main/ui/merchant_application.html
+++ b/src/main/ui/merchant_application.html
@@ -761,27 +761,27 @@
                         </div>
                     </form>-->
                     <form ng-show="chooseArray[4]">
+                        <div class="success_img">
+                            <img height="60" width="60" src="static/images/step/gou.png">
+                        </div>
                         <div class="success_wrapper">
-                            <div class="success_img">
-                                <img height="40" width="40" src="static/images/step/gou.png">
-                            </div>
                             <div class="success_text">
-                                <div>恭喜注册成功</div>
-                                <div class="success_text2">欢迎使用RoyalPay收单服务</div>
+                                <div>Congratulations,
+                                    <br>your RoyalPay account has been registered successfully.</div>
                             </div>
                         </div>
                         <div class="success_content">
                             <div class="content_align">
-                                <div>注意事项：</div>
-                                <p>1、需要完成 合规材料的提交，具体请查看appxx菜单xx功能；</p>
-                                <p>2、在完成合规认证之前，不会对交易进行清算；</p>
-                                <p>3、账户名和密码以及相关信息已发送至账户邮箱，请妥善保护自己的密码，及时进行修改。</p>
+                                <div>Notice：</div>
+                                <p>1. As soon as you create a RoyalPay account, you can use all of RoyalPay's features, including accepting payments from customers.</p>
+                                <p>2. Before you activate your account, RoyalPay will not  execute settlement.Therefore, it is recommended that you submit your compliance materials as soon as possible.</p>
+                                <p>3. If you have any questions, you can contact our customer service.</p>
                             </div>
-                            <div class="row">
-                                <div class="col-xs-12 margin-bottom2">
+                            <div class="row" style="   margin-left: 100px; margin-right: 100px;">
+                                <div class="col-xs-12">
                                     <button type="button" id="login-btn7" class="btn btn-success btn-block btn-flat"
                                             onclick="window.location.href='/login.html'">
-                                        {{seconds}}秒后，将跳转登录页, 或点击直接跳转登录页
+                                       After {{seconds}} seconds, the system will automatically jump to the login page.
                                     </button>
                                     <div>
                                         <p ng-if="resError" style="padding: 6px 12px;font-size: 14px;"
diff --git a/src/main/ui/static/css/merchant_application.css b/src/main/ui/static/css/merchant_application.css
index cb16e9588..5ef180d56 100644
--- a/src/main/ui/static/css/merchant_application.css
+++ b/src/main/ui/static/css/merchant_application.css
@@ -116,6 +116,7 @@ body .progress_inner__step {
     text-align: center;
     position: relative;
 }
+
 body .progress_inner__step label {
     padding-top: 50px;
     top: -20px;
@@ -351,15 +352,18 @@ body .progress_inner input[type="radio"] {
 }
 .success_img{
     display: inline-block;
+    text-align: center;
+    margin-bottom: -5px;
 }
 .success_img img{
-    vertical-align: baseline;
+    vertical-align: top;
 }
 .success_text{
     text-align: left;
     display: inline-block;
     margin-left: 14px;
 }
+
 .success_text2{
     font-family: PingFangSC-Regular;
     font-size: 15px;
@@ -367,7 +371,7 @@ body .progress_inner input[type="radio"] {
     letter-spacing: 0px;
 }
 .success_content{
-    margin-top: 50px;
+    margin-top: 30px;
     font-family: PingFangSC-Regular;
     font-size: 15px;
     color: #8B919D;
@@ -375,8 +379,9 @@ body .progress_inner input[type="radio"] {
 }
 .content_align{
     margin:0 auto;
-    width:50%;
+    width:52%;
     text-align:left;
+    margin-bottom: 40px;
 }
 .margin-bottom2{
     margin-top: 120px;
diff --git a/src/main/ui/static/merchantapplication/merchant_application.js b/src/main/ui/static/merchantapplication/merchant_application.js
index b2e40927b..8ea3dc57a 100644
--- a/src/main/ui/static/merchantapplication/merchant_application.js
+++ b/src/main/ui/static/merchantapplication/merchant_application.js
@@ -55,7 +55,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
     $scope.states = angular.copy(stateMap);
     $scope.countries = angular.copy(countryMap);
     $scope.cleanDays = angular.copy(cleanDays);
-    $scope.seconds = 6;
+    $scope.seconds = 10;
     $scope.canClick=false;
     $scope.description = "Send Code";
     $scope.partner = {nation_code:"+61"};