周五定时更新

mining-pool/src/components/header.vue

@@ -194,9 +194,9 @@
             </div>
           </li>
             <!-- 矿机租赁 -->
-            <li    @click="handelMachineLease">
+            <!-- <li    @click="handelMachineLease">
               {{ $t(`home.machineLease`) }}
-            </li>
+            </li> -->
         
           <!-- 工单管理 -->
           <!-- <li 

mining-pool/src/views/pendingPaymentSummary/index.js

@@ -3,6 +3,7 @@ export default {
   data() {
     return {
       pendingPaymentData: [],
+      allPendingData: [],
       currencyList: [
       
 
@@ -27,13 +28,47 @@ export default {
   methods: {
     async fetchPendingPaymentData(params) {
         this.setLoading('loading', true);
-        const res = await summaryOfPendingPayments(params);
-    
-      if (res && res.code == 200) {
-        this.pendingPaymentData = res.rows;
-        this.total = res.total;
-      }
-      this.setLoading('loading', false);
+        const firstRes = await summaryOfPendingPayments(params);
+        let allRows = [];
+        if (firstRes && firstRes.code == 200) {
+          const firstRows = Array.isArray(firstRes.rows) ? firstRes.rows : [];
+          const total = Number(firstRes.total || 0);
+          // 若后端做了分页，二次拉取全量数据用于前端全局排序与分页
+          if (total > params.pageSize) {
+            const fullRes = await summaryOfPendingPayments({ ...params, pageNum: 1, pageSize: total });
+            allRows = Array.isArray(fullRes && fullRes.rows) ? fullRes.rows : firstRows;
+          } else {
+            allRows = firstRows;
+          }
+
+          const sortedRows = this.sortRows(allRows);
+          this.allPendingData = sortedRows;
+          this.total = sortedRows.length;
+          this.applySlice();
+        }
+        this.setLoading('loading', false);
+    },
+    sortRows(rows) {
+        const safeRows = Array.isArray(rows) ? rows : [];
+        return safeRows.slice().sort((a, b) => {
+          const aNeed = Number(a && a.needPayAmount != null ? a.needPayAmount : 0);
+          const aStart = Number(a && a.startPayAmount != null ? a.startPayAmount : 0);
+          const bNeed = Number(b && b.needPayAmount != null ? b.needPayAmount : 0);
+          const bStart = Number(b && b.startPayAmount != null ? b.startPayAmount : 0);
+
+          const aPriority = aNeed >= aStart ? 1 : 0;
+          const bPriority = bNeed >= bStart ? 1 : 0;
+          if (bPriority !== aPriority) return bPriority - aPriority;
+          if (bNeed !== aNeed) return bNeed - aNeed;
+          return 0;
+        });
+    },
+    applySlice() {
+        const pageSize = Number(this.pendingPaymentParams.pageSize || 10);
+        const pageNum = Number(this.pendingPaymentParams.pageNum || 1);
+        const start = (pageNum - 1) * pageSize;
+        const end = start + pageSize;
+        this.pendingPaymentData = (this.allPendingData || []).slice(start, end);
     },
     handelImg(coin) {
         console.log(coin,"coin");
@@ -73,13 +108,21 @@ export default {
         this.pendingPaymentParams.pageSize = val
         this.pendingPaymentParams.pageNum = 1
         this.currentPage = 1
-        this.fetchPendingPaymentData(this.pendingPaymentParams);
+        if (this.allPendingData && this.allPendingData.length > 0) {
+            this.applySlice();
+        } else {
+            this.fetchPendingPaymentData(this.pendingPaymentParams);
+        }
        
     },
     handleCurrentChange(val) {
             console.log(`当前页: ${val}`);
             this.pendingPaymentParams.pageNum = val
-             this.fetchPendingPaymentData(this.pendingPaymentParams);
+            if (this.allPendingData && this.allPendingData.length > 0) {
+                this.applySlice();
+            } else {
+                this.fetchPendingPaymentData(this.pendingPaymentParams);
+            }
 
 
 

mining-pool/src/views/pendingPaymentSummary/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading">
-
+ 
     <div class="main-title">{{$t('backendSystem.pendingPaymentSummary')}}</div>
     <el-table
       :data="pendingPaymentData"
@@ -27,7 +27,13 @@
       <el-table-column prop="maxHeight" :label="$t('backendSystem.allocateHeight')"  show-overflow-tooltip/>
       <el-table-column prop="startPayAmount" :label="$t('backendSystem.startPayAmount')" show-overflow-tooltip/>
       
-      <el-table-column prop="needPayAmount" :label="$t('backendSystem.needPayAmount')"  show-overflow-tooltip/>
+      <el-table-column prop="needPayAmount" :label="$t('backendSystem.needPayAmount')"  show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span :class="{ 'amount-highlight': Number(scope.row.needPayAmount) >= Number(scope.row.startPayAmount) }">
+            {{ scope.row.needPayAmount }}
+          </span>
+        </template>
+      </el-table-column>
       
     
 
@@ -69,4 +75,8 @@ export default {
   color: #333;
   margin-bottom: 18px;
 }
+.amount-highlight {
+  font-weight: 700;
+  color: #f56c6c;
+}
 </style>

mining-pool/test/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><meta name=google-site-verification content=pKAZogQ0NQ6L4j9-V58WJMjm7zYCFwkJXSJzWu9UDM8><meta name=robots content="index, follow, max-image-preview:large, max-snippet:-1, max-video-preview:-1"><meta name=googlebot content="index, follow"><meta name=googlebot-news content="index, follow"><meta name=bingbot content="index, follow"><link rel=alternate hreflang=zh href=https://m2pool.com/zh><link rel=alternate hreflang=en href=https://m2pool.com/en><link rel=alternate hreflang=x-default href=https://m2pool.com/en><meta property=og:title content="M2pool - Stable leading high-yield mining pool"><meta property=og:description content="M2Pool provides professional mining services, supporting multiple cryptocurrency mining"><meta property=og:url content=https://m2pool.com/en><meta property=og:site_name content=M2Pool><meta property=og:type content=website><meta property=og:image content=https://m2pool.com/logo.png><link rel=icon href=/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/c/font_4582735_7i8wfzc0art.css><title>M2pool - Stable leading high-yield mining pool</title><meta name=keywords content="M2Pool, cryptocurrency mining pool,entropyx, bitcoin mining, DGB mining, mining pool service, 加密货币矿池, 比特币挖矿, DGB挖矿"><meta name=description content="M2Pool provides professional mining services, supporting multiple cryptocurrency mining, including nexa, grs, mona, dgb, rxd"><script defer=defer src=/js/chunk-vendors-c0d76f48.f34181ba.js></script><script defer=defer src=/js/chunk-vendors-bc050c32.8062ab74.js></script><script defer=defer src=/js/chunk-vendors-3003db77.d0b93d36.js></script><script defer=defer src=/js/chunk-vendors-9d134daf.bb668c99.js></script><script defer=defer src=/js/chunk-vendors-96cecd74.a7d9b845.js></script><script defer=defer src=/js/chunk-vendors-c2f7d60e.3710fdc2.js></script><script defer=defer src=/js/chunk-vendors-89d5c698.2190b4ca.js></script><script defer=defer src=/js/chunk-vendors-377fed06.0e89b4b7.js></script><script defer=defer src=/js/chunk-vendors-c9ff040c.57bd8c18.js></script><script defer=defer src=/js/app-42f9d7e6.22250631.js></script><script defer=defer src=/js/app-5c551db8.66f3d87b.js></script><script defer=defer src=/js/app-45954fd3.1331a09e.js></script><script defer=defer src=/js/app-72600b29.42f2b75e.js></script><script defer=defer src=/js/app-5a0d40dd.ab147917.js></script><script defer=defer src=/js/app-113c6c50.31c63edf.js></script><link href=/css/chunk-vendors-bc050c32.6f97509c.css rel=stylesheet><link href=/css/app-189e7968.e06124c7.css rel=stylesheet></head><body><div id=app></div></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><meta name=google-site-verification content=pKAZogQ0NQ6L4j9-V58WJMjm7zYCFwkJXSJzWu9UDM8><meta name=robots content="index, follow, max-image-preview:large, max-snippet:-1, max-video-preview:-1"><meta name=googlebot content="index, follow"><meta name=googlebot-news content="index, follow"><meta name=bingbot content="index, follow"><link rel=alternate hreflang=zh href=https://m2pool.com/zh><link rel=alternate hreflang=en href=https://m2pool.com/en><link rel=alternate hreflang=x-default href=https://m2pool.com/en><meta property=og:title content="M2pool - Stable leading high-yield mining pool"><meta property=og:description content="M2Pool provides professional mining services, supporting multiple cryptocurrency mining"><meta property=og:url content=https://m2pool.com/en><meta property=og:site_name content=M2Pool><meta property=og:type content=website><meta property=og:image content=https://m2pool.com/logo.png><link rel=icon href=/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/c/font_4582735_7i8wfzc0art.css><title>M2pool - Stable leading high-yield mining pool</title><meta name=keywords content="M2Pool, cryptocurrency mining pool,entropyx, bitcoin mining, DGB mining, mining pool service, 加密货币矿池, 比特币挖矿, DGB挖矿"><meta name=description content="M2Pool provides professional mining services, supporting multiple cryptocurrency mining, including nexa, grs, mona, dgb, rxd"><script defer=defer src=/js/chunk-vendors-c0d76f48.f34181ba.js></script><script defer=defer src=/js/chunk-vendors-bc050c32.8062ab74.js></script><script defer=defer src=/js/chunk-vendors-3003db77.d0b93d36.js></script><script defer=defer src=/js/chunk-vendors-9d134daf.bb668c99.js></script><script defer=defer src=/js/chunk-vendors-96cecd74.a7d9b845.js></script><script defer=defer src=/js/chunk-vendors-c2f7d60e.3710fdc2.js></script><script defer=defer src=/js/chunk-vendors-89d5c698.2190b4ca.js></script><script defer=defer src=/js/chunk-vendors-377fed06.0e89b4b7.js></script><script defer=defer src=/js/chunk-vendors-c9ff040c.57bd8c18.js></script><script defer=defer src=/js/app-42f9d7e6.22250631.js></script><script defer=defer src=/js/app-5c551db8.946f1024.js></script><script defer=defer src=/js/app-45954fd3.1331a09e.js></script><script defer=defer src=/js/app-72600b29.42f2b75e.js></script><script defer=defer src=/js/app-5a0d40dd.f3cdcc6c.js></script><script defer=defer src=/js/app-113c6c50.31c63edf.js></script><link href=/css/chunk-vendors-bc050c32.6f97509c.css rel=stylesheet><link href=/css/app-189e7968.aa4fb95c.css rel=stylesheet></head><body><div id=app></div></body></html>