Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/ui/merchant_application.html

@@ -524,7 +524,7 @@
                         <div class="row">
                             <div class="col-xs-12 margin-bottom">
                                 <button type="button" class="btn btn-success btn-block btn-flat"
-                                        ng-click="saveApplyInfo(cleanForm,4)" ng-disabled="cleanForm.$invalid || !partner.agree" >Submit
+                                        ng-click="saveApplyInfo(cleanForm,4)" ng-disabled="cleanForm.$invalid || !partner.agree || submit" >Submit<span ng-if="submit"  class="dotting"></span>
                                 </button>
                                 <div>
                                     <p ng-if="resError" style="padding: 6px 12px;font-size: 14px;"

src/main/ui/static/css/merchant_application.css

@@ -469,3 +469,22 @@ body .dis_before:nth-child(5):before {
 }*/
 
 
+.dotting {
+    display: inline-block; width: 10px; min-height: 2px;
+    padding-right: 2px;
+    border-left: 2px solid currentColor; border-right: 2px solid currentColor;
+    background-color: currentColor; background-clip: content-box;
+    box-sizing: border-box;
+    animation: dot 4s infinite step-start both;
+}
+.dotting:before { content: '...'; } /* IE8 */
+.dotting::before { content: ''; }
+:root .dotting { margin-left: 2px; padding-left: 2px; } /* IE9+ */
+
+@keyframes dot {
+    25% { border-color: transparent; background-color: transparent; }          /* 0个点 */
+    50% { border-right-color: transparent; background-color: transparent; }    /* 1个点 */
+    75% { border-right-color: transparent; }                                   /* 2个点 */
+}
+
+

src/main/ui/static/merchantapplication/merchant_application.js

@@ -259,6 +259,9 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
             return;
         }
         $scope.initParam();
+        if(index == 4){
+            $scope.submit = true;
+        }
         $http.post('/register/info/update/' + $scope.partner.username, $scope.partner).then(function (resp) {
             if (index == 3) {
                 $scope.getRateConfig();