From 81e1584c9a62c5122ec68acc257c7c782563a3d4 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 23 Oct 2018 20:12:18 +0800
Subject: [PATCH] fix  v1-manager.html

---
 src/main/ui/manage.html                       | 70 ++++++-----------
 src/main/ui/managev2.html                     | 76 +++----------------
 src/main/ui/static/boot/managerMainApp.js     | 45 +++++++++++
 src/main/ui/static/boot/managerMainAppv2.js   | 63 +++++++++++++--
 src/main/ui/static/menu/templates/home.html   |  1 +
 .../ui/static/menu/templates/main_menu.html   |  2 -
 6 files changed, 136 insertions(+), 121 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 17dab0a5a..447275054 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -143,21 +143,25 @@ margin-bottom: 10%;"/>
         </a>
          <!--Header Navbar: style can be found in header.less -->
         <!--顶部导航栏-->
+
         <nav class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
             <!--Sidebar toggle button-->
             <a class="sidebar-toggle sidebar-tooggle-yedian" data-toggle="offcanvas" role="button"
                ng-click="toggleHideSideBar()">
                 <span class="sr-only">Toggle navigation</span>
             </a>
-            <ul class="navbar-header" style="left: 75%">
-                <li ui-sref-active="active" style="border-bottom-left-radius: 5px;border-top-left-radius: 5px;background-color: #FFF; ">
-                    <a href="/manage.html"  role="button" style="color:#f06101 !important;">v1</a>
-                </li>
-                <li ui-sref-active="active" style="border-bottom-right-radius: 5px;border-top-right-radius: 5px;">
-                    <a href="/managev2.html" role="button">v2</a>
-                </li>
-            </ul>
+            <select class="navbar-header" style="height: 30px;border: 0;" ng-model="roleNow" ng-change="changeRole(roleNow)">
+                <option ng-repeat="x in role" value="{{x.value}}">{{x.module}}</option>
+            </select>
             <div class="navbar-custom-menu">
+                <ul class="navbar-header" style="position: relative;left: 10%">
+                    <li ui-sref-active="active" style="border-bottom-left-radius: 5px;border-top-left-radius: 5px;background-color: #FFF; ">
+                        <a href="/manage.html"  role="button" style="color:#f06101 !important;">v1</a>
+                    </li>
+                    <li ui-sref-active="active" style="border-bottom-right-radius: 5px;border-top-right-radius: 5px;">
+                        <a href="/managev2.html" role="button">v2</a>
+                    </li>
+                </ul>
                 <ul class="nav navbar-nav">
                     <li class="user-menu" ng-if="currentUser.onoff">
                         <a role="button" ng-click="customerService()">
@@ -284,7 +288,7 @@ margin-bottom: 10%;"/>
                     </a>
                 </li>
 
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
                     <a href="javascript:;">
                         <i class="fa fa-sitemap"></i>
                         <span>商户管理|Partner Manage</span>
@@ -318,7 +322,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
                     <a href="javascript:;">
                         <i class="fa fa-list-alt"></i>
                         <span>交易管理|Transaction</span>
@@ -351,9 +355,8 @@ margin-bottom: 10%;"/>
                         </li>
                     </ul>
                 </li>
-                <!--<li class="header nav-header" ng-if="'1011110'|withRole">交易管理|Transaction</li>-->
 
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow=='riskmanager'">
                     <a href="javascript:;">
                         <i class="fa fa-tv"></i>
                         <span>风控管理|Risk Management</span>
@@ -391,9 +394,8 @@ margin-bottom: 10%;"/>
                         </li>
                     </ul>
                 </li>
-                <!--<li class="header nav-header" ng-if="'1011110'|withRole">风控管理|Risk Management</li>-->
 
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow=='compliance'">
                     <a href="javascript:;">
                         <i class="fa fa fa-eye"></i>
                         <span>合规管理|Compliance Management</span>
@@ -434,9 +436,8 @@ margin-bottom: 10%;"/>
                         </li>
                     </ul>
                 </li>
-                <!--<li class="header nav-header" ng-if="'1011110'|withRole">合规管理|Compliance Management</li>-->
 
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow=='accountant' || roleNow=='director'">
                     <a href="javascript:;">
                         <i class="fa fa-balance-scale"></i>
                         <span>清算管理|Settlement Management</span>
@@ -475,9 +476,8 @@ margin-bottom: 10%;"/>
                         </li>
                     </ul>
                 </li>
-                <!--<li class="header nav-header" ng-if="'1011110'|withRole">清算管理|Settlement Management</li>-->
 
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow=='accountant' || roleNow=='director'">
                     <a href="javascript:;">
                         <i class="fa fa-file-excel-o"></i>
                         <span>财务管理|Financial Management</span>
@@ -515,9 +515,8 @@ margin-bottom: 10%;"/>
                         </li>
                     </ul>
                 </li>
-                <!--<li class="header nav-header" ng-if="'1011110'|withRole">财务管理|Financial Management</li>-->
 
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow=='sitemanager'">
                     <a href="javascript:;">
                         <i class="fa fa-file-text-o"></i>
                         <span>营销活动管理|Promotion</span>
@@ -556,7 +555,6 @@ margin-bottom: 10%;"/>
                         </li>
                     </ul>
                 </li>
-                <!--<li class="header nav-header" ng-if="'1011110'|withRole">营销活动管理|Promotion</li>-->
 
 
                <!-- <li ui-sref-active="active" ng-if="'citypartner'|withModule">
@@ -564,7 +562,6 @@ margin-bottom: 10%;"/>
                         <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)">
                <a ui-sref="activity.detail({act_id:'3'})" ui-sref-opts="{reload:true}">
@@ -576,31 +573,21 @@ margin-bottom: 10%;"/>
                        <i class="fa fa-compass"></i> <span>店长行动参与情况</span>
                    </a>
                </li>-->
-
                 <!--<li ui-sref-active="active" ng-if="('act_redpack'|withModule) && (currentUser.org_id==1 || currentUser.org_id==null)">-->
                 <!--<a ui-sref="act_partners" ui-sref-opts="{reload:true}">-->
                 <!--<i class="fa fa-compass"></i> <span>新费率签约情况</span>-->
                 <!--</a>-->
                 <!--</li>-->
-
                 <!--<li ui-sref-active="active" ng-if="('act_customer_redpack'|withModule)">
                     <a ui-sref="customer_redpack">
                         <i class="fa fa-gift"></i> <span>红包返现</span>
                     </a>
                 </li>-->
-
-
-
-
                <!-- <li ui-sref-active="active" ng-if="('funds'|withModule)">
                     <a ui-sref="funds">
                         <i class="fa fa-money"></i> <span>增值计划</span>
                     </a>
                 </li>-->
-
-
-
-
                 <!--<li class="header nav-header" ng-if="('1000000000000'|withRole)">机构|Agent</li>-->
                 <!--<li ui-sref-active="active" ng-if="('1000000000000'|withRole)">-->
                     <!--<a ui-sref="analysis_agent" ui-sref-opts="{reload:true}">-->
@@ -612,7 +599,7 @@ margin-bottom: 10%;"/>
                         <!--<i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>-->
                     <!--</a>-->
                 <!--</li>-->
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow=='sitemanager'">
                     <a href="javascript:;">
                         <i class="fa fa-bell"></i>
                         <span>内容管理|Content Management</span>
@@ -635,11 +622,8 @@ margin-bottom: 10%;"/>
                         </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="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow=='administrator'">
                     <a href="javascript:;">
                         <i class="fa fa-users"></i>
                         <span>组织架构|Organization Framework</span>
@@ -673,8 +657,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <!--<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">绩效管理</li>-->
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow=='bduser' || roleNow=='salesmanager' || roleNow=='director'">
                     <a href="javascript:;">
                         <i class="fa fa-hand-peace-o"></i>
                         <span>绩效管理</span>
@@ -708,8 +691,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <!--<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">合伙人管理</li>-->
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow=='salesmanager'">
                     <a href="javascript:;">
                         <i class="fa fa-tv"></i>
                         <span>合伙人管理</span>
@@ -734,8 +716,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <!--<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">配置管理|Basic Settings</li>-->
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow=='administrator'">
                     <a href="javascript:;">
                         <i class="fa  fa-sitemap"></i>
                         <span>配置管理|Basic Settings</span>
@@ -761,8 +742,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <!--<li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">开发工具|Developer</li>-->
-                <li class="treeview" ng-if="'1011110'|withRole">
+                <li class="treeview" ng-if="roleNow=='developer'">
                     <a href="javascript:;">
                         <i class="fa fa-users"></i>
                         <span>开发工具|Developer</span>
diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
index b635ded1f..d45e279b3 100644
--- a/src/main/ui/managev2.html
+++ b/src/main/ui/managev2.html
@@ -41,49 +41,6 @@
     <link rel="stylesheet" href="static/lib/dist/css/skins/_all-skins.min.css">
     <link rel="stylesheet" href="static/css/common.css">
     <style type="text/css">
-        .backgroud {
-            background-image: url("/static/images/manage_bg.png");
-        }
-
-        .total_logo {
-            padding-top: 4.62%;
-            text-align: center;
-        }
-
-        .box-items {
-            padding: 30px 15px 15px 15px;
-            cursor: pointer;
-
-        }
-
-        .box-items img {
-            width: 72px;
-            height: 72px;
-        }
-
-        .boxs {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            width: 180px;
-            height: 180px;
-            background: #434365;
-            border-radius: 5px;
-        }
-
-        .boxs:hover {
-            background: #FFFFFF;
-        }
-
-        .box-font {
-            font-family: PingFang-SC-Regular;
-            font-size: 20px;
-            color: #FFFFFF;
-            letter-spacing: 0px;
-            text-align: center;
-            padding-top: 25px;
-        }
-
         footer {
             font-family: PingFang-SC-Regular;
             font-size: 12px;
@@ -92,15 +49,6 @@
             padding-bottom: 2.3%;
         }
 
-        .easypay {
-            font-family: PingFang-SC-Regular;
-            font-size: 20px;
-            color: #FFFFFF;
-            letter-spacing: 0px;
-            padding-top: 1%;
-            padding-bottom: 1%;
-        }
-
         .ng-cloak, [ng-cloak] {
             display: none !important;
         }
@@ -136,11 +84,6 @@
             /*width: 86px;*/
         }
 
-        .list-group label {
-            border-bottom: 1px solid #333333;
-            font-size: 20px;
-            color: #333333;
-        }
         .navbar-header a{
             color: #FFF;
         }
@@ -233,15 +176,16 @@ margin-bottom: 10%;"/>
             <!--</div>-->
             <!-- Header Navbar: style can be found in header.less -->
             <!--顶部导航栏-->
-            <ul class="navbar-header" style="margin: 10px;left: 80%" >
-                <li ui-sref-active="active" style="border-bottom-left-radius: 5px;border-top-left-radius: 5px;">
-                    <a href="/manage.html"  role="button">v1</a>
-                </li>
-                <li ui-sref-active="active" style="border-bottom-right-radius: 5px;border-top-right-radius: 5px;background-color: #FFF">
-                    <a href="/managev2.html" role="button" style="color: #f06101 !important;">v2</a>
-                </li>
-            </ul>
+
             <div class="navbar-custom-menu">
+                <ul class="navbar-header" style="position: relative;left: 10%">
+                    <li ui-sref-active="active" style="border-bottom-left-radius: 5px;border-top-left-radius: 5px;">
+                        <a href="/manage.html"  role="button">v1</a>
+                    </li>
+                    <li ui-sref-active="active" style="border-bottom-right-radius: 5px;border-top-right-radius: 5px;background-color: #FFF">
+                        <a style="color: #f06101 !important;">v2</a>
+                    </li>
+                </ul>
                 <ul class="nav navbar-nav">
                     <li class="user-menu" ng-if="currentUser.onoff">
                         <a role="button" ng-click="customerService()">
@@ -321,7 +265,7 @@ margin-bottom: 10%;"/>
             </div>
         </nav>
     </header>
-    <div class="content-wrapper autoheight" style="margin-left: 0;" ui-view autoscroll="false" >
+    <div class="content-wrapper" style="margin-left: 0;min-height: 890px" ui-view autoscroll="false" >
     </div>
     <footer ng-if="copyright" class="main-footer" style="margin-left: 0px">
         <div class="pull-right hidden-xs">
diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js
index 9ee069211..94318c0bf 100644
--- a/src/main/ui/static/boot/managerMainApp.js
+++ b/src/main/ui/static/boot/managerMainApp.js
@@ -15,6 +15,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
     }]);
     app.controller('managerIndexCtrl', ['$scope', '$rootScope', '$http', '$log', '$timeout', '$interval', '$uibModal', '$filter', 'myLoginLogView', 'commonDialog',
         function ($scope, $rootScope, $http, $log, $timeout, $interval, $uibModal, $filter, myLoginLogView, commonDialog) {
+
             $http.get('/sysconfig/base').then(function (resp) {
                 $rootScope.sysParams = resp.data;
             });
@@ -201,6 +202,50 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 });
             }
 
+            var getRoleMenulist = function (role) {
+                var roleMenu = [];
+
+                if ((role & 1) >0){
+                    roleMenu.push({'value':'administrator','module':'系统配置'});
+                }
+                if ((role & 2) >0){
+                    roleMenu.push({'value':'compliance','module':'合规中心'});
+                }
+                if ((role & 4) >0){
+                    roleMenu.push({'value':'bduser','module':"销售中心"});
+                }
+                if ((role & 8) >0){
+                    roleMenu.push({'value':'accountant','module':"财务中心"});
+                }
+                if ((role & 64) >0){
+                    roleMenu.push({'value':'director','module':"领导决策"});
+                }
+                if ((role & 128) >0){
+                    roleMenu.push({'value':'sitemanager','module':"营销中心"});
+                }
+                if ((role & 256) >0){
+                    roleMenu.push({'value':'developer','module':"开发中心"});
+                }
+                if ((role & 1024) >0){
+                    roleMenu.push({'value':'riskmanager','module':"风控中心"});
+                }
+                if ((role & 2048) >0){
+                    roleMenu.push({'value':'guest','module':"guest"});
+                }
+                if ((role & 8192) >0){
+                    roleMenu.push({'value':'salesmanager','module':"销管中心"});
+                }
+                return roleMenu;
+            };
+            $scope.role = getRoleMenulist(window.currentUser.role);
+            sessionStorage.setItem('role',$scope.role[0].value);
+            $scope.roleNow = sessionStorage.getItem('role');
+
+            $scope.changeRole = function (index) {
+                sessionStorage.setItem('role',index);
+            };
+
+
         }]);
     app.controller('changePwdCtrl', ['$scope', '$http', function ($scope, $http) {
         $scope.formData = {};
diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index 44b2bb179..fc224facd 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -6,7 +6,53 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
     var app = angular.module('managerMainAppv2', ['ngSanitize', 'ngAnimate', 'ngMessages', 'ui.router', 'ui.bootstrap', 'ngFileUpload']);
     app.config(['$urlRouterProvider', '$httpProvider', function ($urlRouterProvider, $httpProvider) {
 
-        $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/home');
+        var getRoleMenulist = function () {
+            var roleMenu = [];
+
+            if ((window.currentUser.role.toString(2) | 1) >0){
+                roleMenu.push("administrator");
+            }
+            if ((window.currentUser.role.toString(2) | 10) >0){
+                roleMenu.push("compliance");
+            }
+            if ((window.currentUser.role.toString(2) | 100) >0){
+                roleMenu.push("bduser");
+            }
+            if ((window.currentUser.role.toString(2) | 1000) >0){
+                roleMenu.push("accountant");
+            }
+            if ((window.currentUser.role.toString(2) | 1000000) >0){
+                roleMenu.push("director");
+            }
+            if ((window.currentUser.role.toString(2) | 10000000) >0){
+                roleMenu.push("sitemanager");
+            }
+            if ((window.currentUser.role.toString(2) & 100000000) >0){
+                roleMenu.push("developer");
+            }
+            if ((window.currentUser.role.toString(2) & 1000000000) >0){
+                roleMenu.push("riskmanager");
+            }
+            if ((window.currentUser.role.toString(2) & 100000000000) >0){
+                roleMenu.push("guest");
+            }
+            if ((window.currentUser.role.toString(2) & 10000000000000) >0){
+                roleMenu.push("salesmanager");
+            }
+            return roleMenu;
+        };
+        if (getRoleMenulist().length>1) {
+            sessionStorage.setItem('roleNum','N');
+            $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/home');
+        }else {
+            sessionStorage.setItem('roleNum','1');
+            sessionStorage.setItem('role',getRoleMenulist().valueOf());
+            $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/menu?role=' + getRoleMenulist().valueOf());
+        }
+
+
+
+
 
         if (!$httpProvider.defaults.headers.get) {
             $httpProvider.defaults.headers.get = {};
@@ -17,13 +63,14 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
     }]);
     app.controller('managerIndexCtrl', ['$scope', '$rootScope', '$http', '$log', '$timeout', '$interval', '$uibModal', '$filter', 'myLoginLogView', 'commonDialog',
         function ($scope, $rootScope, $http, $log, $timeout, $interval, $uibModal, $filter, myLoginLogView, commonDialog) {
-            if (window.location.hash == "" || window.location.hash == "#/home") {
-                $scope.headerDisplay = false;
-                $scope.copyright = false;
-            }else{
-                $scope.headerDisplay = true;
-                $scope.copyright = true;
-            }
+                if (sessionStorage.getItem('roleNum') =='N'){
+                    $scope.headerDisplay = false;
+                    $scope.copyright = false;
+                }else {
+                    $scope.headerDisplay = true;
+                    $scope.copyright = true;
+                }
+
             $scope.headerCopyDisplay  = function () {
                 $scope.headerDisplay = false;
                 $scope.copyright = false;
diff --git a/src/main/ui/static/menu/templates/home.html b/src/main/ui/static/menu/templates/home.html
index 3e998489a..31dc55ebe 100644
--- a/src/main/ui/static/menu/templates/home.html
+++ b/src/main/ui/static/menu/templates/home.html
@@ -1,5 +1,6 @@
 <style type="text/css">
     .backgroud {
+        min-height: 890px;
         background-image: url("/static/images/manage_bg.png");
     }
 
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 326518c69..f70ed02d0 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -304,8 +304,6 @@
               </div>
           </div>
         </div>
-
-
         <div class="list-group" ng-if="role=='salesmanager'">
             <div class="row" ng-if="('citypartner'|withModule)||('org'|withModule)||(('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole)))||('orgcommission'|withModule)" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="citypartners">