Merge branch 'develop'

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.74</version>
+    <version>2.3.75</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

src/main/ui/static/payment/partner/partner-manage.js

@@ -5610,7 +5610,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     }
                 }
             }).result.then(function () {
-                $scope.loadPartnerInfo()
+                $state.reload();
                 commonDialog.alert({
                     title: 'Success',
                     content: 'Modify successfully',
@@ -5851,21 +5851,21 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.confirm = function () {
             $scope.flag = true
             if (channel === 'Wechat') {
-                $http.put('/sys/partners/' + clientMoniker + '/payment_config', { sub_merchant_id: merchantId }).then(function (resp) {
+                $http.put('/sys/partners/' + clientMoniker + '/payment_config', { sub_merchant_id: $scope.merchantId }).then(function (resp) {
                     $scope.$close();
                 }, function (resp) {
                     $scope.flag = false
                     commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
                 });
             } else if (channel === 'Alipay') {
-                $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: merchantId }).then(function (resp) {
+                $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.merchantId }).then(function (resp) {
                     $scope.$close();
                 }, function (resp) {
                     $scope.flag = false
                     commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
                 });
             } else if (channel = 'AlipayOnline') {
-                $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: merchantId }).then(function (resp) {
+                $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.merchantId }).then(function (resp) {
                     $scope.$close();
                 }, function (resp) {
                     $scope.flag = false

src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html

@@ -87,8 +87,7 @@
                                 <div>
                                     <button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
                                         ng-click="applyWxSubMerchantId()">
-                                        <i class="fa fa-plus"></i>
-                                        Apply
+                                        <i class="fa fa-plus"></i> Apply
                                     </button>
                                     <button role="button" class="btn btn-info"
                                         ng-click="queryWechatSubMerchantIdStatus()">
@@ -285,8 +284,7 @@
 
                                     <button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
                                         ng-click="submitAlipayOnlineSubId()">
-                                        <i class="fa fa-plus"></i>
-                                        Apply
+                                        <i class="fa fa-plus"></i> Apply
                                     </button>
                                     <button role="button" class="btn btn-info" ng-click="queryAlipayOnlineGms()">
                                         <i class="fa fa-search"></i> Result