Update open spot orders page

brtr · Dec 1, 2023 · a9373d6 · a9373d6
1 parent e0a3846
commit a9373d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/app/models/open_spot_order.rb b/app/models/open_spot_order.rb
@@ -4,6 +4,6 @@ def current_price
   end
 
   def margin_rate
-    current_price.zero? ? 0 : ((price - current_price) / current_price) * 100
+    current_price.zero? ? 0 : ((current_price - price) / current_price) * 100
   end
 end
diff --git a/app/views/page/open_spot_orders.html.erb b/app/views/page/open_spot_orders.html.erb
@@ -22,9 +22,8 @@
             <th>买卖类别</th>
             <th>委托价</th>
             <th>当前价</th>
-            <th>委托家和当前价的比例</th>
+            <th>委托价和当前价的比例</th>
             <th>委托数量</th>
-            <th>成交数量</th>
             <th>委托金额</th>
             <th>订单类型</th>
           </tr>
@@ -38,9 +37,8 @@
                 <td class="<%= trade_type_style(order.trade_type) %>"><%= I18n.t("views.trading.#{order.trade_type}") %></td>
                 <td><%= order.price.round(4) %></td>
                 <td><%= order.current_price.round(4) %></td>
-                <td><%= order.margin_rate.round(2) %>%</td>
+                <td class="<%= order.margin_rate > 0 ? 'pos-num' : 'neg-num' %>"><%= order.margin_rate.round(2) %>%</td>
                 <td><%= order.orig_qty.round(4) %></td>
-                <td><%= order.executed_qty.round(4) %></td>
                 <td><%= order.amount.round(4) %></td>
                 <td><%= order.order_type %></td>
               </tr>