diff --git a/ft-app/app/templates/trades.html b/ft-app/app/templates/trades.html index 417c6f7..e76bff4 100644 --- a/ft-app/app/templates/trades.html +++ b/ft-app/app/templates/trades.html @@ -241,20 +241,25 @@ {% endfor %} {% set summary_trades = closed_trades if closed_tab == '全部' else grouped_closed.get(closed_tab, []) %} -{% set ns = namespace(total_pnl=0, total_open_fee=0, total_close_fee=0) %} +{% set ns = namespace(gross=0, open_fee=0, close_fee=0) %} {% for t in summary_trades %} - {% set ns.total_pnl = ns.total_pnl + (t.pnl or 0) %} - {% set ns.total_open_fee = ns.total_open_fee + (t.open_fee or 0) %} - {% set ns.total_close_fee = ns.total_close_fee + (t.close_fee or 0) %} + {% if t.direction == 'short' %} + {% set ns.gross = ns.gross + (t.open_price - t.close_price) * t.point_value %} + {% else %} + {% set ns.gross = ns.gross + (t.close_price - t.open_price) * t.point_value %} + {% endif %} + {% set ns.open_fee = ns.open_fee + (t.open_fee or 0) %} + {% set ns.close_fee = ns.close_fee + (t.close_fee or 0) %} {% endfor %} +{% set net = ns.gross - ns.open_fee - ns.close_fee %}