From 8caa1157044d2229e56a288cc5665fadf526dd45 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 11 六月 2026 16:30:02 +0800
Subject: [PATCH] 恢复支付金额与退款金额
---
small-program/shop/pages/wallet/wallet.vue | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/small-program/shop/pages/wallet/wallet.vue b/small-program/shop/pages/wallet/wallet.vue
index dcb13e4..283ecba 100644
--- a/small-program/shop/pages/wallet/wallet.vue
+++ b/small-program/shop/pages/wallet/wallet.vue
@@ -58,22 +58,24 @@
</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">
<view class="item-list-item" v-for="(item, index) in dataList" :key="index" @click="jumpDetail(item)">
<view class="image">
<image v-if="item.type === 0" src="/static/icon/ic_shouru@2x.png" mode="widthFix"></image>
+ <image v-if="item.type === 3" src="/static/icon/ic_shouru@2x.png" mode="widthFix"></image>
<image v-if="item.type === 1" src="/static/icon/ic_tixian@2x.png" mode="widthFix"></image>
<image v-if="item.type === 2" src="/static/icon/ic_tuikuan@2x.png" mode="widthFix"></image>
+ <image v-if="item.type === 4 || item.type === 5" src="/static/icon/ic_tixian@2x.png" mode="widthFix"></image>
</view>
<view class="info">
<view class="info">
<view class="info-a">
<view class="info-a-label">
- {{item.type === 0 ? '瀹屾垚璁㈠崟' : item.type === 1 ? '鎻愮幇鏀嚭' : item.type === 2 ? '鎻愮幇閫�鍥�' : ''}}
+ {{item.type === 0 ? '瀹屾垚璁㈠崟' : item.type === 1 ? '鎻愮幇鏀嚭' : item.type === 2 ? '鎻愮幇閫�鍥�' : item.type === 3 ? '骞冲彴濂栧姳' : item.type === 4 ? '璐ｄ换鎵ｆ' : item.type === 5 ? '淇濈琛ヨ创' : ''}}
<template v-if="item.type === 1">
<text style="color: #FF0020;" v-if="item.status == 2">澶勭悊涓�</text>
<text style="color: #FF0020;" v-else-if="item.status == 1">澶辫触</text>
@@ -81,7 +83,7 @@
</template>
</view>
<view class="info-a-price">
- <text>{{item.type==1?'-':'+'}}{{item.amountInfo || 0}}</text>
+ <text>{{[1, 4].includes(item.type) ? '-' : '+'}}{{item.amountInfo || 0}}</text>
<text></text>
</view>
</view>
@@ -117,7 +119,10 @@
<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(6)" :class="tempType == 6?'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 style="width: 216rpx; height: 0;"></view>
<view style="width: 216rpx; height: 0;"></view>
</view>
</view>
@@ -215,7 +220,12 @@
this.countDataList={}
this.show = false
this.initDateStr()
- uni.$on('accountListReload', this.getFirstPageData())
+ uni.$on('accountListReload', ()=>{
+ this.getFirstPageData()
+ })
+ },
+ onReachBottom() {
+ this.getShopPage()
},
methods:{
bindChange1 (e) {
@@ -238,21 +248,22 @@
return
}
this.loading=true
- if(this.currentPage == 1){
- this.hasNext = true
- this.dataList=[]
- }
this.$u.api.shopPage({
capacity: 10,
model: {
startTime: this.startDate || this.defaultStartDate,
endTime: this.endDate || this.defaultEndDate,
optType: this.active === 1 ? 1 : (this.active === 2 ? -1 : ''),
- type: this.type === 1 ? 0 : (this.type === 2 ? 1 : (this.type === 4 ? 2 : '')),
+ type: this.type === 0 ? '' : (this.type === 1 ? 0 : (this.type === 2 ? 1 : (this.type === 3 ? 3 : (this.type === 4 ? 4 : (this.type === 5 ? 5 : (this.type === 6 ? 2 : '')))))),
},
page: this.currentPage
}).then(res => {
if (res.code == 200) {
+ if(res.data.page == 1){
+ this.getShopSummary()
+ this.hasNext = true
+ this.dataList=[]
+ }
this.dataList.push(...res.data.records)
this.total = res.data.total
this.currentPage = this.currentPage+1
@@ -262,6 +273,8 @@
this.hasNext = true
}
}
+ }).finally(() => {
+ this.loading = false
})
},
getShopSummary() {
@@ -269,7 +282,7 @@
startTime: this.startDate || this.defaultStartDate,
endTime: this.endDate || this.defaultEndDate,
optType: this.active === 1 ? 1 : (this.active === 2 ? -1 : ''),
- type: this.type === 1 ? 0 : (this.type === 2 ? 1 : (this.type === 4 ? 2 : '')),
+ type: this.type === 0 ? '' : (this.type === 1 ? 0 : (this.type === 2 ? 1 : (this.type === 3 ? 3 : (this.type === 4 ? 4 : (this.type === 5 ? 5 : (this.type === 6 ? 2 : '')))))),
}).then(res=>{
if(res.code == 200){
this.countDataList = res.data
@@ -329,7 +342,7 @@
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 === 1 ? '璁㈠崟缁撶畻' : (this.type === 2 ? '鎻愮幇' : (this.type === 3 ? '骞冲彴濂栧姳' : (this.type === 4 ? '璐ｄ换鎵ｆ' : (this.type === 5 ? '淇濈琛ヨ创' : (this.type === 6 ? '鎻愮幇閫�鍥�' : '')))))
if(t1 !='' && t2 !=''){
this.wordsWidth = 350
}
@@ -372,8 +385,8 @@
this.endDate = null
this.getShopStatistics()
- this.getShopSummary()
- this.getShopPage()
+ // this.getShopSummary()
+ this.getFirstPageData()
},
checkActive(index){
this.tempActive =index
@@ -382,7 +395,7 @@
this.tempType =index
},
getFirstPageData(){
- this.currentPage = 0
+ this.currentPage = 1
this.hasNext = true
this.loading = false
this.total = 0
--
Gitblit v1.9.3