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

fix manage.html & menu_html

Browse Source
master
luoyang 6 years ago
parent ad83527c06
commit 297d01a794
10 changed files with 96 additions and 36 deletions
Show Stats Download Patch File Download Diff File

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

@ -313,12 +313,12 @@ margin-bottom: 10%;"/>
</li> </li>
<li ui-sref-active="active" ng-if="'clientrate'|withModule"> <li ui-sref-active="active" ng-if="'clientrate'|withModule">
<a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
<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="('merchantAmount'|withModule)"> <li ui-sref-active="active" ng-if="('merchantAmount'|withModule)">
<a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}"> <a ui-sref="merchantAmountAnalysis" 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>
</ul> </ul>
@ -338,8 +338,28 @@ margin-bottom: 10%;"/>
</a> </a>
</li> </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_transanalysis" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>原统计</span> <i class="fa fa-area-chart"></i> <span>交易数据|Transaction Data</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('dashboard'|withModule)">
<a ui-sref="analysis_gateway" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>Gateway统计</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('refundAnalysisApp'|withModule)">
<a ui-sref="analysis_refundAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>退款统计|Refund Analysis</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('channels_Analysis'|withModule)">
<a ui-sref="analysis_channelsAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>支付通道|Channels Analysis</span>
</a>
</li>
<li ui-sref-active="active" ng-if="('dashboard'|withModule)&&(currentUser.org_id==null)">
<a ui-sref="analysis_amountlsAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>交易金额分析</span>
</a> </a>
</li> </li>
</ul> </ul>

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

@ -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 app = angular.module('channelsAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
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'];
app.config(['$stateProvider', function ($stateProvider) { app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('analysis_transaction.channelsAnalysis', { $stateProvider.state('analysis_channelsAnalysis', {
url: '/channelsAnalysis', url: '/channelsAnalysis',
templateUrl: '/static/analysis/templates/channels_analysis.html', templateUrl: '/static/analysis/templates/channels_analysis.html',
controller: 'channelsCtrl' controller: 'channelsCtrl'

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

@ -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 app = angular.module('refundAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
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'];
app.config(['$stateProvider', function ($stateProvider) { app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('analysis_transaction.refundAnalysis', { $stateProvider.state('analysis_refundAnalysis', {
url: '/refunds', url: '/refunds',
templateUrl: '/static/analysis/templates/refund_analysis.html', templateUrl: '/static/analysis/templates/refund_analysis.html',
controller: 'refundListCtrl' controller: 'refundListCtrl'

2
src/main/ui/static/analysis/trans-analysis-monthly.js
Unescape View File

@ -15,7 +15,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
{ {
key: 'day', key: 'day',
label: '按日统计', label: '按日统计',
sref:"analysis_transaction.transanalysis" sref:"analysis_transanalysis"
}, },
{ {
key: 'month', key: 'month',

4
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 colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
var app = angular.module('transAnalysis', ['ui.bootstrap', 'ui.router', 'ngEcharts']); var app = angular.module('transAnalysis', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
app.config(['$stateProvider', function ($stateProvider) { app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('analysis_transaction.transanalysis', { $stateProvider.state('analysis_transanalysis', {
url: '/analysis/transaction', url: '/analysis/transaction',
templateUrl: '/static/analysis/templates/trans_analysis.html', templateUrl: '/static/analysis/templates/trans_analysis.html',
controller: 'transAnalysisCtrl' controller: 'transAnalysisCtrl'
@ -15,7 +15,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
{ {
key: 'day', key: 'day',
label: '按日统计', label: '按日统计',
sref:"analysis_transaction.transanalysis" sref:"analysis_transanalysis"
}, },
{ {
key: 'month', key: 'month',

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

@ -10,11 +10,11 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
url: '/analysis/transaction', url: '/analysis/transaction',
templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html', templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html',
controller: 'analysisTransactionCtrl' controller: 'analysisTransactionCtrl'
}).state('analysis_transaction.gateway', { }).state('analysis_gateway', {
url: '/gateway', url: '/analysis/transaction/gateway',
templateUrl: '/static/dashboard/templates/dashboard_gateway.html', templateUrl: '/static/dashboard/templates/dashboard_gateway.html',
controller: 'gatewayTransCtrl' controller: 'gatewayTransCtrl'
}).state('analysis_transaction.amountlsAnalysis', { }).state('analysis_amountlsAnalysis', {
url: '/amountRangeAnalysis', url: '/amountRangeAnalysis',
templateUrl: '/static/analysis/templates/transaction_amount_Analysis.html', templateUrl: '/static/analysis/templates/transaction_amount_Analysis.html',
controller: 'transactionAmountCtrl' controller: 'transactionAmountCtrl'
@ -159,7 +159,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
}]); }]);
app.controller('analysisTransactionCtrl', ['$scope','$state', function ($scope,$state) { app.controller('analysisTransactionCtrl', ['$scope','$state', function ($scope,$state) {
if($state.is('analysis_transaction')){ if($state.is('analysis_transaction')){
$state.go('.transanalysis'); $state.go('analysis_transanalysis');
} }
}]); }]);

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

@ -4,34 +4,34 @@
<div class="col-sm-12 analysis-nav"> <div class="col-sm-12 analysis-nav">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li ui-sref-active-eq="active" ng-if="'transAnalysis'|withModule"> <!-- <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> <a ui-sref="analysis_transanalysis"><i class="fa fa-area-chart"></i>交易数据|Transaction Data</a>
</li> </li>-->
<!--<li ui-sref-active-eq="active" ng-if="'partner_analysis'|withModule">--> <!--<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>--> <!--<a ui-sref="analysis_transaction.partners_analysis"><i class="fa fa-line-chart"></i></i>商户数|Merchants Data</a>-->
<!--</li>--> <!--</li>-->
<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_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>-->
<li ui-sref-active="active" ng-if="'refundAnalysisApp'|withModule"> <!--<li ui-sref-active="active" ng-if="'refundAnalysisApp'|withModule">-->
<a ui-sref="analysis_transaction.refundAnalysis"><i class="fa fa-money"></i>退款统计|Refund Analysis</a> <!--<a ui-sref="analysis_refundAnalysis"><i class="fa fa-money"></i>退款统计|Refund Analysis</a>-->
</li> <!--</li>-->
<!--<li ui-sref-active="active" ng-if="('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)">--> <!--<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>--> <!--<a ui-sref="analysis_transaction.estimateAnalysis"><i class="fa fa-money"></i>清算预估|Settlement Estimate</a>-->
<!--</li>--> <!--</li>-->
<li ui-sref-active="active" ng-if="'channels_Analysis'|withModule"> <!--<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> <!--<a ui-sref="analysis_channelsAnalysis"><i class="fa fa-area-chart"></i>支付通道|Channels Analysis</a>-->
</li> <!--</li>-->
<li ui-sref-active="active" ng-if="('dashboard'|withModule)&&(currentUser.org_id==null)"> <!--<li ui-sref-active="active" ng-if="('dashboard'|withModule)&&(currentUser.org_id==null)">-->
<a ui-sref="analysis_transaction.amountlsAnalysis"><i class="fa fa-area-chart"></i>交易金额分析|Transaction Amount Analysis</a> <!--<a ui-sref="analysis_amountlsAnalysis"><i class="fa fa-area-chart"></i>交易金额分析|Transaction Amount Analysis</a>-->
</li> <!--</li>-->
<!--<li ui-sref-active="active" ng-if="('merchantAmount'|withModule) &&('1'|withRole) ">--> <!--<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>--> <!--<a ui-sref="analysis_transaction.merchantAmountAnalysis"><i class="fa fa-area-chart"></i>商户交易额</a>-->

4
src/main/ui/static/config/sysconfigs/templates/permission_config.html
Unescape View File

@ -87,9 +87,9 @@
<div class="box-header with-border">权限 <div class="box-header with-border">权限
<button style="float: right;" class="btn btn-success" ng-click="submitAuthorize()">Submit</button> <button style="float: right;" class="btn btn-success" ng-click="submitAuthorize()">Submit</button>
</div> </div>
<div class="box-body table-responsive"> <div class="box-body">
<div class="row"> <div class="row">
<div class="col-sm-4 col-xs-1"> <div class="col-sm-4 col-xs-1" style="height:800px;overflow-y:scroll;">
<a role="button" ng-class="{active:mod.module_name==moduleName}" ng-click="switchModule(mod.module_name)" class="list-group-item" ng-repeat="mod in modules.modules" ng-bind="mod.module_name+' - '+mod.remark"></a> <a role="button" ng-class="{active:mod.module_name==moduleName}" ng-click="switchModule(mod.module_name)" class="list-group-item" ng-repeat="mod in modules.modules" ng-bind="mod.module_name+' - '+mod.remark"></a>
</div> </div>
<div class="col-sm-8 col-xs-1"> <div class="col-sm-8 col-xs-1">

2
src/main/ui/static/config/sysconfigs/templates/permission_functions.html
Unescape View File

@ -12,7 +12,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-3"> <div class="col-sm-3" style="height:800px;overflow-y:scroll;">
<a ng-if="modFunctions.no_module.length" ng-class="{active:'no_module'==tabModuleName}" ng-click="moduleTab('no_module')" role="button" class="list-group-item" >Functions With No Modules</a> <a ng-if="modFunctions.no_module.length" ng-class="{active:'no_module'==tabModuleName}" ng-click="moduleTab('no_module')" role="button" class="list-group-item" >Functions With No Modules</a>
<a role="button" class="list-group-item" ng-class="{active:mod.module_name==tabModuleName}" ng-click="moduleTab(mod.module_name)" ng-repeat="mod in modFunctions.modules" ng-bind="mod.module_name+' - '+mod.remark"></a> <a role="button" class="list-group-item" ng-class="{active:mod.module_name==tabModuleName}" ng-click="moduleTab(mod.module_name)" ng-repeat="mod in modFunctions.modules" ng-bind="mod.module_name+' - '+mod.remark"></a>
</div> </div>

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

@ -76,7 +76,7 @@
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/merchant_statistics.png"/> <img src="/static/images/main_menu/merchant_statistics.png"/>
<div class="description-text"> <div class="description-text">
<span class="description-text">商户统计(原统计)</span> <span class="description-text">商户统计</span>
</div> </div>
</div> </div>
</a> </a>
@ -86,7 +86,7 @@
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/merchant_activity_1.png"/> <img src="/static/images/main_menu/merchant_activity_1.png"/>
<div class="description-text"> <div class="description-text">
<span class="description-text">商户活跃度(原统计)</span> <span class="description-text">商户活跃度</span>
</div> </div>
</div> </div>
</a> </a>
@ -96,7 +96,7 @@
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/merchant_turnover.png"/> <img src="/static/images/main_menu/merchant_turnover.png"/>
<div class="description-text"> <div class="description-text">
<span class="description-text">商户交易额(原统计)</span> <span class="description-text">商户交易额</span>
</div> </div>
</div> </div>
</a> </a>
@ -123,15 +123,55 @@
</a> </a>
</div> </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_transanalysis" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/transaction_original_statistics.png"/> <img src="/static/images/main_menu/transaction_original_statistics.png"/>
<div class="description-text"> <div class="description-text">
<span class="description-text">原统计</span> <span class="description-text">交易数据</span>
</div> </div>
</div> </div>
</a> </a>
</div> </div>
<div ng-if="('dashboard'|withModule)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_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="('refundAnalysisApp'|withModule)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_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="analysis_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="analysis_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>
</div>
</div>
</a>
</div>
</div> </div>
</div> </div>
<div class="list-group" ng-if="role=='riskmanager'"> <div class="list-group" ng-if="role=='riskmanager'">

Write Preview
Loading…
Cancel
Save