From 639027338489bbdb0b31049934a88ed12bd26714 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Thu, 25 Oct 2018 15:44:12 +0800
Subject: [PATCH] fix

---
 src/main/ui/manage.html           | 172 +++++++++++++++++-------------
 src/main/ui/static/css/common.css |  28 +++++
 2 files changed, 127 insertions(+), 73 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index ffd0b7c2b..3b793db69 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -288,12 +288,14 @@ margin-bottom: 10%;"/>
                     </a>
                 </li>
 
-                <li class="treeview" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
-                    <a href="javascript:;">
-                        <i class="fa fa-sitemap"></i>
-                        <span>商户管理|Partner Manage</span>
-                    </a>
-                    <ul class="treeview-menu">
+                <li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
+                    <p role="button" ng-class="{'active': Partner,'is-hide':hideSideBar}" ng-click="Partner = !Partner">
+                        <span>商户管理|Merchant</span>
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':Partner}">
                         <li ui-sref-active="active" ng-if="'partners'|withModule">
                             <a ui-sref="partners" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-sitemap"></i> <span>商户名录|Partner Directories</span>
@@ -322,12 +324,14 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
-                    <a href="javascript:;">
-                        <i class="fa fa-list-alt"></i>
+                <li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
+                    <p role="button" ng-class="{'active': Transaction,'is-hide':hideSideBar}" ng-click="Transaction = !Transaction">
                         <span>交易管理|Transaction</span>
-                    </a>
-                    <ul class="treeview-menu">
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':Transaction}">
                         <li ui-sref-active="active" ng-if="'tradelog'|withModule">
                             <a ui-sref="trade" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span>
@@ -356,12 +360,14 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow=='riskmanager'">
-                    <a href="javascript:;">
-                        <i class="fa fa-tv"></i>
-                        <span>风控管理|Risk Management</span>
-                    </a>
-                    <ul class="treeview-menu">
+                <li class="menu-group" ng-if="roleNow=='riskmanager'">
+                    <p role="button" ng-class="{'active': Risk,'is-hide':hideSideBar}" ng-click="Risk = !Risk">
+                        <span>风控管理|Risk</span>
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':Risk}">
                         <li ui-sref-active="active">
                             <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-tv"></i> <span>交易成功率监控</span>
@@ -395,12 +401,14 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow=='compliance'">
-                    <a href="javascript:;">
-                        <i class="fa fa fa-eye"></i>
-                        <span>合规管理|Compliance Management</span>
-                    </a>
-                    <ul class="treeview-menu">
+                <li class="menu-group" ng-if="roleNow=='compliance'">
+                    <p role="button" ng-class="{'active': Compliance,'is-hide':hideSideBar}" ng-click="Compliance = !Compliance">
+                        <span>合规管理|Compliance</span>
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':Compliance}">
                         <li ui-sref-active="active">
                             <a ui-sref="businessCompliance" ui-sref-opts="{reload:true}">
                                 <i class="fa fa fa-eye"></i> <span>商户合规</span>
@@ -437,12 +445,14 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow=='accountant' || roleNow=='director'">
-                    <a href="javascript:;">
-                        <i class="fa fa-balance-scale"></i>
-                        <span>清算管理|Settlement Management</span>
-                    </a>
-                    <ul class="treeview-menu">
+                <li class="menu-group" ng-if="roleNow=='accountant' || roleNow=='director'">
+                    <p role="button" ng-class="{'active': Settlement,'is-hide':hideSideBar}" ng-click="Settlement = !Settlement">
+                        <span>清算管理|Settlement</span>
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':Settlement}">
                         <li ui-sref-active="active" ng-if="'ordervalid'|withModule">
                             <a ui-sref="order_valid">
                                 <i class="fa fa-balance-scale"></i> <span>交易对账|Order Validation</span>
@@ -477,12 +487,14 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow=='accountant' || roleNow=='director'">
-                    <a href="javascript:;">
-                        <i class="fa fa-file-excel-o"></i>
-                        <span>财务管理|Financial Management</span>
-                    </a>
-                    <ul class="treeview-menu">
+                <li class="menu-group" ng-if="roleNow=='accountant' || roleNow=='director'">
+                    <p role="button" ng-class="{'active': Financial,'is-hide':hideSideBar}" ng-click="Financial = !Financial">
+                        <span>财务管理|Financial </span>
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':Financial}">
                         <li ui-sref-active="active" ng-if="'austrac'|withModule">
                             <a ui-sref="transreport" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-file-excel-o"></i> <span>Austrac Report</span>
@@ -516,12 +528,14 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow=='sitemanager'">
-                    <a href="javascript:;">
-                        <i class="fa fa-file-text-o"></i>
+                <li class="menu-group" ng-if="roleNow=='sitemanager'">
+                    <p role="button" ng-class="{'active': Promotion,'is-hide':hideSideBar}" ng-click="Promotion = !Promotion">
                         <span>营销活动管理|Promotion</span>
-                    </a>
-                    <ul class="treeview-menu">
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':Promotion}">
                         <li ui-sref-active="active" ng-if="'appAct'|withModule">
                             <a ui-sref="appAct">
                                 <i class="fa fa-file-text-o"></i> <span>APP弹屏管理</span>
@@ -599,12 +613,14 @@ margin-bottom: 10%;"/>
                         <!--<i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>-->
                     <!--</a>-->
                 <!--</li>-->
-                <li class="treeview" ng-if="roleNow=='sitemanager'">
-                    <a href="javascript:;">
-                        <i class="fa fa-bell"></i>
-                        <span>内容管理|Content Management</span>
-                    </a>
-                    <ul class="treeview-menu">
+                <li class="menu-group" ng-if="roleNow=='sitemanager'">
+                    <p role="button" ng-class="{'active': Content,'is-hide':hideSideBar}" ng-click="Content = !Content">
+                        <span>内容管理|Content</span>
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':Content}">
                         <li ui-sref-active="active" ng-if="'notice'|withModule">
                             <a ui-sref="notice">
                                 <i class="fa fa-bell"></i> <span>通知群发|Notifications</span>
@@ -623,12 +639,14 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow=='administrator'">
-                    <a href="javascript:;">
-                        <i class="fa fa-users"></i>
+                <li class="menu-group" ng-if="roleNow=='administrator'">
+                    <p role="button" ng-class="{'active': Organization,'is-hide':hideSideBar}" ng-click="Organization = !Organization">
                         <span>组织架构|Organization</span>
-                    </a>
-                    <ul class="treeview-menu">
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active': Organization}">
                         <li ui-sref-active="active" ng-if="'org'|withModule">
                             <a ui-sref="organizations" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-users"></i> <span>组织管理|Organizations</span>
@@ -657,12 +675,14 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow=='bduser' || roleNow=='salesmanager' || roleNow=='director'">
-                    <a href="javascript:;">
-                        <i class="fa fa-hand-peace-o"></i>
-                        <span>绩效管理</span>
-                    </a>
-                    <ul class="treeview-menu">
+                <li class="menu-group" ng-if="roleNow=='bduser' || roleNow=='salesmanager' || roleNow=='director'">
+                    <p role="button" ng-class="{'active': Performance,'is-hide':hideSideBar}" ng-click="Performance = !Performance">
+                        <span>绩效管理|Performance</span>
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':Performance}">
                         <li ui-sref-active="active" ng-if="'bdsale'|withModule">
                             <a ui-sref="analysis_bd.bdanalysis" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-hand-peace-o"></i> <span>BD销售量|BD Sale</span>
@@ -691,12 +711,14 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="(roleNow=='salesmanager') || (roleNow=='director')">
-                    <a href="javascript:;">
-                        <i class="fa fa-tv"></i>
-                        <span>合伙人管理</span>
-                    </a>
-                    <ul class="treeview-menu">
+                <li class="menu-group" ng-if="(roleNow=='salesmanager') || (roleNow=='director')">
+                    <p role="button" ng-class="{'active': cityPartner,'is-hide':hideSideBar}" ng-click="cityPartner = !cityPartner">
+                        <span>合伙人管理|Partner</span>
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':cityPartner}">
                         <li ui-sref-active="active"
                             ng-if="'org'|withModule">
                             <a ui-sref="newOrganizations" ui-sref-opts="{reload:true}">
@@ -721,12 +743,14 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow=='administrator'">
-                    <a href="javascript:;">
-                        <i class="fa  fa-sitemap"></i>
+                <li class="menu-group" ng-if="roleNow=='administrator'">
+                    <p role="button" ng-class="{'active': Settings,'is-hide':hideSideBar}" ng-click="Settings = !Settings">
                         <span>配置管理|Basic Settings</span>
-                    </a>
-                    <ul class="treeview-menu">
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':Settings}">
                         <li ui-sref-active="active" ng-if="('merchantIdManage'|withModule)">
                             <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
                                 <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
@@ -747,12 +771,14 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow=='developer'">
-                    <a href="javascript:;">
-                        <i class="fa fa-users"></i>
+                <li class="menu-group" ng-if="roleNow=='developer'">
+                    <p role="button" ng-class="{'active': Developer,'is-hide':hideSideBar}" ng-click="Developer = !Developer">
                         <span>开发工具|Developer</span>
-                    </a>
-                    <ul class="treeview-menu">
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':Developer}">
                         <li ui-sref-active="active" ng-if="('log'|withModule) || ('dev'|withModule)">
                             <a ui-sref="login_history">
                                 <i class="fa fa-users"></i> <span>登录日志|Sign In History</span>
diff --git a/src/main/ui/static/css/common.css b/src/main/ui/static/css/common.css
index 55984fa76..5f4889790 100644
--- a/src/main/ui/static/css/common.css
+++ b/src/main/ui/static/css/common.css
@@ -842,4 +842,32 @@
 .settle-result-box .settle-result-table .bank-logo {
     width: 24px;
     vertical-align: middle;
+}
+
+.menu-group >p{
+    color: #4b646f !important;
+    background: #1a2226 !important;
+    padding: 10px 25px 10px 15px;
+    font-size: 12px;
+    text-align: center;
+    margin: 0 0 0px !important;
+}
+
+.menu-group p.active>.pull-right-container>.fa-angle-down {
+    -webkit-transform: rotate(90deg);
+    -ms-transform: rotate(90deg);
+    -o-transform: rotate(90deg);
+    transform: rotate(90deg);
+}
+
+.menu-group ul.active {
+    display: none;
+}
+
+.menu-group .sidebar-menu {
+    display: block;
+}
+
+.menu-group .is-hide {
+    display: none;
 }
\ No newline at end of file