msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix return按钮

Browse Source
master
luoyang 5 years ago
parent 2f13b89f70
commit 19db06bd53
4 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
Unescape View File

@ -166,7 +166,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
client.putAll(clientConfigService.find(client_id));
client = clientInfoWithNoSecretInfo(client);
client.put("client_less_file", false);
if (client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10) {
if (client.getIntValue("open_status") == 10) {
List<JSONObject> clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id"));
if (clientFiles != null && clientFiles.size() > 0) {
clientFiles = clientFiles.stream().filter(fileJson -> ((fileJson.getIntValue("status") == 1 || fileJson.getIntValue("status") == 2))).collect(Collectors.toList());
@ -643,7 +643,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
public JSONObject checkAuthFileStatus(JSONObject client) {
JSONObject result = new JSONObject();
result.put("client_less_file", false);
if (client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10) {
if (client.getIntValue("open_status") == 10) {
List<JSONObject> clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id"));
boolean clientFilesIsLess = false;
for (int i = 0; i < FILE_KEYS.length; i++) {

10
src/main/ui/static/payment/partner/templates/client_compliance_to_perfect.html
Unescape View File

@ -8,9 +8,10 @@
<button class="btn-group btn btn-warning" type="button"
ng-click="clientComplianceViewCommit()" ng-if="file.file_company.status != 0 && file.file_company.status!=1">Commit to Compliance
</button>
<p class="btn-group btn btn-warning" ng-if="file.file_company.status == 0">正在审核中
<p class="btn-group btn btn-success" ng-if="file.file_company.status == 1">审核成功
<p class="btn-group btn btn-warning" ng-if="file.file_company.status == 0">Under Review
<p class="btn-group btn btn-success" ng-if="file.file_company.status == 1">Review The Success
</p>
<p class="small text-danger" style="margin:10px 0 0 0" ng-if="file.client_refuse_reason">{{file.client_refuse_reason}}</p>
</div>
<div class="panel-body">
<div class="form-horizontal">
@ -141,8 +142,9 @@
<label class="control-label col-sm-2">* Agreement</label>
<div class="col-sm-4">
<div class="form-control-static">
<a role="button" class="btn btn-success" ng-if="file.client_agree_file.file_value && file.file_company.status != 0 && file.file_company.status!=1 && file.client_less_file" ui-sref="compliance_contract" >重新签订合同</a>
<a role="button" class="btn btn-success" ng-if="!file.client_agree_file.file_value && file.file_company.status != 0 && file.file_company.status!=1 && file.client_less_file" ui-sref="compliance_contract" >签订合同</a>
<a role="button" class="btn btn-success" ng-if="file.client_agree_file.file_value && file.file_company.status != 0 && file.file_company.status!=1 && file.client_less_file" ui-sref="compliance_contract" >Resign The Contract
</a>
<a role="button" class="btn btn-success" ng-if="!file.client_agree_file.file_value && file.file_company.status != 0 && file.file_company.status!=1 && file.client_less_file" ui-sref="compliance_contract" >Sign The Contract</a>
<a ng-if="file.client_agree_file.file_value" role="button" class="btn-group btn btn-warning" type="button" ng-href="{{file.client_agree_file.file_value[0].file_value}}" target="_blank"><i class="fa fa-download"></i></a>
<table>
<tbody>

2
src/main/ui/static/payment/partner/templates/compliance_files_advice.html
Unescape View File

@ -1,5 +1,5 @@
<div class="modal-header bg-green">
<h4 style="text-align: center">合规文件补充通知<span ng-if="client_refuse_reason">Refuse to reason/打回原因:{{client_refuse_reason}}</span></h4>
<h4 style="text-align: center">合规文件补充通知<span ng-if="client_refuse_reason">{{client_refuse_reason}}</span></h4>
</div>
<div class="modal-body" style="padding: 30px">
<div class="row">

51
src/main/ui/static/payment/partner/templates/contract_for_compliance.html
Unescape View File

@ -25,6 +25,11 @@
width:70%;
margin: 0px 15%;
}
.return-class {
float: right;
font-size: 30px;
padding: 10px 50px;
}
.sign{
/* // line color
@ -43,15 +48,45 @@
min-height: 150px;
}
@media (min-width:100px) and (max-width:399px){*{font-size:1px;}}
@media (min-width:400px) and (max-width:799px){*{font-size:5px;}}
@media (min-width:800px) and (max-width:1024px) {*{font-size:10px;}}
@media (min-width:1025px) and (max-width:1440px) {*{font-size:15px;}}
@media (min-width:1441px) and (max-width:1600px){*{font-size:20px;}}
@media (min-width:100px) and (max-width:399px){
*{font-size:1px;}
.return-class {
float: right;
font-size: 17px;
padding: 10px 0px;
}
}
@media (min-width:400px) and (max-width:799px){
*{font-size:5px;}
.return-class {
float: right;
font-size: 17px;
padding: 10px 20px;
}
}
@media (min-width:800px) and (max-width:1024px) {
*{font-size:10px;}
.return-class {
float: right;
font-size: 22px;
padding: 10px 20px;
}
}
@media (min-width:1025px) and (max-width:1440px) {
*{font-size:15px;}
.return-class {
float: right;
font-size: 28px;
padding: 10px 30px;
}
}
@media (min-width:1441px) and (max-width:1600px){
*{font-size:20px;}
}
</style>
<div ui-view>
<div ui-view autoscroll="true">
<section class="content" style="background:#4F4F4F;">
<div class="row">
<div class="container-fluid">
@ -66,8 +101,8 @@
</div>
<div id="back" style="z-index: 9999; position: fixed ! important; right: 84%;top: 20%;">
<button class="btn-warning" type="button" ui-sref="basic.compliance_to_perfect"><i class="fa fa-reply"></i> 返回</button>
<div id="back" style="z-index: 9999; position: fixed ! important; right: 82%;top: 13.2%;">
<button class="btn-warning return-class" ui-sref="basic.compliance_to_perfect"><i class="fa fa-reply"></i> Return</button>
</div>

Write Preview
Loading…
Cancel
Save