diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index c613fa0fb..a934153a5 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -5689,8 +5689,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter // $scope.hideMerchantInfo = function () { // $scope.showMoreMerchantInfo = !$scope.showMoreMerchantInfo; // }; - $scope.updateSubMerchantId = function (merchant_app_id) { - $uibModal.open({ + $scope.updateSubMerchantId = function (sub_merchant_id) { + angular.forEach($scope.subMerchantInfos, function (each) { + if(sub_merchant_id==each.sub_merchant_id){ + $scope.merchant_app_id=each.merchant_app_id; + } + }); + $uibModal.open({ templateUrl: '/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html', controller: 'updateApplyWxSubMerchantIdCtrl', resolve: { @@ -5699,7 +5704,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids'); }], subMerchantInfo: ['$http', '$stateParams', function ($http) { - return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + merchant_app_id); + return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_merchant_ids/' + $scope.merchant_app_id); }] } }).result.then(function () { diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html index 7ae05c24b..f4d7af204 100644 --- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html +++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html @@ -93,9 +93,12 @@ ng-click="queryWechatSubMerchantIdStatus()"> Result - - - + + @@ -138,8 +141,8 @@ Use Detail - Modify + +