From 7f8ba7f3dfd9e970a1af81f537c86c108b51db0e Mon Sep 17 00:00:00 2001
From: "xiao.tang" <xiao.tang@geekforbest.com>
Date: Tue, 29 Dec 2020 17:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8feat(royalpay):=20MID=20Management?=
 =?UTF-8?q?=E5=B0=8F=E5=B1=8F=E5=B9=95=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/payment/partner/partner-manage.js   | 10 +---------
 .../templates/sub_merchant_id_apply.html       | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index f922956b4..f587fbdd6 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -5845,7 +5845,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
     }]);
     // 修改sub_merchant_id
     app.controller('ModifysubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'commonDialog', 'clientMoniker', 'merchantId', 'channel', function ($scope, $http, $uibModal, $state, commonDialog, clientMoniker, merchantId, channel) {
-        console.log(merchantId, channel);
         $scope.merchantId = merchantId
         $scope.flag = false
         $scope.confirm = function () {
@@ -5857,14 +5856,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     $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: $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') {
+            } else if (channel === 'Alipay' || channel === 'AlipayOnline') {
                 $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.merchantId }).then(function (resp) {
                     $scope.$close();
                 }, function (resp) {
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 5d9e62317..8ffe9468c 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
@@ -45,8 +45,24 @@
         min-height: unset;
         margin: unset;
     }
+
+    .flex-container {
+        display: flex;
+        flex-wrap: wrap;
+    }
+
+    @media (max-width:1400px) {
+        .flex-container {
+            display: flex;
+            flex-direction: column;
+        }
+
+        .content-mine {
+            width: 100%;
+        }
+    }
 </style>
-<div style="display: flex;flex-wrap: wrap;">
+<div class="flex-container">
     <!-- Wechat -->
     <div class="content content-mine">
         <div class="row">