From 8caa1157044d2229e56a288cc5665fadf526dd45 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 11 六月 2026 16:30:02 +0800
Subject: [PATCH] 恢复支付金额与退款金额
---
app/pages/wallet/wallet.vue | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/app/pages/wallet/wallet.vue b/app/pages/wallet/wallet.vue
index a14a1e0..f89d304 100644
--- a/app/pages/wallet/wallet.vue
+++ b/app/pages/wallet/wallet.vue
@@ -53,8 +53,8 @@
</view>
</view>
<view class="item-date-bottom">
- <text>鏀跺叆锛毬{(countDataList.totalIncome || 0).toFixed(2)}}</text>
- <text>鏀嚭锛毬{(countDataList.totalExpense || 0).toFixed(2)}}</text>
+ <text>鏀跺叆锛毬{((countDataList.totalIncome || 0) / 100).toFixed(2)}}</text>
+ <text>鏀嚭锛毬{((countDataList.totalExpense || 0) / 100).toFixed(2)}}</text>
</view>
</view>
<view class="item-list">
@@ -113,7 +113,7 @@
<view @click="checkType(2)" :class="tempType === 2?'sear-item-list-item active':'sear-item-list-item'">鎻愮幇閫�鍥�</view>
<view @click="checkType(3)" :class="tempType === 3?'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(5)" :class="tempType === 5?'sear-item-list-item active':'sear-item-list-item'">寮傚父閲戦</view>
+ <view @click="checkType(5)" :class="tempType === 5?'sear-item-list-item active':'sear-item-list-item'">寮傚父杞繍</view>
<view style="width: 216rpx; height: 0;"></view>
</view>
</view>
@@ -166,6 +166,7 @@
data() {
return {
currentPage:1,
+ loading:false,
total:0,
active:0,
wordsWidth:250,
@@ -240,6 +241,7 @@
return value
},
getShopPage() {
+ console.log(this.loading, this.hasNext)
if(this.loading || !this.hasNext){
return
}
@@ -248,6 +250,12 @@
this.hasNext = true
this.dataList=[]
}
+ console.log({
+ startTime: this.startDate || this.defaultStartDate,
+ endTime: this.endDate || this.defaultEndDate,
+ type: this.type,
+ optType: this.active === 1?1:(this.active === 2?-1:'')
+ })
this.$u.api.driverPage({
capacity: 10,
model: {
@@ -259,15 +267,16 @@
page: this.currentPage
}).then(res => {
if (res.code == 200) {
- this.dataList.push(...res.data.records)
+ const records = res.data.records || []
+ this.dataList.push(...records)
this.total = res.data.total
- this.currentPage = this.currentPage+1
- if (this.dataList.length >= res.data.total) {
- this.hasNext = false
- } else {
- this.hasNext = true
- }
+ this.currentPage++
+ this.hasNext = this.dataList.length < res.data.total
}
+ }).catch(err => {
+ console.log(err)
+ }).finally(() => {
+ this.loading = false
})
},
getShopSummary() {
@@ -383,7 +392,7 @@
2: '鎻愮幇閫�鍥�',
3: '骞冲彴濂栧姳',
4: '璐ｄ换鎵ｆ',
- 5: '寮傚父閲戦'
+ 5: '寮傚父杞繍'
}
return typeMap[type] || ''
},
@@ -394,7 +403,7 @@
2: '鎻愮幇閫�鍥�',
3: '骞冲彴濂栧姳',
4: '璐ｄ换鎵ｆ',
- 5: '寮傚父閲戦'
+ 5: '寮傚父杞繍'
}
return typeMap[type] || ''
},
@@ -428,7 +437,7 @@
this.tempType = index
},
getFirstPageData(){
- this.currentPage = 0
+ this.currentPage = 1
this.hasNext=true
this.loading=false
this.total=0
--
Gitblit v1.9.3