diff --git a/src/pages/index/Header.tsx b/src/pages/index/Header.tsx index ec151f8..c9f032e 100644 --- a/src/pages/index/Header.tsx +++ b/src/pages/index/Header.tsx @@ -12,17 +12,22 @@ import {handleInviteRelation, getStoredInviteParams} from "@/utils/invite"; import {View,Text} from '@tarojs/components' import MySearch from "./MySearch"; import './Header.scss'; +import {User} from "@/api/system/user/model"; const Header = (_: any) => { // 使用新的useShopInfo Hook const { - getWebsiteName, getWebsiteLogo } = useShopInfo(); const [IsLogin, setIsLogin] = useState(true) const [statusBarHeight, setStatusBarHeight] = useState() const [stickyStatus, setStickyStatus] = useState(false) + const [userInfo] = useState() + + const getTenantName = () => { + return userInfo?.tenantName || '商城名称' + } const reload = async () => { Taro.getSystemInfo({ @@ -219,7 +224,7 @@ const Header = (_: any) => { size="22" src={getWebsiteLogo()} /> - {getWebsiteName()} + {getTenantName()} @@ -230,11 +235,11 @@ const Header = (_: any) => { size="22" src={getWebsiteLogo()} /> - {getWebsiteName()} + {getTenantName()} )}> - {/**/} + {getTenantName()} diff --git a/src/pages/user/components/UserCard.tsx b/src/pages/user/components/UserCard.tsx index 9f1699b..b7cc16b 100644 --- a/src/pages/user/components/UserCard.tsx +++ b/src/pages/user/components/UserCard.tsx @@ -11,6 +11,7 @@ import {useUserData} from "@/hooks/useUserData"; import {getStoredInviteParams} from "@/utils/invite"; import UnifiedQRButton from "@/components/UnifiedQRButton"; import {useThemeStyles} from "@/hooks/useTheme"; +import {getRootDomain} from "@/utils/domain"; const UserCard = forwardRef((_, ref) => { const {data, refresh} = useUserData() @@ -198,7 +199,9 @@ const UserCard = forwardRef((_, ref) => { /> {getDisplayName() || '点击登录'} - {getRoleName()} + {getRootDomain() && ( + {getRoleName()} + )}