From 74a59a1bd3b7e4e9b81b460baa7decc07a62fc8c Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Fri, 25 May 2018 18:08:15 +0800
Subject: [PATCH] fix~

---
 src/main/ui/merchant_application.html         | 33 ++++++++++++++-----
 .../merchant_application.js                   |  2 +-
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html
index 5f1162c0a..e3946a6ca 100644
--- a/src/main/ui/merchant_application.html
+++ b/src/main/ui/merchant_application.html
@@ -70,6 +70,16 @@
             body .step_show {
                 display: none;
             }
+            .button_width{
+                width: 20%;
+            }
+            .input-group .form-control{
+                position: relative;
+                z-index: 2;
+                float: left;
+                width: 80%;
+                margin-bottom: 0;
+            }
         }
 
         @media (max-width: 544px) {
@@ -83,16 +93,21 @@
             body .step_show {
                 display: block;
             }
+            .button_width{
+                width: 35%;
+            }
+            .input-group .form-control{
+                position: relative;
+                z-index: 2;
+                float: left;
+                width: 65%;
+                margin-bottom: 0;
+            }
 
             .register-box {
                 width: 89%;
             }
 
-            @media (min-width:1200px) {
-                .register-box {
-                    margin-top: 30%;
-                }
-            }
 
         }
 
@@ -269,14 +284,14 @@
                                 <div class="input-group">
                                     <span class="input-group-addon">+61</span>
                                     <input type="text" name="contact_phone" required ng-model="partner.contact_phone"
-                                           class="form-control" style="width: 80%;display: inline"
+                                           class="form-control" style="display: inline"
                                            placeholder="Your Phone">
-                                    <button type="button"  class="btn btn-success" style="width:20%;display:inline;height: 34px;float: right;border-radius: 0px"
+                                    <button type="button"  class="btn btn-success button_width" style="display:inline;height: 34px;float: right;border-radius: 0px"
                                             title="发送验证码" ng-click="sendVerificationCode()"
                                             ng-bind="description" ng-disabled="canClick"></button>
                                 </div>
                                 <div style="text-align: left">
-                                    <p style="text-align: left;font-size: 12px;color: grey">phone number is also your login id</p>
+                                    <span style="text-align: left;font-size: 12px;" class="text-info">phone number is also your login id</span>
                                 </div>
                             </div>
                         </div>
@@ -292,7 +307,7 @@
                             <input type="password" class="form-control" ng-model="partner.password" placeholder="Password" required
                                    minlength="6"   maxlength="12" name="password">
                             <div style="text-align: left">
-                                <p style="text-align: left;font-size: 12px;color: grey">6~12个字符，区分大小写</p>
+                                <span style="text-align: left;font-size: 12px;" class="text-info">6 to 12 characters, case sensitive</span>
                             </div>
                         </div>
 
diff --git a/src/main/ui/static/merchantapplication/merchant_application.js b/src/main/ui/static/merchantapplication/merchant_application.js
index a926beb0b..a116fb8fc 100644
--- a/src/main/ui/static/merchantapplication/merchant_application.js
+++ b/src/main/ui/static/merchantapplication/merchant_application.js
@@ -104,7 +104,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
             if(second<=0){
                 $interval.cancel(timerHandler);
                 second=59;
-                $scope.description="获取验证码";
+                $scope.description="Send Code";
                 $scope.canClick=false;
             }else{
                 $scope.description=second+"s后重发";