From 12332f0f307c6dfd79a7ffb05aad22302526cef7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 1 Mar 2024 13:20:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=20tab=20=E5=88=87=E6=8D=A2=E5=8F=A0=E5=8A=A0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/aftersale/list.vue | 12 +++---------
 pages/order/list.vue           | 16 +++++-----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/pages/order/aftersale/list.vue b/pages/order/aftersale/list.vue
index 7af6f328..64624960 100644
--- a/pages/order/aftersale/list.vue
+++ b/pages/order/aftersale/list.vue
@@ -49,13 +49,7 @@
 	import _ from 'lodash';
   import { formatAfterSaleStatus, formatAfterSaleStatusDescription, handleAfterSaleButtons } from '@/sheep/hooks/useGoods';
   import AfterSaleApi from '@/sheep/api/trade/afterSale';
-
-	const paginationNull = {
-		list: [],
-    total: 0,
-    pageNo: 1,
-    pageSize: 10
-	};
+  import { resetPagination } from '@/sheep/util';
 
 	const state = reactive({
 		currentTab: 0,
@@ -94,7 +88,7 @@
 
 	// 切换选项卡
 	function onTabsChange(e) {
-		state.pagination = paginationNull
+    resetPagination(state.pagination);
 		state.currentTab = e.index;
 		getOrderList();
 	}
@@ -126,7 +120,7 @@
 				}
         const { code } = await AfterSaleApi.cancelAfterSale(orderId);
         if (code === 0) {
-          state.pagination = paginationNull
+          resetPagination(state.pagination);
           await getOrderList();
         }
 			},
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 4b47f940..d9ac7080 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -91,13 +91,7 @@
 		isEmpty
 	} from 'lodash';
   import OrderApi from '@/sheep/api/trade/order';
-
-	const paginationNull = {
-		list: [],
-    total: 0,
-		pageNo: 1,
-    pageSize: 5,
-	};
+  import { resetPagination } from '@/sheep/util';
 
 	// 数据
 	const state = reactive({
@@ -138,7 +132,7 @@
       return;
     }
     // 重头加载代码
-		state.pagination = paginationNull;
+		resetPagination(state.pagination);
 		state.currentTab = e.index;
 		getOrderList();
 	}
@@ -191,8 +185,8 @@
 		// 正常的确认收货流程
 		const { code } = await OrderApi.receiveOrder(order.id);
 		if (code === 0) {
-			state.pagination = paginationNull;
-			await getOrderList();
+      resetPagination(state.pagination);
+      await getOrderList();
 		}
 	}
 
@@ -315,7 +309,7 @@
 
 	// 下拉刷新
 	onPullDownRefresh(() => {
-		state.pagination = paginationNull;
+    resetPagination(state.pagination);
 		getOrderList();
 		setTimeout(function() {
 			uni.stopPullDownRefresh();