From d9a6af58bbe300157e4ab4d26e630b3d2c6bc27c Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Mon, 28 May 2018 16:30:14 +0800
Subject: [PATCH] update

---
 src/main/ui/merchant_application.html                     | 1 +
 .../ui/static/merchantapplication/merchant_application.js | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html
index acaa3d2be..95bfeedfd 100644
--- a/src/main/ui/merchant_application.html
+++ b/src/main/ui/merchant_application.html
@@ -285,6 +285,7 @@
                                     <span class="input-group-addon">+61</span>
                                     <input type="text" name="contact_phone" required ng-model="partner.contact_phone"
                                            class="form-control" style="display: inline"
+                                           maxlength="15"
                                            placeholder="Your Phone">
                                     <button type="button"  class="btn btn-success button_width" style="display:inline;height: 34px;float: right;border-radius: 0px"
                                             title="发送验证码" ng-click="sendVerificationCode()"
diff --git a/src/main/ui/static/merchantapplication/merchant_application.js b/src/main/ui/static/merchantapplication/merchant_application.js
index 6a7eedae5..f8eb0059c 100644
--- a/src/main/ui/static/merchantapplication/merchant_application.js
+++ b/src/main/ui/static/merchantapplication/merchant_application.js
@@ -1,4 +1,4 @@
-angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl', ['$scope', '$http','$interval','$timeout', function ($scope, $http,$interval,$timeout) {
+angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl', ['$scope', '$http','$interval', function ($scope, $http,$interval) {
     var countryMap = [{
         "label": "AUS",
         "value": "AUS"
@@ -61,7 +61,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
     $scope.partner = {nation_code:"+61"};
     $scope.bankaccount = {};
     $scope.rate = {};
-    $scope.phone_code_timer=$timeout(function () {}, 0);
+    $scope.phone_code_timer=$interval(function () {}, 1000);
 
     $scope.loadRoyalpayindustry = function () {
         $http.get('/static/data/royalpayindustry.json').then(function (resp) {
@@ -102,7 +102,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
     };
     $scope.sendPhoneCodeTime = function(){
         var second=59;
-        $scope.phone_code_timer = $timeout(function () {
+        $scope.phone_code_timer = $interval(function () {
             if(second<=0){
                 $interval.cancel(timerHandler);
                 second=59;
@@ -141,7 +141,7 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
         $scope.sendPhoneCodeTime();
         $http.post('/register/info/phone/'+ $scope.partner.contact_phone +'/verify?nation_code='+$scope.partner.nation_code).then(function (resp) {
         }, function (resp) {
-            $timeout.cancel($scope.phone_code_timer);
+            $interval.cancel($scope.phone_code_timer);
             $scope.resError = resp.data.message;
         });
     };