From 154faf131b4cb049443ffbbf7399f214c7634368 Mon Sep 17 00:00:00 2001
From: eason <eason.qian@royalpay.com.au>
Date: Wed, 1 Aug 2018 20:10:52 +0800
Subject: [PATCH 1/2] fix

---
 src/db/modify.sql | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/db/modify.sql b/src/db/modify.sql
index 31d4cfbab..148d4c60f 100644
--- a/src/db/modify.sql
+++ b/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
 

From 624022a67d763e23cb42f18c9847632618bae426 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Thu, 2 Aug 2018 09:57:46 +0800
Subject: [PATCH 2/2] fix bug

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

diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html
index 60669f596..8f508ca71 100644
--- a/src/main/ui/merchant_application.html
+++ b/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>
diff --git a/src/main/ui/static/merchantapplication/merchant_application.js b/src/main/ui/static/merchantapplication/merchant_application.js
index 5987e3fbc..4aac3f34b 100644
--- a/src/main/ui/static/merchantapplication/merchant_application.js
+++ b/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;