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] 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">