From e574a6912c73d9b2855f8658da6f16ccd593f379 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Mon, 18 May 2020 14:10:01 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E5=90=88=E8=A7=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E8=A7=84=E5=88=99=EF=BC=8C?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8EBD=E5=8F=AA=E5=8F=AF=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E4=B8=8D=E5=88=A0=E9=99=A4=E5=90=88=E8=A7=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/partner_cp_auth_files.html      | 12 +++++-----
 .../templates/partner_mw_auth_files.html      | 22 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_cp_auth_files.html b/src/main/ui/static/payment/partner/templates/partner_cp_auth_files.html
index 10454f48d..0633354ec 100644
--- a/src/main/ui/static/payment/partner/templates/partner_cp_auth_files.html
+++ b/src/main/ui/static/payment/partner/templates/partner_cp_auth_files.html
@@ -33,7 +33,7 @@
                         <td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}">
                             <img ng-src="{{file_src.file_value}}"class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'">
                         </a>
-                            <button class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
+                            <button ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==5 || partner.approve_result==4))" class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
                             <a role="button" download="" target="_blank" class="btn-group btn btn-warning" type="button" href="{{file_src.file_value}}" ><i class="fa fa-download"></i></a>
                         </td>
                     </tr>
@@ -68,7 +68,7 @@
                     <td><a ng-if="companyIsImage" target="_blank" ng-href="{{file_src.file_value}}">
                         <img ng-src="{{file_src.file_value}}" class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'">
                     </a>
-                        <button class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
+                        <button ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==5 || partner.approve_result==4))" class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
                         <a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}" download="" target="_blank" ><i class="fa fa-download"></i></a>
                     </td>
                 </tr>
@@ -112,7 +112,7 @@
                         <td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}">
                             <img ng-src="{{file_src.file_value}}" class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'">
                         </a>
-                            <button class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
+                            <button ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==5 || partner.approve_result==4))" class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
                             <a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}"  download="" target="_blank"><i class="fa fa-download"></i></a>
                         </td>
                     </tr>
@@ -252,7 +252,7 @@
                             <td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}">
                                 <img ng-src="{{file_src.file_value}}" class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'">
                             </a>
-                                <button class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
+                                <button ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==5 || partner.approve_result==4))" class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
                                 <a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}"  download="" target="_blank"><i class="fa fa-download"></i></a>
                             </td>
                         </tr>
@@ -289,7 +289,7 @@
                             <td><a ng-if="bankIsImage" target="_blank" ng-href="{{file_src.file_value}}">
                                 <img ng-src="{{file_src.file_value}}"class="col-sm-6" style="border: 1px solid #ddd" onerror="this.src='/static/images/file_close.png'">
                             </a>
-                                <button class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
+                                <button ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==5 || partner.approve_result==4))" class="btn btn-danger" type="button" ng-click="deleteComplianceFiles(file_src.file_id)">X</button>
                                 <a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file_src.file_value}}" download="" target="_blank"><i class="fa fa-download"></i></a>
                             </td>
                         </tr>
@@ -328,7 +328,7 @@
                             <img ng-src="{{file_src.file_value}}" class="col-sm-8"
                                  onerror="this.src='/static/images/file_close.png'">
                         </a>
-                            <button class="btn btn-danger" type="button"
+                            <button ng-if="('10'|withRole) || (('100'|withRole) && (!partner.approve_result || partner.approve_result==0 || partner.approve_result==5 || partner.approve_result==4))" class="btn btn-danger" type="button"
                                     ng-click="deleteComplianceFiles(file_src.file_id)">
                                 X
                             </button>
diff --git a/src/main/ui/static/payment/partner/templates/partner_mw_auth_files.html b/src/main/ui/static/payment/partner/templates/partner_mw_auth_files.html
index 588b271bb..6f5f0eb1e 100644
--- a/src/main/ui/static/payment/partner/templates/partner_mw_auth_files.html
+++ b/src/main/ui/static/payment/partner/templates/partner_mw_auth_files.html
@@ -69,7 +69,7 @@
             <label class="control-label col-sm-2">* Application Form | 商户申请表</label>
             <div class="col-sm-4">
                 <div class="form-control-static">
-                    <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5 || partner.upay_approve_result==4))"
+                    <button class="btn btn-primary" type="button" ng-if="('110'|withRole)"
                             ngf-select="uploadApplicationFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -98,7 +98,7 @@
             <label class="control-label col-sm-2">* Six Months Bank Statement | 六个月银行对账单</label>
             <div class="col-sm-4">
                 <div class="form-control-static">
-                    <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5 || partner.upay_approve_result==4))"
+                    <button class="btn btn-primary" type="button" ng-if="('110'|withRole)"
                             ngf-select="uploadBankFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -127,7 +127,7 @@
             <label class="control-label col-sm-2">* ASIC Current Company Extract | ASIC 当前公司信息摘录</label>
             <div class="col-sm-4">
                 <div class="form-control-static">
-                    <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5 || partner.upay_approve_result==4))"
+                    <button class="btn btn-primary" type="button" ng-if="('110'|withRole)"
                             ngf-select="uploadASICFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -156,7 +156,7 @@
             <label class="control-label col-sm-2">* ID of Legal Representative ｜ 法人身份证明</label>
             <div class="col-sm-4">
                 <div class="form-control-static">
-                    <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5 || partner.upay_approve_result==4))"
+                    <button class="btn btn-primary" type="button" ng-if="('110'|withRole)"
                             ngf-select="uploadIdFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -185,7 +185,7 @@
             <label class="control-label col-sm-2">* Proof of Residential Address (One Utilities Bill) | 家庭住址证明 （一个水电煤网账单）</label>
             <div class="col-sm-4">
                 <div class="form-control-static">
-                    <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5 || partner.upay_approve_result==4))"
+                    <button class="btn btn-primary" type="button" ng-if="('110'|withRole)"
                             ngf-select="uploadResidenceFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -214,7 +214,7 @@
             <label class="control-label col-sm-2">* Refund and Exchange Policy | 退款和换货政策</label>
             <div class="col-sm-4">
                 <div class="form-control-static">
-                    <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5 || partner.upay_approve_result==4))"
+                    <button class="btn btn-primary" type="button" ng-if="('110'|withRole)"
                             ngf-select="uploadRefundPolicyFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -243,7 +243,7 @@
             <label class="control-label col-sm-2">* Privacy Policy | 隐私政策</label>
             <div class="col-sm-4">
                 <div class="form-control-static">
-                    <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5 || partner.upay_approve_result==4))"
+                    <button class="btn btn-primary" type="button" ng-if="('110'|withRole)"
                             ngf-select="uploadPrivacyPolicyFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -272,7 +272,7 @@
             <label class="control-label col-sm-2">* Card information Security Policy | 卡信息安全政策</label>
             <div class="col-sm-4">
                 <div class="form-control-static">
-                    <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5 || partner.upay_approve_result==4))"
+                    <button class="btn btn-primary" type="button" ng-if="('110'|withRole)"
                             ngf-select="uploadCardPolicyFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -301,7 +301,7 @@
             <label class="control-label col-sm-2">* Letter of Offer | 邀约信 </label>
             <div class="col-sm-4">
                 <div class="form-control-static">
-                    <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5 || partner.upay_approve_result==4))"
+                    <button class="btn btn-primary" type="button" ng-if="('110'|withRole)"
                             ngf-select="uploadLetterOfOfferFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -359,7 +359,7 @@
             <label class="control-label col-sm-2">* Terms and Conditions | 条款</label>
             <div class="col-sm-4">
                 <div class="form-control-static">
-                    <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5 || partner.upay_approve_result==4))"
+                    <button class="btn btn-primary" type="button" ng-if="('110'|withRole)"
                             ngf-select="uploadTermsFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>
@@ -388,7 +388,7 @@
             <label class="control-label col-sm-2">* Detailed Business Description｜详细的业务描述</label>
             <div class="col-sm-4">
                 <div class="form-control-static">
-                    <button class="btn btn-primary" type="button" ng-if="('10'|withRole) || (('100'|withRole) && (!partner.upay_approve_result || partner.upay_approve_result==0 || partner.upay_approve_result==5 || partner.upay_approve_result==4))"
+                    <button class="btn btn-primary" type="button" ng-if="('110'|withRole)"
                             ngf-select="uploadDescFile($file)">
                         <i class="fa fa-upload"></i> Upload
                     </button>