From 43098e4550832d389e0d5d2043f8cbf612b3437d Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Wed, 24 Oct 2018 10:57:45 +0800
Subject: [PATCH] fix

---
 src/main/ui/manage.html                          | 6 +++---
 src/main/ui/static/menu/templates/main_menu.html | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 8126a4af6..ed0a0bcf9 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -88,7 +88,7 @@
             .navbar-header {
                 list-style: none;
                 width: 245px;
-                position: absolute;
+                /*position: absolute;*/
                 left: 0;
                 right: 0;
                 margin: 10px;
@@ -448,7 +448,7 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-balance-scale"></i> <span>交易对账|Order Validation</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active"  ng-if="'clearing'|withModule && role!='director'">
+                        <li ui-sref-active="active"  ng-if="('clearing'|withModule) && (role!='director')">
                             <a ui-sref="clearingLogs.date_setting">
                                 <i class="fa fa-balance-scale"></i> <span>清算日管理</span>
                             </a>
@@ -469,7 +469,7 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa fa-tv"></i> <span>清算月报</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'platformRevenue'|withModule && role!='director'">
+                        <li ui-sref-active="active" ng-if="('platformRevenue'|withModule) && (role!='director')">
                             <a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
                                 <i class="fa fa fa-money"></i> <span>清算验证|Validation</span>
                             </a>
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 1b40be8f9..ac8591068 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -3,6 +3,9 @@
         text-decoration:none;
         color:black;
     }
+    .description-block label {
+        border-bottom: 1px solid #000;
+    }
 </style>
 <div class="content-wrapper autoheight" style="margin-left: 0px">
     <div class="content" style="background-color: #FFF;min-height: 900px">
@@ -28,7 +31,7 @@
                 </div>
             </div>
         </div>
--->
+-->     <a role="button" style="float: right;line-height: 46px" ui-sref="home" ng-click="headerCopyDisplay()"><i class="fa fa-reply"></i> 返回</a>
         <div class="list-group" ng-if="role!='administrator' && role!='developer' && role!='sitemanager'">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="partners">