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