EthMev模块重制完成

src/components/History.vue

@@ -53,37 +53,20 @@ export default {
   methods: {
     // 获取数据
     async generateTableData() {
+      this.table.loading = true
       this.table.data.length = 0
 
-      this.table.loading = true
       const rst = await EthMev.getEthMevData(this.query.block, this.query.hash, this.query.dataVague)
-      this.table.loading = false
-
-      if (!rst.data.state) {
-        this.$msgkit.error(rst.data.msg)
 
-        return
+      if (rst.state) {
+        EthMev.generateTableDataByDbData(rst.data)
+        this.table.data = rst.data
+        this.$msgkit.success(rst.msg)
+      } else {
+        this.$msgkit.error(rst.msg)
       }
 
-      this.$msgkit.success(rst.data.msg)
-      this.table.data = rst.data.data
-
-      this.table.data.map(function (one) {
-        try {
-          let dataObj = one.dataObj
-
-          one.tradeInfo = dataObj.tradeInfo
-          one.from = dataObj.fromAdd
-          one.to = dataObj.toAdd
-          one.gasPrice = NumKit._N(parseInt(dataObj.gasPrice) / (1E9), 2)
-          one.index = dataObj.index
-          one.type = dataObj.type
-          one.state = dataObj.status
-          one.pending = dataObj.pending
-        } catch (e) {
-          one.tradeInfo = []
-        }
-      })
+      this.table.loading = false
     }
   },
   provide() {

src/components/Pending.vue

@@ -53,37 +53,20 @@ export default {
   methods: {
     // 获取数据
     async generateTableData() {
+      this.table.loading = true
       this.table.data.length = 0
 
-      this.table.loading = true
       const rst = await EthMev.getEthMevPendingData(this.query.block, this.query.hash, this.query.dataVague)
-      this.table.loading = false
-
-      if (!rst.data.state) {
-        this.$msgkit.error(rst.data.msg)
 
-        return
+      if (rst.state) {
+        EthMev.generateTableDataByDbData(rst.data)
+        this.table.data = rst.data
+        this.$msgkit.success(rst.msg)
+      } else {
+        this.$msgkit.error(rst.msg)
       }
 
-      this.$msgkit.success(rst.data.msg)
-      this.table.data = rst.data.data
-
-      this.table.data.map(function (one) {
-        try {
-          let dataObj = one.dataObj
-
-          one.tradeInfo = dataObj.tradeInfo
-          one.from = dataObj.fromAdd
-          one.to = dataObj.toAdd
-          one.gasPrice = NumKit._N(parseInt(dataObj.gasPrice) / (1E9), 2)
-          one.index = dataObj.index
-          one.type = dataObj.type
-          one.state = dataObj.status
-          one.pending = dataObj.pending
-        } catch (e) {
-          one.tradeInfo = []
-        }
-      })
+      this.table.loading = false
     }
   },
   provide() {

src/plugins/model/EthMev.js

@@ -1,45 +1,69 @@
-import http from "axios";
+import http from 'axios'
+import NumKit from '@/plugins/kit/NumKit'
 
 export default class EthMev {
   static async getEthMevData(block, hash, dataVague, page=1, size=200) {
-    let url = '/ethmev/findByHashOrBlockOrDataVague'
-
-    return http.post(url, {
+    const url = '/ethmev/findByHashOrBlockOrDataVague'
+    const rst = await http.post(url, {
       block: block,
       hash: hash,
       dataVague: dataVague,
       limit1: (page - 1) * size,
       limit2: size
-    });
+    })
+
+    return rst.data
   }
 
   static async getEthMevPendingData(block, hash, dataVague, page=1, size=200) {
-    let url = '/ethmev/findByHashOrBlockOrDataVaguePending'
-
-    return http.post(url, {
+    const url = '/ethmev/findByHashOrBlockOrDataVaguePending'
+    const rst = await http.post(url, {
       block: block,
       hash: hash,
       dataVague: dataVague,
       limit1: (page - 1) * size,
       limit2: size
-    });
+    })
+
+    return rst.data
   }
 
   static async deleteByHash(hash) {
-    let url = '/ethmev/deleteByHash'
-
-    return http.post(url, {
+    const url = '/ethmev/deleteByHash'
+    const rst = await http.post(url, {
       hash: hash
-    });
+    })
+
+    return rst.data
   }
 
   static async appendOrUpdate(block, hash, dataVague) {
-    let url = '/ethmev/appendOrUpdate'
-
-    return http.post(url, {
+    const url = '/ethmev/appendOrUpdate'
+    const rst = await http.post(url, {
       block: block,
       hash: hash,
       dataVague: dataVague
     })
+
+    return rst.data
+  }
+
+  static generateTableDataByDbData(historyList) {
+    historyList.map(function (history) {
+      try {
+        let dataObj = history.dataObj
+
+        history.tradeInfo = dataObj.tradeInfo
+        history.from = dataObj.fromAdd
+        history.to = dataObj.toAdd
+        history.gasPrice = NumKit._N(parseInt(dataObj.gasPrice) / (1E9), 2)
+        history.index = dataObj.index
+        history.type = dataObj.type
+        history.state = dataObj.status
+        history.pending = dataObj.pending
+      } catch (e) {
+        history.tradeInfo = []
+      }
+    })
   }
 }