From 09af5c158b04191c716faefaea0eb8561a026651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 22 Sep 2025 13:46:01 +0800 Subject: [PATCH] =?UTF-8?q?```=20feat(shop/orderConfirm):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BC=98=E6=83=A0=E5=88=B8=E4=BD=BF=E7=94=A8=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E4=BB=98=E9=80=BB=E8=BE=91=E5=BD=93=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=80=89=E6=8B=A9=E4=BD=BF=E7=94=A8=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=97=B6=EF=BC=8C=E7=8E=B0=E5=9C=A8?= =?UTF-8?q?=E4=BC=9A=E9=87=8D=E6=96=B0=E6=9E=84=E5=BB=BA=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B9=B6=E9=80=92=E5=BD=92=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=87=BD=E6=95=B0=EF=BC=8C=20=E7=A1=AE?= =?UTF-8?q?=E4=BF=9D=E4=BC=A0=E9=80=92=E6=9C=80=E6=96=B0=E7=9A=84=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=88=B8=E4=BF=A1=E6=81=AF=E3=80=82=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=97=A5=E5=BF=97=E4=BB=A5=E4=BE=BF?= =?UTF-8?q?=E8=B0=83=E8=AF=95=EF=BC=8C=E5=B9=B6=E6=8F=90=E5=89=8D=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=BB=A5=E9=81=BF=E5=85=8D=E9=87=8D=E5=A4=8D=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=94=AF=E4=BB=98=E9=80=BB=E8=BE=91=E3=80=82```?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/user/components/UserCard.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pages/user/components/UserCard.tsx b/src/pages/user/components/UserCard.tsx index aed2fd2..b60dfb4 100644 --- a/src/pages/user/components/UserCard.tsx +++ b/src/pages/user/components/UserCard.tsx @@ -11,7 +11,7 @@ import {TenantId} from "@/config/app"; import {useUser} from "@/hooks/useUser"; import {useUserData} from "@/hooks/useUserData"; import {getStoredInviteParams} from "@/utils/invite"; -// import QRLoginButton from "@/components/QRLoginButton"; +import QRLoginButton from "@/components/QRLoginButton"; const UserCard = forwardRef((_, ref) => { const { @@ -213,16 +213,15 @@ const UserCard = forwardRef((_, ref) => { marginTop: '30px', marginRight: '10px' }}> - {/*{userInfo?.userId === 33738 &&*/} - {/* */} - {/*}*/} + {/*扫码登录*/} + {!isAdmin() &&