From 8e0a06da052c4f335ed4a2be51e1ac2c6b45a7a4 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 28 四月 2026 17:53:24 +0800
Subject: [PATCH] 小程序改bug

---
 small-program/shop/pages/wallet/wallet.vue |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/small-program/shop/pages/wallet/wallet.vue b/small-program/shop/pages/wallet/wallet.vue
index 899d47a..dcb13e4 100644
--- a/small-program/shop/pages/wallet/wallet.vue
+++ b/small-program/shop/pages/wallet/wallet.vue
@@ -247,8 +247,8 @@
 					model: {
 						startTime: this.startDate || this.defaultStartDate,
 						endTime: this.endDate || this.defaultEndDate,
-						type: this.active === 1?0:(this.active===2?1:''), 
-						objType: this.type === 1?16:( this.type === 2?17:( this.type === 3?25: (this.type === 4?1: ''))), 
+						optType: this.active === 1 ? 1 : (this.active === 2 ? -1 : ''),
+						type: this.type === 1 ? 0 : (this.type === 2 ? 1 : (this.type === 4 ? 2 : '')),
 					},
 					page: this.currentPage
 				}).then(res => {
@@ -268,8 +268,8 @@
 				this.$u.api.shopSummary({
 					startTime: this.startDate || this.defaultStartDate,
 					endTime: this.endDate || this.defaultEndDate,
-					type: this.active === 1?0:(this.active===2?1:''), 
-					objType: this.type === 1?16:( this.type === 2?17:( this.type === 3?25: (this.type === 4?1: ''))), 
+					optType: this.active === 1 ? 1 : (this.active === 2 ? -1 : ''),
+					type: this.type === 1 ? 0 : (this.type === 2 ? 1 : (this.type === 4 ? 2 : '')),
 				}).then(res=>{
 					if(res.code == 200){
 						this.countDataList = res.data
@@ -292,9 +292,9 @@
 							icon: 'none'
 						})
 					}
-					if(new Date(this.tempEndDate+" 00:00:00").getTime() < new Date(this.tempStartDate+" 00:00:00").getTime()){
+					if(new Date(this.tempEndDate+" 00:00:00").getTime() <= new Date(this.tempStartDate+" 00:00:00").getTime()){
 						return uni.showToast({
-							title:'鏃ユ湡鑼冨洿涓嶆纭�',
+							title:'寮�濮嬫椂闂村繀椤诲皬浜庢埅姝㈡椂闂�',
 							icon:'none'
 						})
 					}
@@ -307,8 +307,8 @@
 				} else {
 					this.startDate = null
 					this.endDate = null
-					this.tempStartDate = this.defaultStartDate
-					this.tempEndDate = this.defaultEndDate
+					this.tempStartDate = null
+					this.tempEndDate = null
 					this.show1 = false
 					setTimeout(() => {
 						this.getFirstPageData()
@@ -633,6 +633,8 @@
 						font-size: 30rpx;
 						font-weight: 400;
 						margin-top: 30rpx;
+						padding-bottom: 30rpx;
+						box-sizing: border-box;
 					}
 					.item-list-item {
 						width: 100%;

--
Gitblit v1.9.3