Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

src/db/modify.sql

@@ -678,10 +678,9 @@ ALTER TABLE `log_client_sub_merchant_id`
 ADD COLUMN `wechat_institution_merchant_id`  varchar(6) NULL AFTER `client_id`;
 
 
-INSERT INTO `sys_configs` VALUES ('payment.ali.individual_daily_limit', null);
-INSERT INTO `sys_configs` VALUES ('payment.ali.individual_yearly_limit', null);
-INSERT INTO `sys_configs` VALUES ('payment.ali.per_order_limit', null);
-
+INSERT INTO `sys_configs` VALUES ('payment.ali.individual_daily_limit', 100000,null);
+INSERT INTO `sys_configs` VALUES ('payment.ali.individual_yearly_limit', 500000,null);
+INSERT INTO `sys_configs` VALUES ('payment.ali.per_order_limit', 10000,null);
 
 update sys_clients set contact_phone = concat('+61',contact_phone) where create_time >'2018-06-01' and source = 4
 

src/main/ui/merchant_application.html

@@ -287,9 +287,9 @@
                                     <input type="text" name="contact_phone" required ng-model="partner.contact_phone"
                                            class="form-control" style="display: inline" onkeyup="value=value.replace(/[^\d]/g,'')"
                                            placeholder="Your Phone"  maxlength="11" ng-mouseleave="checkParams()" ng-mousedown="name_exist =false">
-                                    <button ng-disabled="name_exist" type="button"  class="btn btn-success button_width" style="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>
+                                            ng-bind="description" ng-disabled="canClick||name_exist"></button>
                                 </div>
                                 <div style="text-align: left" ng-if="name_exist">
                                     <span style="text-align: left;font-size: 12px;" class="text-danger">The phone number has already existed</span>

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

@@ -160,6 +160,8 @@ angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl',
         }, function (resp) {
             if(resp.data.status+0 ==500) {
                 $interval.cancel($scope.phone_code_timer);
+                $scope.description="Send Code";
+                $scope.canClick=false;
             }
 
             $scope.resError = resp.data.message;