From 9c28923818af9e9e88cc3acf4ad252a82993729c Mon Sep 17 00:00:00 2001 From: yangkai Date: Mon, 22 Oct 2018 15:18:25 +0800 Subject: [PATCH] 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 @@

APP_ACTIVITY

    -
  1. - 活动管理 -
    2. +
  2. Promotion
  3. APP_ACTIVITY
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 @@

半边天公益活动

  1. - Activity + Promotion
  2. 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 @@

    Encourage Money

      -
    1. Activities
      2. +
    2. Promotion
    3. Encourage Money
    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 @@

    余额增值活动

    1. - Payment + Promotion
    2. 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 @@ - - - - - - - +
      +

      Trade Monitor

      +
        +
      1. Risk Management
        2. +
      2. Trade Monitor
        3. +
      +
        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 @@
      --> +
      +

      Risk Records

      +
        +
      1. Risk Management
        2. +
      2. Risk Records
        3. +
      +
      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 @@ - - - - - - - - - +
      +

      Risk Monitor

      +
        +
      1. Risk Management
        2. +
      2. Risk Monitor
        3. +
      +
      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 @@

      Settlement logs

      1. - Analysis + Settlement
      2. Settlement logs
      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 @@ - - - - - - - - - +
      +

      New Partner

      +
        +
      1. + Partner Manage +
        2. +
      2. New Partner
        3. +
      +
      -
      +
      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 @@ - +
      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 @@ } +
      +

      Transaction Amount Analysis

      +
        +
      1. + Payment +
        2. +
      2. Transaction Amount Analysis
        3. +
      +
      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 @@

      Merchant statistics

      1. - Payment + Partner Manage
      2. Merchant statistics
      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 @@ - +
      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 @@

      周末费率减半活动

      1. - Payment + Promotion
      2. 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; } +
        +

        Settlement Estimate

        +
          +
        1. + Settlement +
          2. +
        2. Settlement Estimate
          3. +
        +
        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 @@ - +
        +

        Monthly report of liquidation

        +
          +
        1. + Settlement +
          2. +
        2. Monthly report of liquidation
          3. +
        +
        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 @@ -
        Rate Expire Warnings
        +
        +

        Rate Expire Warnings

        +
          +
        1. + Compliance Management +
          2. +
        2. Rate Expire Warnings
          3. +
        +
        费率已过期商户({{warning.no_rate.length}}家)
        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 @@

        营销返现数据分析

        1. - Marketing + Promotion
        2. Promotion Account
        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 @@

        BD Commissions

          -
        1. Analysis
          2. +
        2. Financial
        3. BD Commissions
        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 @@

        支付宝进件表格导出

        1. - Basic Config + Compliance Management
          2. -
        2. Dev Tools
        3. aliforexcel
        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 @@

        Wechat Settlements

        1. - Report + Financial
        2. Wechat Settlements
        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 @@
        -

        Config Operation Logs

        +

        Compliance Management

        1. - Basic Config -
          2. -
        2. - Log Views + Compliance Management
        3. Config Operation Logs
        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 @@

        Notify Logs

        1. - Basic Config -
          2. -
        2. - Log Views + Transaction
        3. Notify Logs
        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 @@ +
        +

        City Partner Commissions

        +
          +
        1. Financial
          2. +
        2. City Partner Commissions
          3. +
        +
        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 @@ - - - - - - - +
        +

        Platform Revenue Report

        +
          +
        1. Financial
          2. +
        2. Platform Revenue Report
          3. +
        +

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

        Settlement Validation

        1. - Payment + Settlement
        2. Settlement Validation
        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 @@

        Partner Invoice

        1. - Payment + Financial
        2. Partner Invoice
        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 @@

        New Partner

        1. - Payment + Partner Manage
          2. -
        2. Partner Manage
        3. New Partner
        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 @@
        -

        Partner Manage

        +

        Partner Directories

        1. - Payment + Partner Manage
          2. -
        2. Partner Manage
          3. +
        3. Partner Directories
        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 @@

        Partner Application

        1. - Payment + Compliance Management
        2. Partner Applications
        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 @@

        Refund Audit

        1. - Payment + Transaction
        2. 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 @@

          Trade Logs

          1. - Payment + Transaction
          2. Trade Logs
          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 @@

          AusTrac Report

          1. - Payment + Financial
          2. AusTrac Report
          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 @@

          Order Validation

            -
          1. Payment
            2. +
          2. Settlement
          3. Order Validation
          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 @@
          -

          Risky Merchants

          +

          Blacklist

            -
          1. Risk
            2. -
          2. Risk Merchants
            3. +
          3. Risk Manager
            4. +
          4. Blacklist
          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 @@
          -

          Risk Manager

          +

          Risk Records

            -
          1. Risk
            2. -
          2. Risk Manager
            3. +
          3. Risk Manager
            4. +
          4. Risk Records
          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 @@ +
          +

          Business compliance

          +
            +
          1. + Compliance Management +
            2. +
          2. Business compliance
            3. +
          +
          Contract