From 667563d6ae12c2da2a16bf68be67a008d5bc6138 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 06 八月 2024 20:48:41 +0800
Subject: [PATCH] update

---
 sub_pages/supplier/order-settlement/order-settlement.vue |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sub_pages/supplier/order-settlement/order-settlement.vue b/sub_pages/supplier/order-settlement/order-settlement.vue
index 3bd6fe3..47e859f 100644
--- a/sub_pages/supplier/order-settlement/order-settlement.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement.vue
@@ -84,6 +84,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 	export default {
 		data() {
 			return {
@@ -100,13 +101,16 @@
 			var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() + 3600_000 * 24 *
 				40).substring(0, 8) + '01').getTime() - 3600_000 * 24 * 1)
 			this.query.endDateStr = this.$util.toDate(lastMonthDate)
-
-			this.listApi = '/api/partner/settlement/list'
+			// #ifdef PUB_PARTNER
+			this.listApi = '/api/partner/settlement/list'			
+			// #endif
+			// #ifdef PUB_SUPPLIER
+			this.listApi = '/api/supplier/settlement/list'						
+			// #endif
 			this.getList()
 
 		},
 		onReachBottom() {
-			this.page.current += 1
 			this.getMore()
 		},
 		async onPullDownRefresh() {
@@ -127,6 +131,7 @@
 					if (index === 0) {
 						var currentMonthStr = this.$util.toDate(new Date()).substring(0, 8) + '01'
 						this.query.startDateStr = currentMonthStr
+						// moment().startOf
 						var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() +
 							3600_000 * 24 * 40).substring(0, 8) + '01').getTime() - 3600_000 * 24 * 1)
 						this.query.endDateStr = this.$util.toDate(lastMonthDate)

--
Gitblit v1.9.3