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

fix

Browse Source
master
yangkai 6 years ago
parent e19685ad99
commit 7fc914f6ce
3 changed files with 474 additions and 345 deletions
Show Stats Download Patch File Download Diff File

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

@ -274,7 +274,8 @@ margin-bottom: 10%;"/>
<aside class="main-sidebar" style="height: 100%;max-height: 100%;overflow: auto;padding-bottom: 50px;"> <aside class="main-sidebar" style="height: 100%;max-height: 100%;overflow: auto;padding-bottom: 50px;">
<!--sidebar: style can be found in sidebar.less --> <!--sidebar: style can be found in sidebar.less -->
<section class="sidebar"> <section class="sidebar">
<ul class="sidebar-menu">
<ul class="sidebar-menu" data-widget="tree">
<li ui-sref-active="active" ng-if="'dashboard'|withModule"> <li ui-sref-active="active" ng-if="'dashboard'|withModule">
<a ui-sref="dashboard"> <a ui-sref="dashboard">
@ -283,7 +284,12 @@ margin-bottom: 10%;"/>
</a> </a>
</li> </li>
<li class="header nav-header" ng-if="'1011110'|withRole">商户管理|Partner Manage</li> <li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-sitemap"></i>
<span>商户管理|Partner Manage</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="'partners'|withModule"> <li ui-sref-active="active" ng-if="'partners'|withModule">
<a ui-sref="partners" ui-sref-opts="{reload:true}"> <a ui-sref="partners" ui-sref-opts="{reload:true}">
<i class="fa fa-sitemap"></i> <span>商户名录|Partner Directories</span> <i class="fa fa-sitemap"></i> <span>商户名录|Partner Directories</span>
@ -309,8 +315,15 @@ margin-bottom: 10%;"/>
<i class="fa fa-area-chart"></i> <span>商户交易额统计（原统计）</span> <i class="fa fa-area-chart"></i> <span>商户交易额统计（原统计）</span>
</a> </a>
</li> </li>
</ul>
</li>
<li class="header nav-header" ng-if="'1011110'|withRole">交易管理|Transaction</li> <li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-list-alt"></i>
<span>交易管理|Transaction</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="'tradelog'|withModule"> <li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="trade" ui-sref-opts="{reload:true}"> <a ui-sref="trade" ui-sref-opts="{reload:true}">
<i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span> <i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span>
@ -336,8 +349,16 @@ margin-bottom: 10%;"/>
<i class="fa fa-server"></i> <span>支付回调消息|Notify History</span> <i class="fa fa-server"></i> <span>支付回调消息|Notify History</span>
</a> </a>
</li> </li>
</ul>
</li>
<!--<li class="header nav-header" ng-if="'1011110'|withRole">交易管理|Transaction</li>-->
<li class="header nav-header" ng-if="'1011110'|withRole">风控管理|Risk Management</li> <li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-tv"></i>
<span>风控管理|Risk Management</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="'tradelog'|withModule"> <li ui-sref-active="active" ng-if="'tradelog'|withModule">
<a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
<i class="fa fa-tv"></i> <span>交易成功率监控</span> <i class="fa fa-tv"></i> <span>交易成功率监控</span>
@ -368,8 +389,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>
</ul>
</li>
<!--<li class="header nav-header" ng-if="'1011110'|withRole">风控管理|Risk Management</li>-->
<li class="header nav-header" ng-if="'1011110'|withRole">合规管理|Compliance Management</li> <li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa fa-eye"></i>
<span>合规管理|Compliance Management</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="('partners'|withModule)&&('10'|withRole)"> <li ui-sref-active="active" ng-if="('partners'|withModule)&&('10'|withRole)">
<a ui-sref="businessCompliance" ui-sref-opts="{reload:true}"> <a ui-sref="businessCompliance" ui-sref-opts="{reload:true}">
<i class="fa fa fa-eye"></i> <span>商户合规</span> <i class="fa fa fa-eye"></i> <span>商户合规</span>
@ -403,15 +432,23 @@ 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>
</ul>
</li>
<!--<li class="header nav-header" ng-if="'1011110'|withRole">合规管理|Compliance Management</li>-->
<li class="header nav-header" ng-if="'1011110'|withRole">清算管理|Settlement Management</li> <li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-balance-scale"></i>
<span>清算管理|Settlement Management</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="'ordervalid'|withModule"> <li ui-sref-active="active" ng-if="'ordervalid'|withModule">
<a ui-sref="order_valid"> <a ui-sref="order_valid">
<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"> <li ui-sref-active="active">
<a ui-sref="date_setting"> <a ui-sref="clearingLogs.date_setting">
<i class="fa fa-balance-scale"></i> <span>清算日管理</span> <i class="fa fa-balance-scale"></i> <span>清算日管理</span>
</a> </a>
</li> </li>
@ -436,8 +473,16 @@ margin-bottom: 10%;"/>
<i class="fa fa fa-money"></i> <span>清算验证|Validation</span> <i class="fa fa fa-money"></i> <span>清算验证|Validation</span>
</a> </a>
</li> </li>
</ul>
</li>
<!--<li class="header nav-header" ng-if="'1011110'|withRole">清算管理|Settlement Management</li>-->
<li class="header nav-header" ng-if="'1011110'|withRole">财务管理|Financial Management</li> <li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-file-excel-o"></i>
<span>财务管理|Financial Management</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="'austrac'|withModule"> <li ui-sref-active="active" ng-if="'austrac'|withModule">
<a ui-sref="transreport" ui-sref-opts="{reload:true}"> <a ui-sref="transreport" ui-sref-opts="{reload:true}">
<i class="fa fa-file-excel-o"></i> <span>Austrac Report</span> <i class="fa fa-file-excel-o"></i> <span>Austrac Report</span>
@ -468,8 +513,16 @@ margin-bottom: 10%;"/>
<i class="fa fa-users"></i> <span>合伙人提成</span> <i class="fa fa-users"></i> <span>合伙人提成</span>
</a> </a>
</li> </li>
</ul>
</li>
<!--<li class="header nav-header" ng-if="'1011110'|withRole">财务管理|Financial Management</li>-->
<li class="header nav-header" ng-if="'1011110'|withRole">营销活动管理|Promotion</li> <li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-file-text-o"></i>
<span>营销活动管理|Promotion</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="'appAct'|withModule"> <li ui-sref-active="active" ng-if="'appAct'|withModule">
<a ui-sref="appAct"> <a ui-sref="appAct">
<i class="fa fa-file-text-o"></i> <span>APP弹屏管理</span> <i class="fa fa-file-text-o"></i> <span>APP弹屏管理</span>
@ -490,12 +543,6 @@ 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="'citypartner'|withModule">
<a ui-sref="citypartner_reg" ui-sref-opts="{reload:true}">
<i class="fa fa-users"></i> <span>City Partners</span>
</a>
</li>-->
<li ui-sref-active="active" ng-if="'monDelay'|withModule"> <li ui-sref-active="active" ng-if="'monDelay'|withModule">
<a ui-sref="mon_delay" ui-sref-opts="{reload:true}"> <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
<i class="fa fa-users"></i> <span>余额增值活动</span> <i class="fa fa-users"></i> <span>余额增值活动</span>
@ -507,6 +554,17 @@ margin-bottom: 10%;"/>
<i class="fa fa-users"></i> <span>半边天公益活动</span> <i class="fa fa-users"></i> <span>半边天公益活动</span>
</a> </a>
</li> </li>
</ul>
</li>
<!--<li class="header nav-header" ng-if="'1011110'|withRole">营销活动管理|Promotion</li>-->
<!-- <li ui-sref-active="active" ng-if="'citypartner'|withModule">
<a ui-sref="citypartner_reg" ui-sref-opts="{reload:true}">
<i class="fa fa-users"></i> <span>City Partners</span>
</a>
</li>-->
<!-- <!--
<li ui-sref-active="active" ng-if="('activities'|withModule) && (currentUser.org_id==1 || currentUser.org_id==null)"> <li ui-sref-active="active" ng-if="('activities'|withModule) && (currentUser.org_id==1 || currentUser.org_id==null)">
<a ui-sref="activity.detail({act_id:'3'})" ui-sref-opts="{reload:true}"> <a ui-sref="activity.detail({act_id:'3'})" ui-sref-opts="{reload:true}">
@ -554,7 +612,12 @@ margin-bottom: 10%;"/>
<!--<i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>--> <!--<i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>-->
<!--</a>--> <!--</a>-->
<!--</li>--> <!--</li>-->
<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">内容管理|Content Management</li> <li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-bell"></i>
<span>内容管理|Content Management</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="'notice'|withModule"> <li ui-sref-active="active" ng-if="'notice'|withModule">
<a ui-sref="notice"> <a ui-sref="notice">
<i class="fa fa-bell"></i> <span>通知群发|Notifications</span> <i class="fa fa-bell"></i> <span>通知群发|Notifications</span>
@ -570,8 +633,18 @@ margin-bottom: 10%;"/>
<i class="fa fa-file-text-o"></i> <span>积分商城|Integral Mall</span> <i class="fa fa-file-text-o"></i> <span>积分商城|Integral Mall</span>
</a> </a>
</li> </li>
</ul>
</li>
<!--<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">内容管理|Content Management</li>-->
<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">组织架构|Organization Framework</li>
<!--<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">组织架构|Organization Framework</li>-->
<li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-users"></i>
<span>组织架构|Organization Framework</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="'org'|withModule"> <li ui-sref-active="active" ng-if="'org'|withModule">
<a ui-sref="organizations" ui-sref-opts="{reload:true}"> <a ui-sref="organizations" ui-sref-opts="{reload:true}">
<i class="fa fa-users"></i> <span>组织管理|Organizations</span> <i class="fa fa-users"></i> <span>组织管理|Organizations</span>
@ -597,8 +670,16 @@ margin-bottom: 10%;"/>
<i class="fa fa-key"></i> <span>角色权限管理</span> <i class="fa fa-key"></i> <span>角色权限管理</span>
</a> </a>
</li> </li>
</ul>
</li>
<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">绩效管理</li> <!--<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">绩效管理</li>-->
<li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-hand-peace-o"></i>
<span>绩效管理</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="'manager_accounts'|withModule"> <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
<a ui-sref="analysis_bd.bdanalysis" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_bd.bdanalysis" ui-sref-opts="{reload:true}">
<i class="fa fa-hand-peace-o"></i> <span>BD销售量|BD Sale</span> <i class="fa fa-hand-peace-o"></i> <span>BD销售量|BD Sale</span>
@ -624,8 +705,16 @@ 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>
</ul>
</li>
<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">合伙人管理</li> <!--<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">合伙人管理</li>-->
<li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-tv"></i>
<span>合伙人管理</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" <li ui-sref-active="active"
ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))||('orgcommission'|withModule)"> ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))||('orgcommission'|withModule)">
<a ui-sref="newOrganizations" ui-sref-opts="{reload:true}"> <a ui-sref="newOrganizations" ui-sref-opts="{reload:true}">
@ -642,8 +731,16 @@ margin-bottom: 10%;"/>
<i class="fa fa-hand-peace-o"></i> <span>合伙人销售量|City Partner Sale</span> <i class="fa fa-hand-peace-o"></i> <span>合伙人销售量|City Partner Sale</span>
</a> </a>
</li> </li>
</ul>
</li>
<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">配置管理|Basic Settings</li> <!--<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">配置管理|Basic Settings</li>-->
<li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-sitemap"></i>
<span>配置管理|Basic Settings</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="('10'|withRole)&&('merchantIdManage'|withModule)"> <li ui-sref-active="active" ng-if="('10'|withRole)&&('merchantIdManage'|withModule)">
<a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}"> <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
<i class="fa fa-sitemap"></i> <span>商户号管理</span> <i class="fa fa-sitemap"></i> <span>商户号管理</span>
@ -661,8 +758,16 @@ margin-bottom: 10%;"/>
<i class="fa fa-cog"></i> <span>系统参数设定|Settings</span> <i class="fa fa-cog"></i> <span>系统参数设定|Settings</span>
</a> </a>
</li> </li>
</ul>
</li>
<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">开发工具|Developer</li> <!--<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">开发工具|Developer</li>-->
<li class="treeview" ng-if="'1011110'|withRole">
<a href="javascript:;">
<i class="fa fa-users"></i>
<span>开发工具|Developer</span>
</a>
<ul class="treeview-menu">
<li ui-sref-active="active" ng-if="'dev'|withModule"> <li ui-sref-active="active" ng-if="'dev'|withModule">
<a ui-sref="login_history"> <a ui-sref="login_history">
<i class="fa fa-users"></i> <span>登录日志|Sign In History</span> <i class="fa fa-users"></i> <span>登录日志|Sign In History</span>
@ -679,6 +784,9 @@ margin-bottom: 10%;"/>
</a> </a>
</li> </li>
</ul> </ul>
</li>
</ul>
</section> </section>
<!-- /.sidebar --> <!-- /.sidebar -->
</aside> </aside>
@ -699,6 +807,7 @@ margin-bottom: 10%;"/>
</footer> </footer>
</div> </div>
<script type="text/javascript" src="static/lib/dist/js/adminlte.min.js"></script>
<!-- ./wrapper --> <!-- ./wrapper -->
</body> </body>
</html> </html>

16
src/main/ui/static/css/common.css
Unescape View File

@ -68,13 +68,19 @@
/*Tab切换样式重写*/ /*Tab切换样式重写*/
/*左侧菜单选中样式*/ /*左侧菜单选中样式*/
.skin-blue .sidebar-menu li:hover a, /*.skin-blue .sidebar-menu li:hover a,*/
.skin-blue .sidebar-menu li.active a { /*.skin-blue .sidebar-menu li.active a {*/
/*color: #f06101;*/
/*!*background: #1e282c;*!*/
/*border-left-color: #f06101;*/
/*}*/
.skin-blue .sidebar-menu>li:hover>a, .skin-blue .sidebar-menu>li.active>a {
color: #fff; color: #fff;
background: #1e282c; background: #1e282c;
border-left-color: #f06101; border-left-color: #f06101
} }
/*左侧菜单选中样式*/ /*左侧菜单选中样式*/
/*从运营平台引入*/ /*从运营平台引入*/
@ -218,13 +224,13 @@
/*首页左侧下拉菜单动画*/ /*首页左侧下拉菜单动画*/
.sidebar-menu .treeview-menu { .sidebar-menu .treeview-menu {
display: block; display: block;
max-height: 0; /*max-height: 0;*/
overflow: hidden; overflow: hidden;
transition: 0.3s max-height linear; transition: 0.3s max-height linear;
} }
.sidebar-menu li.active .treeview-menu { .sidebar-menu li.active .treeview-menu {
max-height: 100px; /*max-height: 100px;*/
} }
/*基本信息*/ /*基本信息*/

14
src/main/ui/static/lib/dist/js/adminlte.min.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save