From a48fc219c683688c633ff42c7644c7a225ba9ae5 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Mon, 28 Dec 2020 23:41:30 +0800
Subject: [PATCH] fix load more, optimize load more ui

---
 src/locales/en.js                        |  1 +
 src/locales/zh_Hans.js                   |  1 +
 src/views/mobile/transactions/Detail.vue | 19 +++++++++++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/locales/en.js b/src/locales/en.js
index e88bf9b9..2a32fe6a 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -431,6 +431,7 @@ export default {
     'Statistics': 'Statistics',
     'Settings': 'Settings',
     'Back': 'Back',
+    'Load More': 'Load More',
     'Change Language': 'Change Language',
     'Unlock': 'Unlock',
     'Re-login': 'Re-login',
diff --git a/src/locales/zh_Hans.js b/src/locales/zh_Hans.js
index 228975e7..c65b1625 100644
--- a/src/locales/zh_Hans.js
+++ b/src/locales/zh_Hans.js
@@ -431,6 +431,7 @@ export default {
     'Statistics': '统计',
     'Settings': '设置',
     'Back': '返回',
+    'Load More': '加载更多',
     'Change Language': '修改语言',
     'Unlock': '解锁',
     'Re-login': '重新登陆',
diff --git a/src/views/mobile/transactions/Detail.vue b/src/views/mobile/transactions/Detail.vue
index 6067a7b8..619555ea 100644
--- a/src/views/mobile/transactions/Detail.vue
+++ b/src/views/mobile/transactions/Detail.vue
@@ -1,5 +1,5 @@
 <template>
-    <f7-page @infinite="loadMore">
+    <f7-page ptr infinite :infinite-preloader="loadingMore" @ptr:refresh="reload" @infinite="loadMore">
         <f7-navbar>
             <f7-nav-left :back-link="$t('Back')"></f7-nav-left>
             <f7-nav-title :title="$t('Transaction Details')"></f7-nav-title>
@@ -165,6 +165,10 @@
             </f7-accordion-item>
         </f7-card>
 
+        <f7-block class="text-align-center" v-if="!loading && maxTime > 0">
+            <f7-link :class="{ 'disabled': loadingMore }" href="#" @click="loadMore">{{ $t('Load More') }}</f7-link>
+        </f7-block>
+
         <f7-actions close-by-outside-click close-on-escape :opened="showMoreActionSheet" @actions:closed="showMoreActionSheet = false">
             <f7-actions-group>
                 <f7-actions-button bold close>{{ $t('Cancel') }}</f7-actions-button>
@@ -193,6 +197,7 @@ export default {
             allTags: {},
             maxTime: 0,
             loading: true,
+            loadingMore: false,
             transactionToDelete: null,
             showMoreActionSheet: false,
             showDeleteActionSheet: false
@@ -343,9 +348,17 @@ export default {
                 return;
             }
 
+            if (self.loadingMore) {
+                return;
+            }
+
+            self.loadingMore = true;
+
             self.$services.getTransactions({
                 maxTime: self.maxTime
             }).then(response => {
+                self.loadingMore = false;
+
                 const data = response.data;
 
                 if (!data || !data.success || !data.result) {
@@ -355,6 +368,8 @@ export default {
 
                 self.setResult(data.result);
             }).catch(error => {
+                self.loadingMore = false;
+
                 self.$logger.error('failed to reload transaction list', error);
 
                 if (error.response && error.response.data && error.response.data.errorMessage) {
@@ -472,7 +487,7 @@ export default {
                         }
                     }
 
-                    if (!currentMonthList || !currentMonthList.year !== transactionYear || !currentMonthList.month === transactionMonth) {
+                    if (!currentMonthList || currentMonthList.year !== transactionYear || currentMonthList.month !== transactionMonth) {
                         this.transactions.push({
                             year: transactionYear,
                             month: transactionMonth,