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

fix v1-manager.html

Browse Source
master
luoyang 6 years ago
parent 919c7783be
commit c63931939f
13 changed files with 309 additions and 115 deletions
Show Stats Download Patch File Download Diff File

188
src/main/ui/manage.html
Unescape View File

@ -284,45 +284,201 @@ margin-bottom: 10%;"/>
</a>
</li>
<li class="header nav-header" ng-if="'1011110'|withRole">支付结算|Payment</li>
<li class="header nav-header" ng-if="'1011110'|withRole">商户管理|Partner Manage</li>
<li ui-sref-active="active" ng-if="'partners'|withModule">
<a ui-sref="partners" ui-sref-opts="{reload:true}">
<i class="fa fa-sitemap"></i> <span>商户管理|Partner Manage</span>
<i class="fa fa-sitemap"></i> <span>商户名录|Partner Directories</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'partners'|withModule">
<a ui-sref="newPartners" ui-sref-opts="{reload:true}">
<i class="fa fa-plus"></i> <span>商户进件|New Partner</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'partners'|withModule">
<a ui-sref="partners_analysis" ui-sref-opts="{reload:true}">
<i class="fa fa-list-alt"></i> <span>商户统计|Merchants Data</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'partners'|withModule">
<a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
<i class="fa fa-shopping-cart"></i> <span>商户活跃度(原统计)</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'partners'|withModule">
<a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>商户交易额统计（原统计）</span>
</a>
</li>
<li class="header nav-header" ng-if="'1011110'|withRole">交易管理|Transaction</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="trade" ui-sref-opts="{reload:true}">
<i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="refundReview" ui-sref-opts="{reload:true}">
<i class="fa fa-wrench"></i> <span>退款审核|Audit Refund</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
<i class="fa fa-tv"></i> <span>欠款|Pre Refund</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>原统计</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
<i class="fa fa-server"></i> <span>支付回调消息|Notify History</span>
</a>
</li>
<li class="header nav-header" ng-if="'1011110'|withRole">风控管理|Risk Management</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
<i class="fa fa-tv"></i> <span>交易成功率监控</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="analysis_monitoring.cheat" ui-sref-opts="{reload:true}">
<i class="fa fa-bell"></i> <span>风控点预警统计</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="analysis_monitoring.cheat_monitor" ui-sref-opts="{reload:true}">
<i class="fa fa-building"></i> <span>风控点配置|Cheat Monitor</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="analysis_monitoring.risk_manager" ui-sref-opts="{reload:true}">
<i class="fa fa-list-alt"></i> <span>风控记录|Risk Records</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="analysis_monitoring.attention" ui-sref-opts="{reload:true}">
<i class="fa fa-exclamation-triangle"></i> <span>黑名单|Risky Merchants</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa fa-male"></i> <span>消费排名|Risky Merchants</span>
</a>
</li>
<li class="header nav-header" ng-if="'1011110'|withRole">合规管理|Compliance Management</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa fa-eye"></i> <span>商户合规</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('10'|withRole)">
<a ui-sref="contract">
<i class="fa fa-money"></i> <span>合同签约情况</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('10'|withRole)">
<a ui-sref="rate_warnings">
<i class="fa fa-bell"></i> <span>签约到期预警</span>
</a>
</li>
<li ui-sref-active="active"
ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
<a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
<i class="fa fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
<i class="fa fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="trade" ui-sref-opts="{reload:true}">
<i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span>
<li ui-sref-active="active"
ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
<a ui-sref="logview.config_operation" ui-sref-opts="{reload:true}">
<i class="fa fa-edit"></i> <span>商户信息修改日志</span>
</a>
</li>
<li ui-sref-active="active"
ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
<a ui-sref="devtools.aliforexcel" ui-sref-opts="{reload:true}">
<i class="fa fa-envelope"></i> <span>Alipay进件表格导出</span>
</a>
</li>
<li class="header nav-header" ng-if="'1011110'|withRole">清算管理|Settlement Management</li>
<li ui-sref-active="active" ng-if="'ordervalid'|withModule">
<a ui-sref="order_valid">
<i class="fa fa-balance-scale"></i> <span>交易对账|Order Validation</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="clearingLogs.date_setting">
<i class="fa fa-balance-scale"></i> <span>清算日管理</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'clearing'|withModule">
<a ui-sref="clearingLogs" ui-sref-opts="{reload:true}">
<i class="fa fa-line-chart"></i> <span>清算统计|Settlement Logs</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('clearing_org'|withModule) && currentUser.org_id>1">
<a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">
<i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>
<li ui-sref-active="active" ng-if="'clearing'|withModule">
<a ui-sref="analysis_transaction.estimateAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa fa-money"></i> <span>清算预估|Estimate</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'clearing'|withModule">
<a ui-sref="analysis_report.settle_report" ui-sref-opts="{reload:true}">
<i class="fa fa fa-tv"></i> <span>清算月报</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'clearing'|withModule">
<a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
<i class="fa fa fa-money"></i> <span>清算验证|Validation</span>
</a>
</li>
<li class="header nav-header" ng-if="'1011110'|withRole">财务管理|Financial Management</li>
<li ui-sref-active="active" ng-if="'austrac'|withModule">
<a ui-sref="transreport" ui-sref-opts="{reload:true}">
<i class="fa fa-file-excel-o"></i> <span>Austrac Report</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'1000'|withRole">
<a ui-sref="invoice" ui-sref-opts="{reload:true}">
<i class="fa fa-users"></i> <span>Partner Invoice</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'1000'|withRole">
<a ui-sref="analysis_report.platformrevenue" ui-sref-opts="{reload:true}">
<i class="fa fa-money"></i> <span>平台收支统计|Platform Revenue</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'1000'|withRole">
<a ui-sref="analysis_report.wx_settlements" ui-sref-opts="{reload:true}">
<i class="fa fa-money"></i> <span>腾讯打款记录|Tencent Settlement</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'1000'|withRole">
<a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
<i class="fa fa-usd"></i> <span>BD提成|BD Commissions</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'1000'|withRole">
<a ui-sref="analysis_org.commission" ui-sref-opts="{reload:true}">
<i class="fa fa-users"></i> <span>合伙人提成</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('clearing_org'|withModule) && currentUser.org_id>1">
<a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">
<i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>
</a>
</li>
<!-- <li ui-sref-active="active" ng-if="'citypartner'|withModule">
<a ui-sref="citypartner_reg" ui-sref-opts="{reload:true}">
@ -330,11 +486,7 @@ margin-bottom: 10%;"/>
</a>
</li>-->
<li ui-sref-active="active" ng-if="'1000'|withRole">
<a ui-sref="invoice" ui-sref-opts="{reload:true}">
<i class="fa fa-users"></i> <span>Partner Invoice</span>
</a>
</li>
<li class="header nav-header"
ng-if="('1011110'|withRole) || currentUser.org_id==null">营销服务|Promotion
@ -398,11 +550,7 @@ margin-bottom: 10%;"/>
<i class="fa fa-users"></i> <span>余额增值活动</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('1'|withRole)">
<a ui-sref="contract">
<i class="fa fa-money"></i> <span>合同签约情况</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'actChairty'|withModule">
<a ui-sref="act_chairty" ui-sref-opts="{reload:true}">
<i class="fa fa-users"></i> <span>半边天公益活动</span>
@ -419,7 +567,7 @@ margin-bottom: 10%;"/>
<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">数据分析|Analysis</li>
<li ui-sref-active="active" ng-if="('transAnalysis'|withModule)||('dashboard'|withModule)||
<li ui-sref-active="active" ng-if="('transAnalysis'|withModule)||
('customer_analysis'|withModule)||
('customerRankingAnalysisApp'|withModule)||
('partner_analysis'|withModule)">

18
src/main/ui/static/analysis/bd/templates/analysis_bd.html
Unescape View File

@ -1,15 +1,15 @@
<div class="content">
<div class="row">
<div class="col-sm-12 analysis-nav">
<ul class="nav nav-pills">
<li ui-sref-active-eq="active" ng-if="'bdsale'|withModule">
<a ui-sref="analysis_bd.bdanalysis"><i class="fa fa-hand-peace-o"></i>BD销售量|BD Sale</a>
</li>
<li ui-sref-active-eq="active"
ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">
<a ui-sref="analysis_bd.bd_prizes"><i class="fa fa-usd"></i></i>BD提成|BD Commissions</a>
</li>
</ul>
<!--<ul class="nav nav-pills">-->
<!--<li ui-sref-active-eq="active" ng-if="'bdsale'|withModule">-->
<!--<a ui-sref="analysis_bd.bdanalysis"><i class="fa fa-hand-peace-o"></i>BD销售量|BD Sale</a>-->
<!--</li>-->
<!--<li ui-sref-active-eq="active"-->
<!--ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">-->
<!--<a ui-sref="analysis_bd.bd_prizes"><i class="fa fa-usd"></i></i>BD提成|BD Commissions</a>-->
<!--</li>-->
<!--</ul>-->
</div>
</div>
<div class="row">

4
src/main/ui/static/analysis/customer_analysis.js
Unescape View File

@ -5,8 +5,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
'use strict';
var app = angular.module('customerRankingAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('analysis_transaction.customerRankingAnalysis', {
url: '/customers',
$stateProvider.state('customerRankingAnalysis', {
url: '/analysis/transaction/customers',
templateUrl: '/static/analysis/templates/customer_analysis.html',
controller: 'customersListCtrl',
data: {label: 'Customers'}

4
src/main/ui/static/analysis/merchant_amount_analysis.js
Unescape View File

@ -3,8 +3,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
'use strict';
var app = angular.module('merchantAmount', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('analysis_transaction.merchantAmountAnalysis', {
url: '/amount',
$stateProvider.state('merchantAmountAnalysis', {
url: '/analysis/transaction/amount',
templateUrl: '/static/analysis/templates/merchant_amount_analysis.html',
controller: 'clientAmountListCtrl'
})

2
src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html
Unescape View File

@ -1,5 +1,6 @@
<div class="content">
<div class="row">
<!--
<div class="col-sm-12 analysis-nav">
<ul class="nav nav-pills">
<li ui-sref-active-eq="active" ng-if="'clientrate'|withModule">
@ -25,6 +26,7 @@
</ul>
</div>
-->
</div>
<div class="row">
<div class="col-sm-12">

16
src/main/ui/static/analysis/org/templates/analysis_org.html
Unescape View File

@ -1,14 +1,14 @@
<div class="content">
<div class="row">
<div class="col-sm-12 analysis-nav">
<ul class="nav nav-pills">
<li ui-sref-active-eq="active" ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))">
<a ui-sref="analysis_org.organlasis"><i class="fa fa-hand-peace-o"></i>合伙人销售量|City Partner Sale</a>
</li>
<li ui-sref-active-eq="active" ng-if="('orgcommission'|withModule)">
<a ui-sref="analysis_org.commission"><i class="fa fa-users"></i></i>合伙人提成|City Partner Commissions</a>
</li>
</ul>
<!--<ul class="nav nav-pills">-->
<!--<li ui-sref-active-eq="active" ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))">-->
<!--<a ui-sref="analysis_org.organlasis"><i class="fa fa-hand-peace-o"></i>合伙人销售量|City Partner Sale</a>-->
<!--</li>-->
<!--<li ui-sref-active-eq="active" ng-if="('orgcommission'|withModule)">-->
<!--<a ui-sref="analysis_org.commission"><i class="fa fa-users"></i></i>合伙人提成|City Partner Commissions</a>-->
<!--</li>-->
<!--</ul>-->
</div>
</div>
<div class="row">

4
src/main/ui/static/analysis/partners-analysis.js
Unescape View File

@ -3,8 +3,8 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
var app = angular.module('partnersAnalysis', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('analysis_transaction.partners_analysis', {
url: '/analysis/partners',
$stateProvider.state('partners_analysis', {
url: '/analysis/transaction/analysis/partners',
templateUrl: '/static/analysis/templates/partners_analysis.html',
controller: 'partnersAnalysisCtrl'
})

28
src/main/ui/static/analysis/report/templates/analysis_report.html
Unescape View File

@ -1,20 +1,20 @@
<div class="content">
<div class="row">
<div class="col-sm-12 analysis-nav">
<ul class="nav nav-pills">
<li ui-sref-active-eq="active" ng-if="'settleReport'|withModule">
<a ui-sref="analysis_report.settle_report"><i class="fa fa-tv"></i>清算月报|Settlement Month Report</a>
</li>
<li ui-sref-active-eq="active" ng-if="'platformRevenue'|withModule">
<a ui-sref="analysis_report.platformrevenue"><i class="fa fa-money"></i>平台收支统计|Platform Revenue</a>
</li>
<li ui-sref-active-eq="active" ng-if="'wxSettlementsApp'|withModule">
<a ui-sref="analysis_report.wx_settlements"><i class="fa fa-money"></i>腾讯打款记录|Tencent Settlement</a>
</li>
<li ui-sref-active-eq="active" ng-if="'platformRevenue'|withModule">
<a ui-sref="analysis_report.platformsettle"><i class="fa fa-money"></i>清算验证|Settlement Validation</a>
</li>
</ul>
<!--<ul class="nav nav-pills">-->
<!--<li ui-sref-active-eq="active" ng-if="'settleReport'|withModule">-->
<!--<a ui-sref="analysis_report.settle_report"><i class="fa fa-tv"></i>清算月报|Settlement Month Report</a>-->
<!--</li>-->
<!--<li ui-sref-active-eq="active" ng-if="'platformRevenue'|withModule">-->
<!--<a ui-sref="analysis_report.platformrevenue"><i class="fa fa-money"></i>平台收支统计|Platform Revenue</a>-->
<!--</li>-->
<!--<li ui-sref-active-eq="active" ng-if="'wxSettlementsApp'|withModule">-->
<!--<a ui-sref="analysis_report.wx_settlements"><i class="fa fa-money"></i>腾讯打款记录|Tencent Settlement</a>-->
<!--</li>-->
<!--<li ui-sref-active-eq="active" ng-if="'platformRevenue'|withModule">-->
<!--<a ui-sref="analysis_report.platformsettle"><i class="fa fa-money"></i>清算验证|Settlement Validation</a>-->
<!--</li>-->
<!--</ul>-->
</div>
</div>
<div class="row">

118
src/main/ui/static/analysis/templates/settle_estimate_analysis.html
Unescape View File

@ -20,7 +20,8 @@
<div class="col-md-3 col-sm-6 col-xs-12" ng-repeat="fut in future track by $index">
<div class="info-box" ng-if="fut.estimate_date">
<div>
<div class="info-box-icon bg-aqua" style="height: 100px" ng-bind="fut.estimate_date.substr(8,10)">
<div class="info-box-icon bg-aqua" style="height: 100px"
ng-bind="fut.estimate_date.substr(8,10)">
</div>
<div class="info-box-content">
<div>
@ -43,17 +44,51 @@
</div>
</div>
</div>
<div class="box-header" style="border-top: solid #f06010 1px;" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
<div class="box-header" style="border-top: solid #f06010 1px;"
ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
<span class="text-bold">到账金额详情:</span>
</div>
<div class="box-body" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
<p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1307485301"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1307485301" />(1307485301)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1307485301|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1431999902"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1431999902"/>(1431999902)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1431999902|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1487387142"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1487387142"/>(1487387142)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1487387142|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.aliSettleFee_All"> <img src="/static/images/alipay_sign.png" uib-tooltip="AliPay" alt="Alipay"/> 到账金额:<a class="text-green" ng-bind="fut.aliSettleFee_All|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.aliOnlineSettleFee_All"> <img src="/static/images/alipay_sign.png" uib-tooltip="AliPayOnline" alt="AliPayOnline"/> 到账金额(AlipayOnline):<a class="text-green" ng-bind="fut.aliOnlineSettleFee_All|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.hfSettleFee_All"> <img src="/static/images/hf_sign.png" uib-tooltip="Hf" alt="Hf"/> 到账金额:<a class="text-green" ng-bind="fut.hfSettleFee_All|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.platformGetSettleFee" style="color: #f06010"> <img src="/static/images/r_logo.svg" style="width: 20px;height: 20px;" uib-tooltip="RoyalPay" alt="RoyalPay"/> 总到账金额:<a class="text-green" ng-bind="fut.platformGetSettleFee|currency:'AUD'"></a></p>
<div class="box-body"
ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
<p class="text-bold col-sm-12" align="left"
ng-if="fut.settlementFee_1307485301"><img
src="/static/images/wechatpay_sign.png"
uib-tooltip="Wechat Merchant ID: 1307485301"/>(1307485301)到账金额:<a
class="text-green"
ng-bind="fut.settlementFee_1307485301|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left"
ng-if="fut.settlementFee_1431999902"><img
src="/static/images/wechatpay_sign.png"
uib-tooltip="Wechat Merchant ID: 1431999902"/>(1431999902)到账金额:<a
class="text-green"
ng-bind="fut.settlementFee_1431999902|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left"
ng-if="fut.settlementFee_1487387142"><img
src="/static/images/wechatpay_sign.png"
uib-tooltip="Wechat Merchant ID: 1487387142"/>(1487387142)到账金额:<a
class="text-green"
ng-bind="fut.settlementFee_1487387142|currency:'AUD'"></a></p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.aliSettleFee_All">
<img src="/static/images/alipay_sign.png" uib-tooltip="AliPay"
alt="Alipay"/> 到账金额:<a class="text-green"
ng-bind="fut.aliSettleFee_All|currency:'AUD'"></a>
</p>
<p class="text-bold col-sm-12" align="left"
ng-if="fut.aliOnlineSettleFee_All"><img
src="/static/images/alipay_sign.png" uib-tooltip="AliPayOnline"
alt="AliPayOnline"/> 到账金额(AlipayOnline):<a class="text-green"
ng-bind="fut.aliOnlineSettleFee_All|currency:'AUD'"></a>
</p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.hfSettleFee_All"><img
src="/static/images/hf_sign.png" uib-tooltip="Hf" alt="Hf"/> 到账金额:<a
class="text-green" ng-bind="fut.hfSettleFee_All|currency:'AUD'"></a>
</p>
<p class="text-bold col-sm-12" align="left" ng-if="fut.platformGetSettleFee"
style="color: #f06010"><img src="/static/images/r_logo.svg"
style="width: 20px;height: 20px;"
uib-tooltip="RoyalPay" alt="RoyalPay"/>
总到账金额:<a class="text-green"
ng-bind="fut.platformGetSettleFee|currency:'AUD'"></a></p>
</div>
<!-- /.box-body -->
</div>
@ -77,12 +112,14 @@
<input class="form-control" id="date-from-input"
ng-model="params.start_date"
uib-datepicker-popup size="10" placeholder="From"
is-open="dateBegin.open" ng-click="dateBegin.open=true"
is-open="dateBegin.open"
ng-click="dateBegin.open=true"
datepicker-options="{maxDate:params.end_date||today}">
</div>
~
<div style="display: inline-block">
<input class="form-control" id="date-to-input" ng-model="params.end_date"
<input class="form-control" id="date-to-input"
ng-model="params.end_date"
uib-datepicker-popup size="10" placeholder="To"
is-open="dateTo.open" ng-click="dateTo.open=true"
datepicker-options="{minDate:params.start_date,maxDate:today}">
@ -124,39 +161,44 @@
</div>
</div>
</div>
<div class="box box-warning">
<div class="box-header with-border">清算金额趋势</div>
<div class="box-body">
<div class="chart" echarts="stChart" style="height: 300px"
ng-class="{nodata:stChart.nodata}"></div>
<div class="box box-warning">
<div class="box-header with-border">清算金额趋势</div>
<div class="box-body">
<div class="chart" echarts="stChart" style="height: 300px"
ng-class="{nodata:stChart.nodata}"></div>
</div>
</div>
</div>
<div class="box box-warning settle-forecast" >
<div class="box-header">Settlement Logs</div>
<div class="box-body">
<div royal-calendar month-change="loadMonthLog($month)">
<div ng-if="logArray[(day|date:'yyyy-MM-dd')]">
<span class="text-bold">总清算额:</span>
<span style="color: #f60;" ng-bind="logArray[(day|date:'yyyy-MM-dd')].total_amount|currency:'$'"></span>
<div>
<span class="text-bold">T+1 :</span>
<span style="color: #f60;" ng-bind="logArray[(day|date:'yyyy-MM-dd')].one_clean_amount|currency:'$'"></span>
</div>
<div>
<span class="text-bold">T+2 :</span>
<span style="color: #f60;" ng-bind="logArray[(day|date:'yyyy-MM-dd')].two_clean_amount|currency:'$'"></span>
</div>
<div>
<span class="text-bold">T+3 :</span>
<span style="color: #f60;" ng-bind="logArray[(day|date:'yyyy-MM-dd')].three_clean_amount|currency:'$'"></span>
<div class="box box-warning settle-forecast">
<div class="box-header">Settlement Logs</div>
<div class="box-body">
<div royal-calendar month-change="loadMonthLog($month)">
<div ng-if="logArray[(day|date:'yyyy-MM-dd')]">
<span class="text-bold">总清算额:</span>
<span style="color: #f60;"
ng-bind="logArray[(day|date:'yyyy-MM-dd')].total_amount|currency:'$'"></span>
<div>
<span class="text-bold">T+1 :</span>
<span style="color: #f60;"
ng-bind="logArray[(day|date:'yyyy-MM-dd')].one_clean_amount|currency:'$'"></span>
</div>
<div>
<span class="text-bold">T+2 :</span>
<span style="color: #f60;"
ng-bind="logArray[(day|date:'yyyy-MM-dd')].two_clean_amount|currency:'$'"></span>
</div>
<div>
<span class="text-bold">T+3 :</span>
<span style="color: #f60;"
ng-bind="logArray[(day|date:'yyyy-MM-dd')].three_clean_amount|currency:'$'"></span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

26
src/main/ui/static/analysis/transaction/templates/analysis_transaction.html
Unescape View File

@ -1,29 +1,30 @@
<div class="content">
<div class="row">
<div class="col-sm-12 analysis-nav">
<ul class="nav nav-pills">
<li ui-sref-active-eq="active" ng-if="'transAnalysis'|withModule">
<a ui-sref="analysis_transaction.transanalysis"><i class="fa fa-area-chart"></i>交易数据|Transaction Data</a>
</li>
<li ui-sref-active-eq="active" ng-if="'partner_analysis'|withModule">
<a ui-sref="analysis_transaction.partners_analysis"><i class="fa fa-line-chart"></i></i>商户数|Merchants Data</a>
</li>
<!--<li ui-sref-active-eq="active" ng-if="'partner_analysis'|withModule">-->
<!--<a ui-sref="analysis_transaction.partners_analysis"><i class="fa fa-line-chart"></i></i>商户数|Merchants Data</a>-->
<!--</li>-->
<li ui-sref-active="active" ng-if="'dashboard'|withModule">
<a ui-sref="analysis_transaction.gateway"><i class="fa fa-area-chart"></i>Gateway统计|Gateway Analysis</a>
</li>
<li ui-sref-active="active" ng-if="'customer_analysis'|withModule">
<a ui-sref="analysis_transaction.customers_analysis_manage"><i class="fa fa-bar-chart"></i>消费者统计|Customer Analysis</a>
</li>
<li ui-sref-active="active" ng-if="'customerRankingAnalysisApp'|withModule">
<a ui-sref="analysis_transaction.customerRankingAnalysis"><i class="fa fa-male"></i>消费排名|Customers Ranking</a>
</li>
<!--<li ui-sref-active="active" ng-if="'customerRankingAnalysisApp'|withModule">-->
<!--<a ui-sref="analysis_transaction.customerRankingAnalysis"><i class="fa fa-male"></i>消费排名|Customers Ranking</a>-->
<!--</li>-->
<li ui-sref-active="active" ng-if="'refundAnalysisApp'|withModule">
<a ui-sref="analysis_transaction.refundAnalysis"><i class="fa fa-money"></i>退款统计|Refund Analysis</a>
</li>
<li ui-sref-active="active" ng-if="('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)">
<a ui-sref="analysis_transaction.estimateAnalysis"><i class="fa fa-money"></i>清算预估|Settlement Estimate</a>
</li>
<!--<li ui-sref-active="active" ng-if="('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)">-->
<!--<a ui-sref="analysis_transaction.estimateAnalysis"><i class="fa fa-money"></i>清算预估|Settlement Estimate</a>-->
<!--</li>-->
<li ui-sref-active="active" ng-if="'channels_Analysis'|withModule">
<a ui-sref="analysis_transaction.channelsAnalysis"><i class="fa fa-area-chart"></i>支付通道|Channels Analysis</a>
</li>
@ -32,11 +33,12 @@
<a ui-sref="analysis_transaction.amountlsAnalysis"><i class="fa fa-area-chart"></i>交易金额分析|Transaction Amount Analysis</a>
</li>
<li ui-sref-active="active" ng-if="('merchantAmount'|withModule) &&('1'|withRole) ">
<a ui-sref="analysis_transaction.merchantAmountAnalysis"><i class="fa fa-area-chart"></i>商户交易额</a>
</li>
<!--<li ui-sref-active="active" ng-if="('merchantAmount'|withModule) &&('1'|withRole) ">-->
<!--<a ui-sref="analysis_transaction.merchantAmountAnalysis"><i class="fa fa-area-chart"></i>商户交易额</a>-->
<!--</li>-->
</ul>
</div>
</div>
<div class="row">
<div class="col-sm-12">

4
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -87,8 +87,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
templateUrl: '/static/payment/partner/templates/partners.html',
controller: 'partnerListCtrl',
data: {label: '商户列表'}
}).state('partners.new', {
url: '/new',
}).state('newPartners', {
url: '/partners/new',
templateUrl: '/static/payment/partner/templates/add_partner.html',
controller: 'addPartnerCtrl'
}).state('partners.detail', {

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

@ -228,9 +228,9 @@
<i class="fa fa-search"></i> Search
</button>
<!--<div class="pull-right">-->
<button class="btn btn-danger" ng-if="('10000000000'|withRole)" type="button" ui-sref="refundReview">
<i class="fa fa-wrench"></i> Audit Refund
</button>
<!--<button class="btn btn-danger" ng-if="('10000000000'|withRole)" type="button" ui-sref="refundReview">-->
<!--<i class="fa fa-wrench"></i> Audit Refund-->
<!--</button>-->
<!--</div>-->
</div>
</div>

6
src/main/ui/static/risk/templates/risk.html
Unescape View File

@ -35,9 +35,9 @@
class="fa fa-search"></i></button>
</div>
<div class="form-group pull-right">
<button class="btn btn-primary" type="button" ui-sref="analysis_monitoring.attention">Risky Merchants</button>
</div>
<!--<div class="form-group pull-right">-->
<!--<button class="btn btn-primary" type="button" ui-sref="analysis_monitoring.attention">Risky Merchants</button>-->
<!--</div>-->
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save