From b7ae3f69ae6706a692284d2f12835d213debfb1a Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 07 四月 2026 17:21:41 +0800
Subject: [PATCH] -
---
src/common/utils/util.js | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 101 insertions(+), 1 deletions(-)
diff --git a/src/common/utils/util.js b/src/common/utils/util.js
index f16ad85..70a4f8a 100644
--- a/src/common/utils/util.js
+++ b/src/common/utils/util.js
@@ -117,6 +117,52 @@
}
},
/**
+ * 鏍稿績宸ュ叿鍑芥暟锛氭牴鎹敓鏃ュ瓧绗︿覆璁＄畻骞撮緞
+ * @param {string} birthdayStr - 鐢熸棩瀛楃涓诧紙鏀寔 YYYY-MM-DD / YYYY/MM/DD锛�
+ * @returns {number} 鍛ㄥ瞾锛�-1 琛ㄧず鏃ユ湡鏃犳晥锛�
+ */
+ calculateAgeFromBirthday(birthdayStr) {
+ console.log(birthdayStr,'銆併�併�併�併�併�併�併�併�併�佲��');
+ if (!birthdayStr) return -1
+
+ // 1. 缁熶竴鏍煎紡骞剁簿鍑嗚В鏋愮敓鏃ワ紙瑙ｅ喅 1/26 杩欑被鏃犺ˉ闆舵棩鏈熺殑瑙ｆ瀽闂锛�
+ const normalized = birthdayStr.replace(/[./]/g, '-')
+ console.log(normalized,'normalized鈥�');
+ const [birthYear, birthMonth, birthDay] = normalized.split('-').map(Number)
+ // 鐩存帴鐢ㄦ暟瀛楀垱寤� Date 瀵硅薄锛岄伩鍏嶅瓧绗︿覆瑙ｆ瀽鐨勬涔夛紙鏈堜唤浠� 0 寮�濮嬶級
+ const birthDate = new Date(birthYear, birthMonth - 1, birthDay)
+
+ // 2. 鏍￠獙鏃ユ湡鍚堟硶鎬�
+ if (isNaN(birthDate.getTime())) return -1
+ // 鍙嶅悜楠岃瘉锛氱‘淇濊緭鍏ョ殑骞存湀鏃ュ拰 Date 瀵硅薄涓�鑷达紙閬垮厤 2010/2/30 杩欑被鏃犳晥鏃ユ湡锛�
+ if (
+ birthDate.getFullYear() !== birthYear ||
+ birthDate.getMonth() + 1 !== birthMonth ||
+ birthDate.getDate() !== birthDay
+ ) {
+ return -1
+ }
+
+ // 3. 鑾峰彇褰撳墠鏃ユ湡锛堢簿鍑嗗埌鏃ワ紝鎺掗櫎鏃跺垎绉掑共鎵帮級
+ const now = new Date()
+ const currentYear = now.getFullYear()
+ const currentMonth = now.getMonth() + 1 // 杞垚 1-12 鏈�
+ const currentDay = now.getDate()
+
+ // 4. 鏍稿績锛氱簿鍑嗚绠楀懆宀�
+ let age = currentYear - birthYear
+ // 鍒ゆ柇锛氬綋鍓嶆棩鏈� < 鐢熸棩鏃ユ湡 鈫� 骞撮緞鍑� 1锛堝彧鏈夊綋鍓嶆棩鏈� >= 鐢熸棩鏃ユ湡锛屾墠婊″搴斿懆宀侊級
+ if (
+ currentMonth < birthMonth || // 鏈堜唤娌″埌
+ (currentMonth === birthMonth && currentDay < birthDay) // 鏈堜唤鍒颁簡锛屼絾鏃ユ湡娌″埌
+ ) {
+ age--
+ }
+
+ // 5. 杈圭晫澶勭悊锛氬勾榫勪笉鑳戒负璐燂紙鎺掗櫎鏈潵鐢熸棩锛�
+ return age
+ },
+ /**
* 鏃ユ湡鏍煎紡杞椂闂存埑
* @param {Object} timeStamp
*/
@@ -153,7 +199,7 @@
const hours = date.getHours().toString().padStart(2, '0');
const minutes = date.getMinutes().toString().padStart(2, '0');
if (type) {
- return `${year}-${month}-${day} ${hours}:${minutes}`;
+ return type=='riqi' ? `${month}-${day}`: `${year}-${month}-${day} ${hours}:${minutes}`;
}
return `${year}-${month}-${day}`;
},
@@ -867,4 +913,58 @@
}
});
},
+ //鐢熸垚鏃堕棿鎴�+闅忔満鏁�
+ // 鐢熸垚鏃堕棿鎴�+闅忔満鏁扮殑鍑芥暟
+ generateTimestampWithRandom(filename) {
+ // 鑾峰彇褰撳墠鏃ユ湡鍜屾椂闂�
+ const now = new Date();
+ // 鑾峰彇骞翠唤锛岀‘淇濅负鍥涗綅鏁�
+ const year = now.getFullYear();
+ // 鑾峰彇鏈堜唤锛岀‘淇濅负涓や綅鏁�
+ const month = String(now.getMonth() + 1).padStart(2, '0');
+ // 鑾峰彇鏃ユ湡锛岀‘淇濅负涓や綅鏁�
+ const day = String(now.getDate()).padStart(2, '0');
+ // 鑾峰彇灏忔椂锛岀‘淇濅负涓や綅鏁�
+ const hours = String(now.getHours()).padStart(2, '0');
+ // 鑾峰彇鍒嗛挓锛岀‘淇濅负涓や綅鏁�
+ const minutes = String(now.getMinutes()).padStart(2, '0');
+ // 鑾峰彇绉掓暟锛岀‘淇濅负涓や綅鏁�
+ const seconds = String(now.getSeconds()).padStart(2, '0');
+ // 鎷兼帴鏃堕棿鎴�
+ const timestamp = `${year}${month}${day}${hours}${minutes}${seconds}`;
+ // 鐢熸垚涓�涓� 0 鍒� 9999 涔嬮棿鐨勯殢鏈烘暟锛屽苟鏍煎紡鍖栦负鍥涗綅鏁�
+ const randomNumber = String(Math.floor(Math.random() * 10000)).padStart(4, '0');
+ // 鎷兼帴鏃堕棿鎴冲拰闅忔満鏁�
+ return `cylsg/${timestamp}_${randomNumber}` + filename.match(/\.[^.]+$/);
+ },
+ getFileExtensionWithDotRegex(filename) {
+ const match = filename.match(/\.[^.]+$/);
+ return match ? match[0] : '';
+ },
+ isEmpty(value) {
+ return (
+ value === null ||
+ value === undefined ||
+ value === '' ||
+ (Array.isArray(value) && value.length === 0) ||
+ (typeof value === 'object' &&!Array.isArray(value) && Object.keys(value).length === 0)
+ );
+ },
+
+ removeEmptyValuesRecursive(obj) {
+ const newObj = {};
+ for (const key in obj) {
+ if (obj.hasOwnProperty(key)) {
+ const value = obj[key];
+ if (!this.isEmpty(value)) {
+ if (typeof value === 'object' &&!Array.isArray(value)) {
+ newObj[key] = removeEmptyValuesRecursive(value);
+ } else {
+ newObj[key] = value;
+ }
+ }
+ }
+ }
+ return newObj;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1