From 507ba449106177a7a0e4f9bd8ba13b8de74a234e Mon Sep 17 00:00:00 2001 From: ZeroDeng Date: Thu, 6 Jun 2024 20:43:46 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96=20chore:=20Payment=20loading=20usi?= =?UTF-8?q?ng=20user's=20logo=20(#252)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当用户设置系统logo的情况下拉起支付弹窗显示用户自己设置的logo而不是显示默认的logo-loading图 --- web/src/views/Topup/component/PayDialog.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/web/src/views/Topup/component/PayDialog.js b/web/src/views/Topup/component/PayDialog.js index 7e342057..921c1e17 100644 --- a/web/src/views/Topup/component/PayDialog.js +++ b/web/src/views/Topup/component/PayDialog.js @@ -16,11 +16,17 @@ const PayDialog = ({ open, onClose, amount, uuid }) => { const [qrCodeUrl, setQrCodeUrl] = useState(null); const [success, setSuccess] = useState(false); const [intervalId, setIntervalId] = useState(null); - + const siteInfoStorage = localStorage.getItem('siteInfo'); + let siteInfo; + if (siteInfoStorage) { + siteInfo = JSON.parse(siteInfoStorage); + } + const useLogo = siteInfo.logo ? siteInfo.logo : defaultLogo; useEffect(() => { if (!open) { return; } + setMessage('正在拉起支付中...'); setLoading(true); @@ -99,7 +105,7 @@ const PayDialog = ({ open, onClose, amount, uuid }) => { - {loading && loading} + {loading && loading} {qrCodeUrl && (