fix

6 years ago · 9c28923818
parent b5b6a8b286
commit 9c28923818
37 changed files with 128 additions and 83 deletions
--- 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>
--- 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
--- 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>
--- 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
--- 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">
--- 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">
--- 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">
--- 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>
--- 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">
--- 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">
--- 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">
--- 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>
--- 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">
--- 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
--- 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">
--- 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">
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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">
--- 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">
--- 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>
--- 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>
--- 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>
--- 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>

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