From f8e689e2508327761c8a60a7d6c02c06d3f2f293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sat, 31 Jan 2026 22:47:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(header):=20=E6=9B=BF=E6=8D=A2=E7=BD=91?=
 =?UTF-8?q?=E7=AB=99=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=A7=9F=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 引入User模型类型定义
- 添加userInfo状态管理
- 实现getTenantName方法获取租户名称
- 将Header组件中的getWebsiteName替换为getTenantName
- 在用户卡片组件中根据域名条件渲染角色标签
---
 src/pages/index/Header.tsx             | 13 +++++++++----
 src/pages/user/components/UserCard.tsx |  5 ++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

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<boolean>(true)
   const [statusBarHeight, setStatusBarHeight] = useState<number>()
   const [stickyStatus, setStickyStatus] = useState<boolean>(false)
+  const [userInfo] = useState<User>()
+
+  const getTenantName = () => {
+    return userInfo?.tenantName || '商城名称'
+  }
 
   const reload = async () => {
     Taro.getSystemInfo({
@@ -219,7 +224,7 @@ const Header = (_: any) => {
                       size="22"
                       src={getWebsiteLogo()}
                     />
-                    <Text style={{color: '#ffffff'}}>{getWebsiteName()}</Text>
+                    <Text style={{color: '#ffffff'}}>{getTenantName()}</Text>
                     <TriangleDown size={9} className={'text-white'}/>
                   </Space>
                 </Button>
@@ -230,11 +235,11 @@ const Header = (_: any) => {
                   size="22"
                   src={getWebsiteLogo()}
                 />
-                <Text className={'text-white'}>{getWebsiteName()}</Text>
+                <Text className={'text-white'}>{getTenantName()}</Text>
                 <TriangleDown className={'text-white'} size={9}/>
               </View>
             )}>
-          {/*<QRLoginButton />*/}
+          <Text className={'text-white'}>{getTenantName()}</Text>
         </NavBar>
       </Sticky>
     </>
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<any, any>((_, ref) => {
   const {data, refresh} = useUserData()
@@ -198,7 +199,9 @@ const UserCard = forwardRef<any, any>((_, ref) => {
                       />
                       <View className={'flex flex-col'}>
                         <Text style={{color: '#ffffff'}}>{getDisplayName() || '点击登录'}</Text>
-                        <View><Tag type="success">{getRoleName()}</Tag></View>
+                        {getRootDomain() && (
+                          <View><Tag type="success">{getRoleName()}</Tag></View>
+                        )}
                       </View>
                     </View>
                   </View>