From 146cd503d32b415d11fb4109ad106063310cc726 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 15:17:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/shop/pages/wallet/wallet.vue | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/small-program/shop/pages/wallet/wallet.vue b/small-program/shop/pages/wallet/wallet.vue
index 899d47a..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,21 +240,21 @@
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,
- type: this.active === 1?0:(this.active===2?1:''),
- objType: this.type === 1?16:( this.type === 2?17:( this.type === 3?25: (this.type === 4?1: ''))),
+ optType: this.active === 1 ? 1 : (this.active === 2 ? -1 : ''),
+ type: this.type === 1 ? 0 : (this.type === 2 ? 1 : (this.type === 4 ? 2 : '')),
},
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
@@ -268,8 +270,8 @@
this.$u.api.shopSummary({
startTime: this.startDate || this.defaultStartDate,
endTime: this.endDate || this.defaultEndDate,
- type: this.active === 1?0:(this.active===2?1:''),
- objType: this.type === 1?16:( this.type === 2?17:( this.type === 3?25: (this.type === 4?1: ''))),
+ optType: this.active === 1 ? 1 : (this.active === 2 ? -1 : ''),
+ type: this.type === 1 ? 0 : (this.type === 2 ? 1 : (this.type === 4 ? 2 : '')),
}).then(res=>{
if(res.code == 200){
this.countDataList = res.data
@@ -292,9 +294,9 @@
icon: 'none'
})
}
- if(new Date(this.tempEndDate+" 00:00:00").getTime() < new Date(this.tempStartDate+" 00:00:00").getTime()){
+ if(new Date(this.tempEndDate+" 00:00:00").getTime() <= new Date(this.tempStartDate+" 00:00:00").getTime()){
return uni.showToast({
- title:'鏃ユ湡鑼冨洿涓嶆纭�',
+ title:'寮�濮嬫椂闂村繀椤诲皬浜庢埅姝㈡椂闂�',
icon:'none'
})
}
@@ -307,8 +309,8 @@
} else {
this.startDate = null
this.endDate = null
- this.tempStartDate = this.defaultStartDate
- this.tempEndDate = this.defaultEndDate
+ this.tempStartDate = null
+ this.tempEndDate = null
this.show1 = false
setTimeout(() => {
this.getFirstPageData()
@@ -373,7 +375,7 @@
this.getShopStatistics()
this.getShopSummary()
- this.getShopPage()
+ this.getFirstPageData()
},
checkActive(index){
this.tempActive =index
@@ -633,6 +635,8 @@
font-size: 30rpx;
font-weight: 400;
margin-top: 30rpx;
+ padding-bottom: 30rpx;
+ box-sizing: border-box;
}
.item-list-item {
width: 100%;
--
Gitblit v1.9.3