From 06330ed7b98d5d90e873e6f3e92565e1b5b555e3 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 14 Aug 2024 10:38:48 +0800
Subject: [PATCH] 优化CAlert弹窗使用
---
common/Tools.js | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index a99856a..fa45243 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -6,6 +6,8 @@
import moment from 'moment';
import Taro from '@tarojs/taro';
+moment.locale('zh-cn');
+
export class Tools {
/**
* 显示消息
@@ -534,13 +536,12 @@
* @return {String}
*/
static transWeekIndexToDate(year, week, weekDay) {
- const yearStart = moment([year, 0, 1]);
- const dayLong = 24 * 60 * 60 * 1000;
- const firstWeekLong = (7 - yearStart.day()) * dayLong;
- const weeksLong = (week - 1) * 7 * dayLong;
- const weekDayLong = weekDay * dayLong;
- const dayTimestamp = yearStart.valueOf() + firstWeekLong + weeksLong + weekDayLong;
- return moment(dayTimestamp).format('YYYY-MM-DD');
+ if (weekDay < 1 && weekDay > 7) {
+ return '';
+ }
+ const weekDate = moment(year + '-' + week, 'YYYY-WW');
+ const firstDay = weekDate.startOf('week');
+ return firstDay.add(weekDay - 1, 'day').format('YYYY-MM-DD');
}
/**
--
Gitblit v1.9.1