From f49dab81862a84c6b253c609b830d1f6755c7f87 Mon Sep 17 00:00:00 2001
From: al <al@cdhncy.com>
Date: Wed, 25 Dec 2024 16:21:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/globals.css                               |  12 ++++-----
 app/my/refund/refundDetail/[id]/page.jsx      |   7 ++---
 .../completeStreamerInformation/page.jsx      |   8 +++++-
 .../streamerVerification/joinGuild/page.jsx   |   1 +
 .../joinStreamer/page.jsx                     |   1 +
 .../components/MessageList/index.jsx          |   6 ++---
 .../components/NoticeItem/index.jsx           |   4 +--
 app/noticeDetail/page.js                      |   2 +-
 app/search/page.js                            |  12 +++++++++
 app/space/[id]/page.js                        |   1 -
 app/space/setting/spaceRefund/page.jsx        |   2 +-
 public/icons/32DP/comprehensive.png           | Bin 0 -> 446 bytes
 public/icons/32DP/pricefilter.png             | Bin 0 -> 517 bytes
 utils/tools.js                                |  24 ++++++++++--------
 14 files changed, 51 insertions(+), 29 deletions(-)
 create mode 100644 public/icons/32DP/comprehensive.png
 create mode 100644 public/icons/32DP/pricefilter.png

diff --git a/app/globals.css b/app/globals.css
index c9a7ecb..959b082 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -305,7 +305,7 @@ textarea {
 
 .adm-list-item-content {
   padding: 0;
-  border: none!important;
+  border: none !important;
 }
 .customize-body img {
   max-height: 90vh;
@@ -393,13 +393,13 @@ textarea {
   }
 }
 
-.adm-slider-track{
+.adm-slider-track {
   background-color: #ff669e40 !important;
 }
-.adm-slider-thumb{
+.adm-slider-thumb {
   background-color: #ff669e !important;
   transform: scale(0.5);
 }
-.adm-form-item-label .adm-form-item-required-asterisk{
-  left: auto!important;
-}
\ No newline at end of file
+.adm-form-item-label .adm-form-item-required-asterisk {
+  left: auto !important;
+}
diff --git a/app/my/refund/refundDetail/[id]/page.jsx b/app/my/refund/refundDetail/[id]/page.jsx
index 3396cba..7145d56 100644
--- a/app/my/refund/refundDetail/[id]/page.jsx
+++ b/app/my/refund/refundDetail/[id]/page.jsx
@@ -6,6 +6,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faAngleLeft } from "@fortawesome/free-solid-svg-icons";
 import requireAPI from "@/utils/requireAPI";
 import LoadingMask from "@/components/LoadingMask";
+import { formatTimestamp } from "@/utils/tools";
 export default function RefundDetail() {
   const [data, setData] = useState(null);
   const [isLoading, setIsLoading] = useState(false);
@@ -90,7 +91,7 @@ export default function RefundDetail() {
             <div className="flex flex-row justify-between items-center">
               <span className="text-base font-medium">退款价格</span>
               <span className="flex flex-row flex-1 justify-end items-center">
-                <span>¥ {data?.price}</span>
+                <span>¥ {data ? data?.price / 100 : "0"}</span>
               </span>
             </div>
             <Divider className="my-2" />
@@ -104,14 +105,14 @@ export default function RefundDetail() {
             <div className="flex flex-row justify-between items-center">
               <span className="text-base font-medium">购买时间</span>
               <div className="flex flex-row flex-1 justify-end items-center">
-                <span>{data?.ct}</span>
+                <span>{data ? formatTimestamp(data?.by_time) : ""}</span>
               </div>
             </div>
             <Divider className="my-2" />
             <div className="flex flex-row justify-between items-center">
               <span className="text-base font-medium">退款时间</span>
               <div className="flex flex-row flex-1 justify-end items-center">
-                <span>{data?.refund_t}</span>
+                <span>{data ? formatTimestamp(data?.refund_t) : ""}</span>
               </div>
             </div>
             <Divider className="my-2" />
diff --git a/app/my/streamerVerification/completeStreamerInformation/page.jsx b/app/my/streamerVerification/completeStreamerInformation/page.jsx
index 071d0b5..be11234 100644
--- a/app/my/streamerVerification/completeStreamerInformation/page.jsx
+++ b/app/my/streamerVerification/completeStreamerInformation/page.jsx
@@ -966,7 +966,13 @@ export default function CompleteStreamerInformation() {
             <div className="mt-2 px-4 py-3 h-12 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center">
               <div className="flex items-center">
                 <span className="mr-1 text-[#ffffffae] text-sm">¥</span>
-                <OwnInput id="addWeChatPrice" type="number" />
+                <Form.Item name="wechatPrice">
+                  <OwnInput
+                    // name="wechatPrice"
+                    id="addWeChatPrice"
+                    // type="number"
+                  />
+                </Form.Item>
               </div>
               <label
                 htmlFor="addWeChatPrice"
diff --git a/app/my/streamerVerification/joinGuild/page.jsx b/app/my/streamerVerification/joinGuild/page.jsx
index d94d6b2..994f7df 100644
--- a/app/my/streamerVerification/joinGuild/page.jsx
+++ b/app/my/streamerVerification/joinGuild/page.jsx
@@ -222,6 +222,7 @@ export default function JoinGuild() {
           <Button
             size="middle"
             shape="rounded"
+            block
             style={{
               "--background-color": "#FF669E",
               paddingLeft: "32px",
diff --git a/app/my/streamerVerification/joinStreamer/page.jsx b/app/my/streamerVerification/joinStreamer/page.jsx
index bb4edc9..04dcf9a 100644
--- a/app/my/streamerVerification/joinStreamer/page.jsx
+++ b/app/my/streamerVerification/joinStreamer/page.jsx
@@ -200,6 +200,7 @@ export default function JoinStreamer() {
           <Button
             size="middle"
             shape="rounded"
+            block
             style={{
               "--background-color": "#FF669E",
               paddingLeft: "32px",
diff --git a/app/noticeDetail/components/MessageList/index.jsx b/app/noticeDetail/components/MessageList/index.jsx
index 8bb2963..be93a00 100644
--- a/app/noticeDetail/components/MessageList/index.jsx
+++ b/app/noticeDetail/components/MessageList/index.jsx
@@ -4,8 +4,8 @@ import React, {
   forwardRef,
   useImperativeHandle,
 } from "react";
-import { formatTimestamp } from "../../../../utils/tools";
-import ScrollNotice from "../ScrollNotice";
+import { formatDate } from "../../../../utils/tools";
+// import ScrollNotice from "../ScrollNotice";
 import { useRouter } from "next/navigation";
 import requireAPI from "@/utils/requireAPI";
 import { connect } from "react-redux";
@@ -115,7 +115,7 @@ const MessageList = ({ mid, changeNoticeCount, refInstance, noticeCount }) => {
           newInfoItems[parseInt(it)]["count"] = noticeObj[it].unread_cnt;
           if (noticeObj[it]["most_recent_notif"]) {
             const time = noticeObj[it]["most_recent_notif"]["push_time"];
-            newInfoItems[parseInt(it)]["time"] = formatTimestamp(
+            newInfoItems[parseInt(it)]["time"] = formatDate(
               time ? time : noticeObj[it]["most_recent_notif"]["ct"]
             );
             newInfoItems[parseInt(it)]["subtitle"] =
diff --git a/app/noticeDetail/components/NoticeItem/index.jsx b/app/noticeDetail/components/NoticeItem/index.jsx
index 386534d..8c8b5ad 100644
--- a/app/noticeDetail/components/NoticeItem/index.jsx
+++ b/app/noticeDetail/components/NoticeItem/index.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { formatDate } from "@/utils/tools";
+import { formatTimestamp } from "@/utils/tools";
 import { Toast } from "antd-mobile";
 import { useRouter } from "next/navigation";
 import OwnImage from "@/components/OwnImage";
@@ -92,7 +92,7 @@ export default function NoticeItem({ leftIcon, hasLink, data }) {
           {/* 时间 */}
           <div>
             <span className="text-xs text-[#FFFFFF80]">
-              {formatDate(data?.push_time || data?.ct)}
+              {formatTimestamp(data?.push_time || data?.ct)}
             </span>
           </div>
         </div>
diff --git a/app/noticeDetail/page.js b/app/noticeDetail/page.js
index e4143a7..78e7609 100644
--- a/app/noticeDetail/page.js
+++ b/app/noticeDetail/page.js
@@ -142,7 +142,7 @@ export default function Space() {
             <OwnIcon src="/icons/search.png" className="scale-90" />
           </Link>
           <div
-            className="w-9 h-9 flex items-center justify-center bg-[#FFFFFF1A] rounded-full"
+            className="w-9 h-9 flex items-center justify-center rounded-full"
             onClick={handleReadAll}
           >
             <OwnIcon src="/icons/32DP/remove.png" className="scale-90" />
diff --git a/app/search/page.js b/app/search/page.js
index 41ac8cb..c6db725 100644
--- a/app/search/page.js
+++ b/app/search/page.js
@@ -451,6 +451,12 @@ export default function Search() {
             boxSizing: "border-box",
           }}
         >
+          <OwnIcon
+            outClassName="mr-2"
+            className="w-[32px] h-[32px]"
+            src="/icons/comprehensive.png"
+            alt=""
+          />
           <span
             className="text-lg font-medium"
             style={{
@@ -502,6 +508,12 @@ export default function Search() {
             boxSizing: "border-box",
           }}
         >
+          <OwnIcon
+            outClassName="mr-2"
+            className="w-[32px] h-[32px]"
+            src="/icons/pricefilter.png"
+            alt=""
+          />
           <span
             className="text-lg font-medium"
             style={{
diff --git a/app/space/[id]/page.js b/app/space/[id]/page.js
index 6d3dd56..18d7c5f 100644
--- a/app/space/[id]/page.js
+++ b/app/space/[id]/page.js
@@ -1,5 +1,4 @@
 "use client";
-
 import React, { useEffect, useState, useRef, useMemo } from "react";
 import {
   FloatingPanel,
diff --git a/app/space/setting/spaceRefund/page.jsx b/app/space/setting/spaceRefund/page.jsx
index 94145b8..b98fe11 100644
--- a/app/space/setting/spaceRefund/page.jsx
+++ b/app/space/setting/spaceRefund/page.jsx
@@ -77,7 +77,7 @@ export default function SpaceRefund() {
       }
       Toast.show({
         icon: "success",
-        content: "提交成功，请关注原支付渠道通知",
+        content: "已提交，将在一个工作日内审核完毕",
         position: "top",
       });
       router.replace("/");
diff --git a/public/icons/32DP/comprehensive.png b/public/icons/32DP/comprehensive.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8785d07ee9a51178db397dcb354bcdbccd9f030
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0aHmtK~#7F?UvDT
z!ypWXMJ@w$1V-ox?gs4!8KD~_ogmEw9U<Ky9ibbT4eAZ3bjO22Y%FB?CE>f{%pn9q
z`VS1yXf)Qvm5edQC;Ys^at3U_&ba_uFc^=mk9PFwfJHV1TZheq9Uj|mZql}3<EIJO
zK0wEjtu=raN^iU_**jE%KKra>9+rR$beRsGD|~(C+kpkR&}XeMlV8vL4q(Md>5c-Q
zJwF6kL#2|Yf27PF)__DkSGst6cO76&aDxlm>^x%sV)hHHP0GOESn0A-_1aQxY9^<*
z=){KnME|6Hx2gh41i>8jjjRc1iop8nfVN-+mgom{^G3l?AC#B{lmt#!0bQiK%uGRk
zOV%+72m_#>xbw`M7fI%<G$hfC=nXW<5Yx}pra`JJOHqq7GKaOO{e=0kL>*Xv$i5{+
oqIRGlW#sAtOk;~h-Dun$|Ahp%NzY5YYXATM07*qoM6N<$g4rIqH~;_u

literal 0
HcmV?d00001

diff --git a/public/icons/32DP/pricefilter.png b/public/icons/32DP/pricefilter.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7c32a7a6e013ce81e1143e79fb5b7a8f57fd0bb
GIT binary patch
literal 517
zcmV+g0{Z=lP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0h&ofK~#7F?UwCr
zgD?<=U!wePHmEmfHz*sFZomlLAY_8H6I7j`-GFq1Yyg=cY~Y@St6q!&+p(qm;E^nh
z4}ZOPoDD22ETkoyGD;~o^eAvW9hGC2Wi3LX#Rw{mj7Ot4ILT_lmQxXkhoDl<eYBpi
z@!hmkb_iq7#_AA?l2=~3>=m9+pRM6Cfoq@vaw85NJ^BixZ;lwyKySW*srxmoUxip$
zT(@`Vv*nvWY?P~9<+r$5AO$L@=UgX;xvN4-Xo8we_GPhuFnf*EXa&wT*HOJN6ch+x
z<@2#Vi{4q2V0E7KcA@9i8veAlMq0puRC%Flr|JmAOCbjys679@=-+=fO>jaKvLgE|
zUg`RY9(U~hlT<q*1vGfcg10nmwQfI${%z4*rrd-7Am=%1<Lfrxi3bYFVJ5fXbTCJW
zAr&7qp}H^KqgN@{rf>A=;N%)Z(Sn*Lth5SGY(YQh@6rdPVl1esUQM{GaveW*9vUP3
z>N<zKyj~QBO&AKQ^GzT%dZK*9wqXkrxCOLQ&iC(yg_!&TUIKNAY4}mr00000NkvXX
Hu0mjfAdcOe

literal 0
HcmV?d00001

diff --git a/utils/tools.js b/utils/tools.js
index 1318e0a..b5ad1a5 100644
--- a/utils/tools.js
+++ b/utils/tools.js
@@ -11,6 +11,8 @@ export function formatDeadline(timestamp) {
 
   return `${year}年${month}月${day}日 ${hours}:${minutes}:${seconds}`;
 }
+
+// 格式化时间戳-完整
 export function formatTimestamp(timestamp) {
   const now = new Date();
   const date = new Date(timestamp * 1000);
@@ -37,23 +39,20 @@ export function formatTimestamp(timestamp) {
 
   // 检查是否是今年
   if (now.getFullYear() === date.getFullYear()) {
-    return `${
-      date.getMonth() + 1
-    }-${date.getDate()} ${date.getHours()}:${String(date.getMinutes()).padStart(
-      2,
-      "0"
-    )}`;
+    return `${date.getMonth() + 1}-${date.getDate()} ${String(
+      date.getHours()
+    ).padStart(2, "0")}:${String(date.getMinutes()).padStart(2, "0")}`;
   }
 
   // 不是今年，返回完整日期和时间
   return `${date.getFullYear()}-${
     date.getMonth() + 1
-  }-${date.getDate()} ${date.getHours()}:${String(date.getMinutes()).padStart(
-    2,
-    "0"
-  )}`;
+  }-${date.getDate()} ${String(date.getHours()).padStart(2, "0")}:${String(
+    date.getMinutes()
+  ).padStart(2, "0")}`;
 }
 
+// 格式化时间戳-简洁
 export function formatDate(timestamp) {
   const nowTime = new Date();
   const date = new Date(timestamp * 1000);
@@ -65,7 +64,10 @@ export function formatDate(timestamp) {
   if (nowTime.getTime() - 24 * 60 * 60 * 1000 > date.getTime()) {
     return `${month}/${day}`;
   } else {
-    return `${hours}:${minutes > 9 ? minutes : "0" + minutes}`;
+    return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(
+      2,
+      "0"
+    )}`;
   }
 }