From 551d00ef6bb6ba40c4821b3696ad07acd005dbbf Mon Sep 17 00:00:00 2001
From: "xiao.tang" <xiao.tang@geekforbest.com>
Date: Thu, 24 Dec 2020 18:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9Efix(royalpay):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=AD=90=E5=95=86=E6=88=B7id=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/static/payment/partner/partner-manage.js    |  6 +++---
 .../partner/templates/sub_merchant_id_apply.html   | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 1ca66ae37..8ee03bc88 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -5700,21 +5700,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
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 1ab198d45..fbeb1b7d9 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
@@ -87,12 +87,11 @@
                                 <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()">
-                                        <i class="fa fa-search"></i>Result
+                                        <i class="fa fa-search"></i> Result
                                     </button>
                                     <button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
                                         Modify
@@ -225,10 +224,10 @@
                                 <div>
                                     <button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
                                         ng-click="submitAlipaySubId()">
-                                        <i class="fa fa-plus"></i>Apply
+                                        <i class="fa fa-plus"></i> Apply
                                     </button>
                                     <button role="button" class="btn btn-info" ng-click="queryAlipayGms()">
-                                        <i class="fa fa-search"></i>Result
+                                        <i class="fa fa-search"></i> Result
                                     </button>
                                     <button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
                                         Modify
@@ -285,11 +284,10 @@
 
                                     <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
+                                        <i class="fa fa-search"></i> Result
                                     </button>
                                     <button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
                                         Modify