From 87779aa2eb38f07e266ecb536e8ecd30c3b994b5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 28 四月 2026 18:55:33 +0800
Subject: [PATCH] 支付宝支付ddd
---
small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.js | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.js b/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.js
index 7caca15..195b82c 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.js
@@ -247,6 +247,7 @@
countData: {},
countDataList: {},
hasNext: true,
+ loading: false,
show: false,
show1: false,
year: null,
@@ -302,8 +303,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(function (res) {
@@ -325,8 +326,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(function (res) {
if (res.code == 200) {
_this2.countDataList = res.data;
@@ -343,23 +344,36 @@
});
},
comfirmDate: function comfirmDate(flag) {
+ var _this4 = this;
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'
+ });
+ }
+ 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(function () {
+ _this4.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(function () {
+ _this4.getFirstPageData();
+ }, 300);
}
- this.getFirstPageData();
- this.show1 = false;
},
openShow: function openShow() {
this.tempActive = this.active;
@@ -367,10 +381,10 @@
this.show = true;
},
comfirm: function comfirm(flag) {
+ var _this5 = this;
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 = '鍏ㄩ儴';
@@ -382,10 +396,20 @@
}
this.words = t1 + t2;
}
- this.getFirstPageData();
+ this.show = false;
+ setTimeout(function () {
+ _this5.getFirstPageData();
+ }, 300);
} else {
this.tempActive = 0;
this.tempType = 0;
+ this.active = 0;
+ this.type = 0;
+ this.words = '鍏ㄩ儴';
+ this.show = false;
+ setTimeout(function () {
+ _this5.getFirstPageData();
+ }, 300);
}
},
formattedDateTime: function formattedDateTime(currentDate) {
@@ -418,6 +442,7 @@
getFirstPageData: function getFirstPageData() {
this.currentPage = 0;
this.hasNext = true;
+ this.loading = false;
this.total = 0;
this.dataList = [];
this.getShopPage();
--
Gitblit v1.9.3