diff --git a/pom.xml b/pom.xml index 1ba8695eb..9ac542a40 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.44 + 1.2.45 UTF-8 diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index c8b5dcda9..eede0827c 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -85,7 +85,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo $scope.partner.sameAsAddress = false; $scope.partner.partner_type = $scope.partner.company_website ? 'website' : 'photo'; - if ($scope.partner.representativeInfo.phone) { + if ($scope.partner.representativeInfo && $scope.partner.representativeInfo.phone) { $scope.partner.representativeInfo.phone = $scope.partner.representativeInfo.phone.substring(1, $scope.partner.contact_phone.length); } $scope.getMerchantLocation = function () { @@ -321,7 +321,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo }; //修改邮箱 $scope.updateEmail = function () { - $http.put('/client/partner_info/complianceAudit').then( + $http.put('/client/partner_info/compliance_audit').then( ); }; @@ -355,7 +355,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo }).then(function (choice) { $scope.submitted = true; if (choice == 1) { - $http.post('/client/partner_info/complianceAudit').then(function () { + $http.post('/client/partner_info/compliance_audit').then(function () { commonDialog.alert({title: 'Success', content: '已提交至合规,请耐心等待审核!', type: 'info'}); $state.reload(); }, function () { @@ -834,7 +834,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo $scope.commitPartner = function () { if ($scope.file) { if ($scope.file.file_bank_info != null && $scope.file.file_company_info != null && $scope.file.file_id_info != null && $scope.file_apply_info != null) { - $http.put('/client/partner_info/complianceAudit').then(function (resp) { + $http.put('/client/partner_info/compliance_audit').then(function (resp) { }); } else { @@ -1137,23 +1137,6 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo }) }) }; - - - $scope.commitPartner = function () { - if ($scope.file) { - if ($scope.file.file_bank_info != null && $scope.file.file_company_info != null && $scope.file.file_id_info != null && $scope.file_apply_info != null) { - $http.put('/client/partner_info/complianceAudit').then(function (resp) { - - }); - } else { - commitError(); - } - } else { - commitError(); - } - }; - - }]); app.controller('aggregateFileCtrl', ['$scope', '$http', '$rootScope', 'commonDialog', '$state', '$uibModal', 'Upload', function ($scope, $http, $rootScope, commonDialog, $state, $uibModal, Upload) {