Merge branch 'imsyy:dev' into dev

Author: sseaan

package.json

@@ -20,6 +20,7 @@
     "dayjs": "^1.11.10",
     "element-plus": "^2.7.1",
     "fetch-jsonp": "^1.3.0",
+    "lodash-es": "^4.17.21",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
     "swiper": "^11.1.1",

pnpm-lock.yaml

@@ -1,6 +1,13 @@
+import { isEqual } from "lodash-es";
+
 let mainCursor;
 
-Math.lerp = (a, b, n) => (1 - n) * a + n * b;
+const lerp = (a, b, n) => {
+  if (Math.round(a) === b) {
+    return b;
+  }
+  return (1 - n) * a + n * b;
+};
 
 const getStyle = (el, attr) => {
   try {
@@ -49,7 +56,6 @@ class Cursor {
     document.body.appendChild((this.scr = document.createElement("style")));
     this.scr.innerHTML = `* {cursor: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8' width='10px' height='10px'><circle cx='4' cy='4' r='4' fill='white' /></svg>") 4 4, auto !important}`;
   }
-
   refresh() {
     this.scr.remove();
     this.cursor.classList.remove("active");
@@ -72,6 +78,7 @@ class Cursor {
         y: e.clientY - 8,
       };
       this.cursor.classList.remove("hidden");
+      this.render();
     };
     document.onmouseenter = () => this.cursor.classList.remove("hidden");
     document.onmouseleave = () => this.cursor.classList.add("hidden");
@@ -81,13 +88,15 @@ class Cursor {
 
   render() {
     if (this.pos.prev) {
-      this.pos.prev.x = Math.lerp(this.pos.prev.x, this.pos.curr.x, 0.35);
-      this.pos.prev.y = Math.lerp(this.pos.prev.y, this.pos.curr.y, 0.35);
+      this.pos.prev.x = lerp(this.pos.prev.x, this.pos.curr.x, 0.35);
+      this.pos.prev.y = lerp(this.pos.prev.y, this.pos.curr.y, 0.35);
       this.move(this.pos.prev.x, this.pos.prev.y);
     } else {
       this.pos.prev = this.pos.curr;
     }
-    requestAnimationFrame(() => this.render());
+    if (!isEqual(this.pos.curr, this.pos.prev)) {
+      requestAnimationFrame(() => this.render());
+    }
   }
 }
 

src/utils/cursor.js

@@ -124,19 +124,21 @@ export const checkDays = () => {
 // 建站日期统计
 export const siteDateStatistics = (startDate) => {
   const currentDate = new Date();
-  const differenceInTime = currentDate.getTime() - startDate.getTime();
-  const differenceInDays = differenceInTime / (1000 * 3600 * 24);
-  const differenceInMonths = differenceInDays / 30;
-  const differenceInYears = differenceInMonths / 12;
-  if (differenceInYears >= 1) {
-    return `本站已经苟活了 ${Math.floor(differenceInYears)} 年 ${Math.floor(
-      differenceInMonths % 12,
-    )} 月 ${Math.round(differenceInDays % 30)} 天`;
-  } else if (differenceInMonths >= 1) {
-    return `本站已经苟活了 ${Math.floor(differenceInMonths)} 月 ${Math.round(
-      differenceInDays % 30,
-    )} 天`;
-  } else {
-    return `本站已经苟活了 ${Math.round(differenceInDays)} 天`;
+  let years = currentDate.getFullYear() - startDate.getFullYear();
+  let months = currentDate.getMonth() - startDate.getMonth();
+  let days = currentDate.getDate() - startDate.getDate();
+
+  // 如果天数或月份为负数，则调整天数和月份
+  if (days < 0) {
+    months--;
+    const lastMonth = new Date(currentDate.getFullYear(), currentDate.getMonth() - 1, 0);
+    days += lastMonth.getDate();
   }
+
+  if (months < 0) {
+    years--;
+    months += 12;
+  }
+
+  return `本站已经苟活了 ${years} 年 ${months} 月 ${days} 天`;
 };