Эх сурвалжийг харах

1. 新增memo字段
2. _N -> getSubFloat

skyfffire 3 жил өмнө
parent
commit
fed669346b

+ 2 - 1
src/components/History.vue

@@ -47,7 +47,8 @@ export default {
         { text: 'State', value: 'state', width: '3%' },
         { text: 'Mev', value: 'mev', width: '3%' },
         { text: 'Pending', value: 'pending', width: '7%' },
-        { text: 'TradeInfo', value: 'tradeInfo'}
+        { text: 'TradeInfo', value: 'tradeInfo'},
+        { text: 'memo', value: 'memo'}
       ]
     },
   }),

+ 2 - 1
src/components/Pending.vue

@@ -47,7 +47,8 @@ export default {
         {text: 'State', value: 'state'},
         {text: 'Mev', value: 'mev'},
         {text: 'Pending', value: 'pending'},
-        {text: 'TradeInfo', value: 'tradeInfo'}
+        {text: 'TradeInfo', value: 'tradeInfo'},
+        { text: 'memo', value: 'memo'}
       ]
     }
   }),

+ 2 - 2
src/components/viewer/table/TradeInfoDetails.vue

@@ -8,14 +8,14 @@
                   label class="ma-2 tradeLabel" @click="httpKit.jumpToEthw(trade.token, 'token')">
             <!-- 没有名字的 -->
             <div class="tokenName">{{ hashKit.headAndEnd2(trade.token) }}</div>
-            <div class="tokenAmount">{{ numKit._N(trade.amount, 4) }} </div>
+            <div class="tokenAmount">{{ numKit.getSubFloat(trade.amount, 4) }} </div>
           </v-chip>
           <v-chip v-else
                   label class="ma-2 tradeLabel" :color="hashKit.generateColorByHash(trade.token)"
                   @click="httpKit.jumpToEthw(trade.token, 'token')">
             <!-- 有名字的和Ethereum/EthereumPow -->
             <div class="tokenName">{{ trade.tokenSymbol }}</div>
-            <div class="tokenAmount">{{ numKit._N(trade.amount, 4) }}</div>
+            <div class="tokenAmount">{{ numKit.getSubFloat(trade.amount, 4) }}</div>
           </v-chip>
           <!--from-->
           <div>

+ 2 - 2
src/plugins/kit/NumKit.js

@@ -6,7 +6,7 @@ export default class NumKit {
    * @returns {number}
    * @private
    */
-  static _N = function (num, n) {
+  static getSubFloat(num, n) {
     if (!num) {
       return 0
     }
@@ -25,7 +25,7 @@ export default class NumKit {
    * @param num
    * @returns {string}
    */
-  static toNonExponential = function (num) {
+  static toNonExponential(num) {
     const m = num.toExponential().match(/\d(?:\.(\d*))?e([+-]\d+)/)
     return num.toFixed(Math.max(0, (m[1] || '').length - m[2]))
   }

+ 2 - 1
src/plugins/model/EthMev.js

@@ -57,12 +57,13 @@ export default class EthMev {
 
         history.from = dataObj.fromAdd
         history.to = dataObj.toAdd
-        history.gasPrice = NumKit._N(parseInt(dataObj.gasPrice) / (1E9), 2)
+        history.gasPrice = NumKit.getSubFloat(parseInt(dataObj.gasPrice) / (1E9), 2)
         history.index = dataObj.index
         history.type = dataObj.type
         history.state = dataObj.status
         history.pending = dataObj.pending
         history.tradeInfoList = dataObj.tradeInfo
+        history.memo = dataObj.memo
 
         // hash异常处理
         if (history.hash.indexOf('0x') === -1 && history.hash.length === 64) history.hash = '0x' + history.hash