From ce1248297e07cf5e409a37d43f2e0b54fcf86071 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 14 五月 2026 18:29:06 +0800
Subject: [PATCH] 提交

---
 app/pages/wallet/wallet.vue |   34 ++++++++++++++--------------------
 1 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/app/pages/wallet/wallet.vue b/app/pages/wallet/wallet.vue
index 258e43c..326874c 100644
--- a/app/pages/wallet/wallet.vue
+++ b/app/pages/wallet/wallet.vue
@@ -76,7 +76,7 @@
 									</template>
 									</view>
 									<view class="info-a-price">
-										<text>{{item.type==1?'-':'+'}}{{(item.num ||0).toFixed(2)}}</text>
+										<text>{{item.type==1?'-':'+'}}{{(item.amountInfo ||0)}}</text>
 										<text></text>
 									</view>
 								</view>
@@ -109,10 +109,10 @@
 				<view class="sear-item">
 					<view class="sear-item-label">浜ゆ槗绫诲瀷</view>
 					<view class="sear-item-list">
-						<view  @click="checkType(0)" :class="tempType == 0?'sear-item-list-item active':'sear-item-list-item'">鍏ㄩ儴</view>
-						<view  @click="checkType(1)" :class="tempType == 1?'sear-item-list-item active':'sear-item-list-item'">璁㈠崟缁撶畻</view>
-						<view  @click="checkType(2)" :class="tempType == 2?'sear-item-list-item active':'sear-item-list-item'">鎻愮幇</view>
-						<view  @click="checkType(4)" :class="tempType == 4?'sear-item-list-item active':'sear-item-list-item'">鎻愮幇閫�鍥�</view>
+						<view  @click="checkType('')" :class="tempType === '' ? 'sear-item-list-item active':'sear-item-list-item'">鍏ㄩ儴</view>
+						<view  @click="checkType(0)" :class="tempType === 0 ?'sear-item-list-item active':'sear-item-list-item'">璁㈠崟缁撶畻</view>
+						<view  @click="checkType(1)" :class="tempType === 1?'sear-item-list-item active':'sear-item-list-item'">鎻愮幇</view>
+						<view  @click="checkType(2)" :class="tempType === 2?'sear-item-list-item active':'sear-item-list-item'">鎻愮幇閫�鍥�</view>
 						<view style="width: 216rpx; height: 0;"></view>
 					</view>
 				</view>
@@ -169,9 +169,9 @@
 				active:0,
 				wordsWidth:250,
 				tempActive :0,
-				type:0,
+				type:'',
 				words:'鍏ㄩ儴',
-				tempType :0,
+				tempType :'',
 				dateType :0,
 				dataList:[],
 				startDate:null,
@@ -196,7 +196,7 @@
 			this.active=0
 			this.wordsWidth=250
 			this.words='鍏ㄩ儴'
-			this.tempActive=0
+			this.tempActive=''
 			this.dateType=0
 			this.countData={}
 			this.tempStartDate=null
@@ -243,18 +243,12 @@
 					this.hasNext = true
 					this.dataList=[]
 				}
-				console.log({
-						startTime: this.startDate || this.defaultStartDate,
-						endTime: this.endDate || this.defaultEndDate,
-						type: this.type === 1?0:(this.type === 2?1:(this.type === 3?2:'')),
-						optType: this.active === 1?1:(this.active === 2?-1:'')
-					})
 				this.$u.api.driverPage({
 					capacity: 10,
 					model: {
 						startTime: this.startDate || this.defaultStartDate,
 						endTime: this.endDate || this.defaultEndDate,
-						type: this.type === 1?0:(this.type === 2?1:(this.type === 3?2:'')),
+						type: this.type,
 						optType: this.active === 1?1:(this.active === 2?-1:'')
 					},
 					page: this.currentPage
@@ -328,11 +322,11 @@
 					this.type = this.tempType
 					this.show = false
 					this.wordsWidth = 250
-					if(this.active === 0 && this.type === 0){
+					if(this.active === 0 && this.type === ''){
 						this.words = '鍏ㄩ儴'
 					}else {
 						let t1 = this.active === 1 ? '鏀跺叆 ':(this.active === 2 ? '鏀嚭 ' : '');
-						let t2 = this.type === 1 ? '璁㈠崟缁撶畻' : (this.type === 2 ? '鎻愮幇': (this.type === 3 ? '璁㈠崟缁撶畻閫�鍥�' : (this.type === 4 ? '鎻愮幇閫�鍥�' : '')))
+						let t2 = this.type === 0 ? '璁㈠崟缁撶畻' : (this.type === 1 ? '鎻愮幇': (this.type === 2 ? '鎻愮幇閫�鍥�' : ''))
 						if(t1 !='' && t2 !=''){
 							this.wordsWidth = 350
 						}
@@ -340,9 +334,9 @@
 					}
 				} else {
 					this.tempActive = 0
-					this.tempType = 0
+					this.tempType = ''
 					this.active = 0
-					this.type = 0
+					this.type = ''
 					this.words = '鍏ㄩ儴'
 					this.wordsWidth = 250
 					this.show = false
@@ -378,7 +372,7 @@
 				this.tempActive =index
 			},
 			checkType(index){
-				this.tempType =index
+				this.tempType = index
 			},
 			getFirstPageData(){
 				this.currentPage = 0

--
Gitblit v1.9.3