From 83b1865a060662cd7963fe633c45a55ab06b8bc5 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Mon, 5 Feb 2024 10:14:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommonFooter.vue   |  4 ++--
 src/views/exchange/index.vue      | 13 ++++++++++---
 src/views/exchange/order-list.vue | 12 ++++++++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/components/CommonFooter.vue b/src/components/CommonFooter.vue
index 70630b3..2d39458 100644
--- a/src/components/CommonFooter.vue
+++ b/src/components/CommonFooter.vue
@@ -257,10 +257,10 @@
         <!-- </div> -->
       </div>
       <div class="footer-right">
-        <div style="font-size: 20px;">{{ $t("homeNewText.cc1") }}</div>
+        <div style="font-size: 20px;text-align: center;">{{ $t("homeNewText.cc1") }}</div>
         <router-link class="jump_btn" to="/exchange">{{ $t("homeNewText.cc2") }}</router-link>
         <img src="../assets/img/home/qrcode.png" alt="" style="width: 120px;height: 120px;">
-        <div style="font-size: 16px; color: #9c9c9c;margin-top: 12px;">{{ $t("homeNewText.cc3") }}</div>
+        <div style="font-size: 16px; color: #9c9c9c;margin-top: 12px;text-align: center;">{{ $t("homeNewText.cc3") }}</div>
       </div>
     </div>
   </footer>
diff --git a/src/views/exchange/index.vue b/src/views/exchange/index.vue
index f432104..86c98f8 100644
--- a/src/views/exchange/index.vue
+++ b/src/views/exchange/index.vue
@@ -78,7 +78,7 @@
             <!-- <market-news></market-news> -->
 
             <!-- order list  -->
-            <order-list ref="Order" :ordersOpen="ordersOpen" :conditionOrders="conditionOrders" :ordersHistory="ordersHistory" :priceDecimals="priceDecimals" :qtyDecimals="qtyDecimals" :isLogin="isLogin" :pair="pair" @change="currentTab = $event" @update="update"></order-list>
+            <order-list ref="Order" :ordersOpen="ordersOpen" :conditionOrders="conditionOrders" :ordersHistory="ordersHistory" :priceDecimals="priceDecimals" :qtyDecimals="qtyDecimals" :isLogin="isLogin" :pair="pair" @change="currentTab = $event" @update="update" @Pagination="page = $event"></order-list>
 
         </div>
     </div>
@@ -180,7 +180,8 @@ export default {
 
             currentTab: "opens", // orders显示的tab
             price_cny:0,
-            currentIcon: ''
+            currentIcon: '',
+			page: 1
         }
 
     },
@@ -286,7 +287,12 @@ export default {
         currentTab() {
             // tab切换时自动更新
             this.getOrders();
-        }
+        },
+		page() {
+			if (this.currentTab == "histories") { // 历史委托
+				this.getHistories();
+			}
+		}
     },
 
     methods: {
@@ -460,6 +466,7 @@ export default {
             if (this.isLogin) {
                 Order.getHistoryEntrust({
                         symbol: this.marketInfo.pair_name,
+						page:this.page
                     })
                     .then(data => {
                         this.ordersHistory = data;
diff --git a/src/views/exchange/order-list.vue b/src/views/exchange/order-list.vue
index 72fc89e..0734ae6 100644
--- a/src/views/exchange/order-list.vue
+++ b/src/views/exchange/order-list.vue
@@ -182,6 +182,11 @@
                     <i class="icon ion-md-document"></i>
                     {{ $t("common.notData") }}
                 </span>
+				<div class="p-2">
+					<el-pagination layout="prev, pager, next" :page-size="ordersHistory.per_page"
+						@current-change="changePagination" :total="ordersHistory.total">
+					</el-pagination>
+				</div>
             </div>
         </div>
     </div>
@@ -254,8 +259,11 @@ export default {
                     })
                     .catch(err => {});
             }
-
-        }
+        },
+		changePagination(idx) {
+			console.log(idx);
+			this.$emit("Pagination", idx);
+		}
     },
     created() {
         console.log(this.ordersHistory);