Merge remote-tracking branch 'origin/develop' into develop

src/main/ui/managev2.html

@@ -98,6 +98,20 @@
             border: 1px solid #FFF;
             padding: 3px 15px;
         }
+        .dashboard li {
+            float: left;
+            border: 1px solid #FFF;
+            padding: 3px 15px;
+        }
+        .dashboard a{
+            color: #FFF;
+        }
+        .dashboard .active{
+            background-color: #FFF !important;
+        }
+        .dashboard .active a{
+            color: #f06101 !important;
+        }
         @media (min-width: 768px) {
             .navbar-header {
                 list-style: none;
@@ -137,10 +151,10 @@ margin-bottom: 10%;"/>
      ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'">
     <header ng-if="headerDisplay" class="main-header">
 
-        <nav style="margin-left: 0px" class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
+        <nav style="margin-left: 0px;text-align: center" class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
 
             <!-- Logo -->
-            <a ui-sref="home" ng-click="headerCopyDisplay()" class="logo logo-yedian shine" ng-if="!currentUser.org">
+            <a ng-click="headerCopyDisplay()" class="logo logo-yedian shine" style="cursor: pointer" ng-if="!currentUser.org">
                 <!-- mini logo for sidebar mini 50x50 pixels -->
                 <span class="logo-mini"></span>
                 <!-- logo for regular state and mobile devices -->
@@ -150,7 +164,7 @@ margin-bottom: 10%;"/>
 
             </span>
             </a>
-            <a ui-sref="home" ng-click="headerCopyDisplay()" class="logo logo-yedian shine" ng-if="currentUser.org">
+            <a ng-click="headerCopyDisplay()" class="logo logo-yedian shine" style="cursor: pointer" ng-if="currentUser.org">
                 <!-- mini logo for sidebar mini 50x50 pixels -->
                 <span class="logo-mini"></span>
                 <!-- logo for regular state and mobile devices -->
@@ -161,7 +175,7 @@ margin-bottom: 10%;"/>
             <select class="navbar-header" style="position: relative;height: 30px;border: 0;text-align: center;text-align-last:center;" ng-model="roleName" ng-change="changeRole(roleName)">
                 <option ng-repeat="x in rolelist" value="{{x.value}}">{{x.module}}</option>
             </select>
-            <ul class="navbar-header">
+            <ul class="dashboard" style="display: inline-block;margin: 10px auto;list-style: none;padding: initial">
                 <li ui-sref-active="active" style="border-bottom-left-radius: 5px;border-top-left-radius: 5px;">
                     <a ui-sref="dashboard"  role="button">Dashboard</a>
                 </li>

src/main/ui/static/boot/managerMainApp.js

@@ -275,7 +275,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     roleMenu.push({'value':'riskmanager','module':"风控中心"});
                 }
                 if ((role & 2048) >0){
-                    roleMenu.push({'value':'guest','module':"guest"});
+                    roleMenu.push({'value':'guest','module':"访客中心"});
                 }
                 if ((role & 8192) >0){
                     roleMenu.push({'value':'salesmanager','module':"销管中心"});

src/main/ui/static/boot/managerMainAppv2.js

@@ -89,6 +89,10 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 }
 
             $scope.headerCopyDisplay  = function () {
+                if (sessionStorage.getItem('role')=='guest'){
+                    return;
+                }
+                $state.go('home');
                 $scope.headerDisplay = false;
                 $scope.copyright = false;
             };

src/main/ui/static/menu/templates/main_menu.html

@@ -103,8 +103,8 @@
                 </div>
             </div>
         </div>
-        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager' && 'tradelog'|withModule">
-            <div class="row" >
+        <div class="list-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
+            <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
                     <div class="description-block">
                         <label>交易管理</label>