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

---
 small-program/shop/pages/wallet/wallet.vue |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/small-program/shop/pages/wallet/wallet.vue b/small-program/shop/pages/wallet/wallet.vue
index 48857b8..899d47a 100644
--- a/small-program/shop/pages/wallet/wallet.vue
+++ b/small-program/shop/pages/wallet/wallet.vue
@@ -75,9 +75,9 @@
 									<view class="info-a-label">
 									{{item.type === 0 ? '瀹屾垚璁㈠崟' : item.type === 1 ? '鎻愮幇鏀嚭' : item.type === 2 ? '鎻愮幇閫�鍥�' : ''}}
 									<template  v-if="item.type === 1">
-										<text style="color: #FF0020;"  v-if="item.withdrawStatus == 2">鏈�氳繃</text>
-										<text style="color: #004096" v-else-if="item.withdrawStatus == 1">宸查�氳繃</text>
-										<text style="color: #FF0020;" v-else>瀹℃牳涓�</text>
+										<text style="color: #FF0020;"  v-if="item.status == 2">澶勭悊涓�</text>
+										<text style="color: #FF0020;" v-else-if="item.status == 1">澶辫触</text>
+										<text style="color: #004096;" v-else>宸查�氳繃</text>
 									</template>
 									</view>
 									<view class="info-a-price">
@@ -192,6 +192,7 @@
 				countData:{},
 				countDataList:{},
 				hasNext:true,
+				loading:false,
 				show: false,
 				show1:false,
 				year:null,
@@ -285,22 +286,34 @@
 			},
 			comfirmDate(flag){
 				if (flag) {
+					if (!this.tempStartDate || !this.tempEndDate) {
+						return uni.showToast({
+							title: '璇烽�夋嫨寮�濮嬪拰缁撴潫鏃堕棿',
+							icon: 'none'
+						})
+					}
 					if(new Date(this.tempEndDate+" 00:00:00").getTime() < new Date(this.tempStartDate+" 00:00:00").getTime()){
 						return uni.showToast({
 							title:'鏃ユ湡鑼冨洿涓嶆纭�',
-							icon:'error'
+							icon:'none'
 						})
 					}
-					this.startDate =this.tempStartDate
-					this.endDate =this.tempEndDate
+					this.startDate = this.tempStartDate
+					this.endDate = this.tempEndDate
+					this.show1 = false
+					setTimeout(() => {
+						this.getFirstPageData()
+					}, 300)
 				} else {
 					this.startDate = null
 					this.endDate = null
 					this.tempStartDate = this.defaultStartDate
 					this.tempEndDate = this.defaultEndDate
+					this.show1 = false
+					setTimeout(() => {
+						this.getFirstPageData()
+					}, 300)
 				}
-				this.getFirstPageData()
-				this.show1=false
 			},
 			openShow(){
 				this.tempActive =this.active
@@ -311,7 +324,6 @@
 				if(flag){
 					this.active = this.tempActive
 					this.type = this.tempType
-					this.show = false
 					this.wordsWidth = 250
 					if(this.active === 0 && this.type === 0){
 						this.words = '鍏ㄩ儴'
@@ -323,10 +335,20 @@
 						}
 						this.words = t1 + t2
 					} 
-					this.getFirstPageData()
+					this.show = false
+					setTimeout(() => {
+						this.getFirstPageData()
+					}, 300)
 				}else{
 					this.tempActive = 0
-					this.tempType =0
+					this.tempType = 0
+					this.active = 0
+					this.type = 0
+					this.words = '鍏ㄩ儴'
+					this.show = false
+					setTimeout(() => {
+						this.getFirstPageData()
+					}, 300)
 				}
 			},
 			formattedDateTime(currentDate) {
@@ -361,9 +383,10 @@
 			},
 			getFirstPageData(){
 				this.currentPage = 0
-				this.hasNext=true
-				this.total=0
-				this.dataList=[]
+				this.hasNext = true
+				this.loading = false
+				this.total = 0
+				this.dataList = []
 				this.getShopPage()
 			},
 			jumpWithdraw(){

--
Gitblit v1.9.3