From dbd3fe2d3e11b383e280411e775937771816efc2 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Wed, 29 Apr 2020 15:42:41 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 src/main/ui/static/payment/partner/partner-manage.js            | 2 --
 .../static/payment/partner/templates/partner_payment_info.html  | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 93b8a7e22..bd460038b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.2.16</version>
+    <version>2.2.17</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index acd67a9ac..fed52eaf4 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -1211,7 +1211,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             if($scope.extParams != null){
                 for(var key in $scope.extParams){
                     var obj = {}
-                    console.log(1)
                     if(typeof $scope.extParams[key] != 'boolean'){
                         obj.name = key;
                         obj.value = $scope.extParams[key];
@@ -1231,7 +1230,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.reloadQRCode = function () {
             $http.get('/sys/partners/' + $scope.partner.client_moniker + '/qrcode', {params: $scope.qrConfig}).then(function (resp) {
                 $scope.qrcode = resp.data;
-                console.log($scope.qrcode.url)
             });
         };
         $scope.reloadQRCode();
diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
index 05445da42..4c031e5be 100644
--- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
@@ -466,7 +466,7 @@
     </div>
 </div>
 <!-- 卡支付配置 -->
-<div class="panel panel-default" ng-if="('111'|withRole) || ('retail_surcharge'|withFunc)" ng-if="paymentInfo.enable_international_card">
+<div class="panel panel-default" ng-if="(('111'|withRole) || ('retail_surcharge'|withFunc) )&&paymentInfo.enable_card_payment!=0">
     <div class="panel-heading">Card Payment Config</div>
     <div class="panel-body">
         <div class="form-horizontal">