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

fix

Browse Source
master
yangkai 6 years ago
parent 4780926f00
commit f1e11d178f
9 changed files with 132 additions and 64 deletions
Show Stats Download Patch File Download Diff File

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

@ -337,26 +337,11 @@ margin-bottom: 10%;"/>
<i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span> <i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('1010'|withRole)">
<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="('100001010'|withRole)">
<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="('transAnalysis'|withModule)"> <li ui-sref-active="active" ng-if="('transAnalysis'|withModule)">
<a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>原统计</span> <i class="fa fa-area-chart"></i> <span>原统计</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="'log'|withModule">
<a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
<i class="fa fa-server"></i> <span>支付回调消息|Notify History</span>
</a>
</li>
</ul> </ul>
</li> </li>
@ -398,6 +383,16 @@ margin-bottom: 10%;"/>
<i class="fa fa fa-male"></i> <span>消费排名|Risky Merchants</span> <i class="fa fa fa-male"></i> <span>消费排名|Risky Merchants</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="'customer_analysis'|withModule">
<a ui-sref="customersAnalysisManage" ui-sref-opts="{reload:true}">
<i class="fa fa-bar-chart"></i> <span>消费者统计|Customer Analysis</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('10000000000'|withRole)">
<a ui-sref="refundReview" ui-sref-opts="{reload:true}">
<i class="fa fa-wrench"></i> <span>退款审核|Audit Refund</span>
</a>
</li>
</ul> </ul>
</li> </li>
@ -442,6 +437,11 @@ margin-bottom: 10%;"/>
<i class="fa fa-envelope"></i> <span>Alipay进件表格导出</span> <i class="fa fa-envelope"></i> <span>Alipay进件表格导出</span>
</a> </a>
</li> </li>
<li ui-sref-active="active">
<a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
<i class="fa fa-balance-scale"></i> <span>商户手动清算</span>
</a>
</li>
</ul> </ul>
</li> </li>
@ -458,7 +458,7 @@ margin-bottom: 10%;"/>
<i class="fa fa-balance-scale"></i> <span>交易对账|Order Validation</span> <i class="fa fa-balance-scale"></i> <span>交易对账|Order Validation</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('clearing'|withModule) && (role!='director')"> <li ui-sref-active="active" ng-if="('clearing'|withModule) && (roleNow!='director')">
<a ui-sref="date_setting"> <a ui-sref="date_setting">
<i class="fa fa-balance-scale"></i> <span>清算日管理</span> <i class="fa fa-balance-scale"></i> <span>清算日管理</span>
</a> </a>
@ -479,7 +479,7 @@ margin-bottom: 10%;"/>
<i class="fa fa fa-tv"></i> <span>清算月报</span> <i class="fa fa fa-tv"></i> <span>清算月报</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('platformRevenue'|withModule) && (role!='director')"> <li ui-sref-active="active" ng-if="('platformRevenue'|withModule) && (roleNow!='director')">
<a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
<i class="fa fa fa-money"></i> <span>清算验证|Validation</span> <i class="fa fa fa-money"></i> <span>清算验证|Validation</span>
</a> </a>
@ -525,6 +525,21 @@ margin-bottom: 10%;"/>
<i class="fa fa-users"></i> <span>合伙人提成</span> <i class="fa fa-users"></i> <span>合伙人提成</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
<a ui-sref="cashbackAnalysis">
<i class="fa fa-gift"></i> <span>商户营销账户</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('contract'|withModule)">
<a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
<i class="fa fa-balance-scale"></i> <span>商户手动清算</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('preRefund'|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>
</ul> </ul>
</li> </li>
@ -546,11 +561,6 @@ margin-bottom: 10%;"/>
<i class="fa fa-gift"></i> <span>鼓励金</span> <i class="fa fa-gift"></i> <span>鼓励金</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
<a ui-sref="cashbackAnalysis">
<i class="fa fa-gift"></i> <span>商户营销账户</span>
</a>
</li>
<li ui-sref-active="active" ng-if="'settleDelay'|withModule"> <li ui-sref-active="active" ng-if="'settleDelay'|withModule">
<a ui-sref="settle_delay" ui-sref-opts="{reload:true}"> <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
<i class="fa fa-users"></i> <span>周末费率减半活动</span> <i class="fa fa-users"></i> <span>周末费率减半活动</span>
@ -708,6 +718,11 @@ margin-bottom: 10%;"/>
<i class="fa fa-shopping-cart"></i> <span>商户活跃度</span> <i class="fa fa-shopping-cart"></i> <span>商户活跃度</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
<a ui-sref="cashbackAnalysis">
<i class="fa fa-gift"></i> <span>商户营销账户</span>
</a>
</li>
</ul> </ul>
</li> </li>
@ -794,6 +809,11 @@ margin-bottom: 10%;"/>
<i class="fa fa-cog"></i> <span>开发工具|DevTools</span> <i class="fa fa-cog"></i> <span>开发工具|DevTools</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="'log'|withModule">
<a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
<i class="fa fa-server"></i> <span>支付回调消息|Notify History</span>
</a>
</li>
</ul> </ul>
</li> </li>
</ul> </ul>

2
src/main/ui/static/analysis/manage-customers-orders.js
Unescape View File

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

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

@ -7,15 +7,15 @@
text-align: center; text-align: center;
} }
</style> </style>
<!--<section class="content-header"> <section class="content-header">
<h1>Customers Analysis</h1> <h1>Customers Analysis</h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<i class="fa fa-list-alt"></i> Analysis <i class="fa fa-sitemap"></i> Risk Management
</li> </li>
<li class="active">Customers</li> <li class="active">Customers</li>
</ol> </ol>
</section>--> </section>
<div class="content"> <div class="content">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">

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

@ -13,9 +13,9 @@
<li ui-sref-active="active" ng-if="'dashboard'|withModule"> <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> <a ui-sref="analysis_transaction.gateway"><i class="fa fa-area-chart"></i>Gateway统计|Gateway Analysis</a>
</li> </li>
<li ui-sref-active="active" ng-if="'customer_analysis'|withModule"> <!--<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> <a ui-sref="analysis_transaction.customers_analysis_manage"><i class="fa fa-bar-chart"></i>消费者统计|Customer Analysis</a>
</li> </li>-->
<!--<li ui-sref-active="active" ng-if="'customerRankingAnalysisApp'|withModule">--> <!--<li ui-sref-active="active" ng-if="'customerRankingAnalysisApp'|withModule">-->
<!--<a ui-sref="analysis_transaction.customerRankingAnalysis"><i class="fa fa-male"></i>消费排名|Customers Ranking</a>--> <!--<a ui-sref="analysis_transaction.customerRankingAnalysis"><i class="fa fa-male"></i>消费排名|Customers Ranking</a>-->
<!--</li>--> <!--</li>-->

2
src/main/ui/static/config/bdprize/templates/bd_prize_root.html
Unescape View File

@ -50,7 +50,7 @@
<div class="box-body"> <div class="box-body">
<div class="row"> <div class="row">
<div class="col-xs-2" ng-repeat="mon in months"> <div class="col-xs-2" ng-repeat="mon in months">
<a ng-if="hasReport(mon) && ('1000'|withRole)"> <a ng-if="hasReport(mon) && ('10000000000000'|withRole)">
<h2 ROLE="button" class="text-success" ui-sref=".month_report({month:mon})" ng-bind="mon.substring(5,7)"></h2> <h2 ROLE="button" class="text-success" ui-sref=".month_report({month:mon})" ng-bind="mon.substring(5,7)"></h2>
<span class="fa fa-edit btn" ng-click="editCommissionConfig(mon)">Commission</span> <span class="fa fa-edit btn" ng-click="editCommissionConfig(mon)">Commission</span>
</a> </a>

108
src/main/ui/static/menu/templates/main_menu.html
Unescape View File

@ -122,26 +122,6 @@
</div> </div>
</a> </a>
</div> </div>
<div ng-if="('1010'|withRole)" class="col-sm-2 col-xs-6">
<a ui-sref="refundReview" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_refund.png"/>
<div class="description-text">
<span class="description-text">退款审核</span>
</div>
</div>
</a>
</div>
<div ng-if="('100001010'|withRole)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_arrears.png"/>
<div class="description-text">
<span class="description-text">欠款</span>
</div>
</div>
</a>
</div>
<div ng-if="('transAnalysis'|withModule)" class="col-sm-2 col-xs-6"> <div ng-if="('transAnalysis'|withModule)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
@ -152,16 +132,6 @@
</div> </div>
</a> </a>
</div> </div>
<div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_callback_message.png"/>
<div class="description-text">
<span class="description-text">支付回调消息</span>
</div>
</div>
</a>
</div>
</div> </div>
</div> </div>
<div class="list-group" ng-if="role=='riskmanager'"> <div class="list-group" ng-if="role=='riskmanager'">
@ -233,6 +203,26 @@
</div> </div>
</a> </a>
</div> </div>
<div class="col-sm-2 col-xs-6" ng-if="'customer_analysis'|withModule">
<a ui-sref="customersAnalysisManage" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/risk_consumption_ranking.png"/>
<div class="description-text">
<span class="description-text">消费者统计</span>
</div>
</div>
</a>
</div>
<div ng-if="('10000000000'|withRole)" class="col-sm-2 col-xs-6">
<a ui-sref="refundReview" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_refund.png"/>
<div class="description-text">
<span class="description-text">退款审核</span>
</div>
</div>
</a>
</div>
</div> </div>
</div> </div>
<div class="list-group" ng-if="role=='compliance'"> <div class="list-group" ng-if="role=='compliance'">
@ -305,6 +295,16 @@
</div> </div>
</a> </a>
</div> </div>
<div class="col-sm-2 col-xs-6">
<a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/compliance_alipayexcel.png"/>
<div class="description-text">
<span>商户手动清算</span>
</div>
</div>
</a>
</div>
</div> </div>
</div> </div>
<div class="list-group" ng-if="(role=='salesmanager') || (role=='director')"> <div class="list-group" ng-if="(role=='salesmanager') || (role=='director')">
@ -428,6 +428,15 @@
</div> </div>
</div> </div>
</a></div> </a></div>
<div ng-if="'cashbackAnalysis'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="cashbackAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/bd_merchant_activity.png"/>
<div class="description-text">
<span class="description-text">商户营销账户</span>
</div>
</div>
</a></div>
</div> </div>
</div> </div>
<div class="list-group" ng-if="role=='sitemanager'"> <div class="list-group" ng-if="role=='sitemanager'">
@ -661,6 +670,35 @@
</div> </div>
</div> </div>
</a></div> </a></div>
<div ng-if="'cashbackAnalysis'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="cashbackAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/bd_merchant_activity.png"/>
<div class="description-text">
<span class="description-text">商户营销账户</span>
</div>
</div>
</a></div>
<div class="col-sm-2 col-xs-6">
<a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_arrears.png"/>
<div class="description-text">
<span>商户手动清算</span>
</div>
</div>
</a>
</div>
<div ng-if="('preRefund'|withModule)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_arrears.png"/>
<div class="description-text">
<span class="description-text">商户欠款</span>
</div>
</div>
</a>
</div>
</div> </div>
</div> </div>
<div class="list-group" ng-if="role=='accountant' || role=='director'"> <div class="list-group" ng-if="role=='accountant' || role=='director'">
@ -869,6 +907,16 @@
</div> </div>
</div> </div>
</a></div> </a></div>
<div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_callback_message.png"/>
<div class="description-text">
<span class="description-text">支付回调消息</span>
</div>
</div>
</a>
</div>
</div> </div>
</div> </div>
<div ng-if="('1000000000000'|withRole)" class="list-group"> <div ng-if="('1000000000000'|withRole)" class="list-group">

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

@ -18,7 +18,7 @@
<div class="col-sm-12"> <div class="col-sm-12">
<div class="box-solid"> <div class="box-solid">
<div class="panel panel-default" ng-if="'10'|withRole"> <div class="panel panel-default" ng-if="'10000000000'|withRole">
<div class="panel-heading">Refund Audit</div> <div class="panel-heading">Refund Audit</div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">

4
src/main/ui/static/sys/templates/contract_sign.html
Unescape View File

@ -8,7 +8,7 @@
</ol> </ol>
</section> </section>
<ul class="nav nav-tabs"> <!--<ul class="nav nav-tabs">
<li ui-sref-active-eq="active" class="active"> <li ui-sref-active-eq="active" class="active">
<a ui-sref="contract">Contract</a> <a ui-sref="contract">Contract</a>
</li> </li>
@ -16,7 +16,7 @@
<a ui-sref="manual_settle">Manual Settle</a> <a ui-sref="manual_settle">Manual Settle</a>
</li> </li>
</ul> </ul>
<br> <br>-->
<div class="box box-danger"> <div class="box box-danger">
<div class="modal-body"> <div class="modal-body">
<div class="form-inline"> <div class="form-inline">

4
src/main/ui/static/sys/templates/manual_settle.html
Unescape View File

@ -8,14 +8,14 @@
</ol> </ol>
</section> </section>
<ul class="nav nav-tabs"> <!--<ul class="nav nav-tabs">
<li ui-sref-active-eq="active" class="active"> <li ui-sref-active-eq="active" class="active">
<a ui-sref="contract">Contract</a> <a ui-sref="contract">Contract</a>
</li> </li>
<li ui-sref-active-eq="active" class="active"> <li ui-sref-active-eq="active" class="active">
<a ui-sref="manual_settle">Manual Settle</a> <a ui-sref="manual_settle">Manual Settle</a>
</li> </li>
</ul> </ul>-->
<div class="modal-body"> <div class="modal-body">
<div class="box box-danger"> <div class="box box-danger">
<div class="box-header">商户</div> <div class="box-header">商户</div>

Write Preview
Loading…
Cancel
Save