From ec7cc88fca8de4b3c56f8ebee074fb7ce71ebf1e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 02 七月 2025 10:39:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/utils/utils.js | 163 +-----------------------------------------------------
1 files changed, 3 insertions(+), 160 deletions(-)
diff --git a/h5/utils/utils.js b/h5/utils/utils.js
index 08378e8..770fa4b 100644
--- a/h5/utils/utils.js
+++ b/h5/utils/utils.js
@@ -1,163 +1,6 @@
/**
- * 鏃堕棿鍓嶅悗鍚戝墠鎺ㄧ畻鏃堕棿闆嗗悎
- * @param {string:before|after} timebd锛氳幏鍙栨椂闂村線鍚庢帹锛岃繕鏄線鍓嶆帹锛�
- * @param {boole} haveCurrentDay锛氬寘涓嶅寘鍚綋澶╂椂闂达紝
- * @param {number} Days锛氳绠楀嚑澶╃殑鏃堕棿锛�
- * @param {string:"2023-11-02"} timing锛氭寚瀹氫笉鎸囧畾褰撳ぉ鐨勬棩鏈�
- * @returns {array}鏁版嵁闆嗗悎
+ * 鎴彇鏃ユ湡
*/
-export const nextDay = (timebd, haveCurrentDay, Days, timing) => {
-
- let today = new Date() //鑾峰彇浠婂ぉ鐨勬棩鏈�
- if (timing) {
- today = new Date(timing)
- }
- let date2 = new Date(today);
- let dateArray = []
- timebd=timebd ? timebd:"after"
- haveCurrentDay=haveCurrentDay ? true:false
- Days=Days ? Days:7
- function TimestampToDate2(Timestamp) {
- 銆�銆�let now = new Date(Timestamp),
- 銆�銆�y = now.getFullYear(),
- 銆�銆�m = now.getMonth() + 1,
- 銆�銆�d = now.getDate();
- 銆�銆�return y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
- }
- let fori=haveCurrentDay ? 0:1;
- let fortotal=haveCurrentDay ? Days:Days+1;
- for(let i = fori; i < fortotal; i++){
- let everyDay=""
- if (timebd=="after") {//鏈潵
- everyDay=date2.setDate(today.getDate() + i)
- }else{//杩囧幓
- everyDay=date2.setDate(today.getDate() - i)
- }
- dateArray.push(TimestampToDate2(everyDay)) //鑾峰彇鏈潵7澶╁唴鐨勬棩鏈�
- }
- if (timebd=="after") {//鏈潵
- return dateArray
- }else{//杩囧幓
- return dateArray.reverse()
- }
- }
-
-/**
- * 杩斿洖涓や釜鏃ユ湡涔嬪墠鐨勫ぉ鏁�
- */
-export const getDateByDays = (startDate, endDdate) => {
- let d1 = Date.parse(new Date(startDate));
- let d2 = Date.parse(new Date(endDdate));
- // 鏃堕棿鎴崇浉鍑� / 澶╂暟
- let day = parseInt((d2 - d1) / (1000 * 60 * 60 * 24));
- return day
-}
-
-// 鑾峰彇澶氬皯澶╁悗鐨勬棩鏈�
-export const getDaysAfterDate = (date, days) => {
- if (days === 0) {
- return '2099-01-01'
- }
- const now = new Date(date);
- now.setDate(now.getDate() + days);
- const year = now.getFullYear();
- const month = now.getMonth() + 1; // 鏈堜唤鏄粠0寮�濮嬬殑
- const day = now.getDate();
- return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
-}
-
-
-// meeting
-/**
- * 鑾峰彇褰撳ぉ鏃ユ湡
- **/
-export const getDay = () => {
- let date = new Date();
- var year = date.getFullYear();
- var month = date.getMonth() + 1;
- var day = date.getDate();
- month = (month > 9) ? month : ("0" + month);
- day = (day < 10) ? ("0" + day) : day;
- let week = '鏄熸湡' + '鏃ヤ竴浜屼笁鍥涗簲鍏�'.charAt(new Date().getDay())
- var today = year + "骞�" + month + "鏈�" + day + "鏃�" + " " + week;
-
- return {
- today,
- date: year + "-" + month + "-" + day,
- day
- };
-}
-
-/**
- * 鑾峰彇涓婁竴澶╂棩鏈�
- **/
-export const getPreviousDay = (number, val) => {
- let num = (24*60*60*1000) * number;
- let date = ''
- if (val) {
- date = new Date(new Date(val).getTime() - num);
- } else {
- date = new Date(new Date().getTime() - num);
- }
- var year = date.getFullYear();
- var month = date.getMonth() + 1;
- var day = date.getDate();
- month = (month > 9) ? month : ("0" + month);
- day = (day < 10) ? ("0" + day) : day;
- let week = '鏄熸湡' + '鏃ヤ竴浜屼笁鍥涗簲鍏�'.charAt(date.getDay())
- var today = year + "骞�" + month + "鏈�" + day + "鏃�" + " " + week;
-
- return {
- today,
- date: year + "-" + month + "-" + day
- };
-}
-
-// 鏍煎紡鍖栨棩瀵硅薄
-export const getNowDate = () => {
- var date = new Date();
- var sign2 = ":";
- var year = date.getFullYear() // 骞�
- var month = date.getMonth() + 1; // 鏈�
- var day = date.getDate(); // 鏃�
- var hour = date.getHours(); // 鏃�
- var minutes = date.getMinutes(); // 鍒�
- var seconds = date.getSeconds() //绉�
- var weekArr = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡澶�'];
- var week = weekArr[date.getDay()];
- // 缁欎竴浣嶆暟鐨勬暟鎹墠闈㈠姞 鈥�0鈥�
- if (month >= 1 && month <= 9) {
- month = "0" + month;
- }
- if (day >= 0 && day <= 9) {
- day = "0" + day;
- }
- if (hour >= 0 && hour <= 9) {
- hour = "0" + hour;
- }
- if (minutes >= 0 && minutes <= 9) {
- minutes = "0" + minutes;
- }
- if (seconds >= 0 && seconds <= 9) {
- seconds = "0" + seconds;
- }
- return year + "-" + month + "-" + day + " " + hour + sign2 + minutes + sign2 + seconds;
-}
-
-//蹇呴』涓哄瓧姣嶅姞鏁板瓧涓旈暱搴︿笉灏忎簬8浣�
-export const CheckPassWord = (password) => {
- var str = password;
- if (str == null || str.length <8) {
- return false;
- }
- var reg1 = new RegExp(/^[0-9A-Za-z]+$/);
- if (!reg1.test(str)) {
- return false;
- }
- var reg = new RegExp(/[A-Za-z].*[0-9]|[0-9].*[A-Za-z]/);
- if (reg.test(str)) {
- return true;
- } else {
- return false;
- }
+export const runcation = (date) => {
+ return date.substring(0, 16)
}
--
Gitblit v1.9.3