From 777bcb6c5660c0ed14d85207377b62b779d81dde Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:08:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
small-program/shop/pages/wallet/wallet.vue | 101 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 67 insertions(+), 34 deletions(-)
diff --git a/small-program/shop/pages/wallet/wallet.vue b/small-program/shop/pages/wallet/wallet.vue
index 48857b8..f2a329f 100644
--- a/small-program/shop/pages/wallet/wallet.vue
+++ b/small-program/shop/pages/wallet/wallet.vue
@@ -58,30 +58,32 @@
</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.withdrawStatus == 2">鏈�氳繃</text>
- <text style="color: #004096" v-else-if="item.withdrawStatus == 1">宸查�氳繃</text>
- <text style="color: #FF0020;" v-else>瀹℃牳涓�</text>
+ <text style="color: #FF0020;" v-if="item.status == 2">澶勭悊涓�</text>
+ <text style="color: #FF0020;" v-else-if="item.status == 1">澶辫触</text>
+ <text style="color: #004096;" v-else>宸查�氳繃</text>
</template>
</view>
<view class="info-a-price">
- <text>{{item.type==1?'-':'+'}}{{item.amountInfo || 0}}</text>
+ <text>{{[1, 4, 5].includes(item.type) ? '-' : '+'}}{{item.amountInfo || 0}}</text>
<text></text>
</view>
</view>
@@ -117,7 +119,11 @@
<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(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 style="width: 216rpx; height: 0;"></view>
<view style="width: 216rpx; height: 0;"></view>
</view>
</view>
@@ -192,6 +198,7 @@
countData:{},
countDataList:{},
hasNext:true,
+ loading:false,
show: false,
show1:false,
year:null,
@@ -214,7 +221,9 @@
this.countDataList={}
this.show = false
this.initDateStr()
- uni.$on('accountListReload', this.getFirstPageData())
+ uni.$on('accountListReload', ()=>{
+ this.getFirstPageData()
+ })
},
methods:{
bindChange1 (e) {
@@ -237,21 +246,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 === 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.hasNext = true
+ this.dataList=[]
+ }
this.dataList.push(...res.data.records)
this.total = res.data.total
this.currentPage = this.currentPage+1
@@ -267,8 +276,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 === 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
@@ -285,22 +294,34 @@
},
comfirmDate(flag){
if (flag) {
- if(new Date(this.tempEndDate+" 00:00:00").getTime() < new Date(this.tempStartDate+" 00:00:00").getTime()){
+ if (!this.tempStartDate || !this.tempEndDate) {
return uni.showToast({
- title:'鏃ユ湡鑼冨洿涓嶆纭�',
- icon:'error'
+ title: '璇烽�夋嫨寮�濮嬪拰缁撴潫鏃堕棿',
+ icon: 'none'
})
}
- this.startDate =this.tempStartDate
- this.endDate =this.tempEndDate
+ if(new Date(this.tempEndDate+" 00:00:00").getTime() <= new Date(this.tempStartDate+" 00:00:00").getTime()){
+ return uni.showToast({
+ title:'寮�濮嬫椂闂村繀椤诲皬浜庢埅姝㈡椂闂�',
+ icon:'none'
+ })
+ }
+ this.startDate = this.tempStartDate
+ this.endDate = this.tempEndDate
+ this.show1 = false
+ setTimeout(() => {
+ this.getFirstPageData()
+ }, 300)
} 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()
+ }, 300)
}
- this.getFirstPageData()
- this.show1=false
},
openShow(){
this.tempActive =this.active
@@ -311,22 +332,31 @@
if(flag){
this.active = this.tempActive
this.type = this.tempType
- this.show = false
this.wordsWidth = 250
if(this.active === 0 && this.type === 0){
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
}
this.words = t1 + t2
}
- this.getFirstPageData()
+ this.show = false
+ setTimeout(() => {
+ this.getFirstPageData()
+ }, 300)
}else{
this.tempActive = 0
- this.tempType =0
+ this.tempType = 0
+ this.active = 0
+ this.type = 0
+ this.words = '鍏ㄩ儴'
+ this.show = false
+ setTimeout(() => {
+ this.getFirstPageData()
+ }, 300)
}
},
formattedDateTime(currentDate) {
@@ -351,7 +381,7 @@
this.getShopStatistics()
this.getShopSummary()
- this.getShopPage()
+ this.getFirstPageData()
},
checkActive(index){
this.tempActive =index
@@ -361,9 +391,10 @@
},
getFirstPageData(){
this.currentPage = 0
- this.hasNext=true
- this.total=0
- this.dataList=[]
+ this.hasNext = true
+ this.loading = false
+ this.total = 0
+ this.dataList = []
this.getShopPage()
},
jumpWithdraw(){
@@ -610,6 +641,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