From c9ece393fc028ffecca0915d1b9af62d51b5aef6 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 13 八月 2024 17:21:19 +0800
Subject: [PATCH] 1

---
 sub_pages/supplier/order-settlement/order-settlement.vue |   55 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/sub_pages/supplier/order-settlement/order-settlement.vue b/sub_pages/supplier/order-settlement/order-settlement.vue
index 24a2209..f76c55c 100644
--- a/sub_pages/supplier/order-settlement/order-settlement.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement.vue
@@ -6,7 +6,8 @@
 		</view>
 		<view class="p15" style="min-height: calc(100vh - 160rpx);">
 			<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
-			<view v-for="(item,index) in list" :key="index" class="m-b-24 order-sale-list list-container">
+			<view v-for="(item,index) in list" :key="index" @click="toDetail(item)"
+				class="m-b-24 order-sale-list list-container">
 				<view class="order-sale-item br-4 list-item bg-white">
 					<view class="title flex">
 						<view class="title">
@@ -58,8 +59,7 @@
 							</view>
 						</view>
 					</view>
-				
-					<view class="line"></view>
+					<!-- <view class="line"></view> -->
 					<view class="form">
 						<view class="flex">
 							<view class="form-item">
@@ -83,28 +83,33 @@
 </template>
 
 <script>
+import moment from 'moment'
 	export default {
 		data() {
 			return {
 				tabIndex: 0,
-				query:{
-					startDateStr:'',
-					endDateStr:'',
+				query: {
+					startDateStr: '',
+					endDateStr: '',
 				}
 			}
 		},
 		onLoad() {
-			var currentMonthStr = this.$util.toDate(new Date())
+			var currentMonthStr = this.$util.toDate(new Date()).substring(0, 8) + '01'
 			this.query.startDateStr = currentMonthStr
-			var lastMonthDate = new Date(new Date(currentMonthStr).getTime() - 3600_000*24*10)
+			var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() + 3600000 * 24 *
+				40).substring(0, 8) + '01').getTime() - 3600000 * 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() {
@@ -113,28 +118,30 @@
 			uni.stopPullDownRefresh()
 		},
 		methods: {
+			toDetail(item) {
+				uni.navigateTo({
+					url: `/sub_pages/supplier/order-settlement/order-settlement-detail?id=${item.id}`
+				})
+			},
 			changeIndex(index) {
 				if (this.tabIndex !== index) {
 					this.tabIndex = index
 					// 刷新 query
-					if(index===0){
-						var currentMonthStr = this.$util.toDate(new Date())
+					if (index === 0) {
+						var currentMonthStr = this.$util.toDate(new Date()).substring(0, 8) + '01'
 						this.query.startDateStr = currentMonthStr
-						var lastMonthDate = new Date(new Date(currentMonthStr).getTime() - 3600_000*24*10)
+						// 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)
-					}else{
+					} else {
 						this.query.startDateStr = ''
 						this.query.endDateStr = ''
 					}
 					this.refreshList()
-					
+
 				}
 			},
-			toDetail(item) {
-				// uni.navigateTo({
-				// 	url: `/pages/notice/notice?id=${item.id}`
-				// })
-			}
 		}
 	}
 </script>
@@ -160,8 +167,8 @@
 			}
 
 			.form {
-				display: flex;
-				flex-wrap: wrap;
+				// display: flex;
+				// flex-wrap: wrap;
 
 				.form-item {
 					flex: 1;
@@ -188,6 +195,8 @@
 						font-size: 24rpx;
 						color: #000000;
 						line-height: 34rpx;
+						text-align: center;
+						flex: 1;
 					}
 
 					.value.red {

--
Gitblit v1.9.3