Upd:信用卡合规流程

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

@@ -698,13 +698,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             var choises = [{label: '取消', className: 'btn-danger', key: '2', dismiss: true},
                 {label: '确认生成', className: 'btn-success', key: '1'}];
             var content = '';
-            $scope.showBg = true;
+
             commonDialog.confirm({
                 title: title,
                 content: content,
                 choises: choises,
                 contentHtml: contentHtml
             }).then(function (res) {
+                $scope.showBg = true;
                 var date = document.getElementById("promotiona_date").value;
                 var period = document.getElementById("promotiona_period").value;
                 if(date=='' || period==''){

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

@@ -214,7 +214,7 @@
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='CB_BankPay'}"><a role="button" ng-click="bankCtrl.rate_name='CB_BankPay'" ng-if="sysconfig.active_channels.indexOf('CB_BankPay')!=-1">CB_BankPay</a></li>
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='rpaypmt_card'}"><a role="button" ng-click="bankCtrl.rate_name='rpaypmt_card'">Card Payment</a></li>
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='rpaypmt_dd'}"><a role="button" ng-click="bankCtrl.rate_name='rpaypmt_dd'">Direct Debit</a></li>
-            <button class="btn btn-warning" style="float: right" type="button" ng-click="newCardPaymentRates()" ng-if="partner.rate_editable && (('11'|withRole)||((!partner.approve_result||partner.approve_result>4) && ('111'|withRole)))" >
+            <button class="btn btn-warning" style="float: right" type="button" ng-click="newCardPaymentRates()" ng-if="partner.rate_editable && (('11'|withRole)||((!partner.upay_approve_result||partner.upay_approve_result>4) && ('111'|withRole)))" >
                 Add Card Payment Rates
             </button>
         </ul>

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

@@ -60,10 +60,9 @@
 </section>
 <div class="content">
     <!-- 跨境支付审核 -->
-
    <div class="box box-warning" ng-if="('10'|withRole)">
        <div class="box-header with-border">
-           <h3 class="box-title"> <img style="height: 20px;width: 20px" height="20px" src="/static/images/royalpay_sign_s.png">  Compliance <span ng-if="partner.approve_result==5 || partner.refuse_remark.length>0"
+           <h3 class="box-title"> <img style="height: 20px;width: 20px" height="20px" src="/static/images/royalpay_sign_s.png">Cross-border payment  Compliance <span ng-if="partner.approve_result==5 || partner.refuse_remark.length>0"
                                                                                                                                                   style="color: red">(Refused
             <small class=""
                    ng-if="partner.approve_result==5 || partner.refuse_remark.length>0">:{{partner.refuse_remark}}</small>)</span>
@@ -238,12 +237,10 @@
     <div class="box box-warning" ng-if="('10'|withRole)">
         <div class="box-header with-border">
             <h3 class="box-title"><span style="width: 20px;height: 20px"><img style="height: 20px;width: 20px" src="/static/images/card_payment_sign.png"></span>
-                Compliance <span ng-if="partner.upay_approve_result==5 || partner.upay_refuse_remark.length>0"
+                Card Payment Compliance
-                                 style="color: red">(Refused
+                <span ng-if="partner.upay_approve_result==5" style="color: red">(Refused
-                <small class=""
+                 <small class="" ng-if="partner.upay_approve_result==5 || partner.upay_refuse_remark.length>0">:{{partner.upay_refuse_remark}}</small>)
-                       ng-if="partner.approve_result==5 || partner.refuse_remark.length>0">:{{partner.refuse_remark}}</small>)</span>
+                </span>
-                <span ng-if="(partner.source==1 || partner.source==2) && partner.upay_approve_result==2"
-                      style="color: green">(The Partner Using Green Channel Now!)</span>
                 【目前状态】-
                 <b ng-if="partner.source==4">
                     <span ng-if="!partner.upay_approve_result">(自助申请)资料完善中</span>