From e9a7cddce776382916e975402986144a88899ac5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 14 五月 2026 18:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
small-program/shop/pages/wallet/wallet.vue | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/small-program/shop/pages/wallet/wallet.vue b/small-program/shop/pages/wallet/wallet.vue
index dcb13e4..984b166 100644
--- a/small-program/shop/pages/wallet/wallet.vue
+++ b/small-program/shop/pages/wallet/wallet.vue
@@ -58,8 +58,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">
@@ -114,7 +114,7 @@
<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(0)" :class="tpe == 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>
@@ -215,7 +215,9 @@
this.countDataList={}
this.show = false
this.initDateStr()
- uni.$on('accountListReload', this.getFirstPageData())
+ uni.$on('accountListReload', ()=>{
+ this.getFirstPageData()
+ })
},
methods:{
bindChange1 (e) {
@@ -238,10 +240,6 @@
return
}
this.loading=true
- if(this.currentPage == 1){
- this.hasNext = true
- this.dataList=[]
- }
this.$u.api.shopPage({
capacity: 10,
model: {
@@ -253,6 +251,10 @@
page: this.currentPage
}).then(res => {
if (res.code == 200) {
+ if(res.data.page == 1){
+ this.hasNext = true
+ this.dataList=[]
+ }
this.dataList.push(...res.data.records)
this.total = res.data.total
this.currentPage = this.currentPage+1
@@ -373,7 +375,7 @@
this.getShopStatistics()
this.getShopSummary()
- this.getShopPage()
+ this.getFirstPageData()
},
checkActive(index){
this.tempActive =index
--
Gitblit v1.9.3