From 297d01a794c5c51708d7f3c5f5b10263f6654d18 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 30 Oct 2018 09:38:19 +0800 Subject: [PATCH] fix manage.html & menu_html --- src/main/ui/manage.html | 28 +++++++++-- .../ui/static/analysis/channels_analysis.js | 2 +- .../ui/static/analysis/refund_analysis.js | 2 +- .../static/analysis/trans-analysis-monthly.js | 2 +- src/main/ui/static/analysis/trans-analysis.js | 4 +- .../transaction/analysis-transaction.js | 8 +-- .../templates/analysis_transaction.html | 30 +++++------ .../templates/permission_config.html | 4 +- .../templates/permission_functions.html | 2 +- .../ui/static/menu/templates/main_menu.html | 50 +++++++++++++++++-- 10 files changed, 96 insertions(+), 36 deletions(-) diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index 8f6e7fcae..a9fa07fc1 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -313,12 +313,12 @@ margin-bottom: 10%;"/>
  • - 商户活跃度(原统计) + 商户活跃度
  • - 商户交易额统计（原统计） + 商户交易额统计
    • @@ -338,8 +338,28 @@ margin-bottom: 10%;"/>
  • - - 原统计 + + 交易数据|Transaction Data + +
    • +
  • + + Gateway统计 + +
    • +
  • + + 退款统计|Refund Analysis + +
    • +
  • + + 支付通道|Channels Analysis + +
    • +
  • + + 交易金额分析
    • diff --git a/src/main/ui/static/analysis/channels_analysis.js b/src/main/ui/static/analysis/channels_analysis.js index 7cf052150..c9153a7db 100644 --- a/src/main/ui/static/analysis/channels_analysis.js +++ b/src/main/ui/static/analysis/channels_analysis.js @@ -6,7 +6,7 @@ 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('analysis_transaction.channelsAnalysis', { + $stateProvider.state('analysis_channelsAnalysis', { url: '/channelsAnalysis', templateUrl: '/static/analysis/templates/channels_analysis.html', controller: 'channelsCtrl' diff --git a/src/main/ui/static/analysis/refund_analysis.js b/src/main/ui/static/analysis/refund_analysis.js index 870bbf544..f77ba79e2 100644 --- a/src/main/ui/static/analysis/refund_analysis.js +++ b/src/main/ui/static/analysis/refund_analysis.js @@ -3,7 +3,7 @@ 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('analysis_transaction.refundAnalysis', { + $stateProvider.state('analysis_refundAnalysis', { url: '/refunds', templateUrl: '/static/analysis/templates/refund_analysis.html', controller: 'refundListCtrl' diff --git a/src/main/ui/static/analysis/trans-analysis-monthly.js b/src/main/ui/static/analysis/trans-analysis-monthly.js index c1bccba7c..9353218cc 100644 --- a/src/main/ui/static/analysis/trans-analysis-monthly.js +++ b/src/main/ui/static/analysis/trans-analysis-monthly.js @@ -15,7 +15,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an { key: 'day', label: '按日统计', - sref:"analysis_transaction.transanalysis" + sref:"analysis_transanalysis" }, { key: 'month', diff --git a/src/main/ui/static/analysis/trans-analysis.js b/src/main/ui/static/analysis/trans-analysis.js index 2087785c3..7bccea5a0 100644 --- a/src/main/ui/static/analysis/trans-analysis.js +++ b/src/main/ui/static/analysis/trans-analysis.js @@ -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('analysis_transaction.transanalysis', { + $stateProvider.state('analysis_transanalysis', { url: '/analysis/transaction', templateUrl: '/static/analysis/templates/trans_analysis.html', controller: 'transAnalysisCtrl' @@ -15,7 +15,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an { key: 'day', label: '按日统计', - sref:"analysis_transaction.transanalysis" + sref:"analysis_transanalysis" }, { key: 'month', diff --git a/src/main/ui/static/analysis/transaction/analysis-transaction.js b/src/main/ui/static/analysis/transaction/analysis-transaction.js index dafc91ff2..7e4caa701 100644 --- a/src/main/ui/static/analysis/transaction/analysis-transaction.js +++ b/src/main/ui/static/analysis/transaction/analysis-transaction.js @@ -10,11 +10,11 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul url: '/analysis/transaction', templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html', controller: 'analysisTransactionCtrl' - }).state('analysis_transaction.gateway', { - url: '/gateway', + }).state('analysis_gateway', { + url: '/analysis/transaction/gateway', templateUrl: '/static/dashboard/templates/dashboard_gateway.html', controller: 'gatewayTransCtrl' - }).state('analysis_transaction.amountlsAnalysis', { + }).state('analysis_amountlsAnalysis', { url: '/amountRangeAnalysis', templateUrl: '/static/analysis/templates/transaction_amount_Analysis.html', controller: 'transactionAmountCtrl' @@ -159,7 +159,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul }]); app.controller('analysisTransactionCtrl', ['$scope','$state', function ($scope,$state) { if($state.is('analysis_transaction')){ - $state.go('.transanalysis'); + $state.go('analysis_transanalysis'); } }]); diff --git a/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html b/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html index bb2327797..dd409ca64 100644 --- a/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html +++ b/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html @@ -4,34 +4,34 @@