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

fix

Browse Source
master
yangkai 6 years ago
parent 7d7ee28a4b
commit b5b6a8b286
16 changed files with 40 additions and 91 deletions
Show Stats Download Patch File Download Diff File

58
src/main/ui/main_menu.html
Unescape View File

@ -77,7 +77,7 @@
</a>
</div>
<div ng-if="'partner_analysis'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_transaction.partners_analysis" ui-sref-opts="{reload:true}">
<a ui-sref="partners_analysis" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/merchant_statistics.png"/>
<div class="description-text">
@ -87,7 +87,7 @@
</a>
</div>
<div ng-if="'clientrate'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
<a ui-sref="client_rates" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/merchant_activity_1.png"/>
<div class="description-text">
@ -148,61 +148,11 @@
</a>
</div>
<div ng-if="('transAnalysis'|withModule)" class="col-sm-2 col-xs-6">
<a ui-sref="transanalysis" ui-sref-opts="{reload:true}">
<a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_original_statistics.png"/>
<div class="description-text">
<span class="description-text">交易数据</span>
</div>
</div>
</a>
</div>
<div ng-if="('dashboard'|withModule)" class="col-sm-2 col-xs-6">
<a ui-sref="gateway" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_original_statistics.png"/>
<div class="description-text">
<span class="description-text">Gateway统计</span>
</div>
</div>
</a>
</div>
<div ng-if="('customer_analysis'|withModule)" class="col-sm-2 col-xs-6">
<a ui-sref="customers_analysis_manage" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_original_statistics.png"/>
<div class="description-text">
<span class="description-text">消费者统计</span>
</div>
</div>
</a>
</div>
<div ng-if="('refundAnalysisApp'|withModule)" class="col-sm-2 col-xs-6">
<a ui-sref="refundAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_original_statistics.png"/>
<div class="description-text">
<span class="description-text">退款统计</span>
</div>
</div>
</a>
</div>
<div ng-if="('channels_Analysis'|withModule)" class="col-sm-2 col-xs-6">
<a ui-sref="channelsAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_original_statistics.png"/>
<div class="description-text">
<span class="description-text">支付通道</span>
</div>
</div>
</a>
</div>
<div ng-if="('dashboard'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
<a ui-sref="amountlsAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/transaction_original_statistics.png"/>
<div class="description-text">
<span class="description-text">交易金额分析</span>
<span class="description-text">原统计</span>
</div>
</div>
</a>

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

@ -6,8 +6,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
var app = angular.module('channelsAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('channelsAnalysis', {
url: '/analysis/transaction/channelsAnalysis',
$stateProvider.state('analysis_transaction.channelsAnalysis', {
url: '/channelsAnalysis',
templateUrl: '/static/analysis/templates/channels_analysis.html',
controller: 'channelsCtrl'
})

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 app = angular.module('customersAnalysisManage', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('customers_analysis_manage', {
$stateProvider.state('analysis_transaction.customers_analysis_manage', {
url: '/analysis/customers',
templateUrl: '/static/analysis/templates/manage_customers_orders.html',
controller: 'customersAnalysisCtrl'

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

@ -6,10 +6,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
'use strict';
var app = angular.module('preRefundApp', ['ui.router']);
app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('pre_refund', {
$stateProvider.state('analysis_monitoring.pre_refund', {
controller: 'preRefundCtrl',
templateUrl: '/static/analysis/templates/pre_refund.html',
url: '/analysis/monitoring/pre_refund'
url: '/pre_refund'
})
}]);

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

@ -3,8 +3,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
var app = angular.module('refundAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('refundAnalysis', {
url: '/analysis/transaction/refunds',
$stateProvider.state('analysis_transaction.refundAnalysis', {
url: '/refunds',
templateUrl: '/static/analysis/templates/refund_analysis.html',
controller: 'refundListCtrl'
})

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

@ -7,7 +7,7 @@
text-align: center;
}
</style>
<section class="content-header">
<!--<section class="content-header">
<h1>Channels Analysis</h1>
<ol class="breadcrumb">
<li>
@ -15,7 +15,7 @@
</li>
<li class="active">Channels</li>
</ol>
</section>
</section>-->
<section class="content">
<div class="row">
<div class="col-sm-12">

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

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

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

@ -1,4 +1,4 @@
<section class="content-header">
<!--<section class="content-header">
<h1>Pre Refund</h1>
<ol class="breadcrumb">
<li>
@ -6,7 +6,7 @@
</li>
<li class="active">Pre Refund</li>
</ol>
</section>
</section>-->
<section class="content">
<div class="row">
<div class="box">

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

@ -7,7 +7,7 @@
text-align: center;
}
</style>
<section class="content-header">
<!--<section class="content-header">
<h1>Refund Analysis</h1>
<ol class="breadcrumb">
<li>
@ -15,7 +15,7 @@
</li>
<li class="active">Refund</li>
</ol>
</section>
</section>-->
<div class="content">
<div class="content">
<div class="box-solid">

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

@ -7,7 +7,7 @@
text-align: center;
}
</style>
<section class="content-header">
<!--<section class="content-header">
<h1>Transaction Data</h1>
<ol class="breadcrumb">
<li>
@ -15,7 +15,7 @@
</li>
<li class="active">Transaction Data</li>
</ol>
</section>
</section>-->
<div class="content">
<div class="row">
<div style="text-align: right" class="col-sm-12">

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

@ -7,7 +7,7 @@
text-align: center;
}
</style>
<section class="content-header">
<!--<section class="content-header">
<h1>Transaction Data</h1>
<ol class="breadcrumb">
<li>
@ -15,7 +15,7 @@
</li>
<li class="active">Transaction Data</li>
</ol>
</section>
</section>-->
<div class="content">
<div class="row">
<div style="text-align: right" class="col-sm-12">

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

@ -1,4 +1,4 @@
<section class="content-header">
<!--<section class="content-header">
<h1>Transaction Amount Analysis</h1>
<ol class="breadcrumb">
<li>
@ -6,7 +6,7 @@
</li>
<li class="active">Transaction Amount</li>
</ol>
</section>
</section>-->
<div class="content">
<div class="row">
<div class="col-sm-12">

6
src/main/ui/static/analysis/trans-analysis-monthly.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 app = angular.module('transAnalysisMonthly', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('transanalysis_monthly', {
$stateProvider.state('analysis_transaction.transanalysis_monthly', {
url: '/analysis/transaction_monthly',
templateUrl: '/static/analysis/templates/trans_analysis_monthly.html',
controller: 'transAnalysisMonthlyCtrl'
@ -15,12 +15,12 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
{
key: 'day',
label: '按日统计',
sref:"transanalysis"
sref:"analysis_transaction.transanalysis"
},
{
key: 'month',
label: '按月统计',
sref:"transanalysis_monthly"
sref:"analysis_transaction.transanalysis_monthly"
}
];
$scope.currentScalekey = 'month';

6
src/main/ui/static/analysis/trans-analysis.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 app = angular.module('transAnalysis', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('transanalysis', {
$stateProvider.state('analysis_transaction.transanalysis', {
url: '/analysis/transaction',
templateUrl: '/static/analysis/templates/trans_analysis.html',
controller: 'transAnalysisCtrl'
@ -15,12 +15,12 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
{
key: 'day',
label: '按日统计',
sref:"transanalysis"
sref:"analysis_transaction.transanalysis"
},
{
key: 'month',
label: '按月统计',
sref:"transanalysis_monthly"
sref:"analysis_transaction.transanalysis_monthly"
}
];
$scope.currentScalekey = 'day';

17
src/main/ui/static/analysis/transaction/analysis-transaction.js
Unescape View File

@ -6,17 +6,16 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
var app = angular.module('analysisTransaction', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
app.config(['$stateProvider', function ($stateProvider) {
// $stateProvider.state('analysis_transaction', {
// url: '/analysis/transaction',
// templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html',
// controller: 'analysisTransactionCtrl'
// })
$stateProvider.state('gateway', {
url: '/analysis/transaction/gateway',
$stateProvider.state('analysis_transaction', {
url: '/analysis/transaction',
templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html',
controller: 'analysisTransactionCtrl'
}).state('analysis_transaction.gateway', {
url: '/gateway',
templateUrl: '/static/dashboard/templates/dashboard_gateway.html',
controller: 'gatewayTransCtrl'
}).state('amountlsAnalysis', {
url: '/analysis/transaction/amountRangeAnalysis',
}).state('analysis_transaction.amountlsAnalysis', {
url: '/amountRangeAnalysis',
templateUrl: '/static/analysis/templates/transaction_amount_Analysis.html',
controller: 'transactionAmountCtrl'
})

2
src/main/ui/static/dashboard/templates/dashboard_gateway.html
Unescape View File

@ -7,7 +7,7 @@
text-align: center;
}
</style>
<section class="content-header">
<section class="content-header" ng-if="dashboardPage">
<h1>
Gateway Analysis
</h1>

Write Preview
Loading…
Cancel
Save