From 788eec914f9cd5d33edffeb195dd6537b4b25baf Mon Sep 17 00:00:00 2001
From: dragon <3013557874@qq.com>
Date: Tue, 9 Jul 2024 10:24:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E6=97=B6=E9=97=B4=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=8F=AF=E9=80=89=E5=BD=93=E5=A4=A9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
view/molistar/modules/guildAr/js/memberFlow.js | 15 +++++++++------
view/molistar/modules/guildAr/js/memberFlow2.js | 15 +++++++++------
view/molistar/modules/guildAr/memberFlow.html | 2 +-
view/molistar/modules/guildAr/memberFlow2.html | 2 +-
4 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/view/molistar/modules/guildAr/js/memberFlow.js b/view/molistar/modules/guildAr/js/memberFlow.js
index 2197d642..29e1f54e 100644
--- a/view/molistar/modules/guildAr/js/memberFlow.js
+++ b/view/molistar/modules/guildAr/js/memberFlow.js
@@ -28,7 +28,8 @@ const toastMsg = (content = langReplace(localLang.demoModule.layerIndex2), time
skin: 'msg'
})
}
-var times = new Date().getTime() - 86400000;
+// var times = new Date().getTime() - 86400000;
+var times = new Date().getTime();
var startDates;
var endDates;
var timestamp;
@@ -146,11 +147,13 @@ function memberIncome(startDate, endDate) {
}
// 查询按钮
$('.back .text').click(function () {
- if ((Date.parse(endDates)) >= timestamp) {
- toastMsg(langReplace(localLang.memberFlow.text13))
- } else if (endDates == dateFormat(timestamp, 'yyyy-MM-dd')) {
- toastMsg(langReplace(localLang.memberFlow.text14))
- } else if (Date.parse(startDates) > Date.parse(endDates)) {
+ // if ((Date.parse(endDates)) >= timestamp) {
+ // toastMsg(langReplace(localLang.memberFlow.text13))
+ // } else if (endDates == dateFormat(timestamp, 'yyyy-MM-dd')) {
+ // toastMsg(langReplace(localLang.memberFlow.text14))
+ // } else
+
+ if (Date.parse(startDates) > Date.parse(endDates)) {
toastMsg(langReplace(localLang.memberFlow.text15))
} else if ((Date.parse(endDates) - Date.parse(startDates)) > (30 * 24 * 60 * 60 * 1000)) {
toastMsg(langReplace(localLang.memberFlow.text16))
diff --git a/view/molistar/modules/guildAr/js/memberFlow2.js b/view/molistar/modules/guildAr/js/memberFlow2.js
index b57b7116..927503b3 100644
--- a/view/molistar/modules/guildAr/js/memberFlow2.js
+++ b/view/molistar/modules/guildAr/js/memberFlow2.js
@@ -28,7 +28,8 @@ const toastMsg = (content = langReplace(localLang.demoModule.layerIndex2), time
skin: 'msg'
})
}
-var times = new Date().getTime() - 86400000;
+// var times = new Date().getTime() - 86400000;
+var times = new Date().getTime();
var startDates;
var endDates;
var timestamp;
@@ -151,11 +152,13 @@ $('.timeBox .right .goToExchangeGold').click(function () {
})
// 查询按钮
$('.back .text').click(function () {
- if ((Date.parse(endDates)) >= timestamp) {
- toastMsg(langReplace(localLang.memberFlow.text13))
- } else if (endDates == dateFormat(timestamp, 'yyyy-MM-dd')) {
- toastMsg(langReplace(localLang.memberFlow.text14))
- } else if (Date.parse(startDates) > Date.parse(endDates)) {
+ // if ((Date.parse(endDates)) >= timestamp) {
+ // toastMsg(langReplace(localLang.memberFlow.text13))
+ // } else if (endDates == dateFormat(timestamp, 'yyyy-MM-dd')) {
+ // toastMsg(langReplace(localLang.memberFlow.text14))
+ // } else
+
+ if (Date.parse(startDates) > Date.parse(endDates)) {
toastMsg(langReplace(localLang.memberFlow.text15))
} else if ((Date.parse(endDates) - Date.parse(startDates)) > (30 * 24 * 60 * 60 * 1000)) {
toastMsg(langReplace(localLang.memberFlow.text16))
diff --git a/view/molistar/modules/guildAr/memberFlow.html b/view/molistar/modules/guildAr/memberFlow.html
index a9ee0162..ccf135c8 100644
--- a/view/molistar/modules/guildAr/memberFlow.html
+++ b/view/molistar/modules/guildAr/memberFlow.html
@@ -76,7 +76,7 @@
-
+