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

fix ui

Browse Source
master
luoyang 5 years ago
parent dee6c95a51
commit 9476f376a1
17 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -17,7 +17,6 @@ import au.com.royalpay.payment.core.PaymentChannelApi;
import au.com.royalpay.payment.core.exceptions.EmailException;
import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
import au.com.royalpay.payment.core.mappers.SysClientMapper;
import au.com.royalpay.payment.core.surcharge.IncrementalChannel;
import au.com.royalpay.payment.core.utils.OrderExpiryRuleResolver;
import au.com.royalpay.payment.manage.analysis.mappers.TransactionAnalysisMapper;
import au.com.royalpay.payment.manage.appclient.beans.AppClientBean;
@ -53,6 +52,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage;
import au.com.royalpay.payment.tools.connections.mpsupport.exceptions.WechatException;
import au.com.royalpay.payment.tools.defines.IncrementalChannel;
import au.com.royalpay.payment.tools.env.PlatformEnvironment;
import au.com.royalpay.payment.tools.env.SysConfigManager;
import au.com.royalpay.payment.tools.exceptions.BadRequestException;

2
src/main/ui/index.html
Unescape View File

@ -1041,7 +1041,7 @@ margin-bottom: 10%;"/>
</li>
<li class="has-submenu" ng-if="currentUser.has_incremental_setvice" ui-sref-active="active">
<a ui-sref="partnerIncrementalService"><i class="fa fa-plus-square-o"></i>R Service</a>
<a ui-sref="partnerIncrementalService"><i class="fa fa-plus-square-o"></i>R Services</a>
</li>
</ul>

4
src/main/ui/static/cashback/templates/partner_cashback_records.html
Unescape View File

@ -83,8 +83,8 @@
<td>
<img src="/static/images/royalpay_sign_s.png"
uib-tooltip="RoyalPay" ng-if="record.source=='system'"/>
<img src="/static/images/yangmatou_sign.png"
uib-tooltip="YangMaTou" ng-if="record.source=='yangmatou'"/>
<img src="/static/images/yangmaimai_sign.png"
uib-tooltip="YangMaiMai" ng-if="record.source=='yangmaimai'"/>
{{record.order_id}}
</td>
<td ng-bind="record.cashback_amount|currency:'AUD '"></td>

0
src/main/ui/static/images/yangmatou.jpg → src/main/ui/static/images/yangmaimai.jpg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
src/main/ui/static/images/yangmatou_sign.png → src/main/ui/static/images/yangmaimai.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 432 B

After

Width:  |  Height:  |  Size: 432 B

14
src/main/ui/static/incrementalService/templates/partner_incremental_service.html
Unescape View File

@ -47,7 +47,7 @@
margin: 4px 0px;
font-size: 16px;
border-bottom: 1px solid ;
border-bottom-color: #F06101;
border-bottom-color: #ffb38c;
width: 90%;
text-align: center;
margin-left: 5%;
@ -68,9 +68,9 @@
}
</style>
<section class="content-header">
<h1>R Service</h1>
<h1>R Services</h1>
<ol class="breadcrumb">
<li class="active">R Service</li>
<li class="active">R Services</li>
</ol>
</section>
<div class="content">
@ -79,7 +79,7 @@
<div class="box-solid">
<div class="box box-warning" ng-style="{'height':windowHeight}">
<div class="box-header" style="margin-top: 10px">
<div class="col-md-4 col-sm-4 col-xs-12" ng-repeat=" service in serviceAll">
<div class="col-md-3 col-sm-3 col-xs-12" ng-repeat=" service in serviceAll">
<div class="service-background">
<img class="row img_auto_height_width" ng-src="{{service.logo_url}}">
<div class="row border-show">
@ -87,7 +87,7 @@
<label class="label-right">Name:</label>
</div>
<div class="col-md-8 col-sm-8 col-xs-6">
{{service.channel+'小程序'}}
{{service.channel}}
</div>
</div>
<div class="row border-show">
@ -106,12 +106,12 @@
{{service.incremental_mode==1?service.incremental_rate_value+'%':service.total_incremental_amount}}
</div>
</div>
<div class="row border-show" style="margin-bottom: 20px;border-bottom: white">
<div class="row border-show" style="margin-bottom: 20px">
<div class="col-md-4 col-sm-4 col-xs-6">
<label class="label-right ">Status:</label>
</div>
<div class="col-md-8 col-sm-8 col-xs-6">
<span ng-style="{'color':service.is_valid?'#00A65A':'#DD4B39'}">{{service.is_valid?'已启用':'已禁用' }}</span>
<span ng-style="{'color':service.is_valid?'#00A65A':'#DD4B39'}">{{service.is_valid?'已启用':'未启用' }}</span>
</div>
</div>
<div class="row border-show" style="background-color: #F06101;margin: -5px 0px -1px 0px; border-radius: 2px 1px 8px 8px; width: 100%;margin-left: 0px" >

8
src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html
Unescape View File

@ -114,7 +114,7 @@
</div>
<div class="col-sm-3">
<label>Status:</label>
<span ng-style="{'color':serviceInfo.is_valid?'#00A65A':'#DD4B39'}">{{serviceInfo.is_valid?'已启用':'已禁用' }}</span>
<span ng-style="{'color':serviceInfo.is_valid?'#00A65A':'#DD4B39'}">{{serviceInfo.is_valid?'已启用':'未启用' }}</span>
</div>
</div>
</div>
@ -139,8 +139,8 @@
ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':params.source=='system'}"
ng-click="params.source='system';loadTradeLogs(1)">System</a> |
<a role="button" ng-class="{'bg-primary':params.source=='yangmatou'}"
ng-click="params.source='yangmatou';loadTradeLogs(1)">YangMaTou2</a>
<a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}"
ng-click="params.source='yangmaimai';loadTradeLogs(1)">Yangmaimai2</a>
</p>
</div>
</div>-->
@ -368,7 +368,7 @@
<img src="/static/images/clearing-icon.png" uib-tooltip="clearing" ng-if="trade.clearing_status=='1'"/>
<i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i>
<img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmatou_sign.png" uib-tooltip="YangMaTou" ng-if="trade.source=='yangmatou'"/>
<img src="/static/images/yangmaimai_sign.png" uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay" ng-if="trade.channel=='Wechat'"/>
<img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/>

4
src/main/ui/static/invoice/templates/invoice_assistant.html
Unescape View File

@ -196,8 +196,8 @@
<td>
<img src="/static/images/royalpay_sign_s.png"
uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmatou_sign.png"
uib-tooltip="YangMaTou" ng-if="trade.source=='yangmatou'"/>
<img src="/static/images/yangmaimai_sign.png"
uib-tooltip="yangmaimai" ng-if="trade.source=='yangmaimai'"/>
<img src="/static/images/wechatpay_sign.png"
uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
<img src="/static/images/wechatpay_sign.png"

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

@ -296,7 +296,7 @@
<a ui-sref=".permission_client">Permissions</a>
</li>
<li ui-sref-active="active" ng-if="partner.is_valid==1">
<a ui-sref=".incremental_service">R Service</a>
<a ui-sref=".incremental_service">R Services</a>
</li>
</ul>
<div class="tab-content" ui-view>

4
src/main/ui/static/payment/tradelog/templates/balance_report.html
Unescape View File

@ -313,8 +313,8 @@
<td>
<img src="/static/images/royalpay_sign_s.png"
uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmatou_sign.png"
uib-tooltip="YangMaTou" ng-if="trade.source=='yangmatou'"/>
<img src="/static/images/yangmaimai_sign.png"
uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/>
<img src="/static/images/wechatpay_sign.png"
uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
<img src="/static/images/wechatpay_sign.png"

8
src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html
Unescape View File

@ -348,8 +348,8 @@
<th>Input Amount</th>
<th>System Rate</th>
<th>System Profit</th>
<th>YangMaTou Rate</th>
<th>YangMaTou Profit</th>
<th>YangMaiMai Rate</th>
<th>YangMaiMai Profit</th>
<th>Status</th>
<th>Create Time</th>
<th>Operation</th>
@ -365,8 +365,8 @@
<td>
<img src="/static/images/royalpay_sign_s.png"
uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmatou_sign.png"
uib-tooltip="YangMaTou" ng-if="trade.source=='yangmatou'"/>
<img src="/static/images/yangmaimai_sign.png"
uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/>
<img src="/static/images/wechatpay_sign.png"
uib-tooltip="WechatPay" ng-if="trade.channel=='Wechat'"/>
<img src="/static/images/wechatpay_sign.png"

6
src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html
Unescape View File

@ -101,8 +101,8 @@
ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':params.source=='system'}"
ng-click="params.source='system';loadTradeLogs(1)">System</a> |
<a role="button" ng-class="{'bg-primary':params.source=='yangmatou'}"
ng-click="params.source='yangmatou';loadTradeLogs(1)">YangMaTou2</a>
<a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}"
ng-click="params.source='yangmaimai';loadTradeLogs(1)">Yangmaimai2</a>
</p>
</div>
</div>-->
@ -330,7 +330,7 @@
<img src="/static/images/clearing-icon.png" uib-tooltip="clearing" ng-if="trade.clearing_status=='1'"/>
<i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i>
<img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmatou_sign.png" uib-tooltip="YangMaTou" ng-if="trade.source=='yangmatou'"/>
<img src="/static/images/yangmaimai_sign.png" uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay" ng-if="trade.channel=='Wechat'"/>
<img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/>

2
src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
Unescape View File

@ -220,7 +220,7 @@
<tr ng-repeat="tr in report.report|propsFilter:{transaction_type:'Credit',channel:ctrl.channel,transaction_time:ctrl.day}:true">
<td>
<img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="tr.source=='system'"/>
<img src="/static/images/yangmatou_sign.png" uib-tooltip="YangMaTou" ng-if="tr.source=='yangmatou'"/>
<img src="/static/images/yangmaimai_sign.png" uib-tooltip="YangMaiMai" ng-if="tr.source=='yangmaimai'"/>
<img class="channel-icon" ng-src="{{tr.channel|channel_image}}">{{tr.order_id}}
</td>
<td ng-bind="tr.transaction_time"></td>

6
src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
Unescape View File

@ -117,8 +117,8 @@
ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':params.source=='system'}"
ng-click="params.source='system';loadTradeLogs(1)">System</a> |
<a role="button" ng-class="{'bg-primary':params.source=='yangmatou'}"
ng-click="params.source='yangmatou';loadTradeLogs(1)">YangMaTou</a>
<a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}"
ng-click="params.source='yangmaimai';loadTradeLogs(1)">YangMaiMai</a>
</p>
</div>
</div>
@ -420,7 +420,7 @@
<img src="/static/images/clearing-icon.png" uib-tooltip="clearing" ng-if="trade.clearing_status=='1'"/>
<i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i>
<img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmatou_sign.png" uib-tooltip="YangMaTou" ng-if="trade.source=='yangmatou'"/>
<img src="/static/images/yangmaimai_sign.png" uib-tooltip="Yangmaimai" ng-if="trade.source=='yangmaimai'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay" ng-if="trade.channel=='Wechat'"/>
<img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/>

8
src/main/ui/static/payment/tradelog/templates/trade_logs.html
Unescape View File

@ -150,8 +150,8 @@
ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':params.source=='system'}"
ng-click="params.source='system';loadTradeLogs(1)">System</a> |
<a role="button" ng-class="{'bg-primary':params.source=='yangmatou'}"
ng-click="params.source='yangmatou';loadTradeLogs(1)">YangMaTou</a>
<a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}"
ng-click="params.source='yangmaimai';loadTradeLogs(1)">YangMaiMai</a>
</p>
</div>
</div>
@ -464,8 +464,8 @@
<td>
<img src="/static/images/royalpay_sign_s.png"
uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmatou_sign.png"
uib-tooltip="YangMaTou" ng-if="trade.source=='yangmatou'"/>
<img src="/static/images/yangmaimai_sign.png"
uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/>
<img src="/static/images/wechatpay_sign.png"
uib-tooltip="WechatPay" ng-if="trade.channel=='Wechat'"/>
<img src="/static/images/wechatpay_sign.png"

2
src/main/ui/static/payment/tradelog/tradelog-manage.js
Unescape View File

@ -326,7 +326,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
}]);
app.controller('globalIncrementalTradeLogCtrl', ['$scope', '$http', '$filter', 'commonDialog', 'refunder', 'orderService','$sce',
function ($scope, $http, $filter, commonDialog, refunder, orderService,$sce) {
$scope.params = {source: 'yangmatou',status: 'PAID',channel:'ALL', textType: 'all', datefrom: new Date(), dateto: new Date(),org_name:'ALL'};
$scope.params = {source: 'yangmaimai',status: 'PAID',channel:'ALL', textType: 'all', datefrom: new Date(), dateto: new Date(),org_name:'ALL'};
$scope.pagination = {};
$scope.today = new Date();

4
src/main/ui/static/payment/tradelog/tradelog.js
Unescape View File

@ -112,7 +112,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.tradeLogs[i].htmlTooltip = $sce.trustAsHtml('<div style="width: 180px">' +
'<h5>手续费组成</h5>'+'<div style="background-color: #EFEFF5;height: 1px;margin-bottom: 10px;"></div>'+
'<p>system:'+ system_surcharge +'</p>' +
'<p>yangmatou:'+ incremental_surcharge +'</p>' +
'<p>yangmaimai:'+ incremental_surcharge +'</p>' +
'<p>tax amount:'+ tax_amount +'</p>' +
'</div>');
}
@ -297,7 +297,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
app.controller('IncrementalTradeLogCtrl', ['$scope', '$http', '$filter', '$timeout', 'partnerRefunder', 'orderService', 'commonDialog',
function ($scope, $http, $filter, $timeout, partnerRefunder, orderService, commonDialog) {
$scope.params = {source: 'yangmatou',status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()};
$scope.params = {source: 'yangmaimai',status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()};
$scope.pagination = {};
$scope.today = new Date();
$scope.isAll = true;

Write Preview
Loading…
Cancel
Save