From f1e11d178f905701e1948e1f287a27365b410375 Mon Sep 17 00:00:00 2001 From: yangkai Date: Sun, 28 Oct 2018 23:08:07 +0800 Subject: [PATCH] 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%;"/> 交易流水|Trades Logs -
  • - - 退款审核|Audit Refund - -
    • -
  • - - 欠款|Pre Refund - -
  • 原统计
    • -
  • - - 支付回调消息|Notify History - -
    • @@ -398,6 +383,16 @@ margin-bottom: 10%;"/> 消费排名|Risky Merchants +
  • + + 消费者统计|Customer Analysis + +
    • +
  • + + 退款审核|Audit Refund + +
    • @@ -442,6 +437,11 @@ margin-bottom: 10%;"/> Alipay进件表格导出 +
  • + + 商户手动清算 + +
    • @@ -458,7 +458,7 @@ margin-bottom: 10%;"/> 交易对账|Order Validation -
  • +
  • 清算日管理 @@ -479,7 +479,7 @@ margin-bottom: 10%;"/> 清算月报
    • -
  • +
  • 清算验证|Validation @@ -525,6 +525,21 @@ margin-bottom: 10%;"/> 合伙人提成
    • +
  • + + 商户营销账户 + +
    • +
  • + + 商户手动清算 + +
    • +
  • + + 商户欠款|Pre Refund + +
    • @@ -546,11 +561,6 @@ margin-bottom: 10%;"/> 鼓励金 -
  • - - 商户营销账户 - -
  • 周末费率减半活动 @@ -708,6 +718,11 @@ margin-bottom: 10%;"/> 商户活跃度
    • +
  • + + 商户营销账户 + +
    • @@ -794,6 +809,11 @@ margin-bottom: 10%;"/> 开发工具|DevTools +
  • + + 支付回调消息|Notify History + +
    • 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; } - +
    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 @@
  • Gateway统计|Gateway Analysis
    • -
  • + 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 @@
    - +

    Commission     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 @@
    -
    - -
    - -
    - 退款审核 -
    -
    -     -
    -
    - -
    - -
    - 欠款 -
    -
    -     -
    @@ -152,16 +132,6 @@
    -
    - -
    - -
    - 支付回调消息 -
    -
    -     -
    • @@ -233,6 +203,26 @@
    +
    + +
    + +
    + 消费者统计 +
    +
    +     +
    +
    + +
    + +
    + 退款审核 +
    +
    +     +
    @@ -305,6 +295,16 @@
    +
    + +
    + +
    + 商户手动清算 +
    +
    +     +
    @@ -428,6 +428,15 @@
    +
    + +
    + +
    + 商户营销账户 +
    +
    +
    @@ -661,6 +670,35 @@
    +
    + +
    + +
    + 商户营销账户 +
    +
    +
    +
    + +
    + +
    + 商户手动清算 +
    +
    +     +
    +
    + +
    + +
    + 商户欠款 +
    +
    +     +
    @@ -869,6 +907,16 @@
    +
    + +
    + +
    + 支付回调消息 +
    +
    +     +
    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 @@
    -
    +
    Refund Audit
    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 @@ -
      +
      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 @@ -
        +
        商户