Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

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

@@ -481,9 +481,9 @@
                                         <a class="text-primary" role="button" title="Detail"
                                            ng-click="openClientBoard(partner)"
                                            ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))">
-                                            <span ng-bind="partner.client_moniker"></span><span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span></a>
+                                            <span ng-bind="partner.client_moniker"></span></a>
                                         <span ng-bind="partner.client_moniker" ng-if="partner.approve_result!=1 && !(partner.approve_result==2 && (partner.source==1 || partner.source==2))"></span>
-
+                                        <span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
                                         <i class="fa fa-sitemap" ng-if="partner.parent_client_id"
                                            title="Sub Partner"></i>
                                         <i class="text-danger fa fa-envelope-o"

src/main/ui/static/templates/hf/gateway_payment.js

@@ -1,4 +1,5 @@
 $("#bank-li").hide();
+$("#bankCard-li").hide();
 var currentIndex = 0;
 $(".main .main-left ul li.tab-item").click(function () {
     var selectedIndex = $(this).index();
@@ -7,8 +8,10 @@ $(".main .main-left ul li.tab-item").click(function () {
     $(this).siblings().children(".s1").removeClass("s1-change-color");
     if (selectedIndex == 2) {
         $("#bank-li").show();
+        $("#bankCard-li").show();
     } else {
         $("#bank-li").hide();
+        $("#bankCard-li").hide();
     }
 });