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 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 @@ - + ng-bind="description" ng-disabled="canClick||name_exist">
The phone number has already existed 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;