From 17045552f04e9679fa737d267e43f63a512003ea Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 8 Oct 2018 17:21:59 +0800
Subject: [PATCH 01/82] new Manage UI - manage.html

---
 src/main/ui/manage.html                       | 491 ++++--------------
 src/main/ui/manage_bak.html                   | 488 +++++++++++++++++
 src/main/ui/static/boot/managerMainApp.js     |   4 +-
 src/main/ui/static/images/manage/menu_1.png   | Bin 0 -> 1113 bytes
 src/main/ui/static/images/manage/menu_10.png  | Bin 0 -> 648 bytes
 src/main/ui/static/images/manage/menu_2.png   | Bin 0 -> 2313 bytes
 src/main/ui/static/images/manage/menu_3.png   | Bin 0 -> 1056 bytes
 src/main/ui/static/images/manage/menu_4.png   | Bin 0 -> 1678 bytes
 src/main/ui/static/images/manage/menu_5.png   | Bin 0 -> 1804 bytes
 src/main/ui/static/images/manage/menu_6.png   | Bin 0 -> 1545 bytes
 src/main/ui/static/images/manage/menu_7.png   | Bin 0 -> 1476 bytes
 src/main/ui/static/images/manage/menu_8.png   | Bin 0 -> 1560 bytes
 src/main/ui/static/images/manage/menu_9.png   | Bin 0 -> 1356 bytes
 src/main/ui/static/images/manage_bg.png       | Bin 0 -> 85590 bytes
 .../ui/static/images/manage_total_logo.png    | Bin 0 -> 6204 bytes
 15 files changed, 593 insertions(+), 390 deletions(-)
 create mode 100644 src/main/ui/manage_bak.html
 create mode 100644 src/main/ui/static/images/manage/menu_1.png
 create mode 100644 src/main/ui/static/images/manage/menu_10.png
 create mode 100644 src/main/ui/static/images/manage/menu_2.png
 create mode 100644 src/main/ui/static/images/manage/menu_3.png
 create mode 100644 src/main/ui/static/images/manage/menu_4.png
 create mode 100644 src/main/ui/static/images/manage/menu_5.png
 create mode 100644 src/main/ui/static/images/manage/menu_6.png
 create mode 100644 src/main/ui/static/images/manage/menu_7.png
 create mode 100644 src/main/ui/static/images/manage/menu_8.png
 create mode 100644 src/main/ui/static/images/manage/menu_9.png
 create mode 100644 src/main/ui/static/images/manage_bg.png
 create mode 100644 src/main/ui/static/images/manage_total_logo.png

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index a130e2479..5dcc47df1 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -41,6 +41,42 @@
     <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">
+        body{
+            background-image: url("/static/images/manage_bg.png");
+        }
+        .total_logo {
+            margin-top: 7%;
+            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;
+        }
         .ng-cloak, [ng-cloak] {
             display: none !important;
         }
@@ -85,402 +121,79 @@ margin-bottom: 10%;"/>
         <p style="color: #666">To Be The Best QRCode Payment Service Provider!</p>
     </div>
 </div>
-<div class="wrapper" ng-if="currentUser!=null" ng-cloak
+<div ng-if="currentUser!=null" ng-cloak
      ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'">
 
-    <header class="main-header">
-        <!-- Logo -->
-        <a href="#" class="logo logo-yedian shine" ng-if="!currentUser.org">
-            <!-- mini logo for sidebar mini 50x50 pixels -->
-            <span class="logo-mini"><img src="static/images/r_white_logo.svg"
-                                         style="max-height: 35px;margin-left: 15%;"></span>
-            <!-- logo for regular state and mobile devices -->
-            <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
-                                       style="max-height: 35px;">
-                <!--<b>RoyalPay</b>-->
-            </span>
-        </a>
-        <a href="#" class="logo logo-yedian shine" ng-if="currentUser.org">
-            <!-- mini logo for sidebar mini 50x50 pixels -->
-            <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
-                                         style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
-            <!-- logo for regular state and mobile devices -->
-            <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
-                                       style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
-                    ng-bind="currentUser.org.name"></b></span>
-        </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>
-
-            <div class="navbar-custom-menu">
-                <ul class="nav navbar-nav">
-                    <li class="user-menu" ng-if="currentUser.onoff">
-                        <a role="button" ng-click="customerService()">
-                            <i class="fa fa-wechat"></i> contact service
-                        </a>
-
-                    </li>
-                    <li class="user-menu">
-                        <a role="button" ng-click="managerBindWechat(true)">
-                            <i class="fa fa-wechat"></i> Bind WeChat
-                        </a>
-                    </li>
-                    <li ng-if="('110'|withRole)" ng-class="{'dropdown notifications-menu open':openNotice,'dropdown notifications-menu':!openNotice}">
-                        <a title="New Notice" ng-click="toggleOpenNotice()"  class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
-                            <i class="fa fa-bell-o"></i>
-                            <span class="label label-warning" ng-if="notifyCounts">{{notifyCounts}}</span>
-                        </a>
-                        <ul class="dropdown-menu">
-                            <!--<li class="header">System notifications,please resolve it!</li>-->
-                            <li>
-                                <!-- inner menu: contains the actual data -->
-                                <div class="slimScrollDiv" style="position: relative; overflow: hidden; width: auto; max-height: 200px;"><ul class="menu" style="overflow: hidden; width: 100%;">
-                                    <li>
-                                    <a ng-if="partner_application_new" ui-sref="partner_apply">
-                                        <i class="fa fa-commenting"></i>
-                                        新的自主申请商户<span style="font-size:smaller;float:right;right: 0"></span>
-                                    </a>
-                                    </li>
-                                    <li>
-                                    <a ng-if="refundReviews && ('10000000000'|withRole)" ui-sref="refundReview">
-                                        <i class="fa fa-commenting"></i>
-                                        新的退款申请<span style="font-size:smaller;float:right;right: 0"></span>
-                                    </a>
-                                    </li>
-                                </ul><div class="slimScrollBar" style="background: rgb(0, 0, 0); width: 3px; position: absolute; top: 0px; opacity: 0.4; display: none; border-radius: 7px; z-index: 99; right: 1px; height: 195.122px;"></div><div class="slimScrollRail" style="width: 3px; height: 100%; position: absolute; top: 0px; display: none; border-radius: 7px; background: rgb(51, 51, 51); opacity: 0.2; z-index: 90; right: 1px;"></div></div>
-                            </li>
-                        </ul>
-                    </li>
-
-                    <!-- User Account: style can be found in dropdown.less -->
-                    <li class="dropdown user user-menu" uib-dropdown>
-                        <a href class="dropdown-toggle" uib-dropdown-toggle>
-                            <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
-                                 class="user-image user-img-yedian"
-                                 alt="User Image">
-                            <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
-                        </a>
-                        <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
-                            <!-- User image -->
-                            <li class="user-header user-header-yedian">
-                                <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
-                                     alt="User Image">
-
-                                <p>
-                                    {{currentUser.display_name}}
-                                    <small>
-                                        <i class="fa fa-user-secret" title="Administrator"
-                                           ng-class="{'text-orange':!('1'|withRole),'text-gray':('1'|withRole)}"></i>
-                                        <i class="fa fa-eye" title="Compliance"
-                                           ng-class="{'text-orange':!('10'|withRole),'text-gray':('10'|withRole)}"></i>
-                                        <i class="fa fa-crosshairs" title="BD User"
-                                           ng-class="{'text-orange':!('100'|withRole),'text-gray':('100'|withRole)}"></i>
-                                        <i class="fa fa-balance-scale" title="Accountant"
-                                           ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
-                                        <i class="fa fa-tty" title="Service"
-                                           ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
-                                        <i class="fa fa-university" title="Account Manager"
-                                           ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
-                                        <i class="fa fa-line-chart" title="Director"
-                                           ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
-                                        <i class="fa fa-map-o" title="Site Manager"
-                                           ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
-                                        <i class="fa fa-code" title="Developer"
-                                           ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
-                                        <i class="fa fa-user" title="Risk Manager"
-                                           ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
-                                        <i class="fa fa-tripadvisor" title="GUEST"
-                                           ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
-                                        <i class="fa fa-user-plus" title="Org Manager"
-                                           ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
-                                    </small>
-                                </p>
-                            </li>
-                            <!-- Menu Footer-->
-                            <li class="user-footer">
-                                <div class="pull-left">
-                                    <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
-                                </div>
-                                <div class="pull-right">
-                                    <a href class="btn btn-default btn-flat" ng-click="logout()">Sign Out</a>
-                                </div>
-                            </li>
-                        </ul>
-                    </li>
-                    <!-- Control Sidebar Toggle Button -->
-                </ul>
-            </div>
-        </nav>
-    </header>
-    <!--end:顶部导航栏-->
-    <!-- Left side column. contains the logo and sidebar -->
-    <!--左边栏-->
-    <aside class="main-sidebar" style="height: 100%;max-height: 100%;overflow: auto;padding-bottom: 50px;">
-        <!-- sidebar: style can be found in sidebar.less -->
-        <section class="sidebar">
-
-            <ul class="sidebar-menu">
-
-                <li ui-sref-active="active" ng-if="'dashboard'|withModule">
-                    <a ui-sref="dashboard">
-                        <i class="fa fa-dashboard"></i>
-                        <span>控制台|Dashboard</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="'1011110'|withRole">支付结算|Payment</li>
-                <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 Manage</span>
-                    </a>
-                </li>
-
-                <li ui-sref-active="active"
-                    ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
-                        <i class="fa  fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
-                    </a>
-                </li>
-                <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>
-                    </a>
-                </li>
-                <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>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'clearing'|withModule">
-                    <a ui-sref="clearingLogs" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-line-chart"></i> <span>清算统计|Settlement Logs</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('clearing_org'|withModule) && currentUser.org_id>1">
-                    <a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>
-                    </a>
-                </li>
-
-                <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>
-                    </a>
-                </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="'1000'|withRole">
-                    <a ui-sref="invoice" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>Partner Invoice</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header"
-                    ng-if="('1011110'|withRole) || currentUser.org_id==null">营销服务|Promotion
-                </li>
-
-              <li ui-sref-active="active" ng-if="'appAct'|withModule">
-                    <a ui-sref="appAct">
-                        <i class="fa fa-file-text-o"></i> <span>活动管理|Activity Manage</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}">
-               <i class="fa fa-compass"></i> <span>店长行动|Activities</span>
-               </a>
-               </li>
-               <li ui-sref-active="active" ng-if="('act_redpack'|withModule)">
-                   <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_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="('encourage'|withModule)">
-                    <a ui-sref="encourageAct">
-                        <i class="fa fa-gift"></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="('cashbackAnalysis'|withModule)">
-                    <a ui-sref="cashbackAnalysis">
-                        <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 ui-sref-active="active" ng-if="'settleDelay'|withModule">
-                    <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>周末费率减半活动</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'monDelay'|withModule">
-                    <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>余额增值活动</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('1'|withRole)">
-                    <a ui-sref="contract">
-                        <i class="fa fa-money"></i> <span>合同签约情况</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'actChairty'|withModule">
-                    <a ui-sref="act_chairty" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></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}">
-                        <i class="fa fa-hand-peace-o"></i> <span>机构数据分析|Agent Analysis</span>
-                    </a>
-                </li>
-
-
-                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">数据分析|Analysis</li>
 
-                <li ui-sref-active="active" ng-if="('transAnalysis'|withModule)||('dashboard'|withModule)||
-                ('customer_analysis'|withModule)||
-                ('customerRankingAnalysisApp'|withModule)||
-                ('partner_analysis'|withModule)">
-                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-area-chart"></i> <span>交易|Transaction Analysis</span>
-                    </a>
-                </li>
-
-
-                <li ui-sref-active="active"
-                    ng-if="('bdsale'|withModule)||('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="analysis_bd" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-hand-peace-o"></i> <span>BD|BD Analysis</span>
-                    </a>
-                </li>
-
-
-                <li ui-sref-active="active"
-                    ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))||('orgcommission'|withModule)">
-                    <a ui-sref="analysis_org" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-hand-peace-o"></i> <span>合伙人|Partners Analysis</span>
-                    </a>
-                </li>
-
-
-                <li ui-sref-active="active" ng-if="('clientrate'|withModule)||('monitor'|withModule)">
-                    <a ui-sref="analysis_monitoring" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-shopping-cart"></i> <span>监控|Monitoring</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('settleReport'|withModule)||('platformRevenue'|withModule)">
-                    <a ui-sref="analysis_report" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-tv"></i> <span>报表|Report</span>
-                    </a>
-                </li>
-
-
-                <li class="header nav-header" ng-if="'0100001'|withRole">基础设置|Basic Settings</li>
-                <li ui-sref-active="active" ng-if="('10'|withRole)&&('merchantIdManage'|withModule)">
-                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
-                        <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
-                    </a>
-                </li>
-                <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>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
-                    <a ui-sref="managers" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-key"></i> <span>账号管理|Accounts</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'dev'|withModule">
-                    <a ui-sref="devtools">
-                        <i class="fa fa-cog"></i> <span>开发工具|DevTools</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'notice'|withModule">
-                    <a ui-sref="notice">
-                        <i class="fa fa-bell"></i> <span>通知群发|Notifications</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'log'|withModule">
-                    <a ui-sref="logview">
-                        <i class="fa fa-file-text-o"></i> <span>系统日志|System Logs</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'cms'|withModule">
-                    <a ui-sref="cms">
-                        <i class="fa fa-file-text-o"></i> <span>网站管理|Site Manage</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)">
-                    <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
-                        <i class="fa fa-file-text-o"></i> <span>积分商城|Integral Mall</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active"
-                    ng-if="('device'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="device" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>设备管理|Devices</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'sysconfig'|withModule">
-                    <a ui-sref="sysconfig">
-                        <i class="fa fa-cog"></i> <span>系统参数设定|Settings</span>
-                    </a>
-                </li>
-            </ul>
-
-        </section>
-        <!-- /.sidebar -->
-    </aside>
-    <!--END:左边栏-->
+<div class="total_logo">
+    <a><img src="/static/images/manage_total_logo.png">  </a>
+</div>
 
-    <!-- Content Wrapper. Contains page content -->
-    <div>
-        <div class="content-wrapper autoheight" ui-view></div>
+<div style="margin: 0 auto;display: flex;padding-top: 40px;width: 1050px;flex-wrap:wrap">
+    <div class="box-items" ng-if="'10'|withRole">
+        <div class="boxs">
+            <img src="/static/images/manage/menu_1.png">
+        </div>
+        <p class="box-font">Compliance</p>
     </div>
-    <!-- /.content-wrapper -->
-
-    <footer class="main-footer">
-        <div class="pull-right hidden-xs">
-            <b>Easy Business，Easy Pay</b>
+    <div class="box-items" ng-if="'10000000000'|withRole">
+        <div class="boxs">
+                <img src="/static/images/manage/menu_2.png">
+        </div>
+        <p class="box-font">Risk Manager</p>
+    </div>
+    <div class="box-items" ng-if="'100000'|withRole">
+        <div class="boxs">
+                <img src="/static/images/manage/menu_3.png">
+        </div>
+        <p class="box-font">Account Manager</p>
+    </div>
+    <div class="box-items" ng-if="'1000'|withRole">
+        <div class="boxs">
+                <img src="/static/images/manage/menu_4.png">
         </div>
-        <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
-        reserved.
-    </footer>
+        <p class="box-font">Accountant</p>
+    </div>
+    <div class="box-items" ng-if="'100'|withRole">
+        <div class="boxs">
+                <img src="/static/images/manage/menu_5.png">
+        </div>
+        <p class="box-font">BD User</p>
+    </div>
+    <div class="box-items" ng-if="'10000'|withRole">
+        <div class="boxs">
+                <img src="/static/images/manage/menu_6.png">
+        </div>
+        <p class="box-font">Service</p>
+    </div>
+    <div class="box-items" ng-if="'1'|withRole">
+        <div class="boxs">
+                <img src="/static/images/manage/menu_7.png">
+        </div>
+        <p class="box-font">Administrator</p>
+    </div>
+    <div class="box-items" ng-if="'10000000'|withRole">
+        <div class="boxs">
+                <img src="/static/images/manage/menu_8.png">
+        </div>
+        <p class="box-font">Site Manager</p>
+    </div>
+    <div class="box-items" ng-if="'100000000'|withRole">
+        <div class="boxs">
+                <img src="/static/images/manage/menu_9.png">
+        </div>
+        <p class="box-font">Developer</p>
+    </div>
+    <div class="box-items" ng-if="'1000000'|withRole">
+        <div class="boxs">
+                <img src="/static/images/manage/menu_10.png">
+        </div>
+        <p class="box-font">Director</p>
+    </div>
+
+</div>
+
 
 </div>
-<!-- ./wrapper -->
 </body>
 </html>
diff --git a/src/main/ui/manage_bak.html b/src/main/ui/manage_bak.html
new file mode 100644
index 000000000..4185ec394
--- /dev/null
+++ b/src/main/ui/manage_bak.html
@@ -0,0 +1,488 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="apple-touch-icon" sizes="57x57" href="ico/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="ico/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="ico/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="ico/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="ico/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="ico/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="ico/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="ico/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="ico/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192" href="ico/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="ico/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="ico/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="ico/favicon-16x16.png">
+    <link rel="manifest" href="ico/manifest.json">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
+    <meta name="theme-color" content="#ffffff">
+    <meta name="format-detection" content="telephone=no">
+    <meta charset="UTF-8">
+    <title>RoyalPay</title>
+    <!-- Tell the browser to be responsive to screen width -->
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <!-- Bootstrap 3.3.5 -->
+    <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css">
+
+
+    <!-- Font Awesome -->
+    <!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">-->
+    <link href="static/lib/font-awesome-4.6.3/css/font-awesome.min.css" rel="stylesheet">
+    <!-- Ionicons -->
+    <link rel="stylesheet" href="static/lib/ioicons-2.0.1/css/ionicons.min.css">
+
+    <!-- Theme style -->
+    <link rel="stylesheet" href="static/lib/dist/css/AdminLTE.min.css">
+    <!-- AdminLTE Skins. Choose a skin from the css/skins
+         folder instead of downloading all of them to reduce the load. -->
+    <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">
+        .ng-cloak, [ng-cloak] {
+            display: none !important;
+        }
+
+        @keyframes myfirst {
+            0% {
+                transform: rotateY(1deg);
+            }
+            100% {
+                transform: rotateY(90deg);
+            }
+        }
+
+        div.polaroid {
+            text-align: center;
+        }
+
+        div.rotate_left {
+            position: fixed;
+            width: 200px;
+            margin: 0 -100px;
+            top: 40%;
+            left: 50%;
+            z-index: 9999999;
+        }
+
+        .dh {
+            animation: myfirst 1s linear 0s infinite alternate;
+        }
+    </style>
+    <script type="text/javascript" src="static/lib/require.js" data-main="static/boot/manager-boot"></script>
+    <script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
+    <script type="text/javascript" src="/static/lib/bootstrap/js/bootstrap.min.js"></script>
+
+</head>
+<body ng-controller="managerIndexCtrl" class="skin-blue sidebar-mini"
+      ng-class="{'sidebar-collapse':hideSideBar,'sidebar-open':hideSideBar}">
+<div class="polaroid" ng-if="currentUser==null">
+    <div class="rotate_left">
+        <img class="dh" src="static/images/r_logo.svg" alt="RoyalPay" style="width:150px;height:150px;margin-top: 10%;
+margin-bottom: 10%;"/>
+        <p style="color: #666">To Be The Best QRCode Payment Service Provider!</p>
+    </div>
+</div>
+<div class="wrapper" ng-if="currentUser!=null" ng-cloak
+     ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'">
+
+    <header class="main-header">
+        &lt;!&ndash; Logo &ndash;&gt;
+        <a href="#" class="logo logo-yedian shine" ng-if="!currentUser.org">
+            &lt;!&ndash; mini logo for sidebar mini 50x50 pixels &ndash;&gt;
+            <span class="logo-mini"><img src="static/images/r_white_logo.svg"
+                                         style="max-height: 35px;margin-left: 15%;"></span>
+            &lt;!&ndash; logo for regular state and mobile devices &ndash;&gt;
+            <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
+                                       style="max-height: 35px;">
+                &lt;!&ndash;<b>RoyalPay</b>&ndash;&gt;
+            </span>
+        </a>
+        <a href="#" class="logo logo-yedian shine" ng-if="currentUser.org">
+            &lt;!&ndash; mini logo for sidebar mini 50x50 pixels &ndash;&gt;
+            <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
+                                         style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
+            &lt;!&ndash; logo for regular state and mobile devices &ndash;&gt;
+            <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
+                                       style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
+                    ng-bind="currentUser.org.name"></b></span>
+        </a>
+        &lt;!&ndash; Header Navbar: style can be found in header.less &ndash;&gt;
+        &lt;!&ndash;顶部导航栏&ndash;&gt;
+        <nav class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
+            &lt;!&ndash; Sidebar toggle button&ndash;&gt;
+            <a class="sidebar-toggle sidebar-tooggle-yedian" data-toggle="offcanvas" role="button"
+               ng-click="toggleHideSideBar()">
+                <span class="sr-only">Toggle navigation</span>
+            </a>
+
+            <div class="navbar-custom-menu">
+                <ul class="nav navbar-nav">
+                    <li class="user-menu" ng-if="currentUser.onoff">
+                        <a role="button" ng-click="customerService()">
+                            <i class="fa fa-wechat"></i> contact service
+                        </a>
+
+                    </li>
+                    <li class="user-menu">
+                        <a role="button" ng-click="managerBindWechat(true)">
+                            <i class="fa fa-wechat"></i> Bind WeChat
+                        </a>
+                    </li>
+                    <li ng-if="('110'|withRole)" ng-class="{'dropdown notifications-menu open':openNotice,'dropdown notifications-menu':!openNotice}">
+                        <a title="New Notice" ng-click="toggleOpenNotice()"  class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
+                            <i class="fa fa-bell-o"></i>
+                            <span class="label label-warning" ng-if="notifyCounts">{{notifyCounts}}</span>
+                        </a>
+                        <ul class="dropdown-menu">
+                            &lt;!&ndash;<li class="header">System notifications,please resolve it!</li>&ndash;&gt;
+                            <li>
+                                &lt;!&ndash; inner menu: contains the actual data &ndash;&gt;
+                                <div class="slimScrollDiv" style="position: relative; overflow: hidden; width: auto; max-height: 200px;"><ul class="menu" style="overflow: hidden; width: 100%;">
+                                    <li>
+                                    <a ng-if="partner_application_new" ui-sref="partner_apply">
+                                        <i class="fa fa-commenting"></i>
+                                        新的自主申请商户<span style="font-size:smaller;float:right;right: 0"></span>
+                                    </a>
+                                    </li>
+                                    <li>
+                                    <a ng-if="refundReviews && ('10000000000'|withRole)" ui-sref="refundReview">
+                                        <i class="fa fa-commenting"></i>
+                                        新的退款申请<span style="font-size:smaller;float:right;right: 0"></span>
+                                    </a>
+                                    </li>
+                                </ul><div class="slimScrollBar" style="background: rgb(0, 0, 0); width: 3px; position: absolute; top: 0px; opacity: 0.4; display: none; border-radius: 7px; z-index: 99; right: 1px; height: 195.122px;"></div><div class="slimScrollRail" style="width: 3px; height: 100%; position: absolute; top: 0px; display: none; border-radius: 7px; background: rgb(51, 51, 51); opacity: 0.2; z-index: 90; right: 1px;"></div></div>
+                            </li>
+                        </ul>
+                    </li>
+
+                    &lt;!&ndash; User Account: style can be found in dropdown.less &ndash;&gt;
+                    <li class="dropdown user user-menu" uib-dropdown>
+                        <a href class="dropdown-toggle" uib-dropdown-toggle>
+                            <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
+                                 class="user-image user-img-yedian"
+                                 alt="User Image">
+                            <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
+                        </a>
+                        <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
+                            &lt;!&ndash; User image &ndash;&gt;
+                            <li class="user-header user-header-yedian">
+                                <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
+                                     alt="User Image">
+
+                                <p>
+                                    {{currentUser.display_name}}
+                                    <small>
+                                        <i class="fa fa-user-secret" title="Administrator"
+                                           ng-class="{'text-orange':!('1'|withRole),'text-gray':('1'|withRole)}"></i>
+                                        <i class="fa fa-eye" title="Compliance"
+                                           ng-class="{'text-orange':!('10'|withRole),'text-gray':('10'|withRole)}"></i>
+                                        <i class="fa fa-crosshairs" title="BD User"
+                                           ng-class="{'text-orange':!('100'|withRole),'text-gray':('100'|withRole)}"></i>
+                                        <i class="fa fa-balance-scale" title="Accountant"
+                                           ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
+                                        <i class="fa fa-tty" title="Service"
+                                           ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
+                                        <i class="fa fa-university" title="Account Manager"
+                                           ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
+                                        <i class="fa fa-line-chart" title="Director"
+                                           ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
+                                        <i class="fa fa-map-o" title="Site Manager"
+                                           ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
+                                        <i class="fa fa-code" title="Developer"
+                                           ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
+                                        <i class="fa fa-user" title="Risk Manager"
+                                           ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
+                                        <i class="fa fa-tripadvisor" title="GUEST"
+                                           ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
+                                        <i class="fa fa-user-plus" title="Org Manager"
+                                           ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
+                                    </small>
+                                </p>
+                            </li>
+                            &lt;!&ndash; Menu Footer&ndash;&gt;
+                            <li class="user-footer">
+                                <div class="pull-left">
+                                    <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
+                                </div>
+                                <div class="pull-right">
+                                    <a href class="btn btn-default btn-flat" ng-click="logout()">Sign Out</a>
+                                </div>
+                            </li>
+                        </ul>
+                    </li>
+                    &lt;!&ndash; Control Sidebar Toggle Button &ndash;&gt;
+                </ul>
+            </div>
+        </nav>
+    </header>
+    <!--end:顶部导航栏-->
+    <!-- Left side column. contains the logo and sidebar -->
+    <!--左边栏-->
+<!--
+    <aside class="main-sidebar" style="height: 100%;max-height: 100%;overflow: auto;padding-bottom: 50px;">
+        &lt;!&ndash; sidebar: style can be found in sidebar.less &ndash;&gt;
+        <section class="sidebar">
+
+            <ul class="sidebar-menu">
+
+                <li ui-sref-active="active" ng-if="'dashboard'|withModule">
+                    <a ui-sref="dashboard">
+                        <i class="fa fa-dashboard"></i>
+                        <span>控制台|Dashboard</span>
+                    </a>
+                </li>
+
+                <li class="header nav-header" ng-if="'1011110'|withRole">支付结算|Payment</li>
+                <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 Manage</span>
+                    </a>
+                </li>
+
+                <li ui-sref-active="active"
+                    ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                    <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
+                        <i class="fa  fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
+                    </a>
+                </li>
+                <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>
+                    </a>
+                </li>
+                <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>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                    <a ui-sref="clearingLogs" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-line-chart"></i> <span>清算统计|Settlement Logs</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('clearing_org'|withModule) && currentUser.org_id>1">
+                    <a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>
+                    </a>
+                </li>
+
+                <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>
+                    </a>
+                </li>
+
+               &lt;!&ndash; <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>&ndash;&gt;
+
+                <li ui-sref-active="active" ng-if="'1000'|withRole">
+                    <a ui-sref="invoice" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>Partner Invoice</span>
+                    </a>
+                </li>
+
+                <li class="header nav-header"
+                    ng-if="('1011110'|withRole) || currentUser.org_id==null">营销服务|Promotion
+                </li>
+
+              <li ui-sref-active="active" ng-if="'appAct'|withModule">
+                    <a ui-sref="appAct">
+                        <i class="fa fa-file-text-o"></i> <span>活动管理|Activity Manage</span>
+                    </a>
+                </li>
+                &lt;!&ndash;
+               <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}">
+               <i class="fa fa-compass"></i> <span>店长行动|Activities</span>
+               </a>
+               </li>
+               <li ui-sref-active="active" ng-if="('act_redpack'|withModule)">
+                   <a ui-sref="act_partners" ui-sref-opts="{reload:true}">
+                       <i class="fa fa-compass"></i> <span>店长行动参与情况</span>
+                   </a>
+               </li>&ndash;&gt;
+
+                &lt;!&ndash;<li ui-sref-active="active" ng-if="('act_redpack'|withModule) && (currentUser.org_id==1 || currentUser.org_id==null)">&ndash;&gt;
+                &lt;!&ndash;<a ui-sref="act_partners" ui-sref-opts="{reload:true}">&ndash;&gt;
+                &lt;!&ndash;<i class="fa fa-compass"></i> <span>新费率签约情况</span>&ndash;&gt;
+                &lt;!&ndash;</a>&ndash;&gt;
+                &lt;!&ndash;</li>&ndash;&gt;
+
+               <li ui-sref-active="active" ng-if="('encourage'|withModule)">
+                    <a ui-sref="encourageAct">
+                        <i class="fa fa-gift"></i> <span>鼓励金</span>
+                    </a>
+                </li>
+
+                &lt;!&ndash;<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>&ndash;&gt;
+
+
+                <li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
+                    <a ui-sref="cashbackAnalysis">
+                        <i class="fa fa-gift"></i> <span>商户营销账户</span>
+                    </a>
+                </li>
+
+               &lt;!&ndash; <li ui-sref-active="active" ng-if="('funds'|withModule)">
+                    <a ui-sref="funds">
+                        <i class="fa fa-money"></i> <span>增值计划</span>
+                    </a>
+                </li>&ndash;&gt;
+
+                <li ui-sref-active="active" ng-if="'settleDelay'|withModule">
+                    <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>周末费率减半活动</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'monDelay'|withModule">
+                    <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>余额增值活动</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('1'|withRole)">
+                    <a ui-sref="contract">
+                        <i class="fa fa-money"></i> <span>合同签约情况</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'actChairty'|withModule">
+                    <a ui-sref="act_chairty" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></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}">
+                        <i class="fa fa-hand-peace-o"></i> <span>机构数据分析|Agent Analysis</span>
+                    </a>
+                </li>
+
+
+                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">数据分析|Analysis</li>
+
+                <li ui-sref-active="active" ng-if="('transAnalysis'|withModule)||('dashboard'|withModule)||
+                ('customer_analysis'|withModule)||
+                ('customerRankingAnalysisApp'|withModule)||
+                ('partner_analysis'|withModule)">
+                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-area-chart"></i> <span>交易|Transaction Analysis</span>
+                    </a>
+                </li>
+
+
+                <li ui-sref-active="active"
+                    ng-if="('bdsale'|withModule)||('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">
+                    <a ui-sref="analysis_bd" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-hand-peace-o"></i> <span>BD|BD Analysis</span>
+                    </a>
+                </li>
+
+
+                <li ui-sref-active="active"
+                    ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))||('orgcommission'|withModule)">
+                    <a ui-sref="analysis_org" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-hand-peace-o"></i> <span>合伙人|Partners Analysis</span>
+                    </a>
+                </li>
+
+
+                <li ui-sref-active="active" ng-if="('clientrate'|withModule)||('monitor'|withModule)">
+                    <a ui-sref="analysis_monitoring" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-shopping-cart"></i> <span>监控|Monitoring</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('settleReport'|withModule)||('platformRevenue'|withModule)">
+                    <a ui-sref="analysis_report" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-tv"></i> <span>报表|Report</span>
+                    </a>
+                </li>
+
+
+                <li class="header nav-header" ng-if="'0100001'|withRole">基础设置|Basic Settings</li>
+                <li ui-sref-active="active" ng-if="('10'|withRole)&&('merchantIdManage'|withModule)">
+                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
+                        <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
+                    </a>
+                </li>
+                <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>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
+                    <a ui-sref="managers" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-key"></i> <span>账号管理|Accounts</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'dev'|withModule">
+                    <a ui-sref="devtools">
+                        <i class="fa fa-cog"></i> <span>开发工具|DevTools</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'notice'|withModule">
+                    <a ui-sref="notice">
+                        <i class="fa fa-bell"></i> <span>通知群发|Notifications</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'log'|withModule">
+                    <a ui-sref="logview">
+                        <i class="fa fa-file-text-o"></i> <span>系统日志|System Logs</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'cms'|withModule">
+                    <a ui-sref="cms">
+                        <i class="fa fa-file-text-o"></i> <span>网站管理|Site Manage</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)">
+                    <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
+                        <i class="fa fa-file-text-o"></i> <span>积分商城|Integral Mall</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active"
+                    ng-if="('device'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                    <a ui-sref="device" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>设备管理|Devices</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'sysconfig'|withModule">
+                    <a ui-sref="sysconfig">
+                        <i class="fa fa-cog"></i> <span>系统参数设定|Settings</span>
+                    </a>
+                </li>
+            </ul>
+
+        </section>
+        &lt;!&ndash; /.sidebar &ndash;&gt;
+    </aside>
+-->
+    <!--END:左边栏-->
+
+<!--    &lt;!&ndash; Content Wrapper. Contains page content &ndash;&gt;
+    <div>
+        <div class="content-wrapper autoheight" ui-view></div>
+    </div>-->
+    <!-- /.content-wrapper -->
+
+<!--    <footer class="main-footer">
+        <div class="pull-right hidden-xs">
+            <b>Easy Business，Easy Pay</b>
+        </div>
+        <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
+        reserved.
+    </footer>-->
+
+</div>
+<!-- ./wrapper -->
+</body>
+</html>
diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js
index b649f08a1..cd2609478 100644
--- a/src/main/ui/static/boot/managerMainApp.js
+++ b/src/main/ui/static/boot/managerMainApp.js
@@ -5,7 +5,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
     'use strict';
     var app = angular.module('managerMainApp', ['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' : '/dashboard');
+*/
         if (!$httpProvider.defaults.headers.get) {
             $httpProvider.defaults.headers.get = {};
         }
@@ -64,7 +66,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     }
                 })
             };
-            $scope.getManagerTodoNotices();
+          //  $scope.getManagerTodoNotices();
 
 
             var connected;
diff --git a/src/main/ui/static/images/manage/menu_1.png b/src/main/ui/static/images/manage/menu_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e11ffbe8b045c0bd2c592543d11b9a80e7cef3fb
GIT binary patch
literal 1113
zcmV-f1g86mP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px(6G=otRCodH+*?RgK^O<{Z_XZF&GizMc|i>$s34@Qh{#^72ztl}yCK#?L>LtG
z(t{8Z1oc?-76kR0Z`MmUD7ryNNl}uQBn`=w)Y850Y0lC*jx)zy+}U%E@(sw&{Ac#;
z%+EQydt_Z=v^8drbdO&#2x&G9qZF_JA!L{s#=YY8MVCD-CFNIR0GFssKHAI(<Qo9H
zrbh$Wnz?gkVytiirj3TD6=%XVOdE|$uptN_kU+u*2*i5`Ed&xs_yB=;521xX0tp`=
z5bq(h5J({50|eqdgcbq`Bz%BCyob<2Ac2Gr5Qz5>S_mYN@Bsqx9zx4?K)Lk?p!jw>
zth{j-ytO-o3ELgG3y2WNZ#n~-uK@JoQYgCE2HBgo*lof+o~wYg<tsqT$(@-X(KIMH
z*)r31qT(tb4+WZA^zur`TDM_tY+Kt^KzhX*>B9A@wbI;<&{aU*nr+fG>#NJ8xgDWv
zfIO>8z`J#)bj>6$Pnz2ix(3L1xCw}^%hw!<%5xi1R{(j+Dj=t>-g3FI$#KiROm{dB
zl<kG0^Q}NMkL6mUqa&7mneK2LsPOa!$f~NIcb$=;fqDBg+36^dudx|&>-NmMJ|h~1
z$e?pT7SD?F&RI#P@5m|e9XgTpSdoEVFoJ=k<1#fsIgnmi4LUt#2;nzpsIMEMKfcG;
z;oZDFB^+~bjN;_(-j{U!MvU&Xfj&@uIw}QPw!gvh+R5AnBWI6-5%ALs(AuO6P7LsF
ztO4^Ul|ny_0h4!bg8#|GREDQChW|CEbQkMEc@4)cJBc?3wEV(&Kgr6n9G6Z9{bU&U
z4qDG)A;(q<WFk0Th}sz_1#<EYU4kXt-;<~+xm64_p=46&93<THC7rtq_f-t!+$BL`
zWufkmiK>!Y#X!#PpqPIe!u?;Bz$6Z$7|7Wj6#DcYfWGrqS(X$~@WVTmHt}OA26FZk
z3wF64$hlK2L|?sPW4~|*Sqb=GJhJLaD_4AqIkSU|a0mi#o~H$2b>}4k6zqHp#?)V{
zHKvs-1%hxGV)Sa=?lS$jBV!M#7Kl#M?(4De;5P_;?pj1Z6ZSq2O?BMQ7>;>h^*iW~
zeeZ=L!$S~w^=xqgg?qcLCrtn17cc*BtOq9ViA_(z_^oU7oTmRTnZcrb2TeU_2S0tu
zH9{e7+Clm}5gq**&jOvV!Cc@%N_6};_+LJSvDR}CQG8)4n-3X2wpYRLQ+DX3ktyFn
zOM`{20)d!?w1z-Z78W89vyj#hNXo)O1Y#D_8UjgKScpK(LRv#0DGLh`h*?N$2qa};
zAp$WAX$^s-EG$GIW+AO1kd%dmn)!uhtckVR0;Y{-e%ssZ5bI39w9(A3!lUQeb=*m_
fV9cFEO-!4A5}F9t50sVP00000NkvXXu0mjf408Qm

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/manage/menu_10.png b/src/main/ui/static/images/manage/menu_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..84051a502d7ebd07d6e37a412b81b683d0a7754b
GIT binary patch
literal 648
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!jKx9jP7LeL$-HD>U~=+waSW+o
ze0#^<+bL0m?L%>X+7zLQj$5~wm~mXZCG$nJ>4mh(E=!iJUwN}KbFw(2X3c7S*3~Aq
zc&&X@=C88#EY}ZLK4jcI?a|{Wmi=Y#|5nDW^xo5G9eeWHJ-P2obZ`6JS@c1%ktLM#
zsmk<tjr1g$>t(9DRG8*EW_oLG>YTIaq^FWyFw;ce6RAr*LIiKOtU7#%L*T@O7i^7N
z+E;R<c$73d+&Ub>Vx+RmQQ>W(7L%mVU4;qX3`84wI`afPs%LaLw7HmbEV1=*Rd8M;
z&2mX@*{K=l>`jh|T~96ge5U%z`BRN1>-qQIj5o1#beQSD!o;NTj75-xqhW@yi-H0}
zlAi#BR7bqXLCaSb5|i&->wWh(WbLb|H8JlhHpk6A%q|j}X<+zx|GkfU_W$qJn=Wxc
zS%BfyZ6R)MSI*~M_YQBD(>t=)zH+l;_BURQ&07?2hW_6#d-Z&NJ6nf0PmfL`2MdeC
z8BQeu0R}_$4hIK@BXbm(7#RhMn;;TQ4hLUfT*JKnr6!-+bJZD9ANFnkTciFd)O*tl
zw{VNSbFRdmkJ+2`Z$s~UksosFermmYdQbf8o!8O<=hICR@_pWxxtFcAv6%iW>e7lg
z%Zuz@GK!W5TP`%I>&P|@VtzE;<cA9f$diw*>}$T)$NeDSuw-#(<N01}q0rdC&|&F_
z9z2gWY+fi?adE}5jlL4^znQIK_^?ZPw$C2XxIMR}w{!aJ*tMPW4;y=Px^+$3tdGE?
O#o+1c=d#Wzp$P!$`wTn)

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/manage/menu_2.png b/src/main/ui/static/images/manage/menu_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c5ac6143516615fc5521e25fc10f92059be2e2d
GIT binary patch
literal 2313
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/manage/menu_3.png b/src/main/ui/static/images/manage/menu_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4fb7e741ec05c5585b15651de460486910a2e92
GIT binary patch
literal 1056
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!jKx9jP7LeL$-HD>V7}$);uuoF
z_;${D?~p)|<L9f5&%HSFBEoaVI-OV#&A$r_dbTLt+L|G}h2z)8i3`Fmt#h5t)1t80
z{(!Hbqps4g#srrL$B;!+8<l!rDmgDNnG={E_k7>VnH#S#7uMUnnsZco@AJy@JLmtd
z{l2&Qeub_?36p{3evSt+?CfR?(haP_6))PlUa)e{^C@q5JSSc6w7`Znr#UjR=1kqp
zBNN!-wMp_ESAmNmpXE2LyfQ^bHkT6(jD`wL3=h*-iKV{vG(|10tJtT@^zoU-mxs^q
zt?2iN?Z4f0Pt)Ch#ni<nZMhXY_lh)an`*5&voPWL>h}f{PCPl~^XCC4>)bUwdX35s
zBFbxor!orrOgj>?NMT{~=Btbr!J;j`s%AIB;v~HndH+y-Y++zCy>Z=n%^hZT{ijb9
zoz>sID<}8)s^)^F+gx0))?d+laJ{vrV5{DfU%Lb*`2-hrZVjEe)8tmb#!bGQ3uYy$
zUY(S?{^04zZ70_UmbJCLPIho%*N|Mo|K<FH=;*&~{eG8#%9elJ^2NnBbOp<Wv%ds>
z@Oos(iI%*nb<*-yZRiUTaSS}T#WCyH>JYVM>YIAmGn+J+e~B~r>Zd)hI=3~hCR$~d
z^8K|bJd<WVbJ1e{egE76_Bj*S3Lf;EPCfXm!S3Pf?l0n3jtTgk_P2O+{^;C5Woh%|
z^I9*0jhKH6oa3nD5`MKaP`<5b|2?~_(!A1I*Yf-J&2C+_&!Xhmq`b%V_C0EsFMLwt
zSMMlzm&12Bv8Lui?k!Ojk;2!fn{J=`Hc_P}w&1~~V}EX4{19_1)K6z>?J`X_i}LL)
z4=+UhEpVB1OEe_<QFH9lpR7OoBDij~KaWX}7mj@Tr%CwGn|G!&nw2MATBjiR#m?+k
z!hfAT^G=?-X>~lvpzBms+xCx~hVc%EOKZgavUf^8-QoGbad(r;gHl(sFD7k?>5Y@}
z{PmtZ=y=55D`>#${v?ZK0>>UUMO!xxU)BjOm6C@lZwNHn{+M@$JB?>TMvaJkj-29>
zG)LC8chYxWD63}aJ8`nYe5%rtdus(>%#3Q0U9pTSWZLvI77E*^f4JJa^0viQ$$PK#
zw4#~o*jyaKnKC%i@2TZ@92A$G!eC`OrQzUBlYh#K|EOMgdZ62aS>nCPv8lOU`}QbU
zdrtnU893o2+sVGO4IGPjIv536ILx()rMAz#d!fhTb$#jX=#tL6_iltKB$WO>8dkBx
mS7F|P+bqvCM013HFuOE9uP%6dJ{_3l89ZJ6T-G@yGywp-5Yit2

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/manage/menu_4.png b/src/main/ui/static/images/manage/menu_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c2d864c9f50bbc5e933e488b09a65faf11ad159
GIT binary patch
literal 1678
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
O48YCB3)|=vLH`$hYzB$|

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/manage/menu_5.png b/src/main/ui/static/images/manage/menu_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..84f63a2f71c2f8053069300f4fef690cbc1d537c
GIT binary patch
literal 1804
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/manage/menu_6.png b/src/main/ui/static/images/manage/menu_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..580eebe669a922da9115bec9a8cceb73fa238ec9
GIT binary patch
literal 1545
zcmaKsX*d%M0LOPRCNf(pVsqBqM|xbVttLl^g<d5sH<Ok~u2~ebR4Z~TJ;N(Z$o1B0
zM3cKx=n#)I=h%p0j<@%7&+~rx|9@Y9pML3XuJ-aU6&L^jkau(-5P#F*zsX4deow(O
z``-XwA=)1WRQK(h1^}em90_=jYd}F^d^pl>UkBIxMbi**!o8)wm>8nx6`n%yy`3&i
zP}kJu0i@2pTV(E$2P!dS@Q4)No@4n$dFcnmbeh{PzgmcB8CrZiOcA9W0y($}&^C;T
ze=&QBA3hx`khd4Zf`hl3i;6~j<}MwU6pU_MJ=D~57W)xaw7ncUwA2MO-fayBUS*g!
znhs-wAMCyP!)U<g3_=*$Ny>(+3d?`iE6*gD16xyPLqBD(*sPorv?wP64(voo3s7N7
zm!OLk$#NfPNC?vJB3^}=Ogma-=l~`vy3re?LUAw<thNy??|{c?3@U%r0p#I@1^YEk
z{MA+s#RpOg3x}Pn*F8PHb|t%8s&l4%V*^^}g_;_}Hu{O4W&(g{{E120NifPx*?<WL
zw_)p`%@m`uD%Sq#$&~!QMp=6rJ)wckvK{~Ow;EcUwkgB)lI~yflm1~*loDTJRMvAh
zvmOlLk&rHr!MFBu2ZZWlH~hOcEFFz;-*6;;w~2j!wtvh?D!9Kk@cUY1CCYYu-2sJ5
zl_IYk&uu!aD784^d!s@Z&3OWv&pSV+F42ylP?1sU#Tn`*$Ftv)le_=2WJlESBd(i9
z5s|KK5}8Z6vcoPE45}jE;i=d!@ji+|Kox=L%bmxBB5X|=+m0fl3h^xCb4eg_@2CQ6
zOyRR`WQg2r)k!9|wiTMw!XaZQD-)&SoPgde@OVmxVqu(+d?~9!RCpAE8oAx_D-2zE
z(l7c&pjNZ++@4rgz{|Ijsw8d$v+9kMaWi6&!#3G(0Of`zj8m=AE*SKWM&fgcO-o%}
zsd<C=beoO1z+-5iJ0l|ydSPRh@`LwID-AafLb(~(t-NZe8Py;^ZkJm~^{mYUy>b30
z-@DX;goQffjUK7G?6{ES?0aQV55hCLzaDoxNn<0<%IZTuAm8kIx;`n(gC?5VyqsiB
z7p~|CLp+tz14jX5yy3M+*B8HSjqN4OoM*<0LM~ueVYzVTWbcta5m@GF0jT*NU-SGO
z9^-z`r&qr|Rv;?pJahf|Z<WNq?#ghZP#i>B=mbPN5;*@p&T@3{y4bkP=8@bW8Ia-r
zla%*z%;F)QvUN!KeW;uCt~wFaXYW~OoZ@9d9*j#yEKFG~1M3cmC5h~V)7J)L<opts
z?zzXhh4Ja-r!76=Y)P9i5_Utku&sgq5v%%gKyylUNfDIkrBwLPlqK@nz0zn$Q3wyi
z?DSFxE!Z^w<glFwKFl>Tj9>J`pe8n{J66*A+rBR&U(aHK;Qg*^O<Jpayq&oT5T0SS
zzDmfn@`-21?ucJs(Somy3$pR_v3{z*FH*r<>Hv;I?2N(rq3=DnpfgY1oJG%+H>E_+
zelj~w9Wj}{6#x|c9NP#TE<oYSgY>>3<QKiW*W#dPwdDw_=rbxYk-AhfNjc4G+A-8L
z{dqk<;sI4_@v^*?=p;PORAr%N%T9*zpdxttR_`g~4qpx~!AM6LQpW(W5Bga@QR*)7
zytwETU~mND-);~&v7=Bk2(JI8#XUMpGuFxAfC)>5Un9vRdbiY+oo>}BH;5;lkWn1y
zOnNxxAAqrTlto{4=?kpvmMDaA1=~T4h9m9unI$}EsaopFu0h(DU@e_Lx&XsrWRdXo
zv-7jsoI@827}~z8>Db~MPpohyLtS0ZWo?{%rzBLjMLnMp!-OVu?YXYBjLe-yMTev6
z4(5E%iA~y?`&ya^4KN&bjPHzng~<)KpGS4T&zReO4iXHC)tK>7#={}&lFH$v`8fjB
z#b>m?B$1iS-__g;yIpNoD_zp8@rTs^$ErlS-4!zvb-^@o&Lu&>mP0sLMz!*gk6t6r
k#}7P`4ey;94+d=m(>Cv~=k8ta_}zAZqn#_E`Y0*+UtEIGcK`qY

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/manage/menu_7.png b/src/main/ui/static/images/manage/menu_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d5c188e62e43983ae0d033c83ee20e67fb84a74
GIT binary patch
literal 1476
zcmaKs`9Bj30Ef33GKOj*8XFxfQ;3Dq$hBgaqbL)(az-of>l|9jhdH9wfgwfAvQ5ca
z>9X8+iy=pIMpmule7*lbKYX9(^ZWzf8!mWzC`26s005vk2OGks9sb`InN51kv+Xwp
zyhO0K2Gn%yngIZ$lW;ax?*9Pi@1G3UuvO!~lAMPNX@^VxwL0NFo%RqVLh6FNZ9Kq?
ztL}0S2#)(z@Cc8eE|s!$*=Zn3lTaQ56kpfYmE8?aA8~o!c*7G>2L&tUp9)bYIQZus
zZvMUz9@Ri(9_5Y<M}vRhng>_fI}%oe8*N_`!WeeJ&_aVXiFR)7ZG~B6ppE((HCc*N
zEqP++dp7Bg!bHyaI2PMW1k%Ny^J8|6E*j|Sm5%n2-*OGV*v!@!$b(^s6a^SU+5w9l
z^@I?}U@$nc{BOBHYt(A6fI`2`^jw%?9cDP&R~pxJ7hjTrPN`0_YeBpXzP^vXS_$8^
z3Ydk@!Z0Mm@aVWikGuxS;L$|T6XNoPyTr9XnVFq`JS|u`=gnB96w7I60p%?+z+WBC
zGsJ1toOCt*G6KVPo~`P=l!z`ecwK|%RhT-<O1qpkr@y>v7lqxL^=W->8!6edhWbD%
z4%pJI<E@jB!M`ZTzd!(r>yp7zY%MO=#7=OW!g55>g~qNeO{<vaCUZ(G)%x`^Ntbt&
zHf=I)qY83D=52bOWz#_=0sHhJdd{$kg^@-ZW8}lvRIZGa?jDscjN1>+xutYcP>dzn
zE%p?}9b0zVEm899)lCgb-0H_MMW@PqckIxY?&3$hcc(mlnN&BgB5NMA78Ga5mhgLJ
zH&2&i{HMBYv)9afKa@bVbl}SNcQsmiT}JLHHbLY$Kfc1&bfOXrtRo=w=m!TE%#3lx
z*<80CGu`0c8Qe0_6pjdmAYLB24-@{Hhs|4JY#;5L%sAD$9;Jq|SUg@7`6n(l>HaPK
z!kB|jPBgES#pTDxD4C_yOzj}9UxkRfSGP%hd-AP&7Ed@GJ$0euZ!)b^gYFl+OCM-G
z^B5v2`)TkLG*|mfu=~R3L-+n0g+n=eCtm6&vMhZ>@$&o^Y*QSD^8xA=8s_|a`VcAj
zTG1@7tIQ#ugDecKBmJ92u}!9kfAe!(hXjT6AF%-;$Bgn=ju3?9XDi*wb`!l5`N&06
zf!Cd<G};05aa8Tr`PnW#74*C)Kv>(aXO7gfhnpiJM~^l(k9AXre_i$+xNZHK5mAm5
z6L-I_MzL-g&yDVqAP|&9ke|RgJ=Z_+4N$RoI^vGnaGO%oIVAx8q?b>0__Ml#zPcS|
z+d8z(cOExq84bb0E659}3Ps;e9xfD)Te`uOeBB0yuW)YDY3uK$!nG99&Rvt9LVDo-
ziK(y(GL?xZxU;i$3&tktpd*guqNm|Hot_DU@nIF6)q7Hxvzd>JwmQA~91%iZ5-Y?a
zb1#opqN;+GvuTVg<Nhg{sTpzMqt$_Jof<V6J!v9w>yT=n=^?Ca{9G)0PVORRd5Ms+
zWN3UwlRaQx#-@E_DvW>pjxSa!t)lpq0A~659Nv*@^>TL$VoV-JUwhN^ghYa`)Vnhc
zH2W~OWLM)vFP5!=KlO{qp{cce^$>-?KdPGFsQCb~sX*oTDp^dH?e`Wkf1AOu7U9MO
z9>7s6_R)b{swiNvvh~t?Zcy*k6)uk#vzHWqmKT#E<$Yt|QSOxQ+@g@~RFD3Y7BI+A
zBVoont1kOBPOUsdpg#>N-zkpI+gDO*sL)503AV^=H;F{ei-wYvc6II00)8)y-jODm
zcxrN2cylb~3}{`#&ja;k^dDsk2Pd-9MN=R%pX+;Wx{@G~dSAm<324gno_BPB9AZBf
zl0zmpGGGq?a$B|xov`{_=Jv?9gUi>M3*-A6mLj5BLY2E@{8v#&UhGwt?h6B{>Uj~j
aFC8#CqS!%AB9b?68Gy6J+tgT}OZ^Y1C%gp!

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/manage/menu_8.png b/src/main/ui/static/images/manage/menu_8.png
new file mode 100644
index 0000000000000000000000000000000000000000..c716a3464bba00fcbbc53d9e854766cb0169f5b0
GIT binary patch
literal 1560
zcma)-`#Tc~0ETC|&Sn~27@1I6lyGPnX1Sk^X{loxGERA{VG*XRh0=0QwHm49Bx<It
z&4`qWc%t0qI(5iInl+c$#;L#HoFBgLectE$13qS8fDZ&@3<3ZE5I<i}{7?G+iniv@
zK0I6N^Al<bcpogFy3^zf0HD$B=jjoYqBdJXIcey%xpl3!LBQen#hByGy>r%+nIL3g
zG`M^23f+!Z>3!+N`>9Rln&CBNA9gU=>Bixtpqv{F3|L#1VFdzuuhWF}z5)f&m>+l{
zF;)D(M~6qLlX(r|(Bve(Xw+86Av`vD)j^I{G)Rt1ZZ_K7-QCOHpB73c`m=yM<0?B~
z`5}v_NWbNBNv@-bz>E6U3iFWA%(HWP-(6U=vuYfy*6Dr7{UKP7iwk)NsQkwVqxSt?
zi=&3G+7<nRHe|XXLPw4HXzTyci=O#j{c-2?-<U!(uHw{pRjX^JdMN56&dJ?M_7{_6
z9#NTKG}UMW^Kma()Bm<={X}<Rmu|GwZ1dUW<ISf@)YlztbzL4SIo`OvBLqCkXyp$`
z7`^p~a}#4;Jx7?o9QNp7Yhr)wGynO7g8LSaA8bf`0R6^{`&5e74pw27)o<i-JsL=C
z=~Hr1%&}brC|QEMBLxTI^(fOPqeWsJ(sgs8+<I~3#e!+14QV1FkR&@}7c1O7WARz;
zw>E|$Y`C-$&8X}^%rDi@S+(@kB(!4gh^0HB)D@~g)Ma@EJ8eW4X=OoQ?9K~1V6vek
z(S4TqJYw%NaUEq(&N5Ek;_Dy9Xq$i!DxcWHDs;7eo8F=&Je3-8dWWP?&0d;j;F(Xq
zJZ@NLTKgq8kYT6?GeQVvg70!Ll3ru&-s+k{#R=*nsMQ*s|8*yS=~0GTt#usM*0B_o
zoF~1YT5yTSrD<7q0h!tOWMpI~XiD_%t)l_`J9A7duL?BF)+eZcaM=DyS<@nN-eTKd
zfqS`fM<=$m$<aid;c?1k@ny)EHn|nqR@RPs0^vz`Tn_1V8-SWsH%_+_Qmjfc;7WEg
zYR>%1uxeA0y-Sm(C8?YdzZia(CaG}RI~KQTS_stos8o8z9v1I0H5`6R4u0iV&fu|W
zSk@H^Ig`yQ_&IW?gKp6q2l8qTVa)9@LlE7F5!HhVIQsXBbEi{c%KY2E;pcA$;BImS
zJoa+wQ1H$cEl=&EgZyS9|0W0btmuGXX{k&(d8`q%=fLqe-5i=txUMjhUhG^fz_QL3
zXO6zfM!Km|!dSsI#zR+)YTQEby>nr=u=xm1eSb$lm}w<@--<1GRK2o(Uz`co0M^{}
zr~ARsDaHt3W<5S+&opZP!%%HJep`LsN!MA_HCMfHL?VW#U}5N18yjCPCLw`Oy}nr4
zNom%BM~778J4qh!3wmv+dY1wU=M)GA;hbG-dG6X{03jb5=B`3|suFB&s1T7dCzv!{
z&tas~wF$>IjtYSb#Lxs9y!hxq$;837Omg58lIW7FRsQ`-<i6f6{8iOf;e!?5B*Uje
zsZ%|Z*oK&GKgzA^M^B(9h1Yw;*8`3y2C5@yhmnN73eo<g)_Z)7p+UVRfkk}q>Lg#<
z4u-d%uw;BkN1kbW^Y!@Vg)WWuukw|Zl5+bLzOevWL(G#>eS)xS%-p#mO8>B8EM3(%
zV^RJ%XrMv#m^zkcsJFB`6(iY^d5fCmS~}Hn8KVCgXNk3m$lrd-)(LahU1=~uE7P^*
zyE$Pz<pIR()9A#HKp)aNPus<)z7rN>f9*U*9=8YcJJX+58pST@obUMh931L1I6)kl
zY>E#&udkxGiR={Hv#27AN(yu2*=24MC*KTsaTOl>u3JChizdIcs-s`lDq3Wb2ggX_
z+*va-8L*v*?BM(`fJXMOi^rLHf3NKmcZq217o{_Djf%ABgw$-Om$Q92XN0%M*X<Bx
z$d!Bfs427rk%&`+mHFv{3V@d8h{D6_))*KNM)3L%HPM%?4qq=HzhGX=YLp2YLpN`7
rS$Q~d61<8;ukxK2*v&*n3s*;JCY)oVoK@F;eE`7EE5NfFdo2B5Tgl}8

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/manage/menu_9.png b/src/main/ui/static/images/manage/menu_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6d8c62c1b4df1a0155729ef89ccbae4378075ad
GIT binary patch
literal 1356
zcmV-S1+)5zP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px)21!IgRCodHoLy)fRTRhnv)SEjHr2*9Z3$^r+Sr(szUYfDexR0O@u6C*6d@IT
z5g#P>rSzpzrJ@lLK`f#O2Caf(Km>iWKKT&T^dmv2Z4%p>R%4RJ-DI<0<2kF8;7;bu
ztat8EJO>h%d+y9R^V@UpIrrXW9E`eYOkaHwaQon*11f-nDf%~v_SJ_Sd^`6FT=$@I
z@gU$huM(iyUo~<(;BXT~QbOUZ0Ee4t%1QXBRYe38kPrq6NC6211hqzx0ul%aYK<TT
zBoGkP8bJz3ARwqUf)tQIKu~K0DIkG>pw<Wy03`*zRdvPz9$S~fT{kAt+nPX6wh2wt
zHdAsjQ+Dz7ObJIOm#q5a;KZzJ)uM;7&a{K)I-BuyM;dEW{z1KccphgKsvdWVrYZIa
zdZayt_q$urmh=b1kAHEgiiv_fIBYXEKy3K6EgAH0%&;G#Fr52O=8&_?Cq6&}A>fQJ
zRtQcW69mb&#1cXKXd-?-VC0-#U^qEkEXFfcS_jmVP2j!mY@k3G%UAFK!MRLXEH1GQ
z=-{RdvYfjG8OfEggND^KrS~{RP8|llyD8~lFAXnAhUd$*IVWy7?59;geH&6}5u)e2
zt7SZRDu>wyB4;}lmps35!D&jY0=lowe?%`-T<jUkW4;pp@fgexciw>Gy{&kAYfJbW
ztZ;=@KpUI=&5cpUnra|hJ-H!`4|}pmI)8`G9jpAmh!t3PHv4<*c}e4qooRn_T`dW$
z^6ye-{25xFa3!Aj2M%}Oxz3b?bmzaBZ4(^l<p!4kO##jH)B5e$)-0T5aQM>If}Mc3
zuXVEu=<K3g2|vC*jpICAgr_*PsTpr{dCxUdMcIyU`)g{efJSMK2_kz5(x=<9phdo?
z9JwWfmp6OE;R{aXg4yxB`M(<N0;0+|sO)Y}V`y7zUCJKVoWbE+{TH|=L)el0ks?{T
zK9v4S$PBe>Z3^F0>VEUm61W8DqinTfjent8ab0}!TPc)Zex0oXdT32}bG@xic!wt9
zpfWUF!g+&xM%ISdQ5qJHu1g1f&W8F`DS8GjnB9^M|CKi2`s*}r9H2#N)bhea0mFX=
zpXY-36Dc50LT^zjewON$sAcH)B98uIHhS3S$N=%!eV5imPjy5O=W~Ly|EC4|QL1@~
z1Q1ukAKaeB6O?tLltR_Tfu9#~Y^oTU8RLLbG_F3TN_bC%6Y>&)`QncfUYac6blzOm
z>_yoqpk{*e85MUAQ~eTFiuBNfSBjXUeW06Z)!$8rhPTn;m3JTKsqGSN*k7Q(FA2;?
zROj$Pq75+$Xn@N9M&Qhrs@QotUzdS+k|##6curWy+$f-Z>%&LRG{ND$=Mj(P0mn$3
zaF~|SLNV-S*JWCD-#e1?gj4rb#?)XGQ2)6_@LUo^_@wk6f-@F(hzQOa1@z5a8M{aG
z;PmS!6NO3*PLTZ}zx&wG83n`+e>GFaE}C%jwEFfEJ}JHX#~j8DE-1b1m})Z)h#lid
z+DS(@oSv5ppOo^jit8A8xi3LKNBaAqUOHyx)X(+I34(TLykM<<2?{{!7bzgg`1PQV
zWQbi44<6J<1tgGCKnh48AgDEh6p%nbP-_G!Ac26O)(BES0s%p-5u|_w0)kp2NC621
z1hqzx2&nc#Gojc2Rb6{U7r*UIWd#DxV3J>jN3RK_4*HtFYm}C~Ch#w632^->{gU?p
O0000<MNUMnLSTX(N_r&#

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/manage_bg.png b/src/main/ui/static/images/manage_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..f16f31b33fd9433a87560a29cd07ab08fb9b2518
GIT binary patch
literal 85590
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/manage_total_logo.png b/src/main/ui/static/images/manage_total_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..35e277a6655602ce29d122de962ed90c874ebb25
GIT binary patch
literal 6204
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
a8T|*3CvUo$w92{w0000<MNUMnLSTZFpxQnF

literal 0
HcmV?d00001


From 54f62e4c86d693c63702a88910ebb45dc9218f31 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 8 Oct 2018 18:38:41 +0800
Subject: [PATCH 02/82] add managerMenu.js

---
 src/main/ui/manage.html                 | 51 +++++++++++++++++++------
 src/main/ui/manage_bak.html             | 12 +++---
 src/main/ui/static/boot/manager-boot.js |  4 +-
 src/main/ui/static/menu/managerMenu.js  | 17 +++++++++
 4 files changed, 64 insertions(+), 20 deletions(-)
 create mode 100644 src/main/ui/static/menu/managerMenu.js

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 5dcc47df1..aee6240c0 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -122,7 +122,7 @@ margin-bottom: 10%;"/>
     </div>
 </div>
 <div ng-if="currentUser!=null" ng-cloak
-     ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'">
+     ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'" ui-view>
 
 
 <div class="total_logo">
@@ -131,69 +131,96 @@ margin-bottom: 10%;"/>
 
 <div style="margin: 0 auto;display: flex;padding-top: 40px;width: 1050px;flex-wrap:wrap">
     <div class="box-items" ng-if="'10'|withRole">
+        <a ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
             <img src="/static/images/manage/menu_1.png">
         </div>
         <p class="box-font">Compliance</p>
+        </a>
     </div>
+
     <div class="box-items" ng-if="'10000000000'|withRole">
+        <a ui-sref="listMenu({role:'RiskManager'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
-                <img src="/static/images/manage/menu_2.png">
+             <img src="/static/images/manage/menu_2.png">
         </div>
         <p class="box-font">Risk Manager</p>
+        </a>
     </div>
+
     <div class="box-items" ng-if="'100000'|withRole">
+        <a ui-sref="listMenu({role:'AccountManager'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
-                <img src="/static/images/manage/menu_3.png">
+              <img src="/static/images/manage/menu_3.png">
         </div>
         <p class="box-font">Account Manager</p>
+        </a>
     </div>
+
     <div class="box-items" ng-if="'1000'|withRole">
+        <a ui-sref="listMenu({role:'Accountant'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
-                <img src="/static/images/manage/menu_4.png">
+           <img src="/static/images/manage/menu_4.png">
         </div>
         <p class="box-font">Accountant</p>
+        </a>
     </div>
+
     <div class="box-items" ng-if="'100'|withRole">
+        <a ui-sref="listMenu({role:'BDUser'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
-                <img src="/static/images/manage/menu_5.png">
+           <img src="/static/images/manage/menu_5.png">
         </div>
         <p class="box-font">BD User</p>
+        </a>
     </div>
+
     <div class="box-items" ng-if="'10000'|withRole">
+        <a ui-sref="listMenu({role:'Service'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
-                <img src="/static/images/manage/menu_6.png">
+            <img src="/static/images/manage/menu_6.png">
         </div>
         <p class="box-font">Service</p>
+        </a>
     </div>
+
     <div class="box-items" ng-if="'1'|withRole">
+        <a ui-sref="listMenu({role:'Administrator'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
-                <img src="/static/images/manage/menu_7.png">
+            <img src="/static/images/manage/menu_7.png">
         </div>
         <p class="box-font">Administrator</p>
+        </a>
     </div>
+
     <div class="box-items" ng-if="'10000000'|withRole">
+        <a ui-sref="listMenu({role:'SiteManager'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
-                <img src="/static/images/manage/menu_8.png">
+            <img src="/static/images/manage/menu_8.png">
         </div>
         <p class="box-font">Site Manager</p>
+        </a>
     </div>
+
     <div class="box-items" ng-if="'100000000'|withRole">
+        <a ui-sref="listMenu({role:'Developer'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
-                <img src="/static/images/manage/menu_9.png">
+            <img src="/static/images/manage/menu_9.png">
         </div>
         <p class="box-font">Developer</p>
+        </a>
     </div>
+
     <div class="box-items" ng-if="'1000000'|withRole">
+        <a ui-sref="listMenu({role:'Director'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
-                <img src="/static/images/manage/menu_10.png">
+            <img src="/static/images/manage/menu_10.png">
         </div>
         <p class="box-font">Director</p>
+        </a>
     </div>
 
 </div>
-
-
 </div>
 </body>
 </html>
diff --git a/src/main/ui/manage_bak.html b/src/main/ui/manage_bak.html
index 4185ec394..1aa66dcf6 100644
--- a/src/main/ui/manage_bak.html
+++ b/src/main/ui/manage_bak.html
@@ -221,7 +221,7 @@ margin-bottom: 10%;"/>
     <!--end:顶部导航栏-->
     <!-- Left side column. contains the logo and sidebar -->
     <!--左边栏-->
-<!--
+
     <aside class="main-sidebar" style="height: 100%;max-height: 100%;overflow: auto;padding-bottom: 50px;">
         &lt;!&ndash; sidebar: style can be found in sidebar.less &ndash;&gt;
         <section class="sidebar">
@@ -465,22 +465,22 @@ margin-bottom: 10%;"/>
         </section>
         &lt;!&ndash; /.sidebar &ndash;&gt;
     </aside>
--->
+
     <!--END:左边栏-->
 
-<!--    &lt;!&ndash; Content Wrapper. Contains page content &ndash;&gt;
+    <!-- Content Wrapper. Contains page content -->
     <div>
         <div class="content-wrapper autoheight" ui-view></div>
-    </div>-->
+    </div>
     <!-- /.content-wrapper -->
 
-<!--    <footer class="main-footer">
+    <footer class="main-footer">
         <div class="pull-right hidden-xs">
             <b>Easy Business，Easy Pay</b>
         </div>
         <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
         reserved.
-    </footer>-->
+    </footer>
 
 </div>
 <!-- ./wrapper -->
diff --git a/src/main/ui/static/boot/manager-boot.js b/src/main/ui/static/boot/manager-boot.js
index 97f099690..a29a36dcb 100644
--- a/src/main/ui/static/boot/manager-boot.js
+++ b/src/main/ui/static/boot/manager-boot.js
@@ -76,8 +76,8 @@ require(['angular', 'jquery'], function (angular, $) {
     });
 
     function boot(user) {
-        var paths = ['static/boot/managerMainApp', 'static/analysis/org/analysis-org', 'static/analysis/report/analysis-report', 'static/analysis/monitoring/analysis-monitoring', 'static/analysis/bd/analysis-bd'];
-        var moduleNames = ['managerMainApp', 'analysisTransaction', 'analysisBD', 'analysisOrg', 'analysisMonitoring', 'analysisReport'];
+        var paths = ['static/boot/managerMainApp', 'static/menu/managerMenu','static/analysis/org/analysis-org', 'static/analysis/report/analysis-report', 'static/analysis/monitoring/analysis-monitoring', 'static/analysis/bd/analysis-bd'];
+        var moduleNames = ['managerMainApp', 'listMenuApp','analysisTransaction', 'analysisBD', 'analysisOrg', 'analysisMonitoring', 'analysisReport'];
         window.currentUser = user;
         angular.forEach(user.modules, function (mod) {
             paths.push(mod.js_path);
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
new file mode 100644
index 000000000..33b9d82e7
--- /dev/null
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -0,0 +1,17 @@
+define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
+    'use strict';
+    var app = angular.module('listMenuApp', ['ui.router', 'ui.bootstrap']);
+    app.config(['$stateProvider', function ($stateProvider) {
+        $stateProvider.state('listMenu', {
+            url: '/menu?role',
+            templateUrl: '/manage_menu.html',
+            controller: 'listMenuCtrl'
+        })
+    }]);
+    app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal', 'commonDialog','stateParams', function ($scope, $http,$filter, $uibModal, commonDialog,$stateParams) {
+    console.log("dadadadada  + " + $stateParams.role);
+
+
+    }]);
+    return app;
+});

From 7b5ed759479b151eb7a61012da94783cd87e41d0 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 9 Oct 2018 14:44:42 +0800
Subject: [PATCH 03/82]  managerMenu.js test

---
 src/main/ui/manage.html                |  9 +++++----
 src/main/ui/static/menu/managerMenu.js | 11 +++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index aee6240c0..0e3c7e779 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -41,11 +41,11 @@
     <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">
-        body{
+        .backgroud{
             background-image: url("/static/images/manage_bg.png");
         }
         .total_logo {
-            margin-top: 7%;
+            padding-top: 7%;
             text-align: center;
         }
         .box-items {
@@ -123,13 +123,13 @@ margin-bottom: 10%;"/>
 </div>
 <div ng-if="currentUser!=null" ng-cloak
      ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'" ui-view>
-
+<div class="backgroud">
 
 <div class="total_logo">
     <a><img src="/static/images/manage_total_logo.png">  </a>
 </div>
 
-<div style="margin: 0 auto;display: flex;padding-top: 40px;width: 1050px;flex-wrap:wrap">
+<div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:4.75%;width: 60%;flex-wrap:wrap">
     <div class="box-items" ng-if="'10'|withRole">
         <a ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
@@ -220,6 +220,7 @@ margin-bottom: 10%;"/>
         </a>
     </div>
 
+</div>
 </div>
 </div>
 </body>
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index 33b9d82e7..494d047d1 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -4,13 +4,16 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
     app.config(['$stateProvider', function ($stateProvider) {
         $stateProvider.state('listMenu', {
             url: '/menu?role',
-            templateUrl: '/manage_menu.html',
+            templateUrl: '/static/config/managers/templates/managers.html',
             controller: 'listMenuCtrl'
-        })
+        });
     }]);
-    app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal', 'commonDialog','stateParams', function ($scope, $http,$filter, $uibModal, commonDialog,$stateParams) {
-    console.log("dadadadada  + " + $stateParams.role);
+    app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal', 'commonDialog','$stateParams', function ($scope, $http,$filter, $uibModal, commonDialog,$stateParams) {
+        function init() {
+            console.log("dadadadada  + " + $stateParams.role);
+        }
 
+        init();
 
     }]);
     return app;

From 2e207ae8a1f975a379d85b1a347b4adbca09a596 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 10 Oct 2018 11:41:09 +0800
Subject: [PATCH 04/82] add copyright

---
 src/main/ui/manage.html | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 0e3c7e779..5fca397a1 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -45,7 +45,7 @@
             background-image: url("/static/images/manage_bg.png");
         }
         .total_logo {
-            padding-top: 7%;
+            padding-top: 4.62%;
             text-align: center;
         }
         .box-items {
@@ -77,6 +77,21 @@
             text-align: center;
             padding-top: 25px;
         }
+        footer {
+            font-family: PingFang-SC-Regular;
+            font-size: 12px;
+            color: #FFFFFF;
+            letter-spacing: 0px;
+            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;
         }
@@ -127,9 +142,13 @@ margin-bottom: 10%;"/>
 
 <div class="total_logo">
     <a><img src="/static/images/manage_total_logo.png">  </a>
+    <div class="easypay">
+        <b>Easy Business，Easy Payment!</b>
+    </div>
+
 </div>
 
-<div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:4.75%;width: 60%;flex-wrap:wrap">
+<div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;flex-wrap:wrap">
     <div class="box-items" ng-if="'10'|withRole">
         <a ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
@@ -219,8 +238,13 @@ margin-bottom: 10%;"/>
         <p class="box-font">Director</p>
         </a>
     </div>
-
 </div>
+    <div style="text-align: center">
+    <footer>
+        <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
+        reserved.
+    </footer>
+    </div>
 </div>
 </div>
 </body>

From cd0695f33b62d0f6eeea4dbdc81a2d1edb983d0e Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 10 Oct 2018 12:02:45 +0800
Subject: [PATCH 05/82] fix

---
 .../payment/partner/templates/partner_bankaccounts.html       | 2 +-
 .../ui/static/payment/partner/templates/partner_new_rate.html | 4 ++--
 .../static/payment/partner/templates/rate_config_dialog.html  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
index b5ffe8070..5c7423ad0 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -194,7 +194,7 @@
                     ng-class="{'text-bold':rate.current,'success':rate.active}">
                     <td ng-bind="rate.rate_name"></td>
                     <td ng-bind="rate.rate_value + ' %'"></td>
-                    <td ng-bind="rate.transaction_fee + ' c'"></td>
+                    <td ng-bind="'$ '+rate.transaction_fee"></td>
                     <td ng-bind="rate.active_time|date:'yyyy-MM-dd'"></td>
                     <td ng-bind="rate.expiry_time|date:'yyyy-MM-dd'"></td>
                     <td ng-if="rate.rate_name=='Wechat'">T+{{rate.clean_days}}</td>
diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
index 9b3d9937c..6b6872b29 100644
--- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html
+++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
@@ -167,8 +167,8 @@
                     <div class="col-sm-6">
                         <div class="input-group">
                             <input type="number" name="Transaction_fee_value" stringToNumber2 class="form-control" ng-model="rate.transaction_fee"
-                                   min="0" step="0.1" id="transaction_fee_input" required>
-                            <div class="input-group-addon">c</div>
+                                   min="0" step="0.1" max="1" id="transaction_fee_input" required>
+                            <div class="input-group-addon">$</div>
                         </div>
                         <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">
                             <div class="small text-danger" ng-message="min">
diff --git a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
index 738663dec..d95950528 100644
--- a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
+++ b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
@@ -42,8 +42,8 @@
                     <div class="col-sm-6">
                         <div class="input-group">
                             <input type="number" name="transaction_fee" class="form-control" ng-model="rate.transaction_fee"
-                                   min="0" step="0.1" id="transaction_fee_input" required>
-                            <div class="input-group-addon">c</div>
+                                   min="0" step="0.1" max="1" id="transaction_fee_input" required>
+                            <div class="input-group-addon">$</div>
                         </div>
                         <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">
                             <!--<div class="small text-danger" ng-message="max">-->

From 2a8ffb5475cdc43a8ce41d43d567e9ec2858f4e8 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 10 Oct 2018 12:25:26 +0800
Subject: [PATCH 06/82] fix

---
 src/main/ui/static/payment/partner/partner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js
index 7096890c6..2728f37f8 100644
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@@ -68,7 +68,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
         $scope.business_structures = businessStructuresMap.configs();
         $scope.industries = industryMap.configs();
         $scope.partner = partner.data;
-        $scope.partner.partner_type = $scope.partner.website ? 'website' : 'photo';
+        $scope.partner.partner_type = $scope.partner.company_website ? 'website' : 'photo';
 
         $scope.getMerchantLocation = function () {
             $http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) {

From 62e91a49ccfd02f3417cf3cc55472fa043db7c25 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 10 Oct 2018 13:40:57 +0800
Subject: [PATCH 07/82] add copyright

---
 src/main/ui/manage.html                | 2 +-
 src/main/ui/static/menu/managerMenu.js | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 5fca397a1..1ad134ae4 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -137,7 +137,7 @@ margin-bottom: 10%;"/>
     </div>
 </div>
 <div ng-if="currentUser!=null" ng-cloak
-     ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'" ui-view>
+     ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'" ui-view="menu">
 <div class="backgroud">
 
 <div class="total_logo">
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index 494d047d1..cd7b14009 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -4,8 +4,12 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
     app.config(['$stateProvider', function ($stateProvider) {
         $stateProvider.state('listMenu', {
             url: '/menu?role',
-            templateUrl: '/static/config/managers/templates/managers.html',
-            controller: 'listMenuCtrl'
+            controller: 'listMenuCtrl',
+            views: {
+                "menu": {
+                    template: "/static/config/managers/templates/managers.html"
+                }
+            }
         });
     }]);
     app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal', 'commonDialog','$stateParams', function ($scope, $http,$filter, $uibModal, commonDialog,$stateParams) {

From 54b166a8f5499c537c588a8c3d64055a7b646736 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Wed, 10 Oct 2018 14:04:48 +0800
Subject: [PATCH 08/82] =?UTF-8?q?Main=5FMenu=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/main_menu.html                    | 782 ++++++++++++++++++
 .../main_menu/activity_contract_signing.png   | Bin 0 -> 3487 bytes
 .../main_menu/activity_encouraging_gold.png   | Bin 0 -> 2412 bytes
 .../activity_half_day_public_service.png      | Bin 0 -> 3120 bytes
 .../main_menu/activity_half_of_the_rate.png   | Bin 0 -> 1871 bytes
 .../images/main_menu/activity_kangaroo.png    | Bin 0 -> 3718 bytes
 .../images/main_menu/activity_management.png  | Bin 0 -> 2106 bytes
 .../main_menu/activity_marketing_account.png  | Bin 0 -> 1689 bytes
 .../static/images/main_menu/bd_commission.png | Bin 0 -> 2815 bytes
 .../images/main_menu/bd_level_setting.png     | Bin 0 -> 1415 bytes
 .../images/main_menu/bd_merchant_activity.png | Bin 0 -> 2110 bytes
 .../main_menu/bd_performance_setting.png      | Bin 0 -> 2578 bytes
 .../images/main_menu/bd_sales_volume.png      | Bin 0 -> 2785 bytes
 .../images/main_menu/compliance_contract.png  | Bin 0 -> 1953 bytes
 .../images/main_menu/compliance_merchant.png  | Bin 0 -> 1929 bytes
 .../main_menu/configure_device_management.png | Bin 0 -> 1514 bytes
 .../main_menu/configure_merchant_number.png   | Bin 0 -> 2294 bytes
 .../images/main_menu/configure_parameter.png  | Bin 0 -> 2248 bytes
 .../images/main_menu/content_group_hair.png   | Bin 0 -> 2287 bytes
 .../main_menu/content_website_management.png  | Bin 0 -> 2978 bytes
 .../main_menu/finance_austrac_report.png      | Bin 0 -> 1741 bytes
 .../images/main_menu/finance_bd_extract.png   | Bin 0 -> 2825 bytes
 .../main_menu/finance_merchant_invoice.png    | Bin 0 -> 2869 bytes
 .../finance_partner_contribution.png          | Bin 0 -> 2825 bytes
 .../main_menu/finance_record_of_money.png     | Bin 0 -> 2329 bytes
 .../images/main_menu/finance_statistics.png   | Bin 0 -> 1843 bytes
 .../ui/static/images/main_menu/logon_log.png  | Bin 0 -> 2304 bytes
 .../images/main_menu/merchant_activity_1.png  | Bin 0 -> 2315 bytes
 .../images/main_menu/merchant_apply.png       | Bin 0 -> 2241 bytes
 .../static/images/main_menu/merchant_info.png | Bin 0 -> 2261 bytes
 .../static/images/main_menu/merchant_log.png  | Bin 0 -> 2695 bytes
 .../images/main_menu/merchant_statistics.png  | Bin 0 -> 2326 bytes
 .../images/main_menu/merchant_turnover.png    | Bin 0 -> 2326 bytes
 .../main_menu/org_account_management.png      | Bin 0 -> 2107 bytes
 .../images/main_menu/org_management.png       | Bin 0 -> 2907 bytes
 .../main_menu/org_role_rights_management.png  | Bin 0 -> 3149 bytes
 .../images/main_menu/partner_application.png  | Bin 0 -> 2894 bytes
 .../images/main_menu/partner_commission.png   | Bin 0 -> 2590 bytes
 .../images/main_menu/partner_management.png   | Bin 0 -> 2696 bytes
 .../main_menu/partner_trading_volume.png      | Bin 0 -> 2666 bytes
 .../images/main_menu/risk_blacklist.png       | Bin 0 -> 2745 bytes
 .../images/main_menu/risk_configure.png       | Bin 0 -> 2502 bytes
 .../main_menu/risk_consumption_ranking.png    | Bin 0 -> 1851 bytes
 .../images/main_menu/risk_early_warning.png   | Bin 0 -> 2235 bytes
 .../ui/static/images/main_menu/risk_log.png   | Bin 0 -> 2328 bytes
 .../static/images/main_menu/risk_monitor.png  | Bin 0 -> 2130 bytes
 .../ui/static/images/main_menu/settle_day.png | Bin 0 -> 2226 bytes
 .../images/main_menu/settle_execution.png     | Bin 0 -> 2134 bytes
 .../images/main_menu/settle_prediction.png    | Bin 0 -> 2751 bytes
 .../static/images/main_menu/settle_report.png | Bin 0 -> 1968 bytes
 .../images/main_menu/settle_statistics.png    | Bin 0 -> 1393 bytes
 .../settle_transaction_reconciliation.png     | Bin 0 -> 2912 bytes
 .../images/main_menu/settle_verification.png  | Bin 0 -> 2412 bytes
 .../images/main_menu/to_be_treated_1.png      | Bin 0 -> 2455 bytes
 .../images/main_menu/to_be_treated_2.png      | Bin 0 -> 2596 bytes
 .../images/main_menu/transaction_arrears.png  | Bin 0 -> 3141 bytes
 .../transaction_callback_message.png          | Bin 0 -> 2382 bytes
 .../images/main_menu/transaction_flow.png     | Bin 0 -> 3037 bytes
 .../transaction_original_statistics.png       | Bin 0 -> 2177 bytes
 .../images/main_menu/transaction_refund.png   | Bin 0 -> 2324 bytes
 src/main/ui/static/menu/managerMenu.js        |   2 +-
 61 files changed, 783 insertions(+), 1 deletion(-)
 create mode 100644 src/main/ui/main_menu.html
 create mode 100644 src/main/ui/static/images/main_menu/activity_contract_signing.png
 create mode 100644 src/main/ui/static/images/main_menu/activity_encouraging_gold.png
 create mode 100644 src/main/ui/static/images/main_menu/activity_half_day_public_service.png
 create mode 100644 src/main/ui/static/images/main_menu/activity_half_of_the_rate.png
 create mode 100644 src/main/ui/static/images/main_menu/activity_kangaroo.png
 create mode 100644 src/main/ui/static/images/main_menu/activity_management.png
 create mode 100644 src/main/ui/static/images/main_menu/activity_marketing_account.png
 create mode 100644 src/main/ui/static/images/main_menu/bd_commission.png
 create mode 100644 src/main/ui/static/images/main_menu/bd_level_setting.png
 create mode 100644 src/main/ui/static/images/main_menu/bd_merchant_activity.png
 create mode 100644 src/main/ui/static/images/main_menu/bd_performance_setting.png
 create mode 100644 src/main/ui/static/images/main_menu/bd_sales_volume.png
 create mode 100644 src/main/ui/static/images/main_menu/compliance_contract.png
 create mode 100644 src/main/ui/static/images/main_menu/compliance_merchant.png
 create mode 100644 src/main/ui/static/images/main_menu/configure_device_management.png
 create mode 100644 src/main/ui/static/images/main_menu/configure_merchant_number.png
 create mode 100644 src/main/ui/static/images/main_menu/configure_parameter.png
 create mode 100644 src/main/ui/static/images/main_menu/content_group_hair.png
 create mode 100644 src/main/ui/static/images/main_menu/content_website_management.png
 create mode 100644 src/main/ui/static/images/main_menu/finance_austrac_report.png
 create mode 100644 src/main/ui/static/images/main_menu/finance_bd_extract.png
 create mode 100644 src/main/ui/static/images/main_menu/finance_merchant_invoice.png
 create mode 100644 src/main/ui/static/images/main_menu/finance_partner_contribution.png
 create mode 100644 src/main/ui/static/images/main_menu/finance_record_of_money.png
 create mode 100644 src/main/ui/static/images/main_menu/finance_statistics.png
 create mode 100644 src/main/ui/static/images/main_menu/logon_log.png
 create mode 100644 src/main/ui/static/images/main_menu/merchant_activity_1.png
 create mode 100644 src/main/ui/static/images/main_menu/merchant_apply.png
 create mode 100644 src/main/ui/static/images/main_menu/merchant_info.png
 create mode 100644 src/main/ui/static/images/main_menu/merchant_log.png
 create mode 100644 src/main/ui/static/images/main_menu/merchant_statistics.png
 create mode 100644 src/main/ui/static/images/main_menu/merchant_turnover.png
 create mode 100644 src/main/ui/static/images/main_menu/org_account_management.png
 create mode 100644 src/main/ui/static/images/main_menu/org_management.png
 create mode 100644 src/main/ui/static/images/main_menu/org_role_rights_management.png
 create mode 100644 src/main/ui/static/images/main_menu/partner_application.png
 create mode 100644 src/main/ui/static/images/main_menu/partner_commission.png
 create mode 100644 src/main/ui/static/images/main_menu/partner_management.png
 create mode 100644 src/main/ui/static/images/main_menu/partner_trading_volume.png
 create mode 100644 src/main/ui/static/images/main_menu/risk_blacklist.png
 create mode 100644 src/main/ui/static/images/main_menu/risk_configure.png
 create mode 100644 src/main/ui/static/images/main_menu/risk_consumption_ranking.png
 create mode 100644 src/main/ui/static/images/main_menu/risk_early_warning.png
 create mode 100644 src/main/ui/static/images/main_menu/risk_log.png
 create mode 100644 src/main/ui/static/images/main_menu/risk_monitor.png
 create mode 100644 src/main/ui/static/images/main_menu/settle_day.png
 create mode 100644 src/main/ui/static/images/main_menu/settle_execution.png
 create mode 100644 src/main/ui/static/images/main_menu/settle_prediction.png
 create mode 100644 src/main/ui/static/images/main_menu/settle_report.png
 create mode 100644 src/main/ui/static/images/main_menu/settle_statistics.png
 create mode 100644 src/main/ui/static/images/main_menu/settle_transaction_reconciliation.png
 create mode 100644 src/main/ui/static/images/main_menu/settle_verification.png
 create mode 100644 src/main/ui/static/images/main_menu/to_be_treated_1.png
 create mode 100644 src/main/ui/static/images/main_menu/to_be_treated_2.png
 create mode 100644 src/main/ui/static/images/main_menu/transaction_arrears.png
 create mode 100644 src/main/ui/static/images/main_menu/transaction_callback_message.png
 create mode 100644 src/main/ui/static/images/main_menu/transaction_flow.png
 create mode 100644 src/main/ui/static/images/main_menu/transaction_original_statistics.png
 create mode 100644 src/main/ui/static/images/main_menu/transaction_refund.png

diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
new file mode 100644
index 000000000..655f1c824
--- /dev/null
+++ b/src/main/ui/main_menu.html
@@ -0,0 +1,782 @@
+<style type="text/css">
+    .description-text {
+        margin-top: 5px;
+        /*width: 86px;*/
+    }
+    .list-group label {
+        border-bottom: 1px solid #333333;
+        font-size: 20px;
+        color: #333333;
+    }
+    @media (min-width: 768px) {
+        .navbar-header {
+            line-height: 50px;
+            width: 158px;
+            position: absolute;
+            left: 0;
+            right: 0;
+            margin: auto;
+        }
+    }
+    @media (max-width: 768px) {
+        .navbar-header {
+            line-height: 50px;
+            width: 158px;
+            margin: auto;
+        }
+    }
+</style>
+<body class="skin-blue sidebar-mini">
+    <header class="main-header">
+
+        <nav style="margin-left: 0px" class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
+
+            <!-- Logo -->
+            <a href="#" class="logo logo-yedian shine" ng-if="!currentUser.org">
+                <!-- mini logo for sidebar mini 50x50 pixels -->
+                <span class="logo-mini"><img src="static/images/r_white_logo.svg"
+                                             style="max-height: 35px;margin-left: 15%;"></span>
+                <!-- logo for regular state and mobile devices -->
+                <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
+                                           style="max-height: 35px;">
+                    <!--<b>RoyalPay</b>-->
+            </span>
+            </a>
+            <a href="#" class="logo logo-yedian shine" ng-if="currentUser.org">
+                <!-- mini logo for sidebar mini 50x50 pixels -->
+                <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
+                                             style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
+                <!-- logo for regular state and mobile devices -->
+                <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
+                                           style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
+                        ng-bind="currentUser.org.name"></b></span>
+            </a>
+            <div class="navbar-header">
+                <a ui-sref="dashboard" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Dashboard</a>
+                <a ui-sref="listMenu({role:''})" ui-sref-opts="{reload:true}" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Main Menu</a>
+            </div>
+            <!-- Header Navbar: style can be found in header.less -->
+            <!--顶部导航栏-->
+            <div class="navbar-custom-menu">
+                <ul class="nav navbar-nav">
+                    <li class="user-menu" ng-if="currentUser.onoff">
+                        <a role="button" ng-click="customerService()">
+                            <i class="fa fa-wechat"></i> contact service
+                        </a>
+
+                    </li>
+                    <li class="user-menu">
+                        <a role="button" ng-click="managerBindWechat(true)">
+                            <i class="fa fa-wechat"></i> Bind WeChat
+                        </a>
+                    </li>
+
+                    <!-- User Account: style can be found in dropdown.less -->
+                    <li class="dropdown user user-menu" uib-dropdown>
+                        <a href class="dropdown-toggle" uib-dropdown-toggle>
+                            <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
+                                 class="user-image user-img-yedian"
+                                 alt="User Image">
+                            <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
+                        </a>
+                        <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
+                            <!-- User image -->
+                            <li class="user-header user-header-yedian">
+                                <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
+                                     alt="User Image">
+
+                                <p>
+                                    {{currentUser.display_name}}
+                                    <small>
+                                        <i class="fa fa-user-secret" title="Administrator"
+                                           ng-class="{'text-orange':!('1'|withRole),'text-gray':('1'|withRole)}"></i>
+                                        <i class="fa fa-eye" title="Compliance"
+                                           ng-class="{'text-orange':!('10'|withRole),'text-gray':('10'|withRole)}"></i>
+                                        <i class="fa fa-crosshairs" title="BD User"
+                                           ng-class="{'text-orange':!('100'|withRole),'text-gray':('100'|withRole)}"></i>
+                                        <i class="fa fa-balance-scale" title="Accountant"
+                                           ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
+                                        <i class="fa fa-tty" title="Service"
+                                           ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
+                                        <i class="fa fa-university" title="Account Manager"
+                                           ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
+                                        <i class="fa fa-line-chart" title="Director"
+                                           ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
+                                        <i class="fa fa-map-o" title="Site Manager"
+                                           ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
+                                        <i class="fa fa-code" title="Developer"
+                                           ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
+                                        <i class="fa fa-user" title="Risk Manager"
+                                           ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
+                                        <i class="fa fa-tripadvisor" title="GUEST"
+                                           ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
+                                        <i class="fa fa-user-plus" title="Org Manager"
+                                           ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
+                                    </small>
+                                </p>
+                            </li>
+                            <!-- Menu Footer-->
+                            <li class="user-footer">
+                                <div class="pull-left">
+                                    <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
+                                </div>
+                                <div class="pull-right">
+                                    <a href class="btn btn-default btn-flat" ng-click="logout()">Sign Out</a>
+                                </div>
+                            </li>
+                        </ul>
+                    </li>
+                    <!-- Control Sidebar Toggle Button -->
+                </ul>
+            </div>
+        </nav>
+    </header>
+
+    <div class="content-wrapper autoheight" style="margin-left: 0px" ui-view >
+        <div class="content" style="background-color: #FFF">
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>待处理事项</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <a ui-sref="sysconfig">
+                            <div class="description-block">
+                                <img src="/static/images/main_menu/to_be_treated_1.png"/>
+                                <div class="description-text">
+                                    <span>待合规</span>
+                                </div>
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/to_be_treated_2.png"/>
+                            <div class="description-text">
+                                <span>商户自助申请</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>商户管理</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/merchant_info.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户信息</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/merchant_apply.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户申请</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/merchant_log.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户信息修改日志</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/merchant_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户统计(原统计)</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/merchant_activity_1.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户活跃度(原统计)</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/merchant_turnover.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户交易额(原统计)</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>交易管理</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_flow.png"/>
+                            <div class="description-text">
+                                <span class="description-text">交易流水</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_refund.png"/>
+                            <div class="description-text">
+                                <span class="description-text">退款审核</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_arrears.png"/>
+                            <div class="description-text">
+                                <span class="description-text">欠款</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">原统计</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <a role="button">
+                                <img src="/static/images/main_menu/transaction_callback_message.png"/>
+                                <div class="description-text">
+                                    <span class="description-text">支付回调消息</span>
+                                </div>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>风控管理</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/risk_monitor.png"/>
+                            <div class="description-text">
+                                <span class="description-text">交易成功率监控</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/risk_early_warning.png"/>
+                            <div class="description-text">
+                                <span class="description-text">风控点预警统计</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/risk_configure.png"/>
+                            <div class="description-text">
+                                <span class="description-text">风控点配置</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/risk_log.png"/>
+                            <div class="description-text">
+                                <span class="description-text">风控记录</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <a role="button">
+                                <img src="/static/images/main_menu/risk_blacklist.png"/>
+                                <div class="description-text">
+                                    <span class="description-text">黑名单</span>
+                                </div>
+                            </a>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <a role="button">
+                                <img src="/static/images/main_menu/risk_consumption_ranking.png"/>
+                                <div class="description-text">
+                                    <span class="description-text">消费排名</span>
+                                </div>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>合规管理</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/compliance_merchant.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户合规</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/compliance_contract.png"/>
+                            <div class="description-text">
+                                <span class="description-text">合同管理</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>合伙人管理</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/partner_application.png"/>
+                            <div class="description-text">
+                                <span class="description-text">合伙人申请</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/partner_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">合伙人管理</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/partner_trading_volume.png"/>
+                            <div class="description-text">
+                                <span class="description-text">合伙人交易量</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/partner_commission.png"/>
+                            <div class="description-text">
+                                <span class="description-text">合伙人提成</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>BD绩效管理</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_sales_volume.png"/>
+                            <div class="description-text">
+                                <span class="description-text">BD销售量</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_commission.png"/>
+                            <div class="description-text">
+                                <span class="description-text">BD提成</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_performance_setting.png"/>
+                            <div class="description-text">
+                                <span class="description-text">BD绩效设置</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_level_setting.png"/>
+                            <div class="description-text">
+                                <span class="description-text">BD级别设置</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户活跃度</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>营销活动管理</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block ">
+                            <img src="/static/images/main_menu/activity_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">活动管理</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_encouraging_gold.png"/>
+                            <div class="description-text">
+                                <span class="description-text">鼓励金</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_marketing_account.png"/>
+                            <div class="description-text">
+                                <span class="description-text">营销账户</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_half_of_the_rate.png"/>
+                            <div class="description-text">
+                                <span class="description-text">周末费率减半活动</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_contract_signing.png"/>
+                            <div class="description-text">
+                                <span class="description-text">合同签约情况</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_half_day_public_service.png"/>
+                            <div class="description-text">
+                                <span class="description-text">半边天公益活动</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_kangaroo.png"/>
+                            <div class="description-text">
+                                <span class="description-text">袋鼠星球</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>内容管理</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/content_group_hair.png"/>
+                            <div class="description-text">
+                                <span class="description-text">通知群发</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/content_website_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">原网站管理下内容</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>财务管理</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/finance_austrac_report.png"/>
+                            <div class="description-text">
+                                <span class="description-text">Austrac Report</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/finance_merchant_invoice.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户Invoice</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/finance_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">平台收支统计</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/finance_record_of_money.png"/>
+                            <div class="description-text">
+                                <span class="description-text">腾讯打款记录</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/finance_bd_extract.png"/>
+                            <div class="description-text">
+                                <span class="description-text">BD提成</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/finance_partner_contribution.png"/>
+                            <div class="description-text">
+                                <span class="description-text">合伙人提成</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>清算管理</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_transaction_reconciliation.png"/>
+                            <div class="description-text">
+                                <span class="description-text">交易对账</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_execution.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算执行</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_day.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算日管理</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算统计</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_prediction.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算预估</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_report.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算月报</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_verification.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算验证</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>组织架构</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/org_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">组织管理</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/org_account_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">账号管理</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/org_role_rights_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">角色权限管理</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>配置管理</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/configure_merchant_number.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户号</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/configure_device_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">设备管理</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/configure_parameter.png"/>
+                            <div class="description-text">
+                                <span class="description-text">相关参数(原系统参数设定)</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="list-group">
+                <div class="row">
+                    <div class="col-sm-2 col-lg-2 col-xs-6">
+                        <div class="description-block">
+                            <label>开发工具</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-2 col-xs-6">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/logon_log.png"/>
+                            <div class="description-text">
+                                <span class="description-text">登录日志</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- /.content-wrapper -->
+
+    <footer class="main-footer" style="margin-left: 0px">
+        <div class="pull-right hidden-xs">
+            <b>Easy Business，Easy Pay</b>
+        </div>
+        <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
+        reserved.
+    </footer>
+</body>
diff --git a/src/main/ui/static/images/main_menu/activity_contract_signing.png b/src/main/ui/static/images/main_menu/activity_contract_signing.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dc620a993e5311d67833784dc81aa463f18eb81
GIT binary patch
literal 3487
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
N002ovPDHLkV1it?sa^m8

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/activity_encouraging_gold.png b/src/main/ui/static/images/main_menu/activity_encouraging_gold.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bf40dc387b50eada1ce2bba2cbaf1718c737006
GIT binary patch
literal 2412
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/activity_half_day_public_service.png b/src/main/ui/static/images/main_menu/activity_half_day_public_service.png
new file mode 100644
index 0000000000000000000000000000000000000000..73cb858be147e241e91cd5e35029672ae2477a46
GIT binary patch
literal 3120
zcmV-04A1k4P)<h;3K|Lk000e1NJLTq00341003491^@s6RaRm500001b5ch_0Itp)
z=>Px=>PbXFRCodHT?>#D#Tov)XLk4Q;DF;)9)d&!<dH&Skhk)%pnOHqgd`RsN=OK)
z_$Z+)jK*9U%tI(Dl|q6T5+fuECM6GFJk%f{4<RH7h<bt`aEN!j4(@JuXQuQ2v+Odv
zGqXE0JG*zs?O(OEGk^d6clWnF-GBdoZw~_>NX+e096r`CM$@!W44^j%(L*pO!|PHZ
zAm~F8zN=siA_Ab62{;LiRpRwN&iQ+xjzw$PqlfFWEfCx8jl|3=${N&jcM46rlQA|{
z2vOoqQ`5?YZK=bytYMt5D3V&OV81(b(n}3p11l;zmo(Id9|a~J!wQsoDYUudL6B=f
zuxE=(LvvZh(K<Kvb_}doHeL#Eedk9SKm~y4<ff43FUzVpwmUTFrbX=guc}Vk;|N&s
zMET|QVX+*?&H+x8UbHfdZ7&Y7aqO9zBbnNm5!lF#@<9sdpmxlptYxILDw(mnf^%xN
zrfV<uaC@qsQGTx~wDs6i3!o-o5}gPW!Y0A8xUlW9lu-z6u|=K&>pTLC@rlKAYL-|5
zVhJog{`9M$Z5Oi2RN%!BK=8s6<0Gtw1=CPK6BUiA1yD10AHqn-3NcHSP6Ad`jFivM
z{)I6$6)C%WoPP*2GDnRfNx+6{cTH~bCY2E#r`KqPl8tW^PmHm&qN=ZLsBC%0zY&gX
zu31%aX;F{(3N6uN^<`>{TTx{LWNKc~DTZN;ulHEpp`x5Uc(JejQ=#zto_q^Ma_es7
zxY2v8?xniO9V&i<Xr+%jCSgfwI<VyWvl1-u+#?Xjl97|T;b>hoqJ2^LQ{6-1Zw~V3
z7IiMUgp=pL0IGlB5|)H1*Hmq^e`*Vw2muOFag6<3U4X-11klv#jgyz?>95*?HVUS4
zbR@JZK;bU}6rtwWZ7=G8pudng(?*!ed5!zG?F>?%u^{yv0jynTfYz4*3$+4q<`{_6
zM?pKZ1JpflfjGL`Sqqw|6k*EhrkCMpkV9e|q-*a6dBo3vce&P4LE7=pKv_2j)Sdst
zDZpj*Lal*!yB=7Z4!}y<18&9u?ZiP4HTbF8gZePeoCnG&u<VL&L+}UlfOqg_cxY97
zA@cH1Gxy+N2}lF))qg<V^*UgZYzdt>T?GpMSn8ISKvaKjDdQJ2XTZv%9tQcACxP)K
z|F7$M3nc>4Rlfvv(+lRjQUK)9kAQr`H0+(u=U~#QteXwWyMI8V)6q5obJ-a<IRQ5C
zomu*$pP_75$<cS_g7Vg^L>|`pn-IKb0q{<J6Fj#U+Ts5~c+n4W2iI}8Su@J}4y-)#
zAqd=Fk+EPB5cQ`)JFpeBV|xMc8nAaWoZvVPA?))0I6UfJ&4jM#n%{$hAKq&;1Rq!o
zEKr<C^Ln8j{}jUWZUv}2;Z=oYK3{?5R}F*U)D`&n>rOMv0*R@8xf7Is&ja<NmG+Nf
zn~oq4{|U%LCj%>LlhCDXcpju7_XCqJ1dv6v9xaNU`1uegsV{KC!XK!t3-GSr0^WU?
z?U)-^s(!o%BGhwzB>#ZrGK8jYNIOx9XoLPZD;xggc(!Nlx<FvULXfT;Y-%=*mFkuk
zA&M3RoUJyc>x|ZyLIB5ln%q*K0AmIk5;O$ZFG}CFT$CaWx-UJb4Yd$iFb<UW=Q{?K
ziWjF2LuCH#Kx3?t$o36CcPm7f&$I`XGMxPyqOU#-(O0H{P!*$!q-%M^&y()6z3~lL
zdH9cQ>q0#>yzslA9o%LslQscuPnx)*@BJ|$7WvyG5MTZ$ai8fz-LXu!F6`u_9>eu<
z-7eiN-xpvR+K%aL)#&R_fjG3?ZQU-&<0KZG{EBWKsk`6M`BbJ`Qa3&i>VYk`*=SYh
z7x@CLboD6P`lz38LL2nYw&_k1c<(VF^&JbriHjim+D!eCmU`KjnNFu-==G^`%;Q2P
zRS(_!0xY+fSmK2#YiGwVJ%5w6K_u!<qEF!nsQ+7zz6R5-9!L7MeQSY+CM)6{dRwtQ
z@q7W6weMzGxOQ|8XqE3<rnzCV;<mcDwr^eRd+*x-B{7~GJ+aKH?Gl-lUg}z%T?T)E
zZDYN2Ui~Bngk9lI`Qpr1x~MpBQVE>tp$-=m9!WHuvCJvLXD#_&n7#lDHVXo+a-)|z
znewO~twJZ40Cq|DSQ<Xc;_FJ2oMQ&s+?HemxTS0cra!>i*oS0;`a$HMCHq$%@&EuX
zWBE4*qTlvS&#HOHK9+gKxf)Bp7p5=3ic>cKb%?n72T$7iE9l`;HZFv~c=Sl&5?A-t
zrp;lU$jYw-yRlUJ!lRvSQIyRyVIi4@C93xWbhMaJQ=BMiR5(gfH~$srlMRud!H%@b
z4R%Sc`M&g6&Bpj=HjkX^TKbg%d%8S$lBG5gKBtF<EE7F2eF0Yec&%m89DSxui2`@e
zPV$r)>!$8l3ZO=ftgNnm0hVG(TJ-@_MWntrn|O`I&?6exjkhcwH?o1U{yEDuuS{Qn
zrNR}9&<Q!LDX`b5Bn2Vxy}1y$?N_$d(00F$eq3|Mu+88g!8c&lZGXol=P6T>@{Q9>
zyu2`QJeANq3q8Ia$JP67i=@Rubk&o#>0T3ju?qCU!?h57`xyx0IA$d2nsLC<Wv9_H
zG{;0f3o4Iw>K6-v%bAZ#h`#n1h?D-<+s5Yk)?-O2nL^r;T}J)-HHE+dLoK-`>6*Lr
zaE^pd8|DC1<->mf`Dt@Oz5+{|AtFnrfWT;hkyxwt5S;J=0EVk`MyQ*+@TV%+38Kp$
z%vp8(1s1DGYxu}gbC`pAQSiPO(NXE&=wn1hz7coYly@_-EU(Gu5M4V5qW_xiDnw+d
zEDh6lV5uw(ohFeLzc3Xm^}7XvQ}EF<L|sin9vL*YW+Dw&h>`iXfwKBHnMAWr&k3+p
zD|N#Hh^&0VR6(iNNC-W+8Yh^(rnIaWxXs9pL_N;@Z#)g*Im2)tgMDbmF25JPf8lSN
z(xn0S=ys%W9{`C8B@D`&zm7$1ZSp#0lVhdm@f{{{^4}^L7Se5Oj6UR(ax>r=TA*%!
z8MLqVL1@xTN#PU%I&jA<;J7-Y5VoM*Fdm7uy<l<BUIXp3^*Gxv1wHVHKVV}}&U<X4
zQ6*)#_2_Ak2Tn+^;uiuprm5Q&qaFNPeIG!a@AR8Cb<j3Zb^iyTeYze`5lFU5oa*sY
zE`PwDuQl&JR394nWxY)85a_>E(Y939&jWGdkSV=6G4c+q4i4I!(vZmz81)ctf-}d<
zs0VAfvs>A=1oQx6o;C~n`NK61u<;h4gG9oiK_2x8@b+Ef+@x;`B&xes>f@!hf0O+t
zx};o<f77_Y#@mnE>3N?qIQ~x5S5LM(vT;SH?ca<h(`E#FMQmqbTt^f8&bd|KsJ-~8
zYkOBi1V4bg1Ev0VfYk41;8)#{wB~0;rNDdMh~Rzz;;esxKSy<RDa7h$l!fVE9xn6c
zM?BaH_qPtg&rr~J+hEUDRz2l?b6tLFP5&o}u(}y#)gYiePi3}@Vi?qL{ruFH(cHYX
zk}&1iZ?o7^lDE1xuYwR$j^pbm&8yZ;zqUd@Jz3)KHvOtLuNu;k)LcK48jss(UR7_p
zwWXs=2vbf6eWO?1zrTw#-8Sc?W`reSsyn*rpzpkt+5!rRW2pnHpPo(!eHSPz1aKIr
zB`irvtjE%k^muxDR$2?0F)YHKjUVr?1523Dk@Waq$*KZAUJ+nbF$`n*6Ts3bl6X_$
zRc%YpN7%(r;v_5*z|u{qwEtglC6>iM-AGFdB*cu~kzi~&Gv3hk`F9>{$A42?h|r}9
z748iP;JL9y?E2JqBP8`$k|qHe@FfZuk~8EkTv{MN7|}ZsQb8qA6R^b8Pf2Hd3SAc{
z4FZUf)rs<y!xC6Zp!5Cdoc}`4B{Y(WFiH0g1d>LX^i+5yN(w%V9iySruBXPOZF_87
zfE3`1YX%go1w<tF5}yH?Kqc%l0!u<PI2X6>KLowvQ}M0^E+Xi)Q*3JSz?%kJO;m(Y
zDrFoBQZp1@l$MH!^}TCg<7x`8_KPE7{p}f8qq@S&D2-^uuKy2z)nXOk^8&&E0000<
KMNUMnLSTY(sPzN@

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/activity_half_of_the_rate.png b/src/main/ui/static/images/main_menu/activity_half_of_the_rate.png
new file mode 100644
index 0000000000000000000000000000000000000000..3775ff3101b6cd4ee5cb54c8e30240f7da35509f
GIT binary patch
literal 1871
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
JPDHLkV1k8$Z>s<R

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/activity_kangaroo.png b/src/main/ui/static/images/main_menu/activity_kangaroo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cd24b78389c02b894ff15cfa24f16df8d92bbf3
GIT binary patch
literal 3718
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/activity_management.png b/src/main/ui/static/images/main_menu/activity_management.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f82d3a9e6109ff08147b1bc569e5df18786b68d
GIT binary patch
literal 2106
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/activity_marketing_account.png b/src/main/ui/static/images/main_menu/activity_marketing_account.png
new file mode 100644
index 0000000000000000000000000000000000000000..510c73d459fa7086b18dbabb9c80ce269eb22597
GIT binary patch
literal 1689
zcmV;K24?w*P)<h;3K|Lk000e1NJLTq00341003491^@s6RaRm500001b5ch_0Itp)
z=>Px*Q%OWYRCodHoy%_=MG%Lpde_;9ZOM*<@B;;q0t5uU;3RN@5W+QZfCCQ+NRT-v
zRs`bW3ldmS{s9CB5-#C@9fSmqAmSM090({p6p4pIY>Aj0?AYFQcAEOldRM#a+4uDB
z>};20c^=(0)!)|iOh2ZY$p_J=?@6SVHV!+EbC8MllGb}P)1YkkYfU?RxP<R2m?^D^
zR#?+5V!kHZzbd6J#)jh;`1tkpW-lmZZ%p(%y9YNiw~uJYIl|1(X|0ouX$n>@Da)Fa
zWuBFqi${9r_=CT1HDY1iVD<E9a$_ZRoLHX}1Ns}eXs6^6$Sb6ICf*-A&C@s5>an|K
zu=?DKk<_Jck2*xtM0%v2i*$ZkUQ|-<*nvYI^Gly+YAH`mVD)=LW9unBD|P2YElNY1
zhIt_o<LCMP<$tP`u`1Z~)X;%D<U$>;rmQ>8^J0|wg&n7sFI6h9czAhPpBj2Kqn+=?
zQ!UgyCOrZsV3R-Ou~F7zkx^^sj7J`OXo~=|dM$Bk`K%WZPq4WC@vF$YUCb+!J(eXP
z@KO<0PkB`f+o}RQs8FX`sMXyEj9ga2tTc5ISUvr8bnEGF>(o+G<@V+I17>&~Elg4b
zHnno)&8~l?Dx_2Ew!DVo9ltPnzK%tUYJFwnTKB#D7vgAUn->%P@jbZ~THa&bW@^{9
zsG0#;npclx8D@{W9_x0f+*$oA>}~&26n^icZy_G-yB8fduE)B)R3YzB@f)I-J~$>=
z;+zW>U4LE)?Xmg^<XAE~sW)z{-4xoP=ufR5g}*t_pBo=d?o#Oaw^03q3zlH2oQ(5~
ze`>8J5Wo<XlChtMEDnDO$g9>~d3fmu{8ekUVK7xmN5X(b;V%J<P%ClUP!9<Di>x+n
zU>a@NxPRYW)N}YGsr&X54?j#CiPmOilc{t@I`)=+A?ME@X!F7h(dxfVYOJ0eOnL3Z
zpwtFtMLl?scD(WtaqmvE7pkIN-~Nx%pS?xS?-#42Z2q*{@@ig91r6e<L4XPi@x#Iv
z5}Qnmaj>}k+wG}^5Mc{!GA+izqD~E(w8AFiPY^t)D#_;jhoo0;R!Y*)IZh5x6n9Ic
zXIuViHf_t$zyb4Mt33TPm(P)2{-XiYD`ZIwP;BxGPpHV%iZ>GDU@H{g%qc*9dzRGL
zxEcL5Y7H0I<e)&EBQ^SHjm0;Y%=p90oarT+lRE|K`9MI0W#RDH-l43gjyzIAyM4Qz
z@3DQm0tXd8XUBt8yB{aMJ9u5n9S_#I`VDPL`yZVxL6VLK3z(T7XQgxHSfJpB0xaM<
zSI$%V?9sr$4GmZq?oVG*`pg>wcN4p9l~92NN$2OUDE;Z{ZHF5yurg#UUkNt-=Un|-
z;I`Lu1Jgj@q5CQR?&Y@LzJ6XjSRU(V$=a;Tf;IF5Sg;nXAp(ZfT93704G}P;)_SZ3
zYlwg$wbo-TSVII1skI(!!5Si9NUiZs7z~+Int2l0_p&?1h-FZ)Rnm%K9P?mh(l3ua
zR+d@MvnR@)Gj#$Jkxh&7Iu<jjgC?!8$v9X{PsdE^pa^Vnr_38R$T(Qc`N#D1Ai&K{
zm2bs&2rc;r!F7%<`nUt-<@Kq-RLj1cF?{<4MZFB$rSSpXN>B_6iydI9-1w<sDN#Vm
z0j3H;X#-+Uc+3!{O6u3&!c(GPltiimiJlx$-vz^*@K}M6)XI%XE#Wr8Q>^xu1ffg7
zR3Xr}gxi>JuQ}nlI#`0K+wwx7@9-3@y(P)9biumO(-G*~N>c>ffMybj9!jzvi;(mZ
zJ-sQdHnT*5;h9``|9mG5LefhMchT}`lmIVg8D{h6!6J&J>`XVRw%hZ8T`m$QSmeQC
zC)PjyiL}HPux+Id0>TVyBoyY5>C?rswdTQsjU->prTm`6jg9lZ(zOwaJQkUeAWE``
zf&}(1ugsotSqUSoiBJj^=eB{xK{rY|t7F)<Qh|Ul@`@;r9G+lt0`dJ3=ihoRXcP;W
zR9XW8skha!#VUyGk|-ran3qshmh;qH>arf2O8^D3aLt5$TM#1IMSLczK?S?2V37!w
zbE0qjN$C}zl)Wx&L}1w|o=ogN^n}-g3XDpnYE@90!7h|mO2m7=Zm>Buc4@yH3Ge?6
jgDq5N7o#ksk=_0u3gt|Fpp4dM00000NkvXXu0mjfw`w%r

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/bd_commission.png b/src/main/ui/static/images/main_menu/bd_commission.png
new file mode 100644
index 0000000000000000000000000000000000000000..4764d1f7d1288b7b607d7417757f3597688904ac
GIT binary patch
literal 2815
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
R2Gall002ovPDHLkV1k9^U*iA(

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/bd_level_setting.png b/src/main/ui/static/images/main_menu/bd_level_setting.png
new file mode 100644
index 0000000000000000000000000000000000000000..56ce7e00f791614606c046846a4d9222d7c655bf
GIT binary patch
literal 1415
zcmV;21$g?2P)<h;3K|Lk000e1NJLTq00341003491^@s6RaRm500001b5ch_0Itp)
z=>Px)K}keGRCodHojq(6M-<238yjrj*$8kXoPa<e5Gj%ll%z>wl%zmHkOGJV2+1I&
zNJl|Uog!U2uw;=)5ouyYN<pkxNf*gwibO#|<O2f2vK0IFd|>wR-k$fg3wL{adoz1y
z@0(_KJv0BE`Q5uWv$MW82o@6E+B4!UuYO1XlR*CK1b7gTb|AnQ5p1<^3+oby@PymD
z41`MvbO+G<&h4EqjSc^ZXa1>ndqdXBmgwufJ1VP{liawINbnH>m9i=IS1kne2;nw^
znJo{OXYt%$OIcdjF<AQkwUYO+cEv}y3PfXBZn|OWATAq%&r7?8zQ7ary-wPl8Z6y9
zJ>ad(Um~Bbv30)M$xSwTS+?Q_Xz*HTbn*tC`Sw|w{-gry&5ZB%*Wf!MI+8|ovz9@`
z1v3bzN*5RZZP&-PV7=+_w|okqPP7v%LcUn9G4OF|YVp^k{+guBmFe;Gz7IdMr7F~Q
zP~rxKiLgmx*V1C8BKy;uNtKJ9$A0(1=+xp@%{Vj#8+`r6Qh|n=RnouJ39wtJv0Her
znOk@X?D{~ppkM!V=EDQpe>|Wad2v9C`B<8Ne{g;DSD%`WD^KNVB4EbT(P)(zSnuv{
zQ$?RrMd7497iKcYkCtz^0(qjUJgnU*+T=e9qnmS?hLv{>9Son)8Wt;$sR}haT45&)
zLxsR%WkF?SwQ_IMKl_Khc6H>nh0)>iK3TX4ELK*j6siT<yeJj0WT^nGEd5!KRS6~#
zvP4;=uKZtp%sygMtf%(+)8#?TD{mWl#ne~+6{@WdL=04z8bUf|OH_601lS!+8u00`
z0<lbh-}~{K2Rvk1w(xTDGS%?g)a`{QVH*Iyp*H-4u(@9d+J=@wPnep1eea*5{e4?R
zm^Ri5`nHuDv|$R?(Fdns6|5ryj%3wh6|5ryj${WN>BeM7FD=HdySbpXDpY3nbR&^V
zU3CSHFe_LE>xh6OS+!UN>xh6OS+!V4U~`#nJ^k|=d(HQs+S78Vgv-}=@+%rmwh5>!
zuuXJbFBexZu<y8|<|oTi^%3}w7Lp4&%FPAr$OpaokNdU1=V0~rSx4xSWz`iV^U0j6
zU^AmjuBc#>`DD&ju$j>%S5&acd@|=M*v#mXE9NrYs?J?VZiS;<naB1j<pTEEy&rnj
zzn<M!U4bL?xmfJbyI(qLzJ1x+FP~Wv%?0e1L!Ve_Y#t)Ez^W^7^l2$r1?z}_BU!ar
z1?z}_BU!arM__ZAZmrxHchvm;l~s#%^w}7RO6f?uu(HCGf0@XkJ~de-AWV(KPqnJ5
zVjQ#pm-v^79F$g*RRY4)fWbeks;U@B^kjpCKPd~l1o*eK^CpN%&EYoeN*7m6LYD|r
zBZ0mpCUtR9*zI``-<z2R4+w0!vv%c+s}`~hz)JLV;9y+E#bK%E%rIcda&?Q9$YvZp
z-I9D^WrSfE-oLR{5QL=Xz=wsU(q+dbXrwR<Wg1{5ill_34>R=G83ADzM&gv34X|=i
z+W*G1grt{qP3Z{;Gua~{T7w6%c+ybPaUSii#08iwa5OQLw1`LnUO+g-6>9B7i=Hox
zf;|zMY&a2f1tF*)O1go|;k6!H5MV~lBFanYreGyQ;`>XSf3;kp5l_M-X%7S`{gRK3
zO91GWC~+b|cz$-3tt>Sx-4?7A)J=TqxMcKCyNORrR}hkyqYP-}18=@#jQNzm28DZw
zkUmS_%VWphesT1Va*Cd(ve;+^-6$<eqxE^mU_&Y0+Ak#0{FoVRR8BXejMAu|KL<VA
V!}8m(b>IL1002ovPDHLkV1hd<tGECF

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/bd_merchant_activity.png b/src/main/ui/static/images/main_menu/bd_merchant_activity.png
new file mode 100644
index 0000000000000000000000000000000000000000..95753be47ed914dc1941cc36ca8035909d14f3a6
GIT binary patch
literal 2110
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/bd_performance_setting.png b/src/main/ui/static/images/main_menu/bd_performance_setting.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bee83df32922525d27c77fc9c394d22c5a3b57e
GIT binary patch
literal 2578
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/bd_sales_volume.png b/src/main/ui/static/images/main_menu/bd_sales_volume.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5f0796dcb5572ffa81293fb5753c026cb9e782f
GIT binary patch
literal 2785
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/compliance_contract.png b/src/main/ui/static/images/main_menu/compliance_contract.png
new file mode 100644
index 0000000000000000000000000000000000000000..f38dd8a42d3a0c1ec5f4ab05b5d2ae213ada4a68
GIT binary patch
literal 1953
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/compliance_merchant.png b/src/main/ui/static/images/main_menu/compliance_merchant.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b2cf979436d0b7c4d6fdc88fe0e41fb4830fada
GIT binary patch
literal 1929
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
P00000NkvXXu0mjfonWBu

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/configure_device_management.png b/src/main/ui/static/images/main_menu/configure_device_management.png
new file mode 100644
index 0000000000000000000000000000000000000000..bde88d0ff94c34a94b08e5546ea803efc3cd3a49
GIT binary patch
literal 1514
zcmV<G1r_><P)<h;3K|Lk000e1NJLTq00341003491^@s6RaRm500001b5ch_0Itp)
z=>Px)q)9|URCodHolT4sMHI(h^$ZYU*6gaVC<h~;=*0xxje3!2A|wi7Nz5joaPR}q
zYA`W+AO<g(=-osQf@`vg2}Vr_Boe(L6TNs)+?AMUU;(q@3`<y;Y2T}!&h&irOjS?4
zrDyuRWYZs0_3!Fmzj@VNJ^M<53!8rZHmF>B22|xK@ZmuKwGo#ip!^|RE_ZPV=NbwY
z!B-_vFc09*;PO}SbEhD;`Xo$#bgkFpsl)=`>=}U)>_l)ou~A#W_g5y?N>fFp7Vw--
z;5mH-L-@CS3c=f(J=m}JuY_{>4LtZ;c%_Hz57|#Ov_~I?Lg7Q$@$rI9%gw<~Pv@X|
z>}9CJK?HiY%|ZIVtU3=Kp0_vg2~18_OwPv)?DW2MP`Pmoy>!e(bYROUC_--81WbPR
zceiuw4)%+^j{)2ysB624W#e=7UX|MgyN{gibiQ7v4`J$s7ZK|B0yRpB!XPryY@+)c
z*W*1_SF9dsEG}D(1iZbl=kueD`+}|ZV1utedFqOGm1JLyfP(7)`7Q0jLMzyyqbkbR
z-_U&&T)+-(thqyLjIpN<=4-vbbX101wFA-}6WxwRtP$+o*_W_jwr{B-aEw=p8QtSY
ztR4#JiK<kd$==O>gho%RcpElU*cd*c)jgITQ#1EO)f364%6J>583wxpkEH>X|KQKT
zfA();;d~Rv7H)@oY2YUCSQ@1o_yHB?6x#^mpp<3_IJ7`ULw{m!2-H|A(1X--mj`A%
z)eWBHDm0#(8@<cZBmaXkNSz#qyPCuj-==urSD$vLDoUCFzM}H*z0@Yb;g|rv_oL41
ze#f#Rhc8nx6sTb#;g|rvp{7tU;4cInLo<;>rs%OLeeZ8_0%<LSOoIo6v^KDh+a+L`
zE?%BVSIeH+dI-kuT+exkp0tbq`~l-9-t9>vt}?5~rWq;$;cOo(*tn~ih5Z7S=_<3v
z*l3$?Rx7ai_}g%{bUwN}cHP4f&G#OD9u7RTBeqPMKUgxbS8go8FIWDuU{Qh7muD@?
zr>m%h0;cOBV41)!StuA@whG4YSP#FKE*PDP!k<(>xdwlA->0@@U~`@aKW;nJr<m-U
zEup}knNbY^YlO+Zkbt#kW>iDK8ey_8Bw+2C8PyQ5Mwsji30Qk(Mm1Q$&M%gY8gZ)%
zakh{30pZc(@4$w_=&j<`^|-U;xvpiB7GMQ??&>9=zbqOn*bRj>srT5~@<o>G&I-1;
z?R^+tzKW&cE=2!byb2><zUo4%MT52TN;6a<!P!1muq~G{LpxZ(R{d(KQF6AAHO9XA
z^HF$Y<i6Cx{b~LjTiX;&?e^K!Gc3#+3Np+USVO_LTMob&zUNA-ox$I3ZU5l|mgcd7
zefFNsERA+0`rJCc_DLvkb(NZQ1Z)!!SDUP0>G!8;HqQ3R?H1FOXZ2X7Hur@r{yP$8
zr4(~Z0GZN1(3RY(iW)H`k4==uQ}A^lfJ`yQVp3W$#{~Qt3I)G8RuwtSo{XWu`%XwW
zCV(laJ)M)9(rt*jA)r&2tUl@KMBkK?TFearVu{Jqg9ijk^eyIwK#gSpma?aV+|Tw-
z78z=mVcsoDNw45=@4^{ZAcnQ{{`Ii}N=Xlx_)sh%0c58c2G#3eDbGKpq!&v@fY?Rm
zN~nV+xzPtc#gI@;rkvqg#Ej-hh*&*;Y`9ZWNrxm1mly)_`SH%Fq)AFoo{*nF&&9;v
zVjT$(BbpPT&4d$;p&(SD$rF6<m2gv*F$9QF%tRCI!IF;7?~i%@#dBM!Y9{e>AW((Y
z7~3o(Q=&8yq4fNKp)$r(!@}LcQc0P_C*Wl<iBEhe2+`A$g7ex<Pk^Uh%jQD__WX42
zxm}O9>!_lr!gVu`4NKEfCQ6Iah+Ve_8%oL4ej$mr%j96AaxxiZl!jjaAA*mHHuWyr
QV*mgE07*qoM6N<$f&#JR3IG5A

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/configure_merchant_number.png b/src/main/ui/static/images/main_menu/configure_merchant_number.png
new file mode 100644
index 0000000000000000000000000000000000000000..90cb8e36a9122cad2059dddd28aca04e8e58d426
GIT binary patch
literal 2294
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
QD*ylh07*qoM6N<$g3Vw`DF6Tf

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/configure_parameter.png b/src/main/ui/static/images/main_menu/configure_parameter.png
new file mode 100644
index 0000000000000000000000000000000000000000..57bd7a1defe6a276907ce68177789b00a7988312
GIT binary patch
literal 2248
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
WtfF--BXtb`0000<MNUMnLSTZNv^=W-

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/content_group_hair.png b/src/main/ui/static/images/main_menu/content_group_hair.png
new file mode 100644
index 0000000000000000000000000000000000000000..71e62742e5668916062c142a4cadbeb3f9bca745
GIT binary patch
literal 2287
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
JPDHLkV1n(EU^@T+

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/content_website_management.png b/src/main/ui/static/images/main_menu/content_website_management.png
new file mode 100644
index 0000000000000000000000000000000000000000..aaf1c3fffa6d1880fa797a3f2862d1f60bc0efda
GIT binary patch
literal 2978
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
Y2mLs$Q<abFqW}N^07*qoM6N<$f}MQ12LJ#7

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/finance_austrac_report.png b/src/main/ui/static/images/main_menu/finance_austrac_report.png
new file mode 100644
index 0000000000000000000000000000000000000000..60aaea09fc24dafa16deb65909846781d64bbe6b
GIT binary patch
literal 1741
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/finance_bd_extract.png b/src/main/ui/static/images/main_menu/finance_bd_extract.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aef2917ab6468539ac62e4ae6bb56988bf2172c
GIT binary patch
literal 2825
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
bA@2VV5DVkj47yiw00000NkvXXu0mjfk^OIz

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/finance_merchant_invoice.png b/src/main/ui/static/images/main_menu/finance_merchant_invoice.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bb473748f6dd5808cb68f760433e044eb2b5df0
GIT binary patch
literal 2869
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
TD=w{L00000NkvXXu0mjfrw)!d

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/finance_partner_contribution.png b/src/main/ui/static/images/main_menu/finance_partner_contribution.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aef2917ab6468539ac62e4ae6bb56988bf2172c
GIT binary patch
literal 2825
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
bA@2VV5DVkj47yiw00000NkvXXu0mjfk^OIz

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/finance_record_of_money.png b/src/main/ui/static/images/main_menu/finance_record_of_money.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8b39048bcec70b240d3b0ca2b6ede9c65db7c7b
GIT binary patch
literal 2329
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/finance_statistics.png b/src/main/ui/static/images/main_menu/finance_statistics.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a7bb8b5eb569d953f69bab06ebd2b231b3a680c
GIT binary patch
literal 1843
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/logon_log.png b/src/main/ui/static/images/main_menu/logon_log.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd203650f3adc8caa6d33e9b528ee244c32ce68c
GIT binary patch
literal 2304
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
a$NvYx(%Ix94KK9-0000<MNUMnLSTX{7)vPt

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/merchant_activity_1.png b/src/main/ui/static/images/main_menu/merchant_activity_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..97e7f5ac75beaefda95451138171d26c3ad41e47
GIT binary patch
literal 2315
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/merchant_apply.png b/src/main/ui/static/images/main_menu/merchant_apply.png
new file mode 100644
index 0000000000000000000000000000000000000000..104c41ec2a01afb1e5bb1ad4508c0c53d2891db7
GIT binary patch
literal 2241
zcmV;y2tN0TP)<h;3K|Lk000e1NJLTq00341003491^@s6RaRm500001b5ch_0Itp)
z=>Px-dr3q=RCodHoe6LhMHGhr+1&_)L_lstfe<c5lyF2Wj{-zNK%k^jf`AGUEUTyj
zQM@S2lLAF36ve_55YR{|$c;x7lp}>g03{(H2!tF2i6jDnB<p*#Su>N&9<!O=nN8+Z
zZKh|s`%U+^o$i^}y{{!0At}=vpzO>bNM-%uMpr<Jr(+XH?pQirWyCEE*CF9D+)@!F
zoCDlP=$HYwGZoI}-y&(j#hTtv3R%JWu}x5f5d>}o73v<i-O(ZIvQkD#x<GZ>N_AR`
zSo#cGN#OO1ez5B%N29p-NxJz=`le&`-!hVN$SwK}#Kg?U@Ff@YlstH_DJf2rubG5$
zyhK1->$yqfr<HQxpn5w-euSi?vS8{H9N3fz*P`so8fvAzgHc**(@59@XVgd}Ez1s6
z$G~7$jZXwh8EUIQ%IZcuwO+|N3S*Y<_E%qrzeucnXdFTP$%d+=#N8k<k=ZD(tHZuq
ztemlYxjMOhrY7JRkFhI0Q(yC(X@m9r`*TaJr<KXRRzW~Q3E;X*t6QiJ)-zD;vH$&p
zY(5flX+Y~;bwE@1v8gY)Dn@^MpbC<!+yMEBi62K5q6V9Hcp@dN+mBQVI6()Q89(DI
zq_QjEH>#rIBX#fLUqPcrL3#{}jfwZZp;fk6eod`&Z&WoRStT<)hRF;)mpv_(4JzmH
zSM7iIufoFcQ?e~wjdpCf@w8aBQq_8cis2MB6p~R&W(hJau(0XR7Gnrhu#_Mhsq+eI
zjXl*EJfUl0d#<x(Gly*XuPsLE&~X@-lUdSiiUaQQ0mf;yHOT~MipoLrQeA8u1{0up
zKOVd~8LZY;N0X`46-bS35(X2X8ERL>6t%&c)#^INw7}F(_hNAC9_Sd;k|sba-=x(k
zjX%r1REUFxr?4<<GdAU<8-D{WjWq2qVdWUNR-94S#$JCLKIof_dX6ZgREDf)&Y^EG
z>%f;G=hu_b^Mar!hmN$pnsmS?iBl{Am5cpsxBD@)%`G}=5PDLfV4vzb6i!L#Ep*p>
zdEyh8-g$`be0nnot#v|^_Ik@BJpI*C4e;hIWARG&(L(Pf6zsJPt`S;zukw=@&LX{#
zjB|cuZT22a{dKAQIeqaQp6NCm-5a&_lcQ!)LcvO582pzW--gZ`W}w&BS(ucz1m$k+
zv3O^}5iCCXo%}glQY?2-{G=jEgn|`SXs_N?Cw3q??E_qKdsh7{J-!_e?_TT^t~a0e
zcyFs7-k{;fhz8rQX(wDC-An~#)rp-Lzw15KHD4#q>x)~{7m;9#OE1Z++Ba;D)B!J`
z109v}#mQaRlCxiVDeU2h1G^||D{kC06In&MGAwSfsr_dmu3-xmyx6Gvs`GH4L=@PC
zhc{!|-sQ-qQGGz_>&PrRE%Ry{eU035<LPyo<@s(Sa9gv^a@edt5d(I9=0?oex8i?J
zIb;K1xQEVrR#ft%9k<*CJ;&jdo5Vh&{$B_`frtS6X2yEVOkY*48hMw_V_@oR{Ql1=
zIj(hs#<H=eT0#>pSRO1JPM+KUg-<m3CFgPXkF!xwQsgs@84;ES``RC02W5?#-em}y
z)f4yV6v`Ll3MErG^1OWTE4)fz1IgT*AH<9<LjxrXd%PvVzIb3YW*=G`5XL+*rc4Wi
zr7B=SG!j@2><jx-FgIhJMp4z5c=Q+fuCKnE{xeH~eK!4b%*)&muoiD8Ou!TIg94^A
zGl6BmKD}=x798H>mjxTk7WH}rQ#uaxo6ZW6mH@kqtWv>1UEF&jlH>YYfm^^bSOV<o
zlWBen$}M$CpJY7R;V!@FtQ2WF*ndk)@O|DvpG;_}4nFMr7$&s8!)F>RMwkwEOKv(!
z%1brbFw~C|Cu3Z@+co2@e9?5U>$3N1@^R9<&ZmiwV+^fJh(s|JEYDAE%-N^n#uI$Q
z+VsQ&ZTq691!s9xh4ph{D%hV3GEh`{5rbNF$FSB3GSGGn)l)5g%5Lc>Q^E2&uKbbj
zBgSQ}wO_<HWGdKjtve6_E|5-3n+*dM-pcVdSV7;8P_TuUb@`_eR7G>t3I+R1L8dvi
zvcO%1f?aYn)dE#CrwBs9en&QdHK+ENQ!|tADikc&ZOqO^NTDS^bxnjn$MQ<RcMfkw
z(sj4WY}3vj#jod%g`M+0jrFq^%PtEmhj6f5a_>?g4zEAGH>in1PAgir=ZhO$*)k{Y
zYpWph_vL>H=x?Gq>DJHdX@v+eb;+(i;chDA1`4Hb(b}tFZ4&Tk+@0v(;s!-b_=9ou
zyR)4IS>WaKLWJC>(hum!f2te8!EQg337&<WLklcAR9SK<q;h_g{#l%lhjzV7)fObg
z)QQpE?<4i`f^MNwyW?yYe#}3FMp4n=^{Z^vlEU#r1u8`;4WdVi^YF>BZJ0>ERmi>c
zkE(2jo=8aJu7G-Q_h3U6`%$*-Oa}N<tA)HL)8OU!p;lMYjLMNqYKQETn%!;KVhjP<
zbxHGY9kQcu_DOAvF$9<;IZyYz(z2s(TZ|!4!O{bky{ChmaoJKs0>n^e>GiwCF6kw_
zQA4eEc4k=N-oMhi#V+YVjt^}KkpQui8G5o;f@MGd?2_J=&<HR)#a;=OU|C(u&L2~k
zAm{};wDLwoE@sAiBq*f%58rK9(h5Am1gQ&fx%&8bCCz%|%@bTBspXPmZ(IBlU`D(r
zg2sju>aM`6g*Q)dJCePp_R$9cX5?d|32m^fNA~Yee*W#2Tb-)R#P=QuoS}LjTUCv{
zC5oB|yXOaWl|EXkH*sLFoYLOJ$HPm<CO*Eq0xx<#a_8KtOFuZIDRuKDf<}I>yK~g7
zS_735l{Xw*i}j}FqrFj@l7`Q)ez0Cu_SSx05}L=*!7A0+n^7uh$l?D0rQm=%{k%C_
P00000NkvXXu0mjf`4vLu

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/merchant_info.png b/src/main/ui/static/images/main_menu/merchant_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b5b9a8778d9830bfc4c0fc245113b47119e1893
GIT binary patch
literal 2261
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/merchant_log.png b/src/main/ui/static/images/main_menu/merchant_log.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea7b132740fee8d3a19f5a63094fb7a5f9e3c38d
GIT binary patch
literal 2695
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
BFOmQN

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/merchant_statistics.png b/src/main/ui/static/images/main_menu/merchant_statistics.png
new file mode 100644
index 0000000000000000000000000000000000000000..40365844282438d83aa451abec0982000b3d449a
GIT binary patch
literal 2326
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/merchant_turnover.png b/src/main/ui/static/images/main_menu/merchant_turnover.png
new file mode 100644
index 0000000000000000000000000000000000000000..292293e6646fa5bd8059a40790c58502bfecb222
GIT binary patch
literal 2326
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/org_account_management.png b/src/main/ui/static/images/main_menu/org_account_management.png
new file mode 100644
index 0000000000000000000000000000000000000000..30100664ec8bfa3236e9a1a98bef35da84f0727c
GIT binary patch
literal 2107
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/org_management.png b/src/main/ui/static/images/main_menu/org_management.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5af193bc5d446fee110cdf627d14db74edd8428
GIT binary patch
literal 2907
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
FV1grgb<O|)

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/org_role_rights_management.png b/src/main/ui/static/images/main_menu/org_role_rights_management.png
new file mode 100644
index 0000000000000000000000000000000000000000..802be27c1c9085ca3fe751320f0774757bd0b577
GIT binary patch
literal 3149
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/partner_application.png b/src/main/ui/static/images/main_menu/partner_application.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbbf7d754281ed9b5752fe97ed223ac853c4f8ce
GIT binary patch
literal 2894
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/partner_commission.png b/src/main/ui/static/images/main_menu/partner_commission.png
new file mode 100644
index 0000000000000000000000000000000000000000..7503e2059dddd507830f492135957c5703598733
GIT binary patch
literal 2590
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
Avj6}9

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/partner_management.png b/src/main/ui/static/images/main_menu/partner_management.png
new file mode 100644
index 0000000000000000000000000000000000000000..f428275c04f773928c4019a1a316a08dc0d5ef8f
GIT binary patch
literal 2696
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
CGAsoE

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/partner_trading_volume.png b/src/main/ui/static/images/main_menu/partner_trading_volume.png
new file mode 100644
index 0000000000000000000000000000000000000000..290fd8c1a6dfbae497dd1f558b2e3a0dc559fab4
GIT binary patch
literal 2666
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
YAIaiXS<`&M_y7O^07*qoM6N<$g5_N}fB*mh

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/risk_blacklist.png b/src/main/ui/static/images/main_menu/risk_blacklist.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e0786ed0093ce40d45d8fcbc8ccefdaefb616ea
GIT binary patch
literal 2745
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/risk_configure.png b/src/main/ui/static/images/main_menu/risk_configure.png
new file mode 100644
index 0000000000000000000000000000000000000000..b785ced87f0eb40305decb4c519e90a8704ff9a7
GIT binary patch
literal 2502
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
QF#rGn07*qoM6N<$f*^42^#A|>

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/risk_consumption_ranking.png b/src/main/ui/static/images/main_menu/risk_consumption_ranking.png
new file mode 100644
index 0000000000000000000000000000000000000000..79f7a0b5893ae59c9121ee3295b6ed424e6c21b6
GIT binary patch
literal 1851
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/risk_early_warning.png b/src/main/ui/static/images/main_menu/risk_early_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..e985c99be5d180b8029d947f3ae2cbb5f2f938b2
GIT binary patch
literal 2235
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
JPDHLkV1i2OJ?{Vj

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/risk_log.png b/src/main/ui/static/images/main_menu/risk_log.png
new file mode 100644
index 0000000000000000000000000000000000000000..68b9902bba91dc20cc918d69d2d0be098c4da833
GIT binary patch
literal 2328
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/risk_monitor.png b/src/main/ui/static/images/main_menu/risk_monitor.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2a7e6113224ac75ccc0348a5c6e31db688e2c90
GIT binary patch
literal 2130
zcmV-Y2(9;tP)<h;3K|Lk000e1NJLTq00341003491^@s6RaRm500001b5ch_0Itp)
z=>Px-3`s;mRCodHoqcQ+MHIl_Z11kUeiunU6hxqa#E_T>Q9wb6B_a|E0Rjf_GY~bz
z;2$KQG1Zu0NWd5q6G=1?2p}J^AS6-}5fceYO)!cPB>@Dv7AW-NuI*i~H@>&+UiYqh
zce~e}cCVdDnwyz@^LFO9)0x>fyKfoT5csAQ-bP<r6|l%W4)8GJP{|oD0nQ2lxW|T5
z2vEU7z<3+u>>g)unF0I-Tsd7<QE-ZVe5hlfCq#Yeh2|F)m2^O8307<g=db_)=BB5~
zX{A^@V^D`3<ER%rM~nBJxR*{1EraFj7w0y%2Hyq-n>pv$BZqHbjI{xW?PZ18JK3&p
z+pV<JG+2IcMb@p_mRGTN)*#RdD<{cxSp@9EUR+aJUGxQ8d8pe=drX17v+nr^y1Ih3
zc=e{6Q95j87}UGn+0~<WAO9~^8&iU9She7BR8q@<m#0!T5{^^v#SXT#{6O8$$=a(V
zJJ`6oY7NfvXC%}<N;C`-6Jpbs+dr1D$5O!vhdup^$Q+G;!eDLL{!@FkwEou+EdBe_
zRly}xwq97q;|Z`J0-S3!Ec6=+XrjX6wGwJPM5DCY@oIaS#R$ZJ<ux@fn*HUN8p9}Q
zf>^1{a5<_Mi~)P=@3XIr_$8H|j@dXaLurk#7mtpy>K#>E@bXAo{Oe&1Bu>k)vV!bN
z?G7#4W9c?kLQNknu~TpLdsV1CmJBMLyz3es9M<>#>0>ijl57h(%sq|_H)@Y1E0u(5
z4qh@TVn{4WMg>czzhnjEG4lj8mW+(l4ZfB;!^fU#9)cK2)?QvwG+I$D|HH;eEe4e}
ztvr{QD!{tuTPrA~Qxd=}Dun}^l2T9#SRz3CehO~<O|n!<3a2DMo2d$JniZ#%lmeCr
z&<?fIvqf#GoD@z)0Jr^d9qZJ6|5UYi@^S7_ZxEbZ#Z0Z61S{yuxdiD|)w-ungM#HR
zf@^#wupF<*Q<>JygPjn*@(=hA?}5;tznLy)Rgn2sRpGMB{@{7!Q7GB^5irG>{}gC2
zfqUDwLg@Ej?QcA46xQne<!c=al}MtA52%i!f-tbIvExP6**3kd2gTJ<7+7%V5TL&*
zB8Mq)VD&8+fpG~|&_$PEGY%}yy6Fc0H~XNeW)nm@EIsR+?&*Y-6W3#LotRFDv<Dz?
z>}%+{bP-xU+YYqe%)}rLY??GW&eQ?#?0L5$Sbr7**n2ZEI0`I}M4<gUd>&61{D*f#
z@WL;;oXm(i3M>KazU7N0heJX0r`sUhcr!NN;VE%Om;{p-4~4*g>;QzXUPe=JES>Pb
zS7I}IQyj<L<{dRK>Vr=}L1PY$yREx+LioltLwPkbD+|b8k-uyWFpLj&5C=9vO9Cfr
zA#lX-A?TPAu7@fC!d+2#;p<nS_46H2{MNfTvHbxZKb(w_H%ib1sO08B-lFA3hlS=1
zI@qkD5>pMzdu|!HE2l!!J8uH-U3PVz`w{#T4nlWB%9mE6=ZLhnMB{@Q8FaATIaO-=
zf)_7fj|>~ORVglkoS9DpbGe}Cjm_#Xpb7f-e+kUf_ZBJh=7M{o!45tSMXri5khge+
zR&-E*#eq$-{v@~>;8d;6nLZ2hmaKxn(E~lAJOX5_)`EB5LMU9jK}$O3*HNp2L{#!u
zz673Wj~O2J&UwZ#f2cDv0xX&LiZ^ZnWprr_FS4h)$4!jMb4ns3z!EH_pb$zny$9fS
zN7;Fw>KU)284ikM3|M03o-i2-U*6b*k13Gz<a`IAjID~e$t%GPLhR|Sr*h{#3z4SV
zz(YaEDjsEB!620o2R6y7V4!Uixd}MXx@qMzYADbuoe94Zte~qT4y?eTz%~{F>nIFt
z_~v!n+Am6x$T|uG+kWDRC?2-y4IDpgo3408!d3;H=gvSg+ClSI;zMzz&hpI@zTE)+
zgI_`C+0*enY)cD!C{ABPhBncGJZ(5?%QkS08K<fY`)<J94>#-8TZ)qbhX?$Y%A_MK
ztjFprLpuQUmu}$Qeda}urpCx!eBaOEVNk%PV&I-M6<qg^O(>@1_q{u<<Q0H-E;^=5
z5F-9o+<ZI_&~3^+Rst;p&mNSaAXzmF*1ZmS3zsGnv3#ua{7=xl^L@+Z>?|N`RbaM~
zIWuOP6*Vm<^6^ZwmB66@y;2V0n=@^DcR|6L^`I0MnXPkDIa-^N&Y=w~#C)r(?%+1`
zeM4K3VRm)~P58<uOUsStFhgN$bBHOv@(K9lgba2PAg1U=j$g7<snmtD7J5&{cWJY}
zmoRK5z?IVq`J_h1nfrvV%}fTaj<pk0g&ck3_Eg=#6-o_6fLIb!^#*|)eM>C%5YSkv
zV99$rIpeZN^~lvi42dNXP{FD$>Ct=o$VFmP%aNhx-al$9P+iiK|7jW0B7nWsM+~*X
zQLyAi5(nNI?STBXMu6C9o;ayw6f7l5C(pu%PobXTGFTvh%;*~l`V#%#awE6M;ZUev
zdOg--N*t#lz~%PLi2pW1Opm4Fy#m#^A`2!~Cy(?HKt}jYgm|cQtRGm)BroY`_Ii!t
zG9)HIjEp?WQwc+`bb$Q(lb?UtbBRWLV8LYHKp^RUV{E(%`AL*mA`Dmq=2R!@shV`c
z9;*qE0++`#U9J|82+sb*A{A6(ml7-q(coM@W%f)(VH;=`q`Z+7sLj;&@}<R37)?}0
zEK&{y@rC4v(&C92r!9lk)W}c!X(Wt)(*~<oCqG81r_mGtA8VDKA81-ZmH+?%07*qo
IM6N<$f*AMekN^Mx

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/settle_day.png b/src/main/ui/static/images/main_menu/settle_day.png
new file mode 100644
index 0000000000000000000000000000000000000000..c298884f216d51ed7ee23a6d04bfcabccf2b61c6
GIT binary patch
literal 2226
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
ABme*a

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/settle_execution.png b/src/main/ui/static/images/main_menu/settle_execution.png
new file mode 100644
index 0000000000000000000000000000000000000000..71e6246742fad1dbb4b1c152a004a52ac49e8226
GIT binary patch
literal 2134
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
M07*qoM6N<$g3p2mbN~PV

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/settle_prediction.png b/src/main/ui/static/images/main_menu/settle_prediction.png
new file mode 100644
index 0000000000000000000000000000000000000000..0192fcf90f2ce94c99e9fce5570631392fff2377
GIT binary patch
literal 2751
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
FV1l1fL_h!l

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/settle_report.png b/src/main/ui/static/images/main_menu/settle_report.png
new file mode 100644
index 0000000000000000000000000000000000000000..8afa1b996c4e0f05bb4647a1e52d5307cb0d8cc0
GIT binary patch
literal 1968
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
CA<An2

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/settle_statistics.png b/src/main/ui/static/images/main_menu/settle_statistics.png
new file mode 100644
index 0000000000000000000000000000000000000000..76b85805388afc14720e67760c56596dd2061188
GIT binary patch
literal 1393
zcmb7^Yd8}M0EV|cNajwlT;jOQX5^A<xwf&n#mrpJaXTG^(2}s4+bJm=vEw!^5f3`s
zB2Ae)$I)?DELu-O3o$LjlC93p&-3&A_`dgf-k;x(@0P!xr-IxuIRF5lfI%a%65{`j
ztc;|C@X<mEfT>tdcK~BjdmR9fHpL*_a2Y@zbt***r9QG+OeN|hv;-(8fbzU^?!gsd
zH`H9<&pL2<;3W{cCs+mUE*p8rA0`IpfbYI@AEt{`N4y;L^^d?blxLlkgPtpMf*ubY
zFxuI~u8z1($XwgvPgY$AAG%J}lB%iIyS@5c{pvqTaHpPfP7D)7AXu6^q&*gGM(B+#
za$H_ge`{1Q8~y-CE@C|>=y1pmOcV!lGj?>sMeR20hdZ}cj8fNU8uz|s$N6g48r4@8
zTNbXse1l<(G4oek$9R$%-05Pm^VgM0``|Ts_H3{QXJQhC`k>RB^V%Njgox3+6bNBy
z&%uLRvJzi$S@Z$QqX@IKWDy@v!-d1zmoJqKrFbh$>@w~;3m`pvyS=_7T0cctaXdL~
z-0sa42B%<>rZ9tNy05McQTsgR2!``rHDgUe9BB88N!z}?U$NDUsV8IejV3;Fk3Z1D
z?Cfq!S*~3Olul40hXU1F*Lm>g@;f2wCyl?=-!Iy9)N^fEY>rsie=LjE4-p-#FfJ}K
zusHNy+F^@szgs)0sEI)*U!X4Te4zBl^FrW*>qo4|eiY`~?5>U-I-4CIC}@yL5(o~B
zPwPxjc5-<qvolk-x^SV69hqDC^(D17pO|f$0Za;yx4$8ZBlwgxc`%RC8x5Y^8!;Z5
z?bHhJ1zAP1X_p~agizfYpXN>R!2zvAEHJs2axPgPew-w)W_N4ExE*KhT(_+CbE&Sj
z8iIfT7Pj>LaAslEPcH^j)sVdST3i!9_2;#Rr{wyKENZpr=FZKQf)oDY0cmfGxzAam
zdY8}u5U{)cg=lLPGq6+%NN4)-hsI8C1><M=RzU*fprxC{zV%PM!l};EU(=|j9;^Bo
zPx_P+d}I9y=;bdt7Szi0XOF!4Wmwr<R~Gqiwk~$&pf4=($;Md|<|(!ko;J0VU{8(e
zJlb$z{62gmZIRaqlf4X<qU9(c_3qFz{>ux~S(}4@HL)vuguFweBJ1tACN@#Xu`rq6
z4qT;gJQa$eUK7e8@#p9%JvDVXX)7^FW>NHjPKaEHT?CsAVjnB7iJp$g<urb2Gp7>6
z&F+4m52J~<9x~~LOXImgr%SxSrQl!nI$o$t4G{T>L$0q=%}jN**7m?5K&=8-z0lA9
zlL<-YY467%eV0|%)s9cwh(~Wr7Bb9w*vj_;_}JvVAO;<={AP8d<8#b%%HZG$V6vP&
z@e=0ynq*<+vM{J+i^H4zcl<MeI`4j*!L;2?&a*8~Jg#5Whg_-wB7s$1q_7o-=M9OD
zAd)wwz*Tj+$YAD7!$zAdW@_do6k9&1EuC-Pv?RVtwvZ^D)_gvs5@5rU@8VvKQbCp3
zeOwuxyz0>EZ9vFFDIsj(OmeNDIU1aaQIx8Ju+h&e(Dj7abZuH@t5NCuc3eK!A^8Hb
zX*<ziClhgd=sqn&MOtyw$;a<EOVilvHY(fx10Qr-=c|zzsMvP9EMGaw1Es<Zs8>cP
z>h-!TiwalsJhDOL=tRAKN>V;FRMlwY=9(>K)a@Q6OlfC+769tLIKkRET7^zmsof3m
zA4oO~(X1mdbe;AQQ@11E(H*prQ427ZKk4hZHA)F?G1^q>>(-lt_`L#(?dHkbmX|h)
pv8uz_BQiDR<YANcldS#kz|;MGA&+9NZ%aNDfI;~o8SYVe{{YM`nw$Ut

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/settle_transaction_reconciliation.png b/src/main/ui/static/images/main_menu/settle_transaction_reconciliation.png
new file mode 100644
index 0000000000000000000000000000000000000000..100b748beb3eb4b3553f2a980f4f406c2b2d8606
GIT binary patch
literal 2912
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
KMNUMnLSTX%`+<A_

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/settle_verification.png b/src/main/ui/static/images/main_menu/settle_verification.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7ca4863c53d3f817743fc49732a134a9e98da54
GIT binary patch
literal 2412
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/to_be_treated_1.png b/src/main/ui/static/images/main_menu/to_be_treated_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..377df1c78b9c0614542a8f837b7f1748c292b0cc
GIT binary patch
literal 2455
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
VPj91T$shm#002ovPDHLkV1hSSuGatn

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/to_be_treated_2.png b/src/main/ui/static/images/main_menu/to_be_treated_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2f22480d3737a6824b5d5b481aab3b2bbcb3d8c
GIT binary patch
literal 2596
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
GLSTaOU=<<&

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/transaction_arrears.png b/src/main/ui/static/images/main_menu/transaction_arrears.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdbb84ad81c816315dabe7ce78a42c13dd73cac3
GIT binary patch
literal 3141
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/transaction_callback_message.png b/src/main/ui/static/images/main_menu/transaction_callback_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..5170a747762178d031e06bd03bef93a846ff7660
GIT binary patch
literal 2382
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
Avj6}9

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/transaction_flow.png b/src/main/ui/static/images/main_menu/transaction_flow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f23f891cb43f802c432143258a50fa8a0e559b9c
GIT binary patch
literal 3037
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/transaction_original_statistics.png b/src/main/ui/static/images/main_menu/transaction_original_statistics.png
new file mode 100644
index 0000000000000000000000000000000000000000..523b44d0939ff678f06e804eb44ca20c5225412b
GIT binary patch
literal 2177
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
D-@qSq

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/transaction_refund.png b/src/main/ui/static/images/main_menu/transaction_refund.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ddaa65e3fae36f3ef5780d2ae616fa352876908
GIT binary patch
literal 2324
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index cd7b14009..0301b2a69 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -7,7 +7,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
             controller: 'listMenuCtrl',
             views: {
                 "menu": {
-                    template: "/static/config/managers/templates/managers.html"
+                    templateUrl: 'main_menu.html'
                 }
             }
         });

From 419758b21fbb655653b1f3d56df8681ee195c674 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 10 Oct 2018 15:22:01 +0800
Subject: [PATCH 09/82] fix ui-view

---
 src/main/ui/main_menu.html                | 116 +---------------------
 src/main/ui/manage.html                   | 115 ++++++++++++++++++++-
 src/main/ui/static/boot/managerMainApp.js |   7 ++
 src/main/ui/static/menu/managerMenu.js    |   6 +-
 4 files changed, 123 insertions(+), 121 deletions(-)

diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
index 655f1c824..60e98f5ff 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/main_menu.html
@@ -26,113 +26,9 @@
         }
     }
 </style>
-<body class="skin-blue sidebar-mini">
-    <header class="main-header">
 
-        <nav style="margin-left: 0px" class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
 
-            <!-- Logo -->
-            <a href="#" class="logo logo-yedian shine" ng-if="!currentUser.org">
-                <!-- mini logo for sidebar mini 50x50 pixels -->
-                <span class="logo-mini"><img src="static/images/r_white_logo.svg"
-                                             style="max-height: 35px;margin-left: 15%;"></span>
-                <!-- logo for regular state and mobile devices -->
-                <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
-                                           style="max-height: 35px;">
-                    <!--<b>RoyalPay</b>-->
-            </span>
-            </a>
-            <a href="#" class="logo logo-yedian shine" ng-if="currentUser.org">
-                <!-- mini logo for sidebar mini 50x50 pixels -->
-                <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
-                                             style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
-                <!-- logo for regular state and mobile devices -->
-                <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
-                                           style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
-                        ng-bind="currentUser.org.name"></b></span>
-            </a>
-            <div class="navbar-header">
-                <a ui-sref="dashboard" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Dashboard</a>
-                <a ui-sref="listMenu({role:''})" ui-sref-opts="{reload:true}" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Main Menu</a>
-            </div>
-            <!-- Header Navbar: style can be found in header.less -->
-            <!--顶部导航栏-->
-            <div class="navbar-custom-menu">
-                <ul class="nav navbar-nav">
-                    <li class="user-menu" ng-if="currentUser.onoff">
-                        <a role="button" ng-click="customerService()">
-                            <i class="fa fa-wechat"></i> contact service
-                        </a>
-
-                    </li>
-                    <li class="user-menu">
-                        <a role="button" ng-click="managerBindWechat(true)">
-                            <i class="fa fa-wechat"></i> Bind WeChat
-                        </a>
-                    </li>
-
-                    <!-- User Account: style can be found in dropdown.less -->
-                    <li class="dropdown user user-menu" uib-dropdown>
-                        <a href class="dropdown-toggle" uib-dropdown-toggle>
-                            <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
-                                 class="user-image user-img-yedian"
-                                 alt="User Image">
-                            <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
-                        </a>
-                        <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
-                            <!-- User image -->
-                            <li class="user-header user-header-yedian">
-                                <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
-                                     alt="User Image">
-
-                                <p>
-                                    {{currentUser.display_name}}
-                                    <small>
-                                        <i class="fa fa-user-secret" title="Administrator"
-                                           ng-class="{'text-orange':!('1'|withRole),'text-gray':('1'|withRole)}"></i>
-                                        <i class="fa fa-eye" title="Compliance"
-                                           ng-class="{'text-orange':!('10'|withRole),'text-gray':('10'|withRole)}"></i>
-                                        <i class="fa fa-crosshairs" title="BD User"
-                                           ng-class="{'text-orange':!('100'|withRole),'text-gray':('100'|withRole)}"></i>
-                                        <i class="fa fa-balance-scale" title="Accountant"
-                                           ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
-                                        <i class="fa fa-tty" title="Service"
-                                           ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
-                                        <i class="fa fa-university" title="Account Manager"
-                                           ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
-                                        <i class="fa fa-line-chart" title="Director"
-                                           ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
-                                        <i class="fa fa-map-o" title="Site Manager"
-                                           ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
-                                        <i class="fa fa-code" title="Developer"
-                                           ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
-                                        <i class="fa fa-user" title="Risk Manager"
-                                           ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
-                                        <i class="fa fa-tripadvisor" title="GUEST"
-                                           ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
-                                        <i class="fa fa-user-plus" title="Org Manager"
-                                           ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
-                                    </small>
-                                </p>
-                            </li>
-                            <!-- Menu Footer-->
-                            <li class="user-footer">
-                                <div class="pull-left">
-                                    <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
-                                </div>
-                                <div class="pull-right">
-                                    <a href class="btn btn-default btn-flat" ng-click="logout()">Sign Out</a>
-                                </div>
-                            </li>
-                        </ul>
-                    </li>
-                    <!-- Control Sidebar Toggle Button -->
-                </ul>
-            </div>
-        </nav>
-    </header>
-
-    <div class="content-wrapper autoheight" style="margin-left: 0px" ui-view >
+    <div class="content-wrapper autoheight" style="margin-left: 0px" >
         <div class="content" style="background-color: #FFF">
             <div class="list-group">
                 <div class="row">
@@ -144,7 +40,7 @@
                 </div>
                 <div class="row">
                     <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <a ui-sref="sysconfig">
+                        <a ui-sref="sysconfig"  ui-sref-opts="{reload:true}">
                             <div class="description-block">
                                 <img src="/static/images/main_menu/to_be_treated_1.png"/>
                                 <div class="description-text">
@@ -772,11 +668,3 @@
     </div>
     <!-- /.content-wrapper -->
 
-    <footer class="main-footer" style="margin-left: 0px">
-        <div class="pull-right hidden-xs">
-            <b>Easy Business，Easy Pay</b>
-        </div>
-        <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
-        reserved.
-    </footer>
-</body>
diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 1ad134ae4..abec3c402 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -136,8 +136,112 @@ margin-bottom: 10%;"/>
         <p style="color: #666">To Be The Best QRCode Payment Service Provider!</p>
     </div>
 </div>
+<header ng-if="headerDisplay" class="main-header">
+
+    <nav style="margin-left: 0px" class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
+
+        <!-- Logo -->
+        <a href="#" class="logo logo-yedian shine" ng-if="!currentUser.org">
+            <!-- mini logo for sidebar mini 50x50 pixels -->
+            <span class="logo-mini"><img src="static/images/r_white_logo.svg"
+                                         style="max-height: 35px;margin-left: 15%;"></span>
+            <!-- logo for regular state and mobile devices -->
+            <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
+                                       style="max-height: 35px;">
+                <!--<b>RoyalPay</b>-->
+            </span>
+        </a>
+        <a href="#" class="logo logo-yedian shine" ng-if="currentUser.org">
+            <!-- mini logo for sidebar mini 50x50 pixels -->
+            <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
+                                         style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
+            <!-- logo for regular state and mobile devices -->
+            <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
+                                       style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
+                    ng-bind="currentUser.org.name"></b></span>
+        </a>
+        <div class="navbar-header">
+            <a ui-sref="dashboard" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Dashboard</a>
+            <a ui-sref="listMenu({role:''})" ui-sref-opts="{reload:true}" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Main Menu</a>
+        </div>
+        <!-- Header Navbar: style can be found in header.less -->
+        <!--顶部导航栏-->
+        <div class="navbar-custom-menu">
+            <ul class="nav navbar-nav">
+                <li class="user-menu" ng-if="currentUser.onoff">
+                    <a role="button" ng-click="customerService()">
+                        <i class="fa fa-wechat"></i> contact service
+                    </a>
+
+                </li>
+                <li class="user-menu">
+                    <a role="button" ng-click="managerBindWechat(true)">
+                        <i class="fa fa-wechat"></i> Bind WeChat
+                    </a>
+                </li>
+
+                <!-- User Account: style can be found in dropdown.less -->
+                <li class="dropdown user user-menu" uib-dropdown>
+                    <a href class="dropdown-toggle" uib-dropdown-toggle>
+                        <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
+                             class="user-image user-img-yedian"
+                             alt="User Image">
+                        <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
+                    </a>
+                    <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
+                        <!-- User image -->
+                        <li class="user-header user-header-yedian">
+                            <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
+                                 alt="User Image">
+
+                            <p>
+                                {{currentUser.display_name}}
+                                <small>
+                                    <i class="fa fa-user-secret" title="Administrator"
+                                       ng-class="{'text-orange':!('1'|withRole),'text-gray':('1'|withRole)}"></i>
+                                    <i class="fa fa-eye" title="Compliance"
+                                       ng-class="{'text-orange':!('10'|withRole),'text-gray':('10'|withRole)}"></i>
+                                    <i class="fa fa-crosshairs" title="BD User"
+                                       ng-class="{'text-orange':!('100'|withRole),'text-gray':('100'|withRole)}"></i>
+                                    <i class="fa fa-balance-scale" title="Accountant"
+                                       ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
+                                    <i class="fa fa-tty" title="Service"
+                                       ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
+                                    <i class="fa fa-university" title="Account Manager"
+                                       ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
+                                    <i class="fa fa-line-chart" title="Director"
+                                       ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
+                                    <i class="fa fa-map-o" title="Site Manager"
+                                       ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
+                                    <i class="fa fa-code" title="Developer"
+                                       ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
+                                    <i class="fa fa-user" title="Risk Manager"
+                                       ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
+                                    <i class="fa fa-tripadvisor" title="GUEST"
+                                       ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
+                                    <i class="fa fa-user-plus" title="Org Manager"
+                                       ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
+                                </small>
+                            </p>
+                        </li>
+                        <!-- Menu Footer-->
+                        <li class="user-footer">
+                            <div class="pull-left">
+                                <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
+                            </div>
+                            <div class="pull-right">
+                                <a href class="btn btn-default btn-flat" ng-click="logout()">Sign Out</a>
+                            </div>
+                        </li>
+                    </ul>
+                </li>
+                <!-- Control Sidebar Toggle Button -->
+            </ul>
+        </div>
+    </nav>
+</header>
 <div ng-if="currentUser!=null" ng-cloak
-     ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'" ui-view="menu">
+     ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'" ui-view>
 <div class="backgroud">
 
 <div class="total_logo">
@@ -150,7 +254,7 @@ margin-bottom: 10%;"/>
 
 <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;flex-wrap:wrap">
     <div class="box-items" ng-if="'10'|withRole">
-        <a ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
+        <a ng-click="headerShow()" ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
         <div class="boxs">
             <img src="/static/images/manage/menu_1.png">
         </div>
@@ -246,6 +350,13 @@ margin-bottom: 10%;"/>
     </footer>
     </div>
 </div>
+    <footer ng-if="copyright" class="main-footer" style="margin-left: 0px">
+        <div class="pull-right hidden-xs">
+            <b>Easy Business，Easy Pay</b>
+        </div>
+        <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
+        reserved.
+    </footer>
 </div>
 </body>
 </html>
diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js
index cd2609478..5c25c5a3f 100644
--- a/src/main/ui/static/boot/managerMainApp.js
+++ b/src/main/ui/static/boot/managerMainApp.js
@@ -17,6 +17,13 @@ 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) {
+            $scope.headerDisplay = false;
+            $scope.copyright = false;
+
+            $scope.headerShow  = function () {
+                $scope.headerDisplay = true;
+                $scope.copyright = true;
+            };
             $http.get('/sysconfig/base').then(function (resp) {
                 $rootScope.sysParams = resp.data;
             });
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index 0301b2a69..51d0c8f5d 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -5,11 +5,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
         $stateProvider.state('listMenu', {
             url: '/menu?role',
             controller: 'listMenuCtrl',
-            views: {
-                "menu": {
-                    templateUrl: 'main_menu.html'
-                }
-            }
+            templateUrl: 'main_menu.html'
         });
     }]);
     app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal', 'commonDialog','$stateParams', function ($scope, $http,$filter, $uibModal, commonDialog,$stateParams) {

From 53f60669a37d970b5620781181c848f4f065408a Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 10 Oct 2018 16:08:40 +0800
Subject: [PATCH 10/82] fix something

---
 src/main/ui/manage.html                   | 385 +++++++++++-----------
 src/main/ui/static/boot/managerMainApp.js |  10 +-
 2 files changed, 203 insertions(+), 192 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index abec3c402..97ba2811f 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -136,227 +136,232 @@ margin-bottom: 10%;"/>
         <p style="color: #666">To Be The Best QRCode Payment Service Provider!</p>
     </div>
 </div>
-<header ng-if="headerDisplay" class="main-header">
 
-    <nav style="margin-left: 0px" class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
 
-        <!-- Logo -->
-        <a href="#" class="logo logo-yedian shine" ng-if="!currentUser.org">
-            <!-- mini logo for sidebar mini 50x50 pixels -->
-            <span class="logo-mini"><img src="static/images/r_white_logo.svg"
-                                         style="max-height: 35px;margin-left: 15%;"></span>
-            <!-- logo for regular state and mobile devices -->
-            <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
-                                       style="max-height: 35px;">
-                <!--<b>RoyalPay</b>-->
-            </span>
-        </a>
-        <a href="#" class="logo logo-yedian shine" ng-if="currentUser.org">
-            <!-- mini logo for sidebar mini 50x50 pixels -->
-            <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
-                                         style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
-            <!-- logo for regular state and mobile devices -->
-            <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
-                                       style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
-                    ng-bind="currentUser.org.name"></b></span>
-        </a>
-        <div class="navbar-header">
-            <a ui-sref="dashboard" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Dashboard</a>
-            <a ui-sref="listMenu({role:''})" ui-sref-opts="{reload:true}" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Main Menu</a>
-        </div>
-        <!-- Header Navbar: style can be found in header.less -->
-        <!--顶部导航栏-->
-        <div class="navbar-custom-menu">
-            <ul class="nav navbar-nav">
-                <li class="user-menu" ng-if="currentUser.onoff">
-                    <a role="button" ng-click="customerService()">
-                        <i class="fa fa-wechat"></i> contact service
-                    </a>
+    <div ng-if="currentUser!=null" ng-cloak
+         ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'">
+        <header ng-if="headerDisplay" class="main-header">
 
-                </li>
-                <li class="user-menu">
-                    <a role="button" ng-click="managerBindWechat(true)">
-                        <i class="fa fa-wechat"></i> Bind WeChat
-                    </a>
-                </li>
+            <nav style="margin-left: 0px" class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
 
-                <!-- User Account: style can be found in dropdown.less -->
-                <li class="dropdown user user-menu" uib-dropdown>
-                    <a href class="dropdown-toggle" uib-dropdown-toggle>
-                        <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
-                             class="user-image user-img-yedian"
-                             alt="User Image">
-                        <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
-                    </a>
-                    <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
-                        <!-- User image -->
-                        <li class="user-header user-header-yedian">
-                            <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
-                                 alt="User Image">
+                <!-- Logo -->
+                <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="!currentUser.org">
+                    <!-- mini logo for sidebar mini 50x50 pixels -->
+                    <span class="logo-mini"><img src="static/images/r_white_logo.svg"
+                                                 style="max-height: 35px;margin-left: 15%;"></span>
+                    <!-- logo for regular state and mobile devices -->
+                    <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
+                                               style="max-height: 35px;">
+                        <!--<b>RoyalPay</b>-->
+            </span>
+                </a>
+                <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="currentUser.org">
+                    <!-- mini logo for sidebar mini 50x50 pixels -->
+                    <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
+                                                 style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
+                    <!-- logo for regular state and mobile devices -->
+                    <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
+                                               style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
+                            ng-bind="currentUser.org.name"></b></span>
+                </a>
+                <div class="navbar-header">
+                    <a ui-sref="dashboard" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Dashboard</a>
+                    <a ui-sref="listMenu({role:''})" ui-sref-opts="{reload:true}" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Main Menu</a>
+                </div>
+                <!-- Header Navbar: style can be found in header.less -->
+                <!--顶部导航栏-->
+                <div class="navbar-custom-menu">
+                    <ul class="nav navbar-nav">
+                        <li class="user-menu" ng-if="currentUser.onoff">
+                            <a role="button" ng-click="customerService()">
+                                <i class="fa fa-wechat"></i> contact service
+                            </a>
 
-                            <p>
-                                {{currentUser.display_name}}
-                                <small>
-                                    <i class="fa fa-user-secret" title="Administrator"
-                                       ng-class="{'text-orange':!('1'|withRole),'text-gray':('1'|withRole)}"></i>
-                                    <i class="fa fa-eye" title="Compliance"
-                                       ng-class="{'text-orange':!('10'|withRole),'text-gray':('10'|withRole)}"></i>
-                                    <i class="fa fa-crosshairs" title="BD User"
-                                       ng-class="{'text-orange':!('100'|withRole),'text-gray':('100'|withRole)}"></i>
-                                    <i class="fa fa-balance-scale" title="Accountant"
-                                       ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
-                                    <i class="fa fa-tty" title="Service"
-                                       ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
-                                    <i class="fa fa-university" title="Account Manager"
-                                       ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
-                                    <i class="fa fa-line-chart" title="Director"
-                                       ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
-                                    <i class="fa fa-map-o" title="Site Manager"
-                                       ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
-                                    <i class="fa fa-code" title="Developer"
-                                       ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
-                                    <i class="fa fa-user" title="Risk Manager"
-                                       ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
-                                    <i class="fa fa-tripadvisor" title="GUEST"
-                                       ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
-                                    <i class="fa fa-user-plus" title="Org Manager"
-                                       ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
-                                </small>
-                            </p>
                         </li>
-                        <!-- Menu Footer-->
-                        <li class="user-footer">
-                            <div class="pull-left">
-                                <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
-                            </div>
-                            <div class="pull-right">
-                                <a href class="btn btn-default btn-flat" ng-click="logout()">Sign Out</a>
-                            </div>
+                        <li class="user-menu">
+                            <a role="button" ng-click="managerBindWechat(true)">
+                                <i class="fa fa-wechat"></i> Bind WeChat
+                            </a>
                         </li>
+
+                        <!-- User Account: style can be found in dropdown.less -->
+                        <li class="dropdown user user-menu" uib-dropdown>
+                            <a href class="dropdown-toggle" uib-dropdown-toggle>
+                                <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
+                                     class="user-image user-img-yedian"
+                                     alt="User Image">
+                                <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
+                            </a>
+                            <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
+                                <!-- User image -->
+                                <li class="user-header user-header-yedian">
+                                    <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
+                                         alt="User Image">
+
+                                    <p>
+                                        {{currentUser.display_name}}
+                                        <small>
+                                            <i class="fa fa-user-secret" title="Administrator"
+                                               ng-class="{'text-orange':!('1'|withRole),'text-gray':('1'|withRole)}"></i>
+                                            <i class="fa fa-eye" title="Compliance"
+                                               ng-class="{'text-orange':!('10'|withRole),'text-gray':('10'|withRole)}"></i>
+                                            <i class="fa fa-crosshairs" title="BD User"
+                                               ng-class="{'text-orange':!('100'|withRole),'text-gray':('100'|withRole)}"></i>
+                                            <i class="fa fa-balance-scale" title="Accountant"
+                                               ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
+                                            <i class="fa fa-tty" title="Service"
+                                               ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
+                                            <i class="fa fa-university" title="Account Manager"
+                                               ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
+                                            <i class="fa fa-line-chart" title="Director"
+                                               ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
+                                            <i class="fa fa-map-o" title="Site Manager"
+                                               ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
+                                            <i class="fa fa-code" title="Developer"
+                                               ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
+                                            <i class="fa fa-user" title="Risk Manager"
+                                               ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
+                                            <i class="fa fa-tripadvisor" title="GUEST"
+                                               ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
+                                            <i class="fa fa-user-plus" title="Org Manager"
+                                               ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
+                                        </small>
+                                    </p>
+                                </li>
+                                <!-- Menu Footer-->
+                                <li class="user-footer">
+                                    <div class="pull-left">
+                                        <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
+                                    </div>
+                                    <div class="pull-right">
+                                        <a href class="btn btn-default btn-flat" ng-click="logout()">Sign Out</a>
+                                    </div>
+                                </li>
+                            </ul>
+                        </li>
+                        <!-- Control Sidebar Toggle Button -->
                     </ul>
-                </li>
-                <!-- Control Sidebar Toggle Button -->
-            </ul>
-        </div>
-    </nav>
-</header>
-<div ng-if="currentUser!=null" ng-cloak
-     ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'" ui-view>
-<div class="backgroud">
+                </div>
+            </nav>
+        </header>
+            <div style="min-height: 890px" ui-view>
+            <div class="backgroud">
+                <div class="total_logo">
+            <a><img src="/static/images/manage_total_logo.png">  </a>
+            <div class="easypay">
+                <b>Easy Business，Easy Payment!</b>
+            </div>
 
-<div class="total_logo">
-    <a><img src="/static/images/manage_total_logo.png">  </a>
-    <div class="easypay">
-        <b>Easy Business，Easy Payment!</b>
-    </div>
+        </div>
 
-</div>
+                <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;flex-wrap:wrap">
+        <div class="box-items" ng-if="'10'|withRole">
+            <a ng-click="headerShow()" ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
+            <div class="boxs">
+                <img src="/static/images/manage/menu_1.png">
+            </div>
+            <p class="box-font">Compliance</p>
+            </a>
+        </div>
 
-<div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;flex-wrap:wrap">
-    <div class="box-items" ng-if="'10'|withRole">
-        <a ng-click="headerShow()" ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
-        <div class="boxs">
-            <img src="/static/images/manage/menu_1.png">
+        <div class="box-items" ng-if="'10000000000'|withRole">
+            <a ng-click="headerShow()" ui-sref="listMenu({role:'RiskManager'})" ui-sref-opts="{reload:true}">
+            <div class="boxs">
+                 <img src="/static/images/manage/menu_2.png">
+            </div>
+            <p class="box-font">Risk Manager</p>
+            </a>
         </div>
-        <p class="box-font">Compliance</p>
-        </a>
-    </div>
 
-    <div class="box-items" ng-if="'10000000000'|withRole">
-        <a ui-sref="listMenu({role:'RiskManager'})" ui-sref-opts="{reload:true}">
-        <div class="boxs">
-             <img src="/static/images/manage/menu_2.png">
+        <div class="box-items" ng-if="'100000'|withRole">
+            <a ng-click="headerShow()" ui-sref="listMenu({role:'AccountManager'})" ui-sref-opts="{reload:true}">
+            <div class="boxs">
+                  <img src="/static/images/manage/menu_3.png">
+            </div>
+            <p class="box-font">Account Manager</p>
+            </a>
         </div>
-        <p class="box-font">Risk Manager</p>
-        </a>
-    </div>
 
-    <div class="box-items" ng-if="'100000'|withRole">
-        <a ui-sref="listMenu({role:'AccountManager'})" ui-sref-opts="{reload:true}">
-        <div class="boxs">
-              <img src="/static/images/manage/menu_3.png">
+        <div class="box-items" ng-if="'1000'|withRole">
+            <a ng-click="headerShow()" ui-sref="listMenu({role:'Accountant'})" ui-sref-opts="{reload:true}">
+            <div class="boxs">
+               <img src="/static/images/manage/menu_4.png">
+            </div>
+            <p class="box-font">Accountant</p>
+            </a>
         </div>
-        <p class="box-font">Account Manager</p>
-        </a>
-    </div>
 
-    <div class="box-items" ng-if="'1000'|withRole">
-        <a ui-sref="listMenu({role:'Accountant'})" ui-sref-opts="{reload:true}">
-        <div class="boxs">
-           <img src="/static/images/manage/menu_4.png">
+        <div class="box-items" ng-if="'100'|withRole">
+            <a ng-click="headerShow()" ui-sref="listMenu({role:'BDUser'})" ui-sref-opts="{reload:true}">
+            <div class="boxs">
+               <img src="/static/images/manage/menu_5.png">
+            </div>
+            <p class="box-font">BD User</p>
+            </a>
         </div>
-        <p class="box-font">Accountant</p>
-        </a>
-    </div>
 
-    <div class="box-items" ng-if="'100'|withRole">
-        <a ui-sref="listMenu({role:'BDUser'})" ui-sref-opts="{reload:true}">
-        <div class="boxs">
-           <img src="/static/images/manage/menu_5.png">
+        <div class="box-items" ng-if="'10000'|withRole">
+            <a ng-click="headerShow()" ui-sref="listMenu({role:'Service'})" ui-sref-opts="{reload:true}">
+            <div class="boxs">
+                <img src="/static/images/manage/menu_6.png">
+            </div>
+            <p class="box-font">Service</p>
+            </a>
         </div>
-        <p class="box-font">BD User</p>
-        </a>
-    </div>
 
-    <div class="box-items" ng-if="'10000'|withRole">
-        <a ui-sref="listMenu({role:'Service'})" ui-sref-opts="{reload:true}">
-        <div class="boxs">
-            <img src="/static/images/manage/menu_6.png">
+        <div class="box-items" ng-if="'1'|withRole">
+            <a ng-click="headerShow()" ui-sref="listMenu({role:'Administrator'})" ui-sref-opts="{reload:true}">
+            <div class="boxs">
+                <img src="/static/images/manage/menu_7.png">
+            </div>
+            <p class="box-font">Administrator</p>
+            </a>
         </div>
-        <p class="box-font">Service</p>
-        </a>
-    </div>
 
-    <div class="box-items" ng-if="'1'|withRole">
-        <a ui-sref="listMenu({role:'Administrator'})" ui-sref-opts="{reload:true}">
-        <div class="boxs">
-            <img src="/static/images/manage/menu_7.png">
+        <div class="box-items" ng-if="'10000000'|withRole">
+            <a ng-click="headerShow()" ui-sref="listMenu({role:'SiteManager'})" ui-sref-opts="{reload:true}">
+            <div class="boxs">
+                <img src="/static/images/manage/menu_8.png">
+            </div>
+            <p class="box-font">Site Manager</p>
+            </a>
         </div>
-        <p class="box-font">Administrator</p>
-        </a>
-    </div>
 
-    <div class="box-items" ng-if="'10000000'|withRole">
-        <a ui-sref="listMenu({role:'SiteManager'})" ui-sref-opts="{reload:true}">
-        <div class="boxs">
-            <img src="/static/images/manage/menu_8.png">
+        <div class="box-items" ng-if="'100000000'|withRole">
+            <a ng-click="headerShow()" ui-sref="listMenu({role:'Developer'})" ui-sref-opts="{reload:true}">
+            <div class="boxs">
+                <img src="/static/images/manage/menu_9.png">
+            </div>
+            <p class="box-font">Developer</p>
+            </a>
         </div>
-        <p class="box-font">Site Manager</p>
-        </a>
-    </div>
 
-    <div class="box-items" ng-if="'100000000'|withRole">
-        <a ui-sref="listMenu({role:'Developer'})" ui-sref-opts="{reload:true}">
-        <div class="boxs">
-            <img src="/static/images/manage/menu_9.png">
+        <div class="box-items" ng-if="'1000000'|withRole">
+            <a ng-click="headerShow()" ui-sref="listMenu({role:'Director'})" ui-sref-opts="{reload:true}">
+            <div class="boxs">
+                <img src="/static/images/manage/menu_10.png">
+            </div>
+            <p class="box-font">Director</p>
+            </a>
         </div>
-        <p class="box-font">Developer</p>
-        </a>
     </div>
 
-    <div class="box-items" ng-if="'1000000'|withRole">
-        <a ui-sref="listMenu({role:'Director'})" ui-sref-opts="{reload:true}">
-        <div class="boxs">
-            <img src="/static/images/manage/menu_10.png">
+                <div style="text-align: center">
+        <footer>
+            <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
+            reserved.
+        </footer>
         </div>
-        <p class="box-font">Director</p>
-        </a>
+            </div>
+            </div>
+        <footer ng-if="copyright" class="main-footer" style="margin-left: 0px">
+            <div class="pull-right hidden-xs">
+                <b>Easy Business，Easy Pay</b>
+            </div>
+            <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
+            reserved.
+        </footer>
     </div>
-</div>
-    <div style="text-align: center">
-    <footer>
-        <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
-        reserved.
-    </footer>
-    </div>
-</div>
-    <footer ng-if="copyright" class="main-footer" style="margin-left: 0px">
-        <div class="pull-right hidden-xs">
-            <b>Easy Business，Easy Pay</b>
-        </div>
-        <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
-        reserved.
-    </footer>
-</div>
+
 </body>
 </html>
diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js
index 5c25c5a3f..ee3b4db64 100644
--- a/src/main/ui/static/boot/managerMainApp.js
+++ b/src/main/ui/static/boot/managerMainApp.js
@@ -17,8 +17,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) {
-            $scope.headerDisplay = false;
-            $scope.copyright = false;
+            if (window.location.hash == "" || window.location.hash == "#/") {
+                $scope.headerDisplay = false;
+                $scope.copyright = false;
+            }else{
+                $scope.headerDisplay = true;
+                $scope.copyright = true;
+            }
+
 
             $scope.headerShow  = function () {
                 $scope.headerDisplay = true;

From 1fdbce200c524b8c9bfc0fe5002f7d4f5976e9cd Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Wed, 10 Oct 2018 16:21:12 +0800
Subject: [PATCH 11/82] fix

---
 src/main/ui/main_menu.html | 954 ++++++++++++++++++-------------------
 1 file changed, 462 insertions(+), 492 deletions(-)

diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
index 60e98f5ff..a65da3b52 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/main_menu.html
@@ -1,670 +1,640 @@
-<style type="text/css">
-    .description-text {
-        margin-top: 5px;
-        /*width: 86px;*/
-    }
-    .list-group label {
-        border-bottom: 1px solid #333333;
-        font-size: 20px;
-        color: #333333;
-    }
-    @media (min-width: 768px) {
-        .navbar-header {
-            line-height: 50px;
-            width: 158px;
-            position: absolute;
-            left: 0;
-            right: 0;
-            margin: auto;
-        }
-    }
-    @media (max-width: 768px) {
-        .navbar-header {
-            line-height: 50px;
-            width: 158px;
-            margin: auto;
-        }
-    }
-</style>
-
-
-    <div class="content-wrapper autoheight" style="margin-left: 0px" >
-        <div class="content" style="background-color: #FFF">
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>待处理事项</label>
-                        </div>
+<div class="content-wrapper autoheight" style="margin-left: 0px">
+    <div class="content" style="background-color: #FFF">
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>待处理事项</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <a ui-sref="sysconfig"  ui-sref-opts="{reload:true}">
-                            <div class="description-block">
-                                <img src="/static/images/main_menu/to_be_treated_1.png"/>
-                                <div class="description-text">
-                                    <span>待合规</span>
-                                </div>
-                            </div>
-                        </a>
-                    </div>
-                    <div class="col-sm-2 col-xs-6">
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <a ui-sref="sysconfig" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/to_be_treated_2.png"/>
+                            <img src="/static/images/main_menu/to_be_treated_1.png"/>
                             <div class="description-text">
-                                <span>商户自助申请</span>
+                                <span>待合规</span>
                             </div>
                         </div>
+                    </a>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/to_be_treated_2.png"/>
+                        <div class="description-text">
+                            <span>商户自助申请</span>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>商户管理</label>
-                        </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>商户管理</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/merchant_info.png"/>
-                            <div class="description-text">
-                                <span class="description-text">商户信息</span>
-                            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/merchant_info.png"/>
+                        <div class="description-text">
+                            <span class="description-text">商户信息</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/merchant_apply.png"/>
-                            <div class="description-text">
-                                <span class="description-text">商户申请</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/merchant_apply.png"/>
+                        <div class="description-text">
+                            <span class="description-text">商户申请</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/merchant_log.png"/>
-                            <div class="description-text">
-                                <span class="description-text">商户信息修改日志</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/merchant_log.png"/>
+                        <div class="description-text">
+                            <span class="description-text">商户信息修改日志</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/merchant_statistics.png"/>
-                            <div class="description-text">
-                                <span class="description-text">商户统计(原统计)</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/merchant_statistics.png"/>
+                        <div class="description-text">
+                            <span class="description-text">商户统计(原统计)</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/merchant_activity_1.png"/>
-                            <div class="description-text">
-                                <span class="description-text">商户活跃度(原统计)</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/merchant_activity_1.png"/>
+                        <div class="description-text">
+                            <span class="description-text">商户活跃度(原统计)</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/merchant_turnover.png"/>
-                            <div class="description-text">
-                                <span class="description-text">商户交易额(原统计)</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/merchant_turnover.png"/>
+                        <div class="description-text">
+                            <span class="description-text">商户交易额(原统计)</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>交易管理</label>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>交易管理</label>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/transaction_flow.png"/>
+                        <div class="description-text">
+                            <span class="description-text">交易流水</span>
                         </div>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_flow.png"/>
-                            <div class="description-text">
-                                <span class="description-text">交易流水</span>
-                            </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/transaction_refund.png"/>
+                        <div class="description-text">
+                            <span class="description-text">退款审核</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_refund.png"/>
-                            <div class="description-text">
-                                <span class="description-text">退款审核</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/transaction_arrears.png"/>
+                        <div class="description-text">
+                            <span class="description-text">欠款</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_arrears.png"/>
-                            <div class="description-text">
-                                <span class="description-text">欠款</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                        <div class="description-text">
+                            <span class="description-text">原统计</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <a role="button">
+                            <img src="/static/images/main_menu/transaction_callback_message.png"/>
                             <div class="description-text">
-                                <span class="description-text">原统计</span>
+                                <span class="description-text">支付回调消息</span>
                             </div>
-                        </div>
+                        </a>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <a role="button">
-                                <img src="/static/images/main_menu/transaction_callback_message.png"/>
-                                <div class="description-text">
-                                    <span class="description-text">支付回调消息</span>
-                                </div>
-                            </a>
-                        </div>
+                </div>
+            </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>风控管理</label>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>风控管理</label>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/risk_monitor.png"/>
+                        <div class="description-text">
+                            <span class="description-text">交易成功率监控</span>
                         </div>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/risk_monitor.png"/>
-                            <div class="description-text">
-                                <span class="description-text">交易成功率监控</span>
-                            </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/risk_early_warning.png"/>
+                        <div class="description-text">
+                            <span class="description-text">风控点预警统计</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/risk_early_warning.png"/>
-                            <div class="description-text">
-                                <span class="description-text">风控点预警统计</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/risk_configure.png"/>
+                        <div class="description-text">
+                            <span class="description-text">风控点配置</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/risk_configure.png"/>
-                            <div class="description-text">
-                                <span class="description-text">风控点配置</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/risk_log.png"/>
+                        <div class="description-text">
+                            <span class="description-text">风控记录</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/risk_log.png"/>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <a role="button">
+                            <img src="/static/images/main_menu/risk_blacklist.png"/>
                             <div class="description-text">
-                                <span class="description-text">风控记录</span>
+                                <span class="description-text">黑名单</span>
                             </div>
-                        </div>
-                    </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <a role="button">
-                                <img src="/static/images/main_menu/risk_blacklist.png"/>
-                                <div class="description-text">
-                                    <span class="description-text">黑名单</span>
-                                </div>
-                            </a>
-                        </div>
+                        </a>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <a role="button">
-                                <img src="/static/images/main_menu/risk_consumption_ranking.png"/>
-                                <div class="description-text">
-                                    <span class="description-text">消费排名</span>
-                                </div>
-                            </a>
-                        </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <a role="button">
+                            <img src="/static/images/main_menu/risk_consumption_ranking.png"/>
+                            <div class="description-text">
+                                <span class="description-text">消费排名</span>
+                            </div>
+                        </a>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>合规管理</label>
-                        </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>合规管理</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/compliance_merchant.png"/>
-                            <div class="description-text">
-                                <span class="description-text">商户合规</span>
-                            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/compliance_merchant.png"/>
+                        <div class="description-text">
+                            <span class="description-text">商户合规</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/compliance_contract.png"/>
-                            <div class="description-text">
-                                <span class="description-text">合同管理</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/compliance_contract.png"/>
+                        <div class="description-text">
+                            <span class="description-text">合同管理</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>合伙人管理</label>
-                        </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>合伙人管理</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/partner_application.png"/>
-                            <div class="description-text">
-                                <span class="description-text">合伙人申请</span>
-                            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/partner_application.png"/>
+                        <div class="description-text">
+                            <span class="description-text">合伙人申请</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/partner_management.png"/>
-                            <div class="description-text">
-                                <span class="description-text">合伙人管理</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/partner_management.png"/>
+                        <div class="description-text">
+                            <span class="description-text">合伙人管理</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/partner_trading_volume.png"/>
-                            <div class="description-text">
-                                <span class="description-text">合伙人交易量</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/partner_trading_volume.png"/>
+                        <div class="description-text">
+                            <span class="description-text">合伙人交易量</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/partner_commission.png"/>
-                            <div class="description-text">
-                                <span class="description-text">合伙人提成</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/partner_commission.png"/>
+                        <div class="description-text">
+                            <span class="description-text">合伙人提成</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>BD绩效管理</label>
-                        </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>BD绩效管理</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/bd_sales_volume.png"/>
-                            <div class="description-text">
-                                <span class="description-text">BD销售量</span>
-                            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/bd_sales_volume.png"/>
+                        <div class="description-text">
+                            <span class="description-text">BD销售量</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/bd_commission.png"/>
-                            <div class="description-text">
-                                <span class="description-text">BD提成</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/bd_commission.png"/>
+                        <div class="description-text">
+                            <span class="description-text">BD提成</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/bd_performance_setting.png"/>
-                            <div class="description-text">
-                                <span class="description-text">BD绩效设置</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/bd_performance_setting.png"/>
+                        <div class="description-text">
+                            <span class="description-text">BD绩效设置</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/bd_level_setting.png"/>
-                            <div class="description-text">
-                                <span class="description-text">BD级别设置</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/bd_level_setting.png"/>
+                        <div class="description-text">
+                            <span class="description-text">BD级别设置</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
-                            <div class="description-text">
-                                <span class="description-text">商户活跃度</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                        <div class="description-text">
+                            <span class="description-text">商户活跃度</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>营销活动管理</label>
-                        </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>营销活动管理</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block ">
-                            <img src="/static/images/main_menu/activity_management.png"/>
-                            <div class="description-text">
-                                <span class="description-text">活动管理</span>
-                            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block ">
+                        <img src="/static/images/main_menu/activity_management.png"/>
+                        <div class="description-text">
+                            <span class="description-text">活动管理</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/activity_encouraging_gold.png"/>
-                            <div class="description-text">
-                                <span class="description-text">鼓励金</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/activity_encouraging_gold.png"/>
+                        <div class="description-text">
+                            <span class="description-text">鼓励金</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/activity_marketing_account.png"/>
-                            <div class="description-text">
-                                <span class="description-text">营销账户</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/activity_marketing_account.png"/>
+                        <div class="description-text">
+                            <span class="description-text">营销账户</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/activity_half_of_the_rate.png"/>
-                            <div class="description-text">
-                                <span class="description-text">周末费率减半活动</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/activity_half_of_the_rate.png"/>
+                        <div class="description-text">
+                            <span class="description-text">周末费率减半活动</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/activity_contract_signing.png"/>
-                            <div class="description-text">
-                                <span class="description-text">合同签约情况</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/activity_contract_signing.png"/>
+                        <div class="description-text">
+                            <span class="description-text">合同签约情况</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/activity_half_day_public_service.png"/>
-                            <div class="description-text">
-                                <span class="description-text">半边天公益活动</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/activity_half_day_public_service.png"/>
+                        <div class="description-text">
+                            <span class="description-text">半边天公益活动</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/activity_kangaroo.png"/>
-                            <div class="description-text">
-                                <span class="description-text">袋鼠星球</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/activity_kangaroo.png"/>
+                        <div class="description-text">
+                            <span class="description-text">袋鼠星球</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>内容管理</label>
-                        </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>内容管理</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/content_group_hair.png"/>
-                            <div class="description-text">
-                                <span class="description-text">通知群发</span>
-                            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/content_group_hair.png"/>
+                        <div class="description-text">
+                            <span class="description-text">通知群发</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/content_website_management.png"/>
-                            <div class="description-text">
-                                <span class="description-text">原网站管理下内容</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/content_website_management.png"/>
+                        <div class="description-text">
+                            <span class="description-text">原网站管理下内容</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>财务管理</label>
-                        </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>财务管理</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/finance_austrac_report.png"/>
-                            <div class="description-text">
-                                <span class="description-text">Austrac Report</span>
-                            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/finance_austrac_report.png"/>
+                        <div class="description-text">
+                            <span class="description-text">Austrac Report</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/finance_merchant_invoice.png"/>
-                            <div class="description-text">
-                                <span class="description-text">商户Invoice</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/finance_merchant_invoice.png"/>
+                        <div class="description-text">
+                            <span class="description-text">商户Invoice</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/finance_statistics.png"/>
-                            <div class="description-text">
-                                <span class="description-text">平台收支统计</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/finance_statistics.png"/>
+                        <div class="description-text">
+                            <span class="description-text">平台收支统计</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/finance_record_of_money.png"/>
-                            <div class="description-text">
-                                <span class="description-text">腾讯打款记录</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/finance_record_of_money.png"/>
+                        <div class="description-text">
+                            <span class="description-text">腾讯打款记录</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/finance_bd_extract.png"/>
-                            <div class="description-text">
-                                <span class="description-text">BD提成</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/finance_bd_extract.png"/>
+                        <div class="description-text">
+                            <span class="description-text">BD提成</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/finance_partner_contribution.png"/>
-                            <div class="description-text">
-                                <span class="description-text">合伙人提成</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/finance_partner_contribution.png"/>
+                        <div class="description-text">
+                            <span class="description-text">合伙人提成</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>清算管理</label>
-                        </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>清算管理</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/settle_transaction_reconciliation.png"/>
-                            <div class="description-text">
-                                <span class="description-text">交易对账</span>
-                            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/settle_transaction_reconciliation.png"/>
+                        <div class="description-text">
+                            <span class="description-text">交易对账</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/settle_execution.png"/>
-                            <div class="description-text">
-                                <span class="description-text">清算执行</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/settle_execution.png"/>
+                        <div class="description-text">
+                            <span class="description-text">清算执行</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/settle_day.png"/>
-                            <div class="description-text">
-                                <span class="description-text">清算日管理</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/settle_day.png"/>
+                        <div class="description-text">
+                            <span class="description-text">清算日管理</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/settle_statistics.png"/>
-                            <div class="description-text">
-                                <span class="description-text">清算统计</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/settle_statistics.png"/>
+                        <div class="description-text">
+                            <span class="description-text">清算统计</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/settle_prediction.png"/>
-                            <div class="description-text">
-                                <span class="description-text">清算预估</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/settle_prediction.png"/>
+                        <div class="description-text">
+                            <span class="description-text">清算预估</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/settle_report.png"/>
-                            <div class="description-text">
-                                <span class="description-text">清算月报</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/settle_report.png"/>
+                        <div class="description-text">
+                            <span class="description-text">清算月报</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/settle_verification.png"/>
-                            <div class="description-text">
-                                <span class="description-text">清算验证</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/settle_verification.png"/>
+                        <div class="description-text">
+                            <span class="description-text">清算验证</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>组织架构</label>
-                        </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>组织架构</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/org_management.png"/>
-                            <div class="description-text">
-                                <span class="description-text">组织管理</span>
-                            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/org_management.png"/>
+                        <div class="description-text">
+                            <span class="description-text">组织管理</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/org_account_management.png"/>
-                            <div class="description-text">
-                                <span class="description-text">账号管理</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/org_account_management.png"/>
+                        <div class="description-text">
+                            <span class="description-text">账号管理</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/org_role_rights_management.png"/>
-                            <div class="description-text">
-                                <span class="description-text">角色权限管理</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/org_role_rights_management.png"/>
+                        <div class="description-text">
+                            <span class="description-text">角色权限管理</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>配置管理</label>
-                        </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>配置管理</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/configure_merchant_number.png"/>
-                            <div class="description-text">
-                                <span class="description-text">商户号</span>
-                            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/configure_merchant_number.png"/>
+                        <div class="description-text">
+                            <span class="description-text">商户号</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/configure_device_management.png"/>
-                            <div class="description-text">
-                                <span class="description-text">设备管理</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/configure_device_management.png"/>
+                        <div class="description-text">
+                            <span class="description-text">设备管理</span>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/configure_parameter.png"/>
-                            <div class="description-text">
-                                <span class="description-text">相关参数(原系统参数设定)</span>
-                            </div>
+                </div>
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/configure_parameter.png"/>
+                        <div class="description-text">
+                            <span class="description-text">相关参数(原系统参数设定)</span>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="list-group">
-                <div class="row">
-                    <div class="col-sm-2 col-lg-2 col-xs-6">
-                        <div class="description-block">
-                            <label>开发工具</label>
-                        </div>
+        </div>
+        <div class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>开发工具</label>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-2 col-xs-6">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/logon_log.png"/>
-                            <div class="description-text">
-                                <span class="description-text">登录日志</span>
-                            </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-2 col-xs-6">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/logon_log.png"/>
+                        <div class="description-text">
+                            <span class="description-text">登录日志</span>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-    <!-- /.content-wrapper -->
+</div>
+<!-- /.content-wrapper -->
 

From 3ff563307f8f4e4b739c8a47f20cfffead323252 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 10 Oct 2018 17:57:15 +0800
Subject: [PATCH 12/82] add ui-route && permission

---
 src/main/ui/main_menu.html | 553 +++++++++++++++++++++++++------------
 1 file changed, 377 insertions(+), 176 deletions(-)

diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
index a65da3b52..faf03c5b1 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/main_menu.html
@@ -1,3 +1,9 @@
+<style>
+    a{
+        text-decoration:none;
+        color:black;
+    }
+</style>
 <div class="content-wrapper autoheight" style="margin-left: 0px">
     <div class="content" style="background-color: #FFF">
         <div class="list-group">
@@ -9,7 +15,7 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
+                <!--<div class="col-sm-2 col-lg-2 col-xs-6">
                     <a ui-sref="sysconfig" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/to_be_treated_1.png"/>
@@ -18,14 +24,16 @@
                             </div>
                         </div>
                     </a>
-                </div>
-                <div class="col-sm-2 col-xs-6">
+                </div>-->
+                <div ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/to_be_treated_2.png"/>
                         <div class="description-text">
                             <span>商户自助申请</span>
                         </div>
                     </div>
+                    </a>
                 </div>
             </div>
         </div>
@@ -38,53 +46,65 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'partners'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="partners" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_info.png"/>
                         <div class="description-text">
                             <span class="description-text">商户信息</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'11111'|withRole" class="col-sm-2 col-xs-6">
+                    <a ui-sref="partners.new" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_apply.png"/>
                         <div class="description-text">
                             <span class="description-text">商户申请</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="logview.config_operation" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_log.png"/>
                         <div class="description-text">
                             <span class="description-text">商户信息修改日志</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'partner_analysis'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_transaction.partners_analysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_statistics.png"/>
                         <div class="description-text">
                             <span class="description-text">商户统计(原统计)</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'clientrate'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_activity_1.png"/>
                         <div class="description-text">
                             <span class="description-text">商户活跃度(原统计)</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('merchantAmount'|withModule) &&('1'|withRole)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_transaction.merchantAmountAnalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_turnover.png"/>
                         <div class="description-text">
                             <span class="description-text">商户交易额(原统计)</span>
                         </div>
                     </div>
+                    </a>
                 </div>
             </div>
         </div>
@@ -97,47 +117,58 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'tradelog'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="trade" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_flow.png"/>
                         <div class="description-text">
                             <span class="description-text">交易流水</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('10000000000'|withRole)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_refund.png"/>
                         <div class="description-text">
                             <span class="description-text">退款审核</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_arrears.png"/>
                         <div class="description-text">
                             <span class="description-text">欠款</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('transAnalysis'|withModule)||('dashboard'|withModule)||
+                ('customer_analysis'|withModule)||
+                ('customerRankingAnalysisApp'|withModule)||
+                ('partner_analysis'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_original_statistics.png"/>
                         <div class="description-text">
                             <span class="description-text">原统计</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
                     <div class="description-block">
-                        <a role="button">
                             <img src="/static/images/main_menu/transaction_callback_message.png"/>
                             <div class="description-text">
                                 <span class="description-text">支付回调消息</span>
                             </div>
-                        </a>
                     </div>
+                    </a>
                 </div>
             </div>
         </div>
@@ -150,61 +181,69 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('monitor'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/risk_monitor.png"/>
                         <div class="description-text">
                             <span class="description-text">交易成功率监控</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_monitoring.cheat" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/risk_early_warning.png"/>
                         <div class="description-text">
                             <span class="description-text">风控点预警统计</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_monitoring.cheat_monitor" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/risk_configure.png"/>
                         <div class="description-text">
                             <span class="description-text">风控点配置</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('RiskManagement'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_monitoring.risk_manager" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/risk_log.png"/>
                         <div class="description-text">
                             <span class="description-text">风控记录</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('RiskManagement'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_monitoring.risk_manager" ui-sref-opts="{reload:true}">
                     <div class="description-block">
-                        <a role="button">
                             <img src="/static/images/main_menu/risk_blacklist.png"/>
                             <div class="description-text">
                                 <span class="description-text">黑名单</span>
                             </div>
-                        </a>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'customerRankingAnalysisApp'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_transaction.customerRankingAnalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
-                        <a role="button">
                             <img src="/static/images/main_menu/risk_consumption_ranking.png"/>
                             <div class="description-text">
                                 <span class="description-text">消费排名</span>
                             </div>
-                        </a>
                     </div>
+                    </a>
                 </div>
             </div>
         </div>
-        <div class="list-group">
+     <!--   <div class="list-group">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6">
                     <div class="description-block">
@@ -230,7 +269,7 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div>-->
         <div class="list-group">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6">
@@ -240,38 +279,58 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'citypartner'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="partner_apply.citypartner_reg" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/partner_application.png"/>
                         <div class="description-text">
                             <span class="description-text">合伙人申请</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'org'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="organizations" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/partner_management.png"/>
                         <div class="description-text">
                             <span class="description-text">合伙人管理</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_org.organlasis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/partner_trading_volume.png"/>
                         <div class="description-text">
                             <span class="description-text">合伙人交易量</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('orgcommission'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_org.commission" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/partner_commission.png"/>
                         <div class="description-text">
                             <span class="description-text">合伙人提成</span>
                         </div>
                     </div>
+                    </a>
+                </div>
+<!--
+                <div ng-if="('citypartner'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="citypartner_reg" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/partner_commission.png"/>
+                            <div class="description-text">
+                                <span class="description-text">城市合伙人</span>
+                            </div>
+                        </div>
+                    </a>
                 </div>
+-->
             </div>
         </div>
         <div class="list-group">
@@ -283,45 +342,45 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'bdsale'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_bd.bdanalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/bd_sales_volume.png"/>
                         <div class="description-text">
                             <span class="description-text">BD销售量</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/bd_commission.png"/>
                         <div class="description-text">
                             <span class="description-text">BD提成</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
+                    <a ng-click="editRateConfig()">
                     <div class="description-block">
                         <img src="/static/images/main_menu/bd_performance_setting.png"/>
                         <div class="description-text">
-                            <span class="description-text">BD绩效设置</span>
+                            <span class="description-text">BD绩效设置(bug)</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
+                    <a ng-click="editBDLevels()">
                     <div class="description-block">
                         <img src="/static/images/main_menu/bd_level_setting.png"/>
                         <div class="description-text">
-                            <span class="description-text">BD级别设置</span>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/bd_merchant_activity.png"/>
-                        <div class="description-text">
-                            <span class="description-text">商户活跃度</span>
+                            <span class="description-text">BD级别设置(bug)</span>
                         </div>
                     </div>
+                    </a>
                 </div>
             </div>
         </div>
@@ -334,62 +393,127 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'appAct'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="appAct" ui-sref-opts="{reload:true}">
                     <div class="description-block ">
                         <img src="/static/images/main_menu/activity_management.png"/>
                         <div class="description-text">
                             <span class="description-text">活动管理</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('encourage'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="encourageAct" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/activity_encouraging_gold.png"/>
                         <div class="description-text">
                             <span class="description-text">鼓励金</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('cashbackAnalysis'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="cashbackAnalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/activity_marketing_account.png"/>
                         <div class="description-text">
                             <span class="description-text">营销账户</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'settleDelay'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/activity_half_of_the_rate.png"/>
                         <div class="description-text">
                             <span class="description-text">周末费率减半活动</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="('1'|withRole)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="contract" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/activity_contract_signing.png"/>
                         <div class="description-text">
                             <span class="description-text">合同签约情况</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'actChairty'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="act_chairty" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/activity_half_day_public_service.png"/>
                         <div class="description-text">
                             <span class="description-text">半边天公益活动</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'monDelay'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/activity_kangaroo.png"/>
                         <div class="description-text">
-                            <span class="description-text">袋鼠星球</span>
+                            <span class="description-text">余额增值活动</span>
                         </div>
                     </div>
+                    </a>
+                </div>
+
+         <!--       <div ng-if="('activities'|withModule) && (currentUser.org_id==1 || currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="activity.detail({act_id:'3'})" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_kangaroo.png"/>
+                            <div class="description-text">
+                                <span class="description-text">店长行动（注释）</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('act_redpack'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="act_partners" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_kangaroo.png"/>
+                            <div class="description-text">
+                                <span class="description-text">店长行动参与情况（注释）</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('act_customer_redpack'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="customer_redpack" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_kangaroo.png"/>
+                            <div class="description-text">
+                                <span class="description-text">红包返现（注释）</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('funds'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="funds" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_kangaroo.png"/>
+                            <div class="description-text">
+                                <span class="description-text">增值计划（注释）</span>
+                            </div>
+                        </div>
+                    </a>
                 </div>
+                <div ng-if="('act_redpack'|withModule) && (currentUser.org_id==1 || currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="act_partners" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_kangaroo.png"/>
+                            <div class="description-text">
+                                <span class="description-text">新费率签约情况（注释）</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>-->
             </div>
         </div>
         <div class="list-group">
@@ -401,21 +525,35 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'notice'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="notice" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/content_group_hair.png"/>
                         <div class="description-text">
                             <span class="description-text">通知群发</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'cms'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="cms" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/content_website_management.png"/>
                         <div class="description-text">
                             <span class="description-text">原网站管理下内容</span>
                         </div>
                     </div>
+                    </a>
+                </div>
+                <div ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)" class="col-sm-2 col-xs-6">
+                    <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
+                    <div class="description-block">
+                        <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                        <div class="description-text">
+                            <span class="description-text">积分商城</span>
+                        </div>
+                    </div>
+                    </a>
                 </div>
             </div>
         </div>
@@ -428,54 +566,64 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'austrac'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="transreport" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/finance_austrac_report.png"/>
                         <div class="description-text">
                             <span class="description-text">Austrac Report</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
+                    <a ui-sref="invoice" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/finance_merchant_invoice.png"/>
                         <div class="description-text">
                             <span class="description-text">商户Invoice</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
+                <div ng-if="'platformRevenue'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_report.platformrevenue" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/finance_statistics.png"/>
                         <div class="description-text">
                             <span class="description-text">平台收支统计</span>
                         </div>
                     </div>
+                    </a>
                 </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/finance_record_of_money.png"/>
-                        <div class="description-text">
-                            <span class="description-text">腾讯打款记录</span>
+                <div ng-if="'wxSettlementsApp'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_report.wx_settlements" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/finance_record_of_money.png"/>
+                            <div class="description-text">
+                                <span class="description-text">腾讯打款记录</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/finance_bd_extract.png"/>
-                        <div class="description-text">
-                            <span class="description-text">BD提成</span>
+                    </a></div>
+                <div ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)"
+                     class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/finance_bd_extract.png"/>
+                            <div class="description-text">
+                                <span class="description-text">BD提成</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/finance_partner_contribution.png"/>
-                        <div class="description-text">
-                            <span class="description-text">合伙人提成</span>
+                    </a></div>
+                <div ng-if="('orgcommission'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_org.commission" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/finance_partner_contribution.png"/>
+                            <div class="description-text">
+                                <span class="description-text">合伙人提成</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
+                    </a></div>
             </div>
         </div>
         <div class="list-group">
@@ -487,62 +635,69 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/settle_transaction_reconciliation.png"/>
-                        <div class="description-text">
-                            <span class="description-text">交易对账</span>
+                <div ng-if="'ordervalid'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="order_valid" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_transaction_reconciliation.png"/>
+                            <div class="description-text">
+                                <span class="description-text">交易对账</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/settle_execution.png"/>
-                        <div class="description-text">
-                            <span class="description-text">清算执行</span>
+                    </a></div>
+                <div ng-if="('clearing_org'|withModule) && currentUser.org_id>1" class="col-sm-2 col-xs-6">
+                    <a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_execution.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算记录</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/settle_day.png"/>
-                        <div class="description-text">
-                            <span class="description-text">清算日管理</span>
+                    </a></div>
+                <div ng-if="'clearing'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="clearingLogs.date_setting" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_day.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算日管理</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/settle_statistics.png"/>
-                        <div class="description-text">
-                            <span class="description-text">清算统计</span>
+                    </a></div>
+                <div ng-if="'clearing'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="clearingLogs" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算统计</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/settle_prediction.png"/>
-                        <div class="description-text">
-                            <span class="description-text">清算预估</span>
+                    </a></div>
+                <div ng-if="('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_transaction.estimateAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_prediction.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算预估</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/settle_report.png"/>
-                        <div class="description-text">
-                            <span class="description-text">清算月报</span>
+                    </a></div>
+                <div ng-if="'settleReport'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_report.settle_report" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_report.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算月报</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/settle_verification.png"/>
-                        <div class="description-text">
-                            <span class="description-text">清算验证</span>
+                    </a></div>
+                <div ng-if="'platformRevenue'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/settle_verification.png"/>
+                            <div class="description-text">
+                                <span class="description-text">清算验证</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
+                    </a></div>
             </div>
         </div>
         <div class="list-group">
@@ -554,30 +709,33 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/org_management.png"/>
-                        <div class="description-text">
-                            <span class="description-text">组织管理</span>
+                <div ng-if="'org'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="organizations" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/org_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">组织管理</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/org_account_management.png"/>
-                        <div class="description-text">
-                            <span class="description-text">账号管理</span>
+                    </a></div>
+                <div ng-if="'manager_accounts'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="managers" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/org_account_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">账号管理</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/org_role_rights_management.png"/>
-                        <div class="description-text">
-                            <span class="description-text">角色权限管理</span>
+                    </a></div>
+                <div ng-if="'sysconfig'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="sysconfig.permission" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/org_role_rights_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">角色权限管理</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
+                    </a></div>
             </div>
         </div>
         <div class="list-group">
@@ -589,30 +747,34 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/configure_merchant_number.png"/>
-                        <div class="description-text">
-                            <span class="description-text">商户号</span>
+                <div ng-if="('10'|withRole)&&('merchantIdManage'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/configure_merchant_number.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户号</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/configure_device_management.png"/>
-                        <div class="description-text">
-                            <span class="description-text">设备管理</span>
+                    </a></div>
+                <div ng-if="('device'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)"
+                     class="col-sm-2 col-xs-6">
+                    <a ui-sref="device" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/configure_device_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">设备管理</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/configure_parameter.png"/>
-                        <div class="description-text">
-                            <span class="description-text">相关参数(原系统参数设定)</span>
+                    </a></div>
+                <div ng-if="'sysconfig'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="sysconfig" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/configure_parameter.png"/>
+                            <div class="description-text">
+                                <span class="description-text">相关参数(原系统参数设定)</span>
+                            </div>
                         </div>
-                    </div>
-                </div>
+                    </a></div>
             </div>
         </div>
         <div class="list-group">
@@ -624,15 +786,54 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/logon_log.png"/>
-                        <div class="description-text">
-                            <span class="description-text">登录日志</span>
+                <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="logview.login_history" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/logon_log.png"/>
+                            <div class="description-text">
+                                <span class="description-text">登录日志</span>
+                            </div>
                         </div>
+                    </a></div>
+                <div ng-if="'dev'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="devtools" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                            <div class="description-text">
+                                <span class="description-text">开发工具</span>
+                            </div>
+                        </div>
+                    </a></div>
+                <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="logview" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                            <div class="description-text">
+                                <span class="description-text">系统日志</span>
+                            </div>
+                        </div>
+                    </a></div>
+            </div>
+        </div>
+        <div ng-if="('1000000000000'|withRole)" class="list-group">
+            <div class="row">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>机构管理</label>
                     </div>
                 </div>
             </div>
+            <div class="row">
+                <div ng-if="('1000000000000'|withRole)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_agent" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/logon_log.png"/>
+                            <div class="description-text">
+                                <span class="description-text">机构数据分析</span>
+                            </div>
+                        </div>
+                    </a></div>
+            </div>
         </div>
     </div>
 </div>

From 93f2af4d523df832b0332b9d1fc62df912f49710 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 10 Oct 2018 19:02:52 +0800
Subject: [PATCH 13/82] fix BD-ng-click

---
 src/main/ui/main_menu.html             |  8 +--
 src/main/ui/manage.html                |  2 +-
 src/main/ui/static/menu/managerMenu.js | 94 ++++++++++++++++++++++++++
 3 files changed, 99 insertions(+), 5 deletions(-)

diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
index faf03c5b1..de46097e2 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/main_menu.html
@@ -363,21 +363,21 @@
                     </a>
                 </div>
                 <div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
-                    <a ng-click="editRateConfig()">
+                    <a ng-click="editRateConfig()" style="cursor: pointer">
                     <div class="description-block">
                         <img src="/static/images/main_menu/bd_performance_setting.png"/>
                         <div class="description-text">
-                            <span class="description-text">BD绩效设置(bug)</span>
+                            <span class="description-text">BD绩效设置</span>
                         </div>
                     </div>
                     </a>
                 </div>
                 <div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
-                    <a ng-click="editBDLevels()">
+                    <a ng-click="editBDLevels()" style="cursor: pointer">
                     <div class="description-block">
                         <img src="/static/images/main_menu/bd_level_setting.png"/>
                         <div class="description-text">
-                            <span class="description-text">BD级别设置(bug)</span>
+                            <span class="description-text">BD级别设置</span>
                         </div>
                     </div>
                     </a>
diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 97ba2811f..3b7de9695 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -254,7 +254,7 @@ margin-bottom: 10%;"/>
 
         </div>
 
-                <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;flex-wrap:wrap">
+                <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;min-height:626px;flex-wrap:wrap">
         <div class="box-items" ng-if="'10'|withRole">
             <a ng-click="headerShow()" ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
             <div class="boxs">
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index 51d0c8f5d..8312b18cb 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -9,12 +9,106 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
         });
     }]);
     app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal', 'commonDialog','$stateParams', function ($scope, $http,$filter, $uibModal, commonDialog,$stateParams) {
+        $scope.display = function () {
+            var json = {};
+            $(".list-group").each(function () {
+                var child = ($(".list-group").find('a')).length;
+                var label = ($(".list-group").find("label:first-child")).val();
+                if (child >0) {
+                    json[label] = true;
+                }else {
+                    json[label] = false;
+                }
+            });
+            return json;
+        };
         function init() {
             console.log("dadadadada  + " + $stateParams.role);
+            /*console.log("json   + " + $scope.display());*/
         }
+        $scope.editRateConfig = function () {
+            $uibModal.open({
+                templateUrl: '/static/config/bdprize/templates/rate_config_dialog.html',
+                controller: 'bdRateConfigCtrl',
+                resolve: {
+                    rates: function () {
+                        return angular.copy($scope.bd_rate_configs);
+                    }
+                }
+            }).result.then(function () {
+                $scope.loadRateConfigs();
+            })
+        };
+        $scope.editBDLevels = function () {
+            $uibModal.open({
+                templateUrl: '/static/config/bdprize/templates/bd_level_config_dialog.html',
+                controller: 'bdLevelConfigCtrl'
+            })
+        };
 
         init();
 
     }]);
+    app.controller('bdRateConfigCtrl', ['$scope', '$http', 'rates', function ($scope, $http, rates) {
+        $scope.bdLevels = [{value: 1, label: 'Junior'}, {value: 2, label: 'Intermediate'}, {value: 3, label: 'Senior'}];
+        $scope.months = [{value: 1, label: '1-3 Months'}, {value: 2, label: '4-6 Months'}, {
+            value: 3,
+            label: '>=7 Months'
+        }];
+        $scope.kpiRanges = [{value: 1, label: '0-50%'}, {value: 2, label: '50%~80%'}, {value: 3, label: '80%~100%'},
+            {value: 4, label: '100%-120%'}, {value: 5, label: '>=120%'}];
+        $scope.clientRate = [{value: 0.6, label: '0.6-0.79'}, {value: 0.8, label: '0.8-2.0'}];
+        $scope.filter = {bd_level: 1,rate_from:0.6};
+        $scope.rates = rates;
+        $scope.submitRates = function () {
+            var validation = null;
+            $scope.errmsg = null;
+            angular.forEach($scope.rates, function (rate) {
+                if (isNaN(rate.prize_rate)) {
+                    validation = {months: rate.time_range, bd_level: rate.bd_level};
+                    $scope.errmsg = 'Rate Value is NaN';
+                }
+                if (rate.prize_rate > 1) {
+                    validation = {months: rate.time_range, bd_level: rate.bd_level};
+                    $scope.errmsg = 'Rate value shall no more than 1%';
+                }
+                if (rate.prize_rate < 0) {
+                    validation = {months: rate.time_range, bd_level: rate.bd_level};
+                    $scope.errmsg = 'Rate value shall be a positive value';
+                }
+            });
+            if (!validation) {
+                $http.put('/sys/bd_prize/config/rates', $scope.rates).then(function () {
+                    $scope.$close();
+                }, function (resp) {
+                    $scope.errmsg = resp.data.message;
+                })
+            }
+        }
+    }]);
+    app.controller('bdLevelConfigCtrl', ['$scope', '$http', function ($scope, $http) {
+
+        $scope.getBDGroups = function () {
+            $http.get('/sys/manager_accounts/roles/bd_leader').then(function (resp) {
+                $scope.bdgroups = resp.data;
+                $scope.getBDLevels();
+            })
+        };
+        $scope.getBDGroups();
+        $scope.getBDLevels = function () {
+            $http.get('/sys/bd_prize/config/bd_levels').then(function (resp) {
+                $scope.bds = resp.data;
+            })
+        };
+
+        $scope.bdLevels = [{value: 1, label: 'Junior'}, {value: 2, label: 'Intermediate'}, {value: 3, label: 'Senior'}];
+        $scope.updateBDLevel = function (bdInfo) {
+            $http.put('/sys/bd_prize/config/bd_levels/' + bdInfo.manager_id, bdInfo).then(function () {
+                $scope.getBDGroups();
+            }, function (resp) {
+                $scope.errmsg = resp.data.message;
+            })
+        };
+    }]);
     return app;
 });

From b947cc63a08ce17e81ebcf7e92b3b91828aa440e Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Wed, 10 Oct 2018 19:54:53 +0800
Subject: [PATCH 14/82] fix

---
 src/main/ui/manage.html | 470 +++++++++++++++++++++++-----------------
 1 file changed, 267 insertions(+), 203 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 3b7de9695..d77789135 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -41,22 +41,26 @@
     <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{
+        .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;
@@ -66,10 +70,12 @@
             background: #434365;
             border-radius: 5px;
         }
+
         .boxs:hover {
             background: #FFFFFF;
         }
-        .box-font{
+
+        .box-font {
             font-family: PingFang-SC-Regular;
             font-size: 20px;
             color: #FFFFFF;
@@ -77,6 +83,7 @@
             text-align: center;
             padding-top: 25px;
         }
+
         footer {
             font-family: PingFang-SC-Regular;
             font-size: 12px;
@@ -84,6 +91,7 @@
             letter-spacing: 0px;
             padding-bottom: 2.3%;
         }
+
         .easypay {
             font-family: PingFang-SC-Regular;
             font-size: 20px;
@@ -92,6 +100,7 @@
             padding-top: 1%;
             padding-bottom: 1%;
         }
+
         .ng-cloak, [ng-cloak] {
             display: none !important;
         }
@@ -121,6 +130,49 @@
         .dh {
             animation: myfirst 1s linear 0s infinite alternate;
         }
+
+        .description-text {
+            margin-top: 5px;
+            /*width: 86px;*/
+        }
+
+        .list-group label {
+            border-bottom: 1px solid #333333;
+            font-size: 20px;
+            color: #333333;
+        }
+        .navbar-header a{
+            color: #FFF;
+        }
+        .navbar-header .active{
+            background-color: #FFF !important;
+        }
+        .navbar-header .active a{
+            color: #f06101 !important;
+        }
+        .navbar-header li {
+            float: left;
+            border: 1px solid #FFF;
+            padding: 3px 15px;
+        }
+        @media (min-width: 768px) {
+            .navbar-header {
+                list-style: none;
+                width: 245px;
+                position: absolute;
+                left: 0;
+                right: 0;
+                margin: 10px auto;
+            }
+        }
+
+        @media (max-width: 768px) {
+            .navbar-header {
+                list-style: none;
+                width: 245px;
+                margin: 10px auto;
+            }
+        }
     </style>
     <script type="text/javascript" src="static/lib/require.js" data-main="static/boot/manager-boot"></script>
     <script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
@@ -138,230 +190,242 @@ margin-bottom: 10%;"/>
 </div>
 
 
-    <div ng-if="currentUser!=null" ng-cloak
-         ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'">
-        <header ng-if="headerDisplay" class="main-header">
+<div ng-if="currentUser!=null" ng-cloak
+     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" class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
+            <!-- Logo -->
+            <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="!currentUser.org">
+                <!-- mini logo for sidebar mini 50x50 pixels -->
+                <span class="logo-mini"><img src="static/images/r_white_logo.svg"
+                                             style="max-height: 35px;margin-left: 15%;"></span>
+                <!-- logo for regular state and mobile devices -->
+                <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
+                                           style="max-height: 35px;">
+                    <b>RoyalPay</b>
 
-                <!-- Logo -->
-                <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="!currentUser.org">
-                    <!-- mini logo for sidebar mini 50x50 pixels -->
-                    <span class="logo-mini"><img src="static/images/r_white_logo.svg"
-                                                 style="max-height: 35px;margin-left: 15%;"></span>
-                    <!-- logo for regular state and mobile devices -->
-                    <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
-                                               style="max-height: 35px;">
-                        <!--<b>RoyalPay</b>-->
             </span>
-                </a>
-                <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="currentUser.org">
-                    <!-- mini logo for sidebar mini 50x50 pixels -->
-                    <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
-                                                 style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
-                    <!-- logo for regular state and mobile devices -->
-                    <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
-                                               style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
-                            ng-bind="currentUser.org.name"></b></span>
-                </a>
-                <div class="navbar-header">
-                    <a ui-sref="dashboard" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Dashboard</a>
-                    <a ui-sref="listMenu({role:''})" ui-sref-opts="{reload:true}" role="button" style="border: 1px solid #FFF; color: #FFF;padding: 3px">Main Menu</a>
-                </div>
-                <!-- Header Navbar: style can be found in header.less -->
-                <!--顶部导航栏-->
-                <div class="navbar-custom-menu">
-                    <ul class="nav navbar-nav">
-                        <li class="user-menu" ng-if="currentUser.onoff">
-                            <a role="button" ng-click="customerService()">
-                                <i class="fa fa-wechat"></i> contact service
-                            </a>
-
-                        </li>
-                        <li class="user-menu">
-                            <a role="button" ng-click="managerBindWechat(true)">
-                                <i class="fa fa-wechat"></i> Bind WeChat
-                            </a>
-                        </li>
-
-                        <!-- User Account: style can be found in dropdown.less -->
-                        <li class="dropdown user user-menu" uib-dropdown>
-                            <a href class="dropdown-toggle" uib-dropdown-toggle>
+            </a>
+            <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="currentUser.org">
+                <!-- mini logo for sidebar mini 50x50 pixels -->
+                <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
+                                             style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
+                <!-- logo for regular state and mobile devices -->
+                <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
+                                           style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
+                        ng-bind="currentUser.org.name"></b></span>
+            </a>
+            <ul class="navbar-header">
+                <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>
+                <li ui-sref-active="active" style="border-bottom-right-radius: 5px;border-top-right-radius: 5px;">
+                    <a ui-sref="listMenu({role:''})" role="button">Main Menu</a>
+                </li>
+            </ul>
+            <!--<div class="navbar-header">-->
+                <!--<a ui-sref="dashboard" role="button"-->
+                   <!--style="border: 1px solid #FFF; color: #FFF;padding: 3px">Dashboard</a>-->
+                <!--<a ui-sref="listMenu({role:''})" ui-sref-opts="{reload:true}" role="button"-->
+                   <!--style="border: 1px solid #FFF; color: #FFF;padding: 3px">Main Menu</a>-->
+            <!--</div>-->
+            <!-- Header Navbar: style can be found in header.less -->
+            <!--顶部导航栏-->
+            <div class="navbar-custom-menu">
+                <ul class="nav navbar-nav">
+                    <li class="user-menu" ng-if="currentUser.onoff">
+                        <a role="button" ng-click="customerService()">
+                            <i class="fa fa-wechat"></i> contact service
+                        </a>
+
+                    </li>
+                    <li class="user-menu">
+                        <a role="button" ng-click="managerBindWechat(true)">
+                            <i class="fa fa-wechat"></i> Bind WeChat
+                        </a>
+                    </li>
+
+                    <!-- User Account: style can be found in dropdown.less -->
+                    <li class="dropdown user user-menu" uib-dropdown>
+                        <a href class="dropdown-toggle" uib-dropdown-toggle>
+                            <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
+                                 class="user-image user-img-yedian"
+                                 alt="User Image">
+                            <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
+                        </a>
+                        <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
+                            <!-- User image -->
+                            <li class="user-header user-header-yedian">
                                 <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
-                                     class="user-image user-img-yedian"
+                                     class="img-circle"
                                      alt="User Image">
-                                <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
-                            </a>
-                            <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
-                                <!-- User image -->
-                                <li class="user-header user-header-yedian">
-                                    <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
-                                         alt="User Image">
-
-                                    <p>
-                                        {{currentUser.display_name}}
-                                        <small>
-                                            <i class="fa fa-user-secret" title="Administrator"
-                                               ng-class="{'text-orange':!('1'|withRole),'text-gray':('1'|withRole)}"></i>
-                                            <i class="fa fa-eye" title="Compliance"
-                                               ng-class="{'text-orange':!('10'|withRole),'text-gray':('10'|withRole)}"></i>
-                                            <i class="fa fa-crosshairs" title="BD User"
-                                               ng-class="{'text-orange':!('100'|withRole),'text-gray':('100'|withRole)}"></i>
-                                            <i class="fa fa-balance-scale" title="Accountant"
-                                               ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
-                                            <i class="fa fa-tty" title="Service"
-                                               ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
-                                            <i class="fa fa-university" title="Account Manager"
-                                               ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
-                                            <i class="fa fa-line-chart" title="Director"
-                                               ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
-                                            <i class="fa fa-map-o" title="Site Manager"
-                                               ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
-                                            <i class="fa fa-code" title="Developer"
-                                               ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
-                                            <i class="fa fa-user" title="Risk Manager"
-                                               ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
-                                            <i class="fa fa-tripadvisor" title="GUEST"
-                                               ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
-                                            <i class="fa fa-user-plus" title="Org Manager"
-                                               ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
-                                        </small>
-                                    </p>
-                                </li>
-                                <!-- Menu Footer-->
-                                <li class="user-footer">
-                                    <div class="pull-left">
-                                        <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
-                                    </div>
-                                    <div class="pull-right">
-                                        <a href class="btn btn-default btn-flat" ng-click="logout()">Sign Out</a>
-                                    </div>
-                                </li>
-                            </ul>
-                        </li>
-                        <!-- Control Sidebar Toggle Button -->
-                    </ul>
+
+                                <p>
+                                    {{currentUser.display_name}}
+                                    <small>
+                                        <i class="fa fa-user-secret" title="Administrator"
+                                           ng-class="{'text-orange':!('1'|withRole),'text-gray':('1'|withRole)}"></i>
+                                        <i class="fa fa-eye" title="Compliance"
+                                           ng-class="{'text-orange':!('10'|withRole),'text-gray':('10'|withRole)}"></i>
+                                        <i class="fa fa-crosshairs" title="BD User"
+                                           ng-class="{'text-orange':!('100'|withRole),'text-gray':('100'|withRole)}"></i>
+                                        <i class="fa fa-balance-scale" title="Accountant"
+                                           ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
+                                        <i class="fa fa-tty" title="Service"
+                                           ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
+                                        <i class="fa fa-university" title="Account Manager"
+                                           ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
+                                        <i class="fa fa-line-chart" title="Director"
+                                           ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
+                                        <i class="fa fa-map-o" title="Site Manager"
+                                           ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
+                                        <i class="fa fa-code" title="Developer"
+                                           ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
+                                        <i class="fa fa-user" title="Risk Manager"
+                                           ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
+                                        <i class="fa fa-tripadvisor" title="GUEST"
+                                           ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
+                                        <i class="fa fa-user-plus" title="Org Manager"
+                                           ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
+                                    </small>
+                                </p>
+                            </li>
+                            <!-- Menu Footer-->
+                            <li class="user-footer">
+                                <div class="pull-left">
+                                    <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
+                                </div>
+                                <div class="pull-right">
+                                    <a href class="btn btn-default btn-flat" ng-click="logout()">Sign Out</a>
+                                </div>
+                            </li>
+                        </ul>
+                    </li>
+                    <!-- Control Sidebar Toggle Button -->
+                </ul>
+            </div>
+        </nav>
+    </header>
+    <div class="content-wrapper autoheight" style="margin-left: 0" ui-view>
+        <div class="backgroud">
+            <div class="total_logo">
+                <a><img src="/static/images/manage_total_logo.png"> </a>
+                <div class="easypay">
+                    <b>Easy Business，Easy Payment!</b>
                 </div>
-            </nav>
-        </header>
-            <div style="min-height: 890px" ui-view>
-            <div class="backgroud">
-                <div class="total_logo">
-            <a><img src="/static/images/manage_total_logo.png">  </a>
-            <div class="easypay">
-                <b>Easy Business，Easy Payment!</b>
+
             </div>
 
-        </div>
+            <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;flex-wrap:wrap">
+                <div class="box-items" ng-if="'10'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_1.png">
+                        </div>
+                        <p class="box-font">Compliance</p>
+                    </a>
+                </div>
 
-                <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;min-height:626px;flex-wrap:wrap">
-        <div class="box-items" ng-if="'10'|withRole">
-            <a ng-click="headerShow()" ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
-            <div class="boxs">
-                <img src="/static/images/manage/menu_1.png">
-            </div>
-            <p class="box-font">Compliance</p>
-            </a>
-        </div>
+                <div class="box-items" ng-if="'10000000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'RiskManager'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_2.png">
+                        </div>
+                        <p class="box-font">Risk Manager</p>
+                    </a>
+                </div>
 
-        <div class="box-items" ng-if="'10000000000'|withRole">
-            <a ng-click="headerShow()" ui-sref="listMenu({role:'RiskManager'})" ui-sref-opts="{reload:true}">
-            <div class="boxs">
-                 <img src="/static/images/manage/menu_2.png">
-            </div>
-            <p class="box-font">Risk Manager</p>
-            </a>
-        </div>
+                <div class="box-items" ng-if="'100000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'AccountManager'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_3.png">
+                        </div>
+                        <p class="box-font">Account Manager</p>
+                    </a>
+                </div>
 
-        <div class="box-items" ng-if="'100000'|withRole">
-            <a ng-click="headerShow()" ui-sref="listMenu({role:'AccountManager'})" ui-sref-opts="{reload:true}">
-            <div class="boxs">
-                  <img src="/static/images/manage/menu_3.png">
-            </div>
-            <p class="box-font">Account Manager</p>
-            </a>
-        </div>
+                <div class="box-items" ng-if="'1000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Accountant'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_4.png">
+                        </div>
+                        <p class="box-font">Accountant</p>
+                    </a>
+                </div>
 
-        <div class="box-items" ng-if="'1000'|withRole">
-            <a ng-click="headerShow()" ui-sref="listMenu({role:'Accountant'})" ui-sref-opts="{reload:true}">
-            <div class="boxs">
-               <img src="/static/images/manage/menu_4.png">
-            </div>
-            <p class="box-font">Accountant</p>
-            </a>
-        </div>
+                <div class="box-items" ng-if="'100'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'BDUser'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_5.png">
+                        </div>
+                        <p class="box-font">BD User</p>
+                    </a>
+                </div>
 
-        <div class="box-items" ng-if="'100'|withRole">
-            <a ng-click="headerShow()" ui-sref="listMenu({role:'BDUser'})" ui-sref-opts="{reload:true}">
-            <div class="boxs">
-               <img src="/static/images/manage/menu_5.png">
-            </div>
-            <p class="box-font">BD User</p>
-            </a>
-        </div>
+                <div class="box-items" ng-if="'10000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Service'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_6.png">
+                        </div>
+                        <p class="box-font">Service</p>
+                    </a>
+                </div>
 
-        <div class="box-items" ng-if="'10000'|withRole">
-            <a ng-click="headerShow()" ui-sref="listMenu({role:'Service'})" ui-sref-opts="{reload:true}">
-            <div class="boxs">
-                <img src="/static/images/manage/menu_6.png">
-            </div>
-            <p class="box-font">Service</p>
-            </a>
-        </div>
+                <div class="box-items" ng-if="'1'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Administrator'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_7.png">
+                        </div>
+                        <p class="box-font">Administrator</p>
+                    </a>
+                </div>
 
-        <div class="box-items" ng-if="'1'|withRole">
-            <a ng-click="headerShow()" ui-sref="listMenu({role:'Administrator'})" ui-sref-opts="{reload:true}">
-            <div class="boxs">
-                <img src="/static/images/manage/menu_7.png">
-            </div>
-            <p class="box-font">Administrator</p>
-            </a>
-        </div>
+                <div class="box-items" ng-if="'10000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'SiteManager'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_8.png">
+                        </div>
+                        <p class="box-font">Site Manager</p>
+                    </a>
+                </div>
 
-        <div class="box-items" ng-if="'10000000'|withRole">
-            <a ng-click="headerShow()" ui-sref="listMenu({role:'SiteManager'})" ui-sref-opts="{reload:true}">
-            <div class="boxs">
-                <img src="/static/images/manage/menu_8.png">
-            </div>
-            <p class="box-font">Site Manager</p>
-            </a>
-        </div>
+                <div class="box-items" ng-if="'100000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Developer'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_9.png">
+                        </div>
+                        <p class="box-font">Developer</p>
+                    </a>
+                </div>
 
-        <div class="box-items" ng-if="'100000000'|withRole">
-            <a ng-click="headerShow()" ui-sref="listMenu({role:'Developer'})" ui-sref-opts="{reload:true}">
-            <div class="boxs">
-                <img src="/static/images/manage/menu_9.png">
+                <div class="box-items" ng-if="'1000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Director'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_10.png">
+                        </div>
+                        <p class="box-font">Director</p>
+                    </a>
+                </div>
             </div>
-            <p class="box-font">Developer</p>
-            </a>
-        </div>
 
-        <div class="box-items" ng-if="'1000000'|withRole">
-            <a ng-click="headerShow()" ui-sref="listMenu({role:'Director'})" ui-sref-opts="{reload:true}">
-            <div class="boxs">
-                <img src="/static/images/manage/menu_10.png">
+            <div style="text-align: center">
+                <footer>
+                    <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
+                    reserved.
+                </footer>
             </div>
-            <p class="box-font">Director</p>
-            </a>
         </div>
     </div>
-
-                <div style="text-align: center">
-        <footer>
-            <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
-            reserved.
-        </footer>
+    <footer ng-if="copyright" class="main-footer" style="margin-left: 0px">
+        <div class="pull-right hidden-xs">
+            <b>Easy Business，Easy Pay</b>
         </div>
-            </div>
-            </div>
-        <footer ng-if="copyright" class="main-footer" style="margin-left: 0px">
-            <div class="pull-right hidden-xs">
-                <b>Easy Business，Easy Pay</b>
-            </div>
-            <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
-            reserved.
-        </footer>
-    </div>
+        <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
+        reserved.
+    </footer>
+</div>
 
 </body>
 </html>

From 3ede159d976474d394841d614201fefdbe4bb7f8 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 10 Oct 2018 22:45:48 +0800
Subject: [PATCH 15/82] fix

---
 .../static/payment/partner/templates/partner_bankaccounts.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
index 5c7423ad0..854e13fb7 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -179,7 +179,7 @@
                 <tr>
                     <th>Rate Name</th>
                     <th>Rate Value</th>
-                    <th>Transaction Fee(cent)</th>
+                    <th>Transaction Fee</th>
                     <th>Active Time</th>
                     <th>Expire Time</th>
                     <th ng-if="bankCtrl.rate_name=='Wechat'">Clean Days</th>

From 7c0bc3f0195863c920a21f47e0844e265aa527ac Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 11 Oct 2018 14:23:15 +0800
Subject: [PATCH 16/82] add version controller

---
 src/main/ui/m_login.html                    |   4 +-
 src/main/ui/main_menu.html                  |  51 +-
 src/main/ui/manage.html                     | 548 ++++++++++++--------
 src/main/ui/manage_bak.html                 | 488 -----------------
 src/main/ui/managev2.html                   | 439 ++++++++++++++++
 src/main/ui/static/boot/manager-bootv2.js   |  90 ++++
 src/main/ui/static/boot/managerMainApp.js   |  17 +-
 src/main/ui/static/boot/managerMainAppv2.js | 404 +++++++++++++++
 src/main/ui/static/menu/managerMenu.js      |  70 ++-
 9 files changed, 1338 insertions(+), 773 deletions(-)
 delete mode 100644 src/main/ui/manage_bak.html
 create mode 100644 src/main/ui/managev2.html
 create mode 100644 src/main/ui/static/boot/manager-bootv2.js
 create mode 100644 src/main/ui/static/boot/managerMainAppv2.js

diff --git a/src/main/ui/m_login.html b/src/main/ui/m_login.html
index 3c4210286..b5714978b 100644
--- a/src/main/ui/m_login.html
+++ b/src/main/ui/m_login.html
@@ -142,7 +142,7 @@
                 dataType: 'text',
                 success: function () {
                     var from = getUrlParam("f");
-                    location.href = from ? decodeURIComponent(from) : 'manage.html'
+                    location.href = from ? decodeURIComponent(from) : 'managev2.html'
                 },
                 error: function (jqXHR) {
                     alert(JSON.parse(jqXHR.responseText).message);
@@ -185,7 +185,7 @@
                 url: '/global/userstatus/manager_signin_wechat_qrcode/' + codeId + '/check',
                 method: 'get',
                 success: function () {
-                    location.href = '/manage.html'
+                    location.href = '/managev2.html'
                 },
                 error: function () {
                     setTimeout(function () {
diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
index de46097e2..3b0aa58eb 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/main_menu.html
@@ -7,7 +7,7 @@
 <div class="content-wrapper autoheight" style="margin-left: 0px">
     <div class="content" style="background-color: #FFF">
         <div class="list-group">
-            <div class="row">
+            <div class="row" ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
                 <div class="col-sm-2 col-lg-2 col-xs-6">
                     <div class="description-block">
                         <label>待处理事项</label>
@@ -39,7 +39,7 @@
         </div>
         <div class="list-group">
             <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
+                <div class="col-sm-2 col-lg-2 col-xs-6" id="partners">
                     <div class="description-block">
                         <label>商户管理</label>
                     </div>
@@ -109,8 +109,8 @@
             </div>
         </div>
         <div class="list-group">
-            <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
+            <div class="row" >
+                <div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
                     <div class="description-block">
                         <label>交易管理</label>
                     </div>
@@ -173,8 +173,8 @@
             </div>
         </div>
         <div class="list-group">
-            <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
+            <div class="row" ng-if="('clientrate'|withModule)||('monitor'|withModule) || ('customerRankingAnalysisApp'|withModule)">
+                <div class="col-sm-2 col-lg-2 col-xs-6" id="risk">
                     <div class="description-block">
                         <label>风控管理</label>
                     </div>
@@ -271,8 +271,8 @@
             </div>
         </div>-->
         <div class="list-group">
-            <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
+            <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">
                     <div class="description-block">
                         <label>合伙人管理</label>
                     </div>
@@ -334,8 +334,8 @@
             </div>
         </div>
         <div class="list-group">
-            <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
+            <div class="row" ng-if="('1000'|withRole)|| ('bdsale'|withModule) || ('bdprize'|withModule)">
+                <div class="col-sm-2 col-lg-2 col-xs-6" id="bd">
                     <div class="description-block">
                         <label>BD绩效管理</label>
                     </div>
@@ -385,9 +385,9 @@
             </div>
         </div>
         <div class="list-group">
-            <div class="row">
+            <div class="row" ng-if="('1011110'|withRole) || currentUser.org_id==null">
                 <div class="col-sm-2 col-lg-2 col-xs-6">
-                    <div class="description-block">
+                    <div class="description-block" id="art">
                         <label>营销活动管理</label>
                     </div>
                 </div>
@@ -517,9 +517,9 @@
             </div>
         </div>
         <div class="list-group">
-            <div class="row">
+            <div class="row" ng-if="('0100001'|withRole)">
                 <div class="col-sm-2 col-lg-2 col-xs-6">
-                    <div class="description-block">
+                    <div class="description-block" id="cms">
                         <label>内容管理</label>
                     </div>
                 </div>
@@ -558,8 +558,8 @@
             </div>
         </div>
         <div class="list-group">
-            <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
+            <div class="row" ng-if="('settleReport'|withModule)||('platformRevenue'|withModule) ||('austrac'|withModule) ||('1000'|withRole)">
+                <div class="col-sm-2 col-lg-2 col-xs-6" id="staff">
                     <div class="description-block">
                         <label>财务管理</label>
                     </div>
@@ -627,14 +627,15 @@
             </div>
         </div>
         <div class="list-group">
-            <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
+            <div class="row" >
+                <div class="col-sm-2 col-lg-2 col-xs-6" id="clearing">
                     <div class="description-block">
                         <label>清算管理</label>
                     </div>
                 </div>
             </div>
-            <div class="row">
+            <div class="row" ng-if="('ordervalid'|withModule)||(('clearing_org'|withModule) && currentUser.org_id>1)||('clearing'|withModule)||(
+            ('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)) || ('settleReport'|withModule) ||('platformRevenue'|withModule)">
                 <div ng-if="'ordervalid'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="order_valid" ui-sref-opts="{reload:true}">
                         <div class="description-block">
@@ -701,8 +702,8 @@
             </div>
         </div>
         <div class="list-group">
-            <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
+            <div class="row" ng-if="('org'|withModule)||('manager_accounts'|withModule)||('sysconfig'|withModule)">
+                <div class="col-sm-2 col-lg-2 col-xs-6" id="org">
                     <div class="description-block">
                         <label>组织架构</label>
                     </div>
@@ -739,8 +740,8 @@
             </div>
         </div>
         <div class="list-group">
-            <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
+            <div class="row" ng-if="(('10'|withRole)&&('merchantIdManage'|withModule)) || (('device'|withModule)) ||('sysconfig'|withModule)">
+                <div class="col-sm-2 col-lg-2 col-xs-6" id="setting">
                     <div class="description-block">
                         <label>配置管理</label>
                     </div>
@@ -778,8 +779,8 @@
             </div>
         </div>
         <div class="list-group">
-            <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
+            <div class="row" ng-if="('log'|withModule) || ('dev'|withModule)">
+                <div class="col-sm-2 col-lg-2 col-xs-6" id="develop">
                     <div class="description-block">
                         <label>开发工具</label>
                     </div>
diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index d77789135..640a5d069 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -41,66 +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;
-            color: #FFFFFF;
-            letter-spacing: 0px;
-            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;
         }
@@ -130,17 +70,6 @@
         .dh {
             animation: myfirst 1s linear 0s infinite alternate;
         }
-
-        .description-text {
-            margin-top: 5px;
-            /*width: 86px;*/
-        }
-
-        .list-group label {
-            border-bottom: 1px solid #333333;
-            font-size: 20px;
-            color: #333333;
-        }
         .navbar-header a{
             color: #FFF;
         }
@@ -162,7 +91,7 @@
                 position: absolute;
                 left: 0;
                 right: 0;
-                margin: 10px auto;
+                margin: 10px;
             }
         }
 
@@ -170,7 +99,7 @@
             .navbar-header {
                 list-style: none;
                 width: 245px;
-                margin: 10px auto;
+                margin: 10px;
             }
         }
     </style>
@@ -188,51 +117,46 @@ margin-bottom: 10%;"/>
         <p style="color: #666">To Be The Best QRCode Payment Service Provider!</p>
     </div>
 </div>
-
-
-<div ng-if="currentUser!=null" ng-cloak
+<div class="wrapper" ng-if="currentUser!=null" ng-cloak
      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">
-
-            <!-- Logo -->
-            <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="!currentUser.org">
-                <!-- mini logo for sidebar mini 50x50 pixels -->
-                <span class="logo-mini"><img src="static/images/r_white_logo.svg"
-                                             style="max-height: 35px;margin-left: 15%;"></span>
-                <!-- logo for regular state and mobile devices -->
-                <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
-                                           style="max-height: 35px;">
-                    <b>RoyalPay</b>
 
+    <header class="main-header">
+         <!--Logo-->
+        <a href="#" class="logo logo-yedian shine" ng-if="!currentUser.org">
+            <!--mini logo for sidebar mini 50x50 pixels -->
+            <span class="logo-mini"><img src="static/images/r_white_logo.svg"
+                                         style="max-height: 35px;margin-left: 15%;"></span>
+             <!--logo for regular state and mobile devices -->
+            <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
+                                       style="max-height: 35px;">
+                <!--<b>RoyalPay</b>-->
             </span>
+        </a>
+        <a href="#" class="logo logo-yedian shine" ng-if="currentUser.org">
+            <!-- mini logo for sidebar mini 50x50 pixels -->
+            <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
+                                         style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
+            <!-- logo for regular state and mobile devices -->
+            <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
+                                       style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
+                    ng-bind="currentUser.org.name"></b></span>
+        </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>
-            <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="currentUser.org">
-                <!-- mini logo for sidebar mini 50x50 pixels -->
-                <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
-                                             style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
-                <!-- logo for regular state and mobile devices -->
-                <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
-                                           style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
-                        ng-bind="currentUser.org.name"></b></span>
-            </a>
-            <ul class="navbar-header">
-                <li ui-sref-active="active" style="border-bottom-left-radius: 5px;border-top-left-radius: 5px;">
-                    <a ui-sref="dashboard"  role="button">Dashboard</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 ui-sref="listMenu({role:''})" role="button">Main Menu</a>
+                    <a href="/managev2.html" role="button">v2</a>
                 </li>
             </ul>
-            <!--<div class="navbar-header">-->
-                <!--<a ui-sref="dashboard" role="button"-->
-                   <!--style="border: 1px solid #FFF; color: #FFF;padding: 3px">Dashboard</a>-->
-                <!--<a ui-sref="listMenu({role:''})" ui-sref-opts="{reload:true}" role="button"-->
-                   <!--style="border: 1px solid #FFF; color: #FFF;padding: 3px">Main Menu</a>-->
-            <!--</div>-->
-            <!-- Header Navbar: style can be found in header.less -->
-            <!--顶部导航栏-->
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
                     <li class="user-menu" ng-if="currentUser.onoff">
@@ -246,8 +170,38 @@ margin-bottom: 10%;"/>
                             <i class="fa fa-wechat"></i> Bind WeChat
                         </a>
                     </li>
+                    <li ng-if="('110'|withRole)" ng-class="{'dropdown notifications-menu open':openNotice,'dropdown notifications-menu':!openNotice}">
+                        <a title="New Notice" ng-click="toggleOpenNotice()"  class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
+                            <i class="fa fa-bell-o"></i>
+                            <span class="label label-warning" ng-if="notifyCounts">{{notifyCounts}}</span>
+                        </a>
+                        <ul class="dropdown-menu">
+<!--
+                           <li class="header">System notifications,please resolve it!</li>
+-->
+                            <li>
+                                <!--inner menu: contains the actual data-->
+                                <div class="slimScrollDiv" style="position: relative; overflow: hidden; width: auto; max-height: 200px;"><ul class="menu" style="overflow: hidden; width: 100%;">
+                                    <li>
+                                    <a ng-if="partner_application_new" ui-sref="partner_apply">
+                                        <i class="fa fa-commenting"></i>
+                                        新的自主申请商户<span style="font-size:smaller;float:right;right: 0"></span>
+                                    </a>
+                                    </li>
+                                    <li>
+                                    <a ng-if="refundReviews && ('10000000000'|withRole)" ui-sref="refundReview">
+                                        <i class="fa fa-commenting"></i>
+                                        新的退款申请<span style="font-size:smaller;float:right;right: 0"></span>
+                                    </a>
+                                    </li>
+                                </ul><div class="slimScrollBar" style="background: rgb(0, 0, 0); width: 3px; position: absolute; top: 0px; opacity: 0.4; display: none; border-radius: 7px; z-index: 99; right: 1px; height: 195.122px;"></div><div class="slimScrollRail" style="width: 3px; height: 100%; position: absolute; top: 0px; display: none; border-radius: 7px; background: rgb(51, 51, 51); opacity: 0.2; z-index: 90; right: 1px;"></div></div>
+                            </li>
+                        </ul>
+                    </li>
 
-                    <!-- User Account: style can be found in dropdown.less -->
+<!--
+                     User Account: style can be found in dropdown.less
+-->
                     <li class="dropdown user user-menu" uib-dropdown>
                         <a href class="dropdown-toggle" uib-dropdown-toggle>
                             <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
@@ -256,10 +210,9 @@ margin-bottom: 10%;"/>
                             <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
                         </a>
                         <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
-                            <!-- User image -->
+                             <!--User image-->
                             <li class="user-header user-header-yedian">
-                                <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
-                                     class="img-circle"
+                                <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
                                      alt="User Image">
 
                                 <p>
@@ -292,7 +245,9 @@ margin-bottom: 10%;"/>
                                     </small>
                                 </p>
                             </li>
-                            <!-- Menu Footer-->
+<!--
+                             Menu Footer
+-->
                             <li class="user-footer">
                                 <div class="pull-left">
                                     <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
@@ -303,129 +258,274 @@ margin-bottom: 10%;"/>
                             </li>
                         </ul>
                     </li>
-                    <!-- Control Sidebar Toggle Button -->
+                     <!--Control Sidebar Toggle Button -->
                 </ul>
             </div>
         </nav>
     </header>
-    <div class="content-wrapper autoheight" style="margin-left: 0" ui-view>
-        <div class="backgroud">
-            <div class="total_logo">
-                <a><img src="/static/images/manage_total_logo.png"> </a>
-                <div class="easypay">
-                    <b>Easy Business，Easy Payment!</b>
-                </div>
+    <!--end:顶部导航栏-->
+    <!-- Left side column. contains the logo and sidebar -->
+    <!--左边栏-->
+    <aside class="main-sidebar" style="height: 100%;max-height: 100%;overflow: auto;padding-bottom: 50px;">
+        <!--sidebar: style can be found in sidebar.less -->
+        <section class="sidebar">
+
+            <ul class="sidebar-menu">
+
+                <li ui-sref-active="active" ng-if="'dashboard'|withModule">
+                    <a ui-sref="dashboard">
+                        <i class="fa fa-dashboard"></i>
+                        <span>控制台|Dashboard</span>
+                    </a>
+                </li>
 
-            </div>
+                <li class="header nav-header" ng-if="'1011110'|withRole">支付结算|Payment</li>
+                <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 Manage</span>
+                    </a>
+                </li>
 
-            <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;flex-wrap:wrap">
-                <div class="box-items" ng-if="'10'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_1.png">
-                        </div>
-                        <p class="box-font">Compliance</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'10000000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'RiskManager'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_2.png">
-                        </div>
-                        <p class="box-font">Risk Manager</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'100000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'AccountManager'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_3.png">
-                        </div>
-                        <p class="box-font">Account Manager</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'1000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Accountant'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_4.png">
-                        </div>
-                        <p class="box-font">Accountant</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'100'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'BDUser'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_5.png">
-                        </div>
-                        <p class="box-font">BD User</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'10000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Service'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_6.png">
-                        </div>
-                        <p class="box-font">Service</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'1'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Administrator'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_7.png">
-                        </div>
-                        <p class="box-font">Administrator</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'10000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'SiteManager'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_8.png">
-                        </div>
-                        <p class="box-font">Site Manager</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'100000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Developer'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_9.png">
-                        </div>
-                        <p class="box-font">Developer</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'1000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Director'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_10.png">
-                        </div>
-                        <p class="box-font">Director</p>
-                    </a>
-                </div>
-            </div>
+                <li ui-sref-active="active"
+                    ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                    <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
+                        <i class="fa  fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
+                    </a>
+                </li>
+                <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>
+                    </a>
+                </li>
+                <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>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                    <a ui-sref="clearingLogs" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-line-chart"></i> <span>清算统计|Settlement Logs</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('clearing_org'|withModule) && currentUser.org_id>1">
+                    <a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>
+                    </a>
+                </li>
 
-            <div style="text-align: center">
-                <footer>
-                    <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
-                    reserved.
-                </footer>
-            </div>
-        </div>
+                <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>
+                    </a>
+                </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="'1000'|withRole">
+                    <a ui-sref="invoice" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>Partner Invoice</span>
+                    </a>
+                </li>
+
+                <li class="header nav-header"
+                    ng-if="('1011110'|withRole) || currentUser.org_id==null">营销服务|Promotion
+                </li>
+
+              <li ui-sref-active="active" ng-if="'appAct'|withModule">
+                    <a ui-sref="appAct">
+                        <i class="fa fa-file-text-o"></i> <span>活动管理|Activity Manage</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}">
+               <i class="fa fa-compass"></i> <span>店长行动|Activities</span>
+               </a>
+               </li>
+               <li ui-sref-active="active" ng-if="('act_redpack'|withModule)">
+                   <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_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="('encourage'|withModule)">
+                    <a ui-sref="encourageAct">
+                        <i class="fa fa-gift"></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="('cashbackAnalysis'|withModule)">
+                    <a ui-sref="cashbackAnalysis">
+                        <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 ui-sref-active="active" ng-if="'settleDelay'|withModule">
+                    <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>周末费率减半活动</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'monDelay'|withModule">
+                    <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>余额增值活动</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('1'|withRole)">
+                    <a ui-sref="contract">
+                        <i class="fa fa-money"></i> <span>合同签约情况</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'actChairty'|withModule">
+                    <a ui-sref="act_chairty" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></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}">
+                        <i class="fa fa-hand-peace-o"></i> <span>机构数据分析|Agent Analysis</span>
+                    </a>
+                </li>
+
+
+                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">数据分析|Analysis</li>
+
+                <li ui-sref-active="active" ng-if="('transAnalysis'|withModule)||('dashboard'|withModule)||
+                ('customer_analysis'|withModule)||
+                ('customerRankingAnalysisApp'|withModule)||
+                ('partner_analysis'|withModule)">
+                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-area-chart"></i> <span>交易|Transaction Analysis</span>
+                    </a>
+                </li>
+
+
+                <li ui-sref-active="active"
+                    ng-if="('bdsale'|withModule)||('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">
+                    <a ui-sref="analysis_bd" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-hand-peace-o"></i> <span>BD|BD Analysis</span>
+                    </a>
+                </li>
+
+
+                <li ui-sref-active="active"
+                    ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))||('orgcommission'|withModule)">
+                    <a ui-sref="analysis_org" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-hand-peace-o"></i> <span>合伙人|Partners Analysis</span>
+                    </a>
+                </li>
+
+
+                <li ui-sref-active="active" ng-if="('clientrate'|withModule)||('monitor'|withModule)">
+                    <a ui-sref="analysis_monitoring" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-shopping-cart"></i> <span>监控|Monitoring</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('settleReport'|withModule)||('platformRevenue'|withModule)">
+                    <a ui-sref="analysis_report" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-tv"></i> <span>报表|Report</span>
+                    </a>
+                </li>
+
+
+                <li class="header nav-header" ng-if="'0100001'|withRole">基础设置|Basic Settings</li>
+                <li ui-sref-active="active" ng-if="('10'|withRole)&&('merchantIdManage'|withModule)">
+                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
+                        <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
+                    </a>
+                </li>
+                <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>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
+                    <a ui-sref="managers" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-key"></i> <span>账号管理|Accounts</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'dev'|withModule">
+                    <a ui-sref="devtools">
+                        <i class="fa fa-cog"></i> <span>开发工具|DevTools</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'notice'|withModule">
+                    <a ui-sref="notice">
+                        <i class="fa fa-bell"></i> <span>通知群发|Notifications</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'log'|withModule">
+                    <a ui-sref="logview">
+                        <i class="fa fa-file-text-o"></i> <span>系统日志|System Logs</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'cms'|withModule">
+                    <a ui-sref="cms">
+                        <i class="fa fa-file-text-o"></i> <span>网站管理|Site Manage</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)">
+                    <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
+                        <i class="fa fa-file-text-o"></i> <span>积分商城|Integral Mall</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active"
+                    ng-if="('device'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                    <a ui-sref="device" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>设备管理|Devices</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'sysconfig'|withModule">
+                    <a ui-sref="sysconfig">
+                        <i class="fa fa-cog"></i> <span>系统参数设定|Settings</span>
+                    </a>
+                </li>
+            </ul>
+
+        </section>
+        <!-- /.sidebar -->
+    </aside>
+    <!--END:左边栏-->
+
+    <!-- Content Wrapper. Contains page content -->
+    <div>
+        <div class="content-wrapper autoheight" ui-view></div>
     </div>
-    <footer ng-if="copyright" class="main-footer" style="margin-left: 0px">
+    <!-- /.content-wrapper -->
+
+    <footer class="main-footer">
         <div class="pull-right hidden-xs">
             <b>Easy Business，Easy Pay</b>
         </div>
         <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
         reserved.
     </footer>
-</div>
 
+</div>
+<!-- ./wrapper -->
 </body>
 </html>
diff --git a/src/main/ui/manage_bak.html b/src/main/ui/manage_bak.html
deleted file mode 100644
index 1aa66dcf6..000000000
--- a/src/main/ui/manage_bak.html
+++ /dev/null
@@ -1,488 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="apple-touch-icon" sizes="57x57" href="ico/apple-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="ico/apple-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="ico/apple-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="ico/apple-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="ico/apple-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="ico/apple-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="ico/apple-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="ico/apple-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="ico/apple-icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="192x192" href="ico/android-icon-192x192.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="ico/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="ico/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="ico/favicon-16x16.png">
-    <link rel="manifest" href="ico/manifest.json">
-    <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
-    <meta name="theme-color" content="#ffffff">
-    <meta name="format-detection" content="telephone=no">
-    <meta charset="UTF-8">
-    <title>RoyalPay</title>
-    <!-- Tell the browser to be responsive to screen width -->
-    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-    <!-- Bootstrap 3.3.5 -->
-    <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css">
-
-
-    <!-- Font Awesome -->
-    <!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">-->
-    <link href="static/lib/font-awesome-4.6.3/css/font-awesome.min.css" rel="stylesheet">
-    <!-- Ionicons -->
-    <link rel="stylesheet" href="static/lib/ioicons-2.0.1/css/ionicons.min.css">
-
-    <!-- Theme style -->
-    <link rel="stylesheet" href="static/lib/dist/css/AdminLTE.min.css">
-    <!-- AdminLTE Skins. Choose a skin from the css/skins
-         folder instead of downloading all of them to reduce the load. -->
-    <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">
-        .ng-cloak, [ng-cloak] {
-            display: none !important;
-        }
-
-        @keyframes myfirst {
-            0% {
-                transform: rotateY(1deg);
-            }
-            100% {
-                transform: rotateY(90deg);
-            }
-        }
-
-        div.polaroid {
-            text-align: center;
-        }
-
-        div.rotate_left {
-            position: fixed;
-            width: 200px;
-            margin: 0 -100px;
-            top: 40%;
-            left: 50%;
-            z-index: 9999999;
-        }
-
-        .dh {
-            animation: myfirst 1s linear 0s infinite alternate;
-        }
-    </style>
-    <script type="text/javascript" src="static/lib/require.js" data-main="static/boot/manager-boot"></script>
-    <script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
-    <script type="text/javascript" src="/static/lib/bootstrap/js/bootstrap.min.js"></script>
-
-</head>
-<body ng-controller="managerIndexCtrl" class="skin-blue sidebar-mini"
-      ng-class="{'sidebar-collapse':hideSideBar,'sidebar-open':hideSideBar}">
-<div class="polaroid" ng-if="currentUser==null">
-    <div class="rotate_left">
-        <img class="dh" src="static/images/r_logo.svg" alt="RoyalPay" style="width:150px;height:150px;margin-top: 10%;
-margin-bottom: 10%;"/>
-        <p style="color: #666">To Be The Best QRCode Payment Service Provider!</p>
-    </div>
-</div>
-<div class="wrapper" ng-if="currentUser!=null" ng-cloak
-     ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'">
-
-    <header class="main-header">
-        &lt;!&ndash; Logo &ndash;&gt;
-        <a href="#" class="logo logo-yedian shine" ng-if="!currentUser.org">
-            &lt;!&ndash; mini logo for sidebar mini 50x50 pixels &ndash;&gt;
-            <span class="logo-mini"><img src="static/images/r_white_logo.svg"
-                                         style="max-height: 35px;margin-left: 15%;"></span>
-            &lt;!&ndash; logo for regular state and mobile devices &ndash;&gt;
-            <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
-                                       style="max-height: 35px;">
-                &lt;!&ndash;<b>RoyalPay</b>&ndash;&gt;
-            </span>
-        </a>
-        <a href="#" class="logo logo-yedian shine" ng-if="currentUser.org">
-            &lt;!&ndash; mini logo for sidebar mini 50x50 pixels &ndash;&gt;
-            <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
-                                         style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
-            &lt;!&ndash; logo for regular state and mobile devices &ndash;&gt;
-            <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
-                                       style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
-                    ng-bind="currentUser.org.name"></b></span>
-        </a>
-        &lt;!&ndash; Header Navbar: style can be found in header.less &ndash;&gt;
-        &lt;!&ndash;顶部导航栏&ndash;&gt;
-        <nav class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
-            &lt;!&ndash; Sidebar toggle button&ndash;&gt;
-            <a class="sidebar-toggle sidebar-tooggle-yedian" data-toggle="offcanvas" role="button"
-               ng-click="toggleHideSideBar()">
-                <span class="sr-only">Toggle navigation</span>
-            </a>
-
-            <div class="navbar-custom-menu">
-                <ul class="nav navbar-nav">
-                    <li class="user-menu" ng-if="currentUser.onoff">
-                        <a role="button" ng-click="customerService()">
-                            <i class="fa fa-wechat"></i> contact service
-                        </a>
-
-                    </li>
-                    <li class="user-menu">
-                        <a role="button" ng-click="managerBindWechat(true)">
-                            <i class="fa fa-wechat"></i> Bind WeChat
-                        </a>
-                    </li>
-                    <li ng-if="('110'|withRole)" ng-class="{'dropdown notifications-menu open':openNotice,'dropdown notifications-menu':!openNotice}">
-                        <a title="New Notice" ng-click="toggleOpenNotice()"  class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
-                            <i class="fa fa-bell-o"></i>
-                            <span class="label label-warning" ng-if="notifyCounts">{{notifyCounts}}</span>
-                        </a>
-                        <ul class="dropdown-menu">
-                            &lt;!&ndash;<li class="header">System notifications,please resolve it!</li>&ndash;&gt;
-                            <li>
-                                &lt;!&ndash; inner menu: contains the actual data &ndash;&gt;
-                                <div class="slimScrollDiv" style="position: relative; overflow: hidden; width: auto; max-height: 200px;"><ul class="menu" style="overflow: hidden; width: 100%;">
-                                    <li>
-                                    <a ng-if="partner_application_new" ui-sref="partner_apply">
-                                        <i class="fa fa-commenting"></i>
-                                        新的自主申请商户<span style="font-size:smaller;float:right;right: 0"></span>
-                                    </a>
-                                    </li>
-                                    <li>
-                                    <a ng-if="refundReviews && ('10000000000'|withRole)" ui-sref="refundReview">
-                                        <i class="fa fa-commenting"></i>
-                                        新的退款申请<span style="font-size:smaller;float:right;right: 0"></span>
-                                    </a>
-                                    </li>
-                                </ul><div class="slimScrollBar" style="background: rgb(0, 0, 0); width: 3px; position: absolute; top: 0px; opacity: 0.4; display: none; border-radius: 7px; z-index: 99; right: 1px; height: 195.122px;"></div><div class="slimScrollRail" style="width: 3px; height: 100%; position: absolute; top: 0px; display: none; border-radius: 7px; background: rgb(51, 51, 51); opacity: 0.2; z-index: 90; right: 1px;"></div></div>
-                            </li>
-                        </ul>
-                    </li>
-
-                    &lt;!&ndash; User Account: style can be found in dropdown.less &ndash;&gt;
-                    <li class="dropdown user user-menu" uib-dropdown>
-                        <a href class="dropdown-toggle" uib-dropdown-toggle>
-                            <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
-                                 class="user-image user-img-yedian"
-                                 alt="User Image">
-                            <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
-                        </a>
-                        <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
-                            &lt;!&ndash; User image &ndash;&gt;
-                            <li class="user-header user-header-yedian">
-                                <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
-                                     alt="User Image">
-
-                                <p>
-                                    {{currentUser.display_name}}
-                                    <small>
-                                        <i class="fa fa-user-secret" title="Administrator"
-                                           ng-class="{'text-orange':!('1'|withRole),'text-gray':('1'|withRole)}"></i>
-                                        <i class="fa fa-eye" title="Compliance"
-                                           ng-class="{'text-orange':!('10'|withRole),'text-gray':('10'|withRole)}"></i>
-                                        <i class="fa fa-crosshairs" title="BD User"
-                                           ng-class="{'text-orange':!('100'|withRole),'text-gray':('100'|withRole)}"></i>
-                                        <i class="fa fa-balance-scale" title="Accountant"
-                                           ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
-                                        <i class="fa fa-tty" title="Service"
-                                           ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
-                                        <i class="fa fa-university" title="Account Manager"
-                                           ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
-                                        <i class="fa fa-line-chart" title="Director"
-                                           ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
-                                        <i class="fa fa-map-o" title="Site Manager"
-                                           ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
-                                        <i class="fa fa-code" title="Developer"
-                                           ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
-                                        <i class="fa fa-user" title="Risk Manager"
-                                           ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
-                                        <i class="fa fa-tripadvisor" title="GUEST"
-                                           ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
-                                        <i class="fa fa-user-plus" title="Org Manager"
-                                           ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
-                                    </small>
-                                </p>
-                            </li>
-                            &lt;!&ndash; Menu Footer&ndash;&gt;
-                            <li class="user-footer">
-                                <div class="pull-left">
-                                    <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
-                                </div>
-                                <div class="pull-right">
-                                    <a href class="btn btn-default btn-flat" ng-click="logout()">Sign Out</a>
-                                </div>
-                            </li>
-                        </ul>
-                    </li>
-                    &lt;!&ndash; Control Sidebar Toggle Button &ndash;&gt;
-                </ul>
-            </div>
-        </nav>
-    </header>
-    <!--end:顶部导航栏-->
-    <!-- Left side column. contains the logo and sidebar -->
-    <!--左边栏-->
-
-    <aside class="main-sidebar" style="height: 100%;max-height: 100%;overflow: auto;padding-bottom: 50px;">
-        &lt;!&ndash; sidebar: style can be found in sidebar.less &ndash;&gt;
-        <section class="sidebar">
-
-            <ul class="sidebar-menu">
-
-                <li ui-sref-active="active" ng-if="'dashboard'|withModule">
-                    <a ui-sref="dashboard">
-                        <i class="fa fa-dashboard"></i>
-                        <span>控制台|Dashboard</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="'1011110'|withRole">支付结算|Payment</li>
-                <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 Manage</span>
-                    </a>
-                </li>
-
-                <li ui-sref-active="active"
-                    ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
-                        <i class="fa  fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
-                    </a>
-                </li>
-                <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>
-                    </a>
-                </li>
-                <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>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'clearing'|withModule">
-                    <a ui-sref="clearingLogs" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-line-chart"></i> <span>清算统计|Settlement Logs</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('clearing_org'|withModule) && currentUser.org_id>1">
-                    <a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>
-                    </a>
-                </li>
-
-                <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>
-                    </a>
-                </li>
-
-               &lt;!&ndash; <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>&ndash;&gt;
-
-                <li ui-sref-active="active" ng-if="'1000'|withRole">
-                    <a ui-sref="invoice" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>Partner Invoice</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header"
-                    ng-if="('1011110'|withRole) || currentUser.org_id==null">营销服务|Promotion
-                </li>
-
-              <li ui-sref-active="active" ng-if="'appAct'|withModule">
-                    <a ui-sref="appAct">
-                        <i class="fa fa-file-text-o"></i> <span>活动管理|Activity Manage</span>
-                    </a>
-                </li>
-                &lt;!&ndash;
-               <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}">
-               <i class="fa fa-compass"></i> <span>店长行动|Activities</span>
-               </a>
-               </li>
-               <li ui-sref-active="active" ng-if="('act_redpack'|withModule)">
-                   <a ui-sref="act_partners" ui-sref-opts="{reload:true}">
-                       <i class="fa fa-compass"></i> <span>店长行动参与情况</span>
-                   </a>
-               </li>&ndash;&gt;
-
-                &lt;!&ndash;<li ui-sref-active="active" ng-if="('act_redpack'|withModule) && (currentUser.org_id==1 || currentUser.org_id==null)">&ndash;&gt;
-                &lt;!&ndash;<a ui-sref="act_partners" ui-sref-opts="{reload:true}">&ndash;&gt;
-                &lt;!&ndash;<i class="fa fa-compass"></i> <span>新费率签约情况</span>&ndash;&gt;
-                &lt;!&ndash;</a>&ndash;&gt;
-                &lt;!&ndash;</li>&ndash;&gt;
-
-               <li ui-sref-active="active" ng-if="('encourage'|withModule)">
-                    <a ui-sref="encourageAct">
-                        <i class="fa fa-gift"></i> <span>鼓励金</span>
-                    </a>
-                </li>
-
-                &lt;!&ndash;<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>&ndash;&gt;
-
-
-                <li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
-                    <a ui-sref="cashbackAnalysis">
-                        <i class="fa fa-gift"></i> <span>商户营销账户</span>
-                    </a>
-                </li>
-
-               &lt;!&ndash; <li ui-sref-active="active" ng-if="('funds'|withModule)">
-                    <a ui-sref="funds">
-                        <i class="fa fa-money"></i> <span>增值计划</span>
-                    </a>
-                </li>&ndash;&gt;
-
-                <li ui-sref-active="active" ng-if="'settleDelay'|withModule">
-                    <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>周末费率减半活动</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'monDelay'|withModule">
-                    <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>余额增值活动</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('1'|withRole)">
-                    <a ui-sref="contract">
-                        <i class="fa fa-money"></i> <span>合同签约情况</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'actChairty'|withModule">
-                    <a ui-sref="act_chairty" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></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}">
-                        <i class="fa fa-hand-peace-o"></i> <span>机构数据分析|Agent Analysis</span>
-                    </a>
-                </li>
-
-
-                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">数据分析|Analysis</li>
-
-                <li ui-sref-active="active" ng-if="('transAnalysis'|withModule)||('dashboard'|withModule)||
-                ('customer_analysis'|withModule)||
-                ('customerRankingAnalysisApp'|withModule)||
-                ('partner_analysis'|withModule)">
-                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-area-chart"></i> <span>交易|Transaction Analysis</span>
-                    </a>
-                </li>
-
-
-                <li ui-sref-active="active"
-                    ng-if="('bdsale'|withModule)||('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="analysis_bd" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-hand-peace-o"></i> <span>BD|BD Analysis</span>
-                    </a>
-                </li>
-
-
-                <li ui-sref-active="active"
-                    ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))||('orgcommission'|withModule)">
-                    <a ui-sref="analysis_org" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-hand-peace-o"></i> <span>合伙人|Partners Analysis</span>
-                    </a>
-                </li>
-
-
-                <li ui-sref-active="active" ng-if="('clientrate'|withModule)||('monitor'|withModule)">
-                    <a ui-sref="analysis_monitoring" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-shopping-cart"></i> <span>监控|Monitoring</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('settleReport'|withModule)||('platformRevenue'|withModule)">
-                    <a ui-sref="analysis_report" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-tv"></i> <span>报表|Report</span>
-                    </a>
-                </li>
-
-
-                <li class="header nav-header" ng-if="'0100001'|withRole">基础设置|Basic Settings</li>
-                <li ui-sref-active="active" ng-if="('10'|withRole)&&('merchantIdManage'|withModule)">
-                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
-                        <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
-                    </a>
-                </li>
-                <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>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
-                    <a ui-sref="managers" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-key"></i> <span>账号管理|Accounts</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'dev'|withModule">
-                    <a ui-sref="devtools">
-                        <i class="fa fa-cog"></i> <span>开发工具|DevTools</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'notice'|withModule">
-                    <a ui-sref="notice">
-                        <i class="fa fa-bell"></i> <span>通知群发|Notifications</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'log'|withModule">
-                    <a ui-sref="logview">
-                        <i class="fa fa-file-text-o"></i> <span>系统日志|System Logs</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'cms'|withModule">
-                    <a ui-sref="cms">
-                        <i class="fa fa-file-text-o"></i> <span>网站管理|Site Manage</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)">
-                    <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
-                        <i class="fa fa-file-text-o"></i> <span>积分商城|Integral Mall</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active"
-                    ng-if="('device'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="device" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>设备管理|Devices</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'sysconfig'|withModule">
-                    <a ui-sref="sysconfig">
-                        <i class="fa fa-cog"></i> <span>系统参数设定|Settings</span>
-                    </a>
-                </li>
-            </ul>
-
-        </section>
-        &lt;!&ndash; /.sidebar &ndash;&gt;
-    </aside>
-
-    <!--END:左边栏-->
-
-    <!-- Content Wrapper. Contains page content -->
-    <div>
-        <div class="content-wrapper autoheight" ui-view></div>
-    </div>
-    <!-- /.content-wrapper -->
-
-    <footer class="main-footer">
-        <div class="pull-right hidden-xs">
-            <b>Easy Business，Easy Pay</b>
-        </div>
-        <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
-        reserved.
-    </footer>
-
-</div>
-<!-- ./wrapper -->
-</body>
-</html>
diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
new file mode 100644
index 000000000..13ccee754
--- /dev/null
+++ b/src/main/ui/managev2.html
@@ -0,0 +1,439 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="apple-touch-icon" sizes="57x57" href="ico/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="ico/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="ico/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="ico/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="ico/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="ico/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="ico/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="ico/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="ico/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192" href="ico/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="ico/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="ico/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="ico/favicon-16x16.png">
+    <link rel="manifest" href="ico/manifest.json">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
+    <meta name="theme-color" content="#ffffff">
+    <meta name="format-detection" content="telephone=no">
+    <meta charset="UTF-8">
+    <title>RoyalPay</title>
+    <!-- Tell the browser to be responsive to screen width -->
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <!-- Bootstrap 3.3.5 -->
+    <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css">
+
+
+    <!-- Font Awesome -->
+    <!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">-->
+    <link href="static/lib/font-awesome-4.6.3/css/font-awesome.min.css" rel="stylesheet">
+    <!-- Ionicons -->
+    <link rel="stylesheet" href="static/lib/ioicons-2.0.1/css/ionicons.min.css">
+
+    <!-- Theme style -->
+    <link rel="stylesheet" href="static/lib/dist/css/AdminLTE.min.css">
+    <!-- AdminLTE Skins. Choose a skin from the css/skins
+         folder instead of downloading all of them to reduce the load. -->
+    <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;
+            color: #FFFFFF;
+            letter-spacing: 0px;
+            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;
+        }
+
+        @keyframes myfirst {
+            0% {
+                transform: rotateY(1deg);
+            }
+            100% {
+                transform: rotateY(90deg);
+            }
+        }
+
+        div.polaroid {
+            text-align: center;
+        }
+
+        div.rotate_left {
+            position: fixed;
+            width: 200px;
+            margin: 0 -100px;
+            top: 40%;
+            left: 50%;
+            z-index: 9999999;
+        }
+
+        .dh {
+            animation: myfirst 1s linear 0s infinite alternate;
+        }
+
+        .description-text {
+            margin-top: 5px;
+            /*width: 86px;*/
+        }
+
+        .list-group label {
+            border-bottom: 1px solid #333333;
+            font-size: 20px;
+            color: #333333;
+        }
+        .navbar-header a{
+            color: #FFF;
+        }
+        .navbar-header .active{
+            background-color: #FFF !important;
+        }
+        .navbar-header .active a{
+            color: #f06101 !important;
+        }
+        .navbar-header li {
+            float: left;
+            border: 1px solid #FFF;
+            padding: 3px 15px;
+        }
+        @media (min-width: 768px) {
+            .navbar-header {
+                list-style: none;
+                width: 245px;
+                position: absolute;
+                left: 0;
+                right: 0;
+                margin: 10px auto;
+            }
+        }
+
+        @media (max-width: 768px) {
+            .navbar-header {
+                list-style: none;
+                width: 245px;
+                margin: 10px auto;
+            }
+        }
+    </style>
+    <script type="text/javascript" src="static/lib/require.js" data-main="static/boot/manager-bootv2"></script>
+    <script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
+    <script type="text/javascript" src="/static/lib/bootstrap/js/bootstrap.min.js"></script>
+
+</head>
+<body ng-controller="managerIndexCtrl" class="skin-blue sidebar-mini"
+      ng-class="{'sidebar-collapse':hideSideBar,'sidebar-open':hideSideBar}">
+<div class="polaroid" ng-if="currentUser==null">
+    <div class="rotate_left">
+        <img class="dh" src="static/images/r_logo.svg" alt="RoyalPay" style="width:150px;height:150px;margin-top: 10%;
+margin-bottom: 10%;"/>
+        <p style="color: #666">To Be The Best QRCode Payment Service Provider!</p>
+    </div>
+</div>
+
+
+<div ng-if="currentUser!=null" ng-cloak
+     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">
+
+            <!-- Logo -->
+            <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="!currentUser.org">
+                <!-- mini logo for sidebar mini 50x50 pixels -->
+                <span class="logo-mini"><img src="static/images/r_white_logo.svg"
+                                             style="max-height: 35px;margin-left: 15%;"></span>
+                <!-- logo for regular state and mobile devices -->
+                <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
+                                           style="max-height: 35px;">
+                    <b>RoyalPay</b>
+
+            </span>
+            </a>
+            <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="currentUser.org">
+                <!-- mini logo for sidebar mini 50x50 pixels -->
+                <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
+                                             style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
+                <!-- logo for regular state and mobile devices -->
+                <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
+                                           style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
+                        ng-bind="currentUser.org.name"></b></span>
+            </a>
+            <ul class="navbar-header">
+                <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>
+                <li ui-sref-active="active" style="border-bottom-right-radius: 5px;border-top-right-radius: 5px;">
+                    <a ui-sref="listMenu" role="button">Main Menu</a>
+                </li>
+            </ul>
+            <!--<div class="navbar-header">-->
+                <!--<a ui-sref="dashboard" role="button"-->
+                   <!--style="border: 1px solid #FFF; color: #FFF;padding: 3px">Dashboard</a>-->
+                <!--<a ui-sref="listMenu({role:''})" ui-sref-opts="{reload:true}" role="button"-->
+                   <!--style="border: 1px solid #FFF; color: #FFF;padding: 3px">Main Menu</a>-->
+            <!--</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="nav navbar-nav">
+                    <li class="user-menu" ng-if="currentUser.onoff">
+                        <a role="button" ng-click="customerService()">
+                            <i class="fa fa-wechat"></i> contact service
+                        </a>
+
+                    </li>
+                    <li class="user-menu">
+                        <a role="button" ng-click="managerBindWechat(true)">
+                            <i class="fa fa-wechat"></i> Bind WeChat
+                        </a>
+                    </li>
+
+                    <!-- User Account: style can be found in dropdown.less -->
+                    <li class="dropdown user user-menu" uib-dropdown>
+                        <a href class="dropdown-toggle" uib-dropdown-toggle>
+                            <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
+                                 class="user-image user-img-yedian"
+                                 alt="User Image">
+                            <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
+                        </a>
+                        <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
+                            <!-- User image -->
+                            <li class="user-header user-header-yedian">
+                                <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
+                                     class="img-circle"
+                                     alt="User Image">
+
+                                <p>
+                                    {{currentUser.display_name}}
+                                    <small>
+                                        <i class="fa fa-user-secret" title="Administrator"
+                                           ng-class="{'text-orange':!('1'|withRole),'text-gray':('1'|withRole)}"></i>
+                                        <i class="fa fa-eye" title="Compliance"
+                                           ng-class="{'text-orange':!('10'|withRole),'text-gray':('10'|withRole)}"></i>
+                                        <i class="fa fa-crosshairs" title="BD User"
+                                           ng-class="{'text-orange':!('100'|withRole),'text-gray':('100'|withRole)}"></i>
+                                        <i class="fa fa-balance-scale" title="Accountant"
+                                           ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
+                                        <i class="fa fa-tty" title="Service"
+                                           ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
+                                        <i class="fa fa-university" title="Account Manager"
+                                           ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
+                                        <i class="fa fa-line-chart" title="Director"
+                                           ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
+                                        <i class="fa fa-map-o" title="Site Manager"
+                                           ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
+                                        <i class="fa fa-code" title="Developer"
+                                           ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
+                                        <i class="fa fa-user" title="Risk Manager"
+                                           ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
+                                        <i class="fa fa-tripadvisor" title="GUEST"
+                                           ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
+                                        <i class="fa fa-user-plus" title="Org Manager"
+                                           ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
+                                    </small>
+                                </p>
+                            </li>
+                            <!-- Menu Footer-->
+                            <li class="user-footer">
+                                <div class="pull-left">
+                                    <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
+                                </div>
+                                <div class="pull-right">
+                                    <a href class="btn btn-default btn-flat" ng-click="logout()">Sign Out</a>
+                                </div>
+                            </li>
+                        </ul>
+                    </li>
+                    <!-- Control Sidebar Toggle Button -->
+                </ul>
+            </div>
+        </nav>
+    </header>
+    <div style="margin-left: 0;min-height: 890px" ui-view autoscroll="false">
+        <div class="backgroud">
+            <div class="total_logo">
+                <a><img src="/static/images/manage_total_logo.png"> </a>
+                <div class="easypay">
+                    <b>Easy Business，Easy Payment!</b>
+                </div>
+
+            </div>
+
+            <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;min-height:626px;flex-wrap:wrap">
+                <div class="box-items" ng-if="'10'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_1.png">
+                        </div>
+                        <p class="box-font">Compliance</p>
+                    </a>
+                </div>
+
+                <div class="box-items" ng-if="'10000000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'RiskManager'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_2.png">
+                        </div>
+                        <p class="box-font">Risk Manager</p>
+                    </a>
+                </div>
+
+                <div class="box-items" ng-if="'100000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'AccountManager'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_3.png">
+                        </div>
+                        <p class="box-font">Account Manager</p>
+                    </a>
+                </div>
+
+                <div class="box-items" ng-if="'1000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Accountant'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_4.png">
+                        </div>
+                        <p class="box-font">Accountant</p>
+                    </a>
+                </div>
+
+                <div class="box-items" ng-if="'100'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'BDUser'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_5.png">
+                        </div>
+                        <p class="box-font">BD User</p>
+                    </a>
+                </div>
+
+                <div class="box-items" ng-if="'10000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Service'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_6.png">
+                        </div>
+                        <p class="box-font">Service</p>
+                    </a>
+                </div>
+
+                <div class="box-items" ng-if="'1'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Administrator'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_7.png">
+                        </div>
+                        <p class="box-font">Administrator</p>
+                    </a>
+                </div>
+
+                <div class="box-items" ng-if="'10000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'SiteManager'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_8.png">
+                        </div>
+                        <p class="box-font">Site Manager</p>
+                    </a>
+                </div>
+
+                <div class="box-items" ng-if="'100000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Developer'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_9.png">
+                        </div>
+                        <p class="box-font">Developer</p>
+                    </a>
+                </div>
+
+                <div class="box-items" ng-if="'1000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Director'})" ui-sref-opts="{reload:true}">
+                        <div class="boxs">
+                            <img src="/static/images/manage/menu_10.png">
+                        </div>
+                        <p class="box-font">Director</p>
+                    </a>
+                </div>
+            </div>
+
+            <div style="text-align: center">
+                <footer>
+                    <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
+                    reserved.
+                </footer>
+            </div>
+        </div>
+    </div>
+    <footer ng-if="copyright" class="main-footer" style="margin-left: 0px">
+        <div class="pull-right hidden-xs">
+            <b>Easy Business，Easy Pay</b>
+        </div>
+        <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
+        reserved.
+    </footer>
+</div>
+
+</body>
+</html>
diff --git a/src/main/ui/static/boot/manager-bootv2.js b/src/main/ui/static/boot/manager-bootv2.js
new file mode 100644
index 000000000..44f3bd5cb
--- /dev/null
+++ b/src/main/ui/static/boot/manager-bootv2.js
@@ -0,0 +1,90 @@
+/**
+ * Created by yixian on 2016-06-29.
+ */
+require.config({
+    baseUrl: './',
+    waitSeconds: 30,
+    urlArgs: 'bust=' + new Date().getTime(),
+    paths: {
+        jquery: 'static/lib/jquery/jquery-2.1.4.min',
+        uiBootstrap: 'static/lib/angular-plugins/ui-bootstrap-tpls-1.2.4.min',
+        uiRouter: 'static/lib/angular-plugins/angular-ui-router.min',
+        angularChecklist: 'static/lib/angular-plugins/checklist-model',
+        angular: 'static/lib/angularjs/angular.min',
+        angularAnimate: 'static/lib/angularjs/angular-animate.min',
+        angularMessages: 'static/lib/angularjs/angular-messages.min',
+        angularSanitize: 'static/lib/angularjs/angular-sanitize.min',
+        angularLocale: 'static/lib/angularjs/angular-locale_zh-cn',
+        bootSwitch: 'static/lib/bootswitch/bootstrap-switch.min',
+        ngBootSwitch: 'static/lib/angular-plugins/angular-bootstrap-switch.min',
+        ngFileUpload: 'static/lib/ngfileupload/ng-file-upload.min',
+        holder: 'static/lib/holder/holder.min',
+        datetimePicker: 'static/lib/datetime-picker/datetime-picker.min',
+        colorpicker: 'static/lib/colorpicker/js/bootstrap-colorpicker-module.min',
+        qrcode: 'static/lib/jquery/jquery.qrcode.min',
+        sockjs: 'static/lib/websocket/sockjs.min',
+        stomp: 'static/lib/websocket/stomp.min',
+        uiSelect: 'static/lib/angular-plugins/select.min',
+        dragdrop: 'static/lib/angular-plugins/angular-drag-and-drop-lists.min',
+        echarts: 'static/lib/echarts/echarts.min',
+        ueditor: 'static/lib/ueditor/ueditor.all.min',
+        ueditorConfig: 'static/lib/ueditor/ueditor.config',
+        angularEcharts: 'static/commons/angular-echarts',
+        decimal: 'static/lib/decimal/decimal.min',
+        jstz: 'static/lib/timezone/jstz-1.0.4.min'
+    },
+    shim: {
+        'angular': {deps: ['jquery', 'decimal'], exports: 'angular'},
+        'angularLocale': ['angular'],
+        'uiBootstrap': ['angular', 'angularLocale'],
+        'uiRouter': ['angular'],
+        'uiSelect': ['angular', 'css!static/lib/angular-plugins/select.min'],
+        'angularAnimate': ['angular'],
+        'angularMessages': ['angular'],
+        'angularSanitize': ['angular'],
+        'ngFileUpload': ['angular'],
+        'angularChecklist': ['angular'],
+        'datetimePicker': ['angular'],
+        'ngBootSwitch': ['bootSwitch', 'angular'],
+        'bootSwitch': ['jquery', 'css!static/lib/bootswitch/bootstrap-switch.min'],
+        'qrcode': ['jquery'],
+        'colorpicker': ['angular', 'css!static/lib/colorpicker/css/colorpicker.min'],
+        'holder': ['jquery'],
+        'dragdrop': ['angular'],
+        'ueditor': ['ueditorConfig']
+    },
+    map: {
+        '*': {
+            'css': 'static/lib/css.min'
+        }
+    }
+});
+
+require(['angular', 'jquery'], function (angular, $) {
+    $.ajax({
+        url: '/global/userstatus/current_manager',
+        method: 'get',
+        dataType: 'json',
+        success: function (user) {
+            boot(user);
+        },
+        error: function (jqXHR) {
+            if (jqXHR.status == 403) {
+                location.href = 'm_login.html?f=' + encodeURIComponent(location.href);
+            }
+        }
+    });
+
+    function boot(user) {
+        var paths = ['static/boot/managerMainAppv2', 'static/menu/managerMenu','static/analysis/org/analysis-org', 'static/analysis/report/analysis-report', 'static/analysis/monitoring/analysis-monitoring', 'static/analysis/bd/analysis-bd'];
+        var moduleNames = ['managerMainAppv2', 'listMenuApp','analysisTransaction', 'analysisBD', 'analysisOrg', 'analysisMonitoring', 'analysisReport'];
+        window.currentUser = user;
+        angular.forEach(user.modules, function (mod) {
+            paths.push(mod.js_path);
+            moduleNames.push(mod.js_module);
+        });
+        require(paths, function () {
+            angular.bootstrap(document.body, moduleNames)
+        })
+    }
+});
\ No newline at end of file
diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js
index ee3b4db64..b649f08a1 100644
--- a/src/main/ui/static/boot/managerMainApp.js
+++ b/src/main/ui/static/boot/managerMainApp.js
@@ -5,9 +5,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
     'use strict';
     var app = angular.module('managerMainApp', ['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' : '/dashboard');
-*/
         if (!$httpProvider.defaults.headers.get) {
             $httpProvider.defaults.headers.get = {};
         }
@@ -17,19 +15,6 @@ 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 == "#/") {
-                $scope.headerDisplay = false;
-                $scope.copyright = false;
-            }else{
-                $scope.headerDisplay = true;
-                $scope.copyright = true;
-            }
-
-
-            $scope.headerShow  = function () {
-                $scope.headerDisplay = true;
-                $scope.copyright = true;
-            };
             $http.get('/sysconfig/base').then(function (resp) {
                 $rootScope.sysParams = resp.data;
             });
@@ -79,7 +64,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     }
                 })
             };
-          //  $scope.getManagerTodoNotices();
+            $scope.getManagerTodoNotices();
 
 
             var connected;
diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
new file mode 100644
index 000000000..f0f1e5e3c
--- /dev/null
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -0,0 +1,404 @@
+/**
+ * Created by yixian on 2016-06-29.
+ */
+define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRouter', 'uiBootstrap', 'ngFileUpload', 'sockjs', 'stomp'], function (angular) {
+    'use strict';
+    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' : '/dashboard');
+*/
+        if (!$httpProvider.defaults.headers.get) {
+            $httpProvider.defaults.headers.get = {};
+        }
+        $httpProvider.defaults.headers.get['If-Modified-Since'] = 'Mon, 26 Jul 1997 05:00:00 GMT';
+        $httpProvider.defaults.headers.get['Cache-Control'] = 'no-cache';
+        $httpProvider.defaults.headers.get['Pragma'] = 'no-cache';
+    }]);
+    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 == "#/") {
+                $scope.headerDisplay = false;
+                $scope.copyright = false;
+            }else{
+                $scope.headerDisplay = true;
+                $scope.copyright = true;
+            }
+
+
+            $scope.headerShow  = function () {
+                $scope.headerDisplay = true;
+                $scope.copyright = true;
+            };
+            $http.get('/sysconfig/base').then(function (resp) {
+                $rootScope.sysParams = resp.data;
+            });
+            var stompClient = null;
+            $scope.loadCurrentUser = function () {
+                $http.get('/global/userstatus/current_manager').then(function (resp) {
+                    $rootScope.currentUser = resp.data;
+                    // connectWebSocket();
+                    $scope.notifyCounts = 0;
+                    if ($rootScope.currentUser.role & parseInt('110', 2)) {
+                        $scope.loadPartnerApplyNotice();
+                        if (window.currentUser.role & 10000000000) {
+                            $scope.loadRefundNotice();
+                        }
+                    }
+                    // if ($rootScope.currentUser.role ==2 || $rootScope.currentUser.role == 4){
+                    //     $scope.loadPartnerApplyNotice();
+                    // }
+                    if ($rootScope.currentUser.wx_openid == null) {
+                        if ($filter('withRole')('100')) {
+                            $scope.managerBindWechat('static');
+                        } else {
+                            $scope.managerBindWechat(true);
+                        }
+
+                    }
+                }, function (resp) {
+                    if (resp.status == 403) {
+                        location.href = 'm_login.html?f=' + encodeURIComponent(location.href);
+                    }
+                })
+            };
+            $scope.loadCurrentUser();
+
+            $scope.getManagerTodoNotices = function () {
+                $http.get('/global/userstatus/manager_todo_notices').then(function (resp) {
+                    if (resp.data.length) {
+                        $uibModal.open({
+                            controller: 'managerTodoNoticeCtrl',
+                            templateUrl: '/static/boot/templates/manager_todo.html',
+                            resolve: {
+                                notices: function () {
+                                    return resp.data;
+                                }
+                            }
+                        })
+                    }
+                })
+            };
+          //  $scope.getManagerTodoNotices();
+
+
+            var connected;
+            $interval($scope.loadCurrentUser, 300000);
+
+            function connectWebSocket() {
+                if (connected && stompClient) {
+                    return;
+                }
+                var sock = new SockJS('/register');
+                stompClient = window.Stomp.over(sock);
+                stompClient.connect({}, function (frame) {
+                    $log.debug('websocket connected:' + frame);
+                    connected = true;
+                    stompClient.subscribe('/app/common/page_events/' + $rootScope.currentUser.manager_id, function (msg) {
+                        $log.debug('new event notice:' + msg.body);
+                        var msgBody = JSON.parse(msg.body);
+                        $scope.$broadcast(msgBody.event, msgBody.data);
+                    });
+                }, function () {
+                    $log.error('连接失败，3秒后尝试重连');
+                    connected = false;
+                    $timeout(connectWebSocket, 3000);
+                })
+            };
+            connectWebSocket();
+
+            $scope.$on('manager_bind_success', function (evt, msg) {
+                if (msg.key == $scope.checkCode) {
+                    $scope.checkModal != null && $scope.checkModal.close();
+                }
+            });
+
+            $scope.showMyLoginLogs = function () {
+                myLoginLogView.show();
+            };
+
+            $scope.toggleHideSideBar = function () {
+                $scope.hideSideBar = !$scope.hideSideBar;
+            };
+
+            $scope.showQrCode = function (data, backdrop) {
+                return $uibModal.open({
+                    template: '<div style="width: 100%;padding: 10px;">请使用微信扫描<br><div style="width:100%" qrcode="url"></div><p class="text-center"><img class="img-circle img-bordered" style="width: 45px" ng-show="{{wx_headimg}}" ng-src="{{wx_headimg}}">{{wx_nickname}}</p></div>',
+                    controller: ['$scope', 'data', function ($scope, data) {
+                        $scope.url = data.url;
+                        $scope.wx_headimg = data.wx_headimg;
+                        $scope.wx_nickname = data.wx_nickname;
+                    }],
+                    size: 'sm',
+                    resolve: {
+                        data: function () {
+                            return data;
+                        }
+                    },
+                    keyboard: false,
+                    backdrop: backdrop
+
+                })
+            };
+            $scope.logout = function () {
+                $http.put('/global/userstatus/manager_signout').then(function () {
+                    location.href = '/m_login.html';
+                });
+            };
+            $scope.changePwd = function () {
+                $uibModal.open({
+                    templateUrl: '/static/boot/templates/change_pwd_dialog.html',
+                    controller: 'changePwdCtrl',
+                    size: 'sm'
+                }).result.then(function () {
+                    commonDialog.alert({title: '操作成功', content: '您成功修改了密码', type: 'success'})
+                })
+            };
+            $scope.currentUserHasRole = function (role) {
+                return ($scope.currentUser.role & role) > 0
+            };
+            $scope.loadPartnerApplyNotice = function () {
+                var params = {};
+                $http.get('/partners/application/notice', {params: params}).then(function (resp) {
+                    $scope.partner_application_new = resp.data.counts;
+                    if ($scope.partner_application_new) {
+                        $scope.notifyCounts = $scope.notifyCounts + 1;
+                    }
+                })
+
+            };
+            $scope.loadRefundNotice = function () {
+                $http.get('/api/payment/v1.0/refund/orders/notifyReview').then(function (resp) {
+                    $scope.refundReviews = resp.data;
+                    if ($scope.refundReviews) {
+                        $scope.notifyCounts = $scope.notifyCounts + 1;
+                    }
+                });
+            }
+            $scope.openNotice = false;
+            $scope.toggleOpenNotice = function () {
+                var openNotice = angular.copy($scope.openNotice);
+                $scope.openNotice = !openNotice;
+            };
+
+            $scope.managerBindWechat = function (backdrop) {
+                $http.post('/system/manager_wechat_binds').then(function (resp) {
+                    $scope.checkCode = resp.data.bind_id;
+                    if (resp.data.wx_nickname) {
+                        backdrop = true;
+                    }
+                    $scope.checkModal = $scope.showQrCode(resp.data, backdrop);
+                    // $scope.showQrCode(resp.data.url);
+                })
+            }
+            $scope.customerService = function () {
+                $http.put('/sys/openim/check').then(function (resp) {
+                    window.open('/service_client.html?key='+resp.data.appkey+'&p='+resp.data.password+'&uid='+resp.data.user_id,'_blank');
+                });
+            }
+
+        }]);
+    app.controller('changePwdCtrl', ['$scope', '$http', function ($scope, $http) {
+        $scope.formData = {};
+        $scope.submit = function (form) {
+            if (form.$invalid) {
+                angular.forEach(form, function (item, key) {
+                    if (key.indexOf('$') <= 0) {
+                        item.$dirty = true;
+                        $scope.errmsg = '请输入密码';
+                    }
+                });
+                return;
+            }
+            // $scope.errmsg = null;
+            // if($scope.formData.pwd && $scope.formData.pwd.length < 8){
+            //     $scope.errmsg = '密码必须大于8位！';
+            //     return;
+            // }
+            // var regex = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/;
+            // if($scope.formData.pwd &&!regex.test($scope.formData.pwd)){
+            //     $scope.errmsg = '密码需要由8-16位数字以及字母组成';
+            //     return;
+            // }
+            if ($scope.formData.pwd != $scope.formData.repeatpwd) {
+                $scope.errmsg = '两次输入密码不一致';
+                return;
+            }
+            $scope.errmsg = null;
+            $http.put('/global/userstatus/manager_password', $scope.formData).then(function () {
+                $scope.$close();
+            }, function (resp) {
+                $scope.errmsg = resp.data.message;
+            })
+        }
+    }]);
+    app.controller('managerTodoNoticeCtrl', ['$scope', 'notices', function ($scope, notices) {
+        $scope.notices = notices;
+    }]);
+
+    app.controller('blankCtrl', ['$scope', function ($scope) {
+    }]);
+
+    app.factory('myLoginLogView', ['$uibModal', function ($uibModal) {
+        return {
+            show: function () {
+                $uibModal.open({
+                    templateUrl: '/static/boot/templates/user_login_logs.html',
+                    controller: ['$scope', '$http', function ($scope, $http) {
+                        $scope.pagination = {};
+                        $scope.getMyLoginLogs = function (page) {
+                            var params = {page: page || $scope.pagination.page || 1};
+                            $http.get('/global/userstatus/current_manager/login_logs', {params: params}).then(function (resp) {
+                                $scope.pagination = resp.data.pagination;
+                                $scope.loginLogs = resp.data.data;
+                            })
+                        };
+                        $scope.getMyLoginLogs();
+                    }]
+                })
+            }
+        }
+    }]);
+    app.filter('withRole', ['$rootScope', function ($rootScope) {
+        return function (roleCode) {
+            if (angular.isNumber(roleCode)) {
+                var code = roleCode;
+            } else {
+                code = parseInt(roleCode, 2);
+            }
+            return ($rootScope.currentUser.role & code) > 0
+        }
+    }]);
+    app.filter('withModule', ['$rootScope', function ($rootScope) {
+        return function (moduleName) {
+            return $rootScope.currentUser.module_names.indexOf(moduleName) >= 0;
+        }
+    }]);
+    app.filter('withFunc', ['$rootScope', function ($rootScope) {
+        return function (funcName) {
+            return $rootScope.currentUser.available_func_names.indexOf(funcName) >= 0;
+        }
+    }]);
+
+    app.filter('tradeStatus', function () {
+        return function (status) {
+            switch (status + '') {
+                case '0':
+                    return 'Creating';
+                case '1':
+                    return 'Failed Create Order';
+                case '2':
+                    return 'Wait For Payment';
+                case '3':
+                    return 'Closed';
+                case '4':
+                    return 'Payment Failed';
+                case '5':
+                    return 'Payment Successful';
+                case '6':
+                    return 'Partial Refund';
+                case '7':
+                    return 'Full Refund';
+            }
+        }
+    });
+    app.filter('refundStatus', function () {
+        return function (status) {
+            switch (status + '') {
+                case '0':
+                case'1':
+                    return 'Submit Failed';
+                case '2':
+                    return 'Submit Success';
+                case '3':
+                    return 'Failed';
+                case '4':
+                    return 'Success';
+                case '5':
+                    return 'Change'
+            }
+        }
+    });
+    app.filter('tradeGateway', function () {
+        return function (gateway) {
+            switch (gateway + '') {
+                case '0':
+                    return '线下扫码';
+                case '1':
+                    return '线下扫码';
+                case '2':
+                    return '商户静态码';
+                case '3':
+                    return '线上网关';
+                case '4':
+                    return 'JSAPI网关';
+                case '5':
+                    return '线下网关';
+                case '6':
+                    return '线下网关';
+                case '7':
+                    return '商户静态码';
+                case '8':
+                    return 'Mobile H5';
+                case '9':
+                    return '第三方网关';
+                case '10':
+                    return 'APP网关';
+                case '11':
+                    return '账单码';
+                case '12':
+                    return '小程序';
+                case '13':
+                    return '原生二维码';
+                case '14':
+                    return '账单链接'
+            }
+        }
+    });
+
+    app.constant('uiDatetimePickerConfig', {
+        dateFormat: 'yyyy-MM-dd HH:mm',
+        defaultTime: '00:00:00',
+        html5Types: {
+            date: 'yyyy-MM-dd',
+            'datetime-local': 'yyyy-MM-ddTHH:mm:ss.sss',
+            'month': 'yyyy-MM'
+        },
+        initialPicker: 'date',
+        reOpenDefault: false,
+        enableDate: true,
+        enableTime: true,
+        buttonBar: {
+            show: true,
+            now: {
+                show: true,
+                text: '现在'
+            },
+            today: {
+                show: true,
+                text: '今天'
+            },
+            clear: {
+                show: true,
+                text: '清空'
+            },
+            date: {
+                show: true,
+                text: '日期'
+            },
+            time: {
+                show: true,
+                text: '时间'
+            },
+            close: {
+                show: true,
+                text: '关闭'
+            }
+        },
+        closeOnDateSelection: true,
+        appendToBody: false,
+        altInputFormats: [],
+        ngModelOptions: {}
+    });
+    return app;
+});
\ No newline at end of file
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index 8312b18cb..a9149498e 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -8,24 +8,58 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
             templateUrl: 'main_menu.html'
         });
     }]);
-    app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal', 'commonDialog','$stateParams', function ($scope, $http,$filter, $uibModal, commonDialog,$stateParams) {
-        $scope.display = function () {
-            var json = {};
-            $(".list-group").each(function () {
-                var child = ($(".list-group").find('a')).length;
-                var label = ($(".list-group").find("label:first-child")).val();
-                if (child >0) {
-                    json[label] = true;
-                }else {
-                    json[label] = false;
-                }
-            });
-            return json;
+    app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal','$location', '$anchorScroll','$stateParams', function ($scope, $http,$filter, $uibModal,$location, $anchorScroll,$stateParams) {
+
+        var gotohash = function (role) {
+            switch (role) {
+                case "Compliance" :
+                    $location.hash('partners');
+                    $anchorScroll();
+                    break;
+                case "RiskManager" :
+                    $location.hash('risk');
+                    $anchorScroll();
+                    break;
+                case "AccountManager" :
+                    $location.hash('org');
+                    $anchorScroll();
+                    break;
+                case "Accountant" :
+                    $location.hash('clearing');
+                    $anchorScroll();
+                    break;
+                case "BDUser" :
+                    $location.hash('bd');
+                    $anchorScroll();
+                    break;
+                case "Service" :
+                    $location.hash('art');
+                    $anchorScroll();
+                    break;
+                case "Administrator" :
+                    $location.hash('setting');
+                    $anchorScroll();
+                    break;
+                case "SiteManager" :
+                    $location.hash('cms');
+                    $anchorScroll();
+                    break;
+                case "Developer" :
+                    $location.hash('develop');
+                    $anchorScroll();
+                    break;
+                case "Director" :
+                    $location.hash('staff');
+                    $anchorScroll();
+                    break;
+                default:
+                    break;
+            }
+
         };
-        function init() {
-            console.log("dadadadada  + " + $stateParams.role);
-            /*console.log("json   + " + $scope.display());*/
-        }
+
+        gotohash($stateParams["role"]);
+
         $scope.editRateConfig = function () {
             $uibModal.open({
                 templateUrl: '/static/config/bdprize/templates/rate_config_dialog.html',
@@ -46,7 +80,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
             })
         };
 
-        init();
+
 
     }]);
     app.controller('bdRateConfigCtrl', ['$scope', '$http', 'rates', function ($scope, $http, rates) {

From 546df5fef06d71e63bf2d2733849f7b6861bf47e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 12 Oct 2018 18:23:13 +0800
Subject: [PATCH 17/82] fix rpay+ modifySurchargeConfig on

---
 .../manage/dev/core/impl/ManualServiceimpl.java        |  6 +++---
 .../manage/merchants/core/impls/ClientManagerImpl.java | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
index f40ad5a7e..c5f08f985 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
@@ -103,9 +103,9 @@ public class ManualServiceimpl implements ManualService {
             record.put("manager_name", "System");
             record.put("remark", "费率到期系统自动延期1年");
             clientRateMapper.saveRate(record);
-//            if ("Rpay".equals(o.getString("rate_name"))) {
-//                rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
-//            }
+            if ("Rpay".equals(o.getString("rate_name"))) {
+                rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
+            }
 
         });
         clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client_moniker, "tax_in_surcharge", false));
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 120dc8340..5e86590dc 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -1600,7 +1600,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate");
         configNewClientRate(config, clientId, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate");
         //todo 暂不更新Rpay+ 费率信息
-//        rpayApi.modifySurchargeConfig(client);
+        rpayApi.modifySurchargeConfig(client);
 
     }
 
@@ -1644,9 +1644,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         configJson.put("manager_name", manager.getString("username"));
         configJson.put("update_time", new Date());
         clientRateMapper.updateConfig(configJson);
-//        if ("Rpay".equals(configJson.getString("rate_name"))) {
-//            rpayApi.modifySurchargeConfig(client);
-//        }
+        if ("Rpay".equals(configJson.getString("rate_name"))) {
+            rpayApi.modifySurchargeConfig(client);
+        }
         int clientId = client.getIntValue("client_id");
         JSONObject changeRate = merchantInfoProvider.clientCurrentRate(clientId, new Date(), "Wechat");
         int cleanDays = changeRate.getIntValue("clean_days");
@@ -4018,7 +4018,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             record.put("remark", "费率到期系统自动延期1年");
             clientRateMapper.saveRate(record);
             if ("Rpay".equals(o.getString("rate_name"))) {
-                //rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
+                rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
             }
         }
         clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client.getString("client_moniker"), "tax_in_surcharge", false));

From bf8a94a62076b3fdd9640c9f0b984ce7ebefd918 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 16 Oct 2018 12:56:08 +0800
Subject: [PATCH 18/82] fix rpay+switchMerchantSettle

---
 .../manage/merchants/core/impls/ClientManagerImpl.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 5e86590dc..f928885fd 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -3193,7 +3193,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account, clientMoniker, "skip_clearing", skip_clearing));
         client.put("skip_clearing", skip_clearing);
-        rpayApi.switchMerchantSettle(client);
+        if (client.getString("rpay_enterprise_id") != null) {
+            rpayApi.switchMerchantSettle(client);
+        }
     }
 
     @Override

From 30e1561315a9fd3490a0f21adf76ca2244f5f787 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 17 Oct 2018 13:04:48 +0800
Subject: [PATCH 19/82] =?UTF-8?q?app=20rpay=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../royalpay/payment/manage/mappers/payment/OrderMapper.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index 2b0482c19..ad184d835 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -698,9 +698,9 @@
         o.refund_amount refund_fee,
         o.customer_id,
         o.order_detail,
-        CASE o.channel WHEN 'Rpay' THEN o.customer_payment_amount ELSE t.clearing_amount END clearing_amount,
+        t.clearing_amount,
         t.refund_id,
-        CASE o.channel WHEN 'Rpay' THEN t.create_time ELSE t.transaction_time END transaction_time,
+        IFNULL(t.create_time,t.transaction_time) transaction_time,
         t.transaction_type,
         t.transaction_id,
         t.exchange_rate,

From 39e44c076d88018a5ef55c1920eae71ecc63a7c8 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Wed, 17 Oct 2018 14:25:44 +0800
Subject: [PATCH 20/82] ABAfile comment update

---
 .../clearing/core/impl/CleanServiceImpl.java           |  4 ++--
 .../payment/manage/support/abafile/ABAFile.java        | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
index 5c3cbaea3..e4e9e4e11 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
@@ -515,7 +515,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             if (settle.getBigDecimal("clearing_amount").compareTo(BigDecimal.ZERO) == 0) {
                 continue;
             }
-            aba.addSettleMerchant(settle.getString("bsb_no"), settle.getString("account_no"), settle.getString("account_name"),
+            aba.addSettleMerchant(settle.getString("client_moniker"), settle.getString("bsb_no"), settle.getString("account_no"), settle.getString("account_name"),
                     settle.getBigDecimal("clearing_amount"));
         }
         return aba;
@@ -1016,7 +1016,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             // String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content,
             // attachList);
             JSONObject config = sysConfigManager.getSysConfig();
-            String mailId = mailService.sendEmail(title, config.getString("settle_mail_to"),config.getString("settle_mail_cc"), content, attachList);
+            String mailId = mailService.sendEmail(title, config.getString("settle_mail_to"), config.getString("settle_mail_cc"), content, attachList);
 
             if (settleMail == null) {
                 JSONObject settleMailRecord = new JSONObject();
diff --git a/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java b/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java
index 24ccab615..5e893936b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java
+++ b/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java
@@ -29,8 +29,8 @@ public class ABAFile {
         totalSettleAmount = BigDecimal.ZERO;
     }
 
-    public void addSettleMerchant(String bsbNo, String accountNo, String accountName, BigDecimal settleAmount) {
-        settlements.add(new SettleMerchantInfo(bsbNo, accountNo, accountName, settleAmount));
+    public void addSettleMerchant(String clientMoniker, String bsbNo, String accountNo, String accountName, BigDecimal settleAmount) {
+        settlements.add(new SettleMerchantInfo(clientMoniker, bsbNo, accountNo, accountName, settleAmount));
         totalSettleAmount = totalSettleAmount.add(settleAmount);
     }
 
@@ -129,12 +129,14 @@ public class ABAFile {
     }
 
     private class SettleMerchantInfo {
+        private final String clientMoniker;
         private final String bsbNo;
         private final String accountNo;
         private final String accountName;
         private final BigDecimal settleAmount;
 
-        public SettleMerchantInfo(String bsbNo, String accountNo, String accountName, BigDecimal settleAmount) {
+        public SettleMerchantInfo(String clientMoniker, String bsbNo, String accountNo, String accountName, BigDecimal settleAmount) {
+            this.clientMoniker = clientMoniker;
             this.bsbNo = bsbNo;
             this.accountNo = accountNo.replaceAll("\\D", "");
             this.accountName = accountName;
@@ -149,7 +151,7 @@ public class ABAFile {
             lineBuilder.replace(18, 20, "50");
             lineBuilder.replace(20, 30, getSettleAmount());
             lineBuilder.replace(30, 62, getAccountName());
-            lineBuilder.replace(62, 80, StringUtils.rightPad("RoyalPay" + DateFormatUtils.format(settleDate, "yyyyMMdd"), 18));
+            lineBuilder.replace(62, 80, StringUtils.rightPad("RoyalPay" + DateFormatUtils.format(settleDate, "MMdd") + clientMoniker, 18));
             lineBuilder.replace(80, 87, bsbNo(base.getBsb()));
             lineBuilder.replace(87, 96, StringUtils.leftPad(base.getAccountNo(), 9));
             lineBuilder.replace(96, 112, StringUtils.left(StringUtils.rightPad(base.getAccountName(), 16), 16));

From 162f4a7ef4cb96d193e00e1b48712bea0d804ba2 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 17 Oct 2018 16:10:43 +0800
Subject: [PATCH 21/82] fix gatewayjs redirect

---
 .../templates/alipay/v1/gateway_jsapi.js      | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/ui/static/templates/alipay/v1/gateway_jsapi.js b/src/main/ui/static/templates/alipay/v1/gateway_jsapi.js
index 9f876394f..783ab09d6 100644
--- a/src/main/ui/static/templates/alipay/v1/gateway_jsapi.js
+++ b/src/main/ui/static/templates/alipay/v1/gateway_jsapi.js
@@ -10,12 +10,14 @@ $(document).ready(function () {
             alert('debug:origin redirect:' + window.redirect);
         }
         var redirect = window.redirect;
-        while (redirect.indexOf('://') < 0) {
-            redirect = decodeURIComponent(redirect);
-            if (redirect == window.redirect) {
-                break;
-            }
-            window.redirect = redirect;
+            if (window.redirect !=null) {
+                while (redirect.indexOf('://') < 0) {
+                    redirect = decodeURIComponent(redirect);
+                    if (redirect == window.redirect) {
+                        break;
+                    }
+                    window.redirect = redirect;
+                }
         }
 
     }
@@ -55,8 +57,9 @@ $(document).ready(function () {
                 } else {
                     // 如果没有注入则监听注入的事件
                     document.addEventListener('AlipayJSBridgeReady', function () {
-                        callPayment(pay.trade_no);
-                    }, false);
+
+                    });
+                    callPayment(pay.trade_no);
                 }
 
             },

From 784bd85360165e234a8080170a08f84c80d888cc Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 19 Oct 2018 10:09:53 +0800
Subject: [PATCH 22/82] change new ROLE & permission role

---
 .../manage/signin/beans/ManagerInfo.java      | 23 ++++++++++++++++
 .../manage/signin/beans/QueryManagerBean.java | 16 +++++++----
 .../core/impls/ManagerAccountServiceImpl.java |  7 +++--
 src/main/ui/manage.html                       | 27 +++++++++++--------
 src/main/ui/static/config/managers/manager.js |  2 +-
 .../config/managers/templates/managers.html   | 16 ++++++-----
 .../config/managers/templates/modify.html     | 16 +++++++----
 .../managers/templates/new_manager.html       | 16 +++++++----
 .../templates/permission_config.html          | 24 +++++++++++------
 9 files changed, 104 insertions(+), 43 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java b/src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java
index 752a8aedc..fafd02ee3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/beans/ManagerInfo.java
@@ -38,6 +38,8 @@ public class ManagerInfo {
     private boolean riskmanager;
     private boolean guest;
     private boolean orgmanager;
+    private boolean salesmanager;
+    private boolean datacontent;
     @JSONField(name = "org_id")
     private Integer orgId;
 
@@ -105,6 +107,12 @@ public class ManagerInfo {
         if (orgmanager){
             role |= ManagerRole.ORG_MANAGER.getMask();
         }
+        if (salesmanager) {
+            role |= ManagerRole.SALES_MANAGER.getMask();
+        }
+        if (datacontent) {
+            role |= ManagerRole.DATA_CONTENT.getMask();
+        }
         account.put("role", role);
         if (insert) {
             account.put("username", getUsername());
@@ -273,4 +281,19 @@ public class ManagerInfo {
         this.orgmanager = orgmanager;
     }
 
+    public boolean isDatacontent() {
+        return datacontent;
+    }
+
+    public boolean isSalesmanager() {
+        return salesmanager;
+    }
+
+    public void setDatacontent(boolean datacontent) {
+        this.datacontent = datacontent;
+    }
+
+    public void setSalesmanager(boolean salesmanager) {
+        this.salesmanager = salesmanager;
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/beans/QueryManagerBean.java b/src/main/java/au/com/royalpay/payment/manage/signin/beans/QueryManagerBean.java
index da4529722..c9132aca2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/beans/QueryManagerBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/beans/QueryManagerBean.java
@@ -41,9 +41,9 @@ public class QueryManagerBean {
             if(role.equals("10000")){
                 mask = ManagerRole.SERVANT.getMask();
             }
-            if(role.equals("100000")){
-                mask = ManagerRole.ACCOUNT_MANAGER.getMask();
-            }
+//            if(role.equals("100000")){
+//                mask = ManagerRole.ACCOUNT_MANAGER.getMask();
+//            }
             if(role.equals("1000000")){
                 mask = ManagerRole.DIRECTOR.getMask();
             }
@@ -62,9 +62,15 @@ public class QueryManagerBean {
             if(role.equals("100000000000")){
                 mask = ManagerRole.GUEST.getMask();
             }
-            if(role.equals("1000000000000")){
-                mask = ManagerRole.ORG_MANAGER.getMask();
+//            if(role.equals("1000000000000")){
+//                mask = ManagerRole.ORG_MANAGER.getMask();
+//            }
+            if(role.equals("10000000000000")){
+                mask = ManagerRole.SALES_MANAGER.getMask();
             }
+//            if(role.equals("100000000000000")){
+//                mask = ManagerRole.DATA_CONTENT.getMask();
+//            }
             if(mask != 0){
                 params.put("mask",mask);
             }
diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
index 0d58548cc..d99faacd6 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
@@ -52,14 +52,17 @@ public class ManagerAccountServiceImpl implements ManagerAccountsService {
             manager.put("bd", ManagerRole.BD_USER.hasRole(role));
             manager.put("finacial", ManagerRole.FINANCIAL_STAFF.hasRole(role));
             manager.put("servant", ManagerRole.SERVANT.hasRole(role));
-            manager.put("accountmanager", ManagerRole.ACCOUNT_MANAGER.hasRole(role));
+//            manager.put("accountmanager", ManagerRole.ACCOUNT_MANAGER.hasRole(role));
             manager.put("director", ManagerRole.DIRECTOR.hasRole(role));
             manager.put("sitemanager", ManagerRole.SITE_MANAGER.hasRole(role));
             manager.put("developer", ManagerRole.DEVELOPER.hasRole(role));
             manager.put("bdleader", ManagerRole.BD_LEADER.hasRole(role));
             manager.put("riskmanager", ManagerRole.RISK_MANAGER.hasRole(role));
             manager.put("guest", ManagerRole.GUEST.hasRole(role));
-            manager.put("orgmanager", ManagerRole.ORG_MANAGER.hasRole(role));
+//            manager.put("orgmanager", ManagerRole.ORG_MANAGER.hasRole(role));
+            manager.put("salesmanager", ManagerRole.SALES_MANAGER.hasRole(role));
+//            manager.put("datacontent", ManagerRole.DATA_CONTENT.hasRole(role));
+
         }
         return managers;
     }
diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 640a5d069..08c8a5d2e 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -228,11 +228,11 @@ margin-bottom: 10%;"/>
                                            ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
                                         <i class="fa fa-tty" title="Service"
                                            ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
-                                        <i class="fa fa-university" title="Account Manager"
-                                           ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
+                                        <!--<i class="fa fa-university" title="Account Manager"-->
+                                           <!--ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>-->
                                         <i class="fa fa-line-chart" title="Director"
                                            ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
-                                        <i class="fa fa-map-o" title="Site Manager"
+                                        <i class="fa fa-map-o" title="Markting"
                                            ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
                                         <i class="fa fa-code" title="Developer"
                                            ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
@@ -240,14 +240,19 @@ margin-bottom: 10%;"/>
                                            ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
                                         <i class="fa fa-tripadvisor" title="GUEST"
                                            ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
-                                        <i class="fa fa-user-plus" title="Org Manager"
-                                           ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
-                                    </small>
-                                </p>
-                            </li>
-<!--
-                             Menu Footer
--->
+                                        <!--<i class="fa fa-user-plus" title="Org Manager"-->
+                                           <!--ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>-->
+                                        <i class="fa fa-ticket" title="Sales Manager"
+                                            ng-class="{'text-orange':!('10000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
+                                        <!--<i class="fa fa-save" title="Data content"-->
+                                           <!--ng-class="{'text-orange':!('100000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>-->
+
+                                     </small>
+                                 </p>
+                             </li>
+ <!--
+                              Menu Footer
+ -->
                             <li class="user-footer">
                                 <div class="pull-left">
                                     <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
diff --git a/src/main/ui/static/config/managers/manager.js b/src/main/ui/static/config/managers/manager.js
index 94354f51e..1ffaa3ea6 100644
--- a/src/main/ui/static/config/managers/manager.js
+++ b/src/main/ui/static/config/managers/manager.js
@@ -12,7 +12,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
         })
     }]);
     app.controller('managerListCtrl', ['$scope', '$http', '$filter','$uibModal', 'commonDialog', function ($scope, $http,$filter, $uibModal, commonDialog) {
-        $scope.params = {role:"111111111111"};
+        $scope.params = {role:"11111111111111"};
         $scope.pagination = {};
         $scope.listManagers = function (page) {
             var params = angular.copy($scope.params);
diff --git a/src/main/ui/static/config/managers/templates/managers.html b/src/main/ui/static/config/managers/templates/managers.html
index bf4ee461d..e46db3e3d 100644
--- a/src/main/ui/static/config/managers/templates/managers.html
+++ b/src/main/ui/static/config/managers/templates/managers.html
@@ -29,14 +29,16 @@
                                 <option value="100">BD User</option>
                                 <option value="1000">Accountant</option>
                                 <option value="10000">Service</option>
-                                <option value="100000">Account Manager</option>
+                                <!--<option value="100000">Account Manager</option>-->
                                 <option value="1000000">Director</option>
-                                <option value="10000000">Site Manager</option>
+                                <option value="10000000">Markting</option>
                                 <option value="100000000">Developer</option>
                                 <option value="1000000000">BD Leader</option>
                                 <option value="10000000000">Risk Manager</option>
                                 <option value="100000000000">Guest</option>
-                                <option value="1000000000000">Org Manager</option>
+                                <!--<option value="1000000000000">Org Manager</option>-->
+                                <option value="10000000000000">Sales Manager</option>
+                                <!--<option value="100000000000000">Data Ccontent</option>-->
                             </select>
 
                         </div>
@@ -104,14 +106,16 @@
                                 <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':manager.bd,'text-gray':!manager.bd}"></i>
                                 <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':manager.finacial,'text-gray':!manager.finacial}"></i>
                                 <i class="fa fa-tty" title="Service" ng-class="{'text-green':manager.sevant,'text-gray':!manager.servant}"></i>
-                                <i class="fa fa-university" title="Account Manager" ng-class="{'text-green':manager.accountmanager,'text-gray':!manager.accountmanager}"></i>
+                                <!--<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':manager.accountmanager,'text-gray':!manager.accountmanager}"></i>-->
                                 <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':manager.director,'text-gray':!manager.director}"></i>
-                                <i class="fa fa-map-o" title="Site Manager" ng-class="{'text-green':manager.sitemanager,'text-gray':!manager.sitemanager}"></i>
+                                <i class="fa fa-map-o" title="Markting" ng-class="{'text-green':manager.sitemanager,'text-gray':!manager.sitemanager}"></i>
                                 <i class="fa fa-code" title="Developer" ng-class="{'text-green':manager.developer,'text-gray':!manager.developer}"></i>
                                 <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':manager.bdleader,'text-gray':!manager.bdleader}"></i>
                                 <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':manager.riskmanager,'text-gray':!manager.riskmanager}"></i>
                                 <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':manager.guest,'text-gray':!manager.guest}"></i>
-                                <i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':manager.orgmanager,'text-gray':!manager.orgmanager}"></i>
+                                <!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':manager.orgmanager,'text-gray':!manager.orgmanager}"></i>-->
+                                <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':manager.salesmanager,'text-gray':!manager.salesmanager}"></i>
+                                <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':manager.datacontent,'text-gray':!manager.datacontent}"></i>-->
                             </td>
                             <td>
                                 <a role="button" class="text-bold text-primary" ng-click="modifyManager(manager)">Modify</a>
diff --git a/src/main/ui/static/config/managers/templates/modify.html b/src/main/ui/static/config/managers/templates/modify.html
index d2d86acb7..fe043378f 100644
--- a/src/main/ui/static/config/managers/templates/modify.html
+++ b/src/main/ui/static/config/managers/templates/modify.html
@@ -63,14 +63,14 @@
                         <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.servant" name="servant">Service
                         </label>
-                        <label ng-if="!manager.admin && !manager.operator">
-                            <input type="checkbox" ng-model="manager.accountmanager" name="accountmanager">Account Manager
-                        </label>
+                        <!--<label ng-if="!manager.admin && !manager.operator">-->
+                            <!--<input type="checkbox" ng-model="manager.accountmanager" name="accountmanager">Account Manager-->
+                        <!--</label>-->
                         <label>
                             <input type="checkbox" ng-model="manager.director" name="director">Director
                         </label>
                         <label ng-if="('00001'|withRole)">
-                            <input type="checkbox" ng-model="manager.sitemanager" name="sitemanager">Site Manager
+                            <input type="checkbox" ng-model="manager.sitemanager" name="sitemanager">Markting
                         </label>
                         <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.developer" name="developer">Developer
@@ -81,9 +81,15 @@
                         <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.riskmanager" name="riskmanager">Risk Manager
                         </label>
-                        <label ng-if="('00001'|withRole)">
+<!--                        <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.orgmanager" name="orgmanager">Org Manager
+                        </label>-->
+                        <label ng-if="('00001'|withRole)">
+                            <input type="checkbox" ng-model="manager.salesmanager" name="salesmanager">Sales Manager
                         </label>
+<!--                        <label ng-if="('00001'|withRole)">
+                            <input type="checkbox" ng-model="manager.datacontent" name="datacontent">Data Content
+                        </label>-->
                     </p>
                 </div>
                 <div class="form-group" ng-if="isOrgModify&&!isModifyOrgManage">
diff --git a/src/main/ui/static/config/managers/templates/new_manager.html b/src/main/ui/static/config/managers/templates/new_manager.html
index d42e8ec9d..81d3d1d04 100644
--- a/src/main/ui/static/config/managers/templates/new_manager.html
+++ b/src/main/ui/static/config/managers/templates/new_manager.html
@@ -69,14 +69,14 @@
                         <label ng-if="('00001'|withRole) && !manager.admin && !manager.operator">
                             <input type="checkbox" ng-model="manager.servant" name="servant">Service
                         </label>
-                        <label ng-if="!manager.admin && !manager.operator">
-                            <input type="checkbox" ng-model="manager.accountmanager" name="accountmanager">Account Manager
-                        </label>
+                        <!--<label ng-if="!manager.admin && !manager.operator">-->
+                            <!--<input type="checkbox" ng-model="manager.accountmanager" name="accountmanager">Account Manager-->
+                        <!--</label>-->
                         <label>
                             <input type="checkbox" ng-model="manager.director" name="director">Director
                         </label>
                         <label ng-if="('00001'|withRole)">
-                            <input type="checkbox" ng-model="manager.sitemanager" name="sitemanager">Site Manager
+                            <input type="checkbox" ng-model="manager.sitemanager" name="sitemanager">Markting
                         </label>
                         <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.developer" name="developer">Developer
@@ -90,9 +90,15 @@
                         <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.guest" name="guest">Guest
                         </label>
+                        <!--<label ng-if="('00001'|withRole)">-->
+                            <!--<input type="checkbox" ng-model="manager.orgmanager" name="guest">Org Manager-->
+                        <!--</label>-->
                         <label ng-if="('00001'|withRole)">
-                            <input type="checkbox" ng-model="manager.orgmanager" name="guest">Org Manager
+                            <input type="checkbox" ng-model="manager.salesmanager" name="salesmanager">Sales Manager
                         </label>
+                        <!--<label ng-if="('00001'|withRole)">-->
+                            <!--<input type="checkbox" ng-model="manager.datacontent" name="datacontent">Data Content-->
+                        <!--</label>-->
                     </p>
                 </div>
                 <div class="form-group" ng-if="!currentUser.org_id &&isOrg">
diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
index e4dfa6819..012a3e37f 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
@@ -43,17 +43,17 @@
                         <i class="fa fa-tty"></i>
                         Service
                     </a>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('100000')">
-                        <i class="fa fa-university"></i>
-                        Account Manager
-                    </a>
+                    <!--<a class="btn btn-app" role="button" ng-click="authorizeRole('100000')">-->
+                        <!--<i class="fa fa-university"></i>-->
+                        <!--Account Manager-->
+                    <!--</a>-->
                     <a class="btn btn-app" role="button" ng-click="authorizeRole('1000000')">
                         <i class="fa fa-line-chart"></i>
                         Director
                     </a>
                     <a class="btn btn-app" role="button" ng-click="authorizeRole('10000000')">
                         <i class="fa fa-map-o"></i>
-                        Site Manager
+                        Markting
                     </a>
                     <a class="btn btn-app" role="button" ng-click="authorizeRole('100000000')">
                         <i class="fa fa-code"></i>
@@ -67,10 +67,18 @@
                         <i class="fa fa-tripadvisor"></i>
                         GUEST
                     </a>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('1000000000000')">
-                        <i class="fa fa-user-plus"></i>
-                        Org Manager
+                    <!--<a class="btn btn-app" role="button" ng-click="authorizeRole('1000000000000')">-->
+                        <!--<i class="fa fa-user-plus"></i>-->
+                        <!--Org Manager-->
+                    <!--</a>-->
+                    <a class="btn btn-app" role="button" ng-click="authorizeRole('10000000000000')">
+                        <i class="fa fa-ticket"></i>
+                        Sales Manager
                     </a>
+                    <!--<a class="btn btn-app" role="button" ng-click="authorizeRole('100000000000000')">-->
+                        <!--<i class="fa fa-save"></i>-->
+                        <!--Data Content-->
+                    <!--</a>-->
                 </div>
             </div>
         </div>

From 24555404a2a34967901ba23fc77f63e6df1b9fad Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 19 Oct 2018 16:09:20 +0800
Subject: [PATCH 23/82] fix servant

---
 .../manage/signin/core/impls/SignInAccountServiceImpl.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index 661e0b650..fd785877d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
@@ -120,7 +120,11 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
         manager.put("module_names", modules.keySet());
         if((manager.getIntValue("role")& ManagerRole.SERVANT.getMask())>0){
             JSONObject cs = sysCustomerServiceMapper.findByManagerId(accountId);
-            manager.put("onoff",cs.getBoolean("onoff"));
+            if (cs != null) {
+                manager.put("onoff", cs.getBoolean("onoff"));
+            } else {
+                manager.put("onoff", false);
+            }
         }
         return manager;
     }

From dd34208113f6cc37220de6b7ad3b9ddc3d1b36f8 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 19 Oct 2018 16:10:38 +0800
Subject: [PATCH 24/82] fix servant

---
 .../manage/signin/core/impls/SignInAccountServiceImpl.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index 661e0b650..fd785877d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
@@ -120,7 +120,11 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
         manager.put("module_names", modules.keySet());
         if((manager.getIntValue("role")& ManagerRole.SERVANT.getMask())>0){
             JSONObject cs = sysCustomerServiceMapper.findByManagerId(accountId);
-            manager.put("onoff",cs.getBoolean("onoff"));
+            if (cs != null) {
+                manager.put("onoff", cs.getBoolean("onoff"));
+            } else {
+                manager.put("onoff", false);
+            }
         }
         return manager;
     }

From a0d7a4c6312ebf940b73a1851daec97fd8f382ff Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Fri, 19 Oct 2018 18:17:05 +0800
Subject: [PATCH 25/82] =?UTF-8?q?[fix]=E5=95=86=E6=88=B7=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/static/analysis/partners-analysis.js   |  18 +-
 .../analysis/templates/partners_analysis.html | 400 ++++++++++--------
 .../static/payment/partner/partner-manage.js  |   8 +-
 .../payment/partner/templates/partners.html   |  27 +-
 4 files changed, 263 insertions(+), 190 deletions(-)

diff --git a/src/main/ui/static/analysis/partners-analysis.js b/src/main/ui/static/analysis/partners-analysis.js
index fe4100c96..f2525a4d2 100644
--- a/src/main/ui/static/analysis/partners-analysis.js
+++ b/src/main/ui/static/analysis/partners-analysis.js
@@ -404,7 +404,23 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                     }
                 ]
             };
-
+            $scope.analysisClients = function () {
+                $http.get('/sys/partners/analysis').then(function (resp) {
+                    $scope.analysis = resp.data;
+                })
+            };
+            if ($scope.currentUser.org_id == 1 || $scope.currentUser.org_id == null) {
+                $scope.analysisClients();
+            }
+            $scope.mapFrame = 'all_locations.html';
+            $scope.loadLocations = function () {
+                var params = angular.copy($scope.params);
+                $http.get('/sys/partners/merchant/list_locations', {params: params}).then(function (resp) {
+                    $scope.locations = resp.data;
+                    window.merchant_maps.initMap($scope.locations);
+                });
+            };
+            $scope.loadLocations();
 
         }]);
 
diff --git a/src/main/ui/static/analysis/templates/partners_analysis.html b/src/main/ui/static/analysis/templates/partners_analysis.html
index 5240b0ca6..f287b80ca 100644
--- a/src/main/ui/static/analysis/templates/partners_analysis.html
+++ b/src/main/ui/static/analysis/templates/partners_analysis.html
@@ -7,185 +7,228 @@
         text-align: center;
     }
 </style>
-<!--<section class="content-header">-->
-    <!--<h1>Partners Analysis</h1>-->
-    <!--<ol class="breadcrumb">-->
-        <!--<li>-->
-            <!--<i class="fa fa-list-alt"></i> Analysis-->
-        <!--</li>-->
-        <!--<li class="active">Partners</li>-->
-    <!--</ol>-->
-<!--</section>-->
-<div class="content">
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="box-solid">
-                <div class="box box-warning" ng-if="'1000000000'|withRole">
-                    <div class="box-header">
-                        <div class="row">
-                            <div class="col-sm-12">
-                                <div class="form-horizontal">
-                                    <!--<div class="form-group">-->
-                                        <!--<label class="control-label col-xs-4 col-sm-2" for="only-mine-search">-->
-                                            <!--My Group</label>-->
-                                        <!--<div class="col-xs-8 col-sm-4">-->
-                                            <!--<div class="checkbox-inline" style="bottom: 5px">-->
-                                                <!--<input type="checkbox" id="only-mine-search"-->
-                                                       <!--ng-model="params.onlyGroup" ng-click="loadPartnersInTypes();doAnalysis()">-->
+<div ui-view>
+    <section class="content-header">
+        <h1>Merchant statistics</h1>
+        <ol class="breadcrumb">
+            <li>
+                <i class="fa fa-list-alt"></i> Payment
+            </li>
+            <li class="active">Merchant statistics</li>
+        </ol>
+    </section>
+    <div class="content">
+        <div class="row" ng-if="currentUser.org_id==1 || currentUser.org_id==null">
+            <div class="col-md-3 col-sm-6 col-xs-12">
+                <div class="info-box">
+                    <span class="info-box-icon bg-aqua"><i class="ion ion-ios-people"></i></span>
+                    <div class="info-box-content">
+                        <span class="info-box-text">Waiting Compliance</span>
+                        <a role="button"><span class="info-box-number">{{analysis.wp}}</span></a>
+                        <small>其中自助开通:{{analysis.a_wp}}</small>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-3 col-sm-6 col-xs-12">
+                <div class="info-box">
+                    <span class="info-box-icon bg-green"><i class="ion ion-ios-people"></i></span>
+                    <div class="info-box-content">
+                        <span class="info-box-text">Pass</span>
+                        <span class="info-box-number">{{analysis.pass}}</span>
+                        <small>其中自助开通:{{analysis.z_pass+analysis.a_pass}}</small>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-3 col-sm-6 col-xs-12">
+                <div class="info-box">
+                    <span class="info-box-icon bg-red"><i class="ion ion-ios-people"></i></span>
+                    <div class="info-box-content">
+                        <span class="info-box-text">Temp SubMerchantID</span>
+                        <a role="button"><span class="info-box-number" ng-bind="analysis.temp_submchid||0"></span></a>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-3 col-sm-6 col-xs-12">
+                <div class="info-box">
+                    <span class="info-box-icon bg-yellow"><i class="ion ion-ios-people"></i></span>
+                    <div class="info-box-content">
+                        <span class="info-box-text">自助开通</span>
+                        <a role="button"><span class="info-box-number">{{analysis.quick_pass}}</span></a>
+                        <small>waiting compliance:{{analysis.a_wp}}</small>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="box-solid">
+                    <div class="box box-warning" ng-if="'1000000000'|withRole">
+                        <div class="box-header">
+                            <div class="row">
+                                <div class="col-sm-12">
+                                    <div class="form-horizontal">
+                                        <!--<div class="form-group">-->
+                                            <!--<label class="control-label col-xs-4 col-sm-2" for="only-mine-search">-->
+                                                <!--My Group</label>-->
+                                            <!--<div class="col-xs-8 col-sm-4">-->
+                                                <!--<div class="checkbox-inline" style="bottom: 5px">-->
+                                                    <!--<input type="checkbox" id="only-mine-search"-->
+                                                           <!--ng-model="params.onlyGroup" ng-click="loadPartnersInTypes();doAnalysis()">-->
+                                                <!--</div>-->
                                             <!--</div>-->
                                         <!--</div>-->
-                                    <!--</div>-->
-                                    <div class="form-group col-xs-12" ng-if="('1000000000'|withRole)">
-                                        <label class="control-label col-xs-4 col-sm-2"> My Group</label>
-                                        <div class="col-sm-10 col-xs-8">
-                                            <p class="form-control-static">
-                                                <input type="checkbox" id="only-mine-search"
-                                                       ng-model="params.onlyGroup" ng-click="chooseBD('all')">
-                                                <span ng-if="params.onlyGroup">
-                                                     |&nbsp;
-                                                <a role="button" ng-class="{'bg-primary':isAll}"
-                                                   ng-click="chooseBD('all')">All</a>
-                                                <label ng-repeat="sub in bd_group_bds">
-                                                    |&nbsp;<a role="button"
-                                                              ng-class="{'bg-primary':sub.manager_id==chooseBDId}"
-                                                              ng-click="chooseBD(sub.manager_id)">{{sub.bd_name}}</a>&nbsp;
-                                                </label></span>
-                                            </p>
+                                        <div class="form-group col-xs-12" ng-if="('1000000000'|withRole)">
+                                            <label class="control-label col-xs-4 col-sm-2"> My Group</label>
+                                            <div class="col-sm-10 col-xs-8">
+                                                <p class="form-control-static">
+                                                    <input type="checkbox" id="only-mine-search"
+                                                           ng-model="params.onlyGroup" ng-click="chooseBD('all')">
+                                                    <span ng-if="params.onlyGroup">
+                                                         |&nbsp;
+                                                    <a role="button" ng-class="{'bg-primary':isAll}"
+                                                       ng-click="chooseBD('all')">All</a>
+                                                    <label ng-repeat="sub in bd_group_bds">
+                                                        |&nbsp;<a role="button"
+                                                                  ng-class="{'bg-primary':sub.manager_id==chooseBDId}"
+                                                                  ng-click="chooseBD(sub.manager_id)">{{sub.bd_name}}</a>&nbsp;
+                                                    </label></span>
+                                                </p>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="box box-warning">
-                    <div class="box-header pull-right">
-                        <div class="btn-group" role="group">
-                            <button type="button" class="btn btn-info" ng-click="display=false" ng-class="{'active':!display}">行业</button>
-                            <button type="button" class="btn btn-info" ng-click="display=true" ng-class="{'active':display}">清算周期</button>
+                    <div class="box box-warning">
+                        <div class="box-header pull-right">
+                            <div class="btn-group" role="group">
+                                <button type="button" class="btn btn-info" ng-click="display=false" ng-class="{'active':!display}">行业</button>
+                                <button type="button" class="btn btn-info" ng-click="display=true" ng-class="{'active':display}">清算周期</button>
+                            </div>
                         </div>
-                    </div>
-                    <div class="box-body" ng-if="!display">
-                        <div class="col-sm-12">
-                            <div class="col-sm-6 col-xs-12">
-                                <p class="text-center">各类型商家数量分布</p>
-                                <div class="chart" style="height: 400px" echarts="partners_type_chart"
-                                     chart-setter="partner_type_chart($chart)"
-                                     ng-class="{nodata:partners_type_chart.nodata}"></div>
+                        <div class="box-body" ng-if="!display">
+                            <div class="col-sm-12">
+                                <div class="col-sm-6 col-xs-12">
+                                    <p class="text-center">各类型商家数量分布</p>
+                                    <div class="chart" style="height: 400px" echarts="partners_type_chart"
+                                         chart-setter="partner_type_chart($chart)"
+                                         ng-class="{nodata:partners_type_chart.nodata}"></div>
+                                </div>
+                                <div class="col-sm-6 col-xs-12">
+                                    <p class="text-center">{{partners_type.partner_type}} 行业列表</p>
+                                    <table class="table table-bordered table-hover table-striped">
+                                        <thead>
+                                        <tr>
+                                            <th>Type</th>
+                                            <th>Partners</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr ng-repeat="partner in children">
+                                            <td ng-bind="partner.children_partner_type"></td>
+                                            <td ng-bind="partner.partner_counts"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
                             </div>
-                            <div class="col-sm-6 col-xs-12">
-                                <p class="text-center">{{partners_type.partner_type}} 行业列表</p>
-                                <table class="table table-bordered table-hover table-striped">
-                                    <thead>
-                                    <tr>
-                                        <th>Type</th>
-                                        <th>Partners</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    <tr ng-repeat="partner in children">
-                                        <td ng-bind="partner.children_partner_type"></td>
-                                        <td ng-bind="partner.partner_counts"></td>
-                                    </tr>
-                                    </tbody>
-                                </table>
+                            <div class="col-sm-12 col-xs-12" >
+                                <label style="display: inline" ng-repeat="type in PartnerTypes | orderBy:'count_value':true">
+                                    <span ng-bind="type.partner_type" class="text-primary"></span>:
+                                    <span ng-bind="type.count_value" class="text-primary"></span> |
+                                </label>
                             </div>
                         </div>
-                        <div class="col-sm-12 col-xs-12" >
-                            <label style="display: inline" ng-repeat="type in PartnerTypes | orderBy:'count_value':true">
-                                <span ng-bind="type.partner_type" class="text-primary"></span>:
-                                <span ng-bind="type.count_value" class="text-primary"></span> |
-                            </label>
-                        </div>
-                    </div>
-                    <div class="box-body" ng-if="display">
-                        <div class="col-sm-12">
-                            <div class="col-sm-6 col-xs-12">
-                                <p class="text-center">商户清算周期分布</p>
-                                <div class="chart" style="height: 300px" echarts="partners_settlement_chart"
-                                     chart-setter="partner_type_chart($chart)"
-                                     ng-class="{nodata:partners_settlement_chart.nodata}"></div>
-                            </div>
-                            <div class="col-sm-6 col-xs-12">
-                                <div class="text-center">
-                                    <p class="btn-group text-center" role="group">
-                                        <button type="button" class="btn btn-primary btn-xs" ng-click="chooseAll()">All</button>
-                                        <button type="button" class="btn btn-primary btn-xs" ng-click="chooseThirtyDays();">recent 30 days</button>
-                                        <button type="button" class="btn btn-primary btn-xs" ng-click="chooseLastMonth();">Last Month</button>
-                                    </p>
-                                    <p></p>
-                                    <p>清算周期列表</p>
+                        <div class="box-body" ng-if="display">
+                            <div class="col-sm-12">
+                                <div class="col-sm-6 col-xs-12">
+                                    <p class="text-center">商户清算周期分布</p>
+                                    <div class="chart" style="height: 300px" echarts="partners_settlement_chart"
+                                         chart-setter="partner_type_chart($chart)"
+                                         ng-class="{nodata:partners_settlement_chart.nodata}"></div>
+                                </div>
+                                <div class="col-sm-6 col-xs-12">
+                                    <div class="text-center">
+                                        <p class="btn-group text-center" role="group">
+                                            <button type="button" class="btn btn-primary btn-xs" ng-click="chooseAll()">All</button>
+                                            <button type="button" class="btn btn-primary btn-xs" ng-click="chooseThirtyDays();">recent 30 days</button>
+                                            <button type="button" class="btn btn-primary btn-xs" ng-click="chooseLastMonth();">Last Month</button>
+                                        </p>
+                                        <p></p>
+                                        <p>清算周期列表</p>
+                                    </div>
+                                    <table class="table table-bordered table-hover table-striped">
+                                        <thead>
+                                        <tr>
+                                            <th>Clean Days</th>
+                                            <th>Partners</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr ng-repeat="cycle in settlementCycle">
+                                            <td ng-bind="cycle.clean_days"></td>
+                                            <td ng-bind="cycle.client_count"></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
                                 </div>
-                                <table class="table table-bordered table-hover table-striped">
-                                    <thead>
-                                    <tr>
-                                        <th>Clean Days</th>
-                                        <th>Partners</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    <tr ng-repeat="cycle in settlementCycle">
-                                        <td ng-bind="cycle.clean_days"></td>
-                                        <td ng-bind="cycle.client_count"></td>
-                                    </tr>
-                                    </tbody>
-                                </table>
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="box box-warning">
-                    <div class="box-header">
-                        <div class="row">
-                            <div class="col-sm-12">
-                                <div class="form-horizontal">
-                                    <div class="form-group col-xs-12 col-sm-12">
-                                        <label class="control-label col-xs-4 col-sm-2">Date Range</label>
-                                        <div class="col-sm-10">
-                                            <div class="form-control-static form-inline">
-                                                <div style="display: inline-block">
-                                                    <input class="form-control" id="date-from-input"
-                                                           ng-model="params.begin"
-                                                           uib-datepicker-popup size="10" placeholder="From"
-                                                           is-open="dateBegin.open" ng-click="dateBegin.open=true"
-                                                           datepicker-options="{maxDate:params.end||today}">
-                                                </div>
-                                                ~
-                                                <div style="display: inline-block">
-                                                    <input class="form-control" id="date-to-input" ng-model="params.end"
-                                                           uib-datepicker-popup size="10" placeholder="To"
-                                                           is-open="dateTo.open" ng-click="dateTo.open=true"
-                                                           datepicker-options="{minDate:params.begin,maxDate:today}">
-                                                </div>
+                    <div class="box box-warning">
+                        <div class="box-header">
+                            <div class="row">
+                                <div class="col-sm-12">
+                                    <div class="form-horizontal">
+                                        <div class="form-group col-xs-12 col-sm-12">
+                                            <label class="control-label col-xs-4 col-sm-2">Date Range</label>
+                                            <div class="col-sm-10">
+                                                <div class="form-control-static form-inline">
+                                                    <div style="display: inline-block">
+                                                        <input class="form-control" id="date-from-input"
+                                                               ng-model="params.begin"
+                                                               uib-datepicker-popup size="10" placeholder="From"
+                                                               is-open="dateBegin.open" ng-click="dateBegin.open=true"
+                                                               datepicker-options="{maxDate:params.end||today}">
+                                                    </div>
+                                                    ~
+                                                    <div style="display: inline-block">
+                                                        <input class="form-control" id="date-to-input" ng-model="params.end"
+                                                               uib-datepicker-popup size="10" placeholder="To"
+                                                               is-open="dateTo.open" ng-click="dateTo.open=true"
+                                                               datepicker-options="{minDate:params.begin,maxDate:today}">
+                                                    </div>
 
-                                                <!--<div class="btn-group">-->
-                                                    <!--<a role="button" class="btn btn-default btn-sm"-->
-                                                       <!--ng-click="chooseToday()">Today</a>-->
-                                                <!--</div>-->
-                                                <!--<div class="btn-group">-->
-                                                    <!--<a role="button" class="btn btn-default btn-sm"-->
-                                                       <!--ng-click="chooseYesterday()">Yesterday</a>-->
-                                                <!--</div>-->
-                                                <div class="btn-group">
-                                                    <a role="button" class="btn btn-default btn-sm"
-                                                       ng-click="chooseLast7Days()">Last 7 Days</a>
-                                                </div>
-                                                <div class="btn-group">
-                                                    <a role="button" class="btn btn-default btn-sm"
-                                                       ng-click="thisMonth()">This Month</a>
+                                                    <!--<div class="btn-group">-->
+                                                        <!--<a role="button" class="btn btn-default btn-sm"-->
+                                                           <!--ng-click="chooseToday()">Today</a>-->
+                                                    <!--</div>-->
+                                                    <!--<div class="btn-group">-->
+                                                        <!--<a role="button" class="btn btn-default btn-sm"-->
+                                                           <!--ng-click="chooseYesterday()">Yesterday</a>-->
+                                                    <!--</div>-->
+                                                    <div class="btn-group">
+                                                        <a role="button" class="btn btn-default btn-sm"
+                                                           ng-click="chooseLast7Days()">Last 7 Days</a>
+                                                    </div>
+                                                    <div class="btn-group">
+                                                        <a role="button" class="btn btn-default btn-sm"
+                                                           ng-click="thisMonth()">This Month</a>
+                                                    </div>
+                                                    <div class="btn-group">
+                                                        <a role="button" class="btn btn-default btn-sm"
+                                                           ng-click="lastMonth()">Last Month</a>
+                                                    </div>
+                                                    <div class="btn-group">
+                                                        <a role="button" class="btn btn-default btn-sm"
+                                                           ng-click="thisYear()">This Year</a>
+                                                    </div>
+                                                    <button class="btn btn-success" type="button"
+                                                            ng-click="doAnalysis()">
+                                                        <i class="fa fa-search"></i>
+                                                    </button>
                                                 </div>
-                                                <div class="btn-group">
-                                                    <a role="button" class="btn btn-default btn-sm"
-                                                       ng-click="lastMonth()">Last Month</a>
-                                                </div>
-                                                <div class="btn-group">
-                                                    <a role="button" class="btn btn-default btn-sm"
-                                                       ng-click="thisYear()">This Year</a>
-                                                </div>
-                                                <button class="btn btn-success" type="button"
-                                                        ng-click="doAnalysis()">
-                                                    <i class="fa fa-search"></i>
-                                                </button>
                                             </div>
                                         </div>
                                     </div>
@@ -193,20 +236,31 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="box box-warning">
-                    <div class="box-header with-border">新增商户数量变化</div>
-                    <div class="box-body">
-                        <div class="chart" echarts="newPartnersHistory" style="height: 300px"
-                             ng-class="{nodata:newPartnersHistory.nodata}"></div>
+                    <div class="box box-warning">
+                        <div class="box-header with-border">新增商户数量变化</div>
+                        <div class="box-body">
+                            <div class="chart" echarts="newPartnersHistory" style="height: 300px"
+                                 ng-class="{nodata:newPartnersHistory.nodata}"></div>
+                        </div>
                     </div>
-                </div>
 
-                <div class="box box-warning">
-                    <div class="box-header with-border">交易商户数量变化</div>
-                    <div class="box-body">
-                        <div class="chart" echarts="tradePartnersHistory" style="height: 300px"
-                             ng-class="{nodata:tradePartnersHistory.nodata}"></div>
+                    <div class="box box-warning">
+                        <div class="box-header with-border">交易商户数量变化</div>
+                        <div class="box-body">
+                            <div class="chart" echarts="tradePartnersHistory" style="height: 300px"
+                                 ng-class="{nodata:tradePartnersHistory.nodata}"></div>
+                        </div>
+                    </div>
+
+                    <div class="box box-warning">
+                        <div class="box-header with-border">商户分布
+                            <span style="float: right;font-size: 14px;">商户数量:{{locations.length}}</span>
+                        </div>
+                        <div class="box-body">
+                            <div class="embed-responsive" style="height: 300px;">
+                                <iframe class="embed-responsive-item" id="merchant_maps"  name="merchant_maps" src="{{mapFrame}}"></iframe>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index bb47df893..e680fe728 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -203,13 +203,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
             };
 
-            $scope.loadLocations = function () {
+            /*$scope.loadLocations = function () {
                 var params = angular.copy($scope.params);
                 $http.get('/sys/partners/merchant/list_locations', {params: params}).then(function (resp) {
                     $scope.locations = resp.data;
                     window.merchant_maps.initMap($scope.locations);
                 });
-            };
+            };*/
             $scope.today = new Date();
 
             $scope.listBDUsers = function () {
@@ -268,14 +268,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 })
 
             };
-            $scope.toogleMapSelect = function () {
+            /*$scope.toogleMapSelect = function () {
                 $scope.mapFrame = 'all_locations.html';
                 $scope.loadLocations();
             }
             $scope.toogleMerchantSelect = function () {
                 $scope.mapFrame = null;
             }
-            $scope.toogleMerchantSelect();
+            $scope.toogleMerchantSelect();*/
         }]);
     app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone) {
         if ($scope.partner_application) {
diff --git a/src/main/ui/static/payment/partner/templates/partners.html b/src/main/ui/static/payment/partner/templates/partners.html
index 4121cdd6b..e7f5d7105 100644
--- a/src/main/ui/static/payment/partner/templates/partners.html
+++ b/src/main/ui/static/payment/partner/templates/partners.html
@@ -358,9 +358,10 @@
                                                 </div>
                                             </div>
                                             <!--status-->
-                                            <div class="form-group col-sm-12" ng-if="'10'|withRole">
+                                            <!--商户合规位置转移到合规模块的商户合规模块下-->
+                                            <!--<div class="form-group col-sm-12" ng-if="'10'|withRole">
                                                 <label class="control-label col-xs-4 col-sm-2">Status</label>
-                                                <!--<div class="col-xs-8 col-sm-4">-->
+                                                &lt;!&ndash;<div class="col-xs-8 col-sm-4">&ndash;&gt;
                                                 <span class="col-xs-8 col-sm-10">
                                                     <span class="checkbox-inline">
                                                         <label>
@@ -407,14 +408,15 @@
                                                     </span>
 
                                                 </span>
-                                                <!--</div>-->
-                                            </div>
+                                                &lt;!&ndash;</div>&ndash;&gt;
+                                            </div>-->
                                             <div class="col-xs-12">
-                                                <button ng-if="!mapFrame" class="btn btn-primary" type="button"
+                                                <button class="btn btn-primary" type="button"
                                                         ng-click="loadPartners(1)"><i
                                                         class="fa fa-search"></i> Search
                                                 </button>
-                                                <button ng-if="mapFrame" class="btn btn-primary" type="button"
+                                                <!-- 商户分布以及商户进件位置转移 -->
+                                                <!--<button ng-if="mapFrame" class="btn btn-primary" type="button"
                                                         ng-click="loadLocations()"><i
                                                         class="fa fa-search"></i> Search
                                                 </button>
@@ -422,7 +424,7 @@
                                                    ui-sref=".new" title="New Partner">
                                                     <i class="fa fa-plus"></i>
                                                     New Partner
-                                                </a>
+                                                </a>-->
                                             </div>
 
                                         </div>
@@ -434,7 +436,7 @@
 
                         </div>
                     </div>
-                    <ul class="nav nav-tabs">
+                    <!--<ul class="nav nav-tabs">
                         <li ng-if="!mapFrame"><a role="button" class="partner_list_style active"
                                                 ng-click="toogleMerchantSelect()">商户列表</a>
 
@@ -448,9 +450,9 @@
                         <li ng-if="!mapFrame" style="margin-left: 10px"><a role="button" class="partner_list_style" ng-click="toogleMapSelect()">商户分布</a>
                         </li>
                     </ul>
-                    <span id="merchant_locations" hidden>{{locations}}</span>
+                    <span id="merchant_locations" hidden>{{locations}}</span>-->
 
-                    <div class="box box-warning" style="border-top-color:#f06101"  ng-if="!mapFrame">
+                    <div class="box box-warning" style="border-top-color:#f06101">
                         <div class="box-body no-padding table-responsive">
                             <div>
                                 <span style="float: right;font-size: 14px;" class="del_client">禁用</span>
@@ -541,7 +543,8 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row" ng-if="mapFrame">
+                    <!--商户分布位置转移-->
+                    <!--<div class="row" ng-if="mapFrame">
                         <div class="col-sm-12">
                             <div class="box" style="border-top: none">
                                 <div class="embed-responsive" style="height: 300px;">
@@ -549,7 +552,7 @@
                                 </div>
                             </div>
                         </div>
-                    </div>
+                    </div>-->
                 </div>
             </div>
         </div>

From 919c7783be98c9cae9443d1cd1524c12faed2e60 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 22 Oct 2018 09:41:25 +0800
Subject: [PATCH 26/82] fix boot

---
 src/main/ui/managev2.html                 | 66 +++++++++++------------
 src/main/ui/static/boot/manager-boot.js   |  2 +-
 src/main/ui/static/boot/manager-bootv2.js |  2 +-
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
index 13ccee754..f23f25c7f 100644
--- a/src/main/ui/managev2.html
+++ b/src/main/ui/managev2.html
@@ -327,95 +327,95 @@ margin-bottom: 10%;"/>
             </div>
 
             <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;min-height:626px;flex-wrap:wrap">
-                <div class="box-items" ng-if="'10'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Compliance'})" ui-sref-opts="{reload:true}">
+                <div class="box-items" ng-if="'100'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'bduser'})" ui-sref-opts="{reload:true}">
                         <div class="boxs">
                             <img src="/static/images/manage/menu_1.png">
                         </div>
-                        <p class="box-font">Compliance</p>
+                        <p class="box-font">销售中心</p>
                     </a>
                 </div>
 
-                <div class="box-items" ng-if="'10000000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'RiskManager'})" ui-sref-opts="{reload:true}">
+                <div class="box-items" ng-if="'1000000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'riskmanager'})" ui-sref-opts="{reload:true}">
                         <div class="boxs">
                             <img src="/static/images/manage/menu_2.png">
                         </div>
-                        <p class="box-font">Risk Manager</p>
+                        <p class="box-font">风控中心</p>
                     </a>
                 </div>
 
-                <div class="box-items" ng-if="'100000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'AccountManager'})" ui-sref-opts="{reload:true}">
+                <div class="box-items" ng-if="'10'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'compliance'})" ui-sref-opts="{reload:true}">
                         <div class="boxs">
                             <img src="/static/images/manage/menu_3.png">
                         </div>
-                        <p class="box-font">Account Manager</p>
+                        <p class="box-font">合规中心</p>
                     </a>
                 </div>
 
                 <div class="box-items" ng-if="'1000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Accountant'})" ui-sref-opts="{reload:true}">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'accountant'})" ui-sref-opts="{reload:true}">
                         <div class="boxs">
                             <img src="/static/images/manage/menu_4.png">
                         </div>
-                        <p class="box-font">Accountant</p>
+                        <p class="box-font">财务中心</p>
                     </a>
                 </div>
 
-                <div class="box-items" ng-if="'100'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'BDUser'})" ui-sref-opts="{reload:true}">
+                <div class="box-items" ng-if="'10000000000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'salesmanager'})" ui-sref-opts="{reload:true}">
                         <div class="boxs">
                             <img src="/static/images/manage/menu_5.png">
                         </div>
-                        <p class="box-font">BD User</p>
+                        <p class="box-font">销管中心</p>
                     </a>
                 </div>
 
-                <div class="box-items" ng-if="'10000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Service'})" ui-sref-opts="{reload:true}">
+                <div class="box-items" ng-if="'10000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'sitemanager'})" ui-sref-opts="{reload:true}">
                         <div class="boxs">
                             <img src="/static/images/manage/menu_6.png">
                         </div>
-                        <p class="box-font">Service</p>
+                        <p class="box-font">营销中心</p>
                     </a>
                 </div>
 
-                <div class="box-items" ng-if="'1'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Administrator'})" ui-sref-opts="{reload:true}">
+                <div class="box-items" ng-if="'1000000'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'director'})" ui-sref-opts="{reload:true}">
                         <div class="boxs">
                             <img src="/static/images/manage/menu_7.png">
                         </div>
-                        <p class="box-font">Administrator</p>
+                        <p class="box-font">领导决策</p>
                     </a>
                 </div>
 
-                <div class="box-items" ng-if="'10000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'SiteManager'})" ui-sref-opts="{reload:true}">
+                <div class="box-items" ng-if="'1'|withRole">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'administrator'})" ui-sref-opts="{reload:true}">
                         <div class="boxs">
                             <img src="/static/images/manage/menu_8.png">
                         </div>
-                        <p class="box-font">Site Manager</p>
+                        <p class="box-font">系统配置</p>
                     </a>
                 </div>
 
                 <div class="box-items" ng-if="'100000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Developer'})" ui-sref-opts="{reload:true}">
+                    <a ng-click="headerShow()" ui-sref="listMenu({role:'developer'})" ui-sref-opts="{reload:true}">
                         <div class="boxs">
                             <img src="/static/images/manage/menu_9.png">
                         </div>
-                        <p class="box-font">Developer</p>
+                        <p class="box-font">开发中心</p>
                     </a>
                 </div>
 
-                <div class="box-items" ng-if="'1000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'Director'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_10.png">
-                        </div>
-                        <p class="box-font">Director</p>
-                    </a>
-                </div>
+                <!--<div class="box-items" ng-if="'1000000'|withRole">-->
+                    <!--<a ng-click="headerShow()" ui-sref="listMenu({role:'datacontent'})" ui-sref-opts="{reload:true}">-->
+                        <!--<div class="boxs">-->
+                            <!--<img src="/static/images/manage/menu_10.png">-->
+                        <!--</div>-->
+                        <!--<p class="box-font">数据中心</p>-->
+                    <!--</a>-->
+                <!--</div>-->
             </div>
 
             <div style="text-align: center">
diff --git a/src/main/ui/static/boot/manager-boot.js b/src/main/ui/static/boot/manager-boot.js
index a29a36dcb..5d5d73e27 100644
--- a/src/main/ui/static/boot/manager-boot.js
+++ b/src/main/ui/static/boot/manager-boot.js
@@ -76,7 +76,7 @@ require(['angular', 'jquery'], function (angular, $) {
     });
 
     function boot(user) {
-        var paths = ['static/boot/managerMainApp', 'static/menu/managerMenu','static/analysis/org/analysis-org', 'static/analysis/report/analysis-report', 'static/analysis/monitoring/analysis-monitoring', 'static/analysis/bd/analysis-bd'];
+        var paths = ['static/boot/managerMainApp', 'static/menu/managerMenu','static/analysis/org/analysis-org', 'static/analysis/report/analysis-report', 'static/analysis/monitoring/analysis-monitoring', 'static/analysis/bd/analysis-bd','static/analysis/trans-analysis'];
         var moduleNames = ['managerMainApp', 'listMenuApp','analysisTransaction', 'analysisBD', 'analysisOrg', 'analysisMonitoring', 'analysisReport'];
         window.currentUser = user;
         angular.forEach(user.modules, function (mod) {
diff --git a/src/main/ui/static/boot/manager-bootv2.js b/src/main/ui/static/boot/manager-bootv2.js
index 44f3bd5cb..aebce37ff 100644
--- a/src/main/ui/static/boot/manager-bootv2.js
+++ b/src/main/ui/static/boot/manager-bootv2.js
@@ -76,7 +76,7 @@ require(['angular', 'jquery'], function (angular, $) {
     });
 
     function boot(user) {
-        var paths = ['static/boot/managerMainAppv2', 'static/menu/managerMenu','static/analysis/org/analysis-org', 'static/analysis/report/analysis-report', 'static/analysis/monitoring/analysis-monitoring', 'static/analysis/bd/analysis-bd'];
+        var paths = ['static/boot/managerMainAppv2', 'static/menu/managerMenu','static/analysis/org/analysis-org', 'static/analysis/report/analysis-report', 'static/analysis/monitoring/analysis-monitoring', 'static/analysis/bd/analysis-bd','static/analysis/trans-analysis'];
         var moduleNames = ['managerMainAppv2', 'listMenuApp','analysisTransaction', 'analysisBD', 'analysisOrg', 'analysisMonitoring', 'analysisReport'];
         window.currentUser = user;
         angular.forEach(user.modules, function (mod) {

From 55879c5c20856a40b17b33fc4073375972c4ae18 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Mon, 22 Oct 2018 11:27:25 +0800
Subject: [PATCH 27/82] =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=AE=A1=E7=90=86ui?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/main_menu.html                    | 85 ++++++++++++++-----
 src/main/ui/managev2.html                     |  2 +-
 .../ui/static/analysis/channels_analysis.js   |  4 +-
 .../analysis/manage-customers-orders.js       |  2 +-
 src/main/ui/static/analysis/pre_refund.js     |  4 +-
 .../ui/static/analysis/refund_analysis.js     |  4 +-
 .../analysis/templates/channels_analysis.html |  9 ++
 .../templates/manage_customers_orders.html    |  4 +-
 .../static/analysis/templates/pre_refund.html | 18 ++--
 .../analysis/templates/refund_analysis.html   |  9 ++
 .../analysis/templates/trans_analysis.html    | 18 ++--
 .../templates/trans_analysis_monthly.html     |  9 ++
 .../transaction_amount_Analysis.html          |  9 ++
 .../static/analysis/trans-analysis-monthly.js |  6 +-
 src/main/ui/static/analysis/trans-analysis.js |  6 +-
 .../transaction/analysis-transaction.js       | 17 ++--
 .../templates/dashboard_gateway.html          |  2 +-
 17 files changed, 146 insertions(+), 62 deletions(-)

diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
index 3b0aa58eb..e2cdb7092 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/main_menu.html
@@ -138,7 +138,7 @@
                     </a>
                 </div>
                 <div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
+                    <a ui-sref="pre_refund" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_arrears.png"/>
                         <div class="description-text">
@@ -147,19 +147,66 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('transAnalysis'|withModule)||('dashboard'|withModule)||
-                ('customer_analysis'|withModule)||
-                ('customerRankingAnalysisApp'|withModule)||
-                ('partner_analysis'|withModule)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
+                <div ng-if="('transAnalysis'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="transanalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_original_statistics.png"/>
                         <div class="description-text">
-                            <span class="description-text">原统计</span>
+                            <span class="description-text">交易数据</span>
                         </div>
                     </div>
                     </a>
                 </div>
+                <div ng-if="('dashboard'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="gateway" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">Gateway统计</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('customer_analysis'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="customers_analysis_manage" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">消费者统计</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('refundAnalysisApp'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="refundAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">退款统计</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('channels_Analysis'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="channelsAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">支付通道</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('dashboard'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="amountlsAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">交易金额分析</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
                 <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
                     <div class="description-block">
@@ -343,23 +390,23 @@
             </div>
             <div class="row">
                 <div ng-if="'bdsale'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_bd.bdanalysis" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/bd_sales_volume.png"/>
-                        <div class="description-text">
-                            <span class="description-text">BD销售量</span>
+                    <a ui-sref="bdanalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_sales_volume.png"/>
+                            <div class="description-text">
+                                <span class="description-text">BD销售量</span>
+                            </div>
                         </div>
-                    </div>
                     </a>
                 </div>
                 <div ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/bd_commission.png"/>
-                        <div class="description-text">
-                            <span class="description-text">BD提成</span>
+                    <a ui-sref="bd_prizes" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_commission.png"/>
+                            <div class="description-text">
+                                <span class="description-text">BD提成</span>
+                            </div>
                         </div>
-                    </div>
                     </a>
                 </div>
                 <div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
index f23f25c7f..ff1052bdf 100644
--- a/src/main/ui/managev2.html
+++ b/src/main/ui/managev2.html
@@ -316,7 +316,7 @@ margin-bottom: 10%;"/>
             </div>
         </nav>
     </header>
-    <div style="margin-left: 0;min-height: 890px" ui-view autoscroll="false">
+    <div class="content-wrapper autoheight" style="margin-left: 0;" ui-view autoscroll="false" >
         <div class="backgroud">
             <div class="total_logo">
                 <a><img src="/static/images/manage_total_logo.png"> </a>
diff --git a/src/main/ui/static/analysis/channels_analysis.js b/src/main/ui/static/analysis/channels_analysis.js
index 7cf052150..1ed36e4e3 100644
--- a/src/main/ui/static/analysis/channels_analysis.js
+++ b/src/main/ui/static/analysis/channels_analysis.js
@@ -6,8 +6,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
     var app = angular.module('channelsAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.channelsAnalysis', {
-            url: '/channelsAnalysis',
+        $stateProvider.state('channelsAnalysis', {
+            url: '/analysis/transaction/channelsAnalysis',
             templateUrl: '/static/analysis/templates/channels_analysis.html',
             controller: 'channelsCtrl'
         })
diff --git a/src/main/ui/static/analysis/manage-customers-orders.js b/src/main/ui/static/analysis/manage-customers-orders.js
index 4659de334..d453cb506 100644
--- a/src/main/ui/static/analysis/manage-customers-orders.js
+++ b/src/main/ui/static/analysis/manage-customers-orders.js
@@ -3,7 +3,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('customersAnalysisManage', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.customers_analysis_manage', {
+        $stateProvider.state('customers_analysis_manage', {
             url: '/analysis/customers',
             templateUrl: '/static/analysis/templates/manage_customers_orders.html',
             controller: 'customersAnalysisCtrl'
diff --git a/src/main/ui/static/analysis/pre_refund.js b/src/main/ui/static/analysis/pre_refund.js
index d47ad3d1d..e86ebd640 100644
--- a/src/main/ui/static/analysis/pre_refund.js
+++ b/src/main/ui/static/analysis/pre_refund.js
@@ -6,10 +6,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
            'use strict';
            var app = angular.module('preRefundApp', ['ui.router']);
            app.config(['$stateProvider', function ($stateProvider) {
-               $stateProvider.state('analysis_monitoring.pre_refund', {
+               $stateProvider.state('pre_refund', {
                    controller: 'preRefundCtrl',
                    templateUrl: '/static/analysis/templates/pre_refund.html',
-                   url: '/pre_refund'
+                   url: '/analysis/monitoring/pre_refund'
                })
            }]);
 
diff --git a/src/main/ui/static/analysis/refund_analysis.js b/src/main/ui/static/analysis/refund_analysis.js
index 870bbf544..4133be834 100644
--- a/src/main/ui/static/analysis/refund_analysis.js
+++ b/src/main/ui/static/analysis/refund_analysis.js
@@ -3,8 +3,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
     var app = angular.module('refundAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.refundAnalysis', {
-            url: '/refunds',
+        $stateProvider.state('refundAnalysis', {
+            url: '/analysis/transaction/refunds',
             templateUrl: '/static/analysis/templates/refund_analysis.html',
             controller: 'refundListCtrl'
         })
diff --git a/src/main/ui/static/analysis/templates/channels_analysis.html b/src/main/ui/static/analysis/templates/channels_analysis.html
index 89eac868c..1d4283b1d 100644
--- a/src/main/ui/static/analysis/templates/channels_analysis.html
+++ b/src/main/ui/static/analysis/templates/channels_analysis.html
@@ -7,6 +7,15 @@
         text-align: center;
     }
 </style>
+<section class="content-header">
+    <h1>Channels Analysis</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Channels</li>
+    </ol>
+</section>
 <section class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html
index bb65421f4..9b43bebf5 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -7,7 +7,7 @@
         text-align: center;
     }
 </style>
-<!--<section class="content-header">
+<section class="content-header">
     <h1>Customers Analysis</h1>
     <ol class="breadcrumb">
         <li>
@@ -15,7 +15,7 @@
         </li>
         <li class="active">Customers</li>
     </ol>
-</section>-->
+</section>
 <div class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/pre_refund.html b/src/main/ui/static/analysis/templates/pre_refund.html
index efa6f0803..4aa4d9f82 100644
--- a/src/main/ui/static/analysis/templates/pre_refund.html
+++ b/src/main/ui/static/analysis/templates/pre_refund.html
@@ -1,12 +1,12 @@
-<!--<section class="content-header">-->
-    <!--<h1>商户活跃度统计</h1>-->
-    <!--<ol class="breadcrumb">-->
-        <!--<li>-->
-            <!--<i class="fa fa-shopping-cart"></i> Analysis-->
-        <!--</li>-->
-        <!--<li class="active">商户活跃度统计</li>-->
-    <!--</ol>-->
-<!--</section>-->
+<section class="content-header">
+    <h1>Pre Refund</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Pre Refund</li>
+    </ol>
+</section>
 <section class="content">
     <div class="row">
         <div class="box">
diff --git a/src/main/ui/static/analysis/templates/refund_analysis.html b/src/main/ui/static/analysis/templates/refund_analysis.html
index 0414880ef..e5d5fe207 100644
--- a/src/main/ui/static/analysis/templates/refund_analysis.html
+++ b/src/main/ui/static/analysis/templates/refund_analysis.html
@@ -7,6 +7,15 @@
         text-align: center;
     }
 </style>
+<section class="content-header">
+    <h1>Refund Analysis</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Refund</li>
+    </ol>
+</section>
 <div class="content">
     <div class="content">
         <div class="box-solid">
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 9fac48e1a..b819ad5fe 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -7,15 +7,15 @@
         text-align: center;
     }
 </style>
-<!--<section class="content-header">-->
-    <!--<h1>Transaction Data</h1>-->
-    <!--<ol class="breadcrumb">-->
-        <!--<li>-->
-            <!--<i class="fa fa-list-alt"></i> Analysis-->
-        <!--</li>-->
-        <!--<li class="active">Transaction Data</li>-->
-    <!--</ol>-->
-<!--</section>-->
+<section class="content-header">
+    <h1>Transaction Data</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Transaction Data</li>
+    </ol>
+</section>
 <div class="content">
     <div class="row">
         <div style="text-align: right" class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index 624069fa8..082381551 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -7,6 +7,15 @@
         text-align: center;
     }
 </style>
+<section class="content-header">
+    <h1>Transaction Data</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Transaction Data</li>
+    </ol>
+</section>
 <div class="content">
     <div class="row">
         <div style="text-align: right" class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
index 5f4be2c4e..6da6b25d2 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -1,3 +1,12 @@
+<section class="content-header">
+    <h1>Transaction Amount Analysis</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Transaction Amount</li>
+    </ol>
+</section>
 <div class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/trans-analysis-monthly.js b/src/main/ui/static/analysis/trans-analysis-monthly.js
index c1bccba7c..70ff8480b 100644
--- a/src/main/ui/static/analysis/trans-analysis-monthly.js
+++ b/src/main/ui/static/analysis/trans-analysis-monthly.js
@@ -3,7 +3,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('transAnalysisMonthly', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.transanalysis_monthly', {
+        $stateProvider.state('transanalysis_monthly', {
             url: '/analysis/transaction_monthly',
             templateUrl: '/static/analysis/templates/trans_analysis_monthly.html',
             controller: 'transAnalysisMonthlyCtrl'
@@ -15,12 +15,12 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                 {
                     key: 'day',
                     label: '按日统计',
-                    sref:"analysis_transaction.transanalysis"
+                    sref:"transanalysis"
                 },
                 {
                     key: 'month',
                     label: '按月统计',
-                    sref:"analysis_transaction.transanalysis_monthly"
+                    sref:"transanalysis_monthly"
                 }
             ];
             $scope.currentScalekey = 'month';
diff --git a/src/main/ui/static/analysis/trans-analysis.js b/src/main/ui/static/analysis/trans-analysis.js
index 2087785c3..052320a4c 100644
--- a/src/main/ui/static/analysis/trans-analysis.js
+++ b/src/main/ui/static/analysis/trans-analysis.js
@@ -3,7 +3,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('transAnalysis', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.transanalysis', {
+        $stateProvider.state('transanalysis', {
             url: '/analysis/transaction',
             templateUrl: '/static/analysis/templates/trans_analysis.html',
             controller: 'transAnalysisCtrl'
@@ -15,12 +15,12 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                 {
                     key: 'day',
                     label: '按日统计',
-                    sref:"analysis_transaction.transanalysis"
+                    sref:"transanalysis"
                 },
                 {
                     key: 'month',
                     label: '按月统计',
-                    sref:"analysis_transaction.transanalysis_monthly"
+                    sref:"transanalysis_monthly"
                 }
             ];
             $scope.currentScalekey = 'day';
diff --git a/src/main/ui/static/analysis/transaction/analysis-transaction.js b/src/main/ui/static/analysis/transaction/analysis-transaction.js
index dafc91ff2..21ed90ad3 100644
--- a/src/main/ui/static/analysis/transaction/analysis-transaction.js
+++ b/src/main/ui/static/analysis/transaction/analysis-transaction.js
@@ -6,16 +6,17 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('analysisTransaction', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction', {
-            url: '/analysis/transaction',
-            templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html',
-            controller: 'analysisTransactionCtrl'
-        }).state('analysis_transaction.gateway', {
-            url: '/gateway',
+        // $stateProvider.state('analysis_transaction', {
+        //     url: '/analysis/transaction',
+        //     templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html',
+        //     controller: 'analysisTransactionCtrl'
+        // })
+        $stateProvider.state('gateway', {
+            url: '/analysis/transaction/gateway',
             templateUrl: '/static/dashboard/templates/dashboard_gateway.html',
             controller: 'gatewayTransCtrl'
-        }).state('analysis_transaction.amountlsAnalysis', {
-            url: '/amountRangeAnalysis',
+        }).state('amountlsAnalysis', {
+            url: '/analysis/transaction/amountRangeAnalysis',
             templateUrl: '/static/analysis/templates/transaction_amount_Analysis.html',
             controller: 'transactionAmountCtrl'
         })
diff --git a/src/main/ui/static/dashboard/templates/dashboard_gateway.html b/src/main/ui/static/dashboard/templates/dashboard_gateway.html
index 6b68ee856..6e51ca1ea 100644
--- a/src/main/ui/static/dashboard/templates/dashboard_gateway.html
+++ b/src/main/ui/static/dashboard/templates/dashboard_gateway.html
@@ -7,7 +7,7 @@
         text-align: center;
     }
 </style>
-<section class="content-header" ng-if="dashboardPage">
+<section class="content-header">
     <h1>
         Gateway Analysis
     </h1>

From c63931939fd878d56e2b86590b5b0ad18f0de8fd Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 22 Oct 2018 11:57:22 +0800
Subject: [PATCH 28/82] fix v1-manager.html

---
 src/main/ui/manage.html                       | 188 ++++++++++++++++--
 .../analysis/bd/templates/analysis_bd.html    |  18 +-
 .../ui/static/analysis/customer_analysis.js   |   4 +-
 .../analysis/merchant_amount_analysis.js      |   4 +-
 .../templates/analysis_monitoring.html        |   2 +
 .../analysis/org/templates/analysis_org.html  |  16 +-
 .../ui/static/analysis/partners-analysis.js   |   4 +-
 .../report/templates/analysis_report.html     |  28 +--
 .../templates/settle_estimate_analysis.html   | 118 +++++++----
 .../templates/analysis_transaction.html       |  26 +--
 .../static/payment/partner/partner-manage.js  |   4 +-
 .../tradelog/templates/trade_logs.html        |   6 +-
 src/main/ui/static/risk/templates/risk.html   |   6 +-
 13 files changed, 309 insertions(+), 115 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 08c8a5d2e..0fa89e2c6 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -284,45 +284,201 @@ margin-bottom: 10%;"/>
                     </a>
                 </li>
 
-                <li class="header nav-header" ng-if="'1011110'|withRole">支付结算|Payment</li>
+                <li class="header nav-header" ng-if="'1011110'|withRole">商户管理|Partner Manage</li>
                 <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 Manage</span>
+                        <i class="fa fa-sitemap"></i> <span>商户名录|Partner Directories</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'partners'|withModule">
+                    <a ui-sref="newPartners" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-plus"></i> <span>商户进件|New Partner</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'partners'|withModule">
+                    <a ui-sref="partners_analysis" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-list-alt"></i> <span>商户统计|Merchants Data</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'partners'|withModule">
+                    <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-shopping-cart"></i> <span>商户活跃度(原统计)</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'partners'|withModule">
+                    <a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-area-chart"></i> <span>商户交易额统计（原统计）</span>
+                    </a>
+                </li>
+
+                <li class="header nav-header" ng-if="'1011110'|withRole">交易管理|Transaction</li>
+                <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>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                    <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-wrench"></i> <span>退款审核|Audit Refund</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                    <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-tv"></i> <span>欠款|Pre Refund</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-area-chart"></i> <span>原统计</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                    <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-server"></i> <span>支付回调消息|Notify History</span>
                     </a>
                 </li>
 
+                <li class="header nav-header" ng-if="'1011110'|withRole">风控管理|Risk Management</li>
+                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                    <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-tv"></i> <span>交易成功率监控</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                    <a ui-sref="analysis_monitoring.cheat" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-bell"></i> <span>风控点预警统计</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                    <a ui-sref="analysis_monitoring.cheat_monitor" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-building"></i> <span>风控点配置|Cheat Monitor</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                    <a ui-sref="analysis_monitoring.risk_manager" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-list-alt"></i> <span>风控记录|Risk Records</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                    <a ui-sref="analysis_monitoring.attention" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-exclamation-triangle"></i> <span>黑名单|Risky Merchants</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                    <a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
+                        <i class="fa fa fa-male"></i> <span>消费排名|Risky Merchants</span>
+                    </a>
+                </li>
+
+                <li class="header nav-header" ng-if="'1011110'|withRole">合规管理|Compliance Management</li>
+                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                    <a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
+                        <i class="fa fa fa-eye"></i> <span>商户合规</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('10'|withRole)">
+                    <a ui-sref="contract">
+                        <i class="fa fa-money"></i> <span>合同签约情况</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('10'|withRole)">
+                    <a ui-sref="rate_warnings">
+                        <i class="fa fa-bell"></i> <span>签约到期预警</span>
+                    </a>
+                </li>
                 <li ui-sref-active="active"
                     ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
                     <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
-                        <i class="fa  fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
+                        <i class="fa fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
                     </a>
                 </li>
-                <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>
+                <li ui-sref-active="active"
+                    ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                    <a ui-sref="logview.config_operation" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-edit"></i> <span>商户信息修改日志</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active"
+                    ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                    <a ui-sref="devtools.aliforexcel" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-envelope"></i> <span>Alipay进件表格导出</span>
                     </a>
                 </li>
+
+                <li class="header nav-header" ng-if="'1011110'|withRole">清算管理|Settlement Management</li>
                 <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>
                     </a>
                 </li>
+                <li ui-sref-active="active">
+                    <a ui-sref="clearingLogs.date_setting">
+                        <i class="fa fa-balance-scale"></i> <span>清算日管理</span>
+                    </a>
+                </li>
                 <li ui-sref-active="active" ng-if="'clearing'|withModule">
                     <a ui-sref="clearingLogs" ui-sref-opts="{reload:true}">
                         <i class="fa fa-line-chart"></i> <span>清算统计|Settlement Logs</span>
                     </a>
                 </li>
-                <li ui-sref-active="active" ng-if="('clearing_org'|withModule) && currentUser.org_id>1">
-                    <a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>
+                <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                    <a ui-sref="analysis_transaction.estimateAnalysis" ui-sref-opts="{reload:true}">
+                        <i class="fa fa fa-money"></i> <span>清算预估|Estimate</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                    <a ui-sref="analysis_report.settle_report" ui-sref-opts="{reload:true}">
+                        <i class="fa fa fa-tv"></i> <span>清算月报</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                    <a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
+                        <i class="fa fa fa-money"></i> <span>清算验证|Validation</span>
                     </a>
                 </li>
 
+                <li class="header nav-header" ng-if="'1011110'|withRole">财务管理|Financial Management</li>
                 <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>
                     </a>
                 </li>
+                <li ui-sref-active="active" ng-if="'1000'|withRole">
+                    <a ui-sref="invoice" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>Partner Invoice</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'1000'|withRole">
+                    <a ui-sref="analysis_report.platformrevenue" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-money"></i> <span>平台收支统计|Platform Revenue</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'1000'|withRole">
+                    <a ui-sref="analysis_report.wx_settlements" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-money"></i> <span>腾讯打款记录|Tencent Settlement</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'1000'|withRole">
+                    <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-usd"></i> <span>BD提成|BD Commissions</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'1000'|withRole">
+                    <a ui-sref="analysis_org.commission" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>合伙人提成</span>
+                    </a>
+                </li>
+
+
+
+
+                <li ui-sref-active="active" ng-if="('clearing_org'|withModule) && currentUser.org_id>1">
+                    <a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>
+                    </a>
+                </li>
+
+
 
                <!-- <li ui-sref-active="active" ng-if="'citypartner'|withModule">
                     <a ui-sref="citypartner_reg" ui-sref-opts="{reload:true}">
@@ -330,11 +486,7 @@ margin-bottom: 10%;"/>
                     </a>
                 </li>-->
 
-                <li ui-sref-active="active" ng-if="'1000'|withRole">
-                    <a ui-sref="invoice" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>Partner Invoice</span>
-                    </a>
-                </li>
+
 
                 <li class="header nav-header"
                     ng-if="('1011110'|withRole) || currentUser.org_id==null">营销服务|Promotion
@@ -398,11 +550,7 @@ margin-bottom: 10%;"/>
                         <i class="fa fa-users"></i> <span>余额增值活动</span>
                     </a>
                 </li>
-                <li ui-sref-active="active" ng-if="('1'|withRole)">
-                    <a ui-sref="contract">
-                        <i class="fa fa-money"></i> <span>合同签约情况</span>
-                    </a>
-                </li>
+
                 <li ui-sref-active="active" ng-if="'actChairty'|withModule">
                     <a ui-sref="act_chairty" ui-sref-opts="{reload:true}">
                         <i class="fa fa-users"></i> <span>半边天公益活动</span>
@@ -419,7 +567,7 @@ margin-bottom: 10%;"/>
 
                 <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">数据分析|Analysis</li>
 
-                <li ui-sref-active="active" ng-if="('transAnalysis'|withModule)||('dashboard'|withModule)||
+                <li ui-sref-active="active" ng-if="('transAnalysis'|withModule)||
                 ('customer_analysis'|withModule)||
                 ('customerRankingAnalysisApp'|withModule)||
                 ('partner_analysis'|withModule)">
diff --git a/src/main/ui/static/analysis/bd/templates/analysis_bd.html b/src/main/ui/static/analysis/bd/templates/analysis_bd.html
index 584c42f31..85d6088f4 100644
--- a/src/main/ui/static/analysis/bd/templates/analysis_bd.html
+++ b/src/main/ui/static/analysis/bd/templates/analysis_bd.html
@@ -1,15 +1,15 @@
 <div class="content">
     <div class="row">
         <div class="col-sm-12 analysis-nav">
-        <ul class="nav nav-pills">
-            <li ui-sref-active-eq="active" ng-if="'bdsale'|withModule">
-                <a ui-sref="analysis_bd.bdanalysis"><i class="fa fa-hand-peace-o"></i>BD销售量|BD Sale</a>
-            </li>
-            <li ui-sref-active-eq="active"
-                ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">
-                <a ui-sref="analysis_bd.bd_prizes"><i class="fa fa-usd"></i></i>BD提成|BD Commissions</a>
-            </li>
-        </ul>
+        <!--<ul class="nav nav-pills">-->
+            <!--<li ui-sref-active-eq="active" ng-if="'bdsale'|withModule">-->
+                <!--<a ui-sref="analysis_bd.bdanalysis"><i class="fa fa-hand-peace-o"></i>BD销售量|BD Sale</a>-->
+            <!--</li>-->
+            <!--<li ui-sref-active-eq="active"-->
+                <!--ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">-->
+                <!--<a ui-sref="analysis_bd.bd_prizes"><i class="fa fa-usd"></i></i>BD提成|BD Commissions</a>-->
+            <!--</li>-->
+        <!--</ul>-->
         </div>
     </div>
     <div class="row">
diff --git a/src/main/ui/static/analysis/customer_analysis.js b/src/main/ui/static/analysis/customer_analysis.js
index 826c70478..6718e9ecf 100644
--- a/src/main/ui/static/analysis/customer_analysis.js
+++ b/src/main/ui/static/analysis/customer_analysis.js
@@ -5,8 +5,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
     'use strict';
     var app = angular.module('customerRankingAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.customerRankingAnalysis', {
-            url: '/customers',
+        $stateProvider.state('customerRankingAnalysis', {
+            url: '/analysis/transaction/customers',
             templateUrl: '/static/analysis/templates/customer_analysis.html',
             controller: 'customersListCtrl',
             data: {label: 'Customers'}
diff --git a/src/main/ui/static/analysis/merchant_amount_analysis.js b/src/main/ui/static/analysis/merchant_amount_analysis.js
index c9a7984a0..d1696bae4 100644
--- a/src/main/ui/static/analysis/merchant_amount_analysis.js
+++ b/src/main/ui/static/analysis/merchant_amount_analysis.js
@@ -3,8 +3,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
     'use strict';
     var app = angular.module('merchantAmount', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.merchantAmountAnalysis', {
-            url: '/amount',
+        $stateProvider.state('merchantAmountAnalysis', {
+            url: '/analysis/transaction/amount',
             templateUrl: '/static/analysis/templates/merchant_amount_analysis.html',
             controller: 'clientAmountListCtrl'
         })
diff --git a/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html b/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html
index 7ebb4c4ff..ebc28f9e6 100644
--- a/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html
+++ b/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html
@@ -1,5 +1,6 @@
 <div class="content">
 <div class="row">
+<!--
     <div class="col-sm-12 analysis-nav">
         <ul class="nav nav-pills">
             <li ui-sref-active-eq="active" ng-if="'clientrate'|withModule">
@@ -25,6 +26,7 @@
 
         </ul>
     </div>
+-->
 </div>
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/org/templates/analysis_org.html b/src/main/ui/static/analysis/org/templates/analysis_org.html
index 13cefc4d8..3d5f38dd3 100644
--- a/src/main/ui/static/analysis/org/templates/analysis_org.html
+++ b/src/main/ui/static/analysis/org/templates/analysis_org.html
@@ -1,14 +1,14 @@
 <div class="content">
 <div class="row">
     <div class="col-sm-12 analysis-nav">
-        <ul class="nav nav-pills">
-            <li ui-sref-active-eq="active" ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))">
-                <a ui-sref="analysis_org.organlasis"><i class="fa fa-hand-peace-o"></i>合伙人销售量|City Partner Sale</a>
-            </li>
-            <li ui-sref-active-eq="active" ng-if="('orgcommission'|withModule)">
-                <a ui-sref="analysis_org.commission"><i class="fa fa-users"></i></i>合伙人提成|City Partner Commissions</a>
-            </li>
-        </ul>
+        <!--<ul class="nav nav-pills">-->
+            <!--<li ui-sref-active-eq="active" ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))">-->
+                <!--<a ui-sref="analysis_org.organlasis"><i class="fa fa-hand-peace-o"></i>合伙人销售量|City Partner Sale</a>-->
+            <!--</li>-->
+            <!--<li ui-sref-active-eq="active" ng-if="('orgcommission'|withModule)">-->
+                <!--<a ui-sref="analysis_org.commission"><i class="fa fa-users"></i></i>合伙人提成|City Partner Commissions</a>-->
+            <!--</li>-->
+        <!--</ul>-->
     </div>
 </div>
     <div class="row">
diff --git a/src/main/ui/static/analysis/partners-analysis.js b/src/main/ui/static/analysis/partners-analysis.js
index f2525a4d2..80a96e797 100644
--- a/src/main/ui/static/analysis/partners-analysis.js
+++ b/src/main/ui/static/analysis/partners-analysis.js
@@ -3,8 +3,8 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('partnersAnalysis', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.partners_analysis', {
-            url: '/analysis/partners',
+        $stateProvider.state('partners_analysis', {
+            url: '/analysis/transaction/analysis/partners',
             templateUrl: '/static/analysis/templates/partners_analysis.html',
             controller: 'partnersAnalysisCtrl'
         })
diff --git a/src/main/ui/static/analysis/report/templates/analysis_report.html b/src/main/ui/static/analysis/report/templates/analysis_report.html
index f8b5d4a2a..7aff50ca8 100644
--- a/src/main/ui/static/analysis/report/templates/analysis_report.html
+++ b/src/main/ui/static/analysis/report/templates/analysis_report.html
@@ -1,20 +1,20 @@
 <div class="content">
     <div class="row">
         <div class="col-sm-12 analysis-nav">
-        <ul class="nav nav-pills">
-            <li ui-sref-active-eq="active" ng-if="'settleReport'|withModule">
-                <a ui-sref="analysis_report.settle_report"><i class="fa fa-tv"></i>清算月报|Settlement Month Report</a>
-            </li>
-            <li ui-sref-active-eq="active" ng-if="'platformRevenue'|withModule">
-                <a ui-sref="analysis_report.platformrevenue"><i class="fa fa-money"></i>平台收支统计|Platform Revenue</a>
-            </li>
-            <li ui-sref-active-eq="active" ng-if="'wxSettlementsApp'|withModule">
-                <a ui-sref="analysis_report.wx_settlements"><i class="fa fa-money"></i>腾讯打款记录|Tencent Settlement</a>
-            </li>
-            <li ui-sref-active-eq="active" ng-if="'platformRevenue'|withModule">
-                <a ui-sref="analysis_report.platformsettle"><i class="fa fa-money"></i>清算验证|Settlement Validation</a>
-            </li>
-        </ul>
+        <!--<ul class="nav nav-pills">-->
+            <!--<li ui-sref-active-eq="active" ng-if="'settleReport'|withModule">-->
+                <!--<a ui-sref="analysis_report.settle_report"><i class="fa fa-tv"></i>清算月报|Settlement Month Report</a>-->
+            <!--</li>-->
+            <!--<li ui-sref-active-eq="active" ng-if="'platformRevenue'|withModule">-->
+                <!--<a ui-sref="analysis_report.platformrevenue"><i class="fa fa-money"></i>平台收支统计|Platform Revenue</a>-->
+            <!--</li>-->
+            <!--<li ui-sref-active-eq="active" ng-if="'wxSettlementsApp'|withModule">-->
+                <!--<a ui-sref="analysis_report.wx_settlements"><i class="fa fa-money"></i>腾讯打款记录|Tencent Settlement</a>-->
+            <!--</li>-->
+            <!--<li ui-sref-active-eq="active" ng-if="'platformRevenue'|withModule">-->
+                <!--<a ui-sref="analysis_report.platformsettle"><i class="fa fa-money"></i>清算验证|Settlement Validation</a>-->
+            <!--</li>-->
+        <!--</ul>-->
         </div>
     </div>
     <div class="row">
diff --git a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
index 96315a7c2..41309ca99 100644
--- a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
+++ b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
@@ -20,7 +20,8 @@
                             <div class="col-md-3 col-sm-6 col-xs-12" ng-repeat="fut in future track by $index">
                                 <div class="info-box" ng-if="fut.estimate_date">
                                     <div>
-                                        <div class="info-box-icon bg-aqua" style="height: 100px" ng-bind="fut.estimate_date.substr(8,10)">
+                                        <div class="info-box-icon bg-aqua" style="height: 100px"
+                                             ng-bind="fut.estimate_date.substr(8,10)">
                                         </div>
                                         <div class="info-box-content">
                                             <div>
@@ -43,17 +44,51 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="box-header" style="border-top: solid #f06010 1px;" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
+                                        <div class="box-header" style="border-top: solid #f06010 1px;"
+                                             ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
                                             <span class="text-bold">到账金额详情:</span>
                                         </div>
-                                        <div class="box-body" ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
-                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1307485301"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1307485301" />(1307485301)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1307485301|currency:'AUD'"></a></p>
-                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1431999902"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1431999902"/>(1431999902)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1431999902|currency:'AUD'"></a></p>
-                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.settlementFee_1487387142"> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Merchant ID: 1487387142"/>(1487387142)到账金额:<a class="text-green" ng-bind="fut.settlementFee_1487387142|currency:'AUD'"></a></p>
-                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.aliSettleFee_All"> <img src="/static/images/alipay_sign.png" uib-tooltip="AliPay" alt="Alipay"/>  到账金额:<a class="text-green" ng-bind="fut.aliSettleFee_All|currency:'AUD'"></a></p>
-                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.aliOnlineSettleFee_All"> <img src="/static/images/alipay_sign.png" uib-tooltip="AliPayOnline" alt="AliPayOnline"/>  到账金额(AlipayOnline):<a class="text-green" ng-bind="fut.aliOnlineSettleFee_All|currency:'AUD'"></a></p>
-                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.hfSettleFee_All"> <img src="/static/images/hf_sign.png" uib-tooltip="Hf" alt="Hf"/>  到账金额:<a class="text-green" ng-bind="fut.hfSettleFee_All|currency:'AUD'"></a></p>
-                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.platformGetSettleFee" style="color: #f06010"> <img src="/static/images/r_logo.svg" style="width: 20px;height: 20px;" uib-tooltip="RoyalPay" alt="RoyalPay"/>  总到账金额:<a class="text-green" ng-bind="fut.platformGetSettleFee|currency:'AUD'"></a></p>
+                                        <div class="box-body"
+                                             ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
+                                            <p class="text-bold col-sm-12" align="left"
+                                               ng-if="fut.settlementFee_1307485301"><img
+                                                    src="/static/images/wechatpay_sign.png"
+                                                    uib-tooltip="Wechat Merchant ID: 1307485301"/>(1307485301)到账金额:<a
+                                                    class="text-green"
+                                                    ng-bind="fut.settlementFee_1307485301|currency:'AUD'"></a></p>
+                                            <p class="text-bold col-sm-12" align="left"
+                                               ng-if="fut.settlementFee_1431999902"><img
+                                                    src="/static/images/wechatpay_sign.png"
+                                                    uib-tooltip="Wechat Merchant ID: 1431999902"/>(1431999902)到账金额:<a
+                                                    class="text-green"
+                                                    ng-bind="fut.settlementFee_1431999902|currency:'AUD'"></a></p>
+                                            <p class="text-bold col-sm-12" align="left"
+                                               ng-if="fut.settlementFee_1487387142"><img
+                                                    src="/static/images/wechatpay_sign.png"
+                                                    uib-tooltip="Wechat Merchant ID: 1487387142"/>(1487387142)到账金额:<a
+                                                    class="text-green"
+                                                    ng-bind="fut.settlementFee_1487387142|currency:'AUD'"></a></p>
+                                            <p class="text-bold col-sm-12" align="left" ng-if="fut.aliSettleFee_All">
+                                                <img src="/static/images/alipay_sign.png" uib-tooltip="AliPay"
+                                                     alt="Alipay"/> 到账金额:<a class="text-green"
+                                                                            ng-bind="fut.aliSettleFee_All|currency:'AUD'"></a>
+                                            </p>
+                                            <p class="text-bold col-sm-12" align="left"
+                                               ng-if="fut.aliOnlineSettleFee_All"><img
+                                                    src="/static/images/alipay_sign.png" uib-tooltip="AliPayOnline"
+                                                    alt="AliPayOnline"/> 到账金额(AlipayOnline):<a class="text-green"
+                                                                                               ng-bind="fut.aliOnlineSettleFee_All|currency:'AUD'"></a>
+                                            </p>
+                                            <p class="text-bold col-sm-12" align="left" ng-if="fut.hfSettleFee_All"><img
+                                                    src="/static/images/hf_sign.png" uib-tooltip="Hf" alt="Hf"/> 到账金额:<a
+                                                    class="text-green" ng-bind="fut.hfSettleFee_All|currency:'AUD'"></a>
+                                            </p>
+                                            <p class="text-bold col-sm-12" align="left" ng-if="fut.platformGetSettleFee"
+                                               style="color: #f06010"><img src="/static/images/r_logo.svg"
+                                                                           style="width: 20px;height: 20px;"
+                                                                           uib-tooltip="RoyalPay" alt="RoyalPay"/>
+                                                总到账金额:<a class="text-green"
+                                                         ng-bind="fut.platformGetSettleFee|currency:'AUD'"></a></p>
                                         </div>
                                         <!-- /.box-body -->
                                     </div>
@@ -77,12 +112,14 @@
                                                                 <input class="form-control" id="date-from-input"
                                                                        ng-model="params.start_date"
                                                                        uib-datepicker-popup size="10" placeholder="From"
-                                                                       is-open="dateBegin.open" ng-click="dateBegin.open=true"
+                                                                       is-open="dateBegin.open"
+                                                                       ng-click="dateBegin.open=true"
                                                                        datepicker-options="{maxDate:params.end_date||today}">
                                                             </div>
                                                             ~
                                                             <div style="display: inline-block">
-                                                                <input class="form-control" id="date-to-input" ng-model="params.end_date"
+                                                                <input class="form-control" id="date-to-input"
+                                                                       ng-model="params.end_date"
                                                                        uib-datepicker-popup size="10" placeholder="To"
                                                                        is-open="dateTo.open" ng-click="dateTo.open=true"
                                                                        datepicker-options="{minDate:params.start_date,maxDate:today}">
@@ -124,39 +161,44 @@
                                     </div>
                                 </div>
                             </div>
-                        <div class="box box-warning">
-                            <div class="box-header with-border">清算金额趋势</div>
-                            <div class="box-body">
-                                <div class="chart" echarts="stChart" style="height: 300px"
-                                     ng-class="{nodata:stChart.nodata}"></div>
+                            <div class="box box-warning">
+                                <div class="box-header with-border">清算金额趋势</div>
+                                <div class="box-body">
+                                    <div class="chart" echarts="stChart" style="height: 300px"
+                                         ng-class="{nodata:stChart.nodata}"></div>
+                                </div>
                             </div>
-                        </div>
-                        <div class="box box-warning settle-forecast" >
-                            <div class="box-header">Settlement Logs</div>
-                            <div class="box-body">
-                                <div royal-calendar month-change="loadMonthLog($month)">
-                                    <div ng-if="logArray[(day|date:'yyyy-MM-dd')]">
-                                        <span class="text-bold">总清算额:</span>
-                                        <span style="color: #f60;" ng-bind="logArray[(day|date:'yyyy-MM-dd')].total_amount|currency:'$'"></span>
-                                        <div>
-                                            <span class="text-bold">T+1 :</span>
-                                            <span style="color: #f60;" ng-bind="logArray[(day|date:'yyyy-MM-dd')].one_clean_amount|currency:'$'"></span>
-                                        </div>
-                                        <div>
-                                            <span class="text-bold">T+2 :</span>
-                                            <span style="color: #f60;"  ng-bind="logArray[(day|date:'yyyy-MM-dd')].two_clean_amount|currency:'$'"></span>
-                                        </div>
-                                        <div>
-                                            <span class="text-bold">T+3 :</span>
-                                            <span style="color: #f60;" ng-bind="logArray[(day|date:'yyyy-MM-dd')].three_clean_amount|currency:'$'"></span>
+                            <div class="box box-warning settle-forecast">
+                                <div class="box-header">Settlement Logs</div>
+                                <div class="box-body">
+                                    <div royal-calendar month-change="loadMonthLog($month)">
+                                        <div ng-if="logArray[(day|date:'yyyy-MM-dd')]">
+                                            <span class="text-bold">总清算额:</span>
+                                            <span style="color: #f60;"
+                                                  ng-bind="logArray[(day|date:'yyyy-MM-dd')].total_amount|currency:'$'"></span>
+                                            <div>
+                                                <span class="text-bold">T+1 :</span>
+                                                <span style="color: #f60;"
+                                                      ng-bind="logArray[(day|date:'yyyy-MM-dd')].one_clean_amount|currency:'$'"></span>
+                                            </div>
+                                            <div>
+                                                <span class="text-bold">T+2 :</span>
+                                                <span style="color: #f60;"
+                                                      ng-bind="logArray[(day|date:'yyyy-MM-dd')].two_clean_amount|currency:'$'"></span>
+                                            </div>
+                                            <div>
+                                                <span class="text-bold">T+3 :</span>
+                                                <span style="color: #f60;"
+                                                      ng-bind="logArray[(day|date:'yyyy-MM-dd')].three_clean_amount|currency:'$'"></span>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                    </div>
                 </div>
             </div>
         </div>
-    </div>
\ No newline at end of file
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html b/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html
index aaf4db977..b4c003a9f 100644
--- a/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html
+++ b/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html
@@ -1,29 +1,30 @@
 
 <div class="content">
 <div class="row">
+
     <div class="col-sm-12 analysis-nav">
         <ul class="nav nav-pills">
             <li ui-sref-active-eq="active" ng-if="'transAnalysis'|withModule">
                 <a ui-sref="analysis_transaction.transanalysis"><i class="fa fa-area-chart"></i>交易数据|Transaction Data</a>
             </li>
-            <li ui-sref-active-eq="active" ng-if="'partner_analysis'|withModule">
-                <a ui-sref="analysis_transaction.partners_analysis"><i class="fa fa-line-chart"></i></i>商户数|Merchants Data</a>
-            </li>
+            <!--<li ui-sref-active-eq="active" ng-if="'partner_analysis'|withModule">-->
+                <!--<a ui-sref="analysis_transaction.partners_analysis"><i class="fa fa-line-chart"></i></i>商户数|Merchants Data</a>-->
+            <!--</li>-->
             <li ui-sref-active="active" ng-if="'dashboard'|withModule">
                 <a ui-sref="analysis_transaction.gateway"><i class="fa fa-area-chart"></i>Gateway统计|Gateway Analysis</a>
             </li>
             <li ui-sref-active="active" ng-if="'customer_analysis'|withModule">
                 <a ui-sref="analysis_transaction.customers_analysis_manage"><i class="fa fa-bar-chart"></i>消费者统计|Customer Analysis</a>
             </li>
-            <li ui-sref-active="active" ng-if="'customerRankingAnalysisApp'|withModule">
-                <a ui-sref="analysis_transaction.customerRankingAnalysis"><i class="fa fa-male"></i>消费排名|Customers Ranking</a>
-            </li>
+            <!--<li ui-sref-active="active" ng-if="'customerRankingAnalysisApp'|withModule">-->
+                <!--<a ui-sref="analysis_transaction.customerRankingAnalysis"><i class="fa fa-male"></i>消费排名|Customers Ranking</a>-->
+            <!--</li>-->
             <li ui-sref-active="active" ng-if="'refundAnalysisApp'|withModule">
                 <a ui-sref="analysis_transaction.refundAnalysis"><i class="fa fa-money"></i>退款统计|Refund Analysis</a>
             </li>
-            <li ui-sref-active="active" ng-if="('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)">
-                <a ui-sref="analysis_transaction.estimateAnalysis"><i class="fa fa-money"></i>清算预估|Settlement Estimate</a>
-            </li>
+            <!--<li ui-sref-active="active" ng-if="('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)">-->
+                <!--<a ui-sref="analysis_transaction.estimateAnalysis"><i class="fa fa-money"></i>清算预估|Settlement Estimate</a>-->
+            <!--</li>-->
             <li ui-sref-active="active" ng-if="'channels_Analysis'|withModule">
                 <a ui-sref="analysis_transaction.channelsAnalysis"><i class="fa fa-area-chart"></i>支付通道|Channels Analysis</a>
             </li>
@@ -32,11 +33,12 @@
                 <a ui-sref="analysis_transaction.amountlsAnalysis"><i class="fa fa-area-chart"></i>交易金额分析|Transaction Amount Analysis</a>
             </li>
 
-            <li ui-sref-active="active" ng-if="('merchantAmount'|withModule) &&('1'|withRole) ">
-                <a ui-sref="analysis_transaction.merchantAmountAnalysis"><i class="fa fa-area-chart"></i>商户交易额</a>
-            </li>
+            <!--<li ui-sref-active="active" ng-if="('merchantAmount'|withModule) &&('1'|withRole) ">-->
+                <!--<a ui-sref="analysis_transaction.merchantAmountAnalysis"><i class="fa fa-area-chart"></i>商户交易额</a>-->
+            <!--</li>-->
         </ul>
     </div>
+
 </div>
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index e680fe728..ef733f8e5 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -87,8 +87,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             templateUrl: '/static/payment/partner/templates/partners.html',
             controller: 'partnerListCtrl',
             data: {label: '商户列表'}
-        }).state('partners.new', {
-            url: '/new',
+        }).state('newPartners', {
+            url: '/partners/new',
             templateUrl: '/static/payment/partner/templates/add_partner.html',
             controller: 'addPartnerCtrl'
         }).state('partners.detail', {
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 977125376..0f9e99713 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -228,9 +228,9 @@
                                         <i class="fa fa-search"></i> Search
                                     </button>
                                     <!--<div class="pull-right">-->
-                                        <button class="btn btn-danger" ng-if="('10000000000'|withRole)" type="button" ui-sref="refundReview">
-                                            <i class="fa fa-wrench"></i> Audit Refund
-                                        </button>
+                                        <!--<button class="btn btn-danger" ng-if="('10000000000'|withRole)" type="button" ui-sref="refundReview">-->
+                                            <!--<i class="fa fa-wrench"></i> Audit Refund-->
+                                        <!--</button>-->
                                     <!--</div>-->
                                 </div>
                             </div>
diff --git a/src/main/ui/static/risk/templates/risk.html b/src/main/ui/static/risk/templates/risk.html
index 664ecc853..9991b65d6 100644
--- a/src/main/ui/static/risk/templates/risk.html
+++ b/src/main/ui/static/risk/templates/risk.html
@@ -35,9 +35,9 @@
                                 class="fa fa-search"></i></button>
                     </div>
 
-                    <div class="form-group pull-right">
-                        <button class="btn btn-primary" type="button" ui-sref="analysis_monitoring.attention">Risky Merchants</button>
-                    </div>
+                    <!--<div class="form-group pull-right">-->
+                        <!--<button class="btn btn-primary" type="button" ui-sref="analysis_monitoring.attention">Risky Merchants</button>-->
+                    <!--</div>-->
                 </div>
             </div>
         </div>

From b5b6a8b2869573089a721444125f68bc9f5823ca Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Mon, 22 Oct 2018 12:57:00 +0800
Subject: [PATCH 29/82] fix

---
 src/main/ui/main_menu.html                    | 58 ++-----------------
 .../ui/static/analysis/channels_analysis.js   |  4 +-
 .../analysis/manage-customers-orders.js       |  2 +-
 src/main/ui/static/analysis/pre_refund.js     |  4 +-
 .../ui/static/analysis/refund_analysis.js     |  4 +-
 .../analysis/templates/channels_analysis.html |  4 +-
 .../templates/manage_customers_orders.html    |  4 +-
 .../static/analysis/templates/pre_refund.html |  4 +-
 .../analysis/templates/refund_analysis.html   |  4 +-
 .../analysis/templates/trans_analysis.html    |  4 +-
 .../templates/trans_analysis_monthly.html     |  4 +-
 .../transaction_amount_Analysis.html          |  4 +-
 .../static/analysis/trans-analysis-monthly.js |  6 +-
 src/main/ui/static/analysis/trans-analysis.js |  6 +-
 .../transaction/analysis-transaction.js       | 17 +++---
 .../templates/dashboard_gateway.html          |  2 +-
 16 files changed, 40 insertions(+), 91 deletions(-)

diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
index e2cdb7092..3ec946a2e 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/main_menu.html
@@ -77,7 +77,7 @@
                     </a>
                 </div>
                 <div ng-if="'partner_analysis'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_transaction.partners_analysis" ui-sref-opts="{reload:true}">
+                    <a ui-sref="partners_analysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_statistics.png"/>
                         <div class="description-text">
@@ -87,7 +87,7 @@
                     </a>
                 </div>
                 <div ng-if="'clientrate'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
+                    <a ui-sref="client_rates" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_activity_1.png"/>
                         <div class="description-text">
@@ -148,65 +148,15 @@
                     </a>
                 </div>
                 <div ng-if="('transAnalysis'|withModule)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="transanalysis" ui-sref-opts="{reload:true}">
+                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_original_statistics.png"/>
                         <div class="description-text">
-                            <span class="description-text">交易数据</span>
+                            <span class="description-text">原统计</span>
                         </div>
                     </div>
                     </a>
                 </div>
-                <div ng-if="('dashboard'|withModule)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="gateway" ui-sref-opts="{reload:true}">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
-                            <div class="description-text">
-                                <span class="description-text">Gateway统计</span>
-                            </div>
-                        </div>
-                    </a>
-                </div>
-                <div ng-if="('customer_analysis'|withModule)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="customers_analysis_manage" ui-sref-opts="{reload:true}">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
-                            <div class="description-text">
-                                <span class="description-text">消费者统计</span>
-                            </div>
-                        </div>
-                    </a>
-                </div>
-                <div ng-if="('refundAnalysisApp'|withModule)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="refundAnalysis" ui-sref-opts="{reload:true}">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
-                            <div class="description-text">
-                                <span class="description-text">退款统计</span>
-                            </div>
-                        </div>
-                    </a>
-                </div>
-                <div ng-if="('channels_Analysis'|withModule)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="channelsAnalysis" ui-sref-opts="{reload:true}">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
-                            <div class="description-text">
-                                <span class="description-text">支付通道</span>
-                            </div>
-                        </div>
-                    </a>
-                </div>
-                <div ng-if="('dashboard'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="amountlsAnalysis" ui-sref-opts="{reload:true}">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
-                            <div class="description-text">
-                                <span class="description-text">交易金额分析</span>
-                            </div>
-                        </div>
-                    </a>
-                </div>
                 <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
                     <div class="description-block">
diff --git a/src/main/ui/static/analysis/channels_analysis.js b/src/main/ui/static/analysis/channels_analysis.js
index 1ed36e4e3..7cf052150 100644
--- a/src/main/ui/static/analysis/channels_analysis.js
+++ b/src/main/ui/static/analysis/channels_analysis.js
@@ -6,8 +6,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
     var app = angular.module('channelsAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('channelsAnalysis', {
-            url: '/analysis/transaction/channelsAnalysis',
+        $stateProvider.state('analysis_transaction.channelsAnalysis', {
+            url: '/channelsAnalysis',
             templateUrl: '/static/analysis/templates/channels_analysis.html',
             controller: 'channelsCtrl'
         })
diff --git a/src/main/ui/static/analysis/manage-customers-orders.js b/src/main/ui/static/analysis/manage-customers-orders.js
index d453cb506..4659de334 100644
--- a/src/main/ui/static/analysis/manage-customers-orders.js
+++ b/src/main/ui/static/analysis/manage-customers-orders.js
@@ -3,7 +3,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('customersAnalysisManage', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('customers_analysis_manage', {
+        $stateProvider.state('analysis_transaction.customers_analysis_manage', {
             url: '/analysis/customers',
             templateUrl: '/static/analysis/templates/manage_customers_orders.html',
             controller: 'customersAnalysisCtrl'
diff --git a/src/main/ui/static/analysis/pre_refund.js b/src/main/ui/static/analysis/pre_refund.js
index e86ebd640..d47ad3d1d 100644
--- a/src/main/ui/static/analysis/pre_refund.js
+++ b/src/main/ui/static/analysis/pre_refund.js
@@ -6,10 +6,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
            'use strict';
            var app = angular.module('preRefundApp', ['ui.router']);
            app.config(['$stateProvider', function ($stateProvider) {
-               $stateProvider.state('pre_refund', {
+               $stateProvider.state('analysis_monitoring.pre_refund', {
                    controller: 'preRefundCtrl',
                    templateUrl: '/static/analysis/templates/pre_refund.html',
-                   url: '/analysis/monitoring/pre_refund'
+                   url: '/pre_refund'
                })
            }]);
 
diff --git a/src/main/ui/static/analysis/refund_analysis.js b/src/main/ui/static/analysis/refund_analysis.js
index 4133be834..870bbf544 100644
--- a/src/main/ui/static/analysis/refund_analysis.js
+++ b/src/main/ui/static/analysis/refund_analysis.js
@@ -3,8 +3,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
     var app = angular.module('refundAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('refundAnalysis', {
-            url: '/analysis/transaction/refunds',
+        $stateProvider.state('analysis_transaction.refundAnalysis', {
+            url: '/refunds',
             templateUrl: '/static/analysis/templates/refund_analysis.html',
             controller: 'refundListCtrl'
         })
diff --git a/src/main/ui/static/analysis/templates/channels_analysis.html b/src/main/ui/static/analysis/templates/channels_analysis.html
index 1d4283b1d..db4fa595d 100644
--- a/src/main/ui/static/analysis/templates/channels_analysis.html
+++ b/src/main/ui/static/analysis/templates/channels_analysis.html
@@ -7,7 +7,7 @@
         text-align: center;
     }
 </style>
-<section class="content-header">
+<!--<section class="content-header">
     <h1>Channels Analysis</h1>
     <ol class="breadcrumb">
         <li>
@@ -15,7 +15,7 @@
         </li>
         <li class="active">Channels</li>
     </ol>
-</section>
+</section>-->
 <section class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html
index 9b43bebf5..bb65421f4 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -7,7 +7,7 @@
         text-align: center;
     }
 </style>
-<section class="content-header">
+<!--<section class="content-header">
     <h1>Customers Analysis</h1>
     <ol class="breadcrumb">
         <li>
@@ -15,7 +15,7 @@
         </li>
         <li class="active">Customers</li>
     </ol>
-</section>
+</section>-->
 <div class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/pre_refund.html b/src/main/ui/static/analysis/templates/pre_refund.html
index 4aa4d9f82..e56edfa66 100644
--- a/src/main/ui/static/analysis/templates/pre_refund.html
+++ b/src/main/ui/static/analysis/templates/pre_refund.html
@@ -1,4 +1,4 @@
-<section class="content-header">
+<!--<section class="content-header">
     <h1>Pre Refund</h1>
     <ol class="breadcrumb">
         <li>
@@ -6,7 +6,7 @@
         </li>
         <li class="active">Pre Refund</li>
     </ol>
-</section>
+</section>-->
 <section class="content">
     <div class="row">
         <div class="box">
diff --git a/src/main/ui/static/analysis/templates/refund_analysis.html b/src/main/ui/static/analysis/templates/refund_analysis.html
index e5d5fe207..572b1b0be 100644
--- a/src/main/ui/static/analysis/templates/refund_analysis.html
+++ b/src/main/ui/static/analysis/templates/refund_analysis.html
@@ -7,7 +7,7 @@
         text-align: center;
     }
 </style>
-<section class="content-header">
+<!--<section class="content-header">
     <h1>Refund Analysis</h1>
     <ol class="breadcrumb">
         <li>
@@ -15,7 +15,7 @@
         </li>
         <li class="active">Refund</li>
     </ol>
-</section>
+</section>-->
 <div class="content">
     <div class="content">
         <div class="box-solid">
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index b819ad5fe..f1ab22f81 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -7,7 +7,7 @@
         text-align: center;
     }
 </style>
-<section class="content-header">
+<!--<section class="content-header">
     <h1>Transaction Data</h1>
     <ol class="breadcrumb">
         <li>
@@ -15,7 +15,7 @@
         </li>
         <li class="active">Transaction Data</li>
     </ol>
-</section>
+</section>-->
 <div class="content">
     <div class="row">
         <div style="text-align: right" class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index 082381551..99e9a96c5 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -7,7 +7,7 @@
         text-align: center;
     }
 </style>
-<section class="content-header">
+<!--<section class="content-header">
     <h1>Transaction Data</h1>
     <ol class="breadcrumb">
         <li>
@@ -15,7 +15,7 @@
         </li>
         <li class="active">Transaction Data</li>
     </ol>
-</section>
+</section>-->
 <div class="content">
     <div class="row">
         <div style="text-align: right" class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
index 6da6b25d2..2f400fa69 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -1,4 +1,4 @@
-<section class="content-header">
+<!--<section class="content-header">
     <h1>Transaction Amount Analysis</h1>
     <ol class="breadcrumb">
         <li>
@@ -6,7 +6,7 @@
         </li>
         <li class="active">Transaction Amount</li>
     </ol>
-</section>
+</section>-->
 <div class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/trans-analysis-monthly.js b/src/main/ui/static/analysis/trans-analysis-monthly.js
index 70ff8480b..c1bccba7c 100644
--- a/src/main/ui/static/analysis/trans-analysis-monthly.js
+++ b/src/main/ui/static/analysis/trans-analysis-monthly.js
@@ -3,7 +3,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('transAnalysisMonthly', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('transanalysis_monthly', {
+        $stateProvider.state('analysis_transaction.transanalysis_monthly', {
             url: '/analysis/transaction_monthly',
             templateUrl: '/static/analysis/templates/trans_analysis_monthly.html',
             controller: 'transAnalysisMonthlyCtrl'
@@ -15,12 +15,12 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                 {
                     key: 'day',
                     label: '按日统计',
-                    sref:"transanalysis"
+                    sref:"analysis_transaction.transanalysis"
                 },
                 {
                     key: 'month',
                     label: '按月统计',
-                    sref:"transanalysis_monthly"
+                    sref:"analysis_transaction.transanalysis_monthly"
                 }
             ];
             $scope.currentScalekey = 'month';
diff --git a/src/main/ui/static/analysis/trans-analysis.js b/src/main/ui/static/analysis/trans-analysis.js
index 052320a4c..2087785c3 100644
--- a/src/main/ui/static/analysis/trans-analysis.js
+++ b/src/main/ui/static/analysis/trans-analysis.js
@@ -3,7 +3,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('transAnalysis', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('transanalysis', {
+        $stateProvider.state('analysis_transaction.transanalysis', {
             url: '/analysis/transaction',
             templateUrl: '/static/analysis/templates/trans_analysis.html',
             controller: 'transAnalysisCtrl'
@@ -15,12 +15,12 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                 {
                     key: 'day',
                     label: '按日统计',
-                    sref:"transanalysis"
+                    sref:"analysis_transaction.transanalysis"
                 },
                 {
                     key: 'month',
                     label: '按月统计',
-                    sref:"transanalysis_monthly"
+                    sref:"analysis_transaction.transanalysis_monthly"
                 }
             ];
             $scope.currentScalekey = 'day';
diff --git a/src/main/ui/static/analysis/transaction/analysis-transaction.js b/src/main/ui/static/analysis/transaction/analysis-transaction.js
index 21ed90ad3..dafc91ff2 100644
--- a/src/main/ui/static/analysis/transaction/analysis-transaction.js
+++ b/src/main/ui/static/analysis/transaction/analysis-transaction.js
@@ -6,17 +6,16 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('analysisTransaction', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        // $stateProvider.state('analysis_transaction', {
-        //     url: '/analysis/transaction',
-        //     templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html',
-        //     controller: 'analysisTransactionCtrl'
-        // })
-        $stateProvider.state('gateway', {
-            url: '/analysis/transaction/gateway',
+        $stateProvider.state('analysis_transaction', {
+            url: '/analysis/transaction',
+            templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html',
+            controller: 'analysisTransactionCtrl'
+        }).state('analysis_transaction.gateway', {
+            url: '/gateway',
             templateUrl: '/static/dashboard/templates/dashboard_gateway.html',
             controller: 'gatewayTransCtrl'
-        }).state('amountlsAnalysis', {
-            url: '/analysis/transaction/amountRangeAnalysis',
+        }).state('analysis_transaction.amountlsAnalysis', {
+            url: '/amountRangeAnalysis',
             templateUrl: '/static/analysis/templates/transaction_amount_Analysis.html',
             controller: 'transactionAmountCtrl'
         })
diff --git a/src/main/ui/static/dashboard/templates/dashboard_gateway.html b/src/main/ui/static/dashboard/templates/dashboard_gateway.html
index 6e51ca1ea..6b68ee856 100644
--- a/src/main/ui/static/dashboard/templates/dashboard_gateway.html
+++ b/src/main/ui/static/dashboard/templates/dashboard_gateway.html
@@ -7,7 +7,7 @@
         text-align: center;
     }
 </style>
-<section class="content-header">
+<section class="content-header" ng-if="dashboardPage">
     <h1>
         Gateway Analysis
     </h1>

From 9c28923818af9e9e88cc3acf4ad252a82993729c Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Mon, 22 Oct 2018 15:18:25 +0800
Subject: [PATCH 30/82] fix

---
 .../static/actapp/templates/act_app_list.html |  4 +---
 .../templates/act_chairty_merchants.html      |  2 +-
 .../encourage/templates/event_root.html       |  2 +-
 .../templates/mon_delay_merchants.html        |  2 +-
 .../monitor/templates/monitor_root.html       | 14 ++++++-------
 .../templates/cheat_monitor_risk.html         |  7 +++++++
 .../static/analysis/templates/cheat_risk.html | 16 +++++++--------
 .../analysis/templates/clearing_logs.html     |  2 +-
 .../analysis/templates/client_rates.html      | 20 +++++++++----------
 .../analysis/templates/customer_analysis.html |  8 ++++----
 .../templates/merchant_amount_analysis.html   |  9 +++++++++
 .../analysis/templates/partners_analysis.html |  2 +-
 .../static/analysis/templates/pre_refund.html |  6 +++---
 .../templates/settle_delay_merchants.html     |  2 +-
 .../templates/settle_estimate_analysis.html   |  9 +++++++++
 .../analysis/templates/settle_report.html     | 10 +++++++++-
 .../analysis/templates/settle_warnings.html   | 10 +++++++++-
 .../cashback/templates/manage_cashback.html   |  2 +-
 .../bdprize/templates/bd_prize_root.html      |  2 +-
 .../devtools/templates/aliforexcel.html       |  3 +--
 .../devtools/templates/wx_settlements.html    |  2 +-
 .../templates/config_opertaion_log.html       |  7 ++-----
 .../config/logview/templates/notify_log.html  |  5 +----
 .../templates/org_commission_root.html        |  7 +++++++
 .../templates/platform_revenue_root.html      | 14 ++++++-------
 .../templates/platform_settle_logs.html       |  2 +-
 .../payment/invoice/templates/invoice.html    |  2 +-
 .../partner/templates/add_partner.html        |  3 +--
 .../payment/partner/templates/partners.html   |  6 +++---
 .../partner/templates/partners_apply.html     |  2 +-
 .../tradelog/templates/refund_review.html     |  2 +-
 .../tradelog/templates/trade_logs.html        |  2 +-
 .../tradelog/templates/trans_report.html      |  2 +-
 .../validation/templates/valid-calendar.html  |  2 +-
 .../risk/templates/attention_merchants.html   |  6 +++---
 src/main/ui/static/risk/templates/risk.html   |  6 +++---
 .../static/sys/templates/contract_sign.html   |  9 +++++++++
 37 files changed, 128 insertions(+), 83 deletions(-)

diff --git a/src/main/ui/static/actapp/templates/act_app_list.html b/src/main/ui/static/actapp/templates/act_app_list.html
index ba75a94fb..41493484f 100644
--- a/src/main/ui/static/actapp/templates/act_app_list.html
+++ b/src/main/ui/static/actapp/templates/act_app_list.html
@@ -2,9 +2,7 @@
     <section class="content-header">
         <h1>APP_ACTIVITY</h1>
         <ol class="breadcrumb">
-            <li>
-                <i class="fa fa-sitemap">活动管理</i>
-            </li>
+            <li><i class="fa fa-dollar"></i>Promotion</li>
             <li class="active">APP_ACTIVITY</li>
         </ol>
     </section>
diff --git a/src/main/ui/static/actchairty/templates/act_chairty_merchants.html b/src/main/ui/static/actchairty/templates/act_chairty_merchants.html
index dd6f2f8b9..a7fe2c4da 100644
--- a/src/main/ui/static/actchairty/templates/act_chairty_merchants.html
+++ b/src/main/ui/static/actchairty/templates/act_chairty_merchants.html
@@ -2,7 +2,7 @@
     <h4>半边天公益活动</h4>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-users"></i> Activity
+            <i class="fa fa-users"></i> Promotion
         </li>
         <li class="active">
             Act Chairty
diff --git a/src/main/ui/static/activity/encourage/templates/event_root.html b/src/main/ui/static/activity/encourage/templates/event_root.html
index f311db1b7..979875071 100644
--- a/src/main/ui/static/activity/encourage/templates/event_root.html
+++ b/src/main/ui/static/activity/encourage/templates/event_root.html
@@ -2,7 +2,7 @@
     <section class="content-header">
         <h1>Encourage Money</h1>
         <ol class="breadcrumb">
-            <li><i class="fa fa-gift"></i> Activities</li>
+            <li><i class="fa fa-gift"></i> Promotion</li>
             <li class="active">Encourage Money</li>
         </ol>
     </section>
diff --git a/src/main/ui/static/analysis/mondelay/templates/mon_delay_merchants.html b/src/main/ui/static/analysis/mondelay/templates/mon_delay_merchants.html
index 2fb05b0c4..ba77c95dd 100644
--- a/src/main/ui/static/analysis/mondelay/templates/mon_delay_merchants.html
+++ b/src/main/ui/static/analysis/mondelay/templates/mon_delay_merchants.html
@@ -2,7 +2,7 @@
     <h4>余额增值活动</h4>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-users"></i> Payment
+            <i class="fa fa-users"></i> Promotion
         </li>
         <li class="active">
             MonDelay
diff --git a/src/main/ui/static/analysis/monitor/templates/monitor_root.html b/src/main/ui/static/analysis/monitor/templates/monitor_root.html
index 36950fbd2..35593a07f 100644
--- a/src/main/ui/static/analysis/monitor/templates/monitor_root.html
+++ b/src/main/ui/static/analysis/monitor/templates/monitor_root.html
@@ -1,10 +1,10 @@
-<!--<section class="content-header">-->
-    <!--<h1>交易监控</h1>-->
-    <!--<ol class="breadcrumb">-->
-        <!--<li><i class="fa fa-tv"></i> 数据分析</li>-->
-        <!--<li class="active">交易监控</li>-->
-    <!--</ol>-->
-<!--</section>-->
+<section class="content-header">
+    <h1>Trade Monitor</h1>
+    <ol class="breadcrumb">
+        <li><i class="fa fa-tv"></i> Risk Management</li>
+        <li class="active">Trade Monitor</li>
+    </ol>
+</section>
 <section class="content">
     <div class="nav-tabs-custom">
         <ul class="nav nav-tabs">
diff --git a/src/main/ui/static/analysis/templates/cheat_monitor_risk.html b/src/main/ui/static/analysis/templates/cheat_monitor_risk.html
index 2964bebf4..a8d24f1ed 100644
--- a/src/main/ui/static/analysis/templates/cheat_monitor_risk.html
+++ b/src/main/ui/static/analysis/templates/cheat_monitor_risk.html
@@ -142,6 +142,13 @@
         </div>
     </div>
 </section>-->
+<section class="content-header">
+    <h1>Risk Records</h1>
+    <ol class="breadcrumb">
+        <li><i class="fa fa-tv"></i> Risk Management</li>
+        <li class="active">Risk Records</li>
+    </ol>
+</section>
 <section class="content">
     <div class="box">
         <div class="box-body">
diff --git a/src/main/ui/static/analysis/templates/cheat_risk.html b/src/main/ui/static/analysis/templates/cheat_risk.html
index 8928a6cc1..65bd1acf3 100644
--- a/src/main/ui/static/analysis/templates/cheat_risk.html
+++ b/src/main/ui/static/analysis/templates/cheat_risk.html
@@ -1,12 +1,10 @@
-<!--<section class="content-header">-->
-    <!--<h1>商户活跃度统计</h1>-->
-    <!--<ol class="breadcrumb">-->
-        <!--<li>-->
-            <!--<i class="fa fa-shopping-cart"></i> Analysis-->
-        <!--</li>-->
-        <!--<li class="active">商户活跃度统计</li>-->
-    <!--</ol>-->
-<!--</section>-->
+<section class="content-header">
+    <h1>Risk Monitor</h1>
+    <ol class="breadcrumb">
+        <li><i class="fa fa-tv"></i> Risk Management</li>
+        <li class="active">Risk Monitor</li>
+    </ol>
+</section>
 <section class="content">
     <div class="panel panel-success">
         <div class="panel-body">
diff --git a/src/main/ui/static/analysis/templates/clearing_logs.html b/src/main/ui/static/analysis/templates/clearing_logs.html
index 4c81ee029..9f0224898 100644
--- a/src/main/ui/static/analysis/templates/clearing_logs.html
+++ b/src/main/ui/static/analysis/templates/clearing_logs.html
@@ -12,7 +12,7 @@
         <h1>Settlement logs</h1>
         <ol class="breadcrumb">
             <li>
-                <i class="fa fa-list-alt"></i> Analysis
+                <i class="fa fa-list-alt"></i> Settlement
             </li>
             <li class="active">Settlement logs</li>
         </ol>
diff --git a/src/main/ui/static/analysis/templates/client_rates.html b/src/main/ui/static/analysis/templates/client_rates.html
index 833b9186c..744833752 100644
--- a/src/main/ui/static/analysis/templates/client_rates.html
+++ b/src/main/ui/static/analysis/templates/client_rates.html
@@ -1,17 +1,17 @@
-<!--<section class="content-header">-->
-    <!--<h1>商户活跃度统计</h1>-->
-    <!--<ol class="breadcrumb">-->
-        <!--<li>-->
-            <!--<i class="fa fa-shopping-cart"></i> Analysis-->
-        <!--</li>-->
-        <!--<li class="active">商户活跃度统计</li>-->
-    <!--</ol>-->
-<!--</section>-->
+<section class="content-header">
+    <h1>New Partner</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-sitemap"></i> Partner Manage
+        </li>
+        <li class="active">New Partner</li>
+    </ol>
+</section>
 <section class="content">
     <div class="panel panel-success">
         <div class="panel-body">
             <div class="form-inline">
-                <div class="btn-group" ng-if="!('analysis_monitoring.client_rates'|isState) && (!('100'|withRole) || ('1000000000000'|withRole))">
+                <div class="btn-group" ng-if="!('client_rates'|isState) && (!('100'|withRole) || ('1000000000000'|withRole))">
                     <a class="btn btn-default" ui-sref="analysis_monitoring.client_rates"><i class="fa fa-chevron-left"></i></a>
                 </div>
                 <div class="input-group" ng-if="('analysis_monitoring.client_rates'|isState) && !currentUser.org_id">
diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index 34029ebb7..099aba25f 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -1,12 +1,12 @@
-<!--<section class="content-header">
+<section class="content-header">
     <h1>Customer Transaction Analysis</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-sitemap"></i> Analysis
+            <i class="fa fa-sitemap"></i> Risk Management
         </li>
-        <li class="active">Customer</li>
+        <li class="active">Customer Transaction</li>
     </ol>
-</section>-->
+</section>
 
 <div class="content">
     <div class="row">
diff --git a/src/main/ui/static/analysis/templates/merchant_amount_analysis.html b/src/main/ui/static/analysis/templates/merchant_amount_analysis.html
index d937f16b8..42ebcc8b7 100644
--- a/src/main/ui/static/analysis/templates/merchant_amount_analysis.html
+++ b/src/main/ui/static/analysis/templates/merchant_amount_analysis.html
@@ -42,6 +42,15 @@
     }
 
 </style>
+<section class="content-header">
+    <h1>Transaction Amount Analysis</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Payment
+        </li>
+        <li class="active">Transaction Amount Analysis</li>
+    </ol>
+</section>
 <div class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/partners_analysis.html b/src/main/ui/static/analysis/templates/partners_analysis.html
index f287b80ca..5910ad56b 100644
--- a/src/main/ui/static/analysis/templates/partners_analysis.html
+++ b/src/main/ui/static/analysis/templates/partners_analysis.html
@@ -12,7 +12,7 @@
         <h1>Merchant statistics</h1>
         <ol class="breadcrumb">
             <li>
-                <i class="fa fa-list-alt"></i> Payment
+                <i class="fa fa-sitemap"></i> Partner Manage
             </li>
             <li class="active">Merchant statistics</li>
         </ol>
diff --git a/src/main/ui/static/analysis/templates/pre_refund.html b/src/main/ui/static/analysis/templates/pre_refund.html
index e56edfa66..d8c81a8dc 100644
--- a/src/main/ui/static/analysis/templates/pre_refund.html
+++ b/src/main/ui/static/analysis/templates/pre_refund.html
@@ -1,12 +1,12 @@
-<!--<section class="content-header">
+<section class="content-header">
     <h1>Pre Refund</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-list-alt"></i> Analysis
+            <i class="fa fa-list-alt"></i> Transaction
         </li>
         <li class="active">Pre Refund</li>
     </ol>
-</section>-->
+</section>
 <section class="content">
     <div class="row">
         <div class="box">
diff --git a/src/main/ui/static/analysis/templates/settle_delay_merchants.html b/src/main/ui/static/analysis/templates/settle_delay_merchants.html
index fd5752ab0..4aef74ddf 100644
--- a/src/main/ui/static/analysis/templates/settle_delay_merchants.html
+++ b/src/main/ui/static/analysis/templates/settle_delay_merchants.html
@@ -2,7 +2,7 @@
     <h4>周末费率减半活动</h4>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-users"></i> Payment
+            <i class="fa fa-users"></i> Promotion
         </li>
         <li class="active">
             City Partners
diff --git a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
index 41309ca99..5a1d877be 100644
--- a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
+++ b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
@@ -7,6 +7,15 @@
         text-align: center;
     }
 </style>
+<section class="content-header">
+    <h1>Settlement Estimate</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Settlement
+        </li>
+        <li class="active">Settlement Estimate</li>
+    </ol>
+</section>
 <div class="content">
     <div class="content">
         <div class="box-solid">
diff --git a/src/main/ui/static/analysis/templates/settle_report.html b/src/main/ui/static/analysis/templates/settle_report.html
index dfc991e0d..e6bbf9732 100644
--- a/src/main/ui/static/analysis/templates/settle_report.html
+++ b/src/main/ui/static/analysis/templates/settle_report.html
@@ -1,4 +1,12 @@
-
+<section class="content-header">
+    <h1>Monthly report of liquidation</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-sitemap"></i> Settlement
+        </li>
+        <li class="active">Monthly report of liquidation</li>
+    </ol>
+</section>
 <section class="content">
     <div class="box box-default">
         <div class="box-header">
diff --git a/src/main/ui/static/analysis/templates/settle_warnings.html b/src/main/ui/static/analysis/templates/settle_warnings.html
index dcda53830..028b2688f 100644
--- a/src/main/ui/static/analysis/templates/settle_warnings.html
+++ b/src/main/ui/static/analysis/templates/settle_warnings.html
@@ -1,4 +1,12 @@
-<div class="modal-header">Rate Expire Warnings</div>
+<section class="content-header">
+    <h1>Rate Expire Warnings</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-sitemap"></i> Compliance Management
+        </li>
+        <li class="active">Rate Expire Warnings</li>
+    </ol>
+</section>
 <div class="modal-body">
     <div class="box box-danger">
         <div class="box-header">费率已过期商户({{warning.no_rate.length}}家)</div>
diff --git a/src/main/ui/static/cashback/templates/manage_cashback.html b/src/main/ui/static/cashback/templates/manage_cashback.html
index aa61a1348..251047641 100644
--- a/src/main/ui/static/cashback/templates/manage_cashback.html
+++ b/src/main/ui/static/cashback/templates/manage_cashback.html
@@ -3,7 +3,7 @@
     <h1><span>营销返现数据分析</span></h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-sitemap"></i> Marketing
+            <i class="fa fa-sitemap"></i> Promotion
         </li>
         <li><a ui-sref="^">Promotion Account</a></li>
     </ol>
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
index 23183fd11..ef9ffeae6 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
@@ -2,7 +2,7 @@
     <section class="content-header">
         <h1>BD Commissions</h1>
         <ol class="breadcrumb">
-            <li><i class="fa fa-usd"></i> Analysis</li>
+            <li><i class="fa fa-usd"></i> Financial</li>
             <li class="active">BD Commissions</li>
         </ol>
     </section>
diff --git a/src/main/ui/static/config/devtools/templates/aliforexcel.html b/src/main/ui/static/config/devtools/templates/aliforexcel.html
index 51232c480..68d15a1d5 100644
--- a/src/main/ui/static/config/devtools/templates/aliforexcel.html
+++ b/src/main/ui/static/config/devtools/templates/aliforexcel.html
@@ -2,9 +2,8 @@
     <h1>支付宝进件表格导出</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-cog"></i> Basic Config
+            <i class="fa fa-cog"></i> Compliance Management
         </li>
-        <li><a ui-sref="^">Dev Tools</a></li>
         <li class="active">aliforexcel</li>
     </ol>
 </section>
diff --git a/src/main/ui/static/config/devtools/templates/wx_settlements.html b/src/main/ui/static/config/devtools/templates/wx_settlements.html
index dacfa0a9b..dca317662 100644
--- a/src/main/ui/static/config/devtools/templates/wx_settlements.html
+++ b/src/main/ui/static/config/devtools/templates/wx_settlements.html
@@ -2,7 +2,7 @@
     <h1>Wechat Settlements</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-flag"></i>Report
+            <i class="fa fa-flag"></i>Financial
         </li>
         <li class="active">Wechat Settlements</li>
     </ol>
diff --git a/src/main/ui/static/config/logview/templates/config_opertaion_log.html b/src/main/ui/static/config/logview/templates/config_opertaion_log.html
index 4d8eeaf6b..d4efc0c48 100644
--- a/src/main/ui/static/config/logview/templates/config_opertaion_log.html
+++ b/src/main/ui/static/config/logview/templates/config_opertaion_log.html
@@ -1,11 +1,8 @@
 <section class="content-header">
-    <h1>Config Operation Logs</h1>
+    <h1>Compliance Management</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-file-text-o"></i> Basic Config
-        </li>
-        <li>
-            <a ui-sref="^">Log Views</a>
+            <i class="fa fa-file-text-o"></i> Compliance Management
         </li>
         <li class="active">Config Operation Logs</li>
     </ol>
diff --git a/src/main/ui/static/config/logview/templates/notify_log.html b/src/main/ui/static/config/logview/templates/notify_log.html
index 38c66e3dd..f1a2d873e 100644
--- a/src/main/ui/static/config/logview/templates/notify_log.html
+++ b/src/main/ui/static/config/logview/templates/notify_log.html
@@ -2,10 +2,7 @@
     <h1>Notify Logs</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-file-text-o"></i> Basic Config
-        </li>
-        <li>
-            <a ui-sref="^">Log Views</a>
+            <i class="fa fa-file-text-o"></i> Transaction
         </li>
         <li class="active">Notify Logs</li>
     </ol>
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
index f1f8afe09..7cc5ddbe3 100644
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
@@ -1,3 +1,10 @@
+<section class="content-header">
+    <h1>City Partner Commissions</h1>
+    <ol class="breadcrumb">
+        <li><i class="fa fa-dollar"></i>Financial</li>
+        <li class="active">City Partner Commissions</li>
+    </ol>
+</section>
 <div class="content">
     <div class="box box-default">
         <div class="box-body">
diff --git a/src/main/ui/static/config/platformrevenue/templates/platform_revenue_root.html b/src/main/ui/static/config/platformrevenue/templates/platform_revenue_root.html
index 1c3bd22c4..aa13b50bd 100644
--- a/src/main/ui/static/config/platformrevenue/templates/platform_revenue_root.html
+++ b/src/main/ui/static/config/platformrevenue/templates/platform_revenue_root.html
@@ -1,10 +1,10 @@
-<!--<section class="content-header">-->
-    <!--<h1>Platform Revenue Report</h1>-->
-    <!--<ol class="breadcrumb">-->
-        <!--<li><i class="fa fa-dollar"></i>Analysis</li>-->
-        <!--<li class="active">Platform Revenue Report</li>-->
-    <!--</ol>-->
-<!--</section>-->
+<section class="content-header">
+    <h1>Platform Revenue Report</h1>
+    <ol class="breadcrumb">
+        <li><i class="fa fa-dollar"></i>Financial</li>
+        <li class="active">Platform Revenue Report</li>
+    </ol>
+</section>
 
 </br>
 <div class="form-group col-sm-12">
diff --git a/src/main/ui/static/config/platformrevenue/templates/platform_settle_logs.html b/src/main/ui/static/config/platformrevenue/templates/platform_settle_logs.html
index 802d5c3fd..fdff48e0d 100644
--- a/src/main/ui/static/config/platformrevenue/templates/platform_settle_logs.html
+++ b/src/main/ui/static/config/platformrevenue/templates/platform_settle_logs.html
@@ -3,7 +3,7 @@
     <h1>Settlement Validation</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-sitemap"></i> Payment
+            <i class="fa fa-sitemap"></i> Settlement
         </li>
         <li class="active">Settlement Validation</li>
     </ol>
diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index c045936f1..f96b8ca1e 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -33,7 +33,7 @@
     <h1>Partner Invoice</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-comments-o"></i> Payment
+            <i class="fa fa-comments-o"></i> Financial
         </li>
         <li class="active">Partner Invoice</li>
     </ol>
diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index 5aa55efa2..c1346de5a 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -8,9 +8,8 @@
     <h1>New Partner</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-sitemap"></i> Payment
+            <i class="fa fa-sitemap"></i> Partner Manage
         </li>
-        <li><a ui-sref="^" ui-sref-opts="{reload:true}">Partner Manage</a></li>
         <li class="active">New Partner</li>
     </ol>
 </section>
diff --git a/src/main/ui/static/payment/partner/templates/partners.html b/src/main/ui/static/payment/partner/templates/partners.html
index e7f5d7105..91bea07b5 100644
--- a/src/main/ui/static/payment/partner/templates/partners.html
+++ b/src/main/ui/static/payment/partner/templates/partners.html
@@ -8,12 +8,12 @@
 </style>
 <div ui-view>
     <section class="content-header">
-        <h1>Partner Manage</h1>
+        <h1>Partner Directories</h1>
         <ol class="breadcrumb">
             <li>
-                <i class="fa fa-sitemap"></i> Payment
+                <i class="fa fa-sitemap"></i> Partner Manage
             </li>
-            <li class="active">Partner Manage</li>
+            <li class="active">Partner Directories</li>
         </ol>
     </section>
 
diff --git a/src/main/ui/static/payment/partner/templates/partners_apply.html b/src/main/ui/static/payment/partner/templates/partners_apply.html
index f2f532ace..9bb316e93 100644
--- a/src/main/ui/static/payment/partner/templates/partners_apply.html
+++ b/src/main/ui/static/payment/partner/templates/partners_apply.html
@@ -3,7 +3,7 @@
         <h1>Partner Application</h1>
         <ol class="breadcrumb">
             <li>
-                <i class="fa fa-sitemap"></i> Payment
+                <i class="fa fa-sitemap"></i> Compliance Management
             </li>
             <li class="active">Partner Applications</li>
         </ol>
diff --git a/src/main/ui/static/payment/tradelog/templates/refund_review.html b/src/main/ui/static/payment/tradelog/templates/refund_review.html
index 5cc57ee48..ed286dcce 100644
--- a/src/main/ui/static/payment/tradelog/templates/refund_review.html
+++ b/src/main/ui/static/payment/tradelog/templates/refund_review.html
@@ -2,7 +2,7 @@
     <h1>Refund Audit</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-list"></i> Payment
+            <i class="fa fa-list"></i> Transaction
         </li>
         <li class="active">
             Refund Audit
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 0f9e99713..b4a3173f4 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -26,7 +26,7 @@
     <h1>Trade Logs</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-list-alt"></i> Payment
+            <i class="fa fa-list-alt"></i> Transaction
         </li>
         <li class="active">Trade Logs</li>
     </ol>
diff --git a/src/main/ui/static/payment/tradelog/templates/trans_report.html b/src/main/ui/static/payment/tradelog/templates/trans_report.html
index 50a3ec983..ec22314e5 100644
--- a/src/main/ui/static/payment/tradelog/templates/trans_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/trans_report.html
@@ -11,7 +11,7 @@
     <h1>AusTrac Report</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-comments-o"></i> Payment
+            <i class="fa fa-comments-o"></i> Financial
         </li>
         <li class="active">AusTrac Report</li>
     </ol>
diff --git a/src/main/ui/static/payment/validation/templates/valid-calendar.html b/src/main/ui/static/payment/validation/templates/valid-calendar.html
index 055f1c27c..7b8750645 100644
--- a/src/main/ui/static/payment/validation/templates/valid-calendar.html
+++ b/src/main/ui/static/payment/validation/templates/valid-calendar.html
@@ -2,7 +2,7 @@
     <section class="content-header">
         <h1>Order Validation</h1>
         <ol class="breadcrumb">
-            <li><i class="fa fa-balance-scale"></i> Payment</li>
+            <li><i class="fa fa-balance-scale"></i> Settlement</li>
             <li class="active">Order Validation</li>
         </ol>
     </section>
diff --git a/src/main/ui/static/risk/templates/attention_merchants.html b/src/main/ui/static/risk/templates/attention_merchants.html
index d3ddfdf66..a3da05e12 100644
--- a/src/main/ui/static/risk/templates/attention_merchants.html
+++ b/src/main/ui/static/risk/templates/attention_merchants.html
@@ -1,9 +1,9 @@
 <div ui-view>
     <section class="content-header">
-        <h1>Risky Merchants</h1>
+        <h1>Blacklist</h1>
         <ol class="breadcrumb">
-            <li><i class="fa fa-gift"></i> Risk</li>
-            <li class="active">Risk Merchants</li>
+            <li><i class="fa fa-gift"></i> Risk Manager</li>
+            <li class="active">Blacklist</li>
         </ol>
     </section>
     <section class="content">
diff --git a/src/main/ui/static/risk/templates/risk.html b/src/main/ui/static/risk/templates/risk.html
index 9991b65d6..ce0415615 100644
--- a/src/main/ui/static/risk/templates/risk.html
+++ b/src/main/ui/static/risk/templates/risk.html
@@ -1,9 +1,9 @@
 <div ui-view>
     <section class="content-header">
-        <h1>Risk Manager</h1>
+        <h1>Risk Records</h1>
         <ol class="breadcrumb">
-            <li><i class="fa fa-gift"></i> Risk</li>
-            <li class="active">Risk Manager</li>
+            <li><i class="fa fa-gift"></i> Risk Manager</li>
+            <li class="active">Risk Records</li>
         </ol>
     </section>
     <section class="content">
diff --git a/src/main/ui/static/sys/templates/contract_sign.html b/src/main/ui/static/sys/templates/contract_sign.html
index f0b462da6..41f712886 100644
--- a/src/main/ui/static/sys/templates/contract_sign.html
+++ b/src/main/ui/static/sys/templates/contract_sign.html
@@ -1,3 +1,12 @@
+<section class="content-header">
+    <h1>Business compliance</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-sitemap"></i> Compliance Management
+        </li>
+        <li class="active">Business compliance</li>
+    </ol>
+</section>
 <div class="modal-header">Contract</div>
 
 <ul class="nav nav-tabs">

From 465772c5dc7d08a50e98a311aa3f92107f2c6a42 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 22 Oct 2018 16:10:06 +0800
Subject: [PATCH 31/82] fix v1-manager.html & v2-manager.html

---
 src/main/ui/main_menu.html                    | 242 +++++++++++-------
 src/main/ui/manage.html                       | 222 ++++++++--------
 .../analysis/settle_estimate_analysis.js      |   4 +-
 src/main/ui/static/boot/managerMainApp.js     |  81 ++++++
 src/main/ui/static/config/logview/logview.js  |  14 +-
 .../static/config/logview/templates/root.html |   4 +-
 .../config/organizations/organizations.js     |   4 +-
 .../ui/static/config/sysconfigs/sysconfigs.js |   8 +-
 .../templates/permission_config.html          |   2 +-
 .../sysconfigs/templates/sysconfig.html       |  12 +-
 .../main_menu/compliance_alipayexcel.png      | Bin 0 -> 2919 bytes
 .../images/main_menu/compliance_appliy.png    | Bin 0 -> 2493 bytes
 .../images/main_menu/compliance_log.png       | Bin 0 -> 1520 bytes
 .../images/main_menu/compliance_warning.png   | Bin 0 -> 2614 bytes
 14 files changed, 376 insertions(+), 217 deletions(-)
 create mode 100644 src/main/ui/static/images/main_menu/compliance_alipayexcel.png
 create mode 100644 src/main/ui/static/images/main_menu/compliance_appliy.png
 create mode 100644 src/main/ui/static/images/main_menu/compliance_log.png
 create mode 100644 src/main/ui/static/images/main_menu/compliance_warning.png

diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
index 3ec946a2e..b506f3e73 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/main_menu.html
@@ -7,13 +7,13 @@
 <div class="content-wrapper autoheight" style="margin-left: 0px">
     <div class="content" style="background-color: #FFF">
         <div class="list-group">
-            <div class="row" ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
-                    <div class="description-block">
-                        <label>待处理事项</label>
-                    </div>
-                </div>
-            </div>
+            <!--<div class="row" ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">-->
+                <!--<div class="col-sm-2 col-lg-2 col-xs-6">-->
+                    <!--<div class="description-block">-->
+                        <!--<label>待处理事项</label>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
             <div class="row">
                 <!--<div class="col-sm-2 col-lg-2 col-xs-6">
                     <a ui-sref="sysconfig" ui-sref-opts="{reload:true}">
@@ -25,16 +25,6 @@
                         </div>
                     </a>
                 </div>-->
-                <div ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/to_be_treated_2.png"/>
-                        <div class="description-text">
-                            <span>商户自助申请</span>
-                        </div>
-                    </div>
-                    </a>
-                </div>
             </div>
         </div>
         <div class="list-group">
@@ -51,31 +41,31 @@
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_info.png"/>
                         <div class="description-text">
-                            <span class="description-text">商户信息</span>
+                            <span class="description-text">商户名录</span>
                         </div>
                     </div>
                     </a>
                 </div>
                 <div ng-if="'11111'|withRole" class="col-sm-2 col-xs-6">
-                    <a ui-sref="partners.new" ui-sref-opts="{reload:true}">
+                    <a ui-sref="newPartners" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_apply.png"/>
                         <div class="description-text">
-                            <span class="description-text">商户申请</span>
-                        </div>
-                    </div>
-                    </a>
-                </div>
-                <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="logview.config_operation" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/merchant_log.png"/>
-                        <div class="description-text">
-                            <span class="description-text">商户信息修改日志</span>
+                            <span class="description-text">商户进件</span>
                         </div>
                     </div>
                     </a>
                 </div>
+                <!--<div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">-->
+                    <!--<a ui-sref="logview.config_operation" ui-sref-opts="{reload:true}">-->
+                    <!--<div class="description-block">-->
+                        <!--<img src="/static/images/main_menu/merchant_log.png"/>-->
+                        <!--<div class="description-text">-->
+                            <!--<span class="description-text">商户信息修改日志</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--</a>-->
+                <!--</div>-->
                 <div ng-if="'partner_analysis'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="partners_analysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
@@ -87,7 +77,7 @@
                     </a>
                 </div>
                 <div ng-if="'clientrate'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="client_rates" ui-sref-opts="{reload:true}">
+                    <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_activity_1.png"/>
                         <div class="description-text">
@@ -97,7 +87,7 @@
                     </a>
                 </div>
                 <div ng-if="('merchantAmount'|withModule) &&('1'|withRole)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_transaction.merchantAmountAnalysis" ui-sref-opts="{reload:true}">
+                    <a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_turnover.png"/>
                         <div class="description-text">
@@ -138,7 +128,7 @@
                     </a>
                 </div>
                 <div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="pre_refund" ui-sref-opts="{reload:true}">
+                    <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_arrears.png"/>
                         <div class="description-text">
@@ -219,7 +209,7 @@
                     </a>
                 </div>
                 <div ng-if="('RiskManagement'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_monitoring.risk_manager" ui-sref-opts="{reload:true}">
+                    <a ui-sref="analysis_monitoring.attention" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                             <img src="/static/images/main_menu/risk_blacklist.png"/>
                             <div class="description-text">
@@ -229,7 +219,7 @@
                     </a>
                 </div>
                 <div ng-if="'customerRankingAnalysisApp'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_transaction.customerRankingAnalysis" ui-sref-opts="{reload:true}">
+                    <a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                             <img src="/static/images/main_menu/risk_consumption_ranking.png"/>
                             <div class="description-text">
@@ -240,33 +230,80 @@
                 </div>
             </div>
         </div>
-     <!--   <div class="list-group">
-            <div class="row">
-                <div class="col-sm-2 col-lg-2 col-xs-6">
-                    <div class="description-block">
-                        <label>合规管理</label>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/compliance_merchant.png"/>
-                        <div class="description-text">
-                            <span class="description-text">商户合规</span>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-2 col-xs-6">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/compliance_contract.png"/>
-                        <div class="description-text">
-                            <span class="description-text">合同管理</span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>-->
+      <div class="list-group">
+          <div class="row">
+              <div class="col-sm-2 col-lg-2 col-xs-6">
+                  <div class="description-block">
+                      <label>合规管理</label>
+                  </div>
+              </div>
+          </div>
+          <div class="row">
+              <div class="col-sm-2 col-xs-6">
+                  <a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
+                  <div class="description-block">
+                      <img src="/static/images/main_menu/compliance_merchant.png"/>
+                      <div class="description-text">
+                          <span class="description-text">商户合规</span>
+                      </div>
+                  </div>
+                  </a>
+              </div>
+              <div class="col-sm-2 col-xs-6">
+                  <div class="description-block">
+                      <a ui-sref="contract" ui-sref-opts="{reload:true}">
+                      <img src="/static/images/main_menu/compliance_contract.png"/>
+                      <div class="description-text">
+                          <span class="description-text">合同签约情况</span>
+                      </div>
+                      </a>
+                  </div>
+              </div>
+
+              <div class="col-sm-2 col-xs-6">
+                  <a ui-sref="rate_warnings" ui-sref-opts="{reload:true}">
+                      <div class="description-block">
+                          <img src="/static/images/main_menu/compliance_warning.png"/>
+                          <div class="description-text">
+                              <span>签约到期预警</span>
+                          </div>
+                      </div>
+                  </a>
+              </div>
+              <div class="col-sm-2 col-xs-6">
+                  <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
+                      <div class="description-block">
+                          <img src="/static/images/main_menu/compliance_appliy.png"/>
+                          <div class="description-text">
+                              <span>商户自助申请</span>
+                          </div>
+                      </div>
+                  </a>
+              </div>
+              <div class="col-sm-2 col-xs-6">
+                  <a ui-sref="config_operation" ui-sref-opts="{reload:true}">
+                      <div class="description-block">
+                          <img src="/static/images/main_menu/compliance_log.png"/>
+                          <div class="description-text">
+                              <span>商户信息修改日志</span>
+                          </div>
+                      </div>
+                  </a>
+              </div>
+              <div class="col-sm-2 col-xs-6">
+                  <a ui-sref="devtools.aliforexcel" ui-sref-opts="{reload:true}">
+                      <div class="description-block">
+                          <img src="/static/images/main_menu/compliance_alipayexcel.png"/>
+                          <div class="description-text">
+                              <span>Alipay进件表格导出</span>
+                          </div>
+                      </div>
+                  </a>
+              </div>
+          </div>
+        </div>
+
+
         <div class="list-group">
             <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">
@@ -277,7 +314,7 @@
             </div>
             <div class="row">
                 <div ng-if="'citypartner'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="partner_apply.citypartner_reg" ui-sref-opts="{reload:true}">
+                    <a ui-sref="newOrganizations" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/partner_application.png"/>
                         <div class="description-text">
@@ -379,6 +416,15 @@
                     </div>
                     </a>
                 </div>
+                <div ng-if="'dev'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户活跃度</span>
+                            </div>
+                        </div>
+                    </a></div>
             </div>
         </div>
         <div class="list-group">
@@ -395,7 +441,7 @@
                     <div class="description-block ">
                         <img src="/static/images/main_menu/activity_management.png"/>
                         <div class="description-text">
-                            <span class="description-text">活动管理</span>
+                            <span class="description-text">APP弹屏管理</span>
                         </div>
                     </div>
                     </a>
@@ -430,14 +476,14 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('1'|withRole)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="contract" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/activity_contract_signing.png"/>
-                        <div class="description-text">
-                            <span class="description-text">合同签约情况</span>
+                <div ng-if="'monDelay'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/activity_kangaroo.png"/>
+                            <div class="description-text">
+                                <span class="description-text">余额增值活动</span>
+                            </div>
                         </div>
-                    </div>
                     </a>
                 </div>
                 <div ng-if="'actChairty'|withModule" class="col-sm-2 col-xs-6">
@@ -450,16 +496,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="'monDelay'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/activity_kangaroo.png"/>
-                        <div class="description-text">
-                            <span class="description-text">余额增值活动</span>
-                        </div>
-                    </div>
-                    </a>
-                </div>
+
 
          <!--       <div ng-if="('activities'|withModule) && (currentUser.org_id==1 || currentUser.org_id==null)" class="col-sm-2 col-xs-6">
                     <a ui-sref="activity.detail({act_id:'3'})" ui-sref-opts="{reload:true}">
@@ -642,15 +679,6 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="('clearing_org'|withModule) && currentUser.org_id>1" class="col-sm-2 col-xs-6">
-                    <a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">
-                        <div class="description-block">
-                            <img src="/static/images/main_menu/settle_execution.png"/>
-                            <div class="description-text">
-                                <span class="description-text">清算记录</span>
-                            </div>
-                        </div>
-                    </a></div>
                 <div ng-if="'clearing'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="clearingLogs.date_setting" ui-sref-opts="{reload:true}">
                         <div class="description-block">
@@ -660,6 +688,15 @@
                             </div>
                         </div>
                     </a></div>
+                <!--<div ng-if="('clearing_org'|withModule) && currentUser.org_id>1" class="col-sm-2 col-xs-6">-->
+                    <!--<a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">-->
+                        <!--<div class="description-block">-->
+                            <!--<img src="/static/images/main_menu/settle_execution.png"/>-->
+                            <!--<div class="description-text">-->
+                                <!--<span class="description-text">清算记录</span>-->
+                            <!--</div>-->
+                        <!--</div>-->
+                    <!--</a></div>-->
                 <div ng-if="'clearing'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="clearingLogs" ui-sref-opts="{reload:true}">
                         <div class="description-block">
@@ -670,7 +707,7 @@
                         </div>
                     </a></div>
                 <div ng-if="('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_transaction.estimateAnalysis" ui-sref-opts="{reload:true}">
+                    <a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/settle_prediction.png"/>
                             <div class="description-text">
@@ -716,6 +753,15 @@
                             </div>
                         </div>
                     </a></div>
+                <div ng-if="'manager_accounts'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="product" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/org_account_management.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商品库管理</span>
+                            </div>
+                        </div>
+                    </a></div>
                 <div ng-if="'manager_accounts'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="managers" ui-sref-opts="{reload:true}">
                         <div class="description-block">
@@ -725,8 +771,18 @@
                             </div>
                         </div>
                     </a></div>
+                <div ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="servantsConfig" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/to_be_treated_2.png"/>
+                            <div class="description-text">
+                                <span>客服管理</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
                 <div ng-if="'sysconfig'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="sysconfig.permission" ui-sref-opts="{reload:true}">
+                    <a ui-sref="permission" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/org_role_rights_management.png"/>
                             <div class="description-text">
@@ -785,7 +841,7 @@
             </div>
             <div class="row">
                 <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="logview.login_history" ui-sref-opts="{reload:true}">
+                    <a ui-sref="login_history" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/logon_log.png"/>
                             <div class="description-text">
diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 0fa89e2c6..6d507b05d 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -394,7 +394,7 @@ margin-bottom: 10%;"/>
                 </li>
                 <li ui-sref-active="active"
                     ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="logview.config_operation" ui-sref-opts="{reload:true}">
+                    <a ui-sref="config_operation" ui-sref-opts="{reload:true}">
                         <i class="fa fa-edit"></i> <span>商户信息修改日志</span>
                     </a>
                 </li>
@@ -421,8 +421,9 @@ margin-bottom: 10%;"/>
                         <i class="fa fa-line-chart"></i> <span>清算统计|Settlement Logs</span>
                     </a>
                 </li>
+
                 <li ui-sref-active="active" ng-if="'clearing'|withModule">
-                    <a ui-sref="analysis_transaction.estimateAnalysis" ui-sref-opts="{reload:true}">
+                    <a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}">
                         <i class="fa fa fa-money"></i> <span>清算预估|Estimate</span>
                     </a>
                 </li>
@@ -469,32 +470,42 @@ margin-bottom: 10%;"/>
                     </a>
                 </li>
 
-
-
-
-                <li ui-sref-active="active" ng-if="('clearing_org'|withModule) && currentUser.org_id>1">
-                    <a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>
+                <li class="header nav-header" ng-if="'1011110'|withRole">营销活动管理|Promotion</li>
+                <li ui-sref-active="active" ng-if="'appAct'|withModule">
+                    <a ui-sref="appAct">
+                        <i class="fa fa-file-text-o"></i> <span>APP弹屏管理</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('encourage'|withModule)">
+                    <a ui-sref="encourageAct">
+                        <i class="fa fa-gift"></i> <span>鼓励金</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
+                    <a ui-sref="cashbackAnalysis">
+                        <i class="fa fa-gift"></i> <span>商户营销账户</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'settleDelay'|withModule">
+                    <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>周末费率减半活动</span>
                     </a>
                 </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 class="header nav-header"
-                    ng-if="('1011110'|withRole) || currentUser.org_id==null">营销服务|Promotion
+                <li ui-sref-active="active" ng-if="'monDelay'|withModule">
+                    <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>余额增值活动</span>
+                    </a>
                 </li>
 
-              <li ui-sref-active="active" ng-if="'appAct'|withModule">
-                    <a ui-sref="appAct">
-                        <i class="fa fa-file-text-o"></i> <span>活动管理|Activity Manage</span>
+                <li ui-sref-active="active" ng-if="'actChairty'|withModule">
+                    <a ui-sref="act_chairty" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-users"></i> <span>半边天公益活动</span>
                     </a>
                 </li>
                 <!--
@@ -515,12 +526,6 @@ margin-bottom: 10%;"/>
                 <!--</a>-->
                 <!--</li>-->
 
-               <li ui-sref-active="active" ng-if="('encourage'|withModule)">
-                    <a ui-sref="encourageAct">
-                        <i class="fa fa-gift"></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>
@@ -528,11 +533,7 @@ margin-bottom: 10%;"/>
                 </li>-->
 
 
-                <li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
-                    <a ui-sref="cashbackAnalysis">
-                        <i class="fa fa-gift"></i> <span>商户营销账户</span>
-                    </a>
-                </li>
+
 
                <!-- <li ui-sref-active="active" ng-if="('funds'|withModule)">
                     <a ui-sref="funds">
@@ -540,110 +541,113 @@ margin-bottom: 10%;"/>
                     </a>
                 </li>-->
 
-                <li ui-sref-active="active" ng-if="'settleDelay'|withModule">
-                    <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>周末费率减半活动</span>
+
+
+
+                <!--<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}">-->
+                        <!--<i class="fa fa-hand-peace-o"></i> <span>机构数据分析|Agent Analysis</span>-->
+                    <!--</a>-->
+                <!--</li>-->
+                <!--<li ui-sref-active="active" ng-if="('clearing_org'|withModule) && currentUser.org_id>1">-->
+                    <!--<a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">-->
+                        <!--<i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>-->
+                    <!--</a>-->
+                <!--</li>-->
+                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">内容管理|Content Management</li>
+                <li ui-sref-active="active" ng-if="'notice'|withModule">
+                    <a ui-sref="notice">
+                        <i class="fa fa-bell"></i> <span>通知群发|Notifications</span>
                     </a>
                 </li>
-                <li ui-sref-active="active" ng-if="'monDelay'|withModule">
-                    <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>余额增值活动</span>
+                <li ui-sref-active="active" ng-if="'cms'|withModule">
+                    <a ui-sref="cms">
+                        <i class="fa fa-file-text-o"></i> <span>网站管理|Site Manage</span>
                     </a>
                 </li>
-
-                <li ui-sref-active="active" ng-if="'actChairty'|withModule">
-                    <a ui-sref="act_chairty" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>半边天公益活动</span>
+                <li ui-sref-active="active" ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)">
+                    <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
+                        <i class="fa fa-file-text-o"></i> <span>积分商城|Integral Mall</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}">
-                        <i class="fa fa-hand-peace-o"></i> <span>机构数据分析|Agent Analysis</span>
+                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">组织架构|Organization Framework</li>
+                <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>
                     </a>
                 </li>
-
-
-                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">数据分析|Analysis</li>
-
-                <li ui-sref-active="active" ng-if="('transAnalysis'|withModule)||
-                ('customer_analysis'|withModule)||
-                ('customerRankingAnalysisApp'|withModule)||
-                ('partner_analysis'|withModule)">
-                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-area-chart"></i> <span>交易|Transaction Analysis</span>
+                <li ui-sref-active="active" ng-if="'org'|withModule">
+                    <a ui-sref="product" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-shopping-cart"></i> <span>商品库管理</span>
                     </a>
                 </li>
-
-
-                <li ui-sref-active="active"
-                    ng-if="('bdsale'|withModule)||('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="analysis_bd" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-hand-peace-o"></i> <span>BD|BD Analysis</span>
+                <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
+                    <a ui-sref="managers" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-key"></i> <span>账号管理|Accounts</span>
                     </a>
                 </li>
-
-
-                <li ui-sref-active="active"
-                    ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))||('orgcommission'|withModule)">
-                    <a ui-sref="analysis_org" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-hand-peace-o"></i> <span>合伙人|Partners Analysis</span>
+                <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
+                    <a ui-sref="servantsConfig" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-tty"></i> <span>客服管理|Service Accounts</span>
                     </a>
                 </li>
-
-
-                <li ui-sref-active="active" ng-if="('clientrate'|withModule)||('monitor'|withModule)">
-                    <a ui-sref="analysis_monitoring" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-shopping-cart"></i> <span>监控|Monitoring</span>
+                <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
+                    <a ui-sref="permission" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-key"></i> <span>角色权限管理</span>
                     </a>
                 </li>
-                <li ui-sref-active="active" ng-if="('settleReport'|withModule)||('platformRevenue'|withModule)">
-                    <a ui-sref="analysis_report" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-tv"></i> <span>报表|Report</span>
+
+                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">绩效管理</li>
+                <li ui-sref-active="active" ng-if="'manager_accounts'|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>
                     </a>
                 </li>
-
-
-                <li class="header nav-header" ng-if="'0100001'|withRole">基础设置|Basic Settings</li>
-                <li ui-sref-active="active" ng-if="('10'|withRole)&&('merchantIdManage'|withModule)">
-                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
-                        <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
+                <li ui-sref-active="active" ng-if="'1000'|withRole">
+                    <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-usd"></i> <span>BD提成|BD Commissions</span>
                     </a>
                 </li>
-                <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>
+                <li ui-sref-active="active" ng-if="'1000'|withRole">
+                    <a ng-click="editRateConfig()" style="cursor: pointer">
+                        <i class="fa fa-cog"></i> <span>BD绩效设置</span>
                     </a>
                 </li>
-                <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
-                    <a ui-sref="managers" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-key"></i> <span>账号管理|Accounts</span>
+                <li ui-sref-active="active" ng-if="'1000'|withRole">
+                    <a ng-click="editBDLevels()" style="cursor: pointer">
+                        <i class="fa fa-user"></i> <span>BD级别设置</span>
                     </a>
                 </li>
-                <li ui-sref-active="active" ng-if="'dev'|withModule">
-                    <a ui-sref="devtools">
-                        <i class="fa fa-cog"></i> <span>开发工具|DevTools</span>
+                <li ui-sref-active="active" ng-if="'1000'|withRole">
+                    <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-shopping-cart"></i> <span>商户活跃度</span>
                     </a>
                 </li>
-                <li ui-sref-active="active" ng-if="'notice'|withModule">
-                    <a ui-sref="notice">
-                        <i class="fa fa-bell"></i> <span>通知群发|Notifications</span>
+
+                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">合伙人管理</li>
+                <li ui-sref-active="active"
+                    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}">
+                        <i class="fa fa-tv"></i> <span>合伙人申请</span>
                     </a>
                 </li>
-                <li ui-sref-active="active" ng-if="'log'|withModule">
-                    <a ui-sref="logview">
-                        <i class="fa fa-file-text-o"></i> <span>系统日志|System Logs</span>
+                <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>合伙人管理</span>
                     </a>
                 </li>
-                <li ui-sref-active="active" ng-if="'cms'|withModule">
-                    <a ui-sref="cms">
-                        <i class="fa fa-file-text-o"></i> <span>网站管理|Site Manage</span>
+                <li ui-sref-active="active" ng-if="'org'|withModule">
+                    <a ui-sref="analysis_org.organlasis" ui-sref-opts="{reload:true}">
+                        <i class="fa fa-hand-peace-o"></i> <span>合伙人销售量|City Partner Sale</span>
                     </a>
                 </li>
-                <li ui-sref-active="active" ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)">
-                    <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
-                        <i class="fa fa-file-text-o"></i> <span>积分商城|Integral Mall</span>
+
+                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">配置管理|Basic Settings</li>
+                <li ui-sref-active="active" ng-if="('10'|withRole)&&('merchantIdManage'|withModule)">
+                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
+                        <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
                     </a>
                 </li>
                 <li ui-sref-active="active"
@@ -652,11 +656,29 @@ margin-bottom: 10%;"/>
                         <i class="fa fa-users"></i> <span>设备管理|Devices</span>
                     </a>
                 </li>
+
                 <li ui-sref-active="active" ng-if="'sysconfig'|withModule">
                     <a ui-sref="sysconfig">
                         <i class="fa fa-cog"></i> <span>系统参数设定|Settings</span>
                     </a>
                 </li>
+
+                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">开发工具|Developer</li>
+                <li ui-sref-active="active" ng-if="'dev'|withModule">
+                    <a ui-sref="login_history">
+                        <i class="fa fa-users"></i> <span>登录日志|Sign In History</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'log'|withModule">
+                    <a ui-sref="logview">
+                        <i class="fa fa-file-text-o"></i> <span>系统日志|System Logs</span>
+                    </a>
+                </li>
+                <li ui-sref-active="active" ng-if="'dev'|withModule">
+                    <a ui-sref="devtools">
+                        <i class="fa fa-cog"></i> <span>开发工具|DevTools</span>
+                    </a>
+                </li>
             </ul>
 
         </section>
diff --git a/src/main/ui/static/analysis/settle_estimate_analysis.js b/src/main/ui/static/analysis/settle_estimate_analysis.js
index 6d7a5eb9c..d40581d9c 100644
--- a/src/main/ui/static/analysis/settle_estimate_analysis.js
+++ b/src/main/ui/static/analysis/settle_estimate_analysis.js
@@ -6,8 +6,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
     var app = angular.module('estimateAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.estimateAnalysis', {
-            url: '/estimate',
+        $stateProvider.state('estimateAnalysis', {
+            url: '/analysis/transaction/estimate',
             templateUrl: '/static/analysis/templates/settle_estimate_analysis.html',
             controller: 'estimateCtrl'
         })
diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js
index b649f08a1..9ee069211 100644
--- a/src/main/ui/static/boot/managerMainApp.js
+++ b/src/main/ui/static/boot/managerMainApp.js
@@ -66,6 +66,25 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
             };
             $scope.getManagerTodoNotices();
 
+            $scope.editRateConfig = function () {
+                $uibModal.open({
+                    templateUrl: '/static/config/bdprize/templates/rate_config_dialog.html',
+                    controller: 'bdRateConfigCtrl',
+                    resolve: {
+                        rates: function () {
+                            return angular.copy($scope.bd_rate_configs);
+                        }
+                    }
+                }).result.then(function () {
+                    $scope.loadRateConfigs();
+                })
+            };
+            $scope.editBDLevels = function () {
+                $uibModal.open({
+                    templateUrl: '/static/config/bdprize/templates/bd_level_config_dialog.html',
+                    controller: 'bdLevelConfigCtrl'
+                })
+            };
 
             var connected;
             $interval($scope.loadCurrentUser, 300000);
@@ -385,5 +404,67 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
         altInputFormats: [],
         ngModelOptions: {}
     });
+
+    app.controller('bdRateConfigCtrl', ['$scope', '$http', 'rates', function ($scope, $http, rates) {
+        $scope.bdLevels = [{value: 1, label: 'Junior'}, {value: 2, label: 'Intermediate'}, {value: 3, label: 'Senior'}];
+        $scope.months = [{value: 1, label: '1-3 Months'}, {value: 2, label: '4-6 Months'}, {
+            value: 3,
+            label: '>=7 Months'
+        }];
+        $scope.kpiRanges = [{value: 1, label: '0-50%'}, {value: 2, label: '50%~80%'}, {value: 3, label: '80%~100%'},
+            {value: 4, label: '100%-120%'}, {value: 5, label: '>=120%'}];
+        $scope.clientRate = [{value: 0.6, label: '0.6-0.79'}, {value: 0.8, label: '0.8-2.0'}];
+        $scope.filter = {bd_level: 1,rate_from:0.6};
+        $scope.rates = rates;
+        $scope.submitRates = function () {
+            var validation = null;
+            $scope.errmsg = null;
+            angular.forEach($scope.rates, function (rate) {
+                if (isNaN(rate.prize_rate)) {
+                    validation = {months: rate.time_range, bd_level: rate.bd_level};
+                    $scope.errmsg = 'Rate Value is NaN';
+                }
+                if (rate.prize_rate > 1) {
+                    validation = {months: rate.time_range, bd_level: rate.bd_level};
+                    $scope.errmsg = 'Rate value shall no more than 1%';
+                }
+                if (rate.prize_rate < 0) {
+                    validation = {months: rate.time_range, bd_level: rate.bd_level};
+                    $scope.errmsg = 'Rate value shall be a positive value';
+                }
+            });
+            if (!validation) {
+                $http.put('/sys/bd_prize/config/rates', $scope.rates).then(function () {
+                    $scope.$close();
+                }, function (resp) {
+                    $scope.errmsg = resp.data.message;
+                })
+            }
+        }
+    }]);
+    app.controller('bdLevelConfigCtrl', ['$scope', '$http', function ($scope, $http) {
+
+        $scope.getBDGroups = function () {
+            $http.get('/sys/manager_accounts/roles/bd_leader').then(function (resp) {
+                $scope.bdgroups = resp.data;
+                $scope.getBDLevels();
+            })
+        };
+        $scope.getBDGroups();
+        $scope.getBDLevels = function () {
+            $http.get('/sys/bd_prize/config/bd_levels').then(function (resp) {
+                $scope.bds = resp.data;
+            })
+        };
+
+        $scope.bdLevels = [{value: 1, label: 'Junior'}, {value: 2, label: 'Intermediate'}, {value: 3, label: 'Senior'}];
+        $scope.updateBDLevel = function (bdInfo) {
+            $http.put('/sys/bd_prize/config/bd_levels/' + bdInfo.manager_id, bdInfo).then(function () {
+                $scope.getBDGroups();
+            }, function (resp) {
+                $scope.errmsg = resp.data.message;
+            })
+        };
+    }]);
     return app;
 });
\ No newline at end of file
diff --git a/src/main/ui/static/config/logview/logview.js b/src/main/ui/static/config/logview/logview.js
index ec7a739ec..2a0cb8904 100644
--- a/src/main/ui/static/config/logview/logview.js
+++ b/src/main/ui/static/config/logview/logview.js
@@ -9,15 +9,15 @@ define(['angular', 'uiRouter'], function (angular) {
             url: '/logs',
             templateUrl: '/static/config/logview/templates/root.html',
             controller: 'logviewRootCtrl'
-        }).state('logview.login_history', {
-            url: '/login',
+        }).state('login_history', {
+            url: '/logs/login',
             templateUrl: '/static/config/logview/templates/login_log_root.html',
             controller: 'loginLogRootCtrl'
-        }).state('logview.login_history.managers', {
+        }).state('login_history.managers', {
             url: '/managers',
             templateUrl: '/static/config/logview/templates/login_log_manager.html',
             controller: 'managerLoginLogCtrl'
-        }).state('logview.login_history.client', {
+        }).state('login_history.client', {
             url: '/clients',
             templateUrl: '/static/config/logview/templates/login_log_clients.html',
             controller: 'clientLoginLogCtrl'
@@ -29,8 +29,8 @@ define(['angular', 'uiRouter'], function (angular) {
             url: '/wechatMsg',
             templateUrl: '/static/config/logview/templates/wechat_msg_log.html',
             controller: 'wechatMsgLogCtrl'
-        }).state('logview.config_operation', {
-            url: '/config_operation',
+        }).state('config_operation', {
+            url: '/logs/config_operation',
             templateUrl: '/static/config/logview/templates/config_opertaion_log.html',
             controller: 'configOperationLogCtrl'
         })
@@ -38,7 +38,7 @@ define(['angular', 'uiRouter'], function (angular) {
     app.controller('logviewRootCtrl', ['$scope', function ($scope) {
     }]);
     app.controller('loginLogRootCtrl', ['$scope', '$state', function ($scope, $state) {
-        if ($state.is('logview.login_history')) {
+        if ($state.is('login_history')) {
             $state.go('.managers')
         }
     }]);
diff --git a/src/main/ui/static/config/logview/templates/root.html b/src/main/ui/static/config/logview/templates/root.html
index dfb9fd06a..de841b8e5 100644
--- a/src/main/ui/static/config/logview/templates/root.html
+++ b/src/main/ui/static/config/logview/templates/root.html
@@ -11,10 +11,10 @@
     <section class="content">
         <div class="box">
             <div class="box-body">
-                <a class="btn btn-app" role="button" ui-sref=".login_history">
+<!--                <a class="btn btn-app" role="button" ui-sref=".login_history">
                     <i class="fa fa-users"></i>
                     Sign In History
-                </a>
+                </a>-->
                 <a class="btn btn-app" role="button" ui-sref=".notify_logs">
                     <i class="fa fa-server"></i>
                     Notify History
diff --git a/src/main/ui/static/config/organizations/organizations.js b/src/main/ui/static/config/organizations/organizations.js
index be688acaa..b3a93a524 100644
--- a/src/main/ui/static/config/organizations/organizations.js
+++ b/src/main/ui/static/config/organizations/organizations.js
@@ -42,8 +42,8 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
                     return $http.get('/sys/orgs/' + $stateParams.orgId);
                 }]
             }
-        }).state('organizations.new', {
-            url: '/new_org',
+        }).state('newOrganizations', {
+            url: '/organizations/new_org',
             templateUrl: '/static/config/organizations/templates/new_org.html',
             controller: 'newOrgCtrl'
         })
diff --git a/src/main/ui/static/config/sysconfigs/sysconfigs.js b/src/main/ui/static/config/sysconfigs/sysconfigs.js
index bde46911e..7b3842119 100644
--- a/src/main/ui/static/config/sysconfigs/sysconfigs.js
+++ b/src/main/ui/static/config/sysconfigs/sysconfigs.js
@@ -13,15 +13,15 @@ define(['angular', 'uiRouter'], function (angular) {
             url: '/basic',
             templateUrl: '/static/config/sysconfigs/templates/basic.html',
             controller: 'basicConfigCtrl'
-        }).state('sysconfig.permission', {
+        }).state('permission', {
             url: '/permission',
             templateUrl: '/static/config/sysconfigs/templates/permission_config.html',
             controller: 'permissionConfigRootCtrl'
-        }).state('sysconfig.permission.functions', {
+        }).state('permission.functions', {
             url: '/functions',
             templateUrl: '/static/config/sysconfigs/templates/permission_functions.html',
             controller: 'permissionFuncCtrl'
-        }).state('sysconfig.permission.modules', {
+        }).state('permission.modules', {
             url: '/modules',
             templateUrl: '/static/config/sysconfigs/templates/permission_modules.html',
             controller: 'permissionModuleCtrl',
@@ -34,7 +34,7 @@ define(['angular', 'uiRouter'], function (angular) {
             url: '/mail',
             templateUrl: '/static/config/sysconfigs/templates/mail_subscribe.html',
             controller: 'mailSubscribeCtrl'
-        }).state('sysconfig.servantsConfig', {
+        }).state('servantsConfig', {
             url: '/servantsConfig',
             templateUrl: '/static/config/sysconfigs/templates/servants_config.html',
             controller: 'servantsConfigCtrl'
diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
index 012a3e37f..9442c787c 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
@@ -13,7 +13,7 @@
             <div class="nav-tabs-custom">
                 <ul class="nav nav-tabs">
                     <li ui-sref-active-eq="active">
-                        <a ui-sref="sysconfig.permission">Permissions</a>
+                        <a ui-sref="permission">Permissions</a>
                     </li>
                     <li ui-sref-active="active">
                         <a ui-sref=".functions">Functions</a>
diff --git a/src/main/ui/static/config/sysconfigs/templates/sysconfig.html b/src/main/ui/static/config/sysconfigs/templates/sysconfig.html
index e874852d6..970daaa5e 100644
--- a/src/main/ui/static/config/sysconfigs/templates/sysconfig.html
+++ b/src/main/ui/static/config/sysconfigs/templates/sysconfig.html
@@ -15,10 +15,10 @@
                     Basic Config
                 </a>
 
-                <a class="btn btn-app" role="button" ui-sref=".permission">
+<!--                <a class="btn btn-app" role="button" ui-sref=".permission">
                     <i class="fa fa-key"></i>
                     Permission Config
-                </a>
+                </a>-->
 
                 <a class="btn btn-app" role="button" ui-sref=".mail_subscribe">
                     <i class="fa fa-edit"></i>
@@ -30,10 +30,10 @@
                     Partner Permission Config
                 </a>
 
-                <a class="btn btn-app" role="button" ui-sref=".servantsConfig" ng-if="('1'|withRole)">
-                    <i class="fa fa-key"></i>
-                    Servants Config
-                </a>
+                <!--<a class="btn btn-app" role="button" ui-sref=".servantsConfig" ng-if="('1'|withRole)">-->
+                    <!--<i class="fa fa-key"></i>-->
+                    <!--Servants Config-->
+                <!--</a>-->
 
                 <!--<a class="btn btn-app" role="button" ui-sref=".payment_config">
                     <i class="fa fa-edit"></i>
diff --git a/src/main/ui/static/images/main_menu/compliance_alipayexcel.png b/src/main/ui/static/images/main_menu/compliance_alipayexcel.png
new file mode 100644
index 0000000000000000000000000000000000000000..01e13d6019836ff8335cdf413817df54666939c2
GIT binary patch
literal 2919
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
RJKX>P002ovPDHLkV1inzrjq~w

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/compliance_appliy.png b/src/main/ui/static/images/main_menu/compliance_appliy.png
new file mode 100644
index 0000000000000000000000000000000000000000..58b8bb01a0b2b40681c10f0f42da79638032147b
GIT binary patch
literal 2493
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
Hu0mjfjAq8i

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/compliance_log.png b/src/main/ui/static/images/main_menu/compliance_log.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fc646a798b4ccb9f012be361cb96d318800a2e2
GIT binary patch
literal 1520
zcmbu9`8yK~0LLfhig&K%zKt**<aO*xj^<`FjG=PI5+OvBAy>2HNKC!%V}^N0UW$+$
zi4cuNTFyxC((;y!+3Woq-tY5#zMmhyzkdlH2uE>I1yKM1Anxo0_dK@Ge+Ua6H`*t7
z?^t~Co{n~awkf60006Mr8E)&H%*U#jAS$6{a;K?yk{fdRAFcakl0bR3Z5UigGegV4
zDOQv4NVphU+qR^uLCStTFLWf-rV$P{(uWkgsT9hQ&^``!ckYnlvR;RcktlH-90Kjz
za~vkQhkS4W+uZww`H{-mrl<N;w5Snd(J@(b4VeHA0LxW!K`cjz$#}DqEQwGPhR3*o
zxNB1i$hzBx639mvD`~bKQuz_Hc<3FHp?@+|m}Nwt3-;hhsH}U0P%pVO1<7~9gmTUi
zY11#53K<2;tC<yZ=f5o<y#)L~N{0V_<K7qD3=N`Lf7bYzxlu#uni4L7<}bVaef1!@
z7peJ1InKmyFAjW|Ju+<iw<7lxHQ8W%AI_hWcvFY;2_&4Tmxtwzq8@t~s%BW7Ps^zY
zwRopb><xC8rn7=W_}i;m8Ai;UzB)$c6hnBC(0yc_g>$a%IgK)Qa=YVhvlZ1|Lc3%Q
zF7&w}KN<&38rbDu0nPVwUwNwTx@z$(1?ZwObo@X_jdJTn)Z{p8=lRL^&Apf!_nZ2i
z^CmuDLh62&<>}qstm9%RUPQvfy0$l>KfkZ0U@82}`s*`<LvXoY^kMkza8%Hbrc>9%
zFRTr`()eH=nS+j$Mu4bS+Uf4fohoQp36(;qn49b7bs3ZjdT(>~`gabxYsZdc^9|&-
zbrqhp8<aXwIH@*}l)J3F;X+IZZE*HYRaTU+DMpVbNRd6VC9(?G^r&xIzBTM6&*&wZ
z!x1p@dLgr9SSrGcb{dm1)QiNEA=Mx`3vqUozr6E~dipNj`=-^}egM8v#|Q<__s3Pl
zW~)ET3bg8zWG?vMo`m#N?&nxO{_P_#`b9*y>WjSa>6BJ167@JjAW)4CO1cpvb3I@o
zy`b`4I#(?nDPef^`IR(i=x+I*bx*@E&JZ<HaP8HKu~3+cy{%#JGrH0aI~-dpKNIb;
z64%*!{!#74tTVgXx419!e1Aind&<XD*kcI8?wQrdq^%2@ZON&&Ua^RKi~qH*R*FCk
zPL(U*{UWRKD+8%Qm&+#l53d$oK(ri`3u79uss#a~j54Osp|P;GzSQ9M>Cm0EQE#xe
zeqTJSFJ4Q;Jwn#5&%#oyR}c6k{e4+(fVQi2b0czIdXidCW}ooidhI%7#N5(|dBNI$
zC3@Jk#QikiBY1$L_DOr_D}38_+KU<fs%q;Q&tfN>DE)jw1j9E0Pj~i#`aCz03@Qc_
z!8A7kQrJic5Gu{5?brT)=7q}SVQhWV@~D27`9LI6358qy1(Ukju$~qljz<r5b@04e
zfep(ee^g4<uLXg|WC9&KE~IvBZaf1IRic~($%-+XS#Z~G#q!yF$7^TJ$zGz!)DHIS
zVsF3%_US&OJc&Iy>=mzl3!l5cVW~J`1(cP=!>8?Ia_WlYW<;8*#1fiQ&frcE<Ou*A
zax|qQR^2m<Ad{K?P?7;Lj<wI@j3tU#a<r@HQXT3x&?3r3tNV2^A`22&TIXQ#Uc$so
zlG!4Ei=7w&BB<E9QLNHOc6D+F$eS%4m>-Z<O-+>P_Yj%}*1Skq1xJnSaHH)nsfVXr
z-NuY}8b+?Jo;PdDs8-~0>;8PoaH36M933e<s5LMBYY_ylX=4wd<}dpt*MgzWGpi!N
zL;>GsY*Lq$K?`4A_Fb&IKowADaZu`%|JgwgRWXU0FtW>C7}RtHRNA4=J6hiigffJB
zE>n~lHq`>u2W15UW5uUc^e{XR)WV==#n?)aZX<N{?ec>SjdN3w>P8Z4DoueLAGV;I
z>zW&FN=(!#&7NH{h2aZ8^F_rCTqUXg_v=9)u6M{aJj(gOO?whhIJx!}l6HLI0B3sy
Jyv;7?_P;;t&Jq9s

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/compliance_warning.png b/src/main/ui/static/images/main_menu/compliance_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..99bc59254a2094029bff7007eff8cedd7e15538e
GIT binary patch
literal 2614
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
Y|LPe4<VhlARR91007*qoM6N<$f(_^uivR!s

literal 0
HcmV?d00001


From ac7836da815ab76ec110bcde331af67363989770 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Mon, 22 Oct 2018 18:09:12 +0800
Subject: [PATCH 32/82] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A4=B4=E9=83=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/manage.html                       |   4 +-
 src/main/ui/static/analysis/clearing-log.js   |  12 +-
 .../analysis/templates/bd_sale_analysis.html  |   6 +-
 .../analysis/templates/clearing_logs.html     |   4 +-
 .../analysis/templates/client_rates.html      |   4 +-
 .../templates/merchant_amount_analysis.html   |   2 +-
 .../analysis/templates/org_sale_analysis.html |  18 +-
 .../templates/settle_date_config.html         |  36 +-
 .../templates/settle_estimate_analysis.html   | 163 ++++-----
 .../analysis/templates/settle_warnings.html   |   3 -
 .../ui/static/cms/templates/cms_root.html     |   5 +-
 .../bdprize/templates/bd_prize_root.html      |   2 +-
 .../devtools/templates/wx_settlements.html    |   2 +-
 .../config/managers/templates/managers.html   |   2 +-
 .../config/notice/templates/notice.html       |   2 +-
 .../config/organizations/templates/orgs.html  |   2 +-
 .../templates/permission_config.html          |   2 +-
 .../sysconfigs/templates/servants_config.html |   2 +-
 .../payment/invoice/templates/invoice.html    |   2 +-
 .../static/payment/partner/partner-manage.js  |  75 ++++
 .../partner/templates/partner_compliance.html | 335 ++++++++++++++++++
 .../payment/product/templates/product.html    |   9 +
 .../tradelog/templates/trans_report.html      |   2 +-
 .../risk/templates/attention_merchants.html   |   2 +-
 src/main/ui/static/risk/templates/risk.html   |   2 +-
 .../static/sys/templates/contract_sign.html   |   8 +-
 .../static/sys/templates/manual_settle.html   |  13 +-
 27 files changed, 575 insertions(+), 144 deletions(-)
 create mode 100644 src/main/ui/static/payment/partner/templates/partner_compliance.html

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 6d507b05d..3a5c3f54b 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -371,8 +371,8 @@ margin-bottom: 10%;"/>
                 </li>
 
                 <li class="header nav-header" ng-if="'1011110'|withRole">合规管理|Compliance Management</li>
-                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
-                    <a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
+                <li ui-sref-active="active" ng-if="('partners'|withModule)&&('10'|withRole)">
+                    <a ui-sref="businessCompliance" ui-sref-opts="{reload:true}">
                         <i class="fa fa fa-eye"></i> <span>商户合规</span>
                     </a>
                 </li>
diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index e610c6ee9..5117625f4 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -20,19 +20,17 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
             controller: ['$state', function ($state) {
                 $state.go('^')
             }]
-        }).state('clearingLogs.date_setting', {
+        }).state('date_setting', {
             url: '/date_setting',
-            template: '<div></div>',
-            onEnter: ['$uibModal', function ($uibModal) {
+            templateUrl: '/static/analysis/templates/settle_date_config.html',
+/*            onEnter: ['$uibModal', function ($uibModal) {
                 $uibModal.open({
                     templateUrl: '/static/analysis/templates/settle_date_config.html',
                     controller: 'settleDateConfigCtrl',
                     size: 'lg'
                 })
-            }],
-            controller: ['$state', function ($state) {
-                $state.go('^')
-            }]
+            }],*/
+            controller: 'settleDateConfigCtrl',
         }).state('clearingLogs.settlementDetail', {
             url: '/settles/{date}',
             templateUrl: '/static/analysis/templates/settlement_detail.html',
diff --git a/src/main/ui/static/analysis/templates/bd_sale_analysis.html b/src/main/ui/static/analysis/templates/bd_sale_analysis.html
index a071dd659..f2e5b96fe 100644
--- a/src/main/ui/static/analysis/templates/bd_sale_analysis.html
+++ b/src/main/ui/static/analysis/templates/bd_sale_analysis.html
@@ -7,15 +7,15 @@
         text-align: center;
     }
 </style>
-<!--<section class="content-header">
+<section class="content-header">
     <h1>BD Sale</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-list-alt"></i> Analysis
+            <i class="fa fa-list-alt"></i> Performance
         </li>
         <li class="active">BD Sales</li>
     </ol>
-</section>-->
+</section>
 <div class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/clearing_logs.html b/src/main/ui/static/analysis/templates/clearing_logs.html
index 9f0224898..5e071c521 100644
--- a/src/main/ui/static/analysis/templates/clearing_logs.html
+++ b/src/main/ui/static/analysis/templates/clearing_logs.html
@@ -18,7 +18,7 @@
         </ol>
     </section>
     <div class="content">
-        <div class="row margin-bottom">
+        <!--<div class="row margin-bottom">
             <div class="col-sm-12">
                 <button class="btn btn-danger" type="button" ui-sref=".rate_warnings">
                     <i class="fa fa-bell"></i> Rate Expire Warnings
@@ -27,7 +27,7 @@
                     <i class="fa fa-cog"></i> Settlement Date Config
                 </button>
             </div>
-        </div>
+        </div>-->
         <div class="box box-warning">
             <div class="box-header">Settlement Dates</div>
             <div class="box-body">
diff --git a/src/main/ui/static/analysis/templates/client_rates.html b/src/main/ui/static/analysis/templates/client_rates.html
index 744833752..412b2d5bd 100644
--- a/src/main/ui/static/analysis/templates/client_rates.html
+++ b/src/main/ui/static/analysis/templates/client_rates.html
@@ -1,10 +1,10 @@
 <section class="content-header">
-    <h1>New Partner</h1>
+    <h1>Partner Active Rate</h1>
     <ol class="breadcrumb">
         <li>
             <i class="fa fa-sitemap"></i> Partner Manage
         </li>
-        <li class="active">New Partner</li>
+        <li class="active">Partner Active Rate</li>
     </ol>
 </section>
 <section class="content">
diff --git a/src/main/ui/static/analysis/templates/merchant_amount_analysis.html b/src/main/ui/static/analysis/templates/merchant_amount_analysis.html
index 42ebcc8b7..0535d2d78 100644
--- a/src/main/ui/static/analysis/templates/merchant_amount_analysis.html
+++ b/src/main/ui/static/analysis/templates/merchant_amount_analysis.html
@@ -46,7 +46,7 @@
     <h1>Transaction Amount Analysis</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-list-alt"></i> Payment
+            <i class="fa fa-list-alt"></i> Partner Manage
         </li>
         <li class="active">Transaction Amount Analysis</li>
     </ol>
diff --git a/src/main/ui/static/analysis/templates/org_sale_analysis.html b/src/main/ui/static/analysis/templates/org_sale_analysis.html
index 55d0920cc..191815499 100644
--- a/src/main/ui/static/analysis/templates/org_sale_analysis.html
+++ b/src/main/ui/static/analysis/templates/org_sale_analysis.html
@@ -7,15 +7,15 @@
         text-align: center;
     }
 </style>
-<!--<section class="content-header">-->
-    <!--<h1>-->
-        <!--City Partner Sale-->
-    <!--</h1>-->
-    <!--<ol class="breadcrumb">-->
-        <!--<li class="active"><i class="fa fa-dashboard"></i> Analysis</li>-->
-        <!--<li class="active">City Partner Sale</li>-->
-    <!--</ol>-->
-<!--</section>-->
+<section class="content-header">
+    <h1>
+        City Partner Sale
+    </h1>
+    <ol class="breadcrumb">
+        <li class="active"><i class="fa fa-dashboard"></i> Analysis</li>
+        <li class="active">City Partner Sale</li>
+    </ol>
+</section>
 <section class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/settle_date_config.html b/src/main/ui/static/analysis/templates/settle_date_config.html
index d2e0e6902..9c3967965 100644
--- a/src/main/ui/static/analysis/templates/settle_date_config.html
+++ b/src/main/ui/static/analysis/templates/settle_date_config.html
@@ -1,17 +1,27 @@
-<div class="modal-header"><h4>Clearing Plans</h4></div>
-<div class="modal-body">
-    <div class="row">
-        <div class="col-xs-12">
-            <div royal-calendar month-change="loadMonthPlan($month)">
-                <div class="rc-full" style="font-size: 40px" ng-click="triggerDate(day)">
-                    <i class="fa fa-check-circle text-green" ng-if="isDateOn(day)"></i>
+<section class="content-header">
+    <h1>Clearing Plans</h1>
+    <ol class="breadcrumb">
+        <li><i class="fa fa-tv"></i> Settlement</li>
+        <li class="active">Clearing Plans</li>
+    </ol>
+</section>
+<section class="content">
+    <div class="panel panel-success">
+        <div class="modal-body">
+            <div class="row">
+                <div class="col-xs-12">
+                    <div royal-calendar month-change="loadMonthPlan($month)">
+                        <div class="rc-full" style="font-size: 40px" ng-click="triggerDate(day)">
+                            <i class="fa fa-check-circle text-green" ng-if="isDateOn(day)"></i>
+                        </div>
+                    </div>
                 </div>
             </div>
+
+        </div>
+        <div class="modal-footer">
+            <button class="btn btn-success" type="button" ng-click="submitMonthPlan()">Submit Month Plan</button>
+            <!--<button class="btn btn-danger" type="button" ng-click="$dismiss()">Close</button>-->
         </div>
     </div>
-
-</div>
-<div class="modal-footer">
-    <button class="btn btn-success" type="button" ng-click="submitMonthPlan()">Submit Month Plan</button>
-    <button class="btn btn-danger" type="button" ng-click="$dismiss()">Close</button>
-</div>
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
index 5a1d877be..b1307193d 100644
--- a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
+++ b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html
@@ -17,96 +17,99 @@
     </ol>
 </section>
 <div class="content">
-    <div class="content">
-        <div class="box-solid">
+    <!--<div class="content">-->
             <div class="row">
                 <div class="col-sm-12">
-                    <div class="col-sm-12">
+                    <!--<div class="col-sm-12">-->
                         <!--<div class="box-header">Settlement Estimate</div>-->
                         <!--<h5></h5>-->
                         <loadingbar ng-if="future_loading"></loadingbar>
-                        <div class="row">
-                            <div class="col-md-3 col-sm-6 col-xs-12" ng-repeat="fut in future track by $index">
-                                <div class="info-box" ng-if="fut.estimate_date">
-                                    <div>
-                                        <div class="info-box-icon bg-aqua" style="height: 100px"
-                                             ng-bind="fut.estimate_date.substr(8,10)">
-                                        </div>
-                                        <div class="info-box-content">
-                                            <div>
-                                                <span class="text-bold">清算金额:</span>
-                                                <div>
-                                                    <span>&nbsp;T+1: </span>
-                                                    <span ng-bind="fut.t1|currency:'$'" class="text-green"></span>
-                                                </div>
-                                                <div>
-                                                    <span>&nbsp;T+2: </span>
-                                                    <span ng-bind="fut.t2|currency:'$'" class="text-green"></span>
-                                                </div>
-                                                <div>
-                                                    <span>&nbsp;T+3: </span>
-                                                    <span ng-bind="fut.t3|currency:'$'" class="text-green"></span>
-                                                </div>
+                        <div class="box-solid">
+                            <div class="row">
+                                <div class="col-md-3 col-sm-6 col-xs-12" ng-repeat="fut in future track by $index">
+                                    <div class="info-box" ng-if="fut.estimate_date">
+                                        <div>
+                                            <div class="info-box-icon bg-aqua" style="height: 100px"
+                                                 ng-bind="fut.estimate_date.substr(8,10)">
+                                            </div>
+                                            <div class="info-box-content">
                                                 <div>
-                                                    <span>Total: </span>
-                                                    <span ng-bind="fut.total|currency:'$'" class="text-green"></span>
+                                                    <span class="text-bold">清算金额:</span>
+                                                    <div>
+                                                        <span>&nbsp;T+1: </span>
+                                                        <span ng-bind="fut.t1|currency:'$'" class="text-green"></span>
+                                                    </div>
+                                                    <div>
+                                                        <span>&nbsp;T+2: </span>
+                                                        <span ng-bind="fut.t2|currency:'$'" class="text-green"></span>
+                                                    </div>
+                                                    <div>
+                                                        <span>&nbsp;T+3: </span>
+                                                        <span ng-bind="fut.t3|currency:'$'" class="text-green"></span>
+                                                    </div>
+                                                    <div>
+                                                        <span>Total: </span>
+                                                        <span ng-bind="fut.total|currency:'$'" class="text-green"></span>
+                                                    </div>
                                                 </div>
                                             </div>
+                                            <div class="box-header" style="border-top: solid #f06010 1px;"
+                                                 ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
+                                                <span class="text-bold">到账金额详情:</span>
+                                            </div>
+                                            <div class="box-body"
+                                                 ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
+                                                <p class="text-bold col-sm-12" align="left"
+                                                   ng-if="fut.settlementFee_1307485301"><img
+                                                        src="/static/images/wechatpay_sign.png"
+                                                        uib-tooltip="Wechat Merchant ID: 1307485301"/>(1307485301)到账金额:<a
+                                                        class="text-green"
+                                                        ng-bind="fut.settlementFee_1307485301|currency:'AUD'"></a></p>
+                                                <p class="text-bold col-sm-12" align="left"
+                                                   ng-if="fut.settlementFee_1431999902"><img
+                                                        src="/static/images/wechatpay_sign.png"
+                                                        uib-tooltip="Wechat Merchant ID: 1431999902"/>(1431999902)到账金额:<a
+                                                        class="text-green"
+                                                        ng-bind="fut.settlementFee_1431999902|currency:'AUD'"></a></p>
+                                                <p class="text-bold col-sm-12" align="left"
+                                                   ng-if="fut.settlementFee_1487387142"><img
+                                                        src="/static/images/wechatpay_sign.png"
+                                                        uib-tooltip="Wechat Merchant ID: 1487387142"/>(1487387142)到账金额:<a
+                                                        class="text-green"
+                                                        ng-bind="fut.settlementFee_1487387142|currency:'AUD'"></a></p>
+                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.aliSettleFee_All">
+                                                    <img src="/static/images/alipay_sign.png" uib-tooltip="AliPay"
+                                                         alt="Alipay"/> 到账金额:<a class="text-green"
+                                                                                ng-bind="fut.aliSettleFee_All|currency:'AUD'"></a>
+                                                </p>
+                                                <p class="text-bold col-sm-12" align="left"
+                                                   ng-if="fut.aliOnlineSettleFee_All"><img
+                                                        src="/static/images/alipay_sign.png" uib-tooltip="AliPayOnline"
+                                                        alt="AliPayOnline"/> 到账金额(AlipayOnline):<a class="text-green"
+                                                                                                   ng-bind="fut.aliOnlineSettleFee_All|currency:'AUD'"></a>
+                                                </p>
+                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.hfSettleFee_All"><img
+                                                        src="/static/images/hf_sign.png" uib-tooltip="Hf" alt="Hf"/> 到账金额:<a
+                                                        class="text-green" ng-bind="fut.hfSettleFee_All|currency:'AUD'"></a>
+                                                </p>
+                                                <p class="text-bold col-sm-12" align="left" ng-if="fut.platformGetSettleFee"
+                                                   style="color: #f06010"><img src="/static/images/r_logo.svg"
+                                                                               style="width: 20px;height: 20px;"
+                                                                               uib-tooltip="RoyalPay" alt="RoyalPay"/>
+                                                    总到账金额:<a class="text-green"
+                                                             ng-bind="fut.platformGetSettleFee|currency:'AUD'"></a></p>
+                                            </div>
+                                            <!-- /.box-body -->
                                         </div>
-                                        <div class="box-header" style="border-top: solid #f06010 1px;"
-                                             ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
-                                            <span class="text-bold">到账金额详情:</span>
-                                        </div>
-                                        <div class="box-body"
-                                             ng-if="fut.settlementFee_1307485301||fut.settlementFee_1431999902||fut.settlementFee_1487387142||fut.settlementFee_0||fut.aliSettleFee_0">
-                                            <p class="text-bold col-sm-12" align="left"
-                                               ng-if="fut.settlementFee_1307485301"><img
-                                                    src="/static/images/wechatpay_sign.png"
-                                                    uib-tooltip="Wechat Merchant ID: 1307485301"/>(1307485301)到账金额:<a
-                                                    class="text-green"
-                                                    ng-bind="fut.settlementFee_1307485301|currency:'AUD'"></a></p>
-                                            <p class="text-bold col-sm-12" align="left"
-                                               ng-if="fut.settlementFee_1431999902"><img
-                                                    src="/static/images/wechatpay_sign.png"
-                                                    uib-tooltip="Wechat Merchant ID: 1431999902"/>(1431999902)到账金额:<a
-                                                    class="text-green"
-                                                    ng-bind="fut.settlementFee_1431999902|currency:'AUD'"></a></p>
-                                            <p class="text-bold col-sm-12" align="left"
-                                               ng-if="fut.settlementFee_1487387142"><img
-                                                    src="/static/images/wechatpay_sign.png"
-                                                    uib-tooltip="Wechat Merchant ID: 1487387142"/>(1487387142)到账金额:<a
-                                                    class="text-green"
-                                                    ng-bind="fut.settlementFee_1487387142|currency:'AUD'"></a></p>
-                                            <p class="text-bold col-sm-12" align="left" ng-if="fut.aliSettleFee_All">
-                                                <img src="/static/images/alipay_sign.png" uib-tooltip="AliPay"
-                                                     alt="Alipay"/> 到账金额:<a class="text-green"
-                                                                            ng-bind="fut.aliSettleFee_All|currency:'AUD'"></a>
-                                            </p>
-                                            <p class="text-bold col-sm-12" align="left"
-                                               ng-if="fut.aliOnlineSettleFee_All"><img
-                                                    src="/static/images/alipay_sign.png" uib-tooltip="AliPayOnline"
-                                                    alt="AliPayOnline"/> 到账金额(AlipayOnline):<a class="text-green"
-                                                                                               ng-bind="fut.aliOnlineSettleFee_All|currency:'AUD'"></a>
-                                            </p>
-                                            <p class="text-bold col-sm-12" align="left" ng-if="fut.hfSettleFee_All"><img
-                                                    src="/static/images/hf_sign.png" uib-tooltip="Hf" alt="Hf"/> 到账金额:<a
-                                                    class="text-green" ng-bind="fut.hfSettleFee_All|currency:'AUD'"></a>
-                                            </p>
-                                            <p class="text-bold col-sm-12" align="left" ng-if="fut.platformGetSettleFee"
-                                               style="color: #f06010"><img src="/static/images/r_logo.svg"
-                                                                           style="width: 20px;height: 20px;"
-                                                                           uib-tooltip="RoyalPay" alt="RoyalPay"/>
-                                                总到账金额:<a class="text-green"
-                                                         ng-bind="fut.platformGetSettleFee|currency:'AUD'"></a></p>
-                                        </div>
-                                        <!-- /.box-body -->
+                                        <!-- /.box -->
                                     </div>
-                                    <!-- /.box -->
                                 </div>
                             </div>
                         </div>
-                        </br>
-                        </br>
+                        <div ng-if="future.length > 0">
+                            </br>
+                            </br>
+                        </div>
                         <div class="box-solid">
                             <div class="box box-warning">
                                 <div class="box-header">
@@ -208,6 +211,6 @@
                     </div>
                 </div>
             </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
+        <!--</div>-->
+    <!--</div>-->
+<!--</div>-->
\ No newline at end of file
diff --git a/src/main/ui/static/analysis/templates/settle_warnings.html b/src/main/ui/static/analysis/templates/settle_warnings.html
index 028b2688f..ef69f3d89 100644
--- a/src/main/ui/static/analysis/templates/settle_warnings.html
+++ b/src/main/ui/static/analysis/templates/settle_warnings.html
@@ -78,7 +78,4 @@
             </table>
         </div>
     </div>
-</div>
-<div class="modal-footer">
-    <button class="btn btn-danger" ng-click="$dismiss()">Close</button>
 </div>
\ No newline at end of file
diff --git a/src/main/ui/static/cms/templates/cms_root.html b/src/main/ui/static/cms/templates/cms_root.html
index 0040caa6b..006648e7a 100644
--- a/src/main/ui/static/cms/templates/cms_root.html
+++ b/src/main/ui/static/cms/templates/cms_root.html
@@ -2,7 +2,10 @@
     <section class="content-header">
         <h1>网站管理</h1>
         <ol class="breadcrumb">
-            <li>网站管理</li>
+            <li>
+                <i class="fa fa-sitemap"></i> Content Management
+            </li>
+            <li class="active">网站管理</li>
         </ol>
     </section>
     <section class="content">
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
index ef9ffeae6..7657024b0 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
@@ -2,7 +2,7 @@
     <section class="content-header">
         <h1>BD Commissions</h1>
         <ol class="breadcrumb">
-            <li><i class="fa fa-usd"></i> Financial</li>
+            <li><i class="fa fa-usd"></i> Performance</li>
             <li class="active">BD Commissions</li>
         </ol>
     </section>
diff --git a/src/main/ui/static/config/devtools/templates/wx_settlements.html b/src/main/ui/static/config/devtools/templates/wx_settlements.html
index dca317662..cbb5c67ac 100644
--- a/src/main/ui/static/config/devtools/templates/wx_settlements.html
+++ b/src/main/ui/static/config/devtools/templates/wx_settlements.html
@@ -2,7 +2,7 @@
     <h1>Wechat Settlements</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-flag"></i>Financial
+            <i class="fa fa-dollar"></i>Financial
         </li>
         <li class="active">Wechat Settlements</li>
     </ol>
diff --git a/src/main/ui/static/config/managers/templates/managers.html b/src/main/ui/static/config/managers/templates/managers.html
index e46db3e3d..4acfb3305 100644
--- a/src/main/ui/static/config/managers/templates/managers.html
+++ b/src/main/ui/static/config/managers/templates/managers.html
@@ -2,7 +2,7 @@
     <h1>Manager Accounts</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-key"></i> Basic Config
+            <i class="fa fa-key"></i> Framework
         </li>
         <li class="active">Manager Accounts</li>
     </ol>
diff --git a/src/main/ui/static/config/notice/templates/notice.html b/src/main/ui/static/config/notice/templates/notice.html
index 5979a33c2..b336ba0e1 100644
--- a/src/main/ui/static/config/notice/templates/notice.html
+++ b/src/main/ui/static/config/notice/templates/notice.html
@@ -3,7 +3,7 @@
         <h1>Notice Manage</h1>
         <ol class="breadcrumb">
             <li>
-                <i class="fa fa-sitemap"></i> Basic Config
+                <i class="fa fa-sitemap"></i> Content Management
             </li>
             <li class="active">Notice Manage</li>
         </ol>
diff --git a/src/main/ui/static/config/organizations/templates/orgs.html b/src/main/ui/static/config/organizations/templates/orgs.html
index ba15ad749..02662ec4e 100644
--- a/src/main/ui/static/config/organizations/templates/orgs.html
+++ b/src/main/ui/static/config/organizations/templates/orgs.html
@@ -27,7 +27,7 @@
         <h1>Organizations</h1>
         <ol class="breadcrumb">
             <li>
-                <i class="fa fa-users"></i> Basic Config
+                <i class="fa fa-users"></i> Framework
             </li>
             <li class="active">Organizations</li>
         </ol>
diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
index 9442c787c..274afa648 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
@@ -2,7 +2,7 @@
     <h1>Permission Config</h1>
     <ol class="breadcrumb">
         <li>
-            <a ui-sref="^"><i class="fa fa-cog"></i> System Config</a>
+            <a ui-sref="^"><i class="fa fa-cog"></i> Framework</a>
         </li>
         <li>Permission Config</li>
     </ol>
diff --git a/src/main/ui/static/config/sysconfigs/templates/servants_config.html b/src/main/ui/static/config/sysconfigs/templates/servants_config.html
index 1faef465a..133cfce47 100644
--- a/src/main/ui/static/config/sysconfigs/templates/servants_config.html
+++ b/src/main/ui/static/config/sysconfigs/templates/servants_config.html
@@ -2,7 +2,7 @@
     <h1>Servants Config</h1>
     <ol class="breadcrumb">
         <li>
-            <a ui-sref="^"><i class="fa fa-cog"></i> System Config</a>
+            <a ui-sref="^"><i class="fa fa-cog"></i> Framework</a>
         </li>
         <li>Servants Config</li>
     </ol>
diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index f96b8ca1e..d6664ff3b 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -33,7 +33,7 @@
     <h1>Partner Invoice</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-comments-o"></i> Financial
+            <i class="fa fa-dollar"></i>Financial
         </li>
         <li class="active">Partner Invoice</li>
     </ol>
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index ef733f8e5..922eeafdb 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -91,6 +91,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             url: '/partners/new',
             templateUrl: '/static/payment/partner/templates/add_partner.html',
             controller: 'addPartnerCtrl'
+        }).state('businessCompliance', {
+            url: '/partners/compliance',
+            templateUrl: '/static/payment/partner/templates/partner_compliance.html',
+            controller: 'compliancePartnerCtrl'
         }).state('partners.detail', {
             url: '/{clientMoniker}/detail',
             templateUrl: '/static/payment/partner/templates/partner_detail.html',
@@ -277,6 +281,77 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }
             $scope.toogleMerchantSelect();*/
         }]);
+    app.controller('compliancePartnerCtrl', ['$scope', '$sce', '$http', '$filter', '$uibModal', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap',
+        function ($scope, $sce, $http, $filter, $uibModal, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) {
+
+            $scope.analysisClients = function () {
+                $http.get('/sys/partners/analysis').then(function (resp) {
+                    $scope.analysis = resp.data;
+                })
+            };
+            if ($scope.currentUser.org_id == 1 || $scope.currentUser.org_id == null) {
+                $scope.analysisClients();
+            }
+            $scope.pagination = {};
+            $scope.industries = industryMap.configs();
+            $scope.states = stateMap.configs();
+            $scope.countries = countryMap.configs();
+            $scope.sectors = sectorMap.configs();
+            $scope.business_structures = businessStructuresMap.configs();
+            $scope.clean_days = angular.copy(clean_days_map);
+            $scope.bd_citys = angular.copy(bd_city_map);
+            $scope.params = {textType: 'all', org_name: 'ALL'};
+
+            $scope.loadPartners = function (page) {
+                var params = angular.copy($scope.params);
+                params.page = page || $scope.pagination.page || 1;
+                $http.get('/sys/partners', {params: params}).then(function (resp) {
+                    $scope.partners = resp.data.data;
+                    $scope.pagination = resp.data.pagination;
+                });
+            };
+
+            $scope.today = new Date();
+
+            $scope.listBDUsers = function () {
+                $http.get('/sys/manager_accounts/roles/bd_user').then(function (resp) {
+                    $scope.bdUserSource = resp.data;
+                })
+            };
+            $scope.listBDUsers();
+
+            if (($scope.currentUser.role & parseInt('1000011', 2)) > 0 && !$scope.currentUser.org_id) {
+                $scope.showOrg = 'Organization';
+                $http.get('/sys/orgs/list_all_Org', {params: {}}).then(function (resp) {
+                    $scope.orgs = resp.data;
+                });
+            }
+
+            $scope.loadOrgs = function () {
+                var params = angular.copy($scope.params);
+                $http.get('/sys/orgs/orgChild', {params: params}).then(function (resp) {
+                    $scope.orgs_child = resp.data;
+                })
+            };
+            $scope.loadOrgs();
+
+            $scope.loadPartners(1);
+
+
+            $scope.openClientBoard = function (client) {
+                $uibModal.open({
+                    templateUrl: '/static/analysis/templates/partner_card.html',
+                    controller: 'partnerCardCtrl',
+                    resolve: {
+                        clientMoniker: function () {
+                            return client.client_moniker
+                        }
+                    },
+                    size: 'lg'
+                })
+
+            };
+        }]);
     app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone) {
         if ($scope.partner_application) {
             $scope.partner = angular.copy($scope.partner_application);
diff --git a/src/main/ui/static/payment/partner/templates/partner_compliance.html b/src/main/ui/static/payment/partner/templates/partner_compliance.html
new file mode 100644
index 000000000..534daecf6
--- /dev/null
+++ b/src/main/ui/static/payment/partner/templates/partner_compliance.html
@@ -0,0 +1,335 @@
+<style>
+    .pass_timeout {
+        color: red;
+    }
+
+    .del_client {
+        text-decoration: line-through;
+    }
+</style>
+<div ui-view>
+    <section class="content-header">
+        <h1>Business compliance</h1>
+        <ol class="breadcrumb">
+            <li>
+                <i class="fa fa-sitemap"></i> Compliance Management
+            </li>
+            <li class="active">Business compliance</li>
+        </ol>
+    </section>
+
+    <div class="content">
+        <div class="row" ng-if="currentUser.org_id==1 || currentUser.org_id==null">
+            <div class="col-md-3 col-sm-6 col-xs-12">
+                <div class="info-box">
+                    <span class="info-box-icon bg-aqua"><i class="ion ion-ios-people"></i></span>
+                    <div class="info-box-content">
+                        <span class="info-box-text">Waiting Compliance</span>
+                        <a role="button" ng-click="params.approving=true;loadPartners(1)"><span class="info-box-number">{{analysis.wp}}</span></a>
+                        <small>其中自助开通:{{analysis.a_wp}}</small>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-3 col-sm-6 col-xs-12">
+                <div class="info-box">
+                    <span class="info-box-icon bg-green"><i class="ion ion-ios-people"></i></span>
+                    <div class="info-box-content">
+                        <span class="info-box-text">Pass</span>
+                        <span class="info-box-number">{{analysis.pass}}</span>
+                        <small>其中自助开通:{{analysis.z_pass+analysis.a_pass}}</small>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-3 col-sm-6 col-xs-12">
+                <div class="info-box">
+                    <span class="info-box-icon bg-red"><i class="ion ion-ios-people"></i></span>
+                    <div class="info-box-content">
+                        <span class="info-box-text">Temp SubMerchantID</span>
+                        <a role="button" ng-click="params.tempMchId=true;loadPartners(1)"><span class="info-box-number"
+                                                                                                ng-bind="analysis.temp_submchid||0"></span></a>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-3 col-sm-6 col-xs-12">
+                <div class="info-box">
+                    <span class="info-box-icon bg-yellow"><i class="ion ion-ios-people"></i></span>
+                    <div class="info-box-content">
+                        <span class="info-box-text">自助开通</span>
+                        <a role="button" ng-click="params.quickPass=true;loadPartners(1)"><span class="info-box-number">{{analysis.quick_pass}}</span></a>
+                        <small>waiting compliance:{{analysis.a_wp}}</small>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="box-solid">
+
+                    <div class="box box-warning">
+                        <div class="box-header">
+
+                            <div class="row">
+                                <div class="col-xs-12">
+                                    <div class="form-horizontal">
+                                        <!--<div class="form-group">-->
+                                        <!--<label class="control-label" for="partner-code-search">Partner Code</label>-->
+                                        <!--<input class="form-control" id="partner-code-search" ng-model="params.client_moniker">-->
+                                        <!--</div>-->
+                                        <div class="form-group">
+                                            <label class="col-xs-4 col-sm-2">
+                                                <select class="form-control" ng-model="params.textType">
+                                                    <option value="all">ALL</option>
+                                                    <option value="client_moniker">Partner Code</option>
+                                                    <option value="client_name">Partner Name</option>
+                                                    <option value="company_name">Company Name</option>
+                                                    <option value="business_name">Business Name</option>
+                                                    <option value="remark">Remark</option>
+                                                </select>
+                                            </label>
+                                            <div class="col-xs-8 col-sm-4">
+                                                <input class="form-control" placeholder="Keyword"
+                                                       ng-enter="loadPartners(1)"
+                                                       ng-model="params.searchText">
+                                            </div>
+                                        </div>
+                                        <!--Sub Merchant ID-->
+                                        <div class="form-group col-sm-6">
+                                            <label class="control-label col-xs-4 col-sm-4" for="sub-merchant-search">Sub
+                                                Merchant ID</label>
+                                            <div class="col-xs-6">
+                                                <input type="number" class="form-control" id="sub-merchant-search"
+                                                       ng-enter="loadPartners(1)"
+                                                       ng-model="params.sub_merchant_id">
+                                            </div>
+                                        </div>
+
+                                        <div class="form-group col-sm-6" ng-if="('10'|withRole)">
+                                            <label class="control-label col-xs-4 col-sm-4">Merchant ID</label>
+                                            <div class="col-xs-6">
+                                                <select ng-model="params.merchant_id" id="merchant-select"
+                                                        class="form-control">
+                                                    <option value="">All</option>
+                                                    <option value="1307485301">1307485301(Tunnel Show1)</option>
+                                                    <option value="1431999902">1431999902(Tunnel Show2)</option>
+                                                    <option value="1487387142">1487387142(NAP)</option>
+                                                </select>
+                                            </div>
+                                        </div>
+
+                                        <!--Organization-->
+                                        <div class="form-group col-sm-6" ng-if="orgs">
+                                            <label class="control-label col-xs-4 col-sm-4" for="bd-select">Organization</label>
+                                            <div class="col-xs-6 col-sm-6">
+                                                <select id="org-select" class="form-control" ng-model="params.org_id"
+                                                        ng-options="org.org_id as org.name group by org.org_type for org in orgs"
+                                                        ng-change="params.bd = '';params.org_ids = null;loadPartners();loadOrgs();">
+                                                    <option value="">All</option>
+                                                </select>
+                                            </div>
+                                        </div>
+
+                                        <div class="form-group col-sm-6" ng-if="(params.org_id && orgs_child.length>1) || (currentUser.org_id && !currentUser.parent_org_id && orgs_child.length>1)">
+                                            <label class="control-label col-xs-4 col-sm-4" for="org-clild" ng-if="!currentUser.org_id">Sub Organization</label>
+                                            <label class="control-label col-xs-4 col-sm-4" for="org-clild" ng-if="currentUser.org_id">Organization</label>
+                                            <div class="col-xs-6 col-sm-6">
+                                                <select id="org-clild" class="form-control" ng-model="params.org_ids"
+                                                        ng-options="org.org_id as org.name group by org.type for org in orgs_child"
+                                                        ng-change="params.bd = '';loadPartners();">
+                                                    <option value="">All</option>
+                                                </select>
+                                            </div>
+                                        </div>
+
+                                        <div class="form-group col-sm-6"
+                                             ng-if="!('100'|withRole) || (currentUser.org_id && !currentUser.parent_org_id)">
+                                            <label class="control-label col-xs-4 col-sm-4" for="bd-select">BD
+                                                User</label>
+                                            <div class="col-xs-6 col-sm-6">
+                                                <select id="bd-select" class="form-control" ng-model="params.bd"
+                                                        ng-options="bd.manager_id as bd.display_name group by bd.org_name for bd in bdUserSource | bdOrgSelect:params">
+                                                    <option value="">All</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="form-horizontal">
+                                            <!--status-->
+                                            <div class="form-group col-sm-12" ng-if="'10'|withRole">
+                                                <label class="control-label col-xs-4 col-sm-2">Status</label>
+                                                <!--<div class="col-xs-8 col-sm-4">-->
+                                                <span class="col-xs-8 col-sm-10">
+                                                    <span class="checkbox-inline">
+                                                        <label>
+                                                            <input type="checkbox" ng-model="params.approving"
+                                                                   id="approving-check">
+                                                            等待合规
+                                                        </label>
+                                                    </span>
+                                                    <span class="checkbox-inline">
+                                                        <label>
+                                                            <input type="checkbox" ng-model="params.tempMchId"> 使用通用子商户号
+                                                        </label>
+                                                    </span>
+                                                    <span class="checkbox-inline">
+                                                        <label>
+                                                            <input type="checkbox" ng-model="params.quickPass"> 自助开通
+                                                        </label>
+                                                    </span>
+                                                    <span class="checkbox-inline">
+                                                        <label>
+                                                            <input type="checkbox" ng-model="params.greenChannel"> 绿色通道
+                                                        </label>
+                                                    </span>
+
+                                                    <span class="checkbox-inline">
+                                                        <label>
+                                                            <input type="checkbox" ng-model="params.pass"> 通过
+                                                        </label>
+                                                    </span>
+                                                    <span class="checkbox-inline">
+                                                        <label>
+                                                            <input type="checkbox" ng-model="params.completed_contract"> 资料完善中
+                                                        </label>
+                                                    </span>
+                                                    <span class="checkbox-inline">
+                                                        <label>
+                                                            <input type="checkbox" ng-model="params.apply_to_back"> 申请打回
+                                                        </label>
+                                                    </span>
+                                                     <span class="checkbox-inline">
+                                                        <label>
+                                                            <input type="checkbox" ng-model="params.bd_upload_material"> 等待BD上传材料审核
+                                                        </label>
+                                                    </span>
+
+                                                </span>
+                                                <!--</div>-->
+                                            </div>
+                                            <div class="col-xs-12">
+                                                <button class="btn btn-primary" type="button"
+                                                        ng-click="loadPartners(1)"><i
+                                                        class="fa fa-search"></i> Search
+                                                </button>
+                                            </div>
+
+                                        </div>
+                                    </div>
+
+                                </div>
+
+                            </div>
+
+                        </div>
+                    </div>
+
+                    <div class="box box-warning" style="border-top-color:#f06101">
+                        <div class="box-body no-padding table-responsive">
+                            <div>
+                                <span style="float: right;font-size: 14px;" class="del_client">禁用</span>
+                                <span style="float: right;font-size: 14px;" class="pass_timeout">&nbsp;&nbsp;超期提醒&nbsp;&nbsp;</span>
+                                <span style="float: right;font-size: 14px;"
+                                      class="bg-red">&nbsp;&nbsp;等待合规&nbsp;&nbsp;</span>
+                                <span style="float: right;font-size: 14px;"
+                                      class="bg-green">&nbsp;&nbsp;绿色通道&nbsp;&nbsp;</span>
+                                <span style="float: right;font-size: 14px;">&nbsp;&nbsp;通过&nbsp;&nbsp;</span>
+                            </div>
+                            <table class="table table-striped">
+                                <thead>
+                                <tr>
+                                    <th style="padding: 12px;">Partner Code</th>
+                                    <th style="padding: 12px;">Partner Name</th>
+                                    <th style="padding: 12px;">Sub Mch ID</th>
+                                    <th style="padding: 12px;">Register Time</th>
+                                    <th style="padding: 12px;">Compliance Status</th>
+                                    <th style="padding: 12px;">Organization</th>
+                                    <th style="padding: 12px;">BD</th>
+                                    <th style="padding: 12px;" ng-if="'client_detail_by_moniker'|withFunc">Operation
+                                    </th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr ng-repeat="partner in partners"
+                                    ng-class="{pass_timeout:partner.pass_timeout,success:partner.source==5,warning:partner.approve_result==5 && ('100'|withRole)}">
+                                    <td>
+                                        <a class="text-primary" role="button" title="Detail"
+                                           ng-click="openClientBoard(partner)"
+                                           ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))">
+                                            <span ng-bind="partner.client_moniker"></span></a>
+                                        <span ng-bind="partner.client_moniker"
+                                              ng-if="partner.approve_result!=1 && !(partner.approve_result==2 && (partner.source==1 || partner.source==2))"></span>
+                                        <span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
+                                        <i class="fa fa-sitemap" ng-if="partner.parent_client_id"
+                                           title="Sub Partner"></i>
+                                        <i class="text-danger fa fa-envelope-o"
+                                           ng-if="(partner.approve_result==1 || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))) && (partner.approve_email_send==2 || partner.approve_email_send==0)"
+                                           title="Init email send failed"></i>
+                                        <i class="text-danger fa fa-clock-o" ng-if="partner.temp_sub_merchant"
+                                           title="Using temp Sub Merchant ID"></i>
+                                    </td>
+                                    <td ng-bind="partner.short_name"></td>
+                                    <td ng-bind="partner.sub_merchant_id"></td>
+                                    <td ng-bind="partner.create_time"></td>
+                                    <td ng-class="{'bg-green':(partner.approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.open_status==1||partner.open_status==2||partner.open_status==4) && partner.approve_result!=3)||(partner.approve_result==3 && (!partner.open_status || partner.open_status==1 || partner.open_status == 4))||(partner.approve_result==4 && !partner.open_status)||(partner.open_status==10)}">
+                                        <span ng-if="partner.approve_result==1 && partner.approve_time">通过({{partner.approve_time}})</span>
+                                        <span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source!=4">资料完善中</span>
+                                        <span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source==4">(自助开通)资料完善中</span>
+                                        <span ng-if="!partner.open_status && partner.approve_result==2 && partner.approve_time">自助开通试用中({{partner.approve_time}}~{{partner.expiry_time}})</span>
+                                        <span ng-if="partner.approve_result==0 && partner.approve_time">不通过({{partner.approve_time}})</span>
+                                        <span ng-if="partner.approve_result==5 && partner.approve_time && partner.refuse_remark">申请打回({{partner.refuse_remark|limitTo:15}})</span>
+                                        <span ng-if="(partner.open_status==1||partner.open_status==4) && partner.approve_result!=3"><i
+                                                ng-if="partner.refuse_remark.length>0" class="fa fa-reply"
+                                                aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
+                                        <span ng-if="partner.approve_result==3 && (!partner.open_status || partner.open_status==4)">自助开通（等待合规）</span>
+                                        <span ng-if="partner.open_status==2">合同制作完成</span>
+                                        <span ng-if="partner.open_status==3 && partner.approve_result!=5">等待BD上传材料审核</span>
+                                        <span ng-if="partner.open_status==10">绿色通道申请中</span>
+                                        <span ng-if="partner.approve_result==4 && !partner.open_status"><i
+                                                ng-if="partner.refuse_remark.length>0" class="fa fa-reply"
+                                                aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
+                                    </td>
+                                    <td ng-bind="partner.org_name"></td>
+                                    <td ng-bind="partner.bd_user_name"></td>
+                                    <td ng-if="'client_detail_by_moniker'|withFunc">
+                                        <a class="text-primary" role="button" title="Detail"
+                                           ui-sref="partners.detail({clientMoniker:partner.client_moniker})">
+                                            <i class="fa fa-search"></i> Detail
+                                        </a>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+
+                        </div>
+                        <div class="box-footer" ng-if="partners.length">
+                            <uib-pagination class="pagination"
+                                            total-items="pagination.totalCount"
+                                            boundary-links="true"
+                                            ng-model="pagination.page"
+                                            items-per-page="pagination.limit"
+                                            max-size="10"
+                                            ng-change="loadPartners()"
+                                            previous-text="&lsaquo;"
+                                            next-text="&rsaquo;"
+                                            first-text="&laquo;"
+                                            last-text="&raquo;"></uib-pagination>
+                            <div class="row">
+                                <div class="col-xs-12">Total Records:{{pagination.totalCount}};Total
+                                    Pages:{{pagination.totalPages}}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!--商户分布位置转移-->
+                    <!--<div class="row" ng-if="mapFrame">
+                        <div class="col-sm-12">
+                            <div class="box" style="border-top: none">
+                                <div class="embed-responsive" style="height: 300px;">
+                                    <iframe class="embed-responsive-item" id="merchant_maps"  name="merchant_maps" src="{{mapFrame}}"></iframe>
+                                </div>
+                            </div>
+                        </div>
+                    </div>-->
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/main/ui/static/payment/product/templates/product.html b/src/main/ui/static/payment/product/templates/product.html
index 196f2321e..c3aaaaa18 100644
--- a/src/main/ui/static/payment/product/templates/product.html
+++ b/src/main/ui/static/payment/product/templates/product.html
@@ -1,3 +1,12 @@
+<section class="content-header">
+    <h1>Products</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-users"></i> Framework
+        </li>
+        <li class="active">Products</li>
+    </ol>
+</section>
 <div class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/payment/tradelog/templates/trans_report.html b/src/main/ui/static/payment/tradelog/templates/trans_report.html
index ec22314e5..e8ef4c38c 100644
--- a/src/main/ui/static/payment/tradelog/templates/trans_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/trans_report.html
@@ -11,7 +11,7 @@
     <h1>AusTrac Report</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-comments-o"></i> Financial
+            <i class="fa fa-dollar"></i>Financial
         </li>
         <li class="active">AusTrac Report</li>
     </ol>
diff --git a/src/main/ui/static/risk/templates/attention_merchants.html b/src/main/ui/static/risk/templates/attention_merchants.html
index a3da05e12..88aeee434 100644
--- a/src/main/ui/static/risk/templates/attention_merchants.html
+++ b/src/main/ui/static/risk/templates/attention_merchants.html
@@ -2,7 +2,7 @@
     <section class="content-header">
         <h1>Blacklist</h1>
         <ol class="breadcrumb">
-            <li><i class="fa fa-gift"></i> Risk Manager</li>
+            <li><i class="fa fa-list-alt"></i> Risk Manager</li>
             <li class="active">Blacklist</li>
         </ol>
     </section>
diff --git a/src/main/ui/static/risk/templates/risk.html b/src/main/ui/static/risk/templates/risk.html
index ce0415615..435911e83 100644
--- a/src/main/ui/static/risk/templates/risk.html
+++ b/src/main/ui/static/risk/templates/risk.html
@@ -2,7 +2,7 @@
     <section class="content-header">
         <h1>Risk Records</h1>
         <ol class="breadcrumb">
-            <li><i class="fa fa-gift"></i> Risk Manager</li>
+            <li><i class="fa fa-list-alt"></i> Risk Manager</li>
             <li class="active">Risk Records</li>
         </ol>
     </section>
diff --git a/src/main/ui/static/sys/templates/contract_sign.html b/src/main/ui/static/sys/templates/contract_sign.html
index 41f712886..06dc9b700 100644
--- a/src/main/ui/static/sys/templates/contract_sign.html
+++ b/src/main/ui/static/sys/templates/contract_sign.html
@@ -1,21 +1,17 @@
 <section class="content-header">
-    <h1>Business compliance</h1>
+    <h1>Contract Award</h1>
     <ol class="breadcrumb">
         <li>
             <i class="fa fa-sitemap"></i> Compliance Management
         </li>
-        <li class="active">Business compliance</li>
+        <li class="active">contract award</li>
     </ol>
 </section>
-<div class="modal-header">Contract</div>
 
 <ul class="nav nav-tabs">
     <li ui-sref-active-eq="active" class="active">
         <a ui-sref="contract">Contract</a>
     </li>
-    <li ui-sref-active-eq="active" class="active">
-        <a ui-sref="rate_warnings">Rate Warings</a>
-    </li>
     <li ui-sref-active-eq="active" class="active">
         <a ui-sref="manual_settle">Manual Settle</a>
     </li>
diff --git a/src/main/ui/static/sys/templates/manual_settle.html b/src/main/ui/static/sys/templates/manual_settle.html
index dc67edcb0..f3378a7a5 100644
--- a/src/main/ui/static/sys/templates/manual_settle.html
+++ b/src/main/ui/static/sys/templates/manual_settle.html
@@ -1,12 +1,17 @@
-<div class="modal-header">Contract</div>
+<section class="content-header">
+    <h1>Manual Settle</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-sitemap"></i> Compliance Management
+        </li>
+        <li class="active">Manual Settle</li>
+    </ol>
+</section>
 
 <ul class="nav nav-tabs">
     <li ui-sref-active-eq="active" class="active">
         <a ui-sref="contract">Contract</a>
     </li>
-    <li ui-sref-active-eq="active" class="active">
-        <a ui-sref="rate_warnings">Rate Warings</a>
-    </li>
     <li ui-sref-active-eq="active" class="active">
         <a ui-sref="manual_settle">Manual Settle</a>
     </li>

From 28a5d26c4fca283814d3fe35f0146ee59d113b9e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 22 Oct 2018 18:10:09 +0800
Subject: [PATCH 33/82] fix  v2-manager.html permission

---
 src/main/ui/main_menu.html             | 46 ++++++++++++++------------
 src/main/ui/static/menu/managerMenu.js |  2 ++
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
index b506f3e73..d5c210a04 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/main_menu.html
@@ -6,16 +6,17 @@
 </style>
 <div class="content-wrapper autoheight" style="margin-left: 0px">
     <div class="content" style="background-color: #FFF">
+<!--
         <div class="list-group">
-            <!--<div class="row" ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">-->
-                <!--<div class="col-sm-2 col-lg-2 col-xs-6">-->
-                    <!--<div class="description-block">-->
-                        <!--<label>待处理事项</label>-->
-                    <!--</div>-->
-                <!--</div>-->
-            <!--</div>-->
+            <div class="row" ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>待处理事项</label>
+                    </div>
+                </div>
+            </div>
             <div class="row">
-                <!--<div class="col-sm-2 col-lg-2 col-xs-6">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
                     <a ui-sref="sysconfig" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/to_be_treated_1.png"/>
@@ -24,10 +25,11 @@
                             </div>
                         </div>
                     </a>
-                </div>-->
+                </div>
             </div>
         </div>
-        <div class="list-group">
+-->
+        <div class="list-group" ng-if="role!='administrator' && role!='developer' && roll!='sitemanager'">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="partners">
                     <div class="description-block">
@@ -98,7 +100,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role!='administrator' && role!='developer' && roll!='sitemanager'">
             <div class="row" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
                     <div class="description-block">
@@ -159,7 +161,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='riskmanager'">
             <div class="row" ng-if="('clientrate'|withModule)||('monitor'|withModule) || ('customerRankingAnalysisApp'|withModule)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="risk">
                     <div class="description-block">
@@ -230,7 +232,7 @@
                 </div>
             </div>
         </div>
-      <div class="list-group">
+        <div class="list-group" ng-if="role=='compliance'">
           <div class="row">
               <div class="col-sm-2 col-lg-2 col-xs-6">
                   <div class="description-block">
@@ -304,7 +306,7 @@
         </div>
 
 
-        <div class="list-group">
+        <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">
                     <div class="description-block">
@@ -367,7 +369,7 @@
 -->
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='bduser' || role=='salesmanager' || role=='director'">
             <div class="row" ng-if="('1000'|withRole)|| ('bdsale'|withModule) || ('bdprize'|withModule)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="bd">
                     <div class="description-block">
@@ -427,7 +429,7 @@
                     </a></div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='sitemanager'">
             <div class="row" ng-if="('1011110'|withRole) || currentUser.org_id==null">
                 <div class="col-sm-2 col-lg-2 col-xs-6">
                     <div class="description-block" id="art">
@@ -550,7 +552,7 @@
                 </div>-->
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='sitemanager'">
             <div class="row" ng-if="('0100001'|withRole)">
                 <div class="col-sm-2 col-lg-2 col-xs-6">
                     <div class="description-block" id="cms">
@@ -591,7 +593,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='accountant' || role=='director'">
             <div class="row" ng-if="('settleReport'|withModule)||('platformRevenue'|withModule) ||('austrac'|withModule) ||('1000'|withRole)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="staff">
                     <div class="description-block">
@@ -660,7 +662,7 @@
                     </a></div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='accountant' || role=='director'">
             <div class="row" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="clearing">
                     <div class="description-block">
@@ -735,7 +737,7 @@
                     </a></div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='administrator'">
             <div class="row" ng-if="('org'|withModule)||('manager_accounts'|withModule)||('sysconfig'|withModule)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="org">
                     <div class="description-block">
@@ -792,7 +794,7 @@
                     </a></div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='administrator'">
             <div class="row" ng-if="(('10'|withRole)&&('merchantIdManage'|withModule)) || (('device'|withModule)) ||('sysconfig'|withModule)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="setting">
                     <div class="description-block">
@@ -831,7 +833,7 @@
                     </a></div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='developer'">
             <div class="row" ng-if="('log'|withModule) || ('dev'|withModule)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="develop">
                     <div class="description-block">
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index a9149498e..06e83dedd 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -10,6 +10,8 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
     }]);
     app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal','$location', '$anchorScroll','$stateParams', function ($scope, $http,$filter, $uibModal,$location, $anchorScroll,$stateParams) {
 
+
+        $scope.role = $stateParams["role"];
         var gotohash = function (role) {
             switch (role) {
                 case "Compliance" :

From ec010193cef0b546c36e05169c905dc977b28bdf Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 22 Oct 2018 20:10:25 +0800
Subject: [PATCH 34/82] fix  v2-manager.html role

---
 src/main/ui/manage.html                       | 172 ++++++++++++++++++
 src/main/ui/managev2.html                     | 112 +-----------
 src/main/ui/static/boot/managerMainAppv2.js   |  17 +-
 .../static/images/main_menu/admin_shops.png   | Bin 0 -> 2613 bytes
 .../ui/static/images/main_menu/dev_log.png    | Bin 0 -> 2105 bytes
 .../ui/static/images/main_menu/dev_tools.png  | Bin 0 -> 2332 bytes
 .../ui/static/images/main_menu/site_cms.png   | Bin 0 -> 2940 bytes
 .../images/main_menu/site_monelyact.png       | Bin 0 -> 2997 bytes
 src/main/ui/static/menu/managerMenu.js        |  62 +------
 src/main/ui/static/menu/templates/home.html   | 169 +++++++++++++++++
 .../menu/templates}/main_menu.html            |  14 +-
 11 files changed, 370 insertions(+), 176 deletions(-)
 create mode 100644 src/main/ui/static/images/main_menu/admin_shops.png
 create mode 100644 src/main/ui/static/images/main_menu/dev_log.png
 create mode 100644 src/main/ui/static/images/main_menu/dev_tools.png
 create mode 100644 src/main/ui/static/images/main_menu/site_cms.png
 create mode 100644 src/main/ui/static/images/main_menu/site_monelyact.png
 create mode 100644 src/main/ui/static/menu/templates/home.html
 rename src/main/ui/{ => static/menu/templates}/main_menu.html (98%)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 3a5c3f54b..3078d41ac 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -274,6 +274,177 @@ margin-bottom: 10%;"/>
     <aside class="main-sidebar" style="height: 100%;max-height: 100%;overflow: auto;padding-bottom: 50px;">
         <!--sidebar: style can be found in sidebar.less -->
         <section class="sidebar">
+            <ul class="sidebar-menu" data-widget="tree">
+                <li class="header">MAIN NAVIGATION</li>
+                <li class="active treeview">
+                    <a href="#">
+                        <i class="fa fa-dashboard"></i> <span>Dashboard</span>
+                        <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li class="active"><a href="index.html"><i class="fa fa-circle-o"></i> Dashboard v1</a></li>
+                        <li><a href="index2.html"><i class="fa fa-circle-o"></i> Dashboard v2</a></li>
+                    </ul>
+                </li>
+                <li class="treeview">
+                    <a href="#">
+                        <i class="fa fa-files-o"></i>
+                        <span>Layout Options</span>
+                        <span class="pull-right-container">
+              <span class="label label-primary pull-right">4</span>
+            </span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li><a href="pages/layout/top-nav.html"><i class="fa fa-circle-o"></i> Top Navigation</a></li>
+                        <li><a href="pages/layout/boxed.html"><i class="fa fa-circle-o"></i> Boxed</a></li>
+                        <li><a href="pages/layout/fixed.html"><i class="fa fa-circle-o"></i> Fixed</a></li>
+                        <li><a href="pages/layout/collapsed-sidebar.html"><i class="fa fa-circle-o"></i> Collapsed Sidebar</a></li>
+                    </ul>
+                </li>
+                <li>
+                    <a href="pages/widgets.html">
+                        <i class="fa fa-th"></i> <span>Widgets</span>
+                        <span class="pull-right-container">
+              <small class="label pull-right bg-green">new</small>
+            </span>
+                    </a>
+                </li>
+                <li class="treeview">
+                    <a href="#">
+                        <i class="fa fa-pie-chart"></i>
+                        <span>Charts</span>
+                        <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li><a href="pages/charts/chartjs.html"><i class="fa fa-circle-o"></i> ChartJS</a></li>
+                        <li><a href="pages/charts/morris.html"><i class="fa fa-circle-o"></i> Morris</a></li>
+                        <li><a href="pages/charts/flot.html"><i class="fa fa-circle-o"></i> Flot</a></li>
+                        <li><a href="pages/charts/inline.html"><i class="fa fa-circle-o"></i> Inline charts</a></li>
+                    </ul>
+                </li>
+                <li class="treeview">
+                    <a href="#">
+                        <i class="fa fa-laptop"></i>
+                        <span>UI Elements</span>
+                        <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li><a href="pages/UI/general.html"><i class="fa fa-circle-o"></i> General</a></li>
+                        <li><a href="pages/UI/icons.html"><i class="fa fa-circle-o"></i> Icons</a></li>
+                        <li><a href="pages/UI/buttons.html"><i class="fa fa-circle-o"></i> Buttons</a></li>
+                        <li><a href="pages/UI/sliders.html"><i class="fa fa-circle-o"></i> Sliders</a></li>
+                        <li><a href="pages/UI/timeline.html"><i class="fa fa-circle-o"></i> Timeline</a></li>
+                        <li><a href="pages/UI/modals.html"><i class="fa fa-circle-o"></i> Modals</a></li>
+                    </ul>
+                </li>
+                <li class="treeview">
+                    <a href="#">
+                        <i class="fa fa-edit"></i> <span>Forms</span>
+                        <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li><a href="pages/forms/general.html"><i class="fa fa-circle-o"></i> General Elements</a></li>
+                        <li><a href="pages/forms/advanced.html"><i class="fa fa-circle-o"></i> Advanced Elements</a></li>
+                        <li><a href="pages/forms/editors.html"><i class="fa fa-circle-o"></i> Editors</a></li>
+                    </ul>
+                </li>
+                <li class="treeview">
+                    <a href="#">
+                        <i class="fa fa-table"></i> <span>Tables</span>
+                        <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li><a href="pages/tables/simple.html"><i class="fa fa-circle-o"></i> Simple tables</a></li>
+                        <li><a href="pages/tables/data.html"><i class="fa fa-circle-o"></i> Data tables</a></li>
+                    </ul>
+                </li>
+                <li>
+                    <a href="pages/calendar.html">
+                        <i class="fa fa-calendar"></i> <span>Calendar</span>
+                        <span class="pull-right-container">
+              <small class="label pull-right bg-red">3</small>
+              <small class="label pull-right bg-blue">17</small>
+            </span>
+                    </a>
+                </li>
+                <li>
+                    <a href="pages/mailbox/mailbox.html">
+                        <i class="fa fa-envelope"></i> <span>Mailbox</span>
+                        <span class="pull-right-container">
+              <small class="label pull-right bg-yellow">12</small>
+              <small class="label pull-right bg-green">16</small>
+              <small class="label pull-right bg-red">5</small>
+            </span>
+                    </a>
+                </li>
+                <li class="treeview">
+                    <a href="#">
+                        <i class="fa fa-folder"></i> <span>Examples</span>
+                        <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li><a href="pages/examples/invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li>
+                        <li><a href="pages/examples/profile.html"><i class="fa fa-circle-o"></i> Profile</a></li>
+                        <li><a href="pages/examples/login.html"><i class="fa fa-circle-o"></i> Login</a></li>
+                        <li><a href="pages/examples/register.html"><i class="fa fa-circle-o"></i> Register</a></li>
+                        <li><a href="pages/examples/lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li>
+                        <li><a href="pages/examples/404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li>
+                        <li><a href="pages/examples/500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li>
+                        <li><a href="pages/examples/blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li>
+                        <li><a href="pages/examples/pace.html"><i class="fa fa-circle-o"></i> Pace Page</a></li>
+                    </ul>
+                </li>
+                <li class="treeview">
+                    <a href="#">
+                        <i class="fa fa-share"></i> <span>Multilevel</span>
+                        <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li><a href="#"><i class="fa fa-circle-o"></i> Level One</a></li>
+                        <li class="treeview">
+                            <a href="#"><i class="fa fa-circle-o"></i> Level One
+                                <span class="pull-right-container">
+                  <i class="fa fa-angle-left pull-right"></i>
+                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li><a href="#"><i class="fa fa-circle-o"></i> Level Two</a></li>
+                                <li class="treeview">
+                                    <a href="#"><i class="fa fa-circle-o"></i> Level Two
+                                        <span class="pull-right-container">
+                      <i class="fa fa-angle-left pull-right"></i>
+                    </span>
+                                    </a>
+                                    <ul class="treeview-menu">
+                                        <li><a href="#"><i class="fa fa-circle-o"></i> Level Three</a></li>
+                                        <li><a href="#"><i class="fa fa-circle-o"></i> Level Three</a></li>
+                                    </ul>
+                                </li>
+                            </ul>
+                        </li>
+                        <li><a href="#"><i class="fa fa-circle-o"></i> Level One</a></li>
+                    </ul>
+                </li>
+                <li><a href="https://adminlte.io/docs"><i class="fa fa-book"></i> <span>Documentation</span></a></li>
+                <li class="header">LABELS</li>
+                <li><a href="#"><i class="fa fa-circle-o text-red"></i> <span>Important</span></a></li>
+                <li><a href="#"><i class="fa fa-circle-o text-yellow"></i> <span>Warning</span></a></li>
+                <li><a href="#"><i class="fa fa-circle-o text-aqua"></i> <span>Information</span></a></li>
+            </ul>
 
             <ul class="sidebar-menu">
 
@@ -681,6 +852,7 @@ margin-bottom: 10%;"/>
                 </li>
             </ul>
 
+
         </section>
         <!-- /.sidebar -->
     </aside>
diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
index ff1052bdf..6ef6c9323 100644
--- a/src/main/ui/managev2.html
+++ b/src/main/ui/managev2.html
@@ -197,7 +197,7 @@ margin-bottom: 10%;"/>
         <nav style="margin-left: 0px" class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
 
             <!-- Logo -->
-            <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="!currentUser.org">
+            <a ui-sref="home" ng-click="headerCopyDisplay()" class="logo logo-yedian shine" ng-if="!currentUser.org">
                 <!-- mini logo for sidebar mini 50x50 pixels -->
                 <span class="logo-mini"><img src="static/images/r_white_logo.svg"
                                              style="max-height: 35px;margin-left: 15%;"></span>
@@ -208,7 +208,7 @@ margin-bottom: 10%;"/>
 
             </span>
             </a>
-            <a href="#" onclick="location.reload()" class="logo logo-yedian shine" ng-if="currentUser.org">
+            <a ui-sref="home" ng-click="headerCopyDisplay()" class="logo logo-yedian shine" ng-if="currentUser.org">
                 <!-- mini logo for sidebar mini 50x50 pixels -->
                 <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
                                              style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
@@ -317,114 +317,6 @@ margin-bottom: 10%;"/>
         </nav>
     </header>
     <div class="content-wrapper autoheight" style="margin-left: 0;" ui-view autoscroll="false" >
-        <div class="backgroud">
-            <div class="total_logo">
-                <a><img src="/static/images/manage_total_logo.png"> </a>
-                <div class="easypay">
-                    <b>Easy Business，Easy Payment!</b>
-                </div>
-
-            </div>
-
-            <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;min-height:626px;flex-wrap:wrap">
-                <div class="box-items" ng-if="'100'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'bduser'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_1.png">
-                        </div>
-                        <p class="box-font">销售中心</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'1000000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'riskmanager'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_2.png">
-                        </div>
-                        <p class="box-font">风控中心</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'10'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'compliance'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_3.png">
-                        </div>
-                        <p class="box-font">合规中心</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'1000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'accountant'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_4.png">
-                        </div>
-                        <p class="box-font">财务中心</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'10000000000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'salesmanager'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_5.png">
-                        </div>
-                        <p class="box-font">销管中心</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'10000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'sitemanager'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_6.png">
-                        </div>
-                        <p class="box-font">营销中心</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'1000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'director'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_7.png">
-                        </div>
-                        <p class="box-font">领导决策</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'1'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'administrator'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_8.png">
-                        </div>
-                        <p class="box-font">系统配置</p>
-                    </a>
-                </div>
-
-                <div class="box-items" ng-if="'100000000'|withRole">
-                    <a ng-click="headerShow()" ui-sref="listMenu({role:'developer'})" ui-sref-opts="{reload:true}">
-                        <div class="boxs">
-                            <img src="/static/images/manage/menu_9.png">
-                        </div>
-                        <p class="box-font">开发中心</p>
-                    </a>
-                </div>
-
-                <!--<div class="box-items" ng-if="'1000000'|withRole">-->
-                    <!--<a ng-click="headerShow()" ui-sref="listMenu({role:'datacontent'})" ui-sref-opts="{reload:true}">-->
-                        <!--<div class="boxs">-->
-                            <!--<img src="/static/images/manage/menu_10.png">-->
-                        <!--</div>-->
-                        <!--<p class="box-font">数据中心</p>-->
-                    <!--</a>-->
-                <!--</div>-->
-            </div>
-
-            <div style="text-align: center">
-                <footer>
-                    <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
-                    reserved.
-                </footer>
-            </div>
-        </div>
     </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/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index f0f1e5e3c..44b2bb179 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -5,9 +5,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
     'use strict';
     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' : '/dashboard');
-*/
+
+        $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/home');
+
         if (!$httpProvider.defaults.headers.get) {
             $httpProvider.defaults.headers.get = {};
         }
@@ -17,18 +17,21 @@ 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 == "#/") {
+            if (window.location.hash == "" || window.location.hash == "#/home") {
                 $scope.headerDisplay = false;
                 $scope.copyright = false;
             }else{
                 $scope.headerDisplay = true;
                 $scope.copyright = true;
             }
-
-
-            $scope.headerShow  = function () {
+            $scope.headerCopyDisplay  = function () {
+                $scope.headerDisplay = false;
+                $scope.copyright = false;
+            };
+            $scope.headerShow  = function (role) {
                 $scope.headerDisplay = true;
                 $scope.copyright = true;
+                sessionStorage.setItem('role',role);
             };
             $http.get('/sysconfig/base').then(function (resp) {
                 $rootScope.sysParams = resp.data;
diff --git a/src/main/ui/static/images/main_menu/admin_shops.png b/src/main/ui/static/images/main_menu/admin_shops.png
new file mode 100644
index 0000000000000000000000000000000000000000..8540a0ffa6b9212958588b9efa9c5dab84e024fd
GIT binary patch
literal 2613
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
XJdyW!!gHIW00000NkvXXu0mjfn^7&X

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/dev_log.png b/src/main/ui/static/images/main_menu/dev_log.png
new file mode 100644
index 0000000000000000000000000000000000000000..362dc26fbc0810bfa483f3ca41747704986876c7
GIT binary patch
literal 2105
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/dev_tools.png b/src/main/ui/static/images/main_menu/dev_tools.png
new file mode 100644
index 0000000000000000000000000000000000000000..b13eeb886fc14cd3efb5ca296fe5ceb056b85fec
GIT binary patch
literal 2332
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
C6=4|w

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/site_cms.png b/src/main/ui/static/images/main_menu/site_cms.png
new file mode 100644
index 0000000000000000000000000000000000000000..6141f58beb151f7a221b9bd5ec6b9077f11c2c49
GIT binary patch
literal 2940
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/site_monelyact.png b/src/main/ui/static/images/main_menu/site_monelyact.png
new file mode 100644
index 0000000000000000000000000000000000000000..71eaec5425caccef770389d5c490d6d7b64f36ca
GIT binary patch
literal 2997
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index 06e83dedd..81c08d874 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -5,62 +5,16 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
         $stateProvider.state('listMenu', {
             url: '/menu?role',
             controller: 'listMenuCtrl',
-            templateUrl: 'main_menu.html'
+            templateUrl: '/static/menu/templates/main_menu.html'
+        }).state('home', {
+            url: '/home',
+            templateUrl: '/static/menu/templates/home.html',
+            controller: 'homeCtrl'
         });
     }]);
     app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal','$location', '$anchorScroll','$stateParams', function ($scope, $http,$filter, $uibModal,$location, $anchorScroll,$stateParams) {
 
-
-        $scope.role = $stateParams["role"];
-        var gotohash = function (role) {
-            switch (role) {
-                case "Compliance" :
-                    $location.hash('partners');
-                    $anchorScroll();
-                    break;
-                case "RiskManager" :
-                    $location.hash('risk');
-                    $anchorScroll();
-                    break;
-                case "AccountManager" :
-                    $location.hash('org');
-                    $anchorScroll();
-                    break;
-                case "Accountant" :
-                    $location.hash('clearing');
-                    $anchorScroll();
-                    break;
-                case "BDUser" :
-                    $location.hash('bd');
-                    $anchorScroll();
-                    break;
-                case "Service" :
-                    $location.hash('art');
-                    $anchorScroll();
-                    break;
-                case "Administrator" :
-                    $location.hash('setting');
-                    $anchorScroll();
-                    break;
-                case "SiteManager" :
-                    $location.hash('cms');
-                    $anchorScroll();
-                    break;
-                case "Developer" :
-                    $location.hash('develop');
-                    $anchorScroll();
-                    break;
-                case "Director" :
-                    $location.hash('staff');
-                    $anchorScroll();
-                    break;
-                default:
-                    break;
-            }
-
-        };
-
-        gotohash($stateParams["role"]);
+        $scope.role = sessionStorage.getItem('role');
 
         $scope.editRateConfig = function () {
             $uibModal.open({
@@ -146,5 +100,9 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
             })
         };
     }]);
+    app.controller('homeCtrl', ['$scope', '$http', function ($scope, $http) {
+
+    }]);
+
     return app;
 });
diff --git a/src/main/ui/static/menu/templates/home.html b/src/main/ui/static/menu/templates/home.html
new file mode 100644
index 000000000..8b0598370
--- /dev/null
+++ b/src/main/ui/static/menu/templates/home.html
@@ -0,0 +1,169 @@
+<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;
+        color: #FFFFFF;
+        letter-spacing: 0px;
+        padding-bottom: 2.3%;
+    }
+
+    .easypay {
+        font-family: PingFang-SC-Regular;
+        font-size: 20px;
+        color: #FFFFFF;
+        letter-spacing: 0px;
+        padding-top: 1%;
+        padding-bottom: 1%;
+    }
+</style>
+    <div class="backgroud">
+    <div class="total_logo">
+        <a><img src="/static/images/manage_total_logo.png"> </a>
+        <div class="easypay">
+            <b>Easy Business，Easy Payment!</b>
+        </div>
+
+    </div>
+
+    <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;min-height:626px;flex-wrap:wrap">
+        <div class="box-items" ng-if="'100'|withRole">
+            <a ng-click="headerShow('bduser')" ui-sref="listMenu({role:'bduser'})" ui-sref-opts="{reload:true}">
+                <div class="boxs">
+                    <img src="/static/images/manage/menu_1.png">
+                </div>
+                <p class="box-font">销售中心</p>
+            </a>
+        </div>
+
+        <div class="box-items" ng-if="'1000000000'|withRole">
+            <a ng-click="headerShow('riskmanager')" ui-sref="listMenu({role:'riskmanager'})" ui-sref-opts="{reload:true}">
+                <div class="boxs">
+                    <img src="/static/images/manage/menu_2.png">
+                </div>
+                <p class="box-font">风控中心</p>
+            </a>
+        </div>
+
+        <div class="box-items" ng-if="'10'|withRole">
+            <a ng-click="headerShow('compliance')" ui-sref="listMenu({role:'compliance'})" ui-sref-opts="{reload:true}">
+                <div class="boxs">
+                    <img src="/static/images/manage/menu_3.png">
+                </div>
+                <p class="box-font">合规中心</p>
+            </a>
+        </div>
+
+        <div class="box-items" ng-if="'1000'|withRole">
+            <a ng-click="headerShow('accountant')" ui-sref="listMenu({role:'accountant'})" ui-sref-opts="{reload:true}">
+                <div class="boxs">
+                    <img src="/static/images/manage/menu_4.png">
+                </div>
+                <p class="box-font">财务中心</p>
+            </a>
+        </div>
+
+        <div class="box-items" ng-if="'10000000000000'|withRole">
+            <a ng-click="headerShow('salesmanager')" ui-sref="listMenu({role:'salesmanager'})" ui-sref-opts="{reload:true}">
+                <div class="boxs">
+                    <img src="/static/images/manage/menu_5.png">
+                </div>
+                <p class="box-font">销管中心</p>
+            </a>
+        </div>
+
+        <div class="box-items" ng-if="'10000000'|withRole">
+            <a ng-click="headerShow('sitemanager')" ui-sref="listMenu({role:'sitemanager'})" ui-sref-opts="{reload:true}">
+                <div class="boxs">
+                    <img src="/static/images/manage/menu_6.png">
+                </div>
+                <p class="box-font">营销中心</p>
+            </a>
+        </div>
+
+        <div class="box-items" ng-if="'1000000'|withRole">
+            <a ng-click="headerShow('director')" ui-sref="listMenu({role:'director'})" ui-sref-opts="{reload:true}">
+                <div class="boxs">
+                    <img src="/static/images/manage/menu_7.png">
+                </div>
+                <p class="box-font">领导决策</p>
+            </a>
+        </div>
+
+        <div class="box-items" ng-if="'1'|withRole">
+            <a ng-click="headerShow('administrator')" ui-sref="listMenu({role:'administrator'})" ui-sref-opts="{reload:true}">
+                <div class="boxs">
+                    <img src="/static/images/manage/menu_8.png">
+                </div>
+                <p class="box-font">系统配置</p>
+            </a>
+        </div>
+
+        <div class="box-items" ng-if="'100000000'|withRole">
+            <a ng-click="headerShow('developer')" ui-sref="listMenu({role:'developer'})" ui-sref-opts="{reload:true}">
+                <div class="boxs">
+                    <img src="/static/images/manage/menu_9.png">
+                </div>
+                <p class="box-font">开发中心</p>
+            </a>
+        </div>
+
+        <!--<div class="box-items" ng-if="'1000000'|withRole">-->
+        <!--<a ng-click="headerShow()" ui-sref="listMenu({role:'datacontent'})" ui-sref-opts="{reload:true}">-->
+        <!--<div class="boxs">-->
+        <!--<img src="/static/images/manage/menu_10.png">-->
+        <!--</div>-->
+        <!--<p class="box-font">数据中心</p>-->
+        <!--</a>-->
+        <!--</div>-->
+    </div>
+
+    <div style="text-align: center">
+        <footer>
+            <strong>Copyright © 2015-2017 <a href="http://www.royalpay.com.au">RoyalPay</a>.</strong> All rights
+            reserved.
+        </footer>
+    </div>
+</div>
diff --git a/src/main/ui/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
similarity index 98%
rename from src/main/ui/main_menu.html
rename to src/main/ui/static/menu/templates/main_menu.html
index d5c210a04..39d334eba 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -5,7 +5,7 @@
     }
 </style>
 <div class="content-wrapper autoheight" style="margin-left: 0px">
-    <div class="content" style="background-color: #FFF">
+    <div class="content" style="background-color: #FFF;min-height: 900px">
 <!--
         <div class="list-group">
             <div class="row" ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
@@ -242,7 +242,7 @@
           </div>
           <div class="row">
               <div class="col-sm-2 col-xs-6">
-                  <a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
+                  <a ui-sref="businessCompliance" ui-sref-opts="{reload:true}">
                   <div class="description-block">
                       <img src="/static/images/main_menu/compliance_merchant.png"/>
                       <div class="description-text">
@@ -481,7 +481,7 @@
                 <div ng-if="'monDelay'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/activity_kangaroo.png"/>
+                            <img src="/static/images/main_menu/site_monelyact.png"/>
                             <div class="description-text">
                                 <span class="description-text">余额增值活动</span>
                             </div>
@@ -584,7 +584,7 @@
                 <div ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)" class="col-sm-2 col-xs-6">
                     <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
                     <div class="description-block">
-                        <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                        <img src="/static/images/main_menu/site_cms.png"/>
                         <div class="description-text">
                             <span class="description-text">积分商城</span>
                         </div>
@@ -758,7 +758,7 @@
                 <div ng-if="'manager_accounts'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="product" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/org_account_management.png"/>
+                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
                             <div class="description-text">
                                 <span class="description-text">商品库管理</span>
                             </div>
@@ -854,7 +854,7 @@
                 <div ng-if="'dev'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="devtools" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                            <img src="/static/images/main_menu/dev_tools.png"/>
                             <div class="description-text">
                                 <span class="description-text">开发工具</span>
                             </div>
@@ -863,7 +863,7 @@
                 <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="logview" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                            <img src="/static/images/main_menu/dev_log.png"/>
                             <div class="description-text">
                                 <span class="description-text">系统日志</span>
                             </div>

From e19685ad99081bfc9db44b3fabf7d29ddf8fd61e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 23 Oct 2018 14:38:38 +0800
Subject: [PATCH 35/82] fix  v2-manager.html perimission

---
 .../core/impls/ClientManagerImpl.java         |   2 +-
 src/main/ui/manage.html                       | 176 +-----------------
 src/main/ui/managev2.html                     |  15 +-
 .../static/config/logview/templates/root.html |   8 +-
 .../config/organizations/templates/orgs.html  |   2 +-
 .../templates/permission_config.html          |   2 +-
 src/main/ui/static/menu/templates/home.html   |   2 +-
 .../ui/static/menu/templates/main_menu.html   |  52 +++---
 .../static/payment/partner/partner-manage.js  |  13 +-
 9 files changed, 57 insertions(+), 215 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 120dc8340..08e66c96c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -387,7 +387,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                     client.put("contact_email", "******");
                 }
             } else {
-                client.put("rate_editable", ManagerRole.ADMIN.hasRole(role) || ManagerRole.OPERATOR.hasRole(role));
+                client.put("rate_editable",ManagerRole.OPERATOR.hasRole(role));
             }
         }
         List<JSONObject> children = clientMapper.listChildClients(client.getIntValue("client_id"));
diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 3078d41ac..957904ca6 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -274,178 +274,6 @@ margin-bottom: 10%;"/>
     <aside class="main-sidebar" style="height: 100%;max-height: 100%;overflow: auto;padding-bottom: 50px;">
         <!--sidebar: style can be found in sidebar.less -->
         <section class="sidebar">
-            <ul class="sidebar-menu" data-widget="tree">
-                <li class="header">MAIN NAVIGATION</li>
-                <li class="active treeview">
-                    <a href="#">
-                        <i class="fa fa-dashboard"></i> <span>Dashboard</span>
-                        <span class="pull-right-container">
-              <i class="fa fa-angle-left pull-right"></i>
-            </span>
-                    </a>
-                    <ul class="treeview-menu">
-                        <li class="active"><a href="index.html"><i class="fa fa-circle-o"></i> Dashboard v1</a></li>
-                        <li><a href="index2.html"><i class="fa fa-circle-o"></i> Dashboard v2</a></li>
-                    </ul>
-                </li>
-                <li class="treeview">
-                    <a href="#">
-                        <i class="fa fa-files-o"></i>
-                        <span>Layout Options</span>
-                        <span class="pull-right-container">
-              <span class="label label-primary pull-right">4</span>
-            </span>
-                    </a>
-                    <ul class="treeview-menu">
-                        <li><a href="pages/layout/top-nav.html"><i class="fa fa-circle-o"></i> Top Navigation</a></li>
-                        <li><a href="pages/layout/boxed.html"><i class="fa fa-circle-o"></i> Boxed</a></li>
-                        <li><a href="pages/layout/fixed.html"><i class="fa fa-circle-o"></i> Fixed</a></li>
-                        <li><a href="pages/layout/collapsed-sidebar.html"><i class="fa fa-circle-o"></i> Collapsed Sidebar</a></li>
-                    </ul>
-                </li>
-                <li>
-                    <a href="pages/widgets.html">
-                        <i class="fa fa-th"></i> <span>Widgets</span>
-                        <span class="pull-right-container">
-              <small class="label pull-right bg-green">new</small>
-            </span>
-                    </a>
-                </li>
-                <li class="treeview">
-                    <a href="#">
-                        <i class="fa fa-pie-chart"></i>
-                        <span>Charts</span>
-                        <span class="pull-right-container">
-              <i class="fa fa-angle-left pull-right"></i>
-            </span>
-                    </a>
-                    <ul class="treeview-menu">
-                        <li><a href="pages/charts/chartjs.html"><i class="fa fa-circle-o"></i> ChartJS</a></li>
-                        <li><a href="pages/charts/morris.html"><i class="fa fa-circle-o"></i> Morris</a></li>
-                        <li><a href="pages/charts/flot.html"><i class="fa fa-circle-o"></i> Flot</a></li>
-                        <li><a href="pages/charts/inline.html"><i class="fa fa-circle-o"></i> Inline charts</a></li>
-                    </ul>
-                </li>
-                <li class="treeview">
-                    <a href="#">
-                        <i class="fa fa-laptop"></i>
-                        <span>UI Elements</span>
-                        <span class="pull-right-container">
-              <i class="fa fa-angle-left pull-right"></i>
-            </span>
-                    </a>
-                    <ul class="treeview-menu">
-                        <li><a href="pages/UI/general.html"><i class="fa fa-circle-o"></i> General</a></li>
-                        <li><a href="pages/UI/icons.html"><i class="fa fa-circle-o"></i> Icons</a></li>
-                        <li><a href="pages/UI/buttons.html"><i class="fa fa-circle-o"></i> Buttons</a></li>
-                        <li><a href="pages/UI/sliders.html"><i class="fa fa-circle-o"></i> Sliders</a></li>
-                        <li><a href="pages/UI/timeline.html"><i class="fa fa-circle-o"></i> Timeline</a></li>
-                        <li><a href="pages/UI/modals.html"><i class="fa fa-circle-o"></i> Modals</a></li>
-                    </ul>
-                </li>
-                <li class="treeview">
-                    <a href="#">
-                        <i class="fa fa-edit"></i> <span>Forms</span>
-                        <span class="pull-right-container">
-              <i class="fa fa-angle-left pull-right"></i>
-            </span>
-                    </a>
-                    <ul class="treeview-menu">
-                        <li><a href="pages/forms/general.html"><i class="fa fa-circle-o"></i> General Elements</a></li>
-                        <li><a href="pages/forms/advanced.html"><i class="fa fa-circle-o"></i> Advanced Elements</a></li>
-                        <li><a href="pages/forms/editors.html"><i class="fa fa-circle-o"></i> Editors</a></li>
-                    </ul>
-                </li>
-                <li class="treeview">
-                    <a href="#">
-                        <i class="fa fa-table"></i> <span>Tables</span>
-                        <span class="pull-right-container">
-              <i class="fa fa-angle-left pull-right"></i>
-            </span>
-                    </a>
-                    <ul class="treeview-menu">
-                        <li><a href="pages/tables/simple.html"><i class="fa fa-circle-o"></i> Simple tables</a></li>
-                        <li><a href="pages/tables/data.html"><i class="fa fa-circle-o"></i> Data tables</a></li>
-                    </ul>
-                </li>
-                <li>
-                    <a href="pages/calendar.html">
-                        <i class="fa fa-calendar"></i> <span>Calendar</span>
-                        <span class="pull-right-container">
-              <small class="label pull-right bg-red">3</small>
-              <small class="label pull-right bg-blue">17</small>
-            </span>
-                    </a>
-                </li>
-                <li>
-                    <a href="pages/mailbox/mailbox.html">
-                        <i class="fa fa-envelope"></i> <span>Mailbox</span>
-                        <span class="pull-right-container">
-              <small class="label pull-right bg-yellow">12</small>
-              <small class="label pull-right bg-green">16</small>
-              <small class="label pull-right bg-red">5</small>
-            </span>
-                    </a>
-                </li>
-                <li class="treeview">
-                    <a href="#">
-                        <i class="fa fa-folder"></i> <span>Examples</span>
-                        <span class="pull-right-container">
-              <i class="fa fa-angle-left pull-right"></i>
-            </span>
-                    </a>
-                    <ul class="treeview-menu">
-                        <li><a href="pages/examples/invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li>
-                        <li><a href="pages/examples/profile.html"><i class="fa fa-circle-o"></i> Profile</a></li>
-                        <li><a href="pages/examples/login.html"><i class="fa fa-circle-o"></i> Login</a></li>
-                        <li><a href="pages/examples/register.html"><i class="fa fa-circle-o"></i> Register</a></li>
-                        <li><a href="pages/examples/lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li>
-                        <li><a href="pages/examples/404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li>
-                        <li><a href="pages/examples/500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li>
-                        <li><a href="pages/examples/blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li>
-                        <li><a href="pages/examples/pace.html"><i class="fa fa-circle-o"></i> Pace Page</a></li>
-                    </ul>
-                </li>
-                <li class="treeview">
-                    <a href="#">
-                        <i class="fa fa-share"></i> <span>Multilevel</span>
-                        <span class="pull-right-container">
-              <i class="fa fa-angle-left pull-right"></i>
-            </span>
-                    </a>
-                    <ul class="treeview-menu">
-                        <li><a href="#"><i class="fa fa-circle-o"></i> Level One</a></li>
-                        <li class="treeview">
-                            <a href="#"><i class="fa fa-circle-o"></i> Level One
-                                <span class="pull-right-container">
-                  <i class="fa fa-angle-left pull-right"></i>
-                </span>
-                            </a>
-                            <ul class="treeview-menu">
-                                <li><a href="#"><i class="fa fa-circle-o"></i> Level Two</a></li>
-                                <li class="treeview">
-                                    <a href="#"><i class="fa fa-circle-o"></i> Level Two
-                                        <span class="pull-right-container">
-                      <i class="fa fa-angle-left pull-right"></i>
-                    </span>
-                                    </a>
-                                    <ul class="treeview-menu">
-                                        <li><a href="#"><i class="fa fa-circle-o"></i> Level Three</a></li>
-                                        <li><a href="#"><i class="fa fa-circle-o"></i> Level Three</a></li>
-                                    </ul>
-                                </li>
-                            </ul>
-                        </li>
-                        <li><a href="#"><i class="fa fa-circle-o"></i> Level One</a></li>
-                    </ul>
-                </li>
-                <li><a href="https://adminlte.io/docs"><i class="fa fa-book"></i> <span>Documentation</span></a></li>
-                <li class="header">LABELS</li>
-                <li><a href="#"><i class="fa fa-circle-o text-red"></i> <span>Important</span></a></li>
-                <li><a href="#"><i class="fa fa-circle-o text-yellow"></i> <span>Warning</span></a></li>
-                <li><a href="#"><i class="fa fa-circle-o text-aqua"></i> <span>Information</span></a></li>
-            </ul>
-
             <ul class="sidebar-menu">
 
                 <li ui-sref-active="active" ng-if="'dashboard'|withModule">
@@ -583,7 +411,7 @@ margin-bottom: 10%;"/>
                     </a>
                 </li>
                 <li ui-sref-active="active">
-                    <a ui-sref="clearingLogs.date_setting">
+                    <a ui-sref="date_setting">
                         <i class="fa fa-balance-scale"></i> <span>清算日管理</span>
                     </a>
                 </li>
@@ -851,8 +679,6 @@ margin-bottom: 10%;"/>
                     </a>
                 </li>
             </ul>
-
-
         </section>
         <!-- /.sidebar -->
     </aside>
diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
index 6ef6c9323..b635ded1f 100644
--- a/src/main/ui/managev2.html
+++ b/src/main/ui/managev2.html
@@ -283,11 +283,11 @@ margin-bottom: 10%;"/>
                                            ng-class="{'text-orange':!('1000'|withRole),'text-gray':('1000'|withRole)}"></i>
                                         <i class="fa fa-tty" title="Service"
                                            ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
-                                        <i class="fa fa-university" title="Account Manager"
-                                           ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>
+                                        <!--<i class="fa fa-university" title="Account Manager"-->
+                                        <!--ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>-->
                                         <i class="fa fa-line-chart" title="Director"
                                            ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
-                                        <i class="fa fa-map-o" title="Site Manager"
+                                        <i class="fa fa-map-o" title="Markting"
                                            ng-class="{'text-orange':!('10000000'|withRole),'text-gray':('10000000'|withRole)}"></i>
                                         <i class="fa fa-code" title="Developer"
                                            ng-class="{'text-orange':!('100000000'|withRole),'text-gray':('100000000'|withRole)}"></i>
@@ -295,8 +295,13 @@ margin-bottom: 10%;"/>
                                            ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
                                         <i class="fa fa-tripadvisor" title="GUEST"
                                            ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
-                                        <i class="fa fa-user-plus" title="Org Manager"
-                                           ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
+                                        <!--<i class="fa fa-user-plus" title="Org Manager"-->
+                                        <!--ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>-->
+                                        <i class="fa fa-ticket" title="Sales Manager"
+                                           ng-class="{'text-orange':!('10000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
+                                        <!--<i class="fa fa-save" title="Data content"-->
+                                        <!--ng-class="{'text-orange':!('100000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>-->
+
                                     </small>
                                 </p>
                             </li>
diff --git a/src/main/ui/static/config/logview/templates/root.html b/src/main/ui/static/config/logview/templates/root.html
index de841b8e5..de620c483 100644
--- a/src/main/ui/static/config/logview/templates/root.html
+++ b/src/main/ui/static/config/logview/templates/root.html
@@ -23,10 +23,10 @@
                     <i class="fa fa-weixin"></i>
                     WeChat Messages
                 </a>
-                <a class="btn btn-app" role="button" ui-sref=".config_operation">
-                    <i class="fa fa-edit"></i>
-                   Config Operation
-                </a>
+                <!--<a class="btn btn-app" role="button" ui-sref=".config_operation">-->
+                    <!--<i class="fa fa-edit"></i>-->
+                   <!--Config Operation-->
+                <!--</a>-->
             </div>
         </div>
     </section>
diff --git a/src/main/ui/static/config/organizations/templates/orgs.html b/src/main/ui/static/config/organizations/templates/orgs.html
index 02662ec4e..9bf9d5a08 100644
--- a/src/main/ui/static/config/organizations/templates/orgs.html
+++ b/src/main/ui/static/config/organizations/templates/orgs.html
@@ -114,7 +114,7 @@
                                     </div>
                                 </div>
                                 <div class="col-xs-4 col-sm-6" style="text-align: right">
-                                    <a role="button" class="btn btn-success" type="button" ui-sref=".new"><i
+                                    <a role="button" class="btn btn-success" type="button" ui-sref="newOrganizations"><i
                                             class="fa fa-plus"></i>
                                         Add Organization</a>
                                 </div>
diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
index 274afa648..057ac1568 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
@@ -59,7 +59,7 @@
                         <i class="fa fa-code"></i>
                         Developer
                     </a>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('1000000000')">
+                    <a class="btn btn-app" role="button" ng-click="authorizeRole('10000000000')">
                         <i class="fa fa-user"></i>
                         Risk Manager
                     </a>
diff --git a/src/main/ui/static/menu/templates/home.html b/src/main/ui/static/menu/templates/home.html
index 8b0598370..3e998489a 100644
--- a/src/main/ui/static/menu/templates/home.html
+++ b/src/main/ui/static/menu/templates/home.html
@@ -78,7 +78,7 @@
             </a>
         </div>
 
-        <div class="box-items" ng-if="'1000000000'|withRole">
+        <div class="box-items" ng-if="'10000000000'|withRole">
             <a ng-click="headerShow('riskmanager')" ui-sref="listMenu({role:'riskmanager'})" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_2.png">
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 39d334eba..326518c69 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -29,7 +29,7 @@
             </div>
         </div>
 -->
-        <div class="list-group" ng-if="role!='administrator' && role!='developer' && roll!='sitemanager'">
+        <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">
                     <div class="description-block">
@@ -48,7 +48,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="'11111'|withRole" class="col-sm-2 col-xs-6">
+                <div ng-if="'110'|withRole" class="col-sm-2 col-xs-6">
                     <a ui-sref="newPartners" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_apply.png"/>
@@ -88,7 +88,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('merchantAmount'|withModule) &&('1'|withRole)" class="col-sm-2 col-xs-6">
+                <div ng-if="('merchantAmount'|withModule)" class="col-sm-2 col-xs-6">
                     <a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_turnover.png"/>
@@ -100,7 +100,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group" ng-if="role!='administrator' && role!='developer' && roll!='sitemanager'">
+        <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="transaction">
                     <div class="description-block">
@@ -119,7 +119,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('10000000000'|withRole)" class="col-sm-2 col-xs-6">
+                <div ng-if="('1010'|withRole)" class="col-sm-2 col-xs-6">
                     <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_refund.png"/>
@@ -129,7 +129,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                <div ng-if="('100000000'|withRole)" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_arrears.png"/>
@@ -162,7 +162,7 @@
             </div>
         </div>
         <div class="list-group" ng-if="role=='riskmanager'">
-            <div class="row" ng-if="('clientrate'|withModule)||('monitor'|withModule) || ('customerRankingAnalysisApp'|withModule)">
+            <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="risk">
                     <div class="description-block">
                         <label>风控管理</label>
@@ -170,7 +170,7 @@
                 </div>
             </div>
             <div class="row">
-                <div ng-if="('monitor'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
+                <div class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/risk_monitor.png"/>
@@ -180,7 +180,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                <div class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.cheat" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/risk_early_warning.png"/>
@@ -190,7 +190,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                <div class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.cheat_monitor" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/risk_configure.png"/>
@@ -200,7 +200,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('RiskManagement'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                <div class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.risk_manager" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/risk_log.png"/>
@@ -210,7 +210,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('RiskManagement'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                <div class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.attention" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                             <img src="/static/images/main_menu/risk_blacklist.png"/>
@@ -220,7 +220,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="'customerRankingAnalysisApp'|withModule" class="col-sm-2 col-xs-6">
+                <div class="col-sm-2 col-xs-6">
                     <a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                             <img src="/static/images/main_menu/risk_consumption_ranking.png"/>
@@ -373,13 +373,13 @@
             <div class="row" ng-if="('1000'|withRole)|| ('bdsale'|withModule) || ('bdprize'|withModule)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="bd">
                     <div class="description-block">
-                        <label>BD绩效管理</label>
+                        <label>绩效管理</label>
                     </div>
                 </div>
             </div>
             <div class="row">
                 <div ng-if="'bdsale'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="bdanalysis" ui-sref-opts="{reload:true}">
+                    <a ui-sref="analysis_bd.bdanalysis" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/bd_sales_volume.png"/>
                             <div class="description-text">
@@ -389,7 +389,7 @@
                     </a>
                 </div>
                 <div ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="bd_prizes" ui-sref-opts="{reload:true}">
+                    <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/bd_commission.png"/>
                             <div class="description-text">
@@ -398,7 +398,7 @@
                         </div>
                     </a>
                 </div>
-                <div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
+                <div ng-if="'10000000001000'|withRole" class="col-sm-2 col-xs-6">
                     <a ng-click="editRateConfig()" style="cursor: pointer">
                     <div class="description-block">
                         <img src="/static/images/main_menu/bd_performance_setting.png"/>
@@ -408,7 +408,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
+                <div ng-if="'10000000001000'|withRole" class="col-sm-2 col-xs-6">
                     <a ng-click="editBDLevels()" style="cursor: pointer">
                     <div class="description-block">
                         <img src="/static/images/main_menu/bd_level_setting.png"/>
@@ -418,7 +418,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="'dev'|withModule" class="col-sm-2 col-xs-6">
+                <div ng-if="'clientrate'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/bd_merchant_activity.png"/>
@@ -612,7 +612,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
+                <div ng-if="'invoice'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="invoice" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/finance_merchant_invoice.png"/>
@@ -651,7 +651,7 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="('orgcommission'|withModule)" class="col-sm-2 col-xs-6">
+                <div class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_org.commission" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/finance_partner_contribution.png"/>
@@ -681,8 +681,8 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="'clearing'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="clearingLogs.date_setting" ui-sref-opts="{reload:true}">
+                <div ng-if="'clearing'|withModule && role!='director'" class="col-sm-2 col-xs-6">
+                    <a ui-sref="date_setting" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/settle_day.png"/>
                             <div class="description-text">
@@ -726,7 +726,7 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="'platformRevenue'|withModule" class="col-sm-2 col-xs-6">
+                <div ng-if="'platformRevenue'|withModule && role!='director'" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/settle_verification.png"/>
@@ -773,7 +773,7 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
+                <div ng-if="'manager_accounts'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="servantsConfig" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/to_be_treated_2.png"/>
@@ -803,7 +803,7 @@
                 </div>
             </div>
             <div class="row">
-                <div ng-if="('10'|withRole)&&('merchantIdManage'|withModule)" class="col-sm-2 col-xs-6">
+                <div class="col-sm-2 col-xs-6">
                     <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/configure_merchant_number.png"/>
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 922eeafdb..269e64bca 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -352,7 +352,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
             };
         }]);
-    app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone) {
+    app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone','businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) {
         if ($scope.partner_application) {
             $scope.partner = angular.copy($scope.partner_application);
             delete $rootScope.partner_application;
@@ -362,6 +362,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.partner.company_phone_c = 61;
         $scope.partner.contact_phone_c = 61;
 
+
+        $scope.pagination = {};
+        $scope.industries = industryMap.configs();
+        $scope.states = stateMap.configs();
+        $scope.countries = countryMap.configs();
+        $scope.sectors = sectorMap.configs();
+        $scope.business_structures = businessStructuresMap.configs();
+        $scope.clean_days = angular.copy(clean_days_map);
+        $scope.bd_citys = angular.copy(bd_city_map);
+        $scope.params = {textType: 'all', org_name: 'ALL'};
+
         function remove(arr, val) {
             if (angular.isArray(arr)) {
                 for (var i = arr.length; i--;) {

From 7fc914f6ce953791e40e803e3955d094714ec01c Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Tue, 23 Oct 2018 17:08:14 +0800
Subject: [PATCH 36/82] fix

---
 src/main/ui/manage.html                       | 789 ++++++++++--------
 src/main/ui/static/css/common.css             |  16 +-
 .../ui/static/lib/dist/js/adminlte.min.js     |  14 +
 3 files changed, 474 insertions(+), 345 deletions(-)
 create mode 100644 src/main/ui/static/lib/dist/js/adminlte.min.js

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 957904ca6..17dab0a5a 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -274,7 +274,8 @@ margin-bottom: 10%;"/>
     <aside class="main-sidebar" style="height: 100%;max-height: 100%;overflow: auto;padding-bottom: 50px;">
         <!--sidebar: style can be found in sidebar.less -->
         <section class="sidebar">
-            <ul class="sidebar-menu">
+
+            <ul class="sidebar-menu" data-widget="tree">
 
                 <li ui-sref-active="active" ng-if="'dashboard'|withModule">
                     <a ui-sref="dashboard">
@@ -283,230 +284,287 @@ margin-bottom: 10%;"/>
                     </a>
                 </li>
 
-                <li class="header nav-header" ng-if="'1011110'|withRole">商户管理|Partner Manage</li>
-                <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>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'partners'|withModule">
-                    <a ui-sref="newPartners" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-plus"></i> <span>商户进件|New Partner</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'partners'|withModule">
-                    <a ui-sref="partners_analysis" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-list-alt"></i> <span>商户统计|Merchants Data</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'partners'|withModule">
-                    <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-shopping-cart"></i> <span>商户活跃度(原统计)</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'partners'|withModule">
-                    <a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-area-chart"></i> <span>商户交易额统计（原统计）</span>
-                    </a>
-                </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">
+                            <a ui-sref="partners" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-sitemap"></i> <span>商户名录|Partner Directories</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'partners'|withModule">
+                            <a ui-sref="newPartners" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-plus"></i> <span>商户进件|New Partner</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'partners'|withModule">
+                            <a ui-sref="partners_analysis" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-list-alt"></i> <span>商户统计|Merchants Data</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'partners'|withModule">
+                            <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-shopping-cart"></i> <span>商户活跃度(原统计)</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'partners'|withModule">
+                            <a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-area-chart"></i> <span>商户交易额统计（原统计）</span>
+                            </a>
+                        </li>
+                    </ul>
+                </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">
+                            <a ui-sref="trade" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                            <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-wrench"></i> <span>退款审核|Audit Refund</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                            <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-tv"></i> <span>欠款|Pre Refund</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                            <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-area-chart"></i> <span>原统计</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                            <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-server"></i> <span>支付回调消息|Notify History</span>
+                            </a>
+                        </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-tv"></i>
+                        <span>风控管理|Risk Management</span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                            <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-tv"></i> <span>交易成功率监控</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                            <a ui-sref="analysis_monitoring.cheat" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-bell"></i> <span>风控点预警统计</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                            <a ui-sref="analysis_monitoring.cheat_monitor" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-building"></i> <span>风控点配置|Cheat Monitor</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                            <a ui-sref="analysis_monitoring.risk_manager" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-list-alt"></i> <span>风控记录|Risk Records</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                            <a ui-sref="analysis_monitoring.attention" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-exclamation-triangle"></i> <span>黑名单|Risky Merchants</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                            <a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
+                                <i class="fa fa fa-male"></i> <span>消费排名|Risky Merchants</span>
+                            </a>
+                        </li>
+                    </ul>
+                </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 fa-eye"></i>
+                        <span>合规管理|Compliance Management</span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li ui-sref-active="active" ng-if="('partners'|withModule)&&('10'|withRole)">
+                            <a ui-sref="businessCompliance" ui-sref-opts="{reload:true}">
+                                <i class="fa fa fa-eye"></i> <span>商户合规</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('10'|withRole)">
+                            <a ui-sref="contract">
+                                <i class="fa fa-money"></i> <span>合同签约情况</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('10'|withRole)">
+                            <a ui-sref="rate_warnings">
+                                <i class="fa fa-bell"></i> <span>签约到期预警</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active"
+                            ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                            <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active"
+                            ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                            <a ui-sref="config_operation" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-edit"></i> <span>商户信息修改日志</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active"
+                            ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                            <a ui-sref="devtools.aliforexcel" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-envelope"></i> <span>Alipay进件表格导出</span>
+                            </a>
+                        </li>
+                    </ul>
+                </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-balance-scale"></i>
+                        <span>清算管理|Settlement Management</span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <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>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active">
+                            <a ui-sref="clearingLogs.date_setting">
+                                <i class="fa fa-balance-scale"></i> <span>清算日管理</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                            <a ui-sref="clearingLogs" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-line-chart"></i> <span>清算统计|Settlement Logs</span>
+                            </a>
+                        </li>
+
+                        <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                            <a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}">
+                                <i class="fa fa fa-money"></i> <span>清算预估|Estimate</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                            <a ui-sref="analysis_report.settle_report" ui-sref-opts="{reload:true}">
+                                <i class="fa fa fa-tv"></i> <span>清算月报</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                            <a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
+                                <i class="fa fa fa-money"></i> <span>清算验证|Validation</span>
+                            </a>
+                        </li>
+                    </ul>
+                </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-file-excel-o"></i>
+                        <span>财务管理|Financial Management</span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <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>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                            <a ui-sref="invoice" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-users"></i> <span>Partner Invoice</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                            <a ui-sref="analysis_report.platformrevenue" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-money"></i> <span>平台收支统计|Platform Revenue</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                            <a ui-sref="analysis_report.wx_settlements" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-money"></i> <span>腾讯打款记录|Tencent Settlement</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                            <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-usd"></i> <span>BD提成|BD Commissions</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                            <a ui-sref="analysis_org.commission" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-users"></i> <span>合伙人提成</span>
+                            </a>
+                        </li>
+                    </ul>
+                </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-text-o"></i>
+                        <span>营销活动管理|Promotion</span>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li ui-sref-active="active" ng-if="'appAct'|withModule">
+                            <a ui-sref="appAct">
+                                <i class="fa fa-file-text-o"></i> <span>APP弹屏管理</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('encourage'|withModule)">
+                            <a ui-sref="encourageAct">
+                                <i class="fa fa-gift"></i> <span>鼓励金</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
+                            <a ui-sref="cashbackAnalysis">
+                                <i class="fa fa-gift"></i> <span>商户营销账户</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'settleDelay'|withModule">
+                            <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-users"></i> <span>周末费率减半活动</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'monDelay'|withModule">
+                            <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-users"></i> <span>余额增值活动</span>
+                            </a>
+                        </li>
+
+                        <li ui-sref-active="active" ng-if="'actChairty'|withModule">
+                            <a ui-sref="act_chairty" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-users"></i> <span>半边天公益活动</span>
+                            </a>
+                        </li>
+                    </ul>
+                </li>
+                <!--<li class="header nav-header" ng-if="'1011110'|withRole">营销活动管理|Promotion</li>-->
 
-                <li class="header nav-header" ng-if="'1011110'|withRole">交易管理|Transaction</li>
-                <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>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
-                    <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-wrench"></i> <span>退款审核|Audit Refund</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
-                    <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-tv"></i> <span>欠款|Pre Refund</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
-                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-area-chart"></i> <span>原统计</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
-                    <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-server"></i> <span>支付回调消息|Notify History</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="'1011110'|withRole">风控管理|Risk Management</li>
-                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
-                    <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-tv"></i> <span>交易成功率监控</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
-                    <a ui-sref="analysis_monitoring.cheat" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-bell"></i> <span>风控点预警统计</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
-                    <a ui-sref="analysis_monitoring.cheat_monitor" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-building"></i> <span>风控点配置|Cheat Monitor</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
-                    <a ui-sref="analysis_monitoring.risk_manager" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-list-alt"></i> <span>风控记录|Risk Records</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
-                    <a ui-sref="analysis_monitoring.attention" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-exclamation-triangle"></i> <span>黑名单|Risky Merchants</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'tradelog'|withModule">
-                    <a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
-                        <i class="fa fa fa-male"></i> <span>消费排名|Risky Merchants</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="'1011110'|withRole">合规管理|Compliance Management</li>
-                <li ui-sref-active="active" ng-if="('partners'|withModule)&&('10'|withRole)">
-                    <a ui-sref="businessCompliance" ui-sref-opts="{reload:true}">
-                        <i class="fa fa fa-eye"></i> <span>商户合规</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('10'|withRole)">
-                    <a ui-sref="contract">
-                        <i class="fa fa-money"></i> <span>合同签约情况</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('10'|withRole)">
-                    <a ui-sref="rate_warnings">
-                        <i class="fa fa-bell"></i> <span>签约到期预警</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active"
-                    ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active"
-                    ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="config_operation" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-edit"></i> <span>商户信息修改日志</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active"
-                    ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="devtools.aliforexcel" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-envelope"></i> <span>Alipay进件表格导出</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="'1011110'|withRole">清算管理|Settlement Management</li>
-                <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>
-                    </a>
-                </li>
-                <li ui-sref-active="active">
-                    <a ui-sref="date_setting">
-                        <i class="fa fa-balance-scale"></i> <span>清算日管理</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'clearing'|withModule">
-                    <a ui-sref="clearingLogs" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-line-chart"></i> <span>清算统计|Settlement Logs</span>
-                    </a>
-                </li>
-
-                <li ui-sref-active="active" ng-if="'clearing'|withModule">
-                    <a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}">
-                        <i class="fa fa fa-money"></i> <span>清算预估|Estimate</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'clearing'|withModule">
-                    <a ui-sref="analysis_report.settle_report" ui-sref-opts="{reload:true}">
-                        <i class="fa fa fa-tv"></i> <span>清算月报</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'clearing'|withModule">
-                    <a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
-                        <i class="fa fa fa-money"></i> <span>清算验证|Validation</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="'1011110'|withRole">财务管理|Financial Management</li>
-                <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>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'1000'|withRole">
-                    <a ui-sref="invoice" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>Partner Invoice</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'1000'|withRole">
-                    <a ui-sref="analysis_report.platformrevenue" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-money"></i> <span>平台收支统计|Platform Revenue</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'1000'|withRole">
-                    <a ui-sref="analysis_report.wx_settlements" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-money"></i> <span>腾讯打款记录|Tencent Settlement</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'1000'|withRole">
-                    <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-usd"></i> <span>BD提成|BD Commissions</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'1000'|withRole">
-                    <a ui-sref="analysis_org.commission" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>合伙人提成</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="'1011110'|withRole">营销活动管理|Promotion</li>
-                <li ui-sref-active="active" ng-if="'appAct'|withModule">
-                    <a ui-sref="appAct">
-                        <i class="fa fa-file-text-o"></i> <span>APP弹屏管理</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('encourage'|withModule)">
-                    <a ui-sref="encourageAct">
-                        <i class="fa fa-gift"></i> <span>鼓励金</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
-                    <a ui-sref="cashbackAnalysis">
-                        <i class="fa fa-gift"></i> <span>商户营销账户</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'settleDelay'|withModule">
-                    <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>周末费率减半活动</span>
-                    </a>
-                </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">
-                    <a ui-sref="mon_delay" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>余额增值活动</span>
-                    </a>
-                </li>
 
-                <li ui-sref-active="active" ng-if="'actChairty'|withModule">
-                    <a ui-sref="act_chairty" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>半边天公益活动</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}">
@@ -554,131 +612,181 @@ margin-bottom: 10%;"/>
                         <!--<i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>-->
                     <!--</a>-->
                 <!--</li>-->
-                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">内容管理|Content Management</li>
-                <li ui-sref-active="active" ng-if="'notice'|withModule">
-                    <a ui-sref="notice">
-                        <i class="fa fa-bell"></i> <span>通知群发|Notifications</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'cms'|withModule">
-                    <a ui-sref="cms">
-                        <i class="fa fa-file-text-o"></i> <span>网站管理|Site Manage</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)">
-                    <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
-                        <i class="fa fa-file-text-o"></i> <span>积分商城|Integral Mall</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">组织架构|Organization Framework</li>
-                <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>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'org'|withModule">
-                    <a ui-sref="product" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-shopping-cart"></i> <span>商品库管理</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
-                    <a ui-sref="managers" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-key"></i> <span>账号管理|Accounts</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
-                    <a ui-sref="servantsConfig" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-tty"></i> <span>客服管理|Service Accounts</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
-                    <a ui-sref="permission" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-key"></i> <span>角色权限管理</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">绩效管理</li>
-                <li ui-sref-active="active" ng-if="'manager_accounts'|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>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'1000'|withRole">
-                    <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-usd"></i> <span>BD提成|BD Commissions</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'1000'|withRole">
-                    <a ng-click="editRateConfig()" style="cursor: pointer">
-                        <i class="fa fa-cog"></i> <span>BD绩效设置</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'1000'|withRole">
-                    <a ng-click="editBDLevels()" style="cursor: pointer">
-                        <i class="fa fa-user"></i> <span>BD级别设置</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'1000'|withRole">
-                    <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-shopping-cart"></i> <span>商户活跃度</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">合伙人管理</li>
-                <li ui-sref-active="active"
-                    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}">
-                        <i class="fa fa-tv"></i> <span>合伙人申请</span>
-                    </a>
-                </li>
-                <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>合伙人管理</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'org'|withModule">
-                    <a ui-sref="analysis_org.organlasis" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-hand-peace-o"></i> <span>合伙人销售量|City Partner Sale</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">配置管理|Basic Settings</li>
-                <li ui-sref-active="active" ng-if="('10'|withRole)&&('merchantIdManage'|withModule)">
-                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
-                        <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active"
-                    ng-if="('device'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
-                    <a ui-sref="device" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>设备管理|Devices</span>
-                    </a>
-                </li>
-
-                <li ui-sref-active="active" ng-if="'sysconfig'|withModule">
-                    <a ui-sref="sysconfig">
-                        <i class="fa fa-cog"></i> <span>系统参数设定|Settings</span>
-                    </a>
-                </li>
-
-                <li class="header nav-header" ng-if="('1011110'|withRole)|| currentUser.org_id==null">开发工具|Developer</li>
-                <li ui-sref-active="active" ng-if="'dev'|withModule">
-                    <a ui-sref="login_history">
-                        <i class="fa fa-users"></i> <span>登录日志|Sign In History</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'log'|withModule">
-                    <a ui-sref="logview">
-                        <i class="fa fa-file-text-o"></i> <span>系统日志|System Logs</span>
-                    </a>
-                </li>
-                <li ui-sref-active="active" ng-if="'dev'|withModule">
-                    <a ui-sref="devtools">
-                        <i class="fa fa-cog"></i> <span>开发工具|DevTools</span>
-                    </a>
+                <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">
+                            <a ui-sref="notice">
+                                <i class="fa fa-bell"></i> <span>通知群发|Notifications</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'cms'|withModule">
+                            <a ui-sref="cms">
+                                <i class="fa fa-file-text-o"></i> <span>网站管理|Site Manage</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)">
+                            <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
+                                <i class="fa fa-file-text-o"></i> <span>积分商城|Integral Mall</span>
+                            </a>
+                        </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">
+                    <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">
+                            <a ui-sref="organizations" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-users"></i> <span>组织管理|Organizations</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'org'|withModule">
+                            <a ui-sref="product" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-shopping-cart"></i> <span>商品库管理</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
+                            <a ui-sref="managers" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-key"></i> <span>账号管理|Accounts</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
+                            <a ui-sref="servantsConfig" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-tty"></i> <span>客服管理|Service Accounts</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
+                            <a ui-sref="permission" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-key"></i> <span>角色权限管理</span>
+                            </a>
+                        </li>
+                    </ul>
+                </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">
+                            <a ui-sref="analysis_bd.bdanalysis" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-hand-peace-o"></i> <span>BD销售量|BD Sale</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                            <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-usd"></i> <span>BD提成|BD Commissions</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                            <a ng-click="editRateConfig()" style="cursor: pointer">
+                                <i class="fa fa-cog"></i> <span>BD绩效设置</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                            <a ng-click="editBDLevels()" style="cursor: pointer">
+                                <i class="fa fa-user"></i> <span>BD级别设置</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                            <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-shopping-cart"></i> <span>商户活跃度</span>
+                            </a>
+                        </li>
+                    </ul>
+                </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"
+                            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}">
+                                <i class="fa fa-tv"></i> <span>合伙人申请</span>
+                            </a>
+                        </li>
+                        <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>合伙人管理</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'org'|withModule">
+                            <a ui-sref="analysis_org.organlasis" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-hand-peace-o"></i> <span>合伙人销售量|City Partner Sale</span>
+                            </a>
+                        </li>
+                    </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">
+                    <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)">
+                            <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
+                                <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active"
+                            ng-if="('device'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                            <a ui-sref="device" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-users"></i> <span>设备管理|Devices</span>
+                            </a>
+                        </li>
+
+                        <li ui-sref-active="active" ng-if="'sysconfig'|withModule">
+                            <a ui-sref="sysconfig">
+                                <i class="fa fa-cog"></i> <span>系统参数设定|Settings</span>
+                            </a>
+                        </li>
+                    </ul>
+                </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">
+                            <a ui-sref="login_history">
+                                <i class="fa fa-users"></i> <span>登录日志|Sign In History</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'log'|withModule">
+                            <a ui-sref="logview">
+                                <i class="fa fa-file-text-o"></i> <span>系统日志|System Logs</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="'dev'|withModule">
+                            <a ui-sref="devtools">
+                                <i class="fa fa-cog"></i> <span>开发工具|DevTools</span>
+                            </a>
+                        </li>
+                    </ul>
                 </li>
             </ul>
+
         </section>
         <!-- /.sidebar -->
     </aside>
@@ -699,6 +807,7 @@ margin-bottom: 10%;"/>
     </footer>
 
 </div>
+<script type="text/javascript" src="static/lib/dist/js/adminlte.min.js"></script>
 <!-- ./wrapper -->
 </body>
 </html>
diff --git a/src/main/ui/static/css/common.css b/src/main/ui/static/css/common.css
index b88c7fdef..d764ae2ef 100644
--- a/src/main/ui/static/css/common.css
+++ b/src/main/ui/static/css/common.css
@@ -68,13 +68,19 @@
 /*Tab切换样式重写*/
 
 /*左侧菜单选中样式*/
-.skin-blue .sidebar-menu li:hover a,
-.skin-blue .sidebar-menu li.active a {
+/*.skin-blue .sidebar-menu li:hover 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;
     background: #1e282c;
-    border-left-color: #f06101;
+    border-left-color: #f06101
 }
 
+
 /*左侧菜单选中样式*/
 
 /*从运营平台引入*/
@@ -218,13 +224,13 @@
 /*首页左侧下拉菜单动画*/
 .sidebar-menu .treeview-menu {
     display: block;
-    max-height: 0;
+    /*max-height: 0;*/
     overflow: hidden;
     transition: 0.3s max-height linear;
 }
 
 .sidebar-menu li.active .treeview-menu {
-    max-height: 100px;
+    /*max-height: 100px;*/
 }
 
 /*基本信息*/
diff --git a/src/main/ui/static/lib/dist/js/adminlte.min.js b/src/main/ui/static/lib/dist/js/adminlte.min.js
new file mode 100644
index 000000000..fc356e4c0
--- /dev/null
+++ b/src/main/ui/static/lib/dist/js/adminlte.min.js
@@ -0,0 +1,14 @@
+/*! AdminLTE app.js
+* ================
+* Main JS application file for AdminLTE v2. This file
+* should be included in all pages. It controls some layout
+* options and implements exclusive AdminLTE plugins.
+*
+* @Author  Almsaeed Studio
+* @Support <https://www.almsaeedstudio.com>
+* @Email   <abdullah@almsaeedstudio.com>
+* @version 2.4.2
+* @repository git://github.com/almasaeed2010/AdminLTE.git
+* @license MIT <http://opensource.org/licenses/MIT>
+*/
+if("undefined"==typeof jQuery)throw new Error("AdminLTE requires jQuery");+function(a){"use strict";function b(b){return this.each(function(){var e=a(this),g=e.data(c);if(!g){var h=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,g=new f(e,h))}if("string"==typeof g){if(void 0===g[b])throw new Error("No method named "+b);g[b]()}})}var c="lte.boxrefresh",d={source:"",params:{},trigger:".refresh-btn",content:".box-body",loadInContent:!0,responseType:"",overlayTemplate:'<div class="overlay"><div class="fa fa-refresh fa-spin"></div></div>',onLoadStart:function(){},onLoadDone:function(a){return a}},e={data:'[data-widget="box-refresh"]'},f=function(b,c){if(this.element=b,this.options=c,this.$overlay=a(c.overlay),""===c.source)throw new Error("Source url was not defined. Please specify a url in your BoxRefresh source option.");this._setUpListeners(),this.load()};f.prototype.load=function(){this._addOverlay(),this.options.onLoadStart.call(a(this)),a.get(this.options.source,this.options.params,function(b){this.options.loadInContent&&a(this.options.content).html(b),this.options.onLoadDone.call(a(this),b),this._removeOverlay()}.bind(this),""!==this.options.responseType&&this.options.responseType)},f.prototype._setUpListeners=function(){a(this.element).on("click",e.trigger,function(a){a&&a.preventDefault(),this.load()}.bind(this))},f.prototype._addOverlay=function(){a(this.element).append(this.$overlay)},f.prototype._removeOverlay=function(){a(this.element).remove(this.$overlay)};var g=a.fn.boxRefresh;a.fn.boxRefresh=b,a.fn.boxRefresh.Constructor=f,a.fn.boxRefresh.noConflict=function(){return a.fn.boxRefresh=g,this},a(window).on("load",function(){a(e.data).each(function(){b.call(a(this))})})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this),f=e.data(c);if(!f){var g=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,f=new h(e,g))}if("string"==typeof b){if(void 0===f[b])throw new Error("No method named "+b);f[b]()}})}var c="lte.boxwidget",d={animationSpeed:500,collapseTrigger:'[data-widget="collapse"]',removeTrigger:'[data-widget="remove"]',collapseIcon:"fa-minus",expandIcon:"fa-plus",removeIcon:"fa-times"},e={data:".box",collapsed:".collapsed-box",header:".box-header",body:".box-body",footer:".box-footer",tools:".box-tools"},f={collapsed:"collapsed-box"},g={collapsed:"collapsed.boxwidget",expanded:"expanded.boxwidget",removed:"removed.boxwidget"},h=function(a,b){this.element=a,this.options=b,this._setUpListeners()};h.prototype.toggle=function(){a(this.element).is(e.collapsed)?this.expand():this.collapse()},h.prototype.expand=function(){var b=a.Event(g.expanded),c=this.options.collapseIcon,d=this.options.expandIcon;a(this.element).removeClass(f.collapsed),a(this.element).children(e.header+", "+e.body+", "+e.footer).children(e.tools).find("."+d).removeClass(d).addClass(c),a(this.element).children(e.body+", "+e.footer).slideDown(this.options.animationSpeed,function(){a(this.element).trigger(b)}.bind(this))},h.prototype.collapse=function(){var b=a.Event(g.collapsed),c=this.options.collapseIcon,d=this.options.expandIcon;a(this.element).children(e.header+", "+e.body+", "+e.footer).children(e.tools).find("."+c).removeClass(c).addClass(d),a(this.element).children(e.body+", "+e.footer).slideUp(this.options.animationSpeed,function(){a(this.element).addClass(f.collapsed),a(this.element).trigger(b)}.bind(this))},h.prototype.remove=function(){var b=a.Event(g.removed);a(this.element).slideUp(this.options.animationSpeed,function(){a(this.element).trigger(b),a(this.element).remove()}.bind(this))},h.prototype._setUpListeners=function(){var b=this;a(this.element).on("click",this.options.collapseTrigger,function(c){return c&&c.preventDefault(),b.toggle(a(this)),!1}),a(this.element).on("click",this.options.removeTrigger,function(c){return c&&c.preventDefault(),b.remove(a(this)),!1})};var i=a.fn.boxWidget;a.fn.boxWidget=b,a.fn.boxWidget.Constructor=h,a.fn.boxWidget.noConflict=function(){return a.fn.boxWidget=i,this},a(window).on("load",function(){a(e.data).each(function(){b.call(a(this))})})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this),f=e.data(c);if(!f){var g=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,f=new h(e,g))}"string"==typeof b&&f.toggle()})}var c="lte.controlsidebar",d={slide:!0},e={sidebar:".control-sidebar",data:'[data-toggle="control-sidebar"]',open:".control-sidebar-open",bg:".control-sidebar-bg",wrapper:".wrapper",content:".content-wrapper",boxed:".layout-boxed"},f={open:"control-sidebar-open",fixed:"fixed"},g={collapsed:"collapsed.controlsidebar",expanded:"expanded.controlsidebar"},h=function(a,b){this.element=a,this.options=b,this.hasBindedResize=!1,this.init()};h.prototype.init=function(){a(this.element).is(e.data)||a(this).on("click",this.toggle),this.fix(),a(window).resize(function(){this.fix()}.bind(this))},h.prototype.toggle=function(b){b&&b.preventDefault(),this.fix(),a(e.sidebar).is(e.open)||a("body").is(e.open)?this.collapse():this.expand()},h.prototype.expand=function(){this.options.slide?a(e.sidebar).addClass(f.open):a("body").addClass(f.open),a(this.element).trigger(a.Event(g.expanded))},h.prototype.collapse=function(){a("body, "+e.sidebar).removeClass(f.open),a(this.element).trigger(a.Event(g.collapsed))},h.prototype.fix=function(){a("body").is(e.boxed)&&this._fixForBoxed(a(e.bg))},h.prototype._fixForBoxed=function(b){b.css({position:"absolute",height:a(e.wrapper).height()})};var i=a.fn.controlSidebar;a.fn.controlSidebar=b,a.fn.controlSidebar.Constructor=h,a.fn.controlSidebar.noConflict=function(){return a.fn.controlSidebar=i,this},a(document).on("click",e.data,function(c){c&&c.preventDefault(),b.call(a(this),"toggle")})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data(c);e||d.data(c,e=new f(d)),"string"==typeof b&&e.toggle(d)})}var c="lte.directchat",d={data:'[data-widget="chat-pane-toggle"]',box:".direct-chat"},e={open:"direct-chat-contacts-open"},f=function(a){this.element=a};f.prototype.toggle=function(a){a.parents(d.box).first().toggleClass(e.open)};var g=a.fn.directChat;a.fn.directChat=b,a.fn.directChat.Constructor=f,a.fn.directChat.noConflict=function(){return a.fn.directChat=g,this},a(document).on("click",d.data,function(c){c&&c.preventDefault(),b.call(a(this),"toggle")})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this),f=e.data(c);if(!f){var h=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,f=new g(h))}if("string"==typeof b){if(void 0===f[b])throw new Error("No method named "+b);f[b]()}})}var c="lte.layout",d={slimscroll:!0,resetHeight:!0},e={wrapper:".wrapper",contentWrapper:".content-wrapper",layoutBoxed:".layout-boxed",mainFooter:".main-footer",mainHeader:".main-header",sidebar:".sidebar",controlSidebar:".control-sidebar",fixed:".fixed",sidebarMenu:".sidebar-menu",logo:".main-header .logo"},f={fixed:"fixed",holdTransition:"hold-transition"},g=function(a){this.options=a,this.bindedResize=!1,this.activate()};g.prototype.activate=function(){this.fix(),this.fixSidebar(),a("body").removeClass(f.holdTransition),this.options.resetHeight&&a("body, html, "+e.wrapper).css({height:"auto","min-height":"100%"}),this.bindedResize||(a(window).resize(function(){this.fix(),this.fixSidebar(),a(e.logo+", "+e.sidebar).one("webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend",function(){this.fix(),this.fixSidebar()}.bind(this))}.bind(this)),this.bindedResize=!0),a(e.sidebarMenu).on("expanded.tree",function(){this.fix(),this.fixSidebar()}.bind(this)),a(e.sidebarMenu).on("collapsed.tree",function(){this.fix(),this.fixSidebar()}.bind(this))},g.prototype.fix=function(){a(e.layoutBoxed+" > "+e.wrapper).css("overflow","hidden");var b=a(e.mainFooter).outerHeight()||0,c=a(e.mainHeader).outerHeight()+b,d=a(window).height(),g=a(e.sidebar).height()||0;if(a("body").hasClass(f.fixed))a(e.contentWrapper).css("min-height",d-b);else{var h;d>=g?(a(e.contentWrapper).css("min-height",d-c),h=d-c):(a(e.contentWrapper).css("min-height",g),h=g);var i=a(e.controlSidebar);void 0!==i&&i.height()>h&&a(e.contentWrapper).css("min-height",i.height())}},g.prototype.fixSidebar=function(){if(!a("body").hasClass(f.fixed))return void(void 0!==a.fn.slimScroll&&a(e.sidebar).slimScroll({destroy:!0}).height("auto"));this.options.slimscroll&&void 0!==a.fn.slimScroll&&a(e.sidebar).slimScroll({height:a(window).height()-a(e.mainHeader).height()+"px"})};var h=a.fn.layout;a.fn.layout=b,a.fn.layout.Constuctor=g,a.fn.layout.noConflict=function(){return a.fn.layout=h,this},a(window).on("load",function(){b.call(a("body"))})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this),f=e.data(c);if(!f){var g=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,f=new h(g))}"toggle"===b&&f.toggle()})}var c="lte.pushmenu",d={collapseScreenSize:767,expandOnHover:!1,expandTransitionDelay:200},e={collapsed:".sidebar-collapse",open:".sidebar-open",mainSidebar:".main-sidebar",contentWrapper:".content-wrapper",searchInput:".sidebar-form .form-control",button:'[data-toggle="push-menu"]',mini:".sidebar-mini",expanded:".sidebar-expanded-on-hover",layoutFixed:".fixed"},f={collapsed:"sidebar-collapse",open:"sidebar-open",mini:"sidebar-mini",expanded:"sidebar-expanded-on-hover",expandFeature:"sidebar-mini-expand-feature",layoutFixed:"fixed"},g={expanded:"expanded.pushMenu",collapsed:"collapsed.pushMenu"},h=function(a){this.options=a,this.init()};h.prototype.init=function(){(this.options.expandOnHover||a("body").is(e.mini+e.layoutFixed))&&(this.expandOnHover(),a("body").addClass(f.expandFeature)),a(e.contentWrapper).click(function(){a(window).width()<=this.options.collapseScreenSize&&a("body").hasClass(f.open)&&this.close()}.bind(this)),a(e.searchInput).click(function(a){a.stopPropagation()})},h.prototype.toggle=function(){var b=a(window).width(),c=!a("body").hasClass(f.collapsed);b<=this.options.collapseScreenSize&&(c=a("body").hasClass(f.open)),c?this.close():this.open()},h.prototype.open=function(){a(window).width()>this.options.collapseScreenSize?a("body").removeClass(f.collapsed).trigger(a.Event(g.expanded)):a("body").addClass(f.open).trigger(a.Event(g.expanded))},h.prototype.close=function(){a(window).width()>this.options.collapseScreenSize?a("body").addClass(f.collapsed).trigger(a.Event(g.collapsed)):a("body").removeClass(f.open+" "+f.collapsed).trigger(a.Event(g.collapsed))},h.prototype.expandOnHover=function(){a(e.mainSidebar).hover(function(){a("body").is(e.mini+e.collapsed)&&a(window).width()>this.options.collapseScreenSize&&this.expand()}.bind(this),function(){a("body").is(e.expanded)&&this.collapse()}.bind(this))},h.prototype.expand=function(){setTimeout(function(){a("body").removeClass(f.collapsed).addClass(f.expanded)},this.options.expandTransitionDelay)},h.prototype.collapse=function(){setTimeout(function(){a("body").removeClass(f.expanded).addClass(f.collapsed)},this.options.expandTransitionDelay)};var i=a.fn.pushMenu;a.fn.pushMenu=b,a.fn.pushMenu.Constructor=h,a.fn.pushMenu.noConflict=function(){return a.fn.pushMenu=i,this},a(document).on("click",e.button,function(c){c.preventDefault(),b.call(a(this),"toggle")}),a(window).on("load",function(){b.call(a(e.button))})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this),f=e.data(c);if(!f){var h=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,f=new g(e,h))}if("string"==typeof f){if(void 0===f[b])throw new Error("No method named "+b);f[b]()}})}var c="lte.todolist",d={onCheck:function(a){return a},onUnCheck:function(a){return a}},e={data:'[data-widget="todo-list"]'},f={done:"done"},g=function(a,b){this.element=a,this.options=b,this._setUpListeners()};g.prototype.toggle=function(a){if(a.parents(e.li).first().toggleClass(f.done),!a.prop("checked"))return void this.unCheck(a);this.check(a)},g.prototype.check=function(a){this.options.onCheck.call(a)},g.prototype.unCheck=function(a){this.options.onUnCheck.call(a)},g.prototype._setUpListeners=function(){var b=this;a(this.element).on("change ifChanged","input:checkbox",function(){b.toggle(a(this))})};var h=a.fn.todoList;a.fn.todoList=b,a.fn.todoList.Constructor=g,a.fn.todoList.noConflict=function(){return a.fn.todoList=h,this},a(window).on("load",function(){a(e.data).each(function(){b.call(a(this))})})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this);if(!e.data(c)){var f=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,new h(e,f))}})}var c="lte.tree",d={animationSpeed:500,accordion:!0,followLink:!1,trigger:".treeview a"},e={tree:".tree",treeview:".treeview",treeviewMenu:".treeview-menu",open:".menu-open, .active",li:"li",data:'[data-widget="tree"]',active:".active"},f={open:"menu-open",tree:"tree"},g={collapsed:"collapsed.tree",expanded:"expanded.tree"},h=function(b,c){this.element=b,this.options=c,a(this.element).addClass(f.tree),a(e.treeview+e.active,this.element).addClass(f.open),this._setUpListeners()};h.prototype.toggle=function(a,b){var c=a.next(e.treeviewMenu),d=a.parent(),g=d.hasClass(f.open);d.is(e.treeview)&&(this.options.followLink&&"#"!==a.attr("href")||b.preventDefault(),g?this.collapse(c,d):this.expand(c,d))},h.prototype.expand=function(b,c){var d=a.Event(g.expanded);if(this.options.accordion){var h=c.siblings(e.open),i=h.children(e.treeviewMenu);this.collapse(i,h)}c.addClass(f.open),b.slideDown(this.options.animationSpeed,function(){a(this.element).trigger(d)}.bind(this))},h.prototype.collapse=function(b,c){var d=a.Event(g.collapsed);b.find(e.open).removeClass(f.open),c.removeClass(f.open),b.slideUp(this.options.animationSpeed,function(){b.find(e.open+" > "+e.treeview).slideUp(),a(this.element).trigger(d)}.bind(this))},h.prototype._setUpListeners=function(){var b=this;a(this.element).on("click",this.options.trigger,function(c){b.toggle(a(this),c)})};var i=a.fn.tree;a.fn.tree=b,a.fn.tree.Constructor=h,a.fn.tree.noConflict=function(){return a.fn.tree=i,this},a(window).on("load",function(){a(e.data).each(function(){b.call(a(this))})})}(jQuery);
\ No newline at end of file

From 8ff1cc35afa55b3990fa2bc60a3432ec497b27c1 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Tue, 23 Oct 2018 17:51:41 +0800
Subject: [PATCH 37/82] fix

---
 src/main/ui/static/css/common.css             | 12 ++++-----
 .../ui/static/lib/dist/js/adminlte.min.js     | 25 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/main/ui/static/css/common.css b/src/main/ui/static/css/common.css
index d764ae2ef..55984fa76 100644
--- a/src/main/ui/static/css/common.css
+++ b/src/main/ui/static/css/common.css
@@ -222,12 +222,12 @@
 }
 
 /*首页左侧下拉菜单动画*/
-.sidebar-menu .treeview-menu {
-    display: block;
-    /*max-height: 0;*/
-    overflow: hidden;
-    transition: 0.3s max-height linear;
-}
+/*.sidebar-menu .treeview-menu {*/
+    /*!*display: block;*!*/
+    /*!*max-height: 0;*!*/
+    /*overflow: hidden;*/
+    /*transition: 0.3s max-height linear;*/
+/*}*/
 
 .sidebar-menu li.active .treeview-menu {
     /*max-height: 100px;*/
diff --git a/src/main/ui/static/lib/dist/js/adminlte.min.js b/src/main/ui/static/lib/dist/js/adminlte.min.js
index fc356e4c0..def8a04bc 100644
--- a/src/main/ui/static/lib/dist/js/adminlte.min.js
+++ b/src/main/ui/static/lib/dist/js/adminlte.min.js
@@ -1,14 +1,13 @@
 /*! AdminLTE app.js
-* ================
-* Main JS application file for AdminLTE v2. This file
-* should be included in all pages. It controls some layout
-* options and implements exclusive AdminLTE plugins.
-*
-* @Author  Almsaeed Studio
-* @Support <https://www.almsaeedstudio.com>
-* @Email   <abdullah@almsaeedstudio.com>
-* @version 2.4.2
-* @repository git://github.com/almasaeed2010/AdminLTE.git
-* @license MIT <http://opensource.org/licenses/MIT>
-*/
-if("undefined"==typeof jQuery)throw new Error("AdminLTE requires jQuery");+function(a){"use strict";function b(b){return this.each(function(){var e=a(this),g=e.data(c);if(!g){var h=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,g=new f(e,h))}if("string"==typeof g){if(void 0===g[b])throw new Error("No method named "+b);g[b]()}})}var c="lte.boxrefresh",d={source:"",params:{},trigger:".refresh-btn",content:".box-body",loadInContent:!0,responseType:"",overlayTemplate:'<div class="overlay"><div class="fa fa-refresh fa-spin"></div></div>',onLoadStart:function(){},onLoadDone:function(a){return a}},e={data:'[data-widget="box-refresh"]'},f=function(b,c){if(this.element=b,this.options=c,this.$overlay=a(c.overlay),""===c.source)throw new Error("Source url was not defined. Please specify a url in your BoxRefresh source option.");this._setUpListeners(),this.load()};f.prototype.load=function(){this._addOverlay(),this.options.onLoadStart.call(a(this)),a.get(this.options.source,this.options.params,function(b){this.options.loadInContent&&a(this.options.content).html(b),this.options.onLoadDone.call(a(this),b),this._removeOverlay()}.bind(this),""!==this.options.responseType&&this.options.responseType)},f.prototype._setUpListeners=function(){a(this.element).on("click",e.trigger,function(a){a&&a.preventDefault(),this.load()}.bind(this))},f.prototype._addOverlay=function(){a(this.element).append(this.$overlay)},f.prototype._removeOverlay=function(){a(this.element).remove(this.$overlay)};var g=a.fn.boxRefresh;a.fn.boxRefresh=b,a.fn.boxRefresh.Constructor=f,a.fn.boxRefresh.noConflict=function(){return a.fn.boxRefresh=g,this},a(window).on("load",function(){a(e.data).each(function(){b.call(a(this))})})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this),f=e.data(c);if(!f){var g=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,f=new h(e,g))}if("string"==typeof b){if(void 0===f[b])throw new Error("No method named "+b);f[b]()}})}var c="lte.boxwidget",d={animationSpeed:500,collapseTrigger:'[data-widget="collapse"]',removeTrigger:'[data-widget="remove"]',collapseIcon:"fa-minus",expandIcon:"fa-plus",removeIcon:"fa-times"},e={data:".box",collapsed:".collapsed-box",header:".box-header",body:".box-body",footer:".box-footer",tools:".box-tools"},f={collapsed:"collapsed-box"},g={collapsed:"collapsed.boxwidget",expanded:"expanded.boxwidget",removed:"removed.boxwidget"},h=function(a,b){this.element=a,this.options=b,this._setUpListeners()};h.prototype.toggle=function(){a(this.element).is(e.collapsed)?this.expand():this.collapse()},h.prototype.expand=function(){var b=a.Event(g.expanded),c=this.options.collapseIcon,d=this.options.expandIcon;a(this.element).removeClass(f.collapsed),a(this.element).children(e.header+", "+e.body+", "+e.footer).children(e.tools).find("."+d).removeClass(d).addClass(c),a(this.element).children(e.body+", "+e.footer).slideDown(this.options.animationSpeed,function(){a(this.element).trigger(b)}.bind(this))},h.prototype.collapse=function(){var b=a.Event(g.collapsed),c=this.options.collapseIcon,d=this.options.expandIcon;a(this.element).children(e.header+", "+e.body+", "+e.footer).children(e.tools).find("."+c).removeClass(c).addClass(d),a(this.element).children(e.body+", "+e.footer).slideUp(this.options.animationSpeed,function(){a(this.element).addClass(f.collapsed),a(this.element).trigger(b)}.bind(this))},h.prototype.remove=function(){var b=a.Event(g.removed);a(this.element).slideUp(this.options.animationSpeed,function(){a(this.element).trigger(b),a(this.element).remove()}.bind(this))},h.prototype._setUpListeners=function(){var b=this;a(this.element).on("click",this.options.collapseTrigger,function(c){return c&&c.preventDefault(),b.toggle(a(this)),!1}),a(this.element).on("click",this.options.removeTrigger,function(c){return c&&c.preventDefault(),b.remove(a(this)),!1})};var i=a.fn.boxWidget;a.fn.boxWidget=b,a.fn.boxWidget.Constructor=h,a.fn.boxWidget.noConflict=function(){return a.fn.boxWidget=i,this},a(window).on("load",function(){a(e.data).each(function(){b.call(a(this))})})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this),f=e.data(c);if(!f){var g=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,f=new h(e,g))}"string"==typeof b&&f.toggle()})}var c="lte.controlsidebar",d={slide:!0},e={sidebar:".control-sidebar",data:'[data-toggle="control-sidebar"]',open:".control-sidebar-open",bg:".control-sidebar-bg",wrapper:".wrapper",content:".content-wrapper",boxed:".layout-boxed"},f={open:"control-sidebar-open",fixed:"fixed"},g={collapsed:"collapsed.controlsidebar",expanded:"expanded.controlsidebar"},h=function(a,b){this.element=a,this.options=b,this.hasBindedResize=!1,this.init()};h.prototype.init=function(){a(this.element).is(e.data)||a(this).on("click",this.toggle),this.fix(),a(window).resize(function(){this.fix()}.bind(this))},h.prototype.toggle=function(b){b&&b.preventDefault(),this.fix(),a(e.sidebar).is(e.open)||a("body").is(e.open)?this.collapse():this.expand()},h.prototype.expand=function(){this.options.slide?a(e.sidebar).addClass(f.open):a("body").addClass(f.open),a(this.element).trigger(a.Event(g.expanded))},h.prototype.collapse=function(){a("body, "+e.sidebar).removeClass(f.open),a(this.element).trigger(a.Event(g.collapsed))},h.prototype.fix=function(){a("body").is(e.boxed)&&this._fixForBoxed(a(e.bg))},h.prototype._fixForBoxed=function(b){b.css({position:"absolute",height:a(e.wrapper).height()})};var i=a.fn.controlSidebar;a.fn.controlSidebar=b,a.fn.controlSidebar.Constructor=h,a.fn.controlSidebar.noConflict=function(){return a.fn.controlSidebar=i,this},a(document).on("click",e.data,function(c){c&&c.preventDefault(),b.call(a(this),"toggle")})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data(c);e||d.data(c,e=new f(d)),"string"==typeof b&&e.toggle(d)})}var c="lte.directchat",d={data:'[data-widget="chat-pane-toggle"]',box:".direct-chat"},e={open:"direct-chat-contacts-open"},f=function(a){this.element=a};f.prototype.toggle=function(a){a.parents(d.box).first().toggleClass(e.open)};var g=a.fn.directChat;a.fn.directChat=b,a.fn.directChat.Constructor=f,a.fn.directChat.noConflict=function(){return a.fn.directChat=g,this},a(document).on("click",d.data,function(c){c&&c.preventDefault(),b.call(a(this),"toggle")})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this),f=e.data(c);if(!f){var h=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,f=new g(h))}if("string"==typeof b){if(void 0===f[b])throw new Error("No method named "+b);f[b]()}})}var c="lte.layout",d={slimscroll:!0,resetHeight:!0},e={wrapper:".wrapper",contentWrapper:".content-wrapper",layoutBoxed:".layout-boxed",mainFooter:".main-footer",mainHeader:".main-header",sidebar:".sidebar",controlSidebar:".control-sidebar",fixed:".fixed",sidebarMenu:".sidebar-menu",logo:".main-header .logo"},f={fixed:"fixed",holdTransition:"hold-transition"},g=function(a){this.options=a,this.bindedResize=!1,this.activate()};g.prototype.activate=function(){this.fix(),this.fixSidebar(),a("body").removeClass(f.holdTransition),this.options.resetHeight&&a("body, html, "+e.wrapper).css({height:"auto","min-height":"100%"}),this.bindedResize||(a(window).resize(function(){this.fix(),this.fixSidebar(),a(e.logo+", "+e.sidebar).one("webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend",function(){this.fix(),this.fixSidebar()}.bind(this))}.bind(this)),this.bindedResize=!0),a(e.sidebarMenu).on("expanded.tree",function(){this.fix(),this.fixSidebar()}.bind(this)),a(e.sidebarMenu).on("collapsed.tree",function(){this.fix(),this.fixSidebar()}.bind(this))},g.prototype.fix=function(){a(e.layoutBoxed+" > "+e.wrapper).css("overflow","hidden");var b=a(e.mainFooter).outerHeight()||0,c=a(e.mainHeader).outerHeight()+b,d=a(window).height(),g=a(e.sidebar).height()||0;if(a("body").hasClass(f.fixed))a(e.contentWrapper).css("min-height",d-b);else{var h;d>=g?(a(e.contentWrapper).css("min-height",d-c),h=d-c):(a(e.contentWrapper).css("min-height",g),h=g);var i=a(e.controlSidebar);void 0!==i&&i.height()>h&&a(e.contentWrapper).css("min-height",i.height())}},g.prototype.fixSidebar=function(){if(!a("body").hasClass(f.fixed))return void(void 0!==a.fn.slimScroll&&a(e.sidebar).slimScroll({destroy:!0}).height("auto"));this.options.slimscroll&&void 0!==a.fn.slimScroll&&a(e.sidebar).slimScroll({height:a(window).height()-a(e.mainHeader).height()+"px"})};var h=a.fn.layout;a.fn.layout=b,a.fn.layout.Constuctor=g,a.fn.layout.noConflict=function(){return a.fn.layout=h,this},a(window).on("load",function(){b.call(a("body"))})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this),f=e.data(c);if(!f){var g=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,f=new h(g))}"toggle"===b&&f.toggle()})}var c="lte.pushmenu",d={collapseScreenSize:767,expandOnHover:!1,expandTransitionDelay:200},e={collapsed:".sidebar-collapse",open:".sidebar-open",mainSidebar:".main-sidebar",contentWrapper:".content-wrapper",searchInput:".sidebar-form .form-control",button:'[data-toggle="push-menu"]',mini:".sidebar-mini",expanded:".sidebar-expanded-on-hover",layoutFixed:".fixed"},f={collapsed:"sidebar-collapse",open:"sidebar-open",mini:"sidebar-mini",expanded:"sidebar-expanded-on-hover",expandFeature:"sidebar-mini-expand-feature",layoutFixed:"fixed"},g={expanded:"expanded.pushMenu",collapsed:"collapsed.pushMenu"},h=function(a){this.options=a,this.init()};h.prototype.init=function(){(this.options.expandOnHover||a("body").is(e.mini+e.layoutFixed))&&(this.expandOnHover(),a("body").addClass(f.expandFeature)),a(e.contentWrapper).click(function(){a(window).width()<=this.options.collapseScreenSize&&a("body").hasClass(f.open)&&this.close()}.bind(this)),a(e.searchInput).click(function(a){a.stopPropagation()})},h.prototype.toggle=function(){var b=a(window).width(),c=!a("body").hasClass(f.collapsed);b<=this.options.collapseScreenSize&&(c=a("body").hasClass(f.open)),c?this.close():this.open()},h.prototype.open=function(){a(window).width()>this.options.collapseScreenSize?a("body").removeClass(f.collapsed).trigger(a.Event(g.expanded)):a("body").addClass(f.open).trigger(a.Event(g.expanded))},h.prototype.close=function(){a(window).width()>this.options.collapseScreenSize?a("body").addClass(f.collapsed).trigger(a.Event(g.collapsed)):a("body").removeClass(f.open+" "+f.collapsed).trigger(a.Event(g.collapsed))},h.prototype.expandOnHover=function(){a(e.mainSidebar).hover(function(){a("body").is(e.mini+e.collapsed)&&a(window).width()>this.options.collapseScreenSize&&this.expand()}.bind(this),function(){a("body").is(e.expanded)&&this.collapse()}.bind(this))},h.prototype.expand=function(){setTimeout(function(){a("body").removeClass(f.collapsed).addClass(f.expanded)},this.options.expandTransitionDelay)},h.prototype.collapse=function(){setTimeout(function(){a("body").removeClass(f.expanded).addClass(f.collapsed)},this.options.expandTransitionDelay)};var i=a.fn.pushMenu;a.fn.pushMenu=b,a.fn.pushMenu.Constructor=h,a.fn.pushMenu.noConflict=function(){return a.fn.pushMenu=i,this},a(document).on("click",e.button,function(c){c.preventDefault(),b.call(a(this),"toggle")}),a(window).on("load",function(){b.call(a(e.button))})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this),f=e.data(c);if(!f){var h=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,f=new g(e,h))}if("string"==typeof f){if(void 0===f[b])throw new Error("No method named "+b);f[b]()}})}var c="lte.todolist",d={onCheck:function(a){return a},onUnCheck:function(a){return a}},e={data:'[data-widget="todo-list"]'},f={done:"done"},g=function(a,b){this.element=a,this.options=b,this._setUpListeners()};g.prototype.toggle=function(a){if(a.parents(e.li).first().toggleClass(f.done),!a.prop("checked"))return void this.unCheck(a);this.check(a)},g.prototype.check=function(a){this.options.onCheck.call(a)},g.prototype.unCheck=function(a){this.options.onUnCheck.call(a)},g.prototype._setUpListeners=function(){var b=this;a(this.element).on("change ifChanged","input:checkbox",function(){b.toggle(a(this))})};var h=a.fn.todoList;a.fn.todoList=b,a.fn.todoList.Constructor=g,a.fn.todoList.noConflict=function(){return a.fn.todoList=h,this},a(window).on("load",function(){a(e.data).each(function(){b.call(a(this))})})}(jQuery),function(a){"use strict";function b(b){return this.each(function(){var e=a(this);if(!e.data(c)){var f=a.extend({},d,e.data(),"object"==typeof b&&b);e.data(c,new h(e,f))}})}var c="lte.tree",d={animationSpeed:500,accordion:!0,followLink:!1,trigger:".treeview a"},e={tree:".tree",treeview:".treeview",treeviewMenu:".treeview-menu",open:".menu-open, .active",li:"li",data:'[data-widget="tree"]',active:".active"},f={open:"menu-open",tree:"tree"},g={collapsed:"collapsed.tree",expanded:"expanded.tree"},h=function(b,c){this.element=b,this.options=c,a(this.element).addClass(f.tree),a(e.treeview+e.active,this.element).addClass(f.open),this._setUpListeners()};h.prototype.toggle=function(a,b){var c=a.next(e.treeviewMenu),d=a.parent(),g=d.hasClass(f.open);d.is(e.treeview)&&(this.options.followLink&&"#"!==a.attr("href")||b.preventDefault(),g?this.collapse(c,d):this.expand(c,d))},h.prototype.expand=function(b,c){var d=a.Event(g.expanded);if(this.options.accordion){var h=c.siblings(e.open),i=h.children(e.treeviewMenu);this.collapse(i,h)}c.addClass(f.open),b.slideDown(this.options.animationSpeed,function(){a(this.element).trigger(d)}.bind(this))},h.prototype.collapse=function(b,c){var d=a.Event(g.collapsed);b.find(e.open).removeClass(f.open),c.removeClass(f.open),b.slideUp(this.options.animationSpeed,function(){b.find(e.open+" > "+e.treeview).slideUp(),a(this.element).trigger(d)}.bind(this))},h.prototype._setUpListeners=function(){var b=this;a(this.element).on("click",this.options.trigger,function(c){b.toggle(a(this),c)})};var i=a.fn.tree;a.fn.tree=b,a.fn.tree.Constructor=h,a.fn.tree.noConflict=function(){return a.fn.tree=i,this},a(window).on("load",function(){a(e.data).each(function(){b.call(a(this))})})}(jQuery);
\ No newline at end of file
+ * ================
+ * Main JS application file for AdminLTE v2. This file
+ * should be included in all pages. It controls some layout
+ * options and implements exclusive AdminLTE plugins.
+ *
+ * @Author  Almsaeed Studio
+ * @Support <http://www.almsaeedstudio.com>
+ * @Email   <support@almsaeedstudio.com>
+ * @version 2.3.5
+ * @license MIT <http://opensource.org/licenses/MIT>
+ */
+function _init(){"use strict";$.AdminLTE.layout={activate:function(){var a=this;a.fix(),a.fixSidebar(),$(window,".wrapper").resize(function(){a.fix(),a.fixSidebar()})},fix:function(){var a=$(".main-header").outerHeight()+$(".main-footer").outerHeight(),b=$(window).height(),c=$(".sidebar").height();if($("body").hasClass("fixed"))$(".content-wrapper, .right-side").css("min-height",b-$(".main-footer").outerHeight());else{var d;b>=c?($(".content-wrapper, .right-side").css("min-height",b-a),d=b-a):($(".content-wrapper, .right-side").css("min-height",c),d=c);var e=$($.AdminLTE.options.controlSidebarOptions.selector);"undefined"!=typeof e&&e.height()>d&&$(".content-wrapper, .right-side").css("min-height",e.height())}},fixSidebar:function(){return $("body").hasClass("fixed")?("undefined"==typeof $.fn.slimScroll&&window.console&&window.console.error("Error: the fixed layout requires the slimscroll plugin!"),void($.AdminLTE.options.sidebarSlimScroll&&"undefined"!=typeof $.fn.slimScroll&&($(".sidebar").slimScroll({destroy:!0}).height("auto"),$(".sidebar").slimscroll({height:$(window).height()-$(".main-header").height()+"px",color:"rgba(0,0,0,0.2)",size:"3px"})))):void("undefined"!=typeof $.fn.slimScroll&&$(".sidebar").slimScroll({destroy:!0}).height("auto"))}},$.AdminLTE.pushMenu={activate:function(a){var b=$.AdminLTE.options.screenSizes;$(document).on("click",a,function(a){a.preventDefault(),$(window).width()>b.sm-1?$("body").hasClass("sidebar-collapse")?$("body").removeClass("sidebar-collapse").trigger("expanded.pushMenu"):$("body").addClass("sidebar-collapse").trigger("collapsed.pushMenu"):$("body").hasClass("sidebar-open")?$("body").removeClass("sidebar-open").removeClass("sidebar-collapse").trigger("collapsed.pushMenu"):$("body").addClass("sidebar-open").trigger("expanded.pushMenu")}),$(".content-wrapper").click(function(){$(window).width()<=b.sm-1&&$("body").hasClass("sidebar-open")&&$("body").removeClass("sidebar-open")}),($.AdminLTE.options.sidebarExpandOnHover||$("body").hasClass("fixed")&&$("body").hasClass("sidebar-mini"))&&this.expandOnHover()},expandOnHover:function(){var a=this,b=$.AdminLTE.options.screenSizes.sm-1;$(".main-sidebar").hover(function(){$("body").hasClass("sidebar-mini")&&$("body").hasClass("sidebar-collapse")&&$(window).width()>b&&a.expand()},function(){$("body").hasClass("sidebar-mini")&&$("body").hasClass("sidebar-expanded-on-hover")&&$(window).width()>b&&a.collapse()})},expand:function(){$("body").removeClass("sidebar-collapse").addClass("sidebar-expanded-on-hover")},collapse:function(){$("body").hasClass("sidebar-expanded-on-hover")&&$("body").removeClass("sidebar-expanded-on-hover").addClass("sidebar-collapse")}},$.AdminLTE.tree=function(a){var b=this,c=$.AdminLTE.options.animationSpeed;$(document).off("click",a+" li a").on("click",a+" li a",function(a){var d=$(this),e=d.next();if(e.is(".treeview-menu")&&e.is(":visible")&&!$("body").hasClass("sidebar-collapse"))e.slideUp(c,function(){e.removeClass("menu-open")}),e.parent("li").removeClass("active");else if(e.is(".treeview-menu")&&!e.is(":visible")){var f=d.parents("ul").first(),g=f.find("ul:visible").slideUp(c);g.removeClass("menu-open");var h=d.parent("li");e.slideDown(c,function(){e.addClass("menu-open"),f.find("li.active").removeClass("active"),h.addClass("active"),b.layout.fix()})}e.is(".treeview-menu")&&a.preventDefault()})},$.AdminLTE.controlSidebar={activate:function(){var a=this,b=$.AdminLTE.options.controlSidebarOptions,c=$(b.selector),d=$(b.toggleBtnSelector);d.on("click",function(d){d.preventDefault(),c.hasClass("control-sidebar-open")||$("body").hasClass("control-sidebar-open")?a.close(c,b.slide):a.open(c,b.slide)});var e=$(".control-sidebar-bg");a._fix(e),$("body").hasClass("fixed")?a._fixForFixed(c):$(".content-wrapper, .right-side").height()<c.height()&&a._fixForContent(c)},open:function(a,b){b?a.addClass("control-sidebar-open"):$("body").addClass("control-sidebar-open")},close:function(a,b){b?a.removeClass("control-sidebar-open"):$("body").removeClass("control-sidebar-open")},_fix:function(a){var b=this;if($("body").hasClass("layout-boxed")){if(a.css("position","absolute"),a.height($(".wrapper").height()),b.hasBindedResize)return;$(window).resize(function(){b._fix(a)}),b.hasBindedResize=!0}else a.css({position:"fixed",height:"auto"})},_fixForFixed:function(a){a.css({position:"fixed","max-height":"100%",overflow:"auto","padding-bottom":"50px"})},_fixForContent:function(a){$(".content-wrapper, .right-side").css("min-height",a.height())}},$.AdminLTE.boxWidget={selectors:$.AdminLTE.options.boxWidgetOptions.boxWidgetSelectors,icons:$.AdminLTE.options.boxWidgetOptions.boxWidgetIcons,animationSpeed:$.AdminLTE.options.animationSpeed,activate:function(a){var b=this;a||(a=document),$(a).on("click",b.selectors.collapse,function(a){a.preventDefault(),b.collapse($(this))}),$(a).on("click",b.selectors.remove,function(a){a.preventDefault(),b.remove($(this))})},collapse:function(a){var b=this,c=a.parents(".box").first(),d=c.find("> .box-body, > .box-footer, > form  >.box-body, > form > .box-footer");c.hasClass("collapsed-box")?(a.children(":first").removeClass(b.icons.open).addClass(b.icons.collapse),d.slideDown(b.animationSpeed,function(){c.removeClass("collapsed-box")})):(a.children(":first").removeClass(b.icons.collapse).addClass(b.icons.open),d.slideUp(b.animationSpeed,function(){c.addClass("collapsed-box")}))},remove:function(a){var b=a.parents(".box").first();b.slideUp(this.animationSpeed)}}}if("undefined"==typeof jQuery)throw new Error("AdminLTE requires jQuery");$.AdminLTE={},$.AdminLTE.options={navbarMenuSlimscroll:!0,navbarMenuSlimscrollWidth:"3px",navbarMenuHeight:"200px",animationSpeed:500,sidebarToggleSelector:"[data-toggle='offcanvas']",sidebarPushMenu:!0,sidebarSlimScroll:!0,sidebarExpandOnHover:!1,enableBoxRefresh:!0,enableBSToppltip:!0,BSTooltipSelector:"[data-toggle='tooltip']",enableFastclick:!1,enableControlSidebar:!0,controlSidebarOptions:{toggleBtnSelector:"[data-toggle='control-sidebar']",selector:".control-sidebar",slide:!0},enableBoxWidget:!0,boxWidgetOptions:{boxWidgetIcons:{collapse:"fa-minus",open:"fa-plus",remove:"fa-times"},boxWidgetSelectors:{remove:'[data-widget="remove"]',collapse:'[data-widget="collapse"]'}},directChat:{enable:!0,contactToggleSelector:'[data-widget="chat-pane-toggle"]'},colors:{lightBlue:"#3c8dbc",red:"#f56954",green:"#00a65a",aqua:"#00c0ef",yellow:"#f39c12",blue:"#0073b7",navy:"#001F3F",teal:"#39CCCC",olive:"#3D9970",lime:"#01FF70",orange:"#FF851B",fuchsia:"#F012BE",purple:"#8E24AA",maroon:"#D81B60",black:"#222222",gray:"#d2d6de"},screenSizes:{xs:480,sm:768,md:992,lg:1200}},$(function(){"use strict";$("body").removeClass("hold-transition"),"undefined"!=typeof AdminLTEOptions&&$.extend(!0,$.AdminLTE.options,AdminLTEOptions);var a=$.AdminLTE.options;_init(),$.AdminLTE.layout.activate(),$.AdminLTE.tree(".sidebar"),a.enableControlSidebar&&$.AdminLTE.controlSidebar.activate(),a.navbarMenuSlimscroll&&"undefined"!=typeof $.fn.slimscroll&&$(".navbar .menu").slimscroll({height:a.navbarMenuHeight,alwaysVisible:!1,size:a.navbarMenuSlimscrollWidth}).css("width","100%"),a.sidebarPushMenu&&$.AdminLTE.pushMenu.activate(a.sidebarToggleSelector),a.enableBSToppltip&&$("body").tooltip({selector:a.BSTooltipSelector}),a.enableBoxWidget&&$.AdminLTE.boxWidget.activate(),a.enableFastclick&&"undefined"!=typeof FastClick&&FastClick.attach(document.body),a.directChat.enable&&$(document).on("click",a.directChat.contactToggleSelector,function(){var a=$(this).parents(".direct-chat").first();a.toggleClass("direct-chat-contacts-open")}),$('.btn-group[data-toggle="btn-toggle"]').each(function(){var a=$(this);$(this).find(".btn").on("click",function(b){a.find(".btn.active").removeClass("active"),$(this).addClass("active"),b.preventDefault()})})}),function(a){"use strict";a.fn.boxRefresh=function(b){function c(a){a.append(f),e.onLoadStart.call(a)}function d(a){a.find(f).remove(),e.onLoadDone.call(a)}var e=a.extend({trigger:".refresh-btn",source:"",onLoadStart:function(a){return a},onLoadDone:function(a){return a}},b),f=a('<div class="overlay"><div class="fa fa-refresh fa-spin"></div></div>');return this.each(function(){if(""===e.source)return void(window.console&&window.console.log("Please specify a source first - boxRefresh()"));var b=a(this),f=b.find(e.trigger).first();f.on("click",function(a){a.preventDefault(),c(b),b.find(".box-body").load(e.source,function(){d(b)})})})}}(jQuery),function(a){"use strict";a.fn.activateBox=function(){a.AdminLTE.boxWidget.activate(this)},a.fn.toggleBox=function(){var b=a(a.AdminLTE.boxWidget.selectors.collapse,this);a.AdminLTE.boxWidget.collapse(b)},a.fn.removeBox=function(){var b=a(a.AdminLTE.boxWidget.selectors.remove,this);a.AdminLTE.boxWidget.remove(b)}}(jQuery),function(a){"use strict";a.fn.todolist=function(b){var c=a.extend({onCheck:function(a){return a},onUncheck:function(a){return a}},b);return this.each(function(){"undefined"!=typeof a.fn.iCheck?(a("input",this).on("ifChecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onCheck.call(b)}),a("input",this).on("ifUnchecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onUncheck.call(b)})):a("input",this).on("change",function(){var b=a(this).parents("li").first();b.toggleClass("done"),a("input",b).is(":checked")?c.onCheck.call(b):c.onUncheck.call(b)})})}}(jQuery);
\ No newline at end of file

From 8b813a0e516fccdc097188cc8e6a41c73b5266b0 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Tue, 23 Oct 2018 20:08:43 +0800
Subject: [PATCH 38/82] =?UTF-8?q?=E8=B4=B9=E7=8E=87=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=BB=B6=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/system/ClientRateMapper.java      |  4 ++
 .../manage/merchants/core/ClientManager.java  |  7 ++++
 .../core/impls/ClientManagerImpl.java         | 17 +++++++++
 .../manage/task/PostponeClientTask.java       | 19 +++++++++-
 .../mappers/system/ClientRateMapper.xml       | 37 +++++++++++++++++++
 5 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.java
index b9e5ed634..3f245f99a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.java
@@ -46,6 +46,10 @@ public interface ClientRateMapper {
 
     List<JSONObject> getAllExpiry(@Param("expiry_date")Date expiry_date);
 
+    List<JSONObject> getAllClientRateExpiryMerchants();
+
+    void postponeMerchantRateByClientId(int clientId);
+
     JSONObject latestChannelCleanDays(@Param("rate_name")String rate_name, @Param("client_id")int client_id);
 
     JSONObject latestExpiryConfig(@Param("client_id")int client_id,@Param("rate_name") String rate_name);
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index 8bcca2a11..9589510d6 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -342,4 +342,11 @@ public interface ClientManager {
     void updateAllPartnerPassword(String clientMoniker, List<String> emails);
 
     void postponeClientRate(Date now, Date yearTomorrow, String expireDate, JSONObject client);
+
+    /**
+     * 根据商户之前的费率自动延期一年
+     *
+     * @param clientId
+     */
+    boolean postponeClientRate(int clientId, String clientMoniker,String nextYearExipryDate);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index f928885fd..fd3cd717d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -4029,6 +4029,23 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         });
     }
 
+    @Override
+    @Transactional
+    public boolean postponeClientRate(int clientId, String clientMoniker, String nextYearExipryDate) {
+        try {
+            clientRateMapper.postponeMerchantRateByClientId(clientId);
+            clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, clientMoniker, "tax_in_surcharge", false));
+            List<JSONObject> adminAccounts = clientAccountMapper.listAdminAccounts(clientId);
+            adminAccounts.forEach(o -> {
+                sendClientPostponeNotify(o, nextYearExipryDate);
+            });
+            logger.error("[{}]费率自动延期成功", clientMoniker);
+            return true;
+        } catch (Exception e) {
+            logger.error("[{}]费率自动延期失败", clientMoniker);
+            return false;
+        }
+    }
 
 
     private TemplateMessage initClientMessage(JSONObject client, String newExpiryDate, String wechatOpenid, String templateId) {
diff --git a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
index c03a84d31..78bf834d3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
@@ -69,6 +69,23 @@ public class PostponeClientTask {
         });
     }
 
+    @Scheduled(cron = "0 30 6 * * ?")
+    private void postponeMerchantRate() {
+        synchronizedScheduler.executeProcess("manage_task:postponeMerchantRate", 120_000, () -> {
+            String nextYearExipryDate = DateFormatUtils.format(DateUtils.addYears(new Date(), 1), "yyyy-MM-dd");
+            List<JSONObject> expiryRateMerchants = clientRateMapper.getAllClientRateExpiryMerchants();
+            StringBuilder merchantStrBuilder = new StringBuilder();
+            expiryRateMerchants.forEach(merchant -> {
+                if (clientManager.postponeClientRate(merchant.getIntValue("client_id"), merchant.getString("client_moniker"),nextYearExipryDate)) {
+                    merchantStrBuilder.append(merchant.getString("client_moniker")).append("、");
+                }
+            });
+            merchantStrBuilder.deleteCharAt(merchantStrBuilder.length() - 1);
+            sendComplianceNotify(merchantStrBuilder, nextYearExipryDate);
+        });
+    }
+
+
     private void sendComplianceNotify(StringBuilder sb, String newExpireDate) {
         List<String> compliance = managerMapper.listOpenIdsOfCompliances();
         compliance.forEach(p -> {
@@ -76,8 +93,8 @@ public class PostponeClientTask {
             TemplateMessage notice = initComplianceMessage(sb.toString(), newExpireDate, p, api.getTemplateId("client-postpone"));
             api.sendTemplateMessage(notice);
         });
-
     }
+
     private TemplateMessage initComplianceMessage(String clients, String newExpiryDate, String wechatOpenid, String templateId) {
         TemplateMessage notice = new TemplateMessage(wechatOpenid, templateId, null);
         notice.put("first", "以下商户据合同费率已经自动延期1年", "#ff0000");
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
index 545d64bdc..27bd6b82e 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
@@ -119,6 +119,43 @@
             	a.expiry_time < #{expiry_date}
         ]]>
     </select>
+    <select id="getAllClientRateExpiryMerchants" resultType="com.alibaba.fastjson.JSONObject">
+        <![CDATA[
+              SELECT
+                c.client_moniker,
+                c.client_id
+              FROM sys_clients c
+                LEFT JOIN sys_client_rates r
+                  ON r.client_id = c.client_id
+              WHERE c.skip_clearing = 0
+              AND (c.approve_result = 1
+              OR (c.approve_result = 2
+              AND (c.source = 1
+              OR c.source = 2)))
+              AND c.is_valid = 1
+              AND (r.expiry_time = (SELECT
+                  MAX(expiry_time)
+                FROM sys_client_rates r3
+                WHERE r3.client_id = c.client_id
+                AND r3.rate_name = r.rate_name)
+              AND r.expiry_time <= CURRENT_DATE()
+              OR r.client_rate_id IS NULL
+              )
+        ]]>
+    </select>
+    <insert id="postponeMerchantRateByClientId" parameterType="int">
+        INSERT sys_client_rates (manager_id, client_id, rate_name, rate_value, transaction_fee, active_time, expiry_time, create_time, update_time, manager_name, clean_days, remark)
+        SELECT CONCAT('System-', CURRENT_DATE()),r.client_id,r.rate_name,r.rate_value,r.transaction_fee,DATE_ADD(r.expiry_time, INTERVAL 1 day),DATE_ADD(r.expiry_time, INTERVAL 1 year),NOW(), NOW(),
+               CONCAT('System-', CURRENT_DATE()),r.clean_days,'费率自动延期一年'
+        FROM sys_clients c
+   LEFT JOIN sys_client_rates r  ON r.client_id = c.client_id
+       WHERE c.client_id = #{clientId} AND c.skip_clearing = 0 AND (c.approve_result = 1 OR (c.approve_result = 2 AND (c.source = 1 OR c.source = 2)))
+        AND c.is_valid = 1 AND (r.expiry_time = (SELECT  MAX(expiry_time)FROM sys_client_rates r3
+        WHERE r3.client_id = c.client_id
+        AND r3.rate_name = r.rate_name)
+        AND CURRENT_DATE() >= r.expiry_time
+        OR r.client_rate_id IS NULL)
+    </insert>
     <select id="latestConfig" resultType="com.alibaba.fastjson.JSONObject">
         SELECT * FROM
         sys_client_rates

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 39/82] 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">

From 72d5b25c7dd66204a8d63069f82609eb1c3c634f Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 24 Oct 2018 09:33:35 +0800
Subject: [PATCH 40/82] fix

---
 .../royalpay/payment/manage/mappers/system/ClientRateMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
index 27bd6b82e..490a5d3c3 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
@@ -121,7 +121,7 @@
     </select>
     <select id="getAllClientRateExpiryMerchants" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-              SELECT
+              SELECT DISTINCT
                 c.client_moniker,
                 c.client_id
               FROM sys_clients c

From f7a229cddd3ce266c027b2a225f3af5ec2589102 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 24 Oct 2018 09:42:17 +0800
Subject: [PATCH 41/82] fix  v1-manager.html permission

---
 src/main/ui/manage.html                       | 85 ++++++++++---------
 .../ui/static/menu/templates/main_menu.html   | 15 ++--
 2 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 447275054..8126a4af6 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -150,7 +150,7 @@ margin-bottom: 10%;"/>
                ng-click="toggleHideSideBar()">
                 <span class="sr-only">Toggle navigation</span>
             </a>
-            <select class="navbar-header" style="height: 30px;border: 0;" ng-model="roleNow" ng-change="changeRole(roleNow)">
+            <select class="navbar-header" style="height: 30px;border: 0;text-align: center;text-align-last:center;" 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">
@@ -299,22 +299,22 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-sitemap"></i> <span>商户名录|Partner Directories</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'partners'|withModule">
+                        <li ui-sref-active="active" ng-if="'110'|withRole">
                             <a ui-sref="newPartners" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-plus"></i> <span>商户进件|New Partner</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'partners'|withModule">
+                        <li ui-sref-active="active" ng-if="'partner_analysis'|withModule">
                             <a ui-sref="partners_analysis" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-list-alt"></i> <span>商户统计|Merchants Data</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'partners'|withModule">
+                        <li ui-sref-active="active" ng-if="'clientrate'|withModule">
                             <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-shopping-cart"></i> <span>商户活跃度(原统计)</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'partners'|withModule">
+                        <li ui-sref-active="active" ng-if="('merchantAmount'|withModule)">
                             <a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-area-chart"></i> <span>商户交易额统计（原统计）</span>
                             </a>
@@ -333,22 +333,22 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                        <li ui-sref-active="active" ng-if="('1010'|withRole)">
                             <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-wrench"></i> <span>退款审核|Audit Refund</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                        <li ui-sref-active="active" ng-if="('100000000'|withRole)">
                             <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-tv"></i> <span>欠款|Pre Refund</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                        <li ui-sref-active="active" ng-if="('transAnalysis'|withModule)">
                             <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-area-chart"></i> <span>原统计</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                        <li ui-sref-active="active" ng-if="'log'|withModule">
                             <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-server"></i> <span>支付回调消息|Notify History</span>
                             </a>
@@ -362,32 +362,32 @@ margin-bottom: 10%;"/>
                         <span>风控管理|Risk Management</span>
                     </a>
                     <ul class="treeview-menu">
-                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                        <li ui-sref-active="active">
                             <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-tv"></i> <span>交易成功率监控</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                        <li ui-sref-active="active">
                             <a ui-sref="analysis_monitoring.cheat" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-bell"></i> <span>风控点预警统计</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                        <li ui-sref-active="active">
                             <a ui-sref="analysis_monitoring.cheat_monitor" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-building"></i> <span>风控点配置|Cheat Monitor</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                        <li ui-sref-active="active">
                             <a ui-sref="analysis_monitoring.risk_manager" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-list-alt"></i> <span>风控记录|Risk Records</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                        <li ui-sref-active="active">
                             <a ui-sref="analysis_monitoring.attention" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-exclamation-triangle"></i> <span>黑名单|Risky Merchants</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'tradelog'|withModule">
+                        <li ui-sref-active="active">
                             <a ui-sref="customerRankingAnalysis" ui-sref-opts="{reload:true}">
                                 <i class="fa fa fa-male"></i> <span>消费排名|Risky Merchants</span>
                             </a>
@@ -401,17 +401,17 @@ margin-bottom: 10%;"/>
                         <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">
                             <a ui-sref="businessCompliance" ui-sref-opts="{reload:true}">
                                 <i class="fa fa fa-eye"></i> <span>商户合规</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="('10'|withRole)">
+                        <li ui-sref-active="active">
                             <a ui-sref="contract">
                                 <i class="fa fa-money"></i> <span>合同签约情况</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="('10'|withRole)">
+                        <li ui-sref-active="active">
                             <a ui-sref="rate_warnings">
                                 <i class="fa fa-bell"></i> <span>签约到期预警</span>
                             </a>
@@ -429,7 +429,7 @@ margin-bottom: 10%;"/>
                             </a>
                         </li>
                         <li ui-sref-active="active"
-                            ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                            ng-if="(currentUser.org_id==null||currentUser.org_id==1)">
                             <a ui-sref="devtools.aliforexcel" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-envelope"></i> <span>Alipay进件表格导出</span>
                             </a>
@@ -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">
+                        <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>
@@ -459,17 +459,17 @@ margin-bottom: 10%;"/>
                             </a>
                         </li>
 
-                        <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                        <li ui-sref-active="active" ng-if="('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)">
                             <a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}">
                                 <i class="fa fa fa-money"></i> <span>清算预估|Estimate</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                        <li ui-sref-active="active" ng-if="'settleReport'|withModule">
                             <a ui-sref="analysis_report.settle_report" ui-sref-opts="{reload:true}">
                                 <i class="fa fa fa-tv"></i> <span>清算月报</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'clearing'|withModule">
+                        <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>
@@ -488,27 +488,27 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-file-excel-o"></i> <span>Austrac Report</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                        <li ui-sref-active="active" ng-if="'invoice'|withModule">
                             <a ui-sref="invoice" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-users"></i> <span>Partner Invoice</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                        <li ui-sref-active="active" ng-if="'platformRevenue'|withModule">
                             <a ui-sref="analysis_report.platformrevenue" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-money"></i> <span>平台收支统计|Platform Revenue</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                        <li ui-sref-active="active" ng-if="'wxSettlementsApp'|withModule">
                             <a ui-sref="analysis_report.wx_settlements" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-money"></i> <span>腾讯打款记录|Tencent Settlement</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                        <li ui-sref-active="active" ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">
                             <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-usd"></i> <span>BD提成|BD Commissions</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                        <li ui-sref-active="active">
                             <a ui-sref="analysis_org.commission" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-users"></i> <span>合伙人提成</span>
                             </a>
@@ -615,7 +615,7 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-file-text-o"></i> <span>网站管理|Site Manage</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)">
+                        <li ui-sref-active="active" ng-if="('10000000'|withRole)">
                             <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
                                 <i class="fa fa-file-text-o"></i> <span>积分商城|Integral Mall</span>
                             </a>
@@ -634,7 +634,7 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-users"></i> <span>组织管理|Organizations</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'org'|withModule">
+                        <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
                             <a ui-sref="product" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-shopping-cart"></i> <span>商品库管理</span>
                             </a>
@@ -649,7 +649,7 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-tty"></i> <span>客服管理|Service Accounts</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
+                        <li ui-sref-active="active" ng-if="'sysconfig'|withModule">
                             <a ui-sref="permission" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-key"></i> <span>角色权限管理</span>
                             </a>
@@ -663,27 +663,27 @@ margin-bottom: 10%;"/>
                         <span>绩效管理</span>
                     </a>
                     <ul class="treeview-menu">
-                        <li ui-sref-active="active" ng-if="'manager_accounts'|withModule">
+                        <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>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                        <li ui-sref-active="active" ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">
                             <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-usd"></i> <span>BD提成|BD Commissions</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                        <li ui-sref-active="active" ng-if="'10000000001000'|withRole">
                             <a ng-click="editRateConfig()" style="cursor: pointer">
                                 <i class="fa fa-cog"></i> <span>BD绩效设置</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                        <li ui-sref-active="active" ng-if="'10000000001000'|withRole">
                             <a ng-click="editBDLevels()" style="cursor: pointer">
                                 <i class="fa fa-user"></i> <span>BD级别设置</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'1000'|withRole">
+                        <li ui-sref-active="active" ng-if="'clientrate'|withModule">
                             <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-shopping-cart"></i> <span>商户活跃度</span>
                             </a>
@@ -698,7 +698,7 @@ margin-bottom: 10%;"/>
                     </a>
                     <ul class="treeview-menu">
                         <li ui-sref-active="active"
-                            ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))||('orgcommission'|withModule)">
+                            ng-if="'citypartner'|withModule">
                             <a ui-sref="newOrganizations" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-tv"></i> <span>合伙人申请</span>
                             </a>
@@ -708,11 +708,16 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-users"></i> <span>合伙人管理</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'org'|withModule">
+                        <li ui-sref-active="active" ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))">
                             <a ui-sref="analysis_org.organlasis" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-hand-peace-o"></i> <span>合伙人销售量|City Partner Sale</span>
                             </a>
                         </li>
+                        <li ui-sref-active="active" ng-if="('orgcommission'|withModule)">
+                            <a ui-sref="analysis_org.commission" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-hand-peace-o"></i> <span>合伙人提成</span>
+                            </a>
+                        </li>
                     </ul>
                 </li>
 
@@ -722,7 +727,7 @@ margin-bottom: 10%;"/>
                         <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="('merchantIdManage'|withModule)">
                             <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
                                 <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
                             </a>
@@ -748,7 +753,7 @@ margin-bottom: 10%;"/>
                         <span>开发工具|Developer</span>
                     </a>
                     <ul class="treeview-menu">
-                        <li ui-sref-active="active" ng-if="'dev'|withModule">
+                        <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>
                             </a>
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index f70ed02d0..1b40be8f9 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -272,7 +272,7 @@
                       </div>
                   </a>
               </div>
-              <div class="col-sm-2 col-xs-6">
+              <div class="col-sm-2 col-xs-6" ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
                   <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
                       <div class="description-block">
                           <img src="/static/images/main_menu/compliance_appliy.png"/>
@@ -282,7 +282,7 @@
                       </div>
                   </a>
               </div>
-              <div class="col-sm-2 col-xs-6">
+              <div class="col-sm-2 col-xs-6" ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
                   <a ui-sref="config_operation" ui-sref-opts="{reload:true}">
                       <div class="description-block">
                           <img src="/static/images/main_menu/compliance_log.png"/>
@@ -292,7 +292,7 @@
                       </div>
                   </a>
               </div>
-              <div class="col-sm-2 col-xs-6">
+              <div class="col-sm-2 col-xs-6" ng-if="(currentUser.org_id==null||currentUser.org_id==1)">
                   <a ui-sref="devtools.aliforexcel" ui-sref-opts="{reload:true}">
                       <div class="description-block">
                           <img src="/static/images/main_menu/compliance_alipayexcel.png"/>
@@ -579,7 +579,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('10'|withRole)||('1000000'|withRole)||('10000000'|withRole)" class="col-sm-2 col-xs-6">
+                <div ng-if="('10000000'|withRole)" class="col-sm-2 col-xs-6">
                     <a href="https://customer.royalpay.com.au/manage/sign_in" target="_blank">
                     <div class="description-block">
                         <img src="/static/images/main_menu/site_cms.png"/>
@@ -668,8 +668,7 @@
                     </div>
                 </div>
             </div>
-            <div class="row" ng-if="('ordervalid'|withModule)||(('clearing_org'|withModule) && currentUser.org_id>1)||('clearing'|withModule)||(
-            ('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)) || ('settleReport'|withModule) ||('platformRevenue'|withModule)">
+            <div class="row">
                 <div ng-if="'ordervalid'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="order_valid" ui-sref-opts="{reload:true}">
                         <div class="description-block">
@@ -801,8 +800,8 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-2 col-xs-6">
-                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
+                <div class="col-sm-2 col-xs-6" ng-if="('merchantIdManage'|withModule)">
+                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}" >
                         <div class="description-block">
                             <img src="/static/images/main_menu/configure_merchant_number.png"/>
                             <div class="description-text">

From e1e6f8a8c5f853df9c16a2b033face3c66058aa3 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 24 Oct 2018 10:03:46 +0800
Subject: [PATCH 42/82] fix  v2-manager.html header display

---
 src/main/ui/static/boot/managerMainAppv2.js | 22 +++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index fc224facd..fd4c3b9b6 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -9,22 +9,22 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
         var getRoleMenulist = function () {
             var roleMenu = [];
 
-            if ((window.currentUser.role.toString(2) | 1) >0){
+            if ((window.currentUser.role.toString(2) & 1) >0){
                 roleMenu.push("administrator");
             }
-            if ((window.currentUser.role.toString(2) | 10) >0){
+            if ((window.currentUser.role.toString(2) & 10) >0){
                 roleMenu.push("compliance");
             }
-            if ((window.currentUser.role.toString(2) | 100) >0){
+            if ((window.currentUser.role.toString(2) & 100) >0){
                 roleMenu.push("bduser");
             }
-            if ((window.currentUser.role.toString(2) | 1000) >0){
+            if ((window.currentUser.role.toString(2) & 1000) >0){
                 roleMenu.push("accountant");
             }
-            if ((window.currentUser.role.toString(2) | 1000000) >0){
+            if ((window.currentUser.role.toString(2) & 1000000) >0){
                 roleMenu.push("director");
             }
-            if ((window.currentUser.role.toString(2) | 10000000) >0){
+            if ((window.currentUser.role.toString(2) & 10000000) >0){
                 roleMenu.push("sitemanager");
             }
             if ((window.currentUser.role.toString(2) & 100000000) >0){
@@ -64,8 +64,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 (sessionStorage.getItem('roleNum') =='N'){
-                    $scope.headerDisplay = false;
-                    $scope.copyright = false;
+                    if (window.location.hash == "" || window.location.hash == "#/home") {
+                        $scope.headerDisplay = false;
+                        $scope.copyright = false;
+                    }else {
+                        $scope.headerDisplay = true;
+                        $scope.copyright = true;
+                    }
+
                 }else {
                     $scope.headerDisplay = true;
                     $scope.copyright = true;

From d5317359c55c0620376d6943a73e8bb8d8d8dbc4 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 24 Oct 2018 10:26:50 +0800
Subject: [PATCH 43/82] fix  v2-manager.html header rolenow

---
 src/main/ui/managev2.html                   | 17 ++++-----
 src/main/ui/static/boot/managerMainAppv2.js | 39 +++++++++++++++++++++
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
index d45e279b3..0348332ff 100644
--- a/src/main/ui/managev2.html
+++ b/src/main/ui/managev2.html
@@ -142,23 +142,20 @@ margin-bottom: 10%;"/>
             <!-- Logo -->
             <a ui-sref="home" ng-click="headerCopyDisplay()" class="logo logo-yedian shine" ng-if="!currentUser.org">
                 <!-- mini logo for sidebar mini 50x50 pixels -->
-                <span class="logo-mini"><img src="static/images/r_white_logo.svg"
-                                             style="max-height: 35px;margin-left: 15%;"></span>
+                <span class="logo-mini"></span>
                 <!-- logo for regular state and mobile devices -->
-                <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
-                                           style="max-height: 35px;">
                     <b>RoyalPay</b>
-
+                    <b>|</b>
+                     <b>{{roleNow}}</b>
             </span>
             </a>
             <a ui-sref="home" ng-click="headerCopyDisplay()" class="logo logo-yedian shine" ng-if="currentUser.org">
                 <!-- mini logo for sidebar mini 50x50 pixels -->
-                <span class="logo-mini"><img ng-src="{{currentUser.org.logo}}"
-                                             style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"></span>
+                <span class="logo-mini"></span>
                 <!-- logo for regular state and mobile devices -->
-                <span class="logo-lg"><img ng-src="{{currentUser.org.logo}}"
-                                           style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
-                        ng-bind="currentUser.org.name"></b></span>
+                <span class="logo-lg"><b
+                        ng-bind="currentUser.org.name"></b><b>|</b>
+                     <b>{{roleNow}}</b></span>
             </a>
             <ul class="navbar-header">
                 <li ui-sref-active="active" style="border-bottom-left-radius: 5px;border-top-left-radius: 5px;">
diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index fd4c3b9b6..7d16e7b1f 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -86,6 +86,45 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 $scope.copyright = true;
                 sessionStorage.setItem('role',role);
             };
+            $scope.roleNow = getroleNow();
+
+            function getroleNow() {
+                var roleNow = "";
+                switch (sessionStorage.getItem('role')) {
+                    case "administrator":
+                        roleNow = "系统配置";
+                        break;
+                    case "bduser":
+                        roleNow = "销售中心";
+                        break;
+                    case "salesmanager":
+                        roleNow = "销管中心";
+                        break;
+                    case "accountant":
+                        roleNow = "财务中心";
+                        break;
+                    case "sitemanager":
+                        roleNow = "营销中心";
+                        break;
+                    case "director":
+                        roleNow = "领导决策";
+                        break;
+                    case "developer":
+                        roleNow = "开发中心";
+                        break;
+                    case "compliance":
+                        roleNow = "合规中心";
+                        break;
+                    case "riskmanager":
+                        roleNow = "风控中心";
+                        break;
+                    default:
+                        break;
+                }
+                return roleNow;
+            }
+
+
             $http.get('/sysconfig/base').then(function (resp) {
                 $rootScope.sysParams = resp.data;
             });

From 21ce0b9d534056a54baac08c9e2774f7f42e4296 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 24 Oct 2018 10:38:19 +0800
Subject: [PATCH 44/82] fix  v2-manager.html header rolenow

---
 src/main/ui/static/boot/managerMainAppv2.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index 7d16e7b1f..0b4964770 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -63,7 +63,8 @@ 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 (sessionStorage.getItem('roleNum') =='N'){
+            $scope.roleNow = getroleNow();
+            if (sessionStorage.getItem('roleNum') =='N'){
                     if (window.location.hash == "" || window.location.hash == "#/home") {
                         $scope.headerDisplay = false;
                         $scope.copyright = false;
@@ -85,8 +86,8 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 $scope.headerDisplay = true;
                 $scope.copyright = true;
                 sessionStorage.setItem('role',role);
+                $scope.roleNow = getroleNow();
             };
-            $scope.roleNow = getroleNow();
 
             function getroleNow() {
                 var roleNow = "";

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 45/82] 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">

From 278799896180356af84e9fe3e536ea2c88f4bc1c Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Wed, 24 Oct 2018 13:48:19 +0800
Subject: [PATCH 46/82] fix

---
 src/main/ui/static/menu/templates/main_menu.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index ac8591068..6f8eeaf43 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -681,7 +681,7 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="'clearing'|withModule && role!='director'" class="col-sm-2 col-xs-6">
+                <div ng-if="('clearing'|withModule) && (role!='director')" class="col-sm-2 col-xs-6">
                     <a ui-sref="date_setting" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/settle_day.png"/>
@@ -726,7 +726,7 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="'platformRevenue'|withModule && role!='director'" class="col-sm-2 col-xs-6">
+                <div ng-if="('platformRevenue'|withModule) && (role!='director')" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/settle_verification.png"/>

From d0ea610146f097d67fbb05144b1366d79dfba9f2 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 24 Oct 2018 14:59:35 +0800
Subject: [PATCH 47/82] fix  v2-manager.html one role

---
 src/main/ui/static/boot/managerMainAppv2.js | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index 0b4964770..6e85ab3cb 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -6,48 +6,48 @@ 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) {
 
-        var getRoleMenulist = function () {
+        var getRoleMenulist = function (role) {
             var roleMenu = [];
 
-            if ((window.currentUser.role.toString(2) & 1) >0){
+            if ((role & 1) >0){
                 roleMenu.push("administrator");
             }
-            if ((window.currentUser.role.toString(2) & 10) >0){
+            if ((role & 2) >0){
                 roleMenu.push("compliance");
             }
-            if ((window.currentUser.role.toString(2) & 100) >0){
+            if ((role & 4) >0){
                 roleMenu.push("bduser");
             }
-            if ((window.currentUser.role.toString(2) & 1000) >0){
+            if ((role & 8) >0){
                 roleMenu.push("accountant");
             }
-            if ((window.currentUser.role.toString(2) & 1000000) >0){
+            if ((role & 64) >0){
                 roleMenu.push("director");
             }
-            if ((window.currentUser.role.toString(2) & 10000000) >0){
+            if ((role & 128) >0){
                 roleMenu.push("sitemanager");
             }
-            if ((window.currentUser.role.toString(2) & 100000000) >0){
+            if ((role & 256) >0){
                 roleMenu.push("developer");
             }
-            if ((window.currentUser.role.toString(2) & 1000000000) >0){
+            if ((role & 1024) >0){
                 roleMenu.push("riskmanager");
             }
-            if ((window.currentUser.role.toString(2) & 100000000000) >0){
+            if ((role & 2048) >0){
                 roleMenu.push("guest");
             }
-            if ((window.currentUser.role.toString(2) & 10000000000000) >0){
+            if ((role & 8192) >0){
                 roleMenu.push("salesmanager");
             }
             return roleMenu;
         };
-        if (getRoleMenulist().length>1) {
+        if (getRoleMenulist(window.currentUser.role).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());
+            sessionStorage.setItem('role',getRoleMenulist(window.currentUser.role).valueOf());
+            $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/menu?role=' + getRoleMenulist(window.currentUser.role).valueOf());
         }
 
 

From aa437650106bc3399470ba15ce4098d2bb863bd7 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Wed, 24 Oct 2018 17:34:38 +0800
Subject: [PATCH 48/82] fix

---
 src/main/ui/static/config/organizations/organizations.js    | 2 +-
 .../ui/static/config/organizations/templates/new_org.html   | 6 +++---
 .../static/config/organizations/templates/org_detail.html   | 2 +-
 src/main/ui/static/payment/partner/partner-manage.js        | 4 ++--
 .../ui/static/payment/partner/templates/partner_detail.html | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/ui/static/config/organizations/organizations.js b/src/main/ui/static/config/organizations/organizations.js
index b3a93a524..aa5ae2675 100644
--- a/src/main/ui/static/config/organizations/organizations.js
+++ b/src/main/ui/static/config/organizations/organizations.js
@@ -369,7 +369,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
                     content: 'Creation of new organization succeeded',
                     type: 'success'
                 });
-                $state.go('^.detail',{orgId:resp.data.org_id},{reload:true});
+                $state.go('organizations.detail',{orgId:resp.data.org_id},{reload:true});
             },function (resp) {
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
             })
diff --git a/src/main/ui/static/config/organizations/templates/new_org.html b/src/main/ui/static/config/organizations/templates/new_org.html
index 13eaf2fed..4c3442ede 100644
--- a/src/main/ui/static/config/organizations/templates/new_org.html
+++ b/src/main/ui/static/config/organizations/templates/new_org.html
@@ -1,9 +1,9 @@
 <section class="content-header">
     <h1>New Organization</h1>
     <ol class="breadcrumb">
-        <li><i class="fa fa-users"></i> Basic Config</li>
+        <li><i class="fa fa-users"></i> Framework</li>
         <li>
-            <a ui-sref="^" ui-sref-opts="{reload:true}">Organizations</a>
+            <a ui-sref="organizations" ui-sref-opts="{reload:true}">Organizations</a>
         </li>
         <li class="active">New Organization</li>
     </ol>
@@ -304,7 +304,7 @@
                 <div class="btn-group margin-bottom margin-top">
                     <button class="btn btn-success" type="button" ng-click="saveOrg(org_form)">Save
                     </button>
-                    <a class="btn btn-danger" role="button" ui-sref="^" ui-sref-opts="{reload:true}">Back</a>
+                    <a class="btn btn-danger" role="button" ui-sref="organizations" ui-sref-opts="{reload:true}">Back</a>
                 </div>
                 <!--<button class="btn btn-success col-sm-offset-2" ng-click="update()"><i class="fa fa-save"></i> Update</button>-->
             </form>
diff --git a/src/main/ui/static/config/organizations/templates/org_detail.html b/src/main/ui/static/config/organizations/templates/org_detail.html
index 9fa311101..8cea0a62b 100644
--- a/src/main/ui/static/config/organizations/templates/org_detail.html
+++ b/src/main/ui/static/config/organizations/templates/org_detail.html
@@ -11,7 +11,7 @@
 <section class="content-header">
     <h1 ng-bind="org.name"></h1>
     <ol class="breadcrumb">
-        <li><i class="fa fa-users"></i> Basic Config</li>
+        <li><i class="fa fa-users"></i> Framework</li>
         <li>
             <a ui-sref="^" ui-sref-opts="{reload:true}">Organizations</a>
         </li>
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 269e64bca..58b558682 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -521,8 +521,8 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             $http.post('/sys/partners', $scope.partner).then(function (resp) {
                 commonDialog.alert({title: 'Success', content: 'Register new partner successfully', type: 'success'});
                 $scope.updateMerchantLocation();
-                $scope.loadPartners();
-                $state.go('^.detail', {clientMoniker: resp.data.client_moniker})
+                // $scope.loadPartners();
+                $state.go('partners.detail', {clientMoniker: resp.data.client_moniker})
             }, function (resp) {
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
             });
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html
index 91275cb48..a773bec40 100644
--- a/src/main/ui/static/payment/partner/templates/partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/partner_detail.html
@@ -43,9 +43,9 @@
     </h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-sitemap"></i> Payment
+            <i class="fa fa-sitemap"></i> Partner Manage
         </li>
-        <li><a ui-sref="^">Partner Manage</a></li>
+        <li><a ui-sref="^">Partner Directories</a></li>
         <li class="active">Partner Detail</li>
     </ol>
 </section>

From 5c4e012148568f739d2fe4cdca3bbf3c3bb55e2c Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 24 Oct 2018 17:38:11 +0800
Subject: [PATCH 49/82] fix  v1&v2-manager.html

---
 src/main/ui/manage.html                              |  8 ++++----
 .../config/bdprize/templates/bd_prize_root.html      | 12 ++++++------
 src/main/ui/static/menu/templates/main_menu.html     |  6 +++---
 .../payment/tradelog/templates/refund_review.html    |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index ed0a0bcf9..dd6d4db8b 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -338,7 +338,7 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-wrench"></i> <span>退款审核|Audit Refund</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="('100000000'|withRole)">
+                        <li ui-sref-active="active" ng-if="('100001010'|withRole)">
                             <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-tv"></i> <span>欠款|Pre Refund</span>
                             </a>
@@ -449,7 +449,7 @@ margin-bottom: 10%;"/>
                             </a>
                         </li>
                         <li ui-sref-active="active"  ng-if="('clearing'|withModule) && (role!='director')">
-                            <a ui-sref="clearingLogs.date_setting">
+                            <a ui-sref="date_setting">
                                 <i class="fa fa-balance-scale"></i> <span>清算日管理</span>
                             </a>
                         </li>
@@ -698,7 +698,7 @@ margin-bottom: 10%;"/>
                     </a>
                     <ul class="treeview-menu">
                         <li ui-sref-active="active"
-                            ng-if="'citypartner'|withModule">
+                            ng-if="'org'|withModule">
                             <a ui-sref="newOrganizations" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-tv"></i> <span>合伙人申请</span>
                             </a>
@@ -708,7 +708,7 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-users"></i> <span>合伙人管理</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))">
+                        <li ui-sref-active="active" ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('10000000000000'|withRole))">
                             <a ui-sref="analysis_org.organlasis" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-hand-peace-o"></i> <span>合伙人销售量|City Partner Sale</span>
                             </a>
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
index 7657024b0..5baefdd15 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
@@ -7,21 +7,21 @@
         </ol>
     </section>
     <section class="content">
-        <div class="box box-danger" ng-if="'1000'|withRole">
+        <div class="box box-danger" ng-if="('1000'|withRole) || ('1000000'|withRole) || ('10000000000000'|withRole)">
             <div class="box-body">
                 <div class="box box-default">
                     <div class="box-body">
                         <div class="form-inline">
-                            <div class="form-group">
+                            <div class="form-group" ng-if="!('1000000'|withRole)">
                                 <input type="text" class="form-control" uib-datepicker-popup="yyyy-MM" ng-model="generate.month"
                                        is-open="ctrl.genmonth" datepicker-options="{minMode: 'month'}"
                                        ng-click="ctrl.genmonth=true" placeholder="Select Month"/>
                             </div>
-                            <button class="btn btn-primary" ng-click="generateReport()" ng-disabled="!generate.month">
+                            <button ng-if="!('1000000'|withRole)" class="btn btn-primary" ng-click="generateReport()" ng-disabled="!generate.month">
                                 Generate Report
                             </button>
-                            <button class="btn btn-primary" ng-click="editRateConfig()"><i class="fa fa-cog"></i> Edit Rate Config</button>
-                            <button class="btn btn-primary" ng-click="editBDLevels()"><i class="fa fa-user"></i> Edit BD Level</button>
+                            <button ng-if="'10000000000000'|withRole" class="btn btn-primary" ng-click="editRateConfig()"><i class="fa fa-cog"></i> Edit Rate Config</button>
+                            <button ng-if="'10000000000000'|withRole" class="btn btn-primary" ng-click="editBDLevels()"><i class="fa fa-user"></i> Edit BD Level</button>
                             <loadingbar ng-if="generate.status"></loadingbar>
                         </div>
                     </div>
@@ -31,7 +31,7 @@
                 <!--<button class="btn btn-primary" ng-click="editCommissionConfig()"><i class="fa fa-user"></i> Edit Commission Config</button>-->
             </div>
         </div>
-        <div class="box box-default" ng-if="'1000'|withRole">
+        <div class="box box-default" ng-if="('1000'|withRole) || ('1000000'|withRole) || ('10000000000000'|withRole)">
             <div class="box-header">
                <!-- <div uib-dropdown>
                     <button class="btn btn-primary" uib-dropdown-toggle type="button" ng-bind="params.year"></button>
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 6f8eeaf43..0d9e31e83 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -132,7 +132,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('100000000'|withRole)" class="col-sm-2 col-xs-6">
+                <div ng-if="('100001010'|withRole)" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_arrears.png"/>
@@ -316,7 +316,7 @@
                 </div>
             </div>
             <div class="row">
-                <div ng-if="'citypartner'|withModule" class="col-sm-2 col-xs-6">
+                <div ng-if="'org'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="newOrganizations" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/partner_application.png"/>
@@ -336,7 +336,7 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))" class="col-sm-2 col-xs-6">
+                <div ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('10000000000000'|withRole))" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_org.organlasis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/partner_trading_volume.png"/>
diff --git a/src/main/ui/static/payment/tradelog/templates/refund_review.html b/src/main/ui/static/payment/tradelog/templates/refund_review.html
index ed286dcce..08620a1b9 100644
--- a/src/main/ui/static/payment/tradelog/templates/refund_review.html
+++ b/src/main/ui/static/payment/tradelog/templates/refund_review.html
@@ -18,11 +18,11 @@
     <div class="col-sm-12">
         <div class="box-solid">
 
-            <div class="panel panel-default">
+            <div class="panel panel-default" ng-if="'10'|withRole">
                 <div class="panel-heading">Refund Audit</div>
                 <div class="panel-body">
                     <div class="form-horizontal">
-                        <div class="form-group" ng-if="'111'|withRole">
+                        <div class="form-group">
                             <label class="col-sm-2 control-label">Enable Audit</label>
                             <div class="col-sm-4">
                                 <input type="checkbox" ng-model="sysconfig.refund_audit" bs-switch

From 7e62aeb6b28a2e0b89f0126da5dd63b74e43429e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 24 Oct 2018 17:52:03 +0800
Subject: [PATCH 50/82] fix  v1&v2-manager.html

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

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index dd6d4db8b..e726c54be 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -503,7 +503,7 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-money"></i> <span>腾讯打款记录|Tencent Settlement</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">
+                        <li ui-sref-active="active" ng-if="(('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)) || ('100'|withRole)">
                             <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-usd"></i> <span>BD提成|BD Commissions</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 0d9e31e83..6093ccef5 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -389,7 +389,7 @@
                         </div>
                     </a>
                 </div>
-                <div ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
+                <div ng-if="(('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)) || ('100'|withRole)" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/bd_commission.png"/>

From 971f0ca39adccce5e4f0c06dab1c3db22ccaf6a2 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 24 Oct 2018 18:00:06 +0800
Subject: [PATCH 51/82] revert  v1&v2-manager.html

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

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index e726c54be..dd6d4db8b 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -503,7 +503,7 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-money"></i> <span>腾讯打款记录|Tencent Settlement</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="(('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)) || ('100'|withRole)">
+                        <li ui-sref-active="active" ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)">
                             <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-usd"></i> <span>BD提成|BD Commissions</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 6093ccef5..0d9e31e83 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -389,7 +389,7 @@
                         </div>
                     </a>
                 </div>
-                <div ng-if="(('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)) || ('100'|withRole)" class="col-sm-2 col-xs-6">
+                <div ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/bd_commission.png"/>

From 8496689ca05703d6fa994c3cee4f9a5b94b0354e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 24 Oct 2018 18:50:17 +0800
Subject: [PATCH 52/82] =?UTF-8?q?add=20=E4=B8=B4=E6=97=B6=E5=90=88?=
 =?UTF-8?q?=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/payment/partner/partner-manage.js          | 4 ++++
 .../ui/static/payment/partner/templates/partner_detail.html   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 58b558682..534f7723a 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -777,6 +777,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             });
 
         };
+        $scope.Export = function () {
+            var url = '/dev/' + $scope.partner.client_moniker +'/export/aggregate/agreepdf' ;
+            return url;
+        }
         $scope.uploadAgreeFile = function (file) {
             if (file != null) {
                 if (file.size > 2 * 1024 * 1024) {
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html
index a773bec40..b363e245e 100644
--- a/src/main/ui/static/payment/partner/templates/partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/partner_detail.html
@@ -138,6 +138,10 @@
             </div>
         </div>
     </div>
+    <div> <a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{Export()}}">
+        <i class="fa fa-download" ></i>制作临时合同</a>
+    </div>
+
     <div class="box" ng-if="('100'|withRole) && partner.show_all_permission"
          ng-class="{'box-warning':partner.approve_result!=5,'box-danger':partner.approve_result==5}">
         <div class="box-header with-border">

From a9a74e58cf166c21d2151cbc5f3c7d583e6487a2 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 25 Oct 2018 10:44:15 +0800
Subject: [PATCH 53/82] =?UTF-8?q?fix=20=E9=A2=86=E5=AF=BC=E5=86=B3?=
 =?UTF-8?q?=E7=AD=96=E5=8A=A0=E5=85=A5=E5=90=88=E4=BC=99=E4=BA=BA=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index dd6d4db8b..3cb91bb07 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -626,7 +626,7 @@ margin-bottom: 10%;"/>
                 <li class="treeview" ng-if="roleNow=='administrator'">
                     <a href="javascript:;">
                         <i class="fa fa-users"></i>
-                        <span>组织架构|Organization Framework</span>
+                        <span>组织架构|Organization</span>
                     </a>
                     <ul class="treeview-menu">
                         <li ui-sref-active="active" ng-if="'org'|withModule">
@@ -691,7 +691,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow=='salesmanager'">
+                <li class="treeview" ng-if="(role=='salesmanager') || (role=='director')">
                     <a href="javascript:;">
                         <i class="fa fa-tv"></i>
                         <span>合伙人管理</span>
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 0d9e31e83..15745fb13 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -307,7 +307,7 @@
               </div>
           </div>
         </div>
-        <div class="list-group" ng-if="role=='salesmanager'">
+        <div class="list-group" ng-if="(role=='salesmanager') || (role=='director')">
             <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">
                     <div class="description-block">

From 005a33d84ebdb1584ed56df3c8e4700d3a853897 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 25 Oct 2018 15:37:27 +0800
Subject: [PATCH 54/82] fix check has role

---
 src/main/ui/manage.html                       |  8 +--
 src/main/ui/managev2.html                     |  4 ++
 src/main/ui/static/boot/managerMainApp.js     | 50 ++++++++++++++++++-
 src/main/ui/static/boot/managerMainAppv2.js   | 40 +++++++++------
 src/main/ui/static/config/managers/manager.js |  2 +
 .../config/managers/templates/modify.html     |  4 +-
 .../managers/templates/new_manager.html       |  6 +--
 .../templates/org_commission_root.html        |  2 +-
 src/main/ui/static/menu/managerMenu.js        | 47 ++++++++++++++++-
 src/main/ui/static/menu/templates/home.html   | 22 ++++----
 .../ui/static/menu/templates/main_menu.html   |  4 +-
 11 files changed, 148 insertions(+), 41 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 3cb91bb07..ffd0b7c2b 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -281,14 +281,14 @@ margin-bottom: 10%;"/>
 
             <ul class="sidebar-menu" data-widget="tree">
 
-                <li ui-sref-active="active" ng-if="'dashboard'|withModule">
+                <li ui-sref-active="active" ng-if="roleNow!=null && 'dashboard'|withModule">
                     <a ui-sref="dashboard">
                         <i class="fa fa-dashboard"></i>
                         <span>控制台|Dashboard</span>
                     </a>
                 </li>
 
-                <li class="treeview" ng-if="roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
+                <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>
@@ -322,7 +322,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
+                <li class="treeview" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
                     <a href="javascript:;">
                         <i class="fa fa-list-alt"></i>
                         <span>交易管理|Transaction</span>
@@ -691,7 +691,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="treeview" ng-if="(role=='salesmanager') || (role=='director')">
+                <li class="treeview" ng-if="(roleNow=='salesmanager') || (roleNow=='director')">
                     <a href="javascript:;">
                         <i class="fa fa-tv"></i>
                         <span>合伙人管理</span>
diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
index 0348332ff..4fc1108e7 100644
--- a/src/main/ui/managev2.html
+++ b/src/main/ui/managev2.html
@@ -147,6 +147,7 @@ margin-bottom: 10%;"/>
                     <b>RoyalPay</b>
                     <b>|</b>
                      <b>{{roleNow}}</b>
+
             </span>
             </a>
             <a ui-sref="home" ng-click="headerCopyDisplay()" class="logo logo-yedian shine" ng-if="currentUser.org">
@@ -157,6 +158,9 @@ margin-bottom: 10%;"/>
                         ng-bind="currentUser.org.name"></b><b>|</b>
                      <b>{{roleNow}}</b></span>
             </a>
+            <select style="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">
                 <li ui-sref-active="active" style="border-bottom-left-radius: 5px;border-top-left-radius: 5px;">
                     <a ui-sref="dashboard"  role="button">Dashboard</a>
diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js
index 94318c0bf..067b1b66e 100644
--- a/src/main/ui/static/boot/managerMainApp.js
+++ b/src/main/ui/static/boot/managerMainApp.js
@@ -202,6 +202,48 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 });
             }
 
+            function hasRole() {
+                var rolenum;
+                switch (sessionStorage.getItem('role')) {
+                    case "administrator":
+                        rolenum = 1;
+                        break;
+                    case "bduser":
+                        rolenum = 4;
+                        break;
+                    case "salesmanager":
+                        rolenum = 8192;
+                        break;
+                    case "accountant":
+                        rolenum = 8;
+                        break;
+                    case "sitemanager":
+                        rolenum = 128;
+                        break;
+                    case "director":
+                        rolenum = 64;
+                        break;
+                    case "developer":
+                        rolenum = 256;
+                        break;
+                    case "compliance":
+                        rolenum = 2;
+                        break;
+                    case "riskmanager":
+                        rolenum = 1024;
+                        break;
+                    default:
+                        break;
+                }
+                if ((window.currentUser.role & rolenum) >0) {
+                    return true;
+                }else {
+                    sessionStorage.removeItem('role');
+                    return false;
+                }
+            }
+
+
             var getRoleMenulist = function (role) {
                 var roleMenu = [];
 
@@ -238,7 +280,13 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 return roleMenu;
             };
             $scope.role = getRoleMenulist(window.currentUser.role);
-            sessionStorage.setItem('role',$scope.role[0].value);
+
+            if (sessionStorage.getItem('role') == null) {
+                sessionStorage.setItem('role',$scope.role[0].value);
+            }else {
+                hasRole();
+            }
+
             $scope.roleNow = sessionStorage.getItem('role');
 
             $scope.changeRole = function (index) {
diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index 6e85ab3cb..0b30e7962 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -6,38 +6,38 @@ 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) {
 
-        var getRoleMenulist = function (role) {
+         window.getRoleMenulist = function (role) {
             var roleMenu = [];
 
             if ((role & 1) >0){
-                roleMenu.push("administrator");
+                roleMenu.push({'value':'administrator','module':'系统配置'});
             }
             if ((role & 2) >0){
-                roleMenu.push("compliance");
+                roleMenu.push({'value':'compliance','module':'合规中心'});
             }
             if ((role & 4) >0){
-                roleMenu.push("bduser");
+                roleMenu.push({'value':'bduser','module':"销售中心"});
             }
             if ((role & 8) >0){
-                roleMenu.push("accountant");
+                roleMenu.push({'value':'accountant','module':"财务中心"});
             }
             if ((role & 64) >0){
-                roleMenu.push("director");
+                roleMenu.push({'value':'director','module':"领导决策"});
             }
             if ((role & 128) >0){
-                roleMenu.push("sitemanager");
+                roleMenu.push({'value':'sitemanager','module':"营销中心"});
             }
             if ((role & 256) >0){
-                roleMenu.push("developer");
+                roleMenu.push({'value':'developer','module':"开发中心"});
             }
             if ((role & 1024) >0){
-                roleMenu.push("riskmanager");
+                roleMenu.push({'value':'riskmanager','module':"风控中心"});
             }
             if ((role & 2048) >0){
-                roleMenu.push("guest");
+                roleMenu.push({'value':'guest','module':"guest"});
             }
             if ((role & 8192) >0){
-                roleMenu.push("salesmanager");
+                roleMenu.push({'value':'salesmanager','module':"销管中心"});
             }
             return roleMenu;
         };
@@ -46,8 +46,8 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
             $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/home');
         }else {
             sessionStorage.setItem('roleNum','1');
-            sessionStorage.setItem('role',getRoleMenulist(window.currentUser.role).valueOf());
-            $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/menu?role=' + getRoleMenulist(window.currentUser.role).valueOf());
+            sessionStorage.setItem('role',getRoleMenulist(window.currentUser.role)[0].value);
+            $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/menu');
         }
 
 
@@ -61,9 +61,19 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
         $httpProvider.defaults.headers.get['Cache-Control'] = 'no-cache';
         $httpProvider.defaults.headers.get['Pragma'] = 'no-cache';
     }]);
-    app.controller('managerIndexCtrl', ['$scope', '$rootScope', '$http', '$log', '$timeout', '$interval', '$uibModal', '$filter', 'myLoginLogView', 'commonDialog',
-        function ($scope, $rootScope, $http, $log, $timeout, $interval, $uibModal, $filter, myLoginLogView, commonDialog) {
+    app.controller('managerIndexCtrl', ['$scope', '$state','$rootScope', '$http', '$log', '$timeout', '$interval', '$uibModal', '$filter', 'myLoginLogView', 'commonDialog',
+        function ($scope, $state,$rootScope, $http, $log, $timeout, $interval, $uibModal, $filter, myLoginLogView, commonDialog) {
+            $scope.rolelist = window.getRoleMenulist(window.currentUser.role);
             $scope.roleNow = getroleNow();
+            $scope.roleName = getroleNow();
+            $scope.changeRole = function (index) {
+                sessionStorage.setItem('role',index);
+                $scope.roleNow = getroleNow();
+                $state.go('listMenu',null,{
+                    reload:true
+                });
+            };
+
             if (sessionStorage.getItem('roleNum') =='N'){
                     if (window.location.hash == "" || window.location.hash == "#/home") {
                         $scope.headerDisplay = false;
diff --git a/src/main/ui/static/config/managers/manager.js b/src/main/ui/static/config/managers/manager.js
index 1ffaa3ea6..ffea729ac 100644
--- a/src/main/ui/static/config/managers/manager.js
+++ b/src/main/ui/static/config/managers/manager.js
@@ -131,6 +131,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
     }]);
     app.controller('newManagerDialogCtrl', ['$scope', '$http', function ($scope, $http) {
         $scope.params = {};
+        $scope.manager = {};
         if(($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && $scope.currentUser.org_id){
             var params = angular.copy($scope.params);
             params.org_id = $scope.currentUser.org_id;
@@ -164,6 +165,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
                 $scope.manager.org_id = $scope.manager.org_id2;
             }
             delete $scope.manager.org_id2;
+
             $http.post('/sys/manager_accounts', $scope.manager).then(function () {
                 $scope.$close();
             }, function (resp) {
diff --git a/src/main/ui/static/config/managers/templates/modify.html b/src/main/ui/static/config/managers/templates/modify.html
index fe043378f..46b4a356a 100644
--- a/src/main/ui/static/config/managers/templates/modify.html
+++ b/src/main/ui/static/config/managers/templates/modify.html
@@ -98,9 +98,9 @@
                         <label ng-if="!manager.admin && !manager.operator">
                             <input type="checkbox" ng-model="manager.bd" name="bd">BD User
                         </label>
-                        <label ng-if="('00001'|withRole)">
+<!--                        <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.orgmanager" name="orgmanager">Org Manager
-                        </label>
+                        </label>-->
                     </p>
                 </div>
               <!--  <div class="form-group" ng-if="('1'|withRole) && !manager.admin && !manager.operator && !manager.sitemanager && orgs!=null">
diff --git a/src/main/ui/static/config/managers/templates/new_manager.html b/src/main/ui/static/config/managers/templates/new_manager.html
index 81d3d1d04..9c8ca94d7 100644
--- a/src/main/ui/static/config/managers/templates/new_manager.html
+++ b/src/main/ui/static/config/managers/templates/new_manager.html
@@ -107,13 +107,13 @@
                         <label ng-if="!manager.admin && !manager.operator">
                             <input type="checkbox" ng-model="manager.bd" name="bd">BD User
                         </label>
-                        <label ng-if="('00001'|withRole)">
+<!--                        <label ng-if="('00001'|withRole)">
                             <input type="checkbox" ng-model="manager.orgmanager" name="guest">Org Manager
-                        </label>
+                        </label>-->
                     </p>
                 </div>
 
-                <div class="form-group" ng-if="('1'|withRole) && !manager.admin && !manager.operator && orgs != null">
+                <div class="form-group" ng-if="('1'|withRole) && !manager.admin && !manager.operator && orgs != null && manager.bd">
                     <label class="control-label" for="org-select">Organization</label>
                     <select class="form-control" ng-model="manager.org_id" id="org-select"
                             ng-options="org.org_id as org.name for org in orgs"
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
index 7cc5ddbe3..f9e064700 100644
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
@@ -6,7 +6,7 @@
     </ol>
 </section>
 <div class="content">
-    <div class="box box-default">
+    <div class="box box-default" ng-if="'10000000000000'|withRole">
         <div class="box-body">
             <div class="form-inline">
                 <div class="form-group">
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index 81c08d874..2088b8b93 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -3,7 +3,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
     var app = angular.module('listMenuApp', ['ui.router', 'ui.bootstrap']);
     app.config(['$stateProvider', function ($stateProvider) {
         $stateProvider.state('listMenu', {
-            url: '/menu?role',
+            url: '/menu',
             controller: 'listMenuCtrl',
             templateUrl: '/static/menu/templates/main_menu.html'
         }).state('home', {
@@ -14,7 +14,50 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
     }]);
     app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal','$location', '$anchorScroll','$stateParams', function ($scope, $http,$filter, $uibModal,$location, $anchorScroll,$stateParams) {
 
-        $scope.role = sessionStorage.getItem('role');
+        function hasRole() {
+            var rolenum;
+            switch (sessionStorage.getItem('role')) {
+                case "administrator":
+                    rolenum = 1;
+                    break;
+                case "bduser":
+                    rolenum = 4;
+                    break;
+                case "salesmanager":
+                    rolenum = 8192;
+                    break;
+                case "accountant":
+                    rolenum = 8;
+                    break;
+                case "sitemanager":
+                    rolenum = 128;
+                    break;
+                case "director":
+                    rolenum = 64;
+                    break;
+                case "developer":
+                    rolenum = 256;
+                    break;
+                case "compliance":
+                    rolenum = 2;
+                    break;
+                case "riskmanager":
+                    rolenum = 1024;
+                    break;
+                default:
+                    break;
+            }
+            if ((window.currentUser.role & rolenum) >0) {
+                return true;
+            }else {
+                sessionStorage.removeItem('role');
+                return false;
+            }
+        }
+
+        if (hasRole()) {
+            $scope.role = sessionStorage.getItem('role');
+        }
 
         $scope.editRateConfig = function () {
             $uibModal.open({
diff --git a/src/main/ui/static/menu/templates/home.html b/src/main/ui/static/menu/templates/home.html
index 31dc55ebe..a1d5923f8 100644
--- a/src/main/ui/static/menu/templates/home.html
+++ b/src/main/ui/static/menu/templates/home.html
@@ -10,7 +10,7 @@
     }
 
     .box-items {
-        padding: 30px 15px 15px 15px;
+        padding: 30px 1% 15px 1%;
         cursor: pointer;
 
     }
@@ -71,7 +71,7 @@
 
     <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;min-height:626px;flex-wrap:wrap">
         <div class="box-items" ng-if="'100'|withRole">
-            <a ng-click="headerShow('bduser')" ui-sref="listMenu({role:'bduser'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('bduser')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_1.png">
                 </div>
@@ -80,7 +80,7 @@
         </div>
 
         <div class="box-items" ng-if="'10000000000'|withRole">
-            <a ng-click="headerShow('riskmanager')" ui-sref="listMenu({role:'riskmanager'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('riskmanager')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_2.png">
                 </div>
@@ -89,7 +89,7 @@
         </div>
 
         <div class="box-items" ng-if="'10'|withRole">
-            <a ng-click="headerShow('compliance')" ui-sref="listMenu({role:'compliance'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('compliance')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_3.png">
                 </div>
@@ -98,7 +98,7 @@
         </div>
 
         <div class="box-items" ng-if="'1000'|withRole">
-            <a ng-click="headerShow('accountant')" ui-sref="listMenu({role:'accountant'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('accountant')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_4.png">
                 </div>
@@ -107,7 +107,7 @@
         </div>
 
         <div class="box-items" ng-if="'10000000000000'|withRole">
-            <a ng-click="headerShow('salesmanager')" ui-sref="listMenu({role:'salesmanager'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('salesmanager')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_5.png">
                 </div>
@@ -116,7 +116,7 @@
         </div>
 
         <div class="box-items" ng-if="'10000000'|withRole">
-            <a ng-click="headerShow('sitemanager')" ui-sref="listMenu({role:'sitemanager'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('sitemanager')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_6.png">
                 </div>
@@ -125,7 +125,7 @@
         </div>
 
         <div class="box-items" ng-if="'1000000'|withRole">
-            <a ng-click="headerShow('director')" ui-sref="listMenu({role:'director'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('director')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_7.png">
                 </div>
@@ -134,7 +134,7 @@
         </div>
 
         <div class="box-items" ng-if="'1'|withRole">
-            <a ng-click="headerShow('administrator')" ui-sref="listMenu({role:'administrator'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('administrator')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_8.png">
                 </div>
@@ -143,7 +143,7 @@
         </div>
 
         <div class="box-items" ng-if="'100000000'|withRole">
-            <a ng-click="headerShow('developer')" ui-sref="listMenu({role:'developer'})" ui-sref-opts="{reload:true}">
+            <a ng-click="headerShow('developer')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_9.png">
                 </div>
@@ -152,7 +152,7 @@
         </div>
 
         <!--<div class="box-items" ng-if="'1000000'|withRole">-->
-        <!--<a ng-click="headerShow()" ui-sref="listMenu({role:'datacontent'})" ui-sref-opts="{reload:true}">-->
+        <!--<a ng-click="headerShow()" ui-sref="listMenu()" ui-sref-opts="{reload:true}">-->
         <!--<div class="boxs">-->
         <!--<img src="/static/images/manage/menu_10.png">-->
         <!--</div>-->
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 15745fb13..69099262d 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -32,7 +32,7 @@
             </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="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="partners">
                     <div class="description-block">
@@ -103,7 +103,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group" ng-if="role!='administrator' && role!='developer' && role!='sitemanager'">
+        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
             <div class="row" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
                     <div class="description-block">

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 55/82] 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

From 410d501cdaf92c4ba1ae9987244c0687df749e15 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 25 Oct 2018 16:23:39 +0800
Subject: [PATCH 56/82] fix managerv2 header select

---
 src/main/ui/managev2.html                   | 2 +-
 src/main/ui/static/boot/managerMainAppv2.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
index 4fc1108e7..e1f30a4f5 100644
--- a/src/main/ui/managev2.html
+++ b/src/main/ui/managev2.html
@@ -158,7 +158,7 @@ margin-bottom: 10%;"/>
                         ng-bind="currentUser.org.name"></b><b>|</b>
                      <b>{{roleNow}}</b></span>
             </a>
-            <select style="height: 30px;border: 0;text-align: center;text-align-last:center;" ng-model="roleName" ng-change="changeRole(roleName)">
+            <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">
diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index 0b30e7962..cee641170 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -65,7 +65,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
         function ($scope, $state,$rootScope, $http, $log, $timeout, $interval, $uibModal, $filter, myLoginLogView, commonDialog) {
             $scope.rolelist = window.getRoleMenulist(window.currentUser.role);
             $scope.roleNow = getroleNow();
-            $scope.roleName = getroleNow();
+            $scope.roleName = sessionStorage.getItem('role');
             $scope.changeRole = function (index) {
                 sessionStorage.setItem('role',index);
                 $scope.roleNow = getroleNow();

From 1e09f24b8524fc07c8f0b61a4ea1363fc873bf57 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Thu, 25 Oct 2018 16:25:44 +0800
Subject: [PATCH 57/82] fix

---
 src/main/ui/static/menu/templates/home.html | 28 +++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/ui/static/menu/templates/home.html b/src/main/ui/static/menu/templates/home.html
index a1d5923f8..a16f87ba5 100644
--- a/src/main/ui/static/menu/templates/home.html
+++ b/src/main/ui/static/menu/templates/home.html
@@ -10,9 +10,8 @@
     }
 
     .box-items {
-        padding: 30px 1% 15px 1%;
-        cursor: pointer;
-
+        /*padding: 30px 1% 15px 1%;*/
+        /*cursor: pointer;*/
     }
 
     .box-items img {
@@ -59,6 +58,9 @@
         padding-top: 1%;
         padding-bottom: 1%;
     }
+    .boxs {
+        margin: 0 auto;
+    }
 </style>
     <div class="backgroud">
     <div class="total_logo">
@@ -69,8 +71,8 @@
 
     </div>
 
-    <div style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 60%;min-height:626px;flex-wrap:wrap">
-        <div class="box-items" ng-if="'100'|withRole">
+    <div class="row" style="margin: 0 auto;display: flex;padding-top: 40px;padding-bottom:0.5%;width: 80%;min-height:626px;flex-wrap:wrap">
+        <div class="col-sm-3 col-xs-6" ng-if="'100'|withRole">
             <a ng-click="headerShow('bduser')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_1.png">
@@ -79,7 +81,7 @@
             </a>
         </div>
 
-        <div class="box-items" ng-if="'10000000000'|withRole">
+        <div class="box-items col-sm-3 col-xs-6" ng-if="'10000000000'|withRole">
             <a ng-click="headerShow('riskmanager')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_2.png">
@@ -88,7 +90,7 @@
             </a>
         </div>
 
-        <div class="box-items" ng-if="'10'|withRole">
+        <div class="box-items col-sm-3 col-xs-6" ng-if="'10'|withRole">
             <a ng-click="headerShow('compliance')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_3.png">
@@ -97,7 +99,7 @@
             </a>
         </div>
 
-        <div class="box-items" ng-if="'1000'|withRole">
+        <div class="box-items col-sm-3 col-xs-6" ng-if="'1000'|withRole">
             <a ng-click="headerShow('accountant')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_4.png">
@@ -106,7 +108,7 @@
             </a>
         </div>
 
-        <div class="box-items" ng-if="'10000000000000'|withRole">
+        <div class="box-items col-sm-3 col-xs-6" ng-if="'10000000000000'|withRole">
             <a ng-click="headerShow('salesmanager')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_5.png">
@@ -115,7 +117,7 @@
             </a>
         </div>
 
-        <div class="box-items" ng-if="'10000000'|withRole">
+        <div class="box-items col-sm-3 col-xs-6" ng-if="'10000000'|withRole">
             <a ng-click="headerShow('sitemanager')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_6.png">
@@ -124,7 +126,7 @@
             </a>
         </div>
 
-        <div class="box-items" ng-if="'1000000'|withRole">
+        <div class="box-items col-sm-3 col-xs-6" ng-if="'1000000'|withRole">
             <a ng-click="headerShow('director')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_7.png">
@@ -133,7 +135,7 @@
             </a>
         </div>
 
-        <div class="box-items" ng-if="'1'|withRole">
+        <div class="box-items col-sm-3 col-xs-6" ng-if="'1'|withRole">
             <a ng-click="headerShow('administrator')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_8.png">
@@ -142,7 +144,7 @@
             </a>
         </div>
 
-        <div class="box-items" ng-if="'100000000'|withRole">
+        <div class="box-items col-sm-3 col-xs-6" ng-if="'100000000'|withRole">
             <a ng-click="headerShow('developer')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
                 <div class="boxs">
                     <img src="/static/images/manage/menu_9.png">

From 625504119436fc2429328716b42499471524484b Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 25 Oct 2018 16:51:44 +0800
Subject: [PATCH 58/82] fix compliance listpartners

---
 .../manage/mappers/system/ClientMapper.java   |  2 +
 .../manage/mappers/system/ClientMapper.xml    | 70 +++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
index a1b6d4cb9..4ade2bd6a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
@@ -38,6 +38,8 @@ public interface ClientMapper {
 
     PageList<JSONObject> listPartners(JSONObject params, PageBounds pagination);
 
+    PageList<JSONObject> comListPartners(JSONObject params, PageBounds pagination);
+
     List<JSONObject> listClientsIdAndMoniker();
 
 
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index 815348b9d..f6e605d94 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -101,6 +101,75 @@
                 <bind name="suburb_pattern" value="'%'+suburb+'%'"/>
                 and c.suburb like #{suburb_pattern}
             </if>
+
+            <if test="state!=null">
+                and c.state=#{state}
+            </if>
+            <if test="merchant_id!=null">
+                and c.merchant_id=#{merchant_id}
+            </if>
+            <if test="temp_mch_id!=null">
+                and locate(c.sub_merchant_id,#{temp_mch_id})&gt;0 and cc.skip_clearing=0 and
+                locate(c.client_moniker,#{temp_mch_id_source})&lt;=0
+            </if>
+
+
+            <if test="greenChannelBdTodo">
+                and ((c.source=1 or c.source=2) and c.approve_result=2 and (c.open_status is null or c.open_status=3))
+            </if>
+
+
+
+            <if test="search_text!=null">
+                <bind name="name_pattern" value="'%'+search_text+'%'"/>
+                <if test="text_type=='all'">
+                    and (c.client_moniker=#{search_text} or c.short_name like #{name_pattern} or c.company_name like
+                    #{name_pattern} or c.business_name like #{name_pattern} or c.remark like
+                    #{name_pattern} or c.contact_email=#{search_text})
+                </if>
+                <if test="text_type=='client_moniker'">
+                    and c.client_moniker=#{search_text}
+                </if>
+                <if test="text_type=='client_name'">
+                    and c.short_name like #{name_pattern}
+                </if>
+                <if test="text_type=='company_name'">
+                    and c.company_name like #{name_pattern}
+                </if>
+                <if test="text_type=='business_name'">
+                    and c.business_name like #{name_pattern}
+                </if>
+                <if test="text_type=='contact_email'">
+                    and c.contact_email = #{search_text}
+                </if>
+                <if test="text_type=='remark'">
+                    and c.remark like #{name_pattern}
+                </if>
+            </if>
+            <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and c.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+            </if>
+            <if test="referrer_id!=null">and c.referrer_id=#{referrer_id}</if>
+            <if test="is_valid">and c.is_valid=1</if>
+        </where>
+    </select>
+    <select id="comListPartners" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT DISTINCT c.*,o.name org_name
+        FROM sys_clients c
+        inner join sys_client_config cc on cc.client_id = c.client_id
+        inner join sys_org o
+        on o.org_id=c.org_id
+        <if test="bd_user!=null">
+            INNER JOIN sys_client_bd d ON c.client_id = d.client_id AND d.bd_id = #{bd_user} and
+            date(d.start_date)&lt;= date(now()) and (d.end_date is null or date(d.end_date)&gt;= date(now())) and
+            d.is_valid=1
+        </if>
+        <where>
+            <if test="client_moniker !=null">c.client_moniker=#{client_moniker}</if>
+            <if test="sub_merchant_id!=null">and c.sub_merchant_id=#{sub_merchant_id}</if>
+
+
             <if test="approving">
                 and ((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or
                 c.open_status=1 or c.open_status=2 or c.open_status=4)
@@ -170,6 +239,7 @@
             <if test="is_valid">and c.is_valid=1</if>
         </where>
     </select>
+
     <select id="passPartners" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         company_name,short_name,client_moniker,ali_sub_merchant_id,alipayindustry,address,suburb,state,postcode,business_hours,company_phone,merchant_introduction,logo_url,company_photo

From 59b80bd0b5beeef862a91d2e9642222698e0230e Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Thu, 25 Oct 2018 16:57:35 +0800
Subject: [PATCH 59/82] =?UTF-8?q?fix=E5=95=86=E6=88=B7=E5=90=88=E8=A7=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/merchants/core/ClientManager.java  |  2 ++
 .../core/impls/ClientManagerImpl.java         | 27 +++++++++++++++++++
 .../web/PartnerManageController.java          |  6 +++++
 .../static/payment/partner/partner-manage.js  |  2 +-
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index 9589510d6..f19d10018 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -349,4 +349,6 @@ public interface ClientManager {
      * @param clientId
      */
     boolean postponeClientRate(int clientId, String clientMoniker,String nextYearExipryDate);
+
+    JSONObject comListPartnerSelection(JSONObject manager, PartnerQuery query);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 3935ab763..0520f541e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -4047,6 +4047,33 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
     }
 
+    @Override
+    public JSONObject comListPartnerSelection(JSONObject manager, PartnerQuery query) {
+        JSONObject params = query.toJsonParam();
+        String tempSubMchId = sysConfigManager.getSysConfig().getString("temp_sub_mch_id");
+        String tempSubMchSource = sysConfigManager.getSysConfig().getString("temp_sub_mch_id_source");
+        tempSubMchSource = tempSubMchSource == null ? "" : tempSubMchSource;
+        if (query.isTempMchId()) {
+            params.put("temp_mch_id", tempSubMchId);
+            params.put("temp_mch_id_source", tempSubMchSource);
+        }
+        PageList<JSONObject> partners = clientMapper.comListPartners(params,
+                new PageBounds(query.getPage(), query.getLimit(), Order.formString("is_valid.desc,-approve_time.asc,create_time.desc")));
+        int authDays = PlatformEnvironment.getEnv().authDays();// 快速自助开通申请有效期
+        for (JSONObject partner : partners) {
+            String subMerchantId = partner.getString("sub_merchant_id");
+            if (subMerchantId != null && tempSubMchId != null && tempSubMchId.contains(subMerchantId)
+                    && !tempSubMchSource.contains(partner.getString("client_moniker"))) {
+                partner.put("temp_sub_merchant", true);
+            }
+            if (partner.getIntValue("approve_result") == 2) {
+                partner.put("expiry_time", DateUtils.addDays(partner.getDate("approve_time"), authDays));
+                partner.put("pass_timeout", DateUtils.addDays(partner.getDate("approve_time"), authDays).compareTo(new Date()) < 0);
+            }
+        }
+        return PageListUtils.buildPageListResult(partners);
+    }
+
 
     private TemplateMessage initClientMessage(JSONObject client, String newExpiryDate, String wechatOpenid, String templateId) {
         TemplateMessage notice = new TemplateMessage(wechatOpenid, templateId, null);
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index 76edb9f5c..52d4c1681 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -585,4 +585,10 @@ public class PartnerManageController {
         clientManager.subRpayMerchantApplication(clientMoniker, merchantInfo,manager);
     }
 
+    @RequestMapping(value = "/compliance", method = RequestMethod.GET)
+    @RequireManager(role = { ManagerRole.OPERATOR})
+    public JSONObject lisPartnersByCompliance(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, PartnerQuery query) {
+        return clientManager.comListPartnerSelection(manager, query);
+    }
+
 }
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 534f7723a..f2b4f9800 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -305,7 +305,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             $scope.loadPartners = function (page) {
                 var params = angular.copy($scope.params);
                 params.page = page || $scope.pagination.page || 1;
-                $http.get('/sys/partners', {params: params}).then(function (resp) {
+                $http.get('/sys/partners/compliance', {params: params}).then(function (resp) {
                     $scope.partners = resp.data.data;
                     $scope.pagination = resp.data.pagination;
                 });

From 408e5d9a301cc93602c55565d3bae080ad00eb6f Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 25 Oct 2018 17:10:32 +0800
Subject: [PATCH 60/82] fix manager2 js

---
 src/main/ui/static/boot/managerMainAppv2.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index cee641170..8260078ee 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -97,6 +97,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 $scope.copyright = true;
                 sessionStorage.setItem('role',role);
                 $scope.roleNow = getroleNow();
+                $scope.roleName = sessionStorage.getItem('role');
             };
 
             function getroleNow() {

From 8ae8685487560b1351ca41ee5c0de090efa9066b Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 26 Oct 2018 14:33:44 +0800
Subject: [PATCH 61/82] add permission function set role

---
 .../management/sysconfig/beans/FuncInfo.java  | 192 ++++++++++++++++++
 .../core/impls/PermissionManagerImpl.java     |  21 +-
 .../templates/analysis_monitoring.html        |   2 +-
 .../sysconfigs/templates/func_info_edit.html  |  48 +++++
 .../templates/permission_functions.html       |  34 ++++
 src/main/ui/static/risk/risk.js               |   2 +-
 6 files changed, 294 insertions(+), 5 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/beans/FuncInfo.java b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/beans/FuncInfo.java
index 29c221991..63d881c92 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/beans/FuncInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/beans/FuncInfo.java
@@ -1,5 +1,7 @@
 package au.com.royalpay.payment.manage.management.sysconfig.beans;
 
+import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -8,6 +10,21 @@ import org.apache.commons.lang3.StringUtils;
 public class FuncInfo {
     private String name;
     private String remark;
+    private boolean admin;
+    private boolean operator;
+    private boolean bd;
+    private boolean finacial;
+    private boolean servant;
+    private boolean accountmanager;
+    private boolean director;
+    private boolean sitemanager;
+    private boolean developer;
+    private boolean bdleader;
+    private boolean riskmanager;
+    private boolean guest;
+    private boolean orgmanager;
+    private boolean salesmanager;
+    private boolean datacontent;
 
     public String getName() {
         return StringUtils.isEmpty(name) ? null : name;
@@ -24,4 +41,179 @@ public class FuncInfo {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public void setSalesmanager(boolean salesmanager) {
+        this.salesmanager = salesmanager;
+    }
+
+    public boolean isAdmin() {
+        return admin;
+    }
+
+    public boolean isBd() {
+        return bd;
+    }
+
+    public boolean isFinacial() {
+        return finacial;
+    }
+
+    public boolean isAccountmanager() {
+        return accountmanager;
+    }
+
+    public boolean isOperator() {
+        return operator;
+    }
+
+    public boolean isDeveloper() {
+        return developer;
+    }
+
+    public boolean isDirector() {
+        return director;
+    }
+
+    public boolean isServant() {
+        return servant;
+    }
+
+    public void setAccountmanager(boolean accountmanager) {
+        this.accountmanager = accountmanager;
+    }
+
+    public boolean isBdleader() {
+        return bdleader;
+    }
+
+    public boolean isSitemanager() {
+        return sitemanager;
+    }
+
+    public void setAdmin(boolean admin) {
+        this.admin = admin;
+    }
+
+    public void setBd(boolean bd) {
+        this.bd = bd;
+    }
+
+    public boolean isGuest() {
+        return guest;
+    }
+
+    public void setDeveloper(boolean developer) {
+        this.developer = developer;
+    }
+
+    public boolean isRiskmanager() {
+        return riskmanager;
+    }
+
+    public void setDirector(boolean director) {
+        this.director = director;
+    }
+
+    public void setBdleader(boolean bdleader) {
+        this.bdleader = bdleader;
+    }
+
+    public void setFinacial(boolean finacial) {
+        this.finacial = finacial;
+    }
+
+    public void setOperator(boolean operator) {
+        this.operator = operator;
+    }
+
+    public void setServant(boolean servant) {
+        this.servant = servant;
+    }
+
+    public void setGuest(boolean guest) {
+        this.guest = guest;
+    }
+
+    public void setRiskmanager(boolean riskmanager) {
+        this.riskmanager = riskmanager;
+    }
+
+    public void setSitemanager(boolean sitemanager) {
+        this.sitemanager = sitemanager;
+    }
+
+    public void setDatacontent(boolean datacontent) {
+        this.datacontent = datacontent;
+    }
+
+    public boolean isSalesmanager() {
+        return salesmanager;
+    }
+
+    public boolean isOrgmanager() {
+        return orgmanager;
+    }
+
+    public boolean isDatacontent() {
+        return datacontent;
+    }
+
+    public void setOrgmanager(boolean orgmanager) {
+        this.orgmanager = orgmanager;
+    }
+
+
+    public JSONObject initObject(JSONObject mod) {
+        mod.put("name", getName());
+        mod.put("remark", getRemark());
+        int role = 0;
+        if (admin) {
+            role |= ManagerRole.ADMIN.getMask();
+        }
+        if (operator) {
+            role |= ManagerRole.OPERATOR.getMask();
+        }
+        if (sitemanager) {
+            role |= ManagerRole.SITE_MANAGER.getMask();
+        }
+        if (bd) {
+            role |= ManagerRole.BD_USER.getMask();
+        }
+        if (finacial) {
+            role |= ManagerRole.FINANCIAL_STAFF.getMask();
+        }
+        if (servant) {
+            role |= ManagerRole.SERVANT.getMask();
+        }
+        if (accountmanager) {
+            role |= ManagerRole.ACCOUNT_MANAGER.getMask();
+        }
+        if (director) {
+            role |= ManagerRole.DIRECTOR.getMask();
+        }
+        if (developer) {
+            role |= ManagerRole.DEVELOPER.getMask();
+        }
+        if (bdleader){
+            role |= ManagerRole.BD_LEADER.getMask();
+        }
+        if (riskmanager){
+            role |= ManagerRole.RISK_MANAGER.getMask();
+        }
+        if (guest){
+            role |= ManagerRole.GUEST.getMask();
+        }
+        if (orgmanager){
+            role |= ManagerRole.ORG_MANAGER.getMask();
+        }
+        if (salesmanager) {
+            role |= ManagerRole.SALES_MANAGER.getMask();
+        }
+        if (datacontent) {
+            role |= ManagerRole.DATA_CONTENT.getMask();
+        }
+        mod.put("role", role);
+        return mod;
+    }
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/PermissionManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/PermissionManagerImpl.java
index 2b2710c5d..821f9f5e9 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/PermissionManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/PermissionManagerImpl.java
@@ -68,6 +68,23 @@ public class PermissionManagerImpl implements PermissionManager {
         Map<String, List<JSONObject>> moduleMap = new TreeMap<>();
         List<JSONObject> noModule = new ArrayList<>();
         for (JSONObject func : funcs) {
+            int role = func.getIntValue("role");
+            func.put("admin", ManagerRole.ADMIN.hasRole(role));
+            func.put("operator", ManagerRole.OPERATOR.hasRole(role));
+            func.put("bd", ManagerRole.BD_USER.hasRole(role));
+            func.put("finacial", ManagerRole.FINANCIAL_STAFF.hasRole(role));
+            func.put("servant", ManagerRole.SERVANT.hasRole(role));
+//            func.put("accountmanager", ManagerRole.ACCOUNT_MANAGER.hasRole(role));
+            func.put("director", ManagerRole.DIRECTOR.hasRole(role));
+            func.put("sitemanager", ManagerRole.SITE_MANAGER.hasRole(role));
+            func.put("developer", ManagerRole.DEVELOPER.hasRole(role));
+            func.put("bdleader", ManagerRole.BD_LEADER.hasRole(role));
+            func.put("riskmanager", ManagerRole.RISK_MANAGER.hasRole(role));
+            func.put("guest", ManagerRole.GUEST.hasRole(role));
+//            manager.put("orgmanager", ManagerRole.ORG_MANAGER.hasRole(role));
+            func.put("salesmanager", ManagerRole.SALES_MANAGER.hasRole(role));
+//            manager.put("datacontent", ManagerRole.DATA_CONTENT.hasRole(role));
+
             String module = func.getString("module");
             if (module == null) {
                 noModule.add(func);
@@ -128,9 +145,7 @@ public class PermissionManagerImpl implements PermissionManager {
     public void updateFuncInfo(String funcId, FuncInfo funcInfo) {
         JSONObject update = new JSONObject();
         update.put("func_id", funcId);
-        update.put("name", funcInfo.getName());
-        update.put("remark", funcInfo.getRemark());
-        permissionFunctionMapper.update(update);
+        permissionFunctionMapper.update(funcInfo.initObject(update));
     }
 
     @Override
diff --git a/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html b/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html
index ebc28f9e6..e80d3b8e7 100644
--- a/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html
+++ b/src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html
@@ -20,7 +20,7 @@
             <li ui-sref-active-eq="active" ng-if="('monitor'|withModule)&&(currentUser.org_id==null)">
                 <a ui-sref="analysis_monitoring.pre_refund"><i class="fa fa-tv"></i> <span>欠款|Pre Refund</span></a>
             </li>
-            <li ui-sref-active-eq="active" ng-if="('RiskManagement'|withModule)&&(currentUser.org_id==null)">
+            <li ui-sref-active-eq="active" ng-if="('riskManagement'|withModule)&&(currentUser.org_id==null)">
                 <a ui-sref="analysis_monitoring.risk_manager"><i class="fa fa-tv"></i> <span>风控记录|Risk Records</span></a>
             </li>
 
diff --git a/src/main/ui/static/config/sysconfigs/templates/func_info_edit.html b/src/main/ui/static/config/sysconfigs/templates/func_info_edit.html
index 3e2bed66a..b3b76de42 100644
--- a/src/main/ui/static/config/sysconfigs/templates/func_info_edit.html
+++ b/src/main/ui/static/config/sysconfigs/templates/func_info_edit.html
@@ -13,6 +13,54 @@
         <label class="control-label" for="remark-input">Remark</label>
         <input class="form-control" id="remark-input" ng-model="func.remark">
     </div>
+    <div class="form-group">
+        <label class="control-label">Roles</label>
+        <p class="checkbox-inline checkbox">
+            <label ng-if="('00001'|withRole)">
+                <input type="checkbox" ng-model="func.admin" name="admin">Administrator
+            </label>
+            <label ng-if="('00001'|withRole)">
+                <input type="checkbox" ng-model="func.operator" name="operator">Compliance
+            </label>
+            <label>
+                <input type="checkbox" ng-model="func.bd" name="bd">BD User
+            </label>
+            <label ng-if="('00001'|withRole)">
+                <input type="checkbox" ng-model="func.finacial" name="finacial">Accountant
+            </label>
+            <label ng-if="('00001'|withRole)">
+                <input type="checkbox" ng-model="func.servant" name="servant">Service
+            </label>
+            <!--<label ng-if="!manager.admin && !manager.operator">-->
+            <!--<input type="checkbox" ng-model="manager.accountmanager" name="accountmanager">Account Manager-->
+            <!--</label>-->
+            <label>
+                <input type="checkbox" ng-model="func.director" name="director">Director
+            </label>
+            <label ng-if="('00001'|withRole)">
+                <input type="checkbox" ng-model="func.sitemanager" name="sitemanager">Markting
+            </label>
+            <label ng-if="('00001'|withRole)">
+                <input type="checkbox" ng-model="func.developer" name="developer">Developer
+            </label>
+            <label ng-if="('00001'|withRole)">
+                <input type="checkbox" ng-model="func.bdleader" name="bdleader">BD Leader
+            </label>
+            <label ng-if="('00001'|withRole)">
+                <input type="checkbox" ng-model="func.riskmanager" name="riskmanager">Risk Manager
+            </label>
+            <!--                        <label ng-if="('00001'|withRole)">
+                                        <input type="checkbox" ng-model="manager.orgmanager" name="orgmanager">Org Manager
+                                    </label>-->
+            <label ng-if="('00001'|withRole)">
+                <input type="checkbox" ng-model="func.salesmanager" name="salesmanager">Sales Manager
+            </label>
+            <!--                        <label ng-if="('00001'|withRole)">
+                                        <input type="checkbox" ng-model="manager.datacontent" name="datacontent">Data Content
+                                    </label>-->
+        </p>
+    </div>
+
 </div>
 <div class="modal-footer">
     <button class="btn btn-success" ng-click="modifyFunction()">Save</button>
diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
index 4616a92f8..e2d256925 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
@@ -15,6 +15,23 @@
                 <th ng-bind="func.func_id" title="{{func.remark}}"></th>
                 <td ng-bind="func.uri+'['+func.req_methods+']'" title="{{func.remark}}"></td>
                 <td ng-bind="func.name"></td>
+                <td>
+                    <i class="fa fa-user-secret" title="Administrator" ng-class="{'text-green':func.admin,'text-gray':!func.admin}"></i>
+                    <i class="fa fa-eye" title="Compliance" ng-class="{'text-green':func.operator,'text-gray':!func.operator}"></i>
+                    <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':func.bd,'text-gray':!func.bd}"></i>
+                    <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':func.finacial,'text-gray':!func.finacial}"></i>
+                    <i class="fa fa-tty" title="Service" ng-class="{'text-green':func.sevant,'text-gray':!func.servant}"></i>
+                    <!--<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>-->
+                    <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':func.director,'text-gray':!func.director}"></i>
+                    <i class="fa fa-map-o" title="Markting" ng-class="{'text-green':func.sitemanager,'text-gray':!func.sitemanager}"></i>
+                    <i class="fa fa-code" title="Developer" ng-class="{'text-green':func.developer,'text-gray':!func.developer}"></i>
+                    <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
+                    <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
+                    <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
+                    <!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>-->
+                    <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
+                    <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
+                </td>
                 <td>
                     <a role="button" ng-click="moveFunction(func)" title="Move"><i class="fa fa-arrows"></i></a>
                     <a role="button" ng-click="editFunctionInfo(func)" title="Edit"><i class="fa fa-edit"></i></a>
@@ -32,6 +49,23 @@
                 <th ng-bind="func.func_id+(func.remark?'('+func.remark+')':'')" title="{{func.remark}}"></th>
                 <td ng-bind="func.uri+'['+func.req_methods+']'" title="{{func.remark}}"></td>
                 <td ng-bind="func.name"></td>
+                <td>
+                    <i class="fa fa-user-secret" title="Administrator" ng-class="{'text-green':func.admin,'text-gray':!func.admin}"></i>
+                    <i class="fa fa-eye" title="Compliance" ng-class="{'text-green':func.operator,'text-gray':!func.operator}"></i>
+                    <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':func.bd,'text-gray':!func.bd}"></i>
+                    <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':func.finacial,'text-gray':!func.finacial}"></i>
+                    <i class="fa fa-tty" title="Service" ng-class="{'text-green':func.sevant,'text-gray':!func.servant}"></i>
+                    <!--<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>-->
+                    <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':func.director,'text-gray':!func.director}"></i>
+                    <i class="fa fa-map-o" title="Markting" ng-class="{'text-green':func.sitemanager,'text-gray':!func.sitemanager}"></i>
+                    <i class="fa fa-code" title="Developer" ng-class="{'text-green':func.developer,'text-gray':!func.developer}"></i>
+                    <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
+                    <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
+                    <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
+                    <!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>-->
+                    <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
+                    <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
+                </td>
                 <td>
                     <a role="button" ng-click="moveFunction(func)" title="Move"><i class="fa fa-arrows"></i></a>
                     <a role="button" ng-click="editFunctionInfo(func)" title="Edit"><i class="fa fa-edit"></i></a>
diff --git a/src/main/ui/static/risk/risk.js b/src/main/ui/static/risk/risk.js
index 22b7dc984..6dbf6370d 100644
--- a/src/main/ui/static/risk/risk.js
+++ b/src/main/ui/static/risk/risk.js
@@ -6,7 +6,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
         {code: '2', label: 'test2'},
     ];
 
-    var app = angular.module('RiskManagement', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload']);
+    var app = angular.module('riskManagement', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload']);
     app.config(['$stateProvider', function ($stateProvider) {
         $stateProvider.state('analysis_monitoring.risk_manager', {
             url: '/risk/manage',

From 4780926f008a20b6deb0df0eb249ea61b4a3c958 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Fri, 26 Oct 2018 17:39:48 +0800
Subject: [PATCH 62/82] [fix]permissions

---
 .../bdprize/templates/bd_prize_root.html      | 10 ++--
 .../ui/static/config/sysconfigs/sysconfigs.js | 46 +++++++++++++++--
 .../templates/permission_config.html          | 49 ++++++++++++++-----
 3 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
index 5baefdd15..74c51ffa4 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
@@ -7,21 +7,21 @@
         </ol>
     </section>
     <section class="content">
-        <div class="box box-danger" ng-if="('1000'|withRole) || ('1000000'|withRole) || ('10000000000000'|withRole)">
+        <div class="box box-danger" ng-if="('10000000000000'|withRole)">
             <div class="box-body">
                 <div class="box box-default">
                     <div class="box-body">
                         <div class="form-inline">
-                            <div class="form-group" ng-if="!('1000000'|withRole)">
+                            <div class="form-group">
                                 <input type="text" class="form-control" uib-datepicker-popup="yyyy-MM" ng-model="generate.month"
                                        is-open="ctrl.genmonth" datepicker-options="{minMode: 'month'}"
                                        ng-click="ctrl.genmonth=true" placeholder="Select Month"/>
                             </div>
-                            <button ng-if="!('1000000'|withRole)" class="btn btn-primary" ng-click="generateReport()" ng-disabled="!generate.month">
+                            <button class="btn btn-primary" ng-click="generateReport()" ng-disabled="!generate.month">
                                 Generate Report
                             </button>
-                            <button ng-if="'10000000000000'|withRole" class="btn btn-primary" ng-click="editRateConfig()"><i class="fa fa-cog"></i> Edit Rate Config</button>
-                            <button ng-if="'10000000000000'|withRole" class="btn btn-primary" ng-click="editBDLevels()"><i class="fa fa-user"></i> Edit BD Level</button>
+                            <button class="btn btn-primary" ng-click="editRateConfig()"><i class="fa fa-cog"></i> Edit Rate Config</button>
+                            <button class="btn btn-primary" ng-click="editBDLevels()"><i class="fa fa-user"></i> Edit BD Level</button>
                             <loadingbar ng-if="generate.status"></loadingbar>
                         </div>
                     </div>
diff --git a/src/main/ui/static/config/sysconfigs/sysconfigs.js b/src/main/ui/static/config/sysconfigs/sysconfigs.js
index 7b3842119..04a216864 100644
--- a/src/main/ui/static/config/sysconfigs/sysconfigs.js
+++ b/src/main/ui/static/config/sysconfigs/sysconfigs.js
@@ -119,8 +119,8 @@ define(['angular', 'uiRouter'], function (angular) {
         }
     }]);
 
-    app.controller('permissionConfigRootCtrl', ['$scope', '$http', '$uibModal', function ($scope, $http, $uibModal) {
-        $scope.authorizeRole = function (roleMask) {
+    app.controller('permissionConfigRootCtrl', ['$scope', '$filter', '$http', '$uibModal','commonDialog', function ($scope, $filter, $http, $uibModal,commonDialog) {
+        /*$scope.authorizeRole = function (roleMask) {
             $uibModal.open({
                 templateUrl: '/static/config/sysconfigs/templates/permission_authorize_dialog.html',
                 controller: 'permissionAuthorizeDialogCtrl',
@@ -137,7 +137,47 @@ define(['angular', 'uiRouter'], function (angular) {
                     }
                 }
             });
-        }
+        };*/
+        $scope.role = 1;
+        var roleParam = angular.copy($scope.role);
+        $scope.authorizeRole = function (roleMask) {
+            $scope.role = roleMask;
+            $http.get('/sys/permission/functions').then(function (resp) {
+                $scope.modules = resp.data;
+            });
+            $http.get('/sys/permission/roles/' + roleMask + '/functions').then(function (resp) {
+                $scope.authorized = resp.data;
+            });
+        };
+        $scope.submitAuthorize = function () {
+            commonDialog.confirm({
+                title: '修改角色接口权限',
+                content: '你确定修改当前角色接口权限吗?'
+            }).then(function () {
+                $http.put('/sys/permission/roles/' + $scope.role + '/functions', $scope.authorized).then(function () {
+                    commonDialog.alert({title: 'Success', content: '修改成功.', type: 'success'})
+                }, function (resp) {
+                    commonDialog.alert({type: 'error', title: 'Error', content: resp.data.message})
+                })
+            })
+
+        };
+        $scope.toggleAuthorize = function (func) {
+            var idx = $scope.authorized.indexOf(func.func_id);
+            if (idx >= 0) {
+                $scope.authorized.splice(idx, 1);
+            } else {
+                $scope.authorized.push(func.func_id);
+            }
+        };
+        $scope.moduleName = 'actChairty';
+        $scope.filterAuthorized = function (module) {
+            return module.module_name === $scope.moduleName;
+        };
+        $scope.switchModule = function (moduleName) {
+            $scope.moduleName = moduleName;
+        };
+        $scope.authorizeRole(roleParam);
     }]);
     app.controller('permissionAuthorizeDialogCtrl', ['$scope', '$http', 'authorized', 'modules', 'role',
         function ($scope, $http, authorized, modules, role) {
diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
index 057ac1568..059b734e1 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
@@ -1,3 +1,11 @@
+<style>
+    .isSelect{
+        color:#337ab7;
+    }
+    .tab-content a:hover {
+        color:#337ab7;
+    }
+</style>
 <section class="content-header">
     <h1>Permission Config</h1>
     <ol class="breadcrumb">
@@ -23,23 +31,23 @@
                     </li>
                 </ul>
                 <div class="tab-content" ui-view>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('1')">
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='1'}" role="button" ng-click="authorizeRole('1')">
                         <i class="fa fa-user-secret"></i>
                         Administrator
                     </a>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('10')">
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='10'}" role="button" ng-click="authorizeRole('10')">
                         <i class="fa fa-eye"></i>
                         Compliance
                     </a>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('100')">
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='100'}" role="button" ng-click="authorizeRole('100')">
                         <i class="fa fa-crosshairs"></i>
                         BD User
                     </a>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('1000')">
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='1000'}" role="button" ng-click="authorizeRole('1000')">
                         <i class="fa fa-balance-scale"></i>
                         Accountant
                     </a>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('10000')">
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='10000'}" role="button" ng-click="authorizeRole('10000')">
                         <i class="fa fa-tty"></i>
                         Service
                     </a>
@@ -47,23 +55,23 @@
                         <!--<i class="fa fa-university"></i>-->
                         <!--Account Manager-->
                     <!--</a>-->
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('1000000')">
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='1000000'}" role="button" ng-click="authorizeRole('1000000')">
                         <i class="fa fa-line-chart"></i>
                         Director
                     </a>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('10000000')">
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='10000000'}" role="button" ng-click="authorizeRole('10000000')">
                         <i class="fa fa-map-o"></i>
                         Markting
                     </a>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('100000000')">
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='100000000'}" role="button" ng-click="authorizeRole('100000000')">
                         <i class="fa fa-code"></i>
                         Developer
                     </a>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('10000000000')">
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='10000000000'}" role="button" ng-click="authorizeRole('10000000000')">
                         <i class="fa fa-user"></i>
                         Risk Manager
                     </a>
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('100000000000')">
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='100000000000'}" role="button" ng-click="authorizeRole('100000000000')">
                         <i class="fa fa-tripadvisor"></i>
                         GUEST
                     </a>
@@ -71,10 +79,29 @@
                         <!--<i class="fa fa-user-plus"></i>-->
                         <!--Org Manager-->
                     <!--</a>-->
-                    <a class="btn btn-app" role="button" ng-click="authorizeRole('10000000000000')">
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='10000000000000'}" role="button" ng-click="authorizeRole('10000000000000')">
                         <i class="fa fa-ticket"></i>
                         Sales Manager
                     </a>
+                    <div class="box box-warning">
+                        <div class="box-header with-border">权限
+                            <button style="float: right;" class="btn btn-success" ng-click="submitAuthorize()">Submit</button>
+                        </div>
+                        <div class="box-body table-responsive">
+                            <div class="row">
+                                <div class="col-sm-4 col-xs-1">
+                                    <a role="button" ng-class="{active:mod.module_name==moduleName}" ng-click="switchModule(mod.module_name)" class="list-group-item" ng-repeat="mod in modules.modules" ng-bind="mod.module_name+' - '+mod.remark"></a>
+                                </div>
+                                <div class="col-sm-8 col-xs-1">
+                                    <div ng-repeat="mod in modules.modules| filter:filterAuthorized">
+                                        <a role="button" class="list-group-item" ng-repeat="func in mod.funcs" ng-bind="func.func_id+(func.remark?'('+func.remark+')':'')"
+                                           ng-class="{active:authorized.indexOf(func.func_id)>=0}" ng-click="toggleAuthorize(func)">
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     <!--<a class="btn btn-app" role="button" ng-click="authorizeRole('100000000000000')">-->
                         <!--<i class="fa fa-save"></i>-->
                         <!--Data Content-->

From f1e11d178f905701e1948e1f287a27365b410375 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Sun, 28 Oct 2018 23:08:07 +0800
Subject: [PATCH 63/82] fix

---
 src/main/ui/manage.html                       |  64 +++++++----
 .../analysis/manage-customers-orders.js       |   2 +-
 .../templates/manage_customers_orders.html    |   6 +-
 .../templates/analysis_transaction.html       |   4 +-
 .../bdprize/templates/bd_prize_root.html      |   2 +-
 .../ui/static/menu/templates/main_menu.html   | 108 +++++++++++++-----
 .../tradelog/templates/refund_review.html     |   2 +-
 .../static/sys/templates/contract_sign.html   |   4 +-
 .../static/sys/templates/manual_settle.html   |   4 +-
 9 files changed, 132 insertions(+), 64 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 3b793db69..cc64cd928 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -337,26 +337,11 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="('1010'|withRole)">
-                            <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
-                                <i class="fa fa-wrench"></i> <span>退款审核|Audit Refund</span>
-                            </a>
-                        </li>
-                        <li ui-sref-active="active" ng-if="('100001010'|withRole)">
-                            <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
-                                <i class="fa fa-tv"></i> <span>欠款|Pre Refund</span>
-                            </a>
-                        </li>
                         <li ui-sref-active="active" ng-if="('transAnalysis'|withModule)">
                             <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-area-chart"></i> <span>原统计</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="'log'|withModule">
-                            <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
-                                <i class="fa fa-server"></i> <span>支付回调消息|Notify History</span>
-                            </a>
-                        </li>
                     </ul>
                 </li>
 
@@ -398,6 +383,16 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa fa-male"></i> <span>消费排名|Risky Merchants</span>
                             </a>
                         </li>
+                        <li ui-sref-active="active" ng-if="'customer_analysis'|withModule">
+                            <a ui-sref="customersAnalysisManage" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-bar-chart"></i> <span>消费者统计|Customer Analysis</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('10000000000'|withRole)">
+                            <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-wrench"></i> <span>退款审核|Audit Refund</span>
+                            </a>
+                        </li>
                     </ul>
                 </li>
 
@@ -442,6 +437,11 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-envelope"></i> <span>Alipay进件表格导出</span>
                             </a>
                         </li>
+                        <li ui-sref-active="active">
+                            <a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-balance-scale"></i> <span>商户手动清算</span>
+                            </a>
+                        </li>
                     </ul>
                 </li>
 
@@ -458,7 +458,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) && (roleNow!='director')">
                             <a ui-sref="date_setting">
                                 <i class="fa fa-balance-scale"></i> <span>清算日管理</span>
                             </a>
@@ -479,7 +479,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) && (roleNow!='director')">
                             <a ui-sref="analysis_report.platformsettle" ui-sref-opts="{reload:true}">
                                 <i class="fa fa fa-money"></i> <span>清算验证|Validation</span>
                             </a>
@@ -525,6 +525,21 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-users"></i> <span>合伙人提成</span>
                             </a>
                         </li>
+                        <li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
+                            <a ui-sref="cashbackAnalysis">
+                                <i class="fa fa-gift"></i> <span>商户营销账户</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('contract'|withModule)">
+                            <a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-balance-scale"></i> <span>商户手动清算</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('preRefund'|withModule)">
+                            <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-tv"></i> <span>商户欠款|Pre Refund</span>
+                            </a>
+                        </li>
                     </ul>
                 </li>
 
@@ -546,11 +561,6 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-gift"></i> <span>鼓励金</span>
                             </a>
                         </li>
-                        <li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
-                            <a ui-sref="cashbackAnalysis">
-                                <i class="fa fa-gift"></i> <span>商户营销账户</span>
-                            </a>
-                        </li>
                         <li ui-sref-active="active" ng-if="'settleDelay'|withModule">
                             <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-users"></i> <span>周末费率减半活动</span>
@@ -708,6 +718,11 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-shopping-cart"></i> <span>商户活跃度</span>
                             </a>
                         </li>
+                        <li ui-sref-active="active" ng-if="('cashbackAnalysis'|withModule)">
+                            <a ui-sref="cashbackAnalysis">
+                                <i class="fa fa-gift"></i> <span>商户营销账户</span>
+                            </a>
+                        </li>
                     </ul>
                 </li>
 
@@ -794,6 +809,11 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-cog"></i> <span>开发工具|DevTools</span>
                             </a>
                         </li>
+                        <li ui-sref-active="active" ng-if="'log'|withModule">
+                            <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-server"></i> <span>支付回调消息|Notify History</span>
+                            </a>
+                        </li>
                     </ul>
                 </li>
             </ul>
diff --git a/src/main/ui/static/analysis/manage-customers-orders.js b/src/main/ui/static/analysis/manage-customers-orders.js
index 4659de334..e76f639a3 100644
--- a/src/main/ui/static/analysis/manage-customers-orders.js
+++ b/src/main/ui/static/analysis/manage-customers-orders.js
@@ -3,7 +3,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('customersAnalysisManage', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.customers_analysis_manage', {
+        $stateProvider.state('customersAnalysisManage', {
             url: '/analysis/customers',
             templateUrl: '/static/analysis/templates/manage_customers_orders.html',
             controller: 'customersAnalysisCtrl'
diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html
index bb65421f4..27d2c02a6 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -7,15 +7,15 @@
         text-align: center;
     }
 </style>
-<!--<section class="content-header">
+<section class="content-header">
     <h1>Customers Analysis</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-list-alt"></i> Analysis
+            <i class="fa fa-sitemap"></i> Risk Management
         </li>
         <li class="active">Customers</li>
     </ol>
-</section>-->
+</section>
 <div class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html b/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html
index b4c003a9f..bb2327797 100644
--- a/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html
+++ b/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html
@@ -13,9 +13,9 @@
             <li ui-sref-active="active" ng-if="'dashboard'|withModule">
                 <a ui-sref="analysis_transaction.gateway"><i class="fa fa-area-chart"></i>Gateway统计|Gateway Analysis</a>
             </li>
-            <li ui-sref-active="active" ng-if="'customer_analysis'|withModule">
+            <!--<li ui-sref-active="active" ng-if="'customer_analysis'|withModule">
                 <a ui-sref="analysis_transaction.customers_analysis_manage"><i class="fa fa-bar-chart"></i>消费者统计|Customer Analysis</a>
-            </li>
+            </li>-->
             <!--<li ui-sref-active="active" ng-if="'customerRankingAnalysisApp'|withModule">-->
                 <!--<a ui-sref="analysis_transaction.customerRankingAnalysis"><i class="fa fa-male"></i>消费排名|Customers Ranking</a>-->
             <!--</li>-->
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
index 74c51ffa4..73bc0453c 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
@@ -50,7 +50,7 @@
             <div class="box-body">
                 <div class="row">
                     <div class="col-xs-2" ng-repeat="mon in months">
-                        <a ng-if="hasReport(mon) && ('1000'|withRole)">
+                        <a ng-if="hasReport(mon) && ('10000000000000'|withRole)">
                             <h2 ROLE="button" class="text-success" ui-sref=".month_report({month:mon})" ng-bind="mon.substring(5,7)"></h2>
                             <span class="fa fa-edit btn" ng-click="editCommissionConfig(mon)">Commission</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 69099262d..7ead3f4da 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -122,26 +122,6 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('1010'|withRole)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/transaction_refund.png"/>
-                        <div class="description-text">
-                            <span class="description-text">退款审核</span>
-                        </div>
-                    </div>
-                    </a>
-                </div>
-                <div ng-if="('100001010'|withRole)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/transaction_arrears.png"/>
-                        <div class="description-text">
-                            <span class="description-text">欠款</span>
-                        </div>
-                    </div>
-                    </a>
-                </div>
                 <div ng-if="('transAnalysis'|withModule)" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
                     <div class="description-block">
@@ -152,16 +132,6 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_callback_message.png"/>
-                            <div class="description-text">
-                                <span class="description-text">支付回调消息</span>
-                            </div>
-                    </div>
-                    </a>
-                </div>
             </div>
         </div>
         <div class="list-group" ng-if="role=='riskmanager'">
@@ -233,6 +203,26 @@
                     </div>
                     </a>
                 </div>
+                <div class="col-sm-2 col-xs-6" ng-if="'customer_analysis'|withModule">
+                    <a ui-sref="customersAnalysisManage" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/risk_consumption_ranking.png"/>
+                            <div class="description-text">
+                                <span class="description-text">消费者统计</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('10000000000'|withRole)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_refund.png"/>
+                            <div class="description-text">
+                                <span class="description-text">退款审核</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
             </div>
         </div>
         <div class="list-group" ng-if="role=='compliance'">
@@ -305,6 +295,16 @@
                       </div>
                   </a>
               </div>
+              <div class="col-sm-2 col-xs-6">
+                  <a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
+                      <div class="description-block">
+                          <img src="/static/images/main_menu/compliance_alipayexcel.png"/>
+                          <div class="description-text">
+                              <span>商户手动清算</span>
+                          </div>
+                      </div>
+                  </a>
+              </div>
           </div>
         </div>
         <div class="list-group" ng-if="(role=='salesmanager') || (role=='director')">
@@ -428,6 +428,15 @@
                             </div>
                         </div>
                     </a></div>
+                <div ng-if="'cashbackAnalysis'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="cashbackAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户营销账户</span>
+                            </div>
+                        </div>
+                    </a></div>
             </div>
         </div>
         <div class="list-group" ng-if="role=='sitemanager'">
@@ -661,6 +670,35 @@
                             </div>
                         </div>
                     </a></div>
+                <div ng-if="'cashbackAnalysis'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="cashbackAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户营销账户</span>
+                            </div>
+                        </div>
+                    </a></div>
+                <div class="col-sm-2 col-xs-6">
+                    <a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_arrears.png"/>
+                            <div class="description-text">
+                                <span>商户手动清算</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('preRefund'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_arrears.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户欠款</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
             </div>
         </div>
         <div class="list-group" ng-if="role=='accountant' || role=='director'">
@@ -869,6 +907,16 @@
                             </div>
                         </div>
                     </a></div>
+                <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_callback_message.png"/>
+                            <div class="description-text">
+                                <span class="description-text">支付回调消息</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
             </div>
         </div>
         <div ng-if="('1000000000000'|withRole)" class="list-group">
diff --git a/src/main/ui/static/payment/tradelog/templates/refund_review.html b/src/main/ui/static/payment/tradelog/templates/refund_review.html
index 08620a1b9..24ce4ee69 100644
--- a/src/main/ui/static/payment/tradelog/templates/refund_review.html
+++ b/src/main/ui/static/payment/tradelog/templates/refund_review.html
@@ -18,7 +18,7 @@
     <div class="col-sm-12">
         <div class="box-solid">
 
-            <div class="panel panel-default" ng-if="'10'|withRole">
+            <div class="panel panel-default" ng-if="'10000000000'|withRole">
                 <div class="panel-heading">Refund Audit</div>
                 <div class="panel-body">
                     <div class="form-horizontal">
diff --git a/src/main/ui/static/sys/templates/contract_sign.html b/src/main/ui/static/sys/templates/contract_sign.html
index 06dc9b700..db4d69591 100644
--- a/src/main/ui/static/sys/templates/contract_sign.html
+++ b/src/main/ui/static/sys/templates/contract_sign.html
@@ -8,7 +8,7 @@
     </ol>
 </section>
 
-<ul class="nav nav-tabs">
+<!--<ul class="nav nav-tabs">
     <li ui-sref-active-eq="active" class="active">
         <a ui-sref="contract">Contract</a>
     </li>
@@ -16,7 +16,7 @@
         <a ui-sref="manual_settle">Manual Settle</a>
     </li>
 </ul>
-<br>
+<br>-->
 <div class="box box-danger">
     <div class="modal-body">
         <div class="form-inline">
diff --git a/src/main/ui/static/sys/templates/manual_settle.html b/src/main/ui/static/sys/templates/manual_settle.html
index f3378a7a5..16c1e9382 100644
--- a/src/main/ui/static/sys/templates/manual_settle.html
+++ b/src/main/ui/static/sys/templates/manual_settle.html
@@ -8,14 +8,14 @@
     </ol>
 </section>
 
-<ul class="nav nav-tabs">
+<!--<ul class="nav nav-tabs">
     <li ui-sref-active-eq="active" class="active">
         <a ui-sref="contract">Contract</a>
     </li>
     <li ui-sref-active-eq="active" class="active">
         <a ui-sref="manual_settle">Manual Settle</a>
     </li>
-</ul>
+</ul>-->
 <div class="modal-body">
     <div class="box box-danger">
         <div class="box-header">商户</div>

From 56a5eb6aa5aac93a74a32cd243e02eead63803a0 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 29 Oct 2018 11:13:29 +0800
Subject: [PATCH 64/82] fix main_menu

---
 src/main/ui/static/menu/templates/main_menu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 7ead3f4da..dda2e7f81 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -298,7 +298,7 @@
               <div class="col-sm-2 col-xs-6">
                   <a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
                       <div class="description-block">
-                          <img src="/static/images/main_menu/compliance_alipayexcel.png"/>
+                          <img src="/static/images/main_menu/transaction_arrears.png"/>
                           <div class="description-text">
                               <span>商户手动清算</span>
                           </div>

From c2a383d60a85980b305c41d7cf00a3ab723be5aa Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Mon, 29 Oct 2018 11:52:40 +0800
Subject: [PATCH 65/82] =?UTF-8?q?functions=20ui=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/manage.html                       |  4 +-
 src/main/ui/static/citypartner/citypartner.js |  4 +-
 .../templates/citypartner_registers.html      |  2 +-
 .../ui/static/config/sysconfigs/sysconfigs.js |  9 ++-
 .../templates/permission_functions.html       | 81 +++++++++++++++++--
 .../ui/static/menu/templates/main_menu.html   |  4 +-
 .../partner/templates/partners_apply.html     |  4 +-
 7 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index cc64cd928..8f6e7fcae 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -735,8 +735,8 @@ margin-bottom: 10%;"/>
                     </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}">
+                            ng-if="'citypartner'|withModule">
+                            <a ui-sref="citypartner_reg" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-tv"></i> <span>合伙人申请</span>
                             </a>
                         </li>
diff --git a/src/main/ui/static/citypartner/citypartner.js b/src/main/ui/static/citypartner/citypartner.js
index fd3504804..6d3372506 100644
--- a/src/main/ui/static/citypartner/citypartner.js
+++ b/src/main/ui/static/citypartner/citypartner.js
@@ -5,8 +5,8 @@ define(['angular'], function (angular) {
     'use strict';
     var app = angular.module('citypartner', ['ui.router']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('partner_apply.citypartner_reg', {
-            url: '/citypartner_registries',
+        $stateProvider.state('citypartner_reg', {
+            url: '/partner/apply/citypartner_registries',
             templateUrl: '/static/citypartner/templates/citypartner_registers.html',
             controller: 'citypartnerRegisterListCtrl'
         })
diff --git a/src/main/ui/static/citypartner/templates/citypartner_registers.html b/src/main/ui/static/citypartner/templates/citypartner_registers.html
index 654e2e58a..447bec37f 100644
--- a/src/main/ui/static/citypartner/templates/citypartner_registers.html
+++ b/src/main/ui/static/citypartner/templates/citypartner_registers.html
@@ -2,7 +2,7 @@
     <h1>City Partners</h1>
     <ol class="breadcrumb">
         <li>
-            <i class="fa fa-users"></i> Payment
+            <i class="fa fa-users"></i> Framework
         </li>
         <li class="active">
             City Partners
diff --git a/src/main/ui/static/config/sysconfigs/sysconfigs.js b/src/main/ui/static/config/sysconfigs/sysconfigs.js
index 04a216864..bb71c95ce 100644
--- a/src/main/ui/static/config/sysconfigs/sysconfigs.js
+++ b/src/main/ui/static/config/sysconfigs/sysconfigs.js
@@ -253,7 +253,14 @@ define(['angular', 'uiRouter'], function (angular) {
                 }).result.then(function () {
                     $scope.loadFunctions();
                 })
-            }
+            };
+            $scope.tabModuleName = 'no_module';
+            $scope.moduleTab = function(moduleName) {
+                $scope.tabModuleName = moduleName;
+            };
+            $scope.filterModFunctions = function (module) {
+                return module.module_name === $scope.tabModuleName;
+            };
         }]
     );
     app.controller('permissionChooseModuleDialogCtrl', ['$scope', '$http', 'modules', function ($scope, $http, modules) {
diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
index e2d256925..20f105af7 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
@@ -6,6 +6,73 @@
     </div>
 </div>
 
+<div class="row">
+    <div class="col-sm-3">
+        <a ng-if="modFunctions.no_module.length" ng-class="{active:'no_module'==tabModuleName}" ng-click="moduleTab('no_module')" role="button" class="list-group-item" >Functions With No Modules</a>
+        <a role="button" class="list-group-item" ng-class="{active:mod.module_name==tabModuleName}" ng-click="moduleTab(mod.module_name)" ng-repeat="mod in modFunctions.modules" ng-bind="mod.module_name+' - '+mod.remark"></a>
+    </div>
+    <div class="col-sm-9">
+        <table class="table table-hover">
+            <tbody ng-if="'no_module'==tabModuleName">
+                <tr ng-repeat="func in modFunctions.no_module">
+                    <th ng-bind="func.func_id+(func.remark?'('+func.remark+')':'')" title="{{func.remark}}"></th>
+                    <!--<td ng-bind="func.uri+'['+func.req_methods+']'" title="{{func.remark}}"></td>-->
+                    <!--<td ng-bind="func.name"></td>-->
+                    <td>
+                        <i class="fa fa-user-secret" title="Administrator" ng-class="{'text-green':func.admin,'text-gray':!func.admin}"></i>
+                        <i class="fa fa-eye" title="Compliance" ng-class="{'text-green':func.operator,'text-gray':!func.operator}"></i>
+                        <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':func.bd,'text-gray':!func.bd}"></i>
+                        <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':func.finacial,'text-gray':!func.finacial}"></i>
+                        <i class="fa fa-tty" title="Service" ng-class="{'text-green':func.sevant,'text-gray':!func.servant}"></i>
+                        <!--<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>-->
+                        <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':func.director,'text-gray':!func.director}"></i>
+                        <i class="fa fa-map-o" title="Markting" ng-class="{'text-green':func.sitemanager,'text-gray':!func.sitemanager}"></i>
+                        <i class="fa fa-code" title="Developer" ng-class="{'text-green':func.developer,'text-gray':!func.developer}"></i>
+                        <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
+                        <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
+                        <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
+                        <!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>-->
+                        <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
+                        <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
+                    </td>
+                    <td>
+                        <a role="button" ng-click="moveFunction(func)" title="Move"><i class="fa fa-arrows"></i></a>
+                        <a role="button" ng-click="editFunctionInfo(func)" title="Edit"><i class="fa fa-edit"></i></a>
+                    </td>
+                </tr>
+            </tbody>
+            <tbody ng-repeat="mod in modFunctions.modules | filter:filterModFunctions" ng-if="'no_module'!=tabModuleName">
+                <tr ng-repeat="func in mod.funcs">
+                    <th ng-bind="func.func_id+(func.remark?'('+func.remark+')':'')" title="{{func.remark}}"></th>
+                    <!--<td ng-bind="func.uri+'['+func.req_methods+']'" title="{{func.remark}}"></td>-->
+                    <!--<td ng-bind="func.name"></td>-->
+                    <td>
+                        <i class="fa fa-user-secret" title="Administrator" ng-class="{'text-green':func.admin,'text-gray':!func.admin}"></i>
+                        <i class="fa fa-eye" title="Compliance" ng-class="{'text-green':func.operator,'text-gray':!func.operator}"></i>
+                        <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':func.bd,'text-gray':!func.bd}"></i>
+                        <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':func.finacial,'text-gray':!func.finacial}"></i>
+                        <i class="fa fa-tty" title="Service" ng-class="{'text-green':func.sevant,'text-gray':!func.servant}"></i>
+                        <!--<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>-->
+                        <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':func.director,'text-gray':!func.director}"></i>
+                        <i class="fa fa-map-o" title="Markting" ng-class="{'text-green':func.sitemanager,'text-gray':!func.sitemanager}"></i>
+                        <i class="fa fa-code" title="Developer" ng-class="{'text-green':func.developer,'text-gray':!func.developer}"></i>
+                        <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
+                        <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
+                        <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
+                        <!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>-->
+                        <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
+                        <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
+                    </td>
+                    <td>
+                        <a role="button" ng-click="moveFunction(func)" title="Move"><i class="fa fa-arrows"></i></a>
+                        <a role="button" ng-click="editFunctionInfo(func)" title="Edit"><i class="fa fa-edit"></i></a>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+<!--
 <div class="panel panel-warning" ng-if="modFunctions.no_module.length">
     <div class="panel-heading">Functions With No Modules</div>
     <div class="panel-body table-responsive">
@@ -21,16 +88,16 @@
                     <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':func.bd,'text-gray':!func.bd}"></i>
                     <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':func.finacial,'text-gray':!func.finacial}"></i>
                     <i class="fa fa-tty" title="Service" ng-class="{'text-green':func.sevant,'text-gray':!func.servant}"></i>
-                    <!--<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>&ndash;&gt;
                     <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':func.director,'text-gray':!func.director}"></i>
                     <i class="fa fa-map-o" title="Markting" ng-class="{'text-green':func.sitemanager,'text-gray':!func.sitemanager}"></i>
                     <i class="fa fa-code" title="Developer" ng-class="{'text-green':func.developer,'text-gray':!func.developer}"></i>
                     <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
                     <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
                     <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
-                    <!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>&ndash;&gt;
                     <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
-                    <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>&ndash;&gt;
                 </td>
                 <td>
                     <a role="button" ng-click="moveFunction(func)" title="Move"><i class="fa fa-arrows"></i></a>
@@ -55,16 +122,16 @@
                     <i class="fa fa-crosshairs" title="BD User" ng-class="{'text-green':func.bd,'text-gray':!func.bd}"></i>
                     <i class="fa fa-balance-scale" title="Accountant" ng-class="{'text-green':func.finacial,'text-gray':!func.finacial}"></i>
                     <i class="fa fa-tty" title="Service" ng-class="{'text-green':func.sevant,'text-gray':!func.servant}"></i>
-                    <!--<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-university" title="Account Manager" ng-class="{'text-green':func.accountmanager,'text-gray':!func.accountmanager}"></i>&ndash;&gt;
                     <i class="fa fa-line-chart" title="Director" ng-class="{'text-green':func.director,'text-gray':!func.director}"></i>
                     <i class="fa fa-map-o" title="Markting" ng-class="{'text-green':func.sitemanager,'text-gray':!func.sitemanager}"></i>
                     <i class="fa fa-code" title="Developer" ng-class="{'text-green':func.developer,'text-gray':!func.developer}"></i>
                     <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
                     <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
                     <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
-                    <!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>&ndash;&gt;
                     <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
-                    <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
+                    &lt;!&ndash;<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>&ndash;&gt;
                 </td>
                 <td>
                     <a role="button" ng-click="moveFunction(func)" title="Move"><i class="fa fa-arrows"></i></a>
@@ -74,4 +141,4 @@
             </tbody>
         </table>
     </uib-accordion-group>
-</uib-accordion>
\ No newline at end of file
+</uib-accordion>-->
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 7ead3f4da..bad6e7a04 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -316,8 +316,8 @@
                 </div>
             </div>
             <div class="row">
-                <div ng-if="'org'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="newOrganizations" ui-sref-opts="{reload:true}">
+                <div ng-if="'citypartner'|withModule" class="col-sm-2 col-xs-6">
+                    <a ui-sref="citypartner_reg" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/partner_application.png"/>
                         <div class="description-text">
diff --git a/src/main/ui/static/payment/partner/templates/partners_apply.html b/src/main/ui/static/payment/partner/templates/partners_apply.html
index 9bb316e93..e05375a16 100644
--- a/src/main/ui/static/payment/partner/templates/partners_apply.html
+++ b/src/main/ui/static/payment/partner/templates/partners_apply.html
@@ -19,9 +19,9 @@
                     <li ui-sref-active="active" ng-if="'simpleApplyApp'|withModule">
                         <a ui-sref="partner_apply.simple_application"> <span>Application & Open</span></a>
                     </li>
-                    <li ui-sref-active-eq="active" ng-if="'citypartner'|withModule">
+                    <!--<li ui-sref-active-eq="active" ng-if="'citypartner'|withModule">
                         <a ui-sref="partner_apply.citypartner_reg"><i class="fa fa-tv"></i> <span>City Partners</span></a>
-                    </li>
+                    </li>-->
                 </ul>
             </div>
         </div>

From c254ad65262a660b7cdf003cfe6e20a32262be74 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 29 Oct 2018 11:52:50 +0800
Subject: [PATCH 66/82] add main_menu icon

---
 .../main_menu/bd_merchant_activity_green.png     | Bin 0 -> 1667 bytes
 .../main_menu/partner_settlement_green.png       | Bin 0 -> 2641 bytes
 .../main_menu/transaction_arrears_green.png      | Bin 0 -> 3355 bytes
 .../transaction_callback_message_red.png         | Bin 0 -> 2543 bytes
 .../images/main_menu/transaction_refund_red.png  | Bin 0 -> 2506 bytes
 src/main/ui/static/menu/templates/main_menu.html |  10 +++++-----
 6 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 src/main/ui/static/images/main_menu/bd_merchant_activity_green.png
 create mode 100644 src/main/ui/static/images/main_menu/partner_settlement_green.png
 create mode 100644 src/main/ui/static/images/main_menu/transaction_arrears_green.png
 create mode 100644 src/main/ui/static/images/main_menu/transaction_callback_message_red.png
 create mode 100644 src/main/ui/static/images/main_menu/transaction_refund_red.png

diff --git a/src/main/ui/static/images/main_menu/bd_merchant_activity_green.png b/src/main/ui/static/images/main_menu/bd_merchant_activity_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..97bb64dbda8bfa3877ed9b17115704d39079c0f8
GIT binary patch
literal 1667
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
N002ovPDHLkV1l=lD*^xj

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/partner_settlement_green.png b/src/main/ui/static/images/main_menu/partner_settlement_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffccd531df0f2ba8431a5f6df398263c6768595d
GIT binary patch
literal 2641
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/transaction_arrears_green.png b/src/main/ui/static/images/main_menu/transaction_arrears_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5be57470ef991696763c7da5543a506bce7727d
GIT binary patch
literal 3355
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/transaction_callback_message_red.png b/src/main/ui/static/images/main_menu/transaction_callback_message_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..6387389c31eca8466dcfa0415c2264ffa376f9a5
GIT binary patch
literal 2543
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
FV1m&<#6bW6

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/main_menu/transaction_refund_red.png b/src/main/ui/static/images/main_menu/transaction_refund_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..1661b65b348f26facba55468f5f275402130a716
GIT binary patch
literal 2506
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
Ut0co$I{*Lx07*qoM6N<$f?)#En*aa+

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index dda2e7f81..970a39928 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -216,7 +216,7 @@
                 <div ng-if="('10000000000'|withRole)" class="col-sm-2 col-xs-6">
                     <a ui-sref="refundReview" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_refund.png"/>
+                            <img src="/static/images/main_menu/transaction_refund_red.png"/>
                             <div class="description-text">
                                 <span class="description-text">退款审核</span>
                             </div>
@@ -673,7 +673,7 @@
                 <div ng-if="'cashbackAnalysis'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="cashbackAnalysis" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/bd_merchant_activity.png"/>
+                            <img src="/static/images/main_menu/bd_merchant_activity_green.png"/>
                             <div class="description-text">
                                 <span class="description-text">商户营销账户</span>
                             </div>
@@ -682,7 +682,7 @@
                 <div class="col-sm-2 col-xs-6">
                     <a ui-sref="manual_settle" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_arrears.png"/>
+                            <img src="/static/images/main_menu/partner_settlement_green.png"/>
                             <div class="description-text">
                                 <span>商户手动清算</span>
                             </div>
@@ -692,7 +692,7 @@
                 <div ng-if="('preRefund'|withModule)" class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_arrears.png"/>
+                            <img src="/static/images/main_menu/transaction_arrears_green.png"/>
                             <div class="description-text">
                                 <span class="description-text">商户欠款</span>
                             </div>
@@ -910,7 +910,7 @@
                 <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
                         <div class="description-block">
-                            <img src="/static/images/main_menu/transaction_callback_message.png"/>
+                            <img src="/static/images/main_menu/transaction_callback_message_red.png"/>
                             <div class="description-text">
                                 <span class="description-text">支付回调消息</span>
                             </div>

From 3e7a68c5b602393c9b90561f092a6925e581a031 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Mon, 29 Oct 2018 13:00:49 +0800
Subject: [PATCH 67/82] fix

---
 .../config/sysconfigs/templates/permission_functions.html  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
index 20f105af7..4ddeb6c0c 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
@@ -1,3 +1,8 @@
+<style>
+    .table>tbody>tr>th, .table>tbody>tr>td {
+        border-top: 1px solid #ddd;
+    }
+</style>
 <div class="row margin-bottom">
     <div class="col-xs-12">
         <button class="btn btn-primary" ng-click="syncFunctions()">
@@ -12,7 +17,7 @@
         <a role="button" class="list-group-item" ng-class="{active:mod.module_name==tabModuleName}" ng-click="moduleTab(mod.module_name)" ng-repeat="mod in modFunctions.modules" ng-bind="mod.module_name+' - '+mod.remark"></a>
     </div>
     <div class="col-sm-9">
-        <table class="table table-hover">
+        <table class="table table-hover" style="border: 1px solid #ddd">
             <tbody ng-if="'no_module'==tabModuleName">
                 <tr ng-repeat="func in modFunctions.no_module">
                     <th ng-bind="func.func_id+(func.remark?'('+func.remark+')':'')" title="{{func.remark}}"></th>

From 172a8914212540a9b08bc11c748b627537a1a520 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Mon, 29 Oct 2018 15:26:26 +0800
Subject: [PATCH 68/82] fix

---
 .../static/config/sysconfigs/templates/permission_config.html | 4 ++--
 .../config/sysconfigs/templates/permission_functions.html     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
index 059b734e1..b1a48b69f 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
@@ -87,9 +87,9 @@
                         <div class="box-header with-border">权限
                             <button style="float: right;" class="btn btn-success" ng-click="submitAuthorize()">Submit</button>
                         </div>
-                        <div class="box-body table-responsive">
+                        <div class="box-body">
                             <div class="row">
-                                <div class="col-sm-4 col-xs-1">
+                                <div class="col-sm-4 col-xs-1" style="height:800px;overflow-y:scroll;">
                                     <a role="button" ng-class="{active:mod.module_name==moduleName}" ng-click="switchModule(mod.module_name)" class="list-group-item" ng-repeat="mod in modules.modules" ng-bind="mod.module_name+' - '+mod.remark"></a>
                                 </div>
                                 <div class="col-sm-8 col-xs-1">
diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
index 4ddeb6c0c..99637583e 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html
@@ -12,7 +12,7 @@
 </div>
 
 <div class="row">
-    <div class="col-sm-3">
+    <div class="col-sm-3" style="height:800px;overflow-y:scroll;">
         <a ng-if="modFunctions.no_module.length" ng-class="{active:'no_module'==tabModuleName}" ng-click="moduleTab('no_module')" role="button" class="list-group-item" >Functions With No Modules</a>
         <a role="button" class="list-group-item" ng-class="{active:mod.module_name==tabModuleName}" ng-click="moduleTab(mod.module_name)" ng-repeat="mod in modFunctions.modules" ng-bind="mod.module_name+' - '+mod.remark"></a>
     </div>

From c789897636c8758e5db354381be11e8ed76d60c2 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 30 Oct 2018 09:36:19 +0800
Subject: [PATCH 69/82] fix manage.html & menu_html

---
 src/main/ui/manage.html                       | 28 +++++++++--
 .../ui/static/analysis/channels_analysis.js   |  2 +-
 .../ui/static/analysis/refund_analysis.js     |  2 +-
 .../static/analysis/trans-analysis-monthly.js |  2 +-
 src/main/ui/static/analysis/trans-analysis.js |  4 +-
 .../transaction/analysis-transaction.js       |  8 +--
 .../templates/analysis_transaction.html       | 30 +++++------
 .../ui/static/menu/templates/main_menu.html   | 50 +++++++++++++++++--
 8 files changed, 93 insertions(+), 33 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 8f6e7fcae..a9fa07fc1 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -313,12 +313,12 @@ margin-bottom: 10%;"/>
                         </li>
                         <li ui-sref-active="active" ng-if="'clientrate'|withModule">
                             <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
-                                <i class="fa fa-shopping-cart"></i> <span>商户活跃度(原统计)</span>
+                                <i class="fa fa-shopping-cart"></i> <span>商户活跃度</span>
                             </a>
                         </li>
                         <li ui-sref-active="active" ng-if="('merchantAmount'|withModule)">
                             <a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}">
-                                <i class="fa fa-area-chart"></i> <span>商户交易额统计（原统计）</span>
+                                <i class="fa fa-area-chart"></i> <span>商户交易额统计</span>
                             </a>
                         </li>
                     </ul>
@@ -338,8 +338,28 @@ margin-bottom: 10%;"/>
                             </a>
                         </li>
                         <li ui-sref-active="active" ng-if="('transAnalysis'|withModule)">
-                            <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
-                                <i class="fa fa-area-chart"></i> <span>原统计</span>
+                            <a ui-sref="analysis_transanalysis" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-area-chart"></i> <span>交易数据|Transaction Data</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('dashboard'|withModule)">
+                            <a ui-sref="analysis_gateway" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-area-chart"></i> <span>Gateway统计</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('refundAnalysisApp'|withModule)">
+                            <a ui-sref="analysis_refundAnalysis" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-area-chart"></i> <span>退款统计|Refund Analysis</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('channels_Analysis'|withModule)">
+                            <a ui-sref="analysis_channelsAnalysis" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-area-chart"></i> <span>支付通道|Channels Analysis</span>
+                            </a>
+                        </li>
+                        <li ui-sref-active="active" ng-if="('dashboard'|withModule)&&(currentUser.org_id==null)">
+                            <a ui-sref="analysis_amountlsAnalysis" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-area-chart"></i> <span>交易金额分析</span>
                             </a>
                         </li>
                     </ul>
diff --git a/src/main/ui/static/analysis/channels_analysis.js b/src/main/ui/static/analysis/channels_analysis.js
index 7cf052150..c9153a7db 100644
--- a/src/main/ui/static/analysis/channels_analysis.js
+++ b/src/main/ui/static/analysis/channels_analysis.js
@@ -6,7 +6,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
     var app = angular.module('channelsAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.channelsAnalysis', {
+        $stateProvider.state('analysis_channelsAnalysis', {
             url: '/channelsAnalysis',
             templateUrl: '/static/analysis/templates/channels_analysis.html',
             controller: 'channelsCtrl'
diff --git a/src/main/ui/static/analysis/refund_analysis.js b/src/main/ui/static/analysis/refund_analysis.js
index 870bbf544..f77ba79e2 100644
--- a/src/main/ui/static/analysis/refund_analysis.js
+++ b/src/main/ui/static/analysis/refund_analysis.js
@@ -3,7 +3,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
     var app = angular.module('refundAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.refundAnalysis', {
+        $stateProvider.state('analysis_refundAnalysis', {
             url: '/refunds',
             templateUrl: '/static/analysis/templates/refund_analysis.html',
             controller: 'refundListCtrl'
diff --git a/src/main/ui/static/analysis/trans-analysis-monthly.js b/src/main/ui/static/analysis/trans-analysis-monthly.js
index c1bccba7c..9353218cc 100644
--- a/src/main/ui/static/analysis/trans-analysis-monthly.js
+++ b/src/main/ui/static/analysis/trans-analysis-monthly.js
@@ -15,7 +15,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                 {
                     key: 'day',
                     label: '按日统计',
-                    sref:"analysis_transaction.transanalysis"
+                    sref:"analysis_transanalysis"
                 },
                 {
                     key: 'month',
diff --git a/src/main/ui/static/analysis/trans-analysis.js b/src/main/ui/static/analysis/trans-analysis.js
index 2087785c3..7bccea5a0 100644
--- a/src/main/ui/static/analysis/trans-analysis.js
+++ b/src/main/ui/static/analysis/trans-analysis.js
@@ -3,7 +3,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('transAnalysis', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.transanalysis', {
+        $stateProvider.state('analysis_transanalysis', {
             url: '/analysis/transaction',
             templateUrl: '/static/analysis/templates/trans_analysis.html',
             controller: 'transAnalysisCtrl'
@@ -15,7 +15,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                 {
                     key: 'day',
                     label: '按日统计',
-                    sref:"analysis_transaction.transanalysis"
+                    sref:"analysis_transanalysis"
                 },
                 {
                     key: 'month',
diff --git a/src/main/ui/static/analysis/transaction/analysis-transaction.js b/src/main/ui/static/analysis/transaction/analysis-transaction.js
index dafc91ff2..7e4caa701 100644
--- a/src/main/ui/static/analysis/transaction/analysis-transaction.js
+++ b/src/main/ui/static/analysis/transaction/analysis-transaction.js
@@ -10,11 +10,11 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
             url: '/analysis/transaction',
             templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html',
             controller: 'analysisTransactionCtrl'
-        }).state('analysis_transaction.gateway', {
-            url: '/gateway',
+        }).state('analysis_gateway', {
+            url: '/analysis/transaction/gateway',
             templateUrl: '/static/dashboard/templates/dashboard_gateway.html',
             controller: 'gatewayTransCtrl'
-        }).state('analysis_transaction.amountlsAnalysis', {
+        }).state('analysis_amountlsAnalysis', {
             url: '/amountRangeAnalysis',
             templateUrl: '/static/analysis/templates/transaction_amount_Analysis.html',
             controller: 'transactionAmountCtrl'
@@ -159,7 +159,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
     }]);
     app.controller('analysisTransactionCtrl', ['$scope','$state', function ($scope,$state) {
         if($state.is('analysis_transaction')){
-            $state.go('.transanalysis');
+            $state.go('analysis_transanalysis');
         }
     }]);
 
diff --git a/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html b/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html
index bb2327797..dd409ca64 100644
--- a/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html
+++ b/src/main/ui/static/analysis/transaction/templates/analysis_transaction.html
@@ -4,34 +4,34 @@
 
     <div class="col-sm-12 analysis-nav">
         <ul class="nav nav-pills">
-            <li ui-sref-active-eq="active" ng-if="'transAnalysis'|withModule">
-                <a ui-sref="analysis_transaction.transanalysis"><i class="fa fa-area-chart"></i>交易数据|Transaction Data</a>
-            </li>
+<!--            <li ui-sref-active-eq="active" ng-if="'transAnalysis'|withModule">
+                <a ui-sref="analysis_transanalysis"><i class="fa fa-area-chart"></i>交易数据|Transaction Data</a>
+            </li>-->
             <!--<li ui-sref-active-eq="active" ng-if="'partner_analysis'|withModule">-->
                 <!--<a ui-sref="analysis_transaction.partners_analysis"><i class="fa fa-line-chart"></i></i>商户数|Merchants Data</a>-->
             <!--</li>-->
-            <li ui-sref-active="active" ng-if="'dashboard'|withModule">
-                <a ui-sref="analysis_transaction.gateway"><i class="fa fa-area-chart"></i>Gateway统计|Gateway Analysis</a>
-            </li>
+<!--            <li ui-sref-active="active" ng-if="'dashboard'|withModule">
+                <a ui-sref="analysis_gateway"><i class="fa fa-area-chart"></i>Gateway统计|Gateway Analysis</a>
+            </li>-->
             <!--<li ui-sref-active="active" ng-if="'customer_analysis'|withModule">
                 <a ui-sref="analysis_transaction.customers_analysis_manage"><i class="fa fa-bar-chart"></i>消费者统计|Customer Analysis</a>
             </li>-->
             <!--<li ui-sref-active="active" ng-if="'customerRankingAnalysisApp'|withModule">-->
                 <!--<a ui-sref="analysis_transaction.customerRankingAnalysis"><i class="fa fa-male"></i>消费排名|Customers Ranking</a>-->
             <!--</li>-->
-            <li ui-sref-active="active" ng-if="'refundAnalysisApp'|withModule">
-                <a ui-sref="analysis_transaction.refundAnalysis"><i class="fa fa-money"></i>退款统计|Refund Analysis</a>
-            </li>
+            <!--<li ui-sref-active="active" ng-if="'refundAnalysisApp'|withModule">-->
+                <!--<a ui-sref="analysis_refundAnalysis"><i class="fa fa-money"></i>退款统计|Refund Analysis</a>-->
+            <!--</li>-->
             <!--<li ui-sref-active="active" ng-if="('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)">-->
                 <!--<a ui-sref="analysis_transaction.estimateAnalysis"><i class="fa fa-money"></i>清算预估|Settlement Estimate</a>-->
             <!--</li>-->
-            <li ui-sref-active="active" ng-if="'channels_Analysis'|withModule">
-                <a ui-sref="analysis_transaction.channelsAnalysis"><i class="fa fa-area-chart"></i>支付通道|Channels Analysis</a>
-            </li>
+            <!--<li ui-sref-active="active" ng-if="'channels_Analysis'|withModule">-->
+                <!--<a ui-sref="analysis_channelsAnalysis"><i class="fa fa-area-chart"></i>支付通道|Channels Analysis</a>-->
+            <!--</li>-->
 
-            <li ui-sref-active="active" ng-if="('dashboard'|withModule)&&(currentUser.org_id==null)">
-                <a ui-sref="analysis_transaction.amountlsAnalysis"><i class="fa fa-area-chart"></i>交易金额分析|Transaction Amount Analysis</a>
-            </li>
+            <!--<li ui-sref-active="active" ng-if="('dashboard'|withModule)&&(currentUser.org_id==null)">-->
+                <!--<a ui-sref="analysis_amountlsAnalysis"><i class="fa fa-area-chart"></i>交易金额分析|Transaction Amount Analysis</a>-->
+            <!--</li>-->
 
             <!--<li ui-sref-active="active" ng-if="('merchantAmount'|withModule) &&('1'|withRole) ">-->
                 <!--<a ui-sref="analysis_transaction.merchantAmountAnalysis"><i class="fa fa-area-chart"></i>商户交易额</a>-->
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 6309be78b..f5688bc29 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -76,7 +76,7 @@
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_statistics.png"/>
                         <div class="description-text">
-                            <span class="description-text">商户统计(原统计)</span>
+                            <span class="description-text">商户统计</span>
                         </div>
                     </div>
                     </a>
@@ -86,7 +86,7 @@
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_activity_1.png"/>
                         <div class="description-text">
-                            <span class="description-text">商户活跃度(原统计)</span>
+                            <span class="description-text">商户活跃度</span>
                         </div>
                     </div>
                     </a>
@@ -96,7 +96,7 @@
                     <div class="description-block">
                         <img src="/static/images/main_menu/merchant_turnover.png"/>
                         <div class="description-text">
-                            <span class="description-text">商户交易额(原统计)</span>
+                            <span class="description-text">商户交易额</span>
                         </div>
                     </div>
                     </a>
@@ -123,15 +123,55 @@
                     </a>
                 </div>
                 <div ng-if="('transAnalysis'|withModule)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
+                    <a ui-sref="analysis_transanalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_original_statistics.png"/>
                         <div class="description-text">
-                            <span class="description-text">原统计</span>
+                            <span class="description-text">交易数据</span>
                         </div>
                     </div>
                     </a>
                 </div>
+                <div ng-if="('dashboard'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_gateway" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">Gateway统计</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('refundAnalysisApp'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_refundAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">退款统计</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('channels_Analysis'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_channelsAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">支付通道</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('dashboard'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="analysis_amountlsAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">交易金额分析</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
             </div>
         </div>
         <div class="list-group" ng-if="role=='riskmanager'">

From 28d94d9a64de97e7f3b4ddb6c27ef332df5c60b8 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 30 Oct 2018 11:45:28 +0800
Subject: [PATCH 70/82] add clearManager

---
 .../payment/manage/signin/core/SignInAccountService.java    | 2 ++
 .../manage/signin/core/impls/ManagerAccountServiceImpl.java | 4 ++++
 .../manage/signin/core/impls/SignInAccountServiceImpl.java  | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java
index 0cdaa4683..e9b82b21e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java
@@ -11,6 +11,8 @@ public interface SignInAccountService {
 
     JSONObject getManager(String accountId);
 
+    void clearManager(String accountId);
+
     JSONObject getClient(String accountId);
 
     void clearAccountCache(String accountId);
diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
index d99faacd6..078087413 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
@@ -6,6 +6,7 @@ import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
 import au.com.royalpay.payment.manage.organizations.core.OrgManager;
 import au.com.royalpay.payment.manage.signin.beans.ManagerInfo;
 import au.com.royalpay.payment.manage.signin.core.ManagerAccountsService;
+import au.com.royalpay.payment.manage.signin.core.SignInAccountService;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.NotFoundException;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
@@ -37,6 +38,8 @@ public class ManagerAccountServiceImpl implements ManagerAccountsService {
 
     @Resource
     private OrgManager orgManager;
+    @Resource
+    private SignInAccountService signInAccountService;
 
     @Override
     public PageList<JSONObject> listManagers(JSONObject loginManager,JSONObject params) {
@@ -105,6 +108,7 @@ public class ManagerAccountServiceImpl implements ManagerAccountsService {
         }
         obj.put("manager_id", userId);
         managerMapper.update(obj);
+        signInAccountService.clearManager(userId);
     }
 
     @Override
diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index fd785877d..5b790db1c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
@@ -129,6 +129,12 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
         return manager;
     }
 
+    @Override
+    @CacheEvict(value = ":login:managers:", key = "''+#accountId")
+    public void clearManager(String accountId) {
+
+    }
+
     @Override
     @Cacheable(value = ":login:clients:", key = "''+#accountId")
     public JSONObject getClient(String accountId) {

From 4927d0998eebad7f4f45151e6338a272a13270d8 Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Tue, 30 Oct 2018 17:19:06 +0800
Subject: [PATCH 71/82] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0remark=E5=92=8Cgateway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/TradeLogServiceImpl.java       |   4 ++-
 .../mappers/payment/TransactionMapper.xml     |  32 +++++++++++++++++-
 src/main/resources/jasper/trans_excel.jasper  | Bin 46921 -> 47357 bytes
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
index aa9b9984c..6e57d28d5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
@@ -483,7 +483,9 @@ public class TradeLogServiceImpl implements TradeLogService {
             logs.stream().forEach(p -> {
                 String login_id = p.getString("login_id");
                 if (StringUtils.isNotEmpty(login_id)) {
-                    p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")) + "(alipay_id:" + login_id + ")");
+                    p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : login_id+":"+p.getString("order_detail")));
+                }else{
+                    p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")));
                 }
             });
         }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index 7886a2c6a..055d985b9 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -64,6 +64,36 @@
         WHEN 2 THEN 'Preauthorised'
         END) clear_status,
         o.order_detail,o.display_amount,o.channel,o.currency,o.pre_authorization,
+        CASE o.gateway
+        WHEN 0
+        THEN 'Retail In-Store'
+        WHEN 1
+        THEN 'Retail In-Store'
+        WHEN 2
+        THEN 'QR Code'
+        WHEN 3
+        THEN 'Online API'
+        WHEN 4
+        THEN 'WeChat HTML5'
+        WHEN 5
+        THEN 'Retail API'
+        WHEN 6
+        THEN 'Retail API'
+        WHEN 7
+        THEN 'QR Code'
+        WHEN 8
+        THEN 'Mobile H5'
+        WHEN 9
+        THEN 'Third Party Gateway'
+        WHEN 10
+        THEN 'APP'
+        WHEN 12
+        THEN 'MICROAPP'
+        WHEN 13
+        THEN 'Native QR Code'
+        WHEN 14
+        THEN 'Share Link'
+        END AS                                     gateway,
         CASE o.channel
         WHEN 'Alipay' THEN ra.login_id
         WHEN 'AlipayOnline' THEN ra.login_email
@@ -926,4 +956,4 @@ select  sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,
         order by period_start
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/jasper/trans_excel.jasper b/src/main/resources/jasper/trans_excel.jasper
index 714241425107fd5de44573d33dd1002c25814f96..ddf12f23f6c587848c6e5d43b4b5003fe7cd3043 100644
GIT binary patch
literal 47357
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
Wq?ncI@I3qT$ZFgo(5gRTjQ=0?{n_*Y

literal 46921
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
YgFc+^9=3Iw``P1a>{8#WKTgd3U*RB4nE(I)


From 4158922e7cade6225ac94fd07b7969f945cecbaa Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Tue, 30 Oct 2018 18:34:44 +0800
Subject: [PATCH 72/82] =?UTF-8?q?=E4=B8=87=E5=9C=A3=E8=8A=82=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B4=BB=E5=8A=A8=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomerHalloweenCountServiceImpl.java    | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerHalloweenCountServiceImpl.java

diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerHalloweenCountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerHalloweenCountServiceImpl.java
new file mode 100644
index 000000000..00c44643a
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerHalloweenCountServiceImpl.java
@@ -0,0 +1,105 @@
+package au.com.royalpay.payment.manage.customers.core.impls;
+
+import au.com.royalpay.payment.core.events.AfterPaymentFinishEvent;
+import au.com.royalpay.payment.manage.mappers.system.CustomerMapper;
+import cn.yixblog.platform.http.HttpRequestGenerator;
+import cn.yixblog.platform.http.HttpRequestResult;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Service
+public class CustomerHalloweenCountServiceImpl implements ApplicationListener<AfterPaymentFinishEvent> {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Value("${app.customer.host}")
+    private  String CUSTOMER_HOST;
+
+    @Value("${customer.app.appid}")
+    private  String CUSTOMER_APP_ID;
+
+    @Value("${customer.app.auth-code}")
+    private String CUSTOMER_AUTH_CODE;
+
+    @Resource
+    private CustomerMapper customerMapper;
+
+    @Override
+    public void onApplicationEvent(AfterPaymentFinishEvent event) {
+        final JSONObject order = event.getFinishedEvent().getOrder();
+        //判断是否是pine测试商户，若不是则判断是否在活动时间
+        if (order.getIntValue("client_id") != 9) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            Date newDay = new Date();
+            try {
+                if (newDay.compareTo(sdf.parse("2018-10-31 00:00:00")) < 0) {
+                    return;
+                }
+                if (newDay.compareTo(sdf.parse("2018-11-02 00:00:00")) > 0) {
+                    return;
+                }
+            } catch (ParseException e) {
+
+            }
+        }
+        BigDecimal clearAmount = event.getFinishedEvent().getAudFee();
+        String channel = order.getString("channel");
+        if ("Wechat".equals(channel)) {
+            JSONObject customerRelation  = customerMapper.findCustomerByOpenId(order.getString("customer_id"));
+            if (customerRelation == null) {
+                customerRelation  = customerMapper.findCustomerGlobalpayByOpenId(order.getString("customer_id"));
+            }
+            if (customerRelation.getString("kanga_openid") == null) {
+                return;
+            }
+            afterPaymentAddHalloweenCount(customerRelation.getString("kanga_openid"), order.getString("order_id"), customerRelation.getString("redpack_openid"),channel, clearAmount);
+        }
+        if ("Alipay".equals(channel)) {
+            afterPaymentAddHalloweenCount(order.getString("customer_id"), order.getString("order_id"), "alipay",channel, clearAmount);
+        }
+    }
+
+    private void afterPaymentAddHalloweenCount(String id, String orderId,String redPackId, String channel, BigDecimal clearAmount) {
+        String timestamp = System.currentTimeMillis() + "";
+        String base = CUSTOMER_APP_ID + timestamp + CUSTOMER_AUTH_CODE;
+        String sign = DigestUtils.sha256Hex(base).toLowerCase();
+        String uri = UriComponentsBuilder.fromHttpUrl(CUSTOMER_HOST + "activity/halloween/payment/orders")
+                .queryParam("appid", CUSTOMER_APP_ID)
+                .queryParam("timestamp", timestamp)
+                .queryParam("sign", sign)
+                .queryParam("id", id)
+                .queryParam("orderId", orderId)
+                .queryParam("channel", channel)
+                .queryParam("amount", clearAmount)
+                .queryParam("redpackId", redPackId)
+                .toUriString();
+        if(clearAmount.compareTo(new BigDecimal("1.99"))<0){
+            return;
+        }
+        HttpRequestGenerator gen = new HttpRequestGenerator(uri, RequestMethod.POST);
+        try {
+            HttpRequestResult result = gen.execute();
+            if (result.isSuccess()) {
+                int statusCode = result.getStatusCode();
+                if (statusCode == 200) {
+                    logger.info("万圣节活动次数添加成功");
+                }
+            }
+
+        } catch (Exception ignored) {
+            ignored.printStackTrace();
+        }
+    }
+}

From c3ddf0e5d5480dddeadea0d51a861891ed88f0f9 Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Tue, 30 Oct 2018 18:44:09 +0800
Subject: [PATCH 73/82] =?UTF-8?q?=E4=B8=87=E5=9C=A3=E8=8A=82=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B4=BB=E5=8A=A8=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customers/core/CouponValidateService.java |  4 ++
 .../core/impls/CouponValidateServiceImpl.java | 52 +++++++++++++++++++
 .../web/CouponValidateController.java         | 14 +++++
 .../manage/mappers/payment/OrderMapper.java   |  5 ++
 4 files changed, 75 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java
index 12daea020..5756026df 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/CouponValidateService.java
@@ -2,6 +2,8 @@ package au.com.royalpay.payment.manage.customers.core;
 
 import com.alibaba.fastjson.JSONObject;
 
+import java.util.List;
+
 /**
  * Created by yuan on 2017/10/10.
  */
@@ -21,4 +23,6 @@ public interface CouponValidateService {
     JSONObject ctripCouponInfo(String coupon_log_id,int client_id,boolean is_expiry);
 
     JSONObject ctripCouponLogNotice(String coupon_log_id,String order_id,String open_id,String status);
+
+    JSONObject getHalloweenOrderInfo(String customerId, String transactionDate);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java
index 4de0054a5..da92be0e2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java
@@ -2,6 +2,8 @@ package au.com.royalpay.payment.manage.customers.core.impls;
 
 import au.com.royalpay.payment.manage.customers.core.CouponValidateService;
 import au.com.royalpay.payment.manage.mappers.customers.CustomerMembershipMapper;
+import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
+import au.com.royalpay.payment.manage.mappers.system.CustomerMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.NotFoundException;
@@ -51,6 +53,12 @@ public class CouponValidateServiceImpl implements CouponValidateService {
     @Resource
     private ClientManager clientManager;
 
+    @Resource
+    private OrderMapper orderMapper;
+
+    @Resource
+    private CustomerMapper customerMapper;
+
     @Override
     public JSONObject getCoupon(JSONObject partner,int page,int limit) {
         String timestamp = System.currentTimeMillis() + "";
@@ -217,6 +225,50 @@ public class CouponValidateServiceImpl implements CouponValidateService {
         return null;
     }
 
+    @Override
+    public JSONObject getHalloweenOrderInfo(String customerId, String transactionDate) {
+
+        // 获取万圣节活动当天支付成功的订单
+        JSONObject param = new JSONObject();
+        param.put("customer_id", customerId);
+        param.put("transaction_date", transactionDate);
+        param.put("status", 5);
+        List<JSONObject> orderList = orderMapper.listHalloweenActOrder(param);
+
+        JSONObject result = null;
+        if (orderList != null && orderList.size() > 0) {
+            result = new JSONObject();
+            result.put("orderList", orderList);
+            for (JSONObject order : orderList) {
+                String redpackOpenId = getRedpackId(order);
+                if (redpackOpenId != null) {
+                    result.put("redpackOpenId", redpackOpenId);
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+    // 获取该笔订单的redpackOpenId
+    // TODO: 2018/10/28 有待商榷
+    private String getRedpackId(JSONObject order) {
+        String redpackOpenId = null;
+        String channel = order.getString("channel");
+        if ("Wechat".equals(channel)) {
+            JSONObject customerRelation  = customerMapper.findCustomerByOpenId(order.getString("customer_id"));
+            if (customerRelation == null) {
+                customerRelation  = customerMapper.findCustomerGlobalpayByOpenId(order.getString("customer_id"));
+            } else {
+                redpackOpenId = customerRelation.getString("redpack_openid");
+                if (customerRelation.getString("kanga_openid") == null) {
+                    redpackOpenId = null;
+                }
+            }
+        }
+        return redpackOpenId;
+    }
+
     private String signUrl(UriComponentsBuilder uriComponentsBuilder) {
         String timestamp = System.currentTimeMillis() + "";
         String base = CUSTOMER_APP_ID + timestamp + CUSTOMER_AUTH_CODE;
diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/web/CouponValidateController.java b/src/main/java/au/com/royalpay/payment/manage/customers/web/CouponValidateController.java
index d4eeece61..5c46782d9 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/web/CouponValidateController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/web/CouponValidateController.java
@@ -10,6 +10,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * Created by yuan on 2017/10/10.
@@ -40,4 +41,17 @@ public class CouponValidateController {
             throw new BadRequestException("卡券核销失败");
         }
     }
+
+    /**
+     * 万圣节活动当天订单信息
+     * @param customerId
+     * @param actDate
+     * @return
+     */
+    @GetMapping(value = "/payment/halloween")
+    @ResponseBody
+    public JSONObject getHalloweenActOrderInfo(@RequestParam("customer_id") String customerId,
+                                               @RequestParam("act_date") String actDate) {
+        return couponVerificationService.getHalloweenOrderInfo(customerId, actDate);
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
index 7c351ef10..49ccef8e9 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
@@ -79,4 +79,9 @@ public interface OrderMapper {
     List<JSONObject> listAnalysisClientCustomer(JSONObject params);
 
     PageList<JSONObject> listTransactionsForApp(JSONObject params, PageBounds pageBounds);
+
+    JSONObject findOrderById(@Param("order_id") String orderId);
+
+    @AutoSql(type = SqlType.SELECT)
+    List<JSONObject> listHalloweenActOrder(JSONObject param);
 }

From 0bcbba9b23c6d359fa163afd9512392031dc6dab Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Tue, 30 Oct 2018 20:32:04 +0800
Subject: [PATCH 74/82] =?UTF-8?q?=E4=B8=87=E5=9C=A3=E8=8A=82=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B4=BB=E5=8A=A8=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/mappers/payment/OrderMapper.java   |  1 -
 .../manage/mappers/payment/OrderMapper.xml    | 23 +++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
index 49ccef8e9..cb0a76396 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
@@ -82,6 +82,5 @@ public interface OrderMapper {
 
     JSONObject findOrderById(@Param("order_id") String orderId);
 
-    @AutoSql(type = SqlType.SELECT)
     List<JSONObject> listHalloweenActOrder(JSONObject param);
 }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index ad184d835..1e8d8bafb 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -738,5 +738,24 @@
             <if test="clearing_status!=null">and t.clearing_status=#{clearing_status}</if>
         </where>
     </select>
-
-</mapper>
\ No newline at end of file
+    <select id="listHalloweenActOrder" resultType="com.alibaba.fastjson.JSONObject">
+        <![CDATA[
+        SELECT
+        o.order_id                                 order_id,
+        o.currency,
+        o.channel,
+        o.customer_id
+        format(t.clearing_amount,2)                clearing_amount
+        FROM pmt_orders o
+        LEFT JOIN pmt_transactions t
+        ON t.order_id = o.order_id
+        AND t.refund_id IS NULL
+        AND t.transaction_type = 'Credit'
+        AND t.channel != 'System'
+        and o.transaction_date = #{transaction_date}
+        and o.status = #{status}
+        and o.customer_id = #{customer_id}
+        and t.clearing_amount >= 1.99
+         ]]>
+</select>
+</mapper>

From b8140db7e2a244f388a9c23dddf20ec33972222e Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Tue, 30 Oct 2018 21:30:54 +0800
Subject: [PATCH 75/82] =?UTF-8?q?=E4=B8=87=E5=9C=A3=E8=8A=82=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B4=BB=E5=8A=A8=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/royalpay/payment/manage/mappers/payment/OrderMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index 1e8d8bafb..c49eb9faf 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -744,7 +744,7 @@
         o.order_id                                 order_id,
         o.currency,
         o.channel,
-        o.customer_id
+        o.customer_id,
         format(t.clearing_amount,2)                clearing_amount
         FROM pmt_orders o
         LEFT JOIN pmt_transactions t

From c0480d2c62876fa3dc807817900b4f61c007600c Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Tue, 30 Oct 2018 22:11:15 +0800
Subject: [PATCH 76/82] update

---
 .../core/impls/CouponValidateServiceImpl.java | 29 ++++++++++++++-----
 .../manage/mappers/system/CustomerMapper.java |  3 ++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java
index da92be0e2..9cc652ff0 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CouponValidateServiceImpl.java
@@ -227,14 +227,29 @@ public class CouponValidateServiceImpl implements CouponValidateService {
 
     @Override
     public JSONObject getHalloweenOrderInfo(String customerId, String transactionDate) {
-
+        List<JSONObject> orderList = new ArrayList<>();
+        JSONObject relation = customerMapper.findCustomerBykangaId(customerId);
+        if (relation.containsKey("wechat_openid")) {
+            JSONObject param = new JSONObject();
+            param.put("customer_id", relation.getString("wechat_openid"));
+            param.put("transaction_date", transactionDate);
+            param.put("status", 5);
+            List<JSONObject> orderListWechat = orderMapper.listHalloweenActOrder(param);
+            if(orderListWechat!=null){
+                orderList.addAll(orderListWechat);
+            }
+        }
+        if (relation.containsKey("globalpay_openid")) {
+            JSONObject param = new JSONObject();
+            param.put("customer_id", relation.getString("globalpay_openid"));
+            param.put("transaction_date", transactionDate);
+            param.put("status", 5);
+            List<JSONObject> orderListGlobal = orderMapper.listHalloweenActOrder(param);
+            if(orderListGlobal!=null){
+                orderList.addAll(orderListGlobal);
+            }
+        }
         // 获取万圣节活动当天支付成功的订单
-        JSONObject param = new JSONObject();
-        param.put("customer_id", customerId);
-        param.put("transaction_date", transactionDate);
-        param.put("status", 5);
-        List<JSONObject> orderList = orderMapper.listHalloweenActOrder(param);
-
         JSONObject result = null;
         if (orderList != null && orderList.size() > 0) {
             result = new JSONObject();
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMapper.java
index cfcc331b0..de8658aaf 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMapper.java
@@ -28,4 +28,7 @@ public interface CustomerMapper {
     @AutoSql(type = SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "wechat_openid like 'o32%'")
     JSONObject findCustomerBykangaOpenid(@Param("kanga_openid") String openId);
+
+    @AutoSql(type = SqlType.SELECT)
+    JSONObject findCustomerBykangaId(@Param("kanga_openid") String openId);
 }

From b9224b75e45ff790fa4e8bb0978f424712ba32b7 Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Tue, 30 Oct 2018 23:10:49 +0800
Subject: [PATCH 77/82] update

---
 .../com/royalpay/payment/manage/mappers/payment/OrderMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index c49eb9faf..de0da503a 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -749,7 +749,7 @@
         FROM pmt_orders o
         LEFT JOIN pmt_transactions t
         ON t.order_id = o.order_id
-        AND t.refund_id IS NULL
+        WHERE t.refund_id IS NULL
         AND t.transaction_type = 'Credit'
         AND t.channel != 'System'
         and o.transaction_date = #{transaction_date}

From afc74060eabb050c028f6e991170331b1d71da0b Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 31 Oct 2018 11:21:04 +0800
Subject: [PATCH 78/82] add bd_leader <- clearing modules

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

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index a9fa07fc1..58b2a0e7b 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -465,7 +465,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="menu-group" ng-if="roleNow=='accountant' || roleNow=='director'">
+                <li class="menu-group" ng-if="roleNow=='accountant' || roleNow=='director' || ('1000000000'|withRole)">
                     <p role="button" ng-class="{'active': Settlement,'is-hide':hideSideBar}" ng-click="Settlement = !Settlement">
                         <span>清算管理|Settlement</span>
                         <span class="pull-right-container">
@@ -489,7 +489,7 @@ margin-bottom: 10%;"/>
                             </a>
                         </li>
 
-                        <li ui-sref-active="active" ng-if="('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)">
+                        <li ui-sref-active="active" ng-if="('estimateAnalysisApp'|withModule)&&((currentUser.org_id==null)||((currentUser.org_id==1)&&('1000000000'|withRole)))">
                             <a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}">
                                 <i class="fa fa fa-money"></i> <span>清算预估|Estimate</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 f5688bc29..01360cbd5 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -741,7 +741,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group" ng-if="role=='accountant' || role=='director'">
+        <div class="list-group" ng-if="role=='accountant' || role=='director' || ('1000000000'|withRole)">
             <div class="row" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="clearing">
                     <div class="description-block">
@@ -786,7 +786,7 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="('estimateAnalysisApp'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                <div ng-if="('estimateAnalysisApp'|withModule)&&((currentUser.org_id==null)||((currentUser.org_id==1)&&('1000000000'|withRole)))" class="col-sm-2 col-xs-6">
                     <a ui-sref="estimateAnalysis" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/settle_prediction.png"/>

From b9d02da2cb4199cb06b76dd36de10dfce53cb97d Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Wed, 31 Oct 2018 13:52:45 +0800
Subject: [PATCH 79/82] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=94=B6=E5=8F=96?=
 =?UTF-8?q?=E6=89=8B=E7=BB=AD=E8=B4=B9=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/templates/alipay/v1/payment.js   | 3 ++-
 src/main/ui/static/templates/payment/payment.css    | 7 ++++++-
 src/main/ui/static/templates/payment/v1/payment.css | 7 ++++++-
 src/main/ui/static/templates/payment/v2/payment.css | 7 ++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/ui/static/templates/alipay/v1/payment.js b/src/main/ui/static/templates/alipay/v1/payment.js
index 9c78ea26e..f9597c703 100644
--- a/src/main/ui/static/templates/alipay/v1/payment.js
+++ b/src/main/ui/static/templates/alipay/v1/payment.js
@@ -104,7 +104,7 @@ $(function () {
         $(window.coupons).each(function () {
             price = this.handleDiscount(price, dataCache.price, dataCache.discounts, dataCache.coupons);
         });
-        dataCache.customSurcharge = new Decimal(price).sub(realPrice).toFixed(2,Decimal.ROUND_HALF_UP);
+        dataCache.customSurcharge = new Decimal(price).sub(realPrice).toFixed(2, Decimal.ROUND_HALF_UP);
         dataCache.finalPrice = new Decimal(price).toFixed(2, Decimal.ROUND_FLOOR);
         var rate = 'CNY' == window.currency ? 1 : exchangeRate;
         var cnyVal = Decimal.mul(price, rate).toFixed(2, Decimal.ROUND_HALF_UP);
@@ -205,6 +205,7 @@ $(function () {
                 $('<p></p>').html('Input Price 输入金额:' + currencySymbol + dataCache.price).appendTo(bd);
                 if (parseFloat(dataCache.customSurcharge) > 0) {
                     $('<p></p>').html('Surcharge 手续费(' + window.rateValue + '%):+' + currencySymbol + dataCache.customSurcharge).appendTo(bd);
+                    $('<p></p>').addClass('warning-sm').html('温馨提示：商户将向您收取本次消费手续费' + window.rateValue + '%').appendTo(bd);
                 }
                 $(dataCache.discounts).each(function () {
                     $('<p></p>').html(this.title + ':-' + currencySymbol + this.amount).appendTo(bd);
diff --git a/src/main/ui/static/templates/payment/payment.css b/src/main/ui/static/templates/payment/payment.css
index 9d13e26d0..ad4a54769 100644
--- a/src/main/ui/static/templates/payment/payment.css
+++ b/src/main/ui/static/templates/payment/payment.css
@@ -12,7 +12,12 @@ body {
 div, span, p, ul, li {
     box-sizing: border-box;
 }
-
+.warning-sm{
+    color:red;
+    font-size:10px;
+    transform-origin: left;
+    transform: scale(0.8);
+}
 .ff.key {
     position: relative;
 }
diff --git a/src/main/ui/static/templates/payment/v1/payment.css b/src/main/ui/static/templates/payment/v1/payment.css
index 73c482eed..cfd6a7e78 100644
--- a/src/main/ui/static/templates/payment/v1/payment.css
+++ b/src/main/ui/static/templates/payment/v1/payment.css
@@ -13,7 +13,12 @@ body {
 div, span, p, ul, li {
     box-sizing: border-box;
 }
-
+.warning-sm{
+    color:red;
+    font-size:10px;
+    transform-origin: left;
+    transform: scale(0.8);
+}
 .weui_grid {
     padding: 7px;
     height: 53px;
diff --git a/src/main/ui/static/templates/payment/v2/payment.css b/src/main/ui/static/templates/payment/v2/payment.css
index 9564c3027..96b4cd7d4 100644
--- a/src/main/ui/static/templates/payment/v2/payment.css
+++ b/src/main/ui/static/templates/payment/v2/payment.css
@@ -13,7 +13,12 @@ body {
 div, span, p, ul, li {
     box-sizing: border-box;
 }
-
+.warning-sm{
+    color:red;
+    font-size:10px;
+    transform-origin: left;
+    transform: scale(0.8);
+}
 .ff.key {
     position: relative;
 }

From 108557b00c85b05418120e1f0eafbc321cae953e Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 31 Oct 2018 14:07:49 +0800
Subject: [PATCH 80/82] =?UTF-8?q?=E6=B8=85=E7=AE=97=E9=A2=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impls/EstimateAnalysisServiceImpl.java    | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java
index 9521c1680..c12c98bcb 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java
@@ -167,42 +167,6 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService {
             dayInfo.put("t1", 0);
         }
 
-        List<JSONObject> hfSettle = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "hf");
-        if (hfSettle !=null && hfSettle.size()>0) {
-            for (JSONObject logs : hfSettle) {
-                dayInfo.put("hfSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee"));
-                dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("hfSettleFee_" + logs.getString("merchants")));
-            }
-        }else {
-            dayInfo.put("platformGetSettleFee",BigDecimal.ZERO);
-        }
-
-        List<JSONObject> alipaySettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "Alipay");
-        for (JSONObject logs : alipaySettleLogs) {
-            dayInfo.put("aliSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee"));
-            dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliSettleFee_" + logs.getString("merchants"))));
-        }
-
-        List<JSONObject> alipayOnlineSettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "AlipayOnline");
-        logger.info(" Estimate alipayOnlineSettleLogs is :{}", alipayOnlineSettleLogs.toString());
-        for (JSONObject logs : alipayOnlineSettleLogs) {
-            dayInfo.put("aliOnlineSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee"));
-            dayInfo.put("platformGetSettleFee", dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliOnlineSettleFee_" + logs.getString("merchants"))));
-        }
-        cleanDays.clear();
-
-        //T2
-        maxDays = estimateAnalysisMapper.findLastCleanDays(end_date, 1);
-        end_date = maxDays.getString("date_str");
-        cleanDays = estimateAnalysisMapper.findLastCleanDays(start_date, 1);
-        start_date = cleanDays.getString("date_str");
-        JSONObject totalAmountT2 = estimateAnalysisMapper.findAllTransactionByDate(start_date, end_date, t2client);
-        if (totalAmountT2 != null) {
-            dayInfo.put("t2", totalAmountT2.getBigDecimal("total_amount"));
-        } else {
-            dayInfo.put("t2", 0);
-        }
-
         List<JSONObject> tencentSettle = platformSettlementMapper.findBySettleDate(new Date(maxDays.getDate("date_str").getTime() - 86400000L), "Wechat");
         if (tencentSettle != null && tencentSettle.size()>0) {
             for (JSONObject logs : tencentSettle) {
@@ -239,6 +203,42 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService {
 
         }
 
+        List<JSONObject> hfSettle = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "hf");
+        if (hfSettle !=null && hfSettle.size()>0) {
+            for (JSONObject logs : hfSettle) {
+                dayInfo.put("hfSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee"));
+                dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("hfSettleFee_" + logs.getString("merchants")));
+            }
+        }else {
+            dayInfo.put("platformGetSettleFee",BigDecimal.ZERO);
+        }
+
+        List<JSONObject> alipaySettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "Alipay");
+        for (JSONObject logs : alipaySettleLogs) {
+            dayInfo.put("aliSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee"));
+            dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliSettleFee_" + logs.getString("merchants"))));
+        }
+
+        List<JSONObject> alipayOnlineSettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "AlipayOnline");
+        logger.info(" Estimate alipayOnlineSettleLogs is :{}", alipayOnlineSettleLogs.toString());
+        for (JSONObject logs : alipayOnlineSettleLogs) {
+            dayInfo.put("aliOnlineSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee"));
+            dayInfo.put("platformGetSettleFee", dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliOnlineSettleFee_" + logs.getString("merchants"))));
+        }
+        cleanDays.clear();
+
+        //T2
+        maxDays = estimateAnalysisMapper.findLastCleanDays(end_date, 1);
+        end_date = maxDays.getString("date_str");
+        cleanDays = estimateAnalysisMapper.findLastCleanDays(start_date, 1);
+        start_date = cleanDays.getString("date_str");
+        JSONObject totalAmountT2 = estimateAnalysisMapper.findAllTransactionByDate(start_date, end_date, t2client);
+        if (totalAmountT2 != null) {
+            dayInfo.put("t2", totalAmountT2.getBigDecimal("total_amount"));
+        } else {
+            dayInfo.put("t2", 0);
+        }
+
         //T3
         maxDays = estimateAnalysisMapper.findLastCleanDays(end_date, 1);
         end_date = maxDays.getString("date_str");

From 26f18eebda80c78285c624cf15c3726aeaec0269 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 31 Oct 2018 15:39:53 +0800
Subject: [PATCH 81/82] add guest login

---
 src/main/ui/managev2.html                     | 30 +++++++++++++++++++
 .../analysis/templates/settle_report.html     |  2 +-
 src/main/ui/static/boot/managerMainApp.js     |  3 ++
 src/main/ui/static/boot/managerMainAppv2.js   |  5 +++-
 .../templates/permission_config.html          |  4 +++
 src/main/ui/static/dashboard/dashboard.js     |  2 +-
 src/main/ui/static/menu/managerMenu.js        |  3 ++
 .../ui/static/menu/templates/main_menu.html   |  4 +--
 8 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
index e1f30a4f5..fae660339 100644
--- a/src/main/ui/managev2.html
+++ b/src/main/ui/managev2.html
@@ -200,6 +200,36 @@ margin-bottom: 10%;"/>
                         </a>
                     </li>
 
+                    <li ng-if="('110'|withRole)" ng-class="{'dropdown notifications-menu open':openNotice,'dropdown notifications-menu':!openNotice}">
+                        <a title="New Notice" ng-click="toggleOpenNotice()"  class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
+                            <i class="fa fa-bell-o"></i>
+                            <span class="label label-warning" ng-if="notifyCounts">{{notifyCounts}}</span>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!--
+                                                       <li class="header">System notifications,please resolve it!</li>
+                            -->
+                            <li>
+                                <!--inner menu: contains the actual data-->
+                                <div class="slimScrollDiv" style="position: relative; overflow: hidden; width: auto; max-height: 200px;"><ul class="menu" style="overflow: hidden; width: 100%;">
+                                    <li>
+                                        <a ng-if="partner_application_new" ui-sref="partner_apply">
+                                            <i class="fa fa-commenting"></i>
+                                            新的自主申请商户<span style="font-size:smaller;float:right;right: 0"></span>
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a ng-if="refundReviews && ('10000000000'|withRole)" ui-sref="refundReview">
+                                            <i class="fa fa-commenting"></i>
+                                            新的退款申请<span style="font-size:smaller;float:right;right: 0"></span>
+                                        </a>
+                                    </li>
+                                </ul><div class="slimScrollBar" style="background: rgb(0, 0, 0); width: 3px; position: absolute; top: 0px; opacity: 0.4; display: none; border-radius: 7px; z-index: 99; right: 1px; height: 195.122px;"></div><div class="slimScrollRail" style="width: 3px; height: 100%; position: absolute; top: 0px; display: none; border-radius: 7px; background: rgb(51, 51, 51); opacity: 0.2; z-index: 90; right: 1px;"></div></div>
+                            </li>
+                        </ul>
+                    </li>
+
+
                     <!-- User Account: style can be found in dropdown.less -->
                     <li class="dropdown user user-menu" uib-dropdown>
                         <a href class="dropdown-toggle" uib-dropdown-toggle>
diff --git a/src/main/ui/static/analysis/templates/settle_report.html b/src/main/ui/static/analysis/templates/settle_report.html
index e6bbf9732..b335ae010 100644
--- a/src/main/ui/static/analysis/templates/settle_report.html
+++ b/src/main/ui/static/analysis/templates/settle_report.html
@@ -50,7 +50,7 @@
                 <tr>
                     <th>清算日期</th>
                     <th>净交易额(扣除退款)</th>
-                    <th>腾讯清算总额</th>
+                    <th>清算总额</th>
                     <th>清算给商户总额</th>
                     <th>RoyalPay手续费</th>
                 </tr>
diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js
index 067b1b66e..f8dfbf4f4 100644
--- a/src/main/ui/static/boot/managerMainApp.js
+++ b/src/main/ui/static/boot/managerMainApp.js
@@ -229,6 +229,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     case "compliance":
                         rolenum = 2;
                         break;
+                    case "guest":
+                        rolenum = 2048;
+                        break;
                     case "riskmanager":
                         rolenum = 1024;
                         break;
diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index 8260078ee..26f205b3f 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -34,7 +34,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':"销管中心"});
@@ -130,6 +130,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     case "riskmanager":
                         roleNow = "风控中心";
                         break;
+                    case "guest":
+                        roleNow = "访客中心";
+                        break;
                     default:
                         break;
                 }
diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
index b1a48b69f..45bd1090c 100644
--- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html
+++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html
@@ -67,6 +67,10 @@
                         <i class="fa fa-code"></i>
                         Developer
                     </a>
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='1000000000'}" role="button" ng-click="authorizeRole('1000000000')">
+                        <i class="fa fa-male"></i>
+                        BD Leader
+                    </a>
                     <a class="btn btn-app" ng-class="{'isSelect':role=='10000000000'}" role="button" ng-click="authorizeRole('10000000000')">
                         <i class="fa fa-user"></i>
                         Risk Manager
diff --git a/src/main/ui/static/dashboard/dashboard.js b/src/main/ui/static/dashboard/dashboard.js
index e67fa4e6b..add62a4e6 100644
--- a/src/main/ui/static/dashboard/dashboard.js
+++ b/src/main/ui/static/dashboard/dashboard.js
@@ -78,8 +78,8 @@ define(['angular', 'uiRouter', 'jstz', 'uiBootstrap', 'angularEcharts'], functio
                     var end = $filter('date')(date-oneDay, 'yyyyMMdd');
 
                     var date2 = new Date();
+                    date2.setDate(1);
                     date2.setMonth(date2.getMonth() - 1);
-                    date2 = date2.setDate(1);
                     var begin = $filter('date')(date2, 'yyyyMMdd');
                     return {
                         begin: begin,
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index 2088b8b93..9cf84e966 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -41,6 +41,9 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
                 case "compliance":
                     rolenum = 2;
                     break;
+                case "guest":
+                    rolenum = 2048;
+                    break;
                 case "riskmanager":
                     rolenum = 1024;
                     break;
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 01360cbd5..7c8eb2263 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -32,7 +32,7 @@
             </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!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
+        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager' &&  'partners'|withModule">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="partners">
                     <div class="description-block">
@@ -103,7 +103,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
+        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager' && 'tradelog'|withModule">
             <div class="row" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
                     <div class="description-block">

From 32be2ae64d3872cffcd6e79250f2f754acbddd82 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 31 Oct 2018 15:45:56 +0800
Subject: [PATCH 82/82] fix

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

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 58b2a0e7b..95aa4e3a0 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -478,7 +478,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) && (roleNow!='director')">
+                        <li ui-sref-active="active"  ng-if="('clearing'|withModule) && (roleNow!='director') && !('1000000000'|withRole)">
                             <a ui-sref="date_setting">
                                 <i class="fa fa-balance-scale"></i> <span>清算日管理</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 7c8eb2263..b9d32b25c 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -759,7 +759,7 @@
                             </div>
                         </div>
                     </a></div>
-                <div ng-if="('clearing'|withModule) && (role!='director')" class="col-sm-2 col-xs-6">
+                <div ng-if="('clearing'|withModule) && (role!='director') && !('1000000000'|withRole)" class="col-sm-2 col-xs-6">
                     <a ui-sref="date_setting" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/settle_day.png"/>