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 @@
+61 -
-

phone number is also your login id

+ phone number is also your login id
@@ -292,7 +307,7 @@
-

6~12个字符,区分大小写

+ 6 to 12 characters, case sensitive
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后重发";