From 908b9876dde97acbb09c53dc6debe3eecbb9d1b4 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:10:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/shop/pages/wallet/wallet.vue | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/small-program/shop/pages/wallet/wallet.vue b/small-program/shop/pages/wallet/wallet.vue
index 3fc6f0c..dcb13e4 100644
--- a/small-program/shop/pages/wallet/wallet.vue
+++ b/small-program/shop/pages/wallet/wallet.vue
@@ -192,6 +192,7 @@
countData:{},
countDataList:{},
hasNext:true,
+ loading:false,
show: false,
show1:false,
year:null,
@@ -246,8 +247,8 @@
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 => {
@@ -267,8 +268,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
@@ -285,22 +286,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,7 +324,6 @@
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 = '鍏ㄩ儴'
@@ -323,10 +335,20 @@
}
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) {
@@ -361,9 +383,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 +633,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