From ed00fd101b6b7d83e1b23a5693a32c613a14f93c Mon Sep 17 00:00:00 2001
From: al <al@cdhncy.com>
Date: Tue, 21 Jan 2025 16:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=9A=E7=9F=A5icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/globals.css | 4 ++++
components/BottomNav/index.js | 41 ++++++++++++++++++++++------------
public/images/notice.png | Bin 0 -> 1465 bytes
3 files changed, 31 insertions(+), 14 deletions(-)
create mode 100644 public/images/notice.png
diff --git a/app/globals.css b/app/globals.css
index 6cdd326..f861879 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -411,4 +411,8 @@ textarea {
.ant-modal-mask,
.ant-modal-wrap {
position: absolute !important;
+}
+
+.notice-toast .adm-toast-main{
+ background-color: rgb(23,22,26)!important;
}
\ No newline at end of file
diff --git a/components/BottomNav/index.js b/components/BottomNav/index.js
index 878194e..312ba06 100644
--- a/components/BottomNav/index.js
+++ b/components/BottomNav/index.js
@@ -10,6 +10,7 @@ import { connect } from "react-redux";
import { get } from "@/utils/storeInfo";
import requireAPI from "@/utils/requireAPI";
import OwnIcon from "../OwnIcon";
+import OwnImage from "../OwnImage";
function BottomNav({ changeNoticeCount, changeInviter, noticeCount }) {
const searchParams = useSearchParams();
const pathname = usePathname();
@@ -20,6 +21,9 @@ function BottomNav({ changeNoticeCount, changeInviter, noticeCount }) {
// console.log("Current Inviter: " + currentInviter);
changeInviter(currentInviter);
}
+ setTimeout(() => {
+ handleGetWebsocketData();
+ }, 2000);
}, [pathname]);
useEffect(() => {
const getDtata = async () => {
@@ -103,15 +107,23 @@ function BottomNav({ changeNoticeCount, changeInviter, noticeCount }) {
return isActive;
};
const handleGetWebsocketData = (data) => {
- if (data.d.unread_cnt > 0) {
- changeNoticeCount(data.d.unread_cnt);
- const { n_type, title } = data.d.notif;
- Toast.show({
- type: "info",
- maskClassName: "notice-toast",
- content: (
- <div className="flex flex-col gap-2">
- <p className="text-base">{`🔔 收到一条${
+ // if (data.d.unread_cnt > 0) {
+ // changeNoticeCount(data.d.unread_cnt);
+ // const { n_type, title } = data.d.notif;
+ const n_type = 0;
+ const title = "系统通知的更好打开撒服务";
+ Toast.show({
+ type: "info",
+ maskClassName: "notice-toast",
+ content: (
+ <div className="flex items-center gap-2">
+ <OwnImage
+ outClassName="w-[42px] h-[42px]"
+ className="w-[42px] h-[42px]"
+ src="/images/notice.png"
+ />
+ <div>
+ <p className="text-base">{`收到一条${
n_type === 0
? "系统"
: n_type === 1
@@ -122,11 +134,12 @@ function BottomNav({ changeNoticeCount, changeInviter, noticeCount }) {
}通知`}</p>
<p className="text-sm text-[#ffffff80]">{title}</p>
</div>
- ),
- position: "top",
- duration: 5000,
- });
- }
+ </div>
+ ),
+ position: "top",
+ duration: 1000000,
+ });
+ // }
};
return (
<>
diff --git a/public/images/notice.png b/public/images/notice.png
new file mode 100644
index 0000000000000000000000000000000000000000..92c0971366b529aa881864f6c274a8da57a4aaa1
GIT binary patch
literal 1465
zcmV;q1xEUbP)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1x`ssK~#7F)mc4k
z97PoVZtu^I&2cyc0ZMU^C6EFIX_AO0gd!Dm2nvL-Q-d6df({Tp5)nwyVG0TmB~=PS
z>7*boFrpy3LqZ6!k$>a6^ZoI@eLLQ{_3Z8L<&457&F$^(+|IY}eecbiIpBYST$)aU
z!QeSLu+=bGG^DNOa=BHE3n5pP_P(^u!SSOmZHZ&X@yW%Id_fLhfEN7eci`sFz?vNY
z-oZq1=9G*e?ZP~8ex6qv(iX+SKOl*ykbF}P%RZ@3Z@?$|U*NF{@Zl?Z1Qvwsmxv=8
zSn?+7>%e>80{7ZDRuuC<xd1dfK(7zXl$9(k4P3S@o3lt#A9uu(HN5kclH@}Ma`m8#
zvB76dmw;{$*gpXJgYaHXhObNko*bKUuhmtuAH7b?Hl)WnA-lz{p7qEDP?N@zQ^5e^
zk|cq-86B8JO7gr?ez?y-NN+dw1$dt?#jz<l%`n$YSDWY(Zr=?9Mm&L?7RCYxE#%Yp
zZ+CU9gPxu<E;KflU=t1UWDU3OhCiky`~A@a&{7ot+gE_sE{4|!19$&}gy-46W2OPB
z0XGza%l-)(>qtaCr`BR1&=QN6G`$dX+jn<>PEWs6I$jV4?G!I=W9=~8klU&uTJt~a
z>&YZ5(;5V3a2qe3(|pJmri|!5Uk08=b{2#=yT*?KvVa5)Nm}gbCrm0)PzG$zo>tP|
zi~GJ=naD)pIj_!$%chG*ulEL;UKpj%KV>IqH(orO+=p3#86xi?JJE7c^%W&cv2X3G
z`>$ToYjm*+-wl#{>&oyoO5u?cz)4A8vt=EN=OZxM^<K<dzIstD@%4%}g4*OY7bpeZ
zza3<iho)4!Hpa53LAU3=PM1=5h9s>UN78_rHE?CG&gh9Ho+!20cKn#uAxwanz)1r8
znU~pZ>D+E(yEO*UZZCa7lBICDd{&Pnxv?jDm+7<B(ctX$#~{k-tP|sQV@Z>ivZS8#
z^TX%uj?VSF$y2q5tROL3k#1x}^LtvW^5v4W9D{TTpVOe34(Te+VALFQB#EaToc(Ck
zQRys>LaJUTN}BI@<Q#8m0y7I`fzc_!e46ql(^=HcaYZk=CKv^}|MRP1-MPK5!P_1;
zJ=xf6hf!H9*p*Fo7;Td<(;BP#axw8|Zlc9V(Myt>^5#2DokllyC$pZSXIPQ7lPfE?
z>vN7(G|4vmVYy}kDk~U#oJ!e#`9pMHPIP-b(WG?}t9iS;8wFb4)TTTdPte_uiUc;&
z<>74gD8Z<;mmMx*^`LO3mg54C?*4NNX_1X6(}_!)wANbC_?^MRe90<{@_6Gj+%J-e
za)~=t(iFv{|6?8a<c7N55F>e#qov<{c{n#_3A%@+Cap@X``bUUL>vAm2eapHTJTh5
zIJkJe^6Syrg@jx+DHnTbF(*VjK^hEWpurE5o^;#qnMf3SxuY3?mUSgH66Fqy(In69
z!rFeOH)6Nb1aj?=sL##b(%BR@R{fn48?<2AQV7%3x>&uNVd+co8C)?uUeP1VJkCnd
zKCFXTxluwF<{Pr5bH;x^tJ`&7_|e=*Qk#2W*|)Qwo#e?`;Pf2uWHnsgP>WG8pK=^Z
zQ1=S1n_D)~k3l_fAr{ryJt=Je+SYW!?^!YHC_H*GyD4TzPqn#>DA8coZ1HfP(pA-r
zvLyR+Q>^F^uq*PTZnsJ5@_Nzi<oW!feMPGa;BGUcpL(72E^{0xIeIfBxoqD~-WtCZ
z%*(7n@29+TfuxveINND#G!U~j9*f}5hHJqe0mlvgq47cHKN}pRAKbrh9yI(5t{c{H
TaT>-d00000NkvXXu0mjfF*C)x
literal 0
HcmV?d00001