diff --git a/src/components/QRLoginButton.tsx b/src/components/QRLoginButton.tsx index 6a155e3..5775db3 100644 --- a/src/components/QRLoginButton.tsx +++ b/src/components/QRLoginButton.tsx @@ -28,8 +28,8 @@ export interface QRLoginButtonProps { * 扫码登录按钮组件 */ const QRLoginButton: React.FC = ({ - type = 'primary', - size = 'normal', + type = 'default', + size = 'small', text = '扫码登录', showIcon = true, onSuccess, diff --git a/src/pages/index/Header.tsx b/src/pages/index/Header.tsx index 0427d86..42d467b 100644 --- a/src/pages/index/Header.tsx +++ b/src/pages/index/Header.tsx @@ -207,6 +207,7 @@ const Header = (props: any) => { )}> + {/**/} ) diff --git a/src/pages/user/components/UserCard.tsx b/src/pages/user/components/UserCard.tsx index a021741..aed2fd2 100644 --- a/src/pages/user/components/UserCard.tsx +++ b/src/pages/user/components/UserCard.tsx @@ -1,8 +1,8 @@ import {Button} from '@nutui/nutui-react-taro' -import {Avatar, Tag} from '@nutui/nutui-react-taro' +import {Avatar, Tag, Space} from '@nutui/nutui-react-taro' import {View, Text, Image} from '@tarojs/components' -import {Scan} from '@nutui/icons-react-taro'; import {getUserInfo, getWxOpenId} from '@/api/layout'; +import {Scan} from '@nutui/icons-react-taro'; import Taro from '@tarojs/taro'; import {useEffect, useState, forwardRef, useImperativeHandle} from "react"; import {User} from "@/api/system/user/model"; @@ -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 { @@ -185,10 +185,14 @@ const UserCard = forwardRef((_, ref) => { { IsLogin ? ( - + ) : ( ) } @@ -205,11 +209,25 @@ const UserCard = forwardRef((_, ref) => { ) : ''} - {userInfo?.userId === 33738 && - - } - {isAdmin() && - navTo('/user/store/verification', true)}/>} + + {/*{userInfo?.userId === 33738 &&*/} + {/* */} + {/*}*/} + {!isAdmin() && + + } + ((_, ref) => { navTo('/user/profile/profile', true)} > diff --git a/src/pages/user/components/UserGrid.tsx b/src/pages/user/components/UserGrid.tsx index 417491c..95663c5 100644 --- a/src/pages/user/components/UserGrid.tsx +++ b/src/pages/user/components/UserGrid.tsx @@ -11,7 +11,8 @@ import { People, AfterSaleService, Logout, - ShoppingAdd, ShoppingRemove, Service + ShoppingAdd, + Service } from '@nutui/icons-react-taro' import {useUser} from "@/hooks/useUser"; @@ -102,7 +103,7 @@ const UserCell = () => { - navTo('/admin/index', true)}> + navTo('/admin/index', true)}>